From 687ea8cc545e35a11100aed1a1366faac360e0c5 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Mon, 22 Feb 2021 11:53:17 +0800
Subject: [PATCH] 聚合图集成，按钮选中样式调整
---
src/views/realTimePolice/real.vue | 17 +++++++++++++++--
public/map/widgets/clientManagement/ClientManagement.js | 6 +++++-
public/map/index.html | 6 +++---
3 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/public/map/index.html b/public/map/index.html
index 2de4891..cb5f408 100644
--- a/public/map/index.html
+++ b/public/map/index.html
@@ -59,9 +59,9 @@
}
function mapLoad(map) {
- if(locationObj) {
- map.centerAndZoom(new esri.geometry.Point(locationObj.x,locationObj.y, new esri.SpatialReference({ wkid: 4326 })), 14);
- }
+ // if(locationObj) {
+ // map.centerAndZoom(new esri.geometry.Point(locationObj.x,locationObj.y, new esri.SpatialReference({ wkid: 4326 })), 14);
+ // }
}
</script>
diff --git a/public/map/widgets/clientManagement/ClientManagement.js b/public/map/widgets/clientManagement/ClientManagement.js
index c1a9259..a29cc09 100644
--- a/public/map/widgets/clientManagement/ClientManagement.js
+++ b/public/map/widgets/clientManagement/ClientManagement.js
@@ -162,7 +162,7 @@
open: function () {
var that = this;
$.ajax({
- url: 'http://192.168.0.107:1888/api/blade-jfpts/alarm/alarm/page?current=1&size=10',
+ url: '/api/blade-jfpts/alarm/alarm/page?current=1&size=9999',
type: 'get',
dataType: 'JSON',
success: function (data) {
@@ -251,6 +251,10 @@
that.clusterLayer.addData(datas);
+ if(window.locationObj) {
+ that._map.centerAndZoom(new esri.geometry.Point(window.locationObj.x,window.locationObj.y, new esri.SpatialReference({ wkid: 4326 })), 14);
+ }
+
}
, clearLayer: function () {
var that = this;
diff --git a/src/views/realTimePolice/real.vue b/src/views/realTimePolice/real.vue
index 828ae42..d42cbf9 100644
--- a/src/views/realTimePolice/real.vue
+++ b/src/views/realTimePolice/real.vue
@@ -288,7 +288,7 @@
<iframe
id="mapDiv"
ref="mapDiv"
- src=" http://192.168.0.107:1888/map/index.html?openid=ClientManagement"
+ src="/map/index.html?openid=ClientManagement"
frameborder="0"
width="100%"
height="100%"
@@ -779,16 +779,29 @@
}
},
handleStart(row) {
+ var arr = [];
+ this.$store.state.tags.tagList.forEach(item => {
+ if (item.label != "视频") {
+ arr.push(item);
+ }
+ });
+ this.$store.state.tags.tagList = arr;
this.$router.push({
path: `/real/video/${row.channelNumber}/${row.serialNumber}`
});
},
handleHistory(row) {
+ var arr = [];
+ this.$store.state.tags.tagList.forEach(item => {
+ if (item.label != "设备历史") {
+ arr.push(item);
+ }
+ });
+ this.$store.state.tags.tagList = arr;
this.$router.push({path: `/real/history/${row.deviceNumber}`});
},
handleMap(row) {
this.showMap = true;
- debugger
this.$nextTick(() => {
this.$refs.mapDiv.onload = () => {
window.frames[0].locationObj = {x: row.jd, y: row.wd};
--
Gitblit v1.9.3