From eff13d50cacefea45cb589ca32a272bb61d52a89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=94=A1=E7=8E=B2?=
 <8702040+cai-ling@user.noreply.gitee.com>
Date: Wed, 25 Dec 2024 09:12:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=B7=E6=96=B0=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Setup.vue          |  2 +-
 src/pages/modules/index1.vue | 31 +++++++++++++++++++------------
 src/pages/modules/index2.vue | 23 ++++++++++++++---------
 3 files changed, 34 insertions(+), 22 deletions(-)

diff --git a/src/pages/Setup.vue b/src/pages/Setup.vue
index 1ddd043..ab928cf 100644
--- a/src/pages/Setup.vue
+++ b/src/pages/Setup.vue
@@ -52,7 +52,7 @@ export default {
   },
   methods: {
     _config () {
-      if (this.setTime <= 2 || this.setJxtTime <= 2) {
+      if (this.setTime < 1 || this.setJxtTime < 1) {
         this.$message({
           message: '刷新时间设置过短',
           type: 'warning'
diff --git a/src/pages/modules/index1.vue b/src/pages/modules/index1.vue
index 33025f3..33d3f04 100644
--- a/src/pages/modules/index1.vue
+++ b/src/pages/modules/index1.vue
@@ -152,6 +152,7 @@
 
 <script>
 import THeader from '@components/header.vue'
+// import { queryPickingPoint } from '@js/mork2.js'
 import { queryPickingPoint, pickingInfo, updateMaterialInfo } from '@js/getData2.js'
 export default {
   components: {
@@ -160,7 +161,7 @@ export default {
   data () {
     return {
       interTime: this.$store.getters.setJxtTime,
-      timer: null,
+      intervalId: null,
       options: [],
       value: '',
       itemData: []
@@ -170,16 +171,21 @@ export default {
     this._queryPickingPoint()
   },
   beforeDestroy () {
-    if (this.timer !== null) {
-      clearInterval(this.timer)
+    if (this.intervalId !== null) {
+      clearTimeout(this.intervalId)
+      this.intervalId = null
     }
   },
   methods: {
-    refresh () {
-      this._pickingInfo()
-      this.timer = setInterval(() => {
-        this._pickingInfo()
-      }, this.interTime)
+    timerFun (f, time) {
+      let _this = this
+      return function backFun () {
+        clearTimeout(_this.intervalId)
+        _this.intervalId = setTimeout(function () {
+          f()
+          backFun()
+        }, time)
+      }
     },
     async _pickingInfo () {
       let res = await pickingInfo(this.value)
@@ -190,15 +196,16 @@ export default {
       this.options = [...res]
       if (res.length > 0) {
         this.value = res[0].code
-        this.refresh()
+        this.timerFun(this._pickingInfo, this.interTime)()
       }
     },
     change (e) {
       if (e) {
-        if (this.timer !== null) {
-          clearInterval(this.timer)
+        if (this.intervalId !== null) {
+          clearTimeout(this.intervalId)
+          this.intervalId = null
         }
-        this.refresh()
+        this.timerFun(this._pickingInfo, this.interTime)()
       }
     },
     changeWeight (event) {
diff --git a/src/pages/modules/index2.vue b/src/pages/modules/index2.vue
index b0abc33..815baac 100644
--- a/src/pages/modules/index2.vue
+++ b/src/pages/modules/index2.vue
@@ -230,7 +230,7 @@ export default {
   data () {
     return {
       interTime: this.$store.getters.setTime,
-      timer: null,
+      intervalId: null,
       materList: [],
       historyList: [],
       myChart1: null,
@@ -250,7 +250,7 @@ export default {
     }
   },
   created () {
-    this.refresh()
+    this.timerFun(this._synthesizeInfo, this.interTime)()
   },
   mounted () {
     this.myChart1 = this.$echarts.init(this.$refs.echartsRef1)
@@ -259,8 +259,9 @@ export default {
     this.myChart4 = this.$echarts.init(this.$refs.echartsRef4)
   },
   destroyed () {
-    if (this.timer !== null) {
-      clearInterval(this.timer)
+    if (this.intervalId !== null) {
+      clearTimeout(this.intervalId)
+      this.intervalId = null
     }
     if (this.myChart1 !== null) {
       this.myChart1.dispose()
@@ -280,11 +281,15 @@ export default {
     }
   },
   methods: {
-    refresh () {
-      this._synthesizeInfo()
-      this.timer = setInterval(() => {
-        this._synthesizeInfo()
-      }, this.interTime)
+    timerFun (f, time) {
+      let _this = this
+      return function backFun () {
+        clearTimeout(_this.intervalId)
+        _this.intervalId = setTimeout(function () {
+          f()
+          backFun()
+        }, time)
+      }
     },
     async _synthesizeInfo () {
       let res = await synthesizeInfo()