From 88272e512ed2f4feb174167a9d49b340f5243e9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Tue, 26 Mar 2024 18:00:49 +0800
Subject: [PATCH] =?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       | 8 ++++----
 src/views/OperationalOverview/processingBoard.vue | 4 ++--
 src/views/report/glass/day.vue                    | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue
index 167e68c8..57703754 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-03-26 16:30:12
+ * @LastEditTime: 2024-03-26 18:00:34
  * @LastEditors: zhp
  * @Description:
 -->
@@ -381,12 +381,12 @@ export default {
           })
           this.$refs['ISRAChart'].updateChart(chartData)
         } else if (this.SJGWsData.type === 'equipment') {
-          this.realEqList = this.SJGWsData.detData.map((ele, index) => [
+          this.realEqList = this.SJGWsData.detData.map((item, index) => [
             // console.log(item)
             `<span style="color:rgba(255,255,255,0.5)" >${index + 1 || ''}
             </span>`,
-            `<span style="color:rgba(255,255,255,0.5)">${ele.name || ''}</span>`,
-            `<span style="color:rgba(255,255,255,0.5)">${ele.run || ''}</span>`,
+            `<span style="color:rgba(255,255,255,0.5)">${item.name || ''}</span>`,
+            `<span style="color:rgba(255,255,255,0.5)">${item.run || ''}</span>`,
           ])
         }
         this.realEqConfig.data = this.realEqList
diff --git a/src/views/OperationalOverview/processingBoard.vue b/src/views/OperationalOverview/processingBoard.vue
index 656f274b..69629afe 100644
--- a/src/views/OperationalOverview/processingBoard.vue
+++ b/src/views/OperationalOverview/processingBoard.vue
@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2021-07-19 15:18:30
  * @LastEditors: zhp
- * @LastEditTime: 2024-03-26 15:43:27
+ * @LastEditTime: 2024-03-26 17:57:44
  * @Description:
 -->
 <template>
@@ -448,7 +448,7 @@ export default {
         // console.log('22222', this.wsData.data)
         if (this.SJGWsData.type === 'order') {
           this.orderList = this.SJGWsData.detData.map((ele, index) => {
-            if (ele.progressRate != 1) {
+            if (ele.progressRate && ele.progressRate != 1) {
               return {
                 id: ele.id,
                 name: ele.name,
diff --git a/src/views/report/glass/day.vue b/src/views/report/glass/day.vue
index 76eaa955..b6c68cc1 100644
--- a/src/views/report/glass/day.vue
+++ b/src/views/report/glass/day.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-24 15:15:24
- * @LastEditTime: 2024-03-26 09:34:12
+ * @LastEditTime: 2024-03-26 17:56:11
  * @LastEditors: zhp
  * @Description:
 -->
@@ -187,8 +187,8 @@ export default {
         this.endTimeStamp = this.format(val.setHours(7, 0, 0)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
         this.startTimeStamp  = this.format(val.setHours(7, 0, 1) - 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
         // console.log(this.listQuery.reportTime);
-        this.listQuery.reportTime[1] = this.format(val.setHours(7, 0, 1)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
-        this.listQuery.reportTime[0] = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
+        this.listQuery.reportTime[0] = this.format(val.setHours(7, 0, 1)) //+ ' 00:00:00' //new Date(this.startTimeStamp + ' 00:00:00').getTime() / 1000
+        this.listQuery.reportTime[1] = this.format(val.setHours(7, 0, 0) + 24 * 60 * 60 * 1000) //+ ' 23:59:59' //new Date(this.endTimeStamp + ' 23:59:59').getTime() / 1000
         console.log(this.listQuery.reportTime);
 			} else {
 					this.listQuery.reportTime = []
-- 
2.24.3