设备打点

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

@@ -0,0 +1,10 @@
+import request from '@/utils/request'
+
+// 查询黑烟列表
+export function getdeviceList(query) {
+  return request({
+    url: 'gas/common/queryDeviceList',
+    method: 'get',
+    params: query
+  })
+}

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

@@ -4,7 +4,7 @@
 
    <div class="shipDiv" v-show="deviceShow">
       <div class="shipTitle">
-        <span style="float:left">{{deviceName}}</span>
+        <span style="float:left">{{deviceData.name}}</span>
         <i class="el-icon-close" style="font-size:9rem;margin-top:2rem;float:right" @click="deviceShow=false"></i>
       </div>
       <div style="padding—left:10rem" class="shipContent">
@@ -13,13 +13,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">{{deviceName}}</div>
+                <div class="grid-content bg-purple contentFont" style="float:left">{{deviceData.name}}</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">{{deviceData.monitorName}}</div>
               </el-col>
             </el-row>
             <el-row :gutter="3" style="margin-top:3rem">
@@ -27,13 +27,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">在线</div>
+                <div class="grid-content bg-purple contentFont" style="float:left">{{deviceData.status}}</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">{{deviceData.orgName}}</div>
               </el-col>
             </el-row>
              <el-row :gutter="3" style="margin-top:3rem">
@@ -41,13 +41,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">2021-09-30 10:12:11</div>
+                <div class="grid-content bg-purple contentFont" style="float:left">{{deviceData.updateTime}}</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">118.32,32.04</div>
+                <div class="grid-content bg-purple contentFont" style="float:left">{{deviceData.latilongti}}</div>
               </el-col>
             </el-row>
             <!-- <el-row :gutter="3" style="margin-top:3rem">
@@ -307,7 +307,7 @@ export default {
       map: null,
       shipName:'',
       deviceShow:false,
-      deviceName:'',
+      deviceData:'',
       checkList: [],
       drawLayer: null,
       draw: null,
@@ -372,7 +372,7 @@ export default {
                }else if(tadata.type == "device"){
                      that.deviceShow = true;
                      that.shipShow = false;
-                     that.deviceName = tadata.data
+                     that.deviceData = tadata.data
                }
               //  alert("我是点："+tadata.data)
              }

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

@@ -116,6 +116,7 @@
 <script>
 import scroll from "./scroll.vue"
 import {getDeviceType, getIllegalShipStatic, getStaticDevice,getSo2Time,queryIllegalInfoList} from "@/api/data/staticalData";
+import {getdeviceList} from "@/api/data/deviceData";
 import mapdiv from '../../../components/map/index.vue'
 
 export default {
@@ -241,35 +242,52 @@ export default {
     }
   }, mounted() {
     this.getMonthDate();
+    this.getdeviceList();
     //this.getStaticDevice();
     this.getIllegalShipStatic();
-    this.addDevicePoint();
-    this.addAisPoint();
-    this.addSo2Point();
+    // this.addDevicePoint();
+    // this.addAisPoint();
+    // this.addSo2Point();
     this.addshipPoint();
     //  console.log(111111111111)
     //  this.getChart();
   },
   methods: {
-    addDevicePoint(){
-          for(var index in this.heyDeviceData){
-                var obj = this.heyDeviceData[index]
-                this.$refs.mapv.addpoint(obj.locations,obj.name,'hy.png','device');
-
-          }
-    },
-     addAisPoint(){
-          for(var index in this.aisDeviceData){
-                var obj = this.aisDeviceData[index]
-                this.$refs.mapv.addpoint(obj.locations,obj.name,'ais.png','device');
-          }
-    },
-    addSo2Point(){
-          for(var index in this.so2DeviceData){
-                var obj = this.so2DeviceData[index]
-                this.$refs.mapv.addpoint(obj.locations,obj.name,'so2.png','device');
-          }
+    getdeviceList(){
+            getdeviceList().then(data =>{
+                      console.log(data);
+                      var deviceList = [];
+                       for (var key in data.data) {
+                              for(var index in data.data[key]){
+                                  var obj = data.data[key][index]
+                                  //  console.log(data.data[key][index].source);
+                                  //  deviceList.push(data.data[key][index]);
+                                   var locationArry = [[obj.latilongti]];
+                                   this.$refs.mapv.addpoint(locationArry,obj,obj.source+'.png','device');
+                              }
+                       }
+                      //  console.log(deviceList);
+            });
     },
+    // addDevicePoint(){
+    //       for(var index in this.heyDeviceData){
+    //             var obj = this.heyDeviceData[index]
+    //             this.$refs.mapv.addpoint(obj.locations,obj.name,'hy.png','device');
+
+    //       }
+    // },
+    //  addAisPoint(){
+    //       for(var index in this.aisDeviceData){
+    //             var obj = this.aisDeviceData[index]
+    //             this.$refs.mapv.addpoint(obj.locations,obj.name,'ais.png','device');
+    //       }
+    // },
+    // addSo2Point(){
+    //       for(var index in this.so2DeviceData){
+    //             var obj = this.so2DeviceData[index]
+    //             this.$refs.mapv.addpoint(obj.locations,obj.name,'so2.png','device');
+    //       }
+    // },
     addshipPoint(){
           for(var index in this.ship){
                 var obj = this.ship[index]