Bläddra i källkod

fix(safety-inspection):修复巡查任务相关功能问题

王杰 3 månader sedan
förälder
incheckning
042becbea3

+ 1 - 0
src/views/safety-inspection/addInspectionTask.vue

@@ -212,6 +212,7 @@ export default {
         this.stopPatrol()
         this.$globalEventBus.$emit('clickVideoInspectPlay', { visible: false, type: 'add' })
         endPatrol({ id: this.xcId, endTime: endTime, startTime: this.currentTime }).then((res) => {
+          console.log("巡查结束:"+res)
           this.$emit('refreshData')
         })
         return

+ 1 - 1
src/views/safety-inspection/index.vue

@@ -42,7 +42,7 @@ export default {
         })
     },
     refreshLeftList() {
-      this.$refs.inspRef.getSecurityPatrolList()
+      this.$refs.inspRef.getPatrolList()
     },
     // 添加初始点
     addInitialPoints() {

+ 11 - 4
src/views/safety-inspection/right.vue

@@ -150,15 +150,22 @@ export default {
     toXc(item) {
       this.currentTime = moment().format('YYYY-MM-DD HH:mm:ss')
       this.xcId = item.id
-      this.inspectionPoint = item.inspectionPoints
+      if (typeof item.inspectionPoint === 'string') {
+        this.inspectionPoint = JSON.parse(item.inspectionPoint)
+      } else {
+        // 如果已经是对象数组,则直接赋值
+        this.inspectionPoint = item.inspectionPoint
+      }
       this.taskInfo = JSON.parse(JSON.stringify(item))
       this.isPatrolling = true
       this.currentPatrolIndex = 0
       this.goToNextPatrolPoint()
       // 设置定时器,每20秒切换到下一个点
-      this.patrolInterval = setInterval(() => {
-        this.goToNextPatrolPoint()
-      }, 20000)
+      if (this.inspectionPoint) {
+        this.patrolInterval = setInterval(() => {
+            this.goToNextPatrolPoint()
+          }, 20000)
+      }
     },
     // 切换到下一个巡查点
     goToNextPatrolPoint() {