fix

ruoyi-ui/src/api/data/deviceData.js

@@ -33,4 +33,12 @@ export function queryShipData(query) {
         method: "get",
         params: query,
     });
-}
+}
+
+export function queryallShipData(query) {
+    return request({
+        url: "/gas/common/queryRdsShipList",
+        method: "get",
+        params: query,
+    });
+}

ruoyi-ui/src/components/TopNav/index.vue

@@ -91,11 +91,11 @@ export default {
       if (path.lastIndexOf("/") > 0) {
         const tmpPath = path.substring(1, path.length);
         activePath = "/" + tmpPath.substring(0, tmpPath.indexOf("/"));
-      } else if ("/index" == path || "" == path) {
+      } else if ("/home" == path || "" == path) {
         if (!this.isFrist) {
           this.isFrist = true;
         } else {
-          activePath = "index";
+          activePath = "home";
         }
       }
       var routes = this.activeRoutes(activePath);

ruoyi-ui/src/components/map/index.vue

@@ -466,7 +466,6 @@ export default {
             // alert("我是线：" + tadata.towerNumber)
           }
           if (tadata.sectionId == "point") {
-            console.log(tadata);
             if (tadata.type == "ship") {
               that.shipShow = true;
               that.deviceShow = false;

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

@@ -201,6 +201,7 @@ export default {
         {"name": "润扬大桥光谱1", "locations": [[119.367235, 32.209107]]},
         {"name": "润扬大桥光谱2", "locations": [[119.369724, 32.204459]]},
       ],
+      allship:[],
       ship: [
         {"name": "一号船", "mmsi": "s", "locations": [[118.639711, 31.98602]], 'type': 1, "head": 0, "lnglats": [[118.649711, 31.98602], [118.639711, 31.98602], [118.629711, 31.98602], [118.619711, 31.98602]]},
         // {"name": "二号船", "locations": [[118.639711, 31.96602]], 'type': 2,"head":60},
@@ -222,6 +223,10 @@ export default {
       that.getshipData();
     }, 120000);
 
+    setInterval(() => {
+      that.getallshipData();
+    }, 120000);
+
     this.getThresholdList();
     // this.addDevicePoint();
     // this.addAisPoint();
@@ -293,6 +298,25 @@ export default {
 
 
     },
+
+    getallshipData() {
+
+
+      queryallShipData().then(data => {
+        var shipdatalist = [];
+        for (var key in data.data) {
+          var ship = data.data[key];
+          ship["name"] = ship.shipname_cn;
+          ship["locations"] = [[ship.lng, ship.lat]];
+          ship["type"] = 1;
+          shipdatalist.push(ship);
+        }
+        this.allship = shipdatalist;
+        this.addshipPointall();
+      });
+
+
+    },
     // addDevicePoint(){
     //       for(var index in this.heyDeviceData){
     //             var obj = this.heyDeviceData[index]
@@ -324,6 +348,19 @@ export default {
         this.$refs.mapv.addpoint(obj.locations, obj, img, 'ship', ((obj.head == null ? 0 : parseFloat(obj.head)) - 90) * Math.PI / 180);
       }
     },
+
+    addshipPointall() {
+      for (var index in this.allship) {
+        var obj = this.allship[index]
+        var img = 'zc.png'
+        if (obj.type == 2) {
+          img = 'xy.png'
+        } else if (obj.type == 3) {
+          img = 'wg.png'
+        }
+        this.$refs.mapv.addpoint(obj.locations, obj, img, 'ship', ((obj.head == null ? 0 : parseFloat(obj.head)) - 90) * Math.PI / 180);
+      }
+    },
     getSo2Time() {
       console.log(111);
       getSo2Time(this.shipDate).then(data => {