|
@@ -269,14 +269,12 @@ export default {
|
|
|
ship["course"] = ship.course == null ? '-' : ship.course;
|
|
|
// ship["monitorPointName"] = '-';
|
|
|
|
|
|
- var tt = [];
|
|
|
- var obj = ship;
|
|
|
- var img = 'zc.png'
|
|
|
- if (obj.type == 2) {
|
|
|
- img = 'xy.png'
|
|
|
- } else if (obj.type == 3) {
|
|
|
- img = 'wg.png'
|
|
|
+ for (var i in this.ship) {
|
|
|
+ var obj = this.ship[i];
|
|
|
+ obj["isc"] = "2";
|
|
|
}
|
|
|
+ var obj = ship;
|
|
|
+ obj["isc"] = "1";
|
|
|
var isin = false;
|
|
|
for (var i in this.ship) {
|
|
|
if (this.ship[i]["mmsi"] == obj["mmsi"]) {
|
|
@@ -456,6 +454,9 @@ export default {
|
|
|
} else if (obj.type == 3) {
|
|
|
img = 'wg.png'
|
|
|
}
|
|
|
+ if(obj["isc"] == "1"){
|
|
|
+ img = 'xz.png'
|
|
|
+ }
|
|
|
tt.push([obj.locations, obj, img, 'ship', ((obj.head == null ? 0 : parseFloat(obj.head)) - 90) * Math.PI / 180, 1]);
|
|
|
}
|
|
|
this.$refs.mapv.addpoints(tt, "ship");
|
|
@@ -894,6 +895,19 @@ export default {
|
|
|
]
|
|
|
};
|
|
|
myChart.setOption(option);
|
|
|
+ var that = this;
|
|
|
+ myChart.on('click', function(params){
|
|
|
+ if(params.name == "黑烟"){
|
|
|
+ that.$parent.showTable = 9;
|
|
|
+ }
|
|
|
+ if(params.name == "光谱"){
|
|
|
+ that.$parent.showTable = 10;
|
|
|
+ }
|
|
|
+ if(params.name == "嗅探"){
|
|
|
+ that.$parent.showTable = 11;
|
|
|
+ }
|
|
|
+
|
|
|
+ });
|
|
|
}
|
|
|
}
|
|
|
}
|