瀏覽代碼

feat: 修复没有水位历史数据时,回放图表的水位使用成果里面的

hum 1 年之前
父節點
當前提交
0909229861

+ 15 - 11
ruoyi-ui/src/views/analysis/task/result/result.vue

@@ -143,10 +143,12 @@ export default {
         const waterLevelHistory = res.data?.records || [];
         const waterLevelHistory = res.data?.records || [];
         if (waterLevelHistory.length > 0) {
         if (waterLevelHistory.length > 0) {
           this.waterlevel = waterLevelHistory[waterLevelHistory.length - 1].avgWaterlevel;
           this.waterlevel = waterLevelHistory[waterLevelHistory.length - 1].avgWaterlevel;
-          this.initwaterlevel = this.waterlevel;
           this.waterlevelList = waterLevelHistory;
           this.waterlevelList = waterLevelHistory;
           this.waterLevelHistory = waterLevelHistory;
           this.waterLevelHistory = waterLevelHistory;
+        } else {
+          this.waterlevel = this.task.waterlevel;
         }
         }
+        this.initwaterlevel = this.waterlevel;
       })
       })
     },
     },
     loadCarLocation() {
     loadCarLocation() {
@@ -197,16 +199,18 @@ export default {
         })
         })
         this.carInfo = carInfo;
         this.carInfo = carInfo;
 
 
-        let waterlevel = this.waterLevelHistory[0];
-        this.waterLevelHistory.forEach((item) => {
-          if (item.createTime > time) {
-            return
-          }
-          if (!waterlevel.createTime || item.createTime > waterlevel.createTime) {
-            waterlevel = { ...item };
-          }
-        })
-        this.waterlevel = waterlevel.avgWaterlevel;
+        if (this.waterLevelHistory.length > 0) {
+          let waterlevel = this.waterLevelHistory[0];
+          this.waterLevelHistory.forEach((item) => {
+            if (item.createTime > time) {
+              return
+            }
+            if (!waterlevel.createTime || item.createTime > waterlevel.createTime) {
+              waterlevel = { ...item };
+            }
+          })
+          this.waterlevel = waterlevel.avgWaterlevel;
+        }
       }, 500)
       }, 500)
     },
     },
     stop() {
     stop() {

+ 1 - 1
ruoyi-ui/src/views/analysis/task/result/simulation.vue

@@ -94,7 +94,7 @@ export default {
       this.$refs.manual.open({ siteId: this.siteId });
       this.$refs.manual.open({ siteId: this.siteId });
     },
     },
     setOptions() {
     setOptions() {
-      if (!this.chart || !this.config || this.sections.length === 0 || this.positions.length === 0) {
+      if (!this.chart || !this.config || this.sections.length === 0) {
         return;
         return;
       }
       }