From 522910e4329cbffebb214a75b0e6fdb338140121 Mon Sep 17 00:00:00 2001
From: gtz <535262213@qq.com>
Date: Thu, 4 Jan 2024 08:27:12 +0800
Subject: [PATCH] 'update_coldboard'

---
 .env.dev                                    |  4 +-
 src/views/OperationalOverview/coldBoard.vue | 54 ++++++++++-----------
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/.env.dev b/.env.dev
index 44f8ea48..5d905f0a 100644
--- a/.env.dev
+++ b/.env.dev
@@ -16,7 +16,7 @@ VUE_APP_TITLE = MES系统
 
 # VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 
-# VUE_APP_BASE_API = 'http://10.70.2.2:8080'
+VUE_APP_BASE_API = 'http://10.70.2.2:8080'
 
 # VUE_APP_BASE_API = 'http://192.168.4.173:48080'
 # VUE_APP_BASE_API = 'http://192.168.2.173:48080'
@@ -28,7 +28,7 @@ VUE_APP_TITLE = MES系统
 # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
 
 
-VUE_APP_BASE_API = 'http://100.64.0.23:48082'
+# VUE_APP_BASE_API = 'http://100.64.0.23:48082'
 # 积木报表指向地址
 VUE_APP_JIMU_API = 'http://10.70.2.22:8080'
 
diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue
index 3a337e53..9449653c 100644
--- a/src/views/OperationalOverview/coldBoard.vue
+++ b/src/views/OperationalOverview/coldBoard.vue
@@ -518,32 +518,8 @@ export default {
           })
         }
         this.annealFunList = arr
-        this.total3 = Math.ceil(arr.length / 9)
-        if ( this.page3 > this.total3) {
-          this.page3 = 1
-        }
-        if (!this.firstContent3) {
-          setInterval(pageFun3 = () => {
-            if (this.page3 >= this.total3) {
-              this.page3 = 1
-            } else {
-              this.page3 += 1
-            }
-          }, 30000)
-          this.firstContent3 = true
-        }
-      }
-      if (this.funWsData.type === 'FanInfo') {
-        let arr = []
-        for (let i in this.funWsData.data.fanInfo) {
-          arr.push({
-            equipmentName: i,
-            status: this.funWsData.data.fanInfo[i]
-          })
-        }
-        this.funList = arr
         this.total4 = Math.ceil(arr.length / 9)
-        if ( this.page4 > this.total4) {
+        if ( this.page4 >= this.total4) {
           this.page4 = 1
         }
         if (!this.firstContent4) {
@@ -557,6 +533,30 @@ export default {
           this.firstContent4 = true
         }
       }
+      if (this.funWsData.type === 'FanInfo') {
+        let arr = []
+        for (let i in this.funWsData.data.fanInfo) {
+          arr.push({
+            equipmentName: i,
+            status: this.funWsData.data.fanInfo[i]
+          })
+        }
+        this.funList = arr
+        this.total3 = Math.ceil(arr.length / 9)
+        if ( this.page3 >= this.total3) {
+          this.page3 = 1
+        }
+        if (!this.firstContent3) {
+          setInterval(pageFun3 = () => {
+            if (this.page3 >= this.total3) {
+              this.page3 = 1
+            } else {
+              this.page3 += 1
+            }
+          }, 30000)
+          this.firstContent3 = true
+        }
+      }
     },
     cutWebsocketOnOpen() {
       console.log('socket连接成功')
@@ -585,7 +585,7 @@ export default {
           // }
         });
         this.total1 = Math.ceil(this.cutWsData?.productHourData?.length / 9)
-        if ( this.page1 > this.total1) {
+        if ( this.page1 >= this.total1) {
           this.page1 = 1
         }
         if (!this.firstContent1) {
@@ -648,7 +648,7 @@ export default {
         });
         
         this.total2 = Math.ceil(this.SJGWsData?.detData?.length / 9)
-        if ( this.page2 > this.total2) {
+        if ( this.page2 >= this.total2) {
           this.page2 = 1
         }
         if (!this.firstContent2) {