|
@@ -119,7 +119,7 @@
|
|
|
|
|
|
<script>
|
|
|
import scroll from "./scroll.vue"
|
|
|
-import {getDeviceType, getIllegalShipStatic, getSo2Time, getStaticDevice} from "@/api/data/staticalData";
|
|
|
+import {getDeviceType, getIllegalShipStatic, getSo2Time, getStaticDevice,queryShipData} from "@/api/data/staticalData";
|
|
|
import {getdeviceList} from "@/api/data/deviceData";
|
|
|
import mapdiv from '../../../components/map/index.vue'
|
|
|
|
|
@@ -247,10 +247,11 @@ export default {
|
|
|
this.getdeviceList();
|
|
|
this.getStaticDevice();
|
|
|
this.getIllegalShipStatic();
|
|
|
+ this.getshipData();
|
|
|
// this.addDevicePoint();
|
|
|
// this.addAisPoint();
|
|
|
// this.addSo2Point();
|
|
|
- this.addshipPoint();
|
|
|
+ // this.addshipPoint();
|
|
|
// console.log(111111111111)
|
|
|
// this.getChart();
|
|
|
},
|
|
@@ -287,6 +288,23 @@ export default {
|
|
|
// console.log(deviceList);
|
|
|
});
|
|
|
},
|
|
|
+ getshipData(){
|
|
|
+
|
|
|
+ queryShipData().then(data => {
|
|
|
+ var shipdatalist = [];
|
|
|
+ for (var key in data.data) {
|
|
|
+ var ship = data.data[key];
|
|
|
+ ship["name"] = ship.shipName;
|
|
|
+ ship["locations"] = [[ship.lat,ship.lng]];
|
|
|
+ ship["type"] = ship.illegalStatus;
|
|
|
+ shipdatalist.push(ship);
|
|
|
+ }
|
|
|
+ this.ship = shipdatalist;
|
|
|
+ this.addshipPoint();
|
|
|
+ });
|
|
|
+
|
|
|
+
|
|
|
+ },
|
|
|
// addDevicePoint(){
|
|
|
// for(var index in this.heyDeviceData){
|
|
|
// var obj = this.heyDeviceData[index]
|