fix

ruoyi-ui/src/views/components/table/homeTable.vue

@@ -241,7 +241,7 @@ export default {
   }, mounted() {
     this.getMonthDate();
     this.getdeviceList();
-    //this.getStaticDevice();
+    this.getStaticDevice();
     this.getIllegalShipStatic();
     // this.addDevicePoint();
     // this.addAisPoint();

ruoyi-ui/src/views/components/table/liuTable.vue

@@ -219,7 +219,8 @@
       </el-table-column>
       <el-table-column
         prop="shipRegionType"
-        label="内河船/海船">
+        label="内河船/海船"
+        :formatter="shipTypeFormat">
       </el-table-column>
       <el-table-column
         prop="monitorPointName"
@@ -397,6 +398,10 @@ export default {
         this.orgOptions = data.data
       });
     },
+    // 内河船、海船转化
+    shipTypeFormat(row, column) {
+      return row.shipRegionType == 0 ? "内河船" : "海船"
+    },
     tabChange() {
       console.log(this.tableShow);
     },
@@ -424,11 +429,11 @@ export default {
 
 
       getLiuList(this.addDateRange(this.queryParams, dateRange)).then(response => {
-        for (var i in response.rows) {
-          response.rows[i].shipRegionType = '内河船'
-          response.rows[i].destination = '无'
-          response.rows[i].berthName = '无'
-        }
+        // for (var i in response.rows) {
+        //   response.rows[i].shipRegionType = '内河船'
+        // response.rows[i].destination = '无'
+        // response.rows[i].berthName = '无'
+        // }
         this.tableData = response.rows;
         this.total = response.total;
         this.loading = false;

ruoyi-ui/src/views/components/table/xtTable.vue

@@ -130,7 +130,8 @@
       </el-table-column>
       <el-table-column
         prop="aisShipType"
-        label="内河船/海船">
+        label="内河船/海船"
+        :formatter="shipTypeFormat">
       </el-table-column>
       <el-table-column
         prop="monitorPointName"
@@ -282,6 +283,10 @@ export default {
         console.log(response);
         this.loading = false;
       });
+    },
+    // 内河船、海船转化
+    shipTypeFormat(row, column) {
+      return row.shipRegionType == 0 ? "内河船" : "海船"
     }
   }
 }