fix

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

@@ -163,7 +163,7 @@
 
     <div class="shipDiv" v-show="shipShow">
       <div class="shipTitle">
-        <span style="float:left">{{ shipName }}</span>
+        <span style="float:left">{{ shipName.shipName }}</span>
         <i class="el-icon-close" style="font-size:9rem;margin-top:2rem;float:right" @click="shipShow=false"></i>
       </div>
       <div style="padding—left:10rem" class="shipContent">
@@ -174,13 +174,13 @@
                 <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">MMSI:</div>
               </el-col>
               <el-col :span="8">
-                <div class="grid-content bg-purple contentFont" style="float:left">3202342354</div>
+                <div class="grid-content bg-purple contentFont" style="float:left">{{ shipName.mmsi }}</div>
               </el-col>
               <el-col :span="4">
                 <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">监测点:</div>
               </el-col>
               <el-col :span="8">
-                <div class="grid-content bg-purple contentFont" style="float:left">南京三桥</div>
+                <div class="grid-content bg-purple contentFont" style="float:left">{{shipName.monitorPointName}}</div>
               </el-col>
             </el-row>
             <el-row :gutter="3" style="margin-top:3rem">
@@ -188,13 +188,13 @@
                 <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">经度:</div>
               </el-col>
               <el-col :span="8">
-                <div class="grid-content bg-purple contentFont" style="float:left">182.78</div>
+                <div class="grid-content bg-purple contentFont" style="float:left">{{shipName.lng}}</div>
               </el-col>
               <el-col :span="4">
                 <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">纬度:</div>
               </el-col>
               <el-col :span="8">
-                <div class="grid-content bg-purple contentFont" style="float:left">32.04</div>
+                <div class="grid-content bg-purple contentFont" style="float:left">{{shipName.lat}}</div>
               </el-col>
             </el-row>
             <el-row :gutter="3" style="margin-top:3rem">
@@ -202,27 +202,27 @@
                 <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">对地航速:</div>
               </el-col>
               <el-col :span="8">
-                <div class="grid-content bg-purple contentFont" style="float:left">20 km/h</div>
+                <div class="grid-content bg-purple contentFont" style="float:left">{{shipName.speed}}</div>
               </el-col>
               <el-col :span="4">
-                <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">对地航向:</div>
+                <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">实际航向:</div>
               </el-col>
               <el-col :span="8">
-                <div class="grid-content bg-purple contentFont" style="float:left">东南</div>
+                <div class="grid-content bg-purple contentFont" style="float:left">{{shipName.head}}</div>
               </el-col>
             </el-row>
             <el-row :gutter="3" style="margin-top:3rem">
               <el-col :span="4">
-                <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">风向:</div>
+                <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">地面航线:</div>
               </el-col>
               <el-col :span="8">
-                <div class="grid-content bg-purple contentFont" style="float:left">北</div>
+                <div class="grid-content bg-purple contentFont" style="float:left">{{shipName.course}}</div>
               </el-col>
               <el-col :span="4">
-                <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">风速:</div>
+                <div class="grid-content bg-purple contentFont" style="float:right;color:#959595">位置接收时间:</div>
               </el-col>
               <el-col :span="8">
-                <div class="grid-content bg-purple contentFont" style="float:left">3 m/s</div>
+                <div class="grid-content bg-purple contentFont" style="float:left">{{shipName.receive}}</div>
               </el-col>
             </el-row>
             <el-button style="margin-top:5rem;margin-left:10rem;background-color:#0d25a5;color:white;font-size:7rem" icon="el-icon-location-information">历史轨迹</el-button>
@@ -337,12 +337,12 @@
       <br/>
       <div style="margin-top:8rem">
         <div style="float:left;margin-left:5rem"><img src="../../assets/images/icon/xy.png"></img></div>
-        <div style="float:left;margin-left:8rem"><span class="line_font">硫超标嫌疑船舶</span></div>
+        <div style="float:left;margin-left:8rem"><span class="line_font">嫌疑船舶</span></div>
       </div>
       <br/>
       <div style="margin-top:8rem">
         <div style="float:left;margin-left:5rem"><img src="../../assets/images/icon/wg.png"></img></div>
-        <div style="float:left;margin-left:8rem"><span class="line_font">黑烟嫌疑船舶</span></div>
+        <div style="float:left;margin-left:8rem"><span class="line_font">违规船舶</span></div>
       </div>
       <!-- <div style="margin-top:75rem"><div></div><span class="line_font">支路</span></div> -->
     </div>
@@ -419,6 +419,7 @@ export default {
       addrlist: [{name: "南京四桥", location: [1, 1]}],
       caddr: "南京四桥",
       shipShow: false,
+      shipdata:{},
     };
   },
   mounted() {
@@ -447,7 +448,8 @@ export default {
             if (tadata.type == "ship") {
               that.shipShow = true;
               that.deviceShow = false;
-              that.shipName = tadata.data
+              that.shipName = tadata.data;
+
             } else if (tadata.type == "device") {
               that.deviceShow = true;
               that.shipShow = false;
@@ -513,7 +515,9 @@ export default {
       var lo = that.transpoints(list[0].location, 0)[0];
       mapv.getView().setCenter(lo);
     },
+    addshipData(list){
 
+    },
     handleClick(tab, event) {
       console.log(tab, event);
     },

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

@@ -333,7 +333,7 @@ export default {
         } else if (obj.type == 3) {
           img = 'wg.png'
         }
-        this.$refs.mapv.addpoint(obj.locations, obj.name, img, 'ship');
+        this.$refs.mapv.addpoint(obj.locations, obj, img, 'ship');
       }
     },
     getSo2Time() {