diff --git a/src/api/map.js b/src/api/map.js
index e0753aa..d43fd17 100644
--- a/src/api/map.js
+++ b/src/api/map.js
@@ -25,6 +25,7 @@
export function fetchFeatureInfo (code, key) {
return request({
+ // baseURL: config.mockUrl,
baseURL: config.jingyiService,
url: 'services/resource/singleSearch/' + code,
params: {
diff --git a/src/api/map.js b/src/api/map.js
index e0753aa..d43fd17 100644
--- a/src/api/map.js
+++ b/src/api/map.js
@@ -25,6 +25,7 @@
export function fetchFeatureInfo (code, key) {
return request({
+ // baseURL: config.mockUrl,
baseURL: config.jingyiService,
url: 'services/resource/singleSearch/' + code,
params: {
diff --git a/src/views/mapViews/mars3dMap-bak.vue b/src/views/mapViews/mars3dMap-bak.vue
new file mode 100644
index 0000000..929b517
--- /dev/null
+++ b/src/views/mapViews/mars3dMap-bak.vue
@@ -0,0 +1,1021 @@
+
+
+
+
+
+
![]()
+
+
+ {{value.name}}
+
+
![]()
+
+
+
+
+
![]()
+
+
+ {{value.name}}
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/api/map.js b/src/api/map.js
index e0753aa..d43fd17 100644
--- a/src/api/map.js
+++ b/src/api/map.js
@@ -25,6 +25,7 @@
export function fetchFeatureInfo (code, key) {
return request({
+ // baseURL: config.mockUrl,
baseURL: config.jingyiService,
url: 'services/resource/singleSearch/' + code,
params: {
diff --git a/src/views/mapViews/mars3dMap-bak.vue b/src/views/mapViews/mars3dMap-bak.vue
new file mode 100644
index 0000000..929b517
--- /dev/null
+++ b/src/views/mapViews/mars3dMap-bak.vue
@@ -0,0 +1,1021 @@
+
+
+
+
+
+
![]()
+
+
+ {{value.name}}
+
+
![]()
+
+
+
+
+
![]()
+
+
+ {{value.name}}
+
+
![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/mapViews/mars3dMap.vue b/src/views/mapViews/mars3dMap.vue
index abfe74b..c66132c 100644
--- a/src/views/mapViews/mars3dMap.vue
+++ b/src/views/mapViews/mars3dMap.vue
@@ -271,7 +271,23 @@
name: '蓝色底图(GCJ02偏移)',
type: 'arcgis',
url: 'http://map.geoq.cn/arcgis/rest/services/ChinaOnlineStreetPurplishBlue/MapServer'
- }
+ },
+ {
+ id: 2017,
+ pid: 10,
+ name: "蓝色底图",
+ icon: "//data.mars3d.cn/img/thumbnail/basemap/bd-c-midnight.png",
+ type: "gaode",
+ layer: "vec",
+ chinaCRS: "GCJ02",
+ invertColor: true,
+ filterColor: "#4e70a6",
+ brightness: 0.8,
+ // contrast: 1.8,
+ // gamma: 1,
+ // hue: 1,
+ saturation: 4.4
+ },
],
layers: [
{
@@ -287,22 +303,38 @@
},
zIndex: 0
},
- {
- name: '天地图注记',
- type: 'tdt',
- // img_d img_z vec_d vec_z
- layer: 'img_z',
- key: [
- // '9ae78c51a0a28f06444d541148496e36'
- '216ee92889e17ab1b083fae665d522b8'
- ],
- show: true,
- id: 2,
- templateValues: {
- dataServer: 'http://data.marsgis.cn'
- },
- zIndex: 1
- }
+ // {
+ // name: '天地图注记',
+ // type: 'tdt',
+ // // img_d img_z vec_d vec_z
+ // layer: 'img_d',
+ // key: [
+ // // '9ae78c51a0a28f06444d541148496e36'
+ // '216ee92889e17ab1b083fae665d522b8'
+ // ],
+ // show: true,
+ // id: 2,
+ // templateValues: {
+ // dataServer: 'http://data.marsgis.cn'
+ // },
+ // zIndex: 1
+ // },
+ // {
+ // name: '天地图注记',
+ // type: 'tdt',
+ // // img_d img_z vec_d vec_z
+ // layer: 'img_z',
+ // key: [
+ // // '9ae78c51a0a28f06444d541148496e36'
+ // '216ee92889e17ab1b083fae665d522b8'
+ // ],
+ // show: true,
+ // id: 2,
+ // templateValues: {
+ // dataServer: 'http://data.marsgis.cn'
+ // },
+ // zIndex: 1
+ // }
]
}
// 创建三维地球场景
@@ -487,9 +519,13 @@
this.singleSearch('社区分布', 'B-ZH-1001', 'J765870KFV', require('@/assets/images/icon-camera-blu.png'),
[ {name: '社区名称', value: 'SSSJFW'}, {name: '社区地址', value: 'S_DZQC'} ], false)
this.drawPolygon('B-ZH-1004', 'VM0V81395N')
+ } else if (value.index === '12') {
+ this.singleSearch('智慧教育', 'B-ZH-jy', 'J765870KFV', require('@/assets/images/icon-camera-blu.png'),
+ [ {name: '学校名称', value: 'SSSJFW'}, {name: '学校地址', value: 'S_DZQC'} ], false)
+ this.drawPolygon('B-ZH-1004', 'VM0V81395N')
} else if (value.index === '13') {
this.singleSearch('停车场分布', 'B-ZH-1701', '521355523B', require('@/assets/images/icon-camera-blu.png'),
- [ {name: '停车场名称', value: 'SSSJFW'}, {name: '停车场地址', value: 'S_DZQC'} ], false)
+ [ {name: '停车场名称', value: 'SSSJFW'}, {name: '停车场地址', value: 'location'} ], false)
this.drawPolygon('B-ZH-1702', 'VM0V81395N')
} else if (value.index === '14') {
this.singleSearch('工地分布', 'B-ZH-0801', '05VA87X3PX', require('@/assets/images/icon-camera-blu.png'),
@@ -623,6 +659,7 @@
if (this.player) this.player.pause()
}
},
+ // 多边形
async drawPolygon (code, key) {
fetchFeatureInfo(code, key).then(response => {
this.data.polygon = response.data.data[0].data
@@ -730,15 +767,14 @@
}
}
})
+ },
+ async drawGeoServer(){
+ var tileLayer = new mars3d.layer.GeoJsonLayer({
+ url: 'http://11.100.6.5:8084/services/geoserver/gz-shp/ows?service=WFS&request=GetFeature&maxFeatures=20&outputFormat=application/json&typeName=gz-shp:YJFKWK2021&F-Auth-Key=YEF6D3NF1M',
+ // url: 'http://11.100.6.5:8084/services/geoserver/gz-shp/ows?service=WFS&request=GetFeature&maxFeatures=20&outputFormat=application/json&typeName=gz-shp:A_JJYZQ_XZJXZQ_PG_1000&F-Auth-Key=46EBBN247N',
+ })
+ this.map.addLayer(tileLayer)
}
- // async drawGeoServer(){
- // var tileLayer = new mars3d.layer.GeoJsonLayer({
- // url: 'http://11.100.6.5:8084/services/geoserver/gz-shp/ows?service=WFS&request=GetFeature&maxFeatures=20&outputFormat=application/json&typeName=gz-shp:YJFKWK2021&F-Auth-Key=YEF6D3NF1M',
- // // url: 'http://11.100.6.5:8084/services/geoserver/gz-shp/ows?service=WFS&request=GetFeature&maxFeatures=20&outputFormat=application/json&typeName=gz-shp:A_JJYZQ_XZJXZQ_PG_1000&F-Auth-Key=46EBBN247N',
- // })
- //
- // this.map.addLayer(tileLayer)
- // }
}
}