|
@@ -172,7 +172,7 @@ import {
|
|
|
getRegionalFlag
|
|
|
} from '@/api/monitor'
|
|
|
import { treeselect } from '@/api/system/dept'
|
|
|
-import supermap from '@/components/supermap' //超图
|
|
|
+import supermap from '@/components/supermap-2.5d' //超图
|
|
|
import vheader from '@/components/v-header.vue' //一体化共用头部
|
|
|
import vBottomMenu from '@/components/vBottomMenu.vue' //一体化公共底部菜单
|
|
|
import eventLocation from '@/components/eventLocation.vue' //事件定位弹窗
|
|
@@ -424,14 +424,12 @@ export default {
|
|
|
markersList.push(markersMap);
|
|
|
}
|
|
|
setTimeout(() => {
|
|
|
- that.$refs.supermap.clearM(false);
|
|
|
- that.$refs.supermap.clearM(true);
|
|
|
+ that.$refs.supermap.clearM();
|
|
|
that.$refs.supermap.setMarkers(markersList);
|
|
|
}, 2000);
|
|
|
} else {
|
|
|
setTimeout(() => {
|
|
|
- that.$refs.supermap.clearM(false);
|
|
|
- that.$refs.supermap.clearM(true);
|
|
|
+ that.$refs.supermap.clearM();
|
|
|
}, 2000);
|
|
|
}
|
|
|
})
|
|
@@ -488,14 +486,12 @@ export default {
|
|
|
markersList.push(markersMap);
|
|
|
}
|
|
|
setTimeout(() => {
|
|
|
- that.$refs.supermap.clearM(false);
|
|
|
- that.$refs.supermap.clearM(true);
|
|
|
- that.$refs.supermap.setMarkersA(markersList);
|
|
|
+ that.$refs.supermap.clearM();
|
|
|
+ that.$refs.supermap.setMarkers_cgq(markersList);
|
|
|
}, 2000);
|
|
|
} else {
|
|
|
setTimeout(() => {
|
|
|
- that.$refs.supermap.clearM(false);
|
|
|
- that.$refs.supermap.clearM(true);
|
|
|
+ that.$refs.supermap.clearM();
|
|
|
}, 2000);
|
|
|
}
|
|
|
})
|
|
@@ -702,9 +698,8 @@ export default {
|
|
|
// longitude: "125.3333"
|
|
|
}
|
|
|
setTimeout(() => {
|
|
|
- that.$refs.supermap.clearM(true)
|
|
|
- that.$refs.supermap.clearM(false)
|
|
|
- that.$refs.supermap.setMarkersRadius(this.cameraMarkersList)
|
|
|
+ that.$refs.supermap.clearM()
|
|
|
+ that.$refs.supermap.setMarkers(this.cameraMarkersList)
|
|
|
}, 1000)
|
|
|
}
|
|
|
})
|
|
@@ -798,9 +793,8 @@ export default {
|
|
|
// longitude: "125.3333"
|
|
|
}
|
|
|
setTimeout(() => {
|
|
|
- that.$refs.supermap.clearM(true)
|
|
|
- that.$refs.supermap.clearM(false)
|
|
|
- that.$refs.supermap.setMarkersRadius(this.cameraMarkersList)
|
|
|
+ that.$refs.supermap.clearM()
|
|
|
+ that.$refs.supermap.setMarkers(this.cameraMarkersList)
|
|
|
}, 1000)
|
|
|
}
|
|
|
})
|