From b1fbdcf30e41023a965d133b7134a9bcf9ada0ee Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Tue, 28 Mar 2023 15:39:48 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=87=87=E9=9B=86=E5=99=A8=20=E5=B7=A6?=
 =?UTF-8?q?=E4=BE=A7=E6=A0=91=E6=96=B0=E5=A2=9E=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataCollect/Collector/Point/index.vue     |  6 +++---
 .../DataCollect/Collector/Tree/index.vue      | 19 +++++++++++++++----
 src/views/DataCollect/Collector/data.ts       |  2 ++
 src/views/DataCollect/Collector/index.vue     |  4 ++--
 4 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/src/views/DataCollect/Collector/Point/index.vue b/src/views/DataCollect/Collector/Point/index.vue
index 44351f32..0af577a7 100644
--- a/src/views/DataCollect/Collector/Point/index.vue
+++ b/src/views/DataCollect/Collector/Point/index.vue
@@ -99,8 +99,8 @@
                         @click="handleClick"
                         :active="_selectedRowKeys.includes(slotProps.id)"
                         class="card-box"
-                        :status="getState(slotProps).value"
-                        :statusText="getState(slotProps)?.text"
+                        :status="slotProps?.runningState?.value"
+                        :statusText="slotProps?.runningState?.text"
                         :statusNames="Object.fromEntries(colorMap.entries())"
                     >
                         <template #title>
@@ -282,7 +282,7 @@ import BatchUpdate from './components/BatchUpdate/index.vue';
 import SaveModBus from './Save/SaveModBus.vue';
 import SaveOPCUA from './Save/SaveOPCUA.vue';
 import Scan from './Scan/index.vue';
-import { colorMap, getState } from '../data.ts';
+import { colorMap } from '../data.ts';
 import { cloneDeep, isNumber } from 'lodash-es';
 import { getWebSocket } from '@/utils/websocket';
 import { map } from 'rxjs/operators';
diff --git a/src/views/DataCollect/Collector/Tree/index.vue b/src/views/DataCollect/Collector/Tree/index.vue
index 348ff7ba..a348df25 100644
--- a/src/views/DataCollect/Collector/Tree/index.vue
+++ b/src/views/DataCollect/Collector/Tree/index.vue
@@ -38,8 +38,14 @@
                     <j-tag
                         class="tree-left-tag"
                         v-if="data.id !== '*'"
-                        :color="colorMap.get(getState(data)?.value)"
-                        >{{ getState(data)?.text }}</j-tag
+                        :color="colorMap.get(data?.runningState?.value)"
+                        >{{ data?.runningState?.text }}</j-tag
+                    >
+                    <j-tag
+                        class="tree-left-tag2"
+                        v-if="data.id !== '*'"
+                        :color="colorMap.get(data?.state?.value)"
+                        >{{ data?.state?.text }}</j-tag
                     >
                     <span
                         v-if="data.id !== '*'"
@@ -119,7 +125,7 @@ import Save from './Save/index.vue';
 import { onlyMessage } from '@/utils/comm';
 import { Store } from 'jetlinks-store';
 import _ from 'lodash';
-import { colorMap, getState } from '../data.ts';
+import { colorMap } from '../data.ts';
 
 const props = defineProps({
     data: {
@@ -285,7 +291,7 @@ watch(
 <style lang="less" scoped>
 .tree-container {
     padding-right: 24px;
-    width: 350px;
+    width: 370px;
     .add-btn {
         margin: 10px 0;
 
@@ -311,6 +317,11 @@ watch(
                     display: flex;
                     justify-content: center;
                 }
+                .tree-left-tag2 {
+                    width: 50px;
+                    display: flex;
+                    justify-content: center;
+                }
                 .func-btns {
                     // display: none;
                     display: block;
diff --git a/src/views/DataCollect/Collector/data.ts b/src/views/DataCollect/Collector/data.ts
index 7d0cd214..75f7d947 100644
--- a/src/views/DataCollect/Collector/data.ts
+++ b/src/views/DataCollect/Collector/data.ts
@@ -4,6 +4,8 @@ colorMap.set('partialError', 'warning');
 colorMap.set('failed', 'error');
 colorMap.set('stopped', 'default');
 colorMap.set('processing', '#cccccc');
+colorMap.set('enabled', 'processing');
+colorMap.set('disabled', 'error');
 
 export const getState = (record: any) => {
     const enabled = record?.state?.value === 'enabled';
diff --git a/src/views/DataCollect/Collector/index.vue b/src/views/DataCollect/Collector/index.vue
index 2b6af53d..f028e8c6 100644
--- a/src/views/DataCollect/Collector/index.vue
+++ b/src/views/DataCollect/Collector/index.vue
@@ -36,9 +36,9 @@ const changeTree = (row: any) => {
     min-height: calc(100vh - 180px);
     width: 100%;
     .left {
-        width: 350px;
+        width: 370px;
         border-right: 1px #eeeeee solid;
-        margin: 10px;
+        margin: 10px 10px 0 0;
     }
     .right {
         flex: 1;