From f3f40bb001079b2668d0e4548b7154671fcd8889 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 18 Feb 2023 09:47:30 +0800
Subject: [PATCH] 安保活动地图选点优化，系统 相关console.log 去除
---
src/util/store.js | 1
src/store/modules/user.js | 1
src/views/security/security.vue | 17 ++++++--
src/components/map/searchMap.vue | 20 +++++++++-
src/components/map/dcSearchMap.vue | 34 ++++++++--------
src/components/map/dcMap.vue | 38 +++++++++---------
6 files changed, 66 insertions(+), 45 deletions(-)
diff --git a/src/components/map/dcMap.vue b/src/components/map/dcMap.vue
index 087266b..9291ba8 100644
--- a/src/components/map/dcMap.vue
+++ b/src/components/map/dcMap.vue
@@ -48,26 +48,26 @@
})
//加载地图
- global.viewer.imageryLayers.addImageryProvider(
- new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
- url: 'https://webmap-tile.sf-express.com/MapTileService/rt?fetchtype=static&x={x}&y={y}&z={z}&project=sfmap&pic_size=256&pic_type=png8&data_name=361100&data_format=merged-dat&data_type=normal',
- format: 'image/jpeg',
- show: true,
- maximumLevel: 18
- })
- )
-
- // global.viewer.imageryLayers.addImageryProvider(
- // new global.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
- // url: "http://10.141.11.11:8090/MapTileService/wmts?STORETYPE=merged-dat&PROJECTION=4326",
- // layer: "wmts_4326_361100",
- // style: "default",
- // format: "image/png",
- // tileMatrixSetID: "c",
- // tileMatrixLabels: new Array(18).fill(0).map((v, i) => i + 1),
- // tilingScheme: new global.DC.Namespace.Cesium.GeographicTilingScheme(),
+ // global.viewer.imageryLayers.addImageryProvider(
+ // new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
+ // url: 'https://webmap-tile.sf-express.com/MapTileService/rt?fetchtype=static&x={x}&y={y}&z={z}&project=sfmap&pic_size=256&pic_type=png8&data_name=361100&data_format=merged-dat&data_type=normal',
+ // format: 'image/jpeg',
+ // show: true,
+ // maximumLevel: 18
// })
- // )
+ // )
+
+ global.viewer.imageryLayers.addImageryProvider(
+ new global.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
+ url: "http://10.141.11.11:8090/MapTileService/wmts?STORETYPE=merged-dat&PROJECTION=4326",
+ layer: "wmts_4326_361100",
+ style: "default",
+ format: "image/png",
+ tileMatrixSetID: "c",
+ tileMatrixLabels: new Array(18).fill(0).map((v, i) => i + 1),
+ tilingScheme: new global.DC.Namespace.Cesium.GeographicTilingScheme(),
+ })
+ )
//添加图层
self.polygonLayer = new global.DC.VectorLayer('polygonLayer')
diff --git a/src/components/map/dcSearchMap.vue b/src/components/map/dcSearchMap.vue
index 92e2a3f..37a5a0b 100644
--- a/src/components/map/dcSearchMap.vue
+++ b/src/components/map/dcSearchMap.vue
@@ -49,27 +49,27 @@
})
//加载地图
- global.searchViewer.imageryLayers.addImageryProvider(
- new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
- url: 'https://webmap-tile.sf-express.com/MapTileService/rt?fetchtype=static&x={x}&y={y}&z={z}&project=sfmap&pic_size=256&pic_type=png8&data_name=361100&data_format=merged-dat&data_type=normal',
- format: 'image/jpeg',
- show: true,
- maximumLevel: 18
- })
- )
-
// global.searchViewer.imageryLayers.addImageryProvider(
- // new global.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
- // url: "http://10.141.11.11:8090/MapTileService/wmts?STORETYPE=merged-dat&PROJECTION=4326",
- // layer: "wmts_4326_361100",
- // style: "default",
- // format: "image/png",
- // tileMatrixSetID: "c",
- // tileMatrixLabels: new Array(18).fill(0).map((v, i) => i + 1),
- // tilingScheme: new global.DC.Namespace.Cesium.GeographicTilingScheme(),
+ // new global.DC.Namespace.Cesium.UrlTemplateImageryProvider({
+ // url: 'https://webmap-tile.sf-express.com/MapTileService/rt?fetchtype=static&x={x}&y={y}&z={z}&project=sfmap&pic_size=256&pic_type=png8&data_name=361100&data_format=merged-dat&data_type=normal',
+ // format: 'image/jpeg',
+ // show: true,
+ // maximumLevel: 18
// })
// )
+ global.searchViewer.imageryLayers.addImageryProvider(
+ new global.DC.Namespace.Cesium.WebMapTileServiceImageryProvider({
+ url: "http://10.141.11.11:8090/MapTileService/wmts?STORETYPE=merged-dat&PROJECTION=4326",
+ layer: "wmts_4326_361100",
+ style: "default",
+ format: "image/png",
+ tileMatrixSetID: "c",
+ tileMatrixLabels: new Array(18).fill(0).map((v, i) => i + 1),
+ tilingScheme: new global.DC.Namespace.Cesium.GeographicTilingScheme(),
+ })
+ )
+
//添加图层
pointLayer = new global.DC.VectorLayer('polygonLayer')
global.searchViewer.addLayer(pointLayer)
diff --git a/src/components/map/searchMap.vue b/src/components/map/searchMap.vue
index 1f414a3..14e55d0 100644
--- a/src/components/map/searchMap.vue
+++ b/src/components/map/searchMap.vue
@@ -67,6 +67,7 @@
this.longitude = data[0]
this.latitude = data[1]
this.$emit("getLonLat", data)
+
},
remoteMethod(data) {
this.queryString = data
@@ -93,8 +94,23 @@
let location = this.longitude + " " + this.latitude
searchByLonLat(ak, query, region, region_type, page_size, page_num, infos, radius, location).then(res => {
let data = res.data.result[0]
- this.queryString = data.address
- this.$emit("getAddress", this.queryString)
+ if(data!=undefined){
+ this.queryString = data.address
+ this.$emit("getAddress", this.queryString)
+ let point = [data.location.lng,data.location.lat]
+ this.$emit("getLonLat", point)
+ //清空
+ this.searchList = []
+ //触发搜索
+ this.getAddressByQuery()
+ }else{
+ this.queryString = [];
+ //清空
+ this.searchList = []
+ this.$emit("getAddress", '')
+ this.$emit("getLonLat", ['',''])
+ }
+
})
},
selectChange(data) {
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index ce8ec2d..5f8c871 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -50,7 +50,6 @@
return new Promise((resolve, reject) => {
loginByUsername(userInfo.tenantId, userInfo.deptId, userInfo.roleId, userInfo.username, md5(userInfo.password), userInfo.type, userInfo.key, userInfo.code).then(res => {
const data = res.data
- console.log(data, userInfo, 489)
if (data.error_description) {
Message({
message: data.error_description,
diff --git a/src/util/store.js b/src/util/store.js
index 0c59fca..6388ec2 100644
--- a/src/util/store.js
+++ b/src/util/store.js
@@ -55,7 +55,6 @@
} else if (obj.dataType == 'object') {
content = obj.content;
}
- console.log(content,9999)
return content;
}
/**
diff --git a/src/views/security/security.vue b/src/views/security/security.vue
index 91b49cd..80a4ea3 100644
--- a/src/views/security/security.vue
+++ b/src/views/security/security.vue
@@ -480,11 +480,18 @@
this.chosePoint.address = data
},
confirmLonLat(){
- this.form.longitude = this.chosePoint.longitude
- this.form.latitude = this.chosePoint.latitude
- this.form.place = this.chosePoint.address
- this.point = "POINT("+this.form.longitude +" "+this.form.latitude+")"
- this.placeBox = false
+ if(this.chosePoint.longitude){
+ this.form.longitude = this.chosePoint.longitude
+ this.form.latitude = this.chosePoint.latitude
+ this.form.place = this.chosePoint.address
+ this.point = "POINT("+this.form.longitude +" "+this.form.latitude+")"
+ this.placeBox = false
+ }else {
+ this.$alert('该点没有位置信息，请重新选点！', '提示', {
+ confirmButtonText: '确定',
+ });
+ }
+
}
}
}
--
Gitblit v1.9.3