From 2453a589a623b2448a8cc940d8dce3da6698c50c Mon Sep 17 00:00:00 2001
From: yangfeng <wanwan926_4@163.com>
Date: 星期一, 05 二月 2024 14:15:49 +0800
Subject: [PATCH] 获取设备列表、切换设备列表、开始生产接口和逻辑修改、结束任务联调、工艺信息联调、切换任务联调
---
src/views/dashboard/components/DashboardTitle.vue | 59 ++++++++++++++++++++++++++++++++++++-----------------------
1 files changed, 36 insertions(+), 23 deletions(-)
diff --git a/src/views/dashboard/components/DashboardTitle.vue b/src/views/dashboard/components/DashboardTitle.vue
index fbbfb1d..863d4eb 100644
--- a/src/views/dashboard/components/DashboardTitle.vue
+++ b/src/views/dashboard/components/DashboardTitle.vue
@@ -20,11 +20,11 @@
</el-icon>
</div>
<div class="cloud-connection-status">
- <el-icon v-if="cloudConnectionIconStatus" class="size_38" color="#00ff00">
+ <el-icon v-if="cloudConnectionIconStatus" class="size_36" color="#00ff00">
<IconCloudDone></IconCloudDone>
</el-icon>
- <el-icon v-else class="size_38" color="#ff0000">
+ <el-icon v-else class="size_36" color="#ff0000">
<IconCloudOff></IconCloudOff>
</el-icon>
</div>
@@ -61,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'
@@ -101,7 +101,8 @@
// 闂璇婃柇鍒楄〃
const problemList = computed(() => {
- return problemsRes?.value?.data ?? []
+ // return problemsRes?.value?.data ?? []
+ return []
})
// 闂璇婃柇icon鐘舵��, 闂鍒楄〃涓湁涓�鏉″紓甯稿嵆涓虹孩鐏� 鍚﹀垯鏄豢鐏� true缁跨伅
const problemsIconStatus = computed(() => {
@@ -109,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(() => {
@@ -118,8 +120,9 @@
return true
}
// 娌℃暟鎹氨褰撴槸閾炬帴姝e父
- 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
})
// 閰嶇疆涓嬪彂鍙傛暟寮圭獥
@@ -133,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()
@@ -171,8 +174,8 @@
.size_26 {
font-size: 26px;
}
-.size_38 {
- font-size: 38px;
+.size_36 {
+ font-size: 36px;
}
.title-text-box {
width: calc(100% - 150px);
@@ -201,11 +204,21 @@
}
.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;
--
Gitblit v1.8.0