From c01106e38906c3d881a659652b4dc3b0b95b6ef9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Tue, 2 Apr 2024 14:56:02 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/OperationalOverview/coldBoard.vue | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue
index f083af15..97c184ea 100644
--- a/src/views/OperationalOverview/coldBoard.vue
+++ b/src/views/OperationalOverview/coldBoard.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-29 16:50:26
- * @LastEditTime: 2024-04-02 13:55:46
+ * @LastEditTime: 2024-04-02 14:55:15
  * @LastEditors: zhp
  * @Description:
 -->
@@ -649,13 +649,12 @@ export default {
           for (let i in this.funWsData.data.annealFanInfo) {
             index++,
               arr.push([
-                `
-          <span style="color:rgba(255,255,255,0.5)" >${index || ''}
+                `<span style="color:rgba(255,255,255,0.5)" >${index || ''}
             </span>`,
-                `<span style="color:rgba(255,255,255,0.5)" >${i || ''}
-            </span>`,
-                `<span style="color:rgba(255,255,255,0.5)">${i.name || ''}</span>`,
-                `<span style="color:rgba(255,255,255,0.5)"><div style="${i.run == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div>  ${i.run || ''}</span>`,
+                // `<span style="color:rgba(255,255,255,0.5)" >${i || ''}
+                // </span>`,
+                `<span style="color:rgba(255,255,255,0.5)">${i || ''}</span>`,
+                `<span style="color:rgba(255,255,255,0.5)"><div style="${this.funWsData.data.annealFanInfo[i] == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div>  ${this.funWsData.data.annealFanInfo[i] || ''}</span>`,
               ])
           }
           this.annealFunConfig.data = arr
@@ -669,10 +668,10 @@ export default {
           for (let i in this.funWsData.data.fanInfo) {
             index++,
               arr.push([
-                `<span style="color:rgba(255,255,255,0.5)" >${index || ''}</span>`,
-                `<span style="color:rgba(255,255,255,0.5)" >${i || ''}</span>`,
-                `<span style="color:rgba(255,255,255,0.5)">${i.name || ''}</span>`,
-                `<span style="color:rgba(255,255,255,0.5)"><div style="${i.run == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div>  ${i.run || ''}</span>`,
+                `<span style="color:rgba(255,255,255,0.5)" >${index || ''}
+            </span>`,
+                `<span style="color:rgba(255,255,255,0.5)">${i || ''}</span>`,
+                `<span style="color:rgba(255,255,255,0.5)"><div style="${this.funWsData.data.fanInfo[i] == '运行' ? 'box-shadow: 0px 0px 2px 1px #2760FF;width:6px;height:6px;border-radius: 50%;background-color: #2760FF;float:left;margin:10px 10px 0 0 ' : 'box-shadow: 0px 0px 2px 1px #FFBD02;width:6px;height:6px;border-radius: 50%;  background-color: #FFBD02;float:left;margin:10px 10px 0 0 '}"></div>  ${this.funWsData.data.fanInfo[i] || ''}</span>`,
               ])
           }
           this.funConfig.data = arr
-- 
2.45.2


From 1fd547893f32854d61d885927bfd351c1ed0fd5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Tue, 2 Apr 2024 15:01:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/OperationalOverview/coldBoard.vue | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue
index 97c184ea..f67eb995 100644
--- a/src/views/OperationalOverview/coldBoard.vue
+++ b/src/views/OperationalOverview/coldBoard.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-29 16:50:26
- * @LastEditTime: 2024-04-02 14:55:15
+ * @LastEditTime: 2024-04-02 15:01:40
  * @LastEditors: zhp
  * @Description:
 -->
@@ -40,7 +40,7 @@
               <top-radio-group />
             </div> -->
             <!-- 像下面这样表格里的limit值，也许可以用js动态计算出来 -->
-            <div class="myLegend">
+            <div v-if="coldDetData" class="myLegend">
               <div class="barLegend"></div>
               <h4 class="barText">产线产量</h4>
               <div class="barCircle"></div>
@@ -250,6 +250,7 @@ export default {
       funWs: undefined,
       SJGws: undefined,
       funWsData: {},
+      coldDetData:[],
       SJGWsData: {},
       cxNameList:[],
       cxDataList:[],
@@ -352,7 +353,7 @@ export default {
       let sumAreaList = []
       // let yieldList = []
       // this.cutTableDataList =
-      let coldDetData = [
+      this.coldDetData = [
         {
           "first": 0.8834,
           "lineName": "Y61",
@@ -404,7 +405,7 @@ export default {
           "yield": 0.9133
         }
       ]
-      coldDetData.forEach((ele, index) => {
+      this.coldDetData.forEach((ele, index) => {
         nameList.push(ele.lineName)
         topNameList.push('产线: ' + ele.lineName + '   ' + '总面积:' + ele.sumArea + '㎡')
         productList.push(ele.productArea)
@@ -596,6 +597,7 @@ export default {
           let wasteList = []
           let sumAreaList = []
           let yieldList = []
+          this.coldDetData = this.cutWsData.coldDetData
           // this.cutTableDataList =
           this.cutWsData.coldDetData.forEach((ele, index) => {
             nameList.push(ele.lineName)
-- 
2.45.2