From bc96f76d7f842b229df4a7722a256b3dd90ee796 Mon Sep 17 00:00:00 2001
From: "DESKTOP-FUDKNA8\\znjsz" <tonystark@starkindustries.mil>
Date: Tue, 23 Jan 2024 10:12:39 +0800
Subject: [PATCH] update

---
 src/components/RealtimeTable.vue | 31 ++++++++++++++++++++++---------
 src/pages/3D.vue                 | 15 +++++++--------
 2 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/components/RealtimeTable.vue b/src/components/RealtimeTable.vue
index 2dd9c91..79acdff 100644
--- a/src/components/RealtimeTable.vue
+++ b/src/components/RealtimeTable.vue
@@ -3,8 +3,26 @@
 import { ref } from "vue";
 import { useWsStore } from "../store";
 
-const listData = ref([]);
 const store = useWsStore();
+const listData = ref((store.data2.lineDetailData || Array(3).fill({})).map(
+  (item, index) => ({
+    productLine: item.productLine || "---",
+    mbt: item.edgingInput || "---",
+    mbb: item.edgingOutput || "---",
+    dkt: item.drillingInput || "---",
+    dkb: item.drillingOutput || "---",
+    dmt: item.coatingInput || "---",
+    dmb: item.coatingOutput || "---",
+    syt: item.silkInput || "---",
+    syb: item.silkOutput || "---",
+    ght: item.solidificationInput || "---",
+    ghb: item.solidificationOutput || "---",
+    gh1: item.temperingInput || "---",
+    gh2: item.temperingOutput || "---",
+    bzt: item.finalInput || "---",
+    bzb: item.finalOutput || "---",
+  })
+));
 store.$subscribe((mutation, state) => {
   listData.value = (state.data2.lineDetailData || Array(3).fill({})).map(
     (item, index) => ({
@@ -30,13 +48,8 @@ store.$subscribe((mutation, state) => {
 
 <template>
   <div class="realtime-table">
-    <el-table
-      class="dark-table"
-      :data="listData"
-      :show-overflow-tooltip="true"
-      row-class-name="dark-row"
-      header-row-class-name="dark-header"
-    >
+    <el-table class="dark-table" :data="listData" :show-overflow-tooltip="true" row-class-name="dark-row"
+      header-row-class-name="dark-header">
       <el-table-column prop="productLine" label="产线"></el-table-column>
       <el-table-column prop="mbt" label="磨边上"></el-table-column>
       <el-table-column prop="mbb" label="磨边下"></el-table-column>
@@ -68,7 +81,7 @@ store.$subscribe((mutation, state) => {
   height: 100%;
 }
 
-.dark-table >>> .el-table__inner-wrapper::before {
+.dark-table>>>.el-table__inner-wrapper::before {
   background-color: transparent !important;
 }
 </style>
diff --git a/src/pages/3D.vue b/src/pages/3D.vue
index e7fa192..da42f99 100644
--- a/src/pages/3D.vue
+++ b/src/pages/3D.vue
@@ -8,18 +8,15 @@ import Icon from '../assets/svg/IconStatus.vue';
 const { settings } = useSettings();
 const store = useWsStore();
 const lines = ref({
-  g1: null,
-  g2: null,
-  g3: null, // 钢3线
+  g1: store.data2.lineDetailData?.[0] || null,
+  g2: store.data2.lineDetailData?.[1] || null,
+  g3: store.data2.lineDetailData?.[2] || null, // 钢3线
 });
 store.$subscribe((mutation, state) => {
   if (state.data2.lineDetailData && state.data2.lineDetailData.length == 3) {
     lines.value.g1 = state.data2.lineDetailData[0]
     lines.value.g2 = state.data2.lineDetailData[1]
     lines.value.g3 = state.data2.lineDetailData[2]
-    console.log('g1: ', lines.value.g1)
-    console.log('g2: ', lines.value.g2)
-    console.log('g3: ', lines.value.g3)
   }
 })
 
@@ -537,7 +534,8 @@ const status = ref({
       </div>
       <div class="info">
         <h1>
-          <Icon :color="status['S6后储片台'] == 'error' ? '#ff3737' : status['S6后储片台'] == 'warn' ? '#ffb524' : '#24ff5e'" />B3下片
+          <Icon :color="status['S6后储片台'] == 'error' ? '#ff3737' : status['S6后储片台'] == 'warn' ? '#ffb524' : '#24ff5e'" />
+          B3下片
         </h1>
       </div>
       <div class="info">
@@ -1056,4 +1054,5 @@ const status = ref({
   background: url(../assets/model/F12.png) no-repeat;
   background-size: 1920px 1080px;
   background-position: 0 -80px;
-}</style>
+}
+</style>