From 2c30751eee8c2504f969f1d5d1edd87b481d68c0 Mon Sep 17 00:00:00 2001
From: XieYongHong <18010623010@163.com>
Date: Fri, 28 Jul 2023 12:26:15 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E9=80=9A=E9=81=93?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DataCollect/Collector/Tree/index.vue      | 37 +++++++++++++------
 1 file changed, 25 insertions(+), 12 deletions(-)

diff --git a/src/views/DataCollect/Collector/Tree/index.vue b/src/views/DataCollect/Collector/Tree/index.vue
index 74d17139..14866062 100644
--- a/src/views/DataCollect/Collector/Tree/index.vue
+++ b/src/views/DataCollect/Collector/Tree/index.vue
@@ -36,25 +36,38 @@
                     <Ellipsis class="tree-left-title">
                         {{ name }}
                     </Ellipsis>
+<!--                    <j-tag-->
+<!--                        class="tree-left-tag"-->
+<!--                        v-if="data.id !== '*'"-->
+<!--                        :color="-->
+<!--                          data?.uniformState?.value === 'normal' || data?.state?.value === 'disabled' ?-->
+<!--                          colorMap.get(data?.runningState?.value) :-->
+<!--                          colorMap.get(data?.uniformState?.value)-->
+<!--                        "-->
+<!--                        >{{-->
+<!--                        data?.uniformState?.value === 'normal' || data?.state?.value === 'disabled' ?-->
+<!--                            data?.runningState?.text :-->
+<!--                            data?.uniformState?.text-->
+<!--                      }}</j-tag-->
+<!--                    >-->
                     <j-tag
                         class="tree-left-tag"
                         v-if="data.id !== '*'"
-                        :color="
-                          data?.uniformState?.value === 'normal' || data?.state?.value === 'disabled' ?
-                          colorMap.get(data?.runningState?.value) :
-                          colorMap.get(data?.uniformState?.value)
-                        "
-                        >{{
-                        data?.uniformState?.value === 'normal' || data?.state?.value === 'disabled' ?
-                            data?.runningState?.text :
-                            data?.uniformState?.text
-                      }}</j-tag
+                        :color="colorMap.get(data?.uniformState?.value)"
+                    >{{ data?.uniformState?.text }}</j-tag
                     >
                     <j-tag
                         class="tree-left-tag2"
                         v-if="data.id !== '*'"
-                        :color="colorMap.get(data?.state?.value)"
-                        >{{ data?.state?.text }}</j-tag
+                        :color="
+                          data?.state?.value === 'disabled' ? colorMap.get(data?.runningState?.value) :
+                          colorMap.get(data?.state?.value)
+                        "
+                        >
+                      {{
+                        data?.state?.text
+                      }}
+                    </j-tag
                     >
                     <span
                         v-if="data.id !== '*'"