From b95cf940af8e01e4eca30b2599b029c2f645bd1e Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期一, 29 四月 2024 10:44:26 +0800
Subject: [PATCH] feat:创建新分支
---
src/views/dashboard/components/DashboardTitle.vue | 126 ++++++++++++++++++++++++++++-------------
1 files changed, 85 insertions(+), 41 deletions(-)
diff --git a/src/views/dashboard/components/DashboardTitle.vue b/src/views/dashboard/components/DashboardTitle.vue
index cde7f28..50d533e 100644
--- a/src/views/dashboard/components/DashboardTitle.vue
+++ b/src/views/dashboard/components/DashboardTitle.vue
@@ -1,35 +1,37 @@
<template>
<div class="dashboard-title">
- <div class="title-text">
- 鏅鸿兘宸ヤ綔鍙� 鈥�
- <el-popover placement="bottom" :width="200" trigger="click" :content="currentDeviceName">
- <template #reference>
- <el-text truncated class="device-name">{{ currentDeviceName }}</el-text>
- </template>
- </el-popover>
- <el-icon size="32" color="#0db7f5" style="margin-left: 4px; cursor: pointer" @click="openDevicesModal">
- <IconSlider></IconSlider>
- </el-icon>
+ <div class="title-text-box">
+ <div class="title-text">
+ <span> 鏅鸿兘宸ヤ綔鍙� 鈥�</span>
+ <el-popover placement="bottom" :width="180" trigger="click" :content="currentDeviceName">
+ <template #reference>
+ <el-text truncated class="device-name">{{ currentDeviceName }}</el-text>
+ </template>
+ </el-popover>
+ <el-icon class="text-icon" color="#0db7f5" @click="openDevicesModal">
+ <IconSlider></IconSlider>
+ </el-icon>
+ </div>
</div>
<div class="title-status">
<div class="connection-info" @click="openProblemsModal">
- <el-icon size="26" :color="problemsIconStatus ? '#00ff00' : '#ff0000'">
+ <el-icon class="size_26" :color="problemsIconStatus ? '#00ff00' : '#ff0000'">
<AlertLightIcon></AlertLightIcon>
</el-icon>
</div>
<div class="cloud-connection-status">
- <el-icon v-if="cloudConnectionIconStatus" size="38" color="#00ff00">
+ <el-icon v-if="cloudConnectionIconStatus" class="size_36" color="#00ff00">
<IconCloudDone></IconCloudDone>
</el-icon>
- <el-icon v-else size="38" color="#ff0000">
+ <el-icon v-else class="size_36" color="#ff0000">
<IconCloudOff></IconCloudOff>
</el-icon>
</div>
<div class="reporting-record">
<el-icon
- size="26"
+ class="size_26"
:color="taskStore.activeTask ? '#0db7f5' : '#c0c0c0'"
:style="{ 'margin-right': '10px', cursor: taskStore.activeTask ? 'pointer' : 'not-allowed' }"
@click="openReportingRecord"
@@ -39,7 +41,7 @@
</div>
<div class="params-config" @click="openConfigModal">
- <el-icon size="28"><Setting /></el-icon>
+ <el-icon class="size_28"><Setting /></el-icon>
</div>
</div>
</div>
@@ -59,7 +61,7 @@
import IconCloudOff from '~icons/material-symbols-light/cloud-off-outline'
import IconSlider from '~icons/bx/slider'
import { useRequest } from 'vue-hooks-plus'
-import { apiGetProblemList } from '@/api'
+// import { apiGetProblemList } from '@/api'
import { PROBLEMS_POLLING_DURATION } from '@/common/constants'
import { Setting } from '@element-plus/icons-vue'
import DeliverParamsConfigModal from '@/views/dashboard/components/DeliverParamsConfigModal.vue'
@@ -99,7 +101,8 @@
// 闂璇婃柇鍒楄〃
const problemList = computed(() => {
- return problemsRes?.value?.data ?? []
+ // return problemsRes?.value?.data ?? []
+ return []
})
// 闂璇婃柇icon鐘舵��, 闂鍒楄〃涓湁涓�鏉″紓甯稿嵆涓虹孩鐏� 鍚﹀垯鏄豢鐏� true缁跨伅
const problemsIconStatus = computed(() => {
@@ -107,7 +110,8 @@
// 榛樿缁跨伅, 鎷垮埌涓�娆℃暟鎹悗鎵嶄互鎺ュ彛涓哄噯
return true
}
- return !problemList.value.some((ele) => !ele.CheckResult)
+ // return !problemList.value.some((ele) => !ele.CheckResult)
+ return false
})
// 浜戠杩炴帴icon鐘舵��, 闂鍒楄〃涓湁涓�鏉′唬琛ㄤ簯绔摼鎺ョ殑, 寮傚父鍗充负绾㈣壊浜慽con 鍚﹀垯鏄豢鑹� true缁夸簯
const cloudConnectionIconStatus = computed(() => {
@@ -116,8 +120,9 @@
return true
}
// 娌℃暟鎹氨褰撴槸閾炬帴姝ｅ父
- const cloudConnection = problemList.value.find((ele) => ele.ItemCode === 'cloud')
- return cloudConnection ? cloudConnection?.CheckResult : true
+ // const cloudConnection = problemList.value.find((ele) => ele.ItemCode === 'cloud')
+ // return cloudConnection ? cloudConnection?.CheckResult : true
+ return false
})
// 閰嶇疆涓嬪彂鍙傛暟寮圭獥
@@ -131,19 +136,19 @@
/**
* 杞闂璇婃柇
*/
-const {
- data: problemsRes,
- run: startProblemsPolling,
- cancel: cancelProblemsPolling
-} = useRequest(apiGetProblemList, {
- manual: true,
- pollingInterval: PROBLEMS_POLLING_DURATION,
- pollingWhenHidden: false
-})
-startProblemsPolling()
-onUnmounted(() => {
- cancelProblemsPolling()
-})
+// const {
+// data: problemsRes,
+// run: startProblemsPolling,
+// cancel: cancelProblemsPolling
+// } = useRequest(apiGetProblemList, {
+// manual: true,
+// pollingInterval: PROBLEMS_POLLING_DURATION,
+// pollingWhenHidden: false
+// })
+// startProblemsPolling()
+// onUnmounted(() => {
+// cancelProblemsPolling()
+// })
const taskStore = useTasksStore()
@@ -161,27 +166,66 @@
<style scoped lang="scss">
.dashboard-title {
position: relative;
+ height: 100%;
}
-.title-text {
- display: flex;
- align-items: center;
- justify-content: center;
- font-size: 40px;
- font-weight: 700;
+.el-icon.size_28 {
+ font-size: 28px;
}
+.size_26 {
+ font-size: 26px;
+}
+.size_36 {
+ font-size: 36px;
+}
+.title-text-box {
+ width: calc(100% - 150px);
+ height: 100%;
+
+ .title-text {
+ // display: flex;
+ width: 450px;
+ height: 100%;
+ margin: 0 auto;
+ margin-left: 24%;
+ align-items: center;
+ line-height: 68px;
+ // justify-content: center;
+ font-size: 34px;
+ font-weight: 700;
+ span {
+ float: left;
+ }
+ .text-icon {
+ font-size: 40px;
+ margin-left: 4px;
+ cursor: pointer;
+ }
+ }
+}
+
.title-status {
+ height: 100%;
display: flex;
+ vertical-align: middle;
align-items: center;
position: absolute;
- top: 16px;
+ top: 0px;
right: 6px;
+ div {
+ vertical-align: middle;
+ display: inline-block;
+ margin-top: 7px;
+ }
+ .cloud-connection-status {
+ // margin-top: 5px;
+ }
}
.connection-info {
margin-right: 10px;
cursor: pointer;
}
.device-name {
- max-width: 220px;
+ max-width: 180px;
font-size: 40px;
color: #fff;
}
--
Gitblit v1.8.0