ruoyi-ui/src/views/analysis/task/index.vue

@@ -115,10 +115,6 @@ export default {
     handleQuery() {
       this.getList();
     },
-    handleSiteChange(siteId) {
-      this.siteId = siteId;
-      this.getList();
-    },
     resetQuery() {
       this.queryParams = {
         page: 1,

ruoyi-ui/src/views/analysis/task/realtime/realtime.vue

@@ -48,7 +48,6 @@ import {
   listMeasureLine,
   listWaterLevel,
   getPointConfigByPlanid,
-  getAchievement,
 } from "@/api/analysis/achievement";
 
 export default {
@@ -102,6 +101,13 @@ export default {
     },
     loadSiteRealTime() {
       getSiteRealTime(this.siteId).then((res) => {
+        if (res.data && res.data.siteStatus === '0') {
+          this.$notify.success({
+            title: '提示',
+            message: '本次测流任务已完成'
+          });
+          this.$emit('refresh');
+        }
         this.siteRealTime = res.data || {};
       })
     },
@@ -129,14 +135,6 @@ export default {
         this.positions = JSON.parse(res.data.positions || '[]');
       })
     },
-    refreshTask() {
-      getAchievement(this.task.taskid).then((res) => {
-        if (res.data.status === 2) {
-          this.$message.success('本次测流已完成');
-          this.$emit('refresh');
-        }
-      })
-    }
   },
   mounted() {
     this.loadPositions();
@@ -150,7 +148,6 @@ export default {
     this.timer4 = setInterval(() => this.loadSiteRealTime(), 5e3)
     this.loadWaterLevel();
     this.timer5 = setInterval(() => this.loadWaterLevel(), 5e3)
-    this.timer6 = setInterval(() => this.refreshTask(), 5e3)
   },
   beforeDestroy() {
     if (this.timer1) clearTimeout(this.timer1);
@@ -158,7 +155,6 @@ export default {
     if (this.timer3) clearTimeout(this.timer3);
     if (this.timer4) clearTimeout(this.timer4);
     if (this.timer5) clearTimeout(this.timer5);
-    if (this.timer6) clearTimeout(this.timer6);
   }
 }
 </script>

ruoyi-ui/src/views/analysis/task/realtime/site.vue

@@ -17,6 +17,11 @@
         <div class="item-label">站点状态：</div>
         <div class="item-value">{{['空闲', '测流中'][siteRealTime.siteStatus]}}</div>
       </div>
+      <div class="item">
+        <div class="item-icon"></div>
+        <div class="item-label">设备状态：</div>
+        <div class="item-value">{{['离线', '在线'][siteRealTime.deviceStatus]}}</div>
+      </div>
     </div>
   </div>
 </template>

ruoyi-ui/src/views/analysis/task/result/site.vue

@@ -17,6 +17,11 @@
         <div class="item-label">站点状态：</div>
         <div class="item-value">{{['空闲', '测流中'][siteRealTime.siteStatus]}}</div>
       </div>
+      <div class="item">
+        <div class="item-icon"></div>
+        <div class="item-label">设备状态：</div>
+        <div class="item-value">{{['离线', '在线'][siteRealTime.deviceStatus]}}</div>
+      </div>
     </div>
   </div>
 </template>

ruoyi-ui/src/views/analysis/task/waiting/simulation.vue

@@ -68,14 +68,6 @@ export default {
     }
   },
   methods: {
-    pause() {
-      this.$modal.confirm('是否确认暂停当前任务？').then(() => {
-        return taskAction(this.siteId, 1);
-      }).then(() => {
-        this.$emit('refresh');
-        this.$modal.msgSuccess("暂停成功");
-      }).catch(() => {});
-    },
     play() {
       this.$modal.confirm('是否确认重启当前任务？').then(() => {
         return taskAction(this.siteId, 2);
@@ -347,7 +339,11 @@ export default {
       return { sections, bar1X, bar2X };
     },
     handleManualMeasure() {
-      this.$refs.manual.open({ siteId: this.siteId });
+      if(this.siteRealTime.deviceStatus === 0) {
+        this.$message.error('设备已离线');
+      } else {
+        this.$refs.manual.open({ siteId: this.siteId });
+      }
     },
   }
 }

ruoyi-ui/src/views/analysis/task/waiting/site.vue

@@ -17,6 +17,11 @@
         <div class="item-label">站点状态：</div>
         <div class="item-value">{{['空闲', '测流中'][siteRealTime.siteStatus]}}</div>
       </div>
+      <div class="item">
+        <div class="item-icon"></div>
+        <div class="item-label">设备状态：</div>
+        <div class="item-value">{{['离线', '在线'][siteRealTime.deviceStatus]}}</div>
+      </div>
     </div>
   </div>
 </template>

ruoyi-ui/src/views/analysis/task/waiting/waiting.vue

@@ -101,6 +101,13 @@ export default {
     },
     loadSiteRealTime() {
       getSiteRealTime(this.siteId).then((res) => {
+        if (res.data && res.data.siteStatus === '1') {
+          this.$notify.info({
+            title: '提示',
+            message: '有新的测流任务'
+          });
+          this.$emit('refresh');
+        }
         this.siteRealTime = res.data || {};
       })
     },