From bc0370fac0f88d83691cac221a0373ec9aea05bd Mon Sep 17 00:00:00 2001
From: suixy <2277317060@qq.com>
Date: Fri, 5 Dec 2025 16:13:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9C=8B=E6=9D=BFws=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/chart/chart1.vue   | 35 +++++++++++++++++++++--------------
 src/views/chart/treeItem.vue | 12 ++++++------
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/src/views/chart/chart1.vue b/src/views/chart/chart1.vue
index fc860a9..4775843 100644
--- a/src/views/chart/chart1.vue
+++ b/src/views/chart/chart1.vue
@@ -28,8 +28,14 @@
     </div>
     <div class="menu">
       <el-menu active-text-color="#ffd04b" background-color="#062852" class="el-menu-vertical-demo" default-active="2" text-color="#fff">
-        <template v-for="(i, index) in centerData" :key="i.id">
-          <MenuItem :data="i" />
+        <template v-for="(i, index) in treeData" :key="i.id">
+          <!--          <MenuItem :data="i" />-->
+          <el-sub-menu index="1">
+            <template #title>
+              <span>{{ i.locationAlias }}</span>
+            </template>
+            <el-menu-item @click="scrollToId(ii.id)" v-for="ii in i.children">{{ ii.locationAlias }}</el-menu-item>
+          </el-sub-menu>
         </template>
       </el-menu>
     </div>
@@ -345,7 +351,6 @@ const getData = () => {
   getLocationTree().then((res) => {
     treeData.value = res.data;
     centerData.value = findParentsWithLocationType3(res.data);
-    console.log(centerData.value);
   });
 };
 
@@ -398,23 +403,24 @@ const getSocket = () => {
   socket.addEventListener('message', (event) => {
     let data = JSON.parse(event.data);
 
-    if (data?.dataType === '2') {
+    if (data?.deviceStatus === 1) {
       deviceData.value[data.deviceId] = {
-        status: data.readStatus === '1',
-        code: data.epcStr,
-        time: parseTime(data.recordTime)
+        status: true,
+        code: data.epcStr || '',
+        time: parseTime(data.recordTime, '{m}-{d} {h}:{i}')
+      };
+    } else {
+      deviceData.value[data.deviceId] = {
+        status: false,
+        code: data.epcStr || '',
+        time: parseTime(data.recordTime, '{m}-{d} {h}:{i}')
       };
     }
     if (data?.dataType === '1') {
-      deviceData.value[data.deviceId] = {
-        status: false,
-        code: '',
-        time: parseTime(data.recordTime)
-      };
     }
     if (data?.alarmFlag === '1') {
       tableData.value.push({
-        alarmTime: parseTime(data.recordTime),
+        alarmTime: parseTime(data.recordTime, '{m}-{d} {h}:{i}'),
         deviceName: deviceData.value[data.deviceId]?.epcStr?.trimStart() || '',
         location: centerData.value.flatMap((item) => item.children || []).find((child) => child.deviceId === targetDeviceId)?.locationAlias || '',
         alarmAction: data.alarmAction
@@ -470,9 +476,10 @@ onMounted(() => {
       deviceData.value[item.deviceId] = {
         code: item.latestBarcode,
         status: item.readStatus === '1',
-        time: parseTime(new Date())
+        time: parseTime(new Date(), '{m}-{d} {h}:{i}')
       };
     });
+    console.log(deviceData.value);
   });
   getSocket();
   timer1 = setInterval(() => {
diff --git a/src/views/chart/treeItem.vue b/src/views/chart/treeItem.vue
index 39a3d43..19c6bb1 100644
--- a/src/views/chart/treeItem.vue
+++ b/src/views/chart/treeItem.vue
@@ -1,8 +1,8 @@
 <template>
-  <div class="node" ref="container">
+  <div class="node" ref="container" :id="copy ? '' : `tree${data.id}`">
     <!-- 主节点 -->
     <div class="node-main" ref="nodeMain">
-      <div class="node-icon" ref="nodeIcon" :id="copy ? '' : `tree${data.id}`"></div>
+      <div class="node-icon" ref="nodeIcon"></div>
       <div class="node-title">{{ data.locationAlias }}</div>
     </div>
 
@@ -12,16 +12,16 @@
         :id="copy ? '' : `tree${child.id}`"
         v-for="(child, index) in data.children"
         :key="index"
-        :class="deviceData[data.deviceId]?.status ? 'child-item' : 'child-item1'"
+        :class="deviceData[child.deviceId]?.status ? 'child-item' : 'child-item1'"
         :ref="(el) => (childRefs[index] = el)"
       >
-        <div :class="deviceData[data.deviceId]?.status ? 'child-icon' : 'child-icon1'"></div>
+        <div :class="deviceData[child.deviceId]?.status ? 'child-icon' : 'child-icon1'"></div>
         <div class="child-info">
           <div class="child-name">
             工位名称: <span style="font-size: 0.8vw">{{ child.locationAlias }}</span>
           </div>
-          <div class="child-code">总装码：{{ deviceData[data.deviceId]?.code?.trimStart() }}</div>
-          <div class="child-time">时间：{{ parseTime(deviceData[data.deviceId]?.time) }}</div>
+          <div class="child-code">总装码：{{ deviceData[child.deviceId]?.code?.trimStart() }}</div>
+          <div class="child-time">时间：{{ parseTime(deviceData[child.deviceId]?.time, '{m}-{d} {h}:{i}') }}</div>
         </div>
       </div>
     </div>