From 910bf93c12579e21cedf6111bddb8c8380177781 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: Mon, 21 Oct 2024 16:03:57 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=AC=E8=BF=90=E8=B5=B7=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/config/getData.js                       |  1 +
 src/config/mork.js                          | 72 +++----------------
 src/pages/modules/taskmanage/CarryPoint.vue | 79 ++++++++++++---------
 3 files changed, 54 insertions(+), 98 deletions(-)

diff --git a/src/config/getData.js b/src/config/getData.js
index 85964af..99b6146 100644
--- a/src/config/getData.js
+++ b/src/config/getData.js
@@ -24,6 +24,7 @@ export const queryTaskList = () => post('api/task/queryTaskList', {})
 export const deleteTask = (taskNum) => post('api/task/deleteTask', {
   task_num: taskNum
 })
+export const querySingleTask = () => post('api/task/querySingleTask', {})
 export const deleteSingleTask = (taskNum) => post('api/task/deleteSingleTask', {
   task_num: taskNum
 })
diff --git a/src/config/mork.js b/src/config/mork.js
index 0b904f3..fc35fec 100644
--- a/src/config/mork.js
+++ b/src/config/mork.js
@@ -6,6 +6,14 @@ export const queryTaskList = () => {
     }
     return res
 }
+export const querySingleTask = () => {
+    let res = {
+        code: '1',
+        result: {'next_point_code': '4'},
+        desc: 'ok'
+    }
+    return res
+}
 export const queryPoint = () => {
     let res = {
         code: '1',
@@ -51,70 +59,6 @@ export const queryPoint = () => {
         {
             point_code: '10',
             code_name: 'A-ZD101'
-        },
-        {
-            point_code: '11',
-            code_name: 'A-ZD101'
-        },
-        {
-            point_code: '12',
-            code_name: 'A-ZD101'
-        },
-        {
-            point_code: '13',
-            code_name: 'A-ZD101'
-        },
-        {
-            point_code: '14',
-            code_name: 'A-ZD101'
-        },
-        {
-            point_code: '15',
-            code_name: 'A-ZD101'
-        },
-        {
-            point_code: '16',
-            code_name: 'A-ZD101'
-        },
-        {
-            point_code: '17',
-            code_name: 'A-ZD101'
-        },
-        {
-            point_code: '18',
-            code_name: 'A-ZD101'
-        },
-        {
-            point_code: '19',
-            code_name: 'A-ZD101'
-        },
-        {
-            point_code: '20',
-            code_name: 'A-ZD101'
-        },
-        {
-            point_code: '21',
-            code_name: 'A-ZD101'
-        },
-        {
-            point_code: '22',
-            code_name: 'A-ZD101'
-        },
-        {
-            point_code: '23',
-            code_name: 'A-ZD101'
-        },
-        {
-            point_code: '24',
-            code_name: 'A-ZD101'
-        },
-        {
-            point_code: '25',
-            code_name: 'A-ZD101'
-        },
-        {
-            point_code: '26',
-            code_name: '二楼中间层休息点位与茶水间的充电桩交叉点1二楼中间层休息点位与茶水间的充电桩交叉点1'
         }
         ]
     }
diff --git a/src/pages/modules/taskmanage/CarryPoint.vue b/src/pages/modules/taskmanage/CarryPoint.vue
index 12dbf42..b2ee4d7 100644
--- a/src/pages/modules/taskmanage/CarryPoint.vue
+++ b/src/pages/modules/taskmanage/CarryPoint.vue
@@ -25,12 +25,14 @@
 </template>
 
 <script>
-// import {queryTaskList, queryPoint} from '@/config/mork.js'
-import {queryTaskList, queryPoint, confirmPoint, deleteSingleTask} from '@/config/getData.js'
+// import {queryPoint, querySingleTask} from '@/config/mork.js'
+import {queryPoint, querySingleTask, confirmPoint, deleteSingleTask} from '@/config/getData.js'
 export default {
   name: 'CarryPoint',
   data () {
     return {
+      interTime: this.$store.getters.setTime,
+      timer: null,
       type: '',
       title: '',
       disabled: false,
@@ -42,32 +44,42 @@ export default {
   created () {
     this.initData()
   },
+  beforeDestroy () {
+    if (this.timer) {
+      clearInterval(this.timer)
+    }
+  },
   methods: {
+    refresh () {
+      this._querySingleTask()
+      this.timer = setInterval(() => {
+        this._querySingleTask()
+      }, this.interTime)
+    },
     async initData () {
       let res = await queryPoint()
       if (res.code === '1') {
+        this.pkId = ''
+        this.active = false
         this.dataList = [...res.result]
         this.dataList.map(el => {
           this.$set(el, 'checked', false)
         })
-        this._queryTaskList()
+        this.refresh()
       } else {
         this.toast(res.desc)
       }
     },
-    async _queryTaskList () {
-      let res = await queryTaskList()
-      if (res.code === '1') {
-        let arr = this.dataList.filter(i => res.result.some(j => j.next_point_code === i.point_code && j.task_status === '01'))
-        if (arr.length > 0) {
-          this.pkId = arr[0].point_code
-          this.active = true
-          this.dataList.map(el => {
-            el.checked = true
-          })
-        }
-      } else {
-        this.toast(res.desc)
+    async _querySingleTask () {
+      let res = await querySingleTask()
+      if (res.code === '1' && res.hasOwnProperty('result')) {
+        this.dataList.map(el => {
+          if (el.point_code === res.result.next_point_code) {
+            this.pkId = el.point_code
+            this.active = true
+          }
+          el.checked = true
+        })
       }
     },
     async _deleteSingleTask () {
@@ -78,16 +90,15 @@ export default {
       }
       try {
         let res = await deleteSingleTask(this.pkId)
-        if (res.code === '1') {
-          this.toast(res.desc)
-          this.pkId = ''
-          this.active = false
-          setTimeout(() => {
-            this.initData()
-          }, 1000)
-        } else {
-          this.toast(res.desc)
+        if (this.timer) {
+          clearInterval(this.timer)
         }
+        this.toast(res.desc)
+        this.pkId = ''
+        this.active = false
+        setTimeout(() => {
+          this.refresh()
+        }, 1000)
         this.disabled = false
       } catch (e) {
         this.disabled = false
@@ -101,16 +112,15 @@ export default {
       }
       try {
         let res = await confirmPoint(this.pkId, type)
-        if (res.code === '1') {
-          this.toast(res.desc)
-          this.pkId = ''
-          this.active = false
-          setTimeout(() => {
-            this.initData()
-          }, 1000)
-        } else {
-          this.toast(res.desc)
+        if (this.timer) {
+          clearInterval(this.timer)
         }
+        this.toast(res.desc)
+        this.pkId = ''
+        this.active = false
+        setTimeout(() => {
+          this.refresh()
+        }, 1000)
         this.disabled = false
       } catch (e) {
         this.disabled = false
@@ -132,6 +142,7 @@ export default {
   display flex
   flex-wrap wrap
   justify-content flex-start
+  align-content flex-start
   height calc(100% - 122px)
   overflow-y auto
 .buttons_wrapper