From c6df06bd690486739067ee1ee7124ac66da720fb Mon Sep 17 00:00:00 2001
From: 少年 <1392120328@qq.com>
Date: 星期二, 27 二月 2024 14:23:32 +0800
Subject: [PATCH] youhua
---
src/components/viewer2.vue | 71 +++++
src/components/rightMenu/bottom2.vue | 4
src/utils/poiKeys.js | 2
src/components/poplayer/history2.vue | 3
src/components/sideMenu/sliderAlpha/alpha2.vue | 16
src/components/login.vue | 2
static/SmartEarthSDK/Workers/image/xzspj/camera.png | 0
src/router/index.js | 2
src/components/sideMenu/layerTreePanel/layerTreePanel2.vue | 2
src/utils/map.js | 11
src/components/sideMenu/layerMenu/layerPanel2.vue | 222 ++++++++++++------
src/assets/img/statistics/camera.png | 0
src/utils/map2.js | 343 ++++++++++++++--------------
src/components/leftMenu/bottom2.vue | 2
14 files changed, 404 insertions(+), 276 deletions(-)
diff --git a/src/assets/img/statistics/camera.png b/src/assets/img/statistics/camera.png
new file mode 100644
index 0000000..dd710af
--- /dev/null
+++ b/src/assets/img/statistics/camera.png
Binary files differ
diff --git a/src/components/leftMenu/bottom2.vue b/src/components/leftMenu/bottom2.vue
index f2be22c..3083ef7 100644
--- a/src/components/leftMenu/bottom2.vue
+++ b/src/components/leftMenu/bottom2.vue
@@ -168,7 +168,7 @@
},
methods: {
flyBack() {
- map.getView().animate({
+ window.mapapi.getView().animate({
// 鍙缃渶瑕佺殑灞炴�у嵆鍙�
center: [116.52217697339846, 39.75979421847914], // 涓績鐐�
zoom: 12, // 缂╂斁绾у埆
diff --git a/src/components/login.vue b/src/components/login.vue
index fb71d32..e4d5ae6 100644
--- a/src/components/login.vue
+++ b/src/components/login.vue
@@ -29,7 +29,7 @@
var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
var r = window.location.search.substr(1).match(reg);
if (r != null) {
- this.$router.push("/index");
+ this.$router.push("/home");
}
return null;
},
diff --git a/src/components/poplayer/history2.vue b/src/components/poplayer/history2.vue
index f6386b7..cd947d5 100644
--- a/src/components/poplayer/history2.vue
+++ b/src/components/poplayer/history2.vue
@@ -131,7 +131,8 @@
z-index: 2;
width: 100vw;
height: 100vh;
- background: rgba(0, 0, 0, 0.5);
+ /* background: rgba(0, 0, 0, 0.5); */
+ background: #ffffff;
top: 0;
left: 0;
}
diff --git a/src/components/rightMenu/bottom2.vue b/src/components/rightMenu/bottom2.vue
index 3f9af5d..a8f7553 100644
--- a/src/components/rightMenu/bottom2.vue
+++ b/src/components/rightMenu/bottom2.vue
@@ -177,7 +177,7 @@
const view = window.mapapi.getView();
const zoom = view.getZoom();
- map.getView().animate({
+ window.mapapi.getView().animate({
// 鍙缃渶瑕佺殑灞炴�у嵆鍙�
center: window.mapapi.getView().getCenter(), // 涓績鐐�
zoom: zoom + 1, // 缂╂斁绾у埆
@@ -189,7 +189,7 @@
const view = window.mapapi.getView();
const zoom = view.getZoom();
- map.getView().animate({
+ window.mapapi.getView().animate({
// 鍙缃渶瑕佺殑灞炴�у嵆鍙�
center: window.mapapi.getView().getCenter(), // 涓績鐐�
zoom: zoom - 1, // 缂╂斁绾у埆
diff --git a/src/components/sideMenu/layerMenu/layerPanel2.vue b/src/components/sideMenu/layerMenu/layerPanel2.vue
index 6d35b94..cf14e79 100644
--- a/src/components/sideMenu/layerMenu/layerPanel2.vue
+++ b/src/components/sideMenu/layerMenu/layerPanel2.vue
@@ -178,19 +178,19 @@
},
mounted() {
this.$nextTick(() => {
- setTimeout(() => {
- this.handleEMapClick(
- {
- id: "yxdt",
- name: "褰卞儚鍦板浘",
- active: true,
- type: "er",
- src: "/static/img/yxdt.cf4698e.png",
- },
- 1
- );
- loadEnterprise();
- }, 2000);
+ // setTimeout(() => {
+ // this.handleEMapClick(
+ // {
+ // id: "yxdt",
+ // name: "褰卞儚鍦板浘",
+ // active: true,
+ // type: "er",
+ // src: "/static/img/yxdt.cf4698e.png",
+ // },
+ // 1
+ // );
+ // loadEnterprise();
+ // }, 2000);
});
},
methods: {
@@ -227,13 +227,14 @@
// 浜岀淮搴曞浘閫夋嫨
handleEMapClick(result, index) {
// 璁剧疆鐩告満
- if (result.name == "浜岀淮鍦板浘") {
- window.mapapi.getLayerByName("浜岀淮鍦板浘").setVisible(true);
- window.mapapi.getLayerByName("褰卞儚鍦板浘").setVisible(false);
- } else if (result.name == "褰卞儚鍦板浘") {
- window.mapapi.getLayerByName("褰卞儚鍦板浘").setVisible(true);
- window.mapapi.getLayerByName("浜岀淮鍦板浘").setVisible(false);
- }
+ // if (result.name == "浜岀淮鍦板浘") {
+ // window.mapapi.getLayerByName("浜岀淮鍦板浘").setVisible(true);
+ // window.mapapi.getLayerByName("褰卞儚鍦板浘").setVisible(false);
+ // } else if (result.name == "褰卞儚鍦板浘") {
+ // window.mapapi.getLayerByName("褰卞儚鍦板浘").setVisible(true);
+ // window.mapapi.getLayerByName("浜岀淮鍦板浘").setVisible(false);
+ // }
+
// 鍒囨崲鍥惧眰
const val = layers.filter((res) => {
if (res.name == result.name) {
@@ -241,6 +242,73 @@
}
});
const children = val[0].children;
+ // console.log(children, '111')
+ if (result.name == '褰卞儚鍦板浘') {
+ //鍔犺浇鑸媿褰卞儚
+ window.ImageLayer = new ol.layer.Tile({
+ id: 'C0698021',
+ visible: true,
+ source: new ol.source.XYZ({
+ wrapX: true,
+ url: `${'https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer'}/tile/{z}/{y}/{x}`,
+ }),
+ projection: new ol.proj.get('EPSG:4326')
+ });
+ window.mapapi.addLayer(window.ImageLayer);
+
+ //鍔犺浇楂樺痉鏍囨敞
+ window.annotation = new ol.layer.Tile({
+ id: '69EB42A8',
+ visible: true,
+ source: new ol.source.XYZ({
+ wrapX: true,
+ url: `https://webst02.is.autonavi.com/appmaptile?style=8&x={x}&y={y}&z={z}`,
+ }),
+ projection: new ol.proj.get('EPSG:4326')
+ });
+ window.mapapi.addLayer(window.annotation);
+
+
+ window.hexin = new ol.layer.Tile({
+ source: new ol.source.TileWMS({
+ ratio: 3,
+ url: 'https://skyzt.bda.gov.cn/gisserver/wmsserver/YZ_BJ60',//鍥惧眰鍦板潃
+ params: {
+ 'VERSION': '1.1.1',
+ 'SRS': 'EPSG:4326',
+ 'FORMAT': 'image/png',
+ 'TILED': true,
+ "LAYERS": ''
+ }
+ })
+ })
+ window.mapapi.addLayer(window.hexin)
+
+
+ //浜﹀簞鏂板煄瑙勫垝鑼冨洿
+ window.yizhuang = new ol.layer.Tile({
+ source: new ol.source.TileWMS({
+ ratio: 3,
+ url: 'https://skyzt.bda.gov.cn/gisserver/wmsserver/YZ_BJ',//鍥惧眰鍦板潃
+ params: {
+ 'VERSION': '1.1.1',
+ 'SRS': 'EPSG:4326',
+ 'FORMAT': 'image/png',
+ 'TILED': true,
+ "LAYERS": ''
+ }
+ })
+ })
+ window.mapapi.addLayer(window.yizhuang)
+ } else {
+ window.mapapi.removeLayer(window.ImageLayer);
+ window.mapapi.removeLayer(window.annotation)
+ window.mapapi.removeLayer(window.hexin);
+ window.mapapi.removeLayer(window.yizhuang);
+ }
+
+
+
if (this.curEMapModelIndex == index) {
// 鍐嶆鐐瑰嚮閫変腑鐨刬tem鏃跺彇娑堥�夋嫨
// clearLayerByTypeId(result.id);
@@ -248,14 +316,14 @@
} else {
this.curSMapModelIndex = -1;
this.curEMapModelIndex = index;
- clearLayerByTypeIdArr(["ewdt", "yxdt"]);
- clearLayerByTypeIdArr(["3Dcs", "swmx"]);
- _GLOBAL.layers[result.id] = [];
- children.forEach((item) => {
- let itemLayer = loadLayer(item);
- _GLOBAL.layers[result.id].push(itemLayer);
- // console.log(_GLOBAL.layers[result.id]);
- });
+ // clearLayerByTypeIdArr(["ewdt", "yxdt"]);
+ // clearLayerByTypeIdArr(["3Dcs", "swmx"]);
+ // _GLOBAL.layers[result.id] = [];
+ // children.forEach((item) => {
+ // let itemLayer = loadLayer(item);
+ // _GLOBAL.layers[result.id].push(itemLayer);
+ // // console.log(_GLOBAL.layers[result.id]);
+ // });
}
},
// 涓夌淮妯″瀷閫夋嫨
@@ -357,7 +425,7 @@
},
// 绗簩琛� 涓撻鍥� 鐐瑰嚮
handleZTlick(result, index) {
- console.log(result, index);
+ // console.log(result, index);
const val = layers.filter((res) => {
if (res.name == result.name) {
return res;
@@ -378,75 +446,81 @@
if (this.curFuncIndex == index) {
store.setTdglFlag(false);
store.setPoplayerListAction({});
- divPoint3 && divPoint3.deleteObject();
store.setPoplayerShowAction(false);
+ this.curFuncIndex = -1;
+ // window.clusterLayer && window.clusterLayer.clear();
if (window.tdglLine) {
window.mapapi.removeLayer(window.tdglLine);
window.tdglLine = null;
}
- this.curFuncIndex = -1;
- window.clusterLayer && window.clusterLayer.clear();
- if (window.tdglLayer) {
+ if (window.tdgllayer) {
store.setSliderShow(false);
- window.mapapi.removeLayer(window.tdglLayer);
+ window.mapapi.removeLayer(window.tdgllayer);
+ window.tdgllayer = null;
}
} else {
+ this.curFuncIndex = index;
// 闅愯棌搴曢儴鍥惧眰闈㈢増
store.setLayerPanelShow(false);
// 闅愯棌鍙充笂瑙掕彍鍗曢潰鏉�
store.setMenuListShow(false);
// 闅愯棌搴曢儴婕父闈㈡澘
store.setRoamPanelShow(false);
- this.curFuncIndex = index;
switch (index) {
case 0:
- if (window.tdgllayer) {
- window.mapapi.removeLayer(window.tdgllayer);
- store.setSliderShow(false);
- window.tdgllayer = null;
- window.mapapi.removeLayer(window.tdglLine);
- return;
- }
- store.setSliderShow(true);
-
- var url = layers[8].children[0].urls;
- //"https://skyzt.bda.gov.cn/gisserver/tmsserver/chengshiguihua_dikuaibianhao_tms/";
-
- window.mapapi.removeLayer(window.tdgllayer);
- window.tdgllayer = new ol.layer.Tile({
- source: new ol.source.XYZ({
- projection: "EPSG:4326",
- tileGrid: ol.tilegrid.createXYZ({
- extent: [50.582, -90, 180, 70.1558],
- }),
- tileUrlFunction: function (tileCoord, pixelRatio, proj) {
- // return url + (tileCoord[0] - 1) + '/' + tileCoord[1] + '/' + (Math.pow(2, tileCoord[0] - 1) + tileCoord[2]) + '.jpeg';
- return (
- url +
- "/" +
- (tileCoord[0] - 1) +
- "/" +
- tileCoord[1] +
- "/" +
- (Math.pow(2, tileCoord[0] - 1) + tileCoord[2]) +
- ".jpeg"
- );
- },
- }),
- });
- window.mapapi.addLayer(window.tdgllayer);
//鏄剧ず婊戝姩鏉�
+ store.setSliderShow(true);
store.setTdglFlag(true);
+ var url = layers[8].children[0].urls;
+ //鍔犺浇鍦板潡妯″瀷
+ window.tdgllayer = new ol.layer.Tile({
+ source: new ol.source.TileWMS({
+ ratio: 3,
+ url: 'https://skyzt.bda.gov.cn//gisserver/wmsserver/chengshiguihua_dikuaibianhao',
+ params: {
+ 'VERSION': '1.1.1',
+ 'SRS': 'EPSG:4326',
+ 'FORMAT': 'image/png',
+ 'TILED': true,
+ "LAYERS": ''
+ }
+ })
+ })
+
+ // window.tdgllayer = new ol.layer.Tile({
+ // source: new ol.source.XYZ({
+ // projection: "EPSG:4326",
+ // format: new ol.format.MVT(),
+ // tileGrid: ol.tilegrid.createXYZ({
+ // // extent: [-50.582, -90, 180, 70.1558],
+ // extent: [-180, -90, 180, 90]
+ // }),
+ // tilePixelRatio: 3,
+ // tileUrlFunction: function (tileCoord, pixelRatio, proj) {
+ // console.log(tileCoord, '鍙傛暟')
+ // console.log(Math.pow(2, tileCoord[0]) + tileCoord[2] - 1)
+ // // return url + (tileCoord[0] - 1) + '/' + tileCoord[1] + '/' + (Math.pow(2, tileCoord[0] - 1) + tileCoord[2]) + '.jpeg';
+ // return (
+ // url +
+ // (tileCoord[0]) +
+ // "/" +
+ // tileCoord[1] +
+ // "/" +
+ // (Math.pow(2, tileCoord[0]) + tileCoord[2] - 1) +
+ // ".jpeg"
+ // );
+
+ // },
+ // }),
+ // });
+
+ window.mapapi.addLayer(window.tdgllayer);
break;
case 1:
this.curFuncIndex = -1;
store.setTdglFlag(false);
store.setSliderShow(false);
store.setHistoryShow(true);
- if (window.tdglLayer) {
- store.setSliderShow(false);
- window.mapapi.removeLayer(window.tdgllayer);
- }
break;
}
}
diff --git a/src/components/sideMenu/layerTreePanel/layerTreePanel2.vue b/src/components/sideMenu/layerTreePanel/layerTreePanel2.vue
index ba145ed..5e423af 100644
--- a/src/components/sideMenu/layerTreePanel/layerTreePanel2.vue
+++ b/src/components/sideMenu/layerTreePanel/layerTreePanel2.vue
@@ -2036,7 +2036,7 @@
return new ol.style.Style({
image: new ol.style.Icon({
anchor: [0.5, 1],
- src: "./static/SmartEarthSDK/Workers/image/xzspj/spjk.png",
+ src: "./static/SmartEarthSDK/Workers/image/xzspj/camera.png",
}),
});
}
diff --git a/src/components/sideMenu/sliderAlpha/alpha2.vue b/src/components/sideMenu/sliderAlpha/alpha2.vue
index 3c36bf1..fcf62c8 100644
--- a/src/components/sideMenu/sliderAlpha/alpha2.vue
+++ b/src/components/sideMenu/sliderAlpha/alpha2.vue
@@ -1,13 +1,6 @@
<template>
<div class="sliders">
- <el-slider
- v-model="value"
- :max="100"
- :min="0"
- vertical
- height="200px"
- @input="changeSlider"
- >
+ <el-slider v-model="value" :max="100" :min="0" vertical height="200px" @input="changeSlider">
</el-slider>
</div>
</template>
@@ -21,9 +14,9 @@
},
methods: {
changeSlider(val) {
- console.log(val);
- // window.tdglLayer.item.alpha = val / 100;
- window.tdgllayer.state_.layer.setOpacity(val / 100);
+ if (window.tdgllayer) {
+ window.tdgllayer.state_.layer.setOpacity(val / 100);
+ }
},
},
};
@@ -36,6 +29,7 @@
left: 0.15rem;
z-index: 88;
}
+
.el-tooltip__popper {
z-index: 88 !important;
}
diff --git a/src/components/viewer2.vue b/src/components/viewer2.vue
index 534a607..84d5020 100644
--- a/src/components/viewer2.vue
+++ b/src/components/viewer2.vue
@@ -57,7 +57,7 @@
</template>
<script>
import store from "@/utils/store2.js";
-import { setClick,leftClick } from '@/utils/map2.js'
+import { setClick, leftClick } from '@/utils/map2.js'
import _GLOBAL from "@/assets/GLOBAL2";
// import { leftClick, loadLayer } from "@/utils/map.js";
import leftBottom from "@/components/leftMenu/bottom2.vue";
@@ -114,7 +114,7 @@
"my-history": history,
"my-land-admin-info": landAdminInfo,
"my-slider": sliderAlpha,
- "my-poplayer":mainPoplayer
+ "my-poplayer": mainPoplayer
},
data() {
return {
@@ -235,13 +235,13 @@
id: "cva_c",
source: wmtsSource2,
});
- wmtsLayer2.setVisible(false);
+ // wmtsLayer2.setVisible(false);
////鍗槦褰卞儚
layers.push(wmtsLayer);
////浜岀淮鍦板浘
layers.push(wmtsLayer2);
////璺綉
- layers.push(wmtsLayer1);
+ // layers.push(wmtsLayer1);
const map = new ol.Map({
layers: layers,
@@ -250,10 +250,72 @@
center: [116.505348, 39.795592],
projection: "EPSG:4326",
zoom: 12,
+ minZoom: 8.5
}),
});
window.mapapi = map;
+
+ //鍔犺浇鑸媿褰卞儚
+ window.ImageLayer = new ol.layer.Tile({
+ id: 'C0698021',
+ visible: true,
+ source: new ol.source.XYZ({
+ wrapX: true,
+ url: `${'https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer'}/tile/{z}/{y}/{x}`,
+ }),
+ projection: new ol.proj.get('EPSG:4326')
+ });
+ window.mapapi.addLayer(window.ImageLayer);
+
+ //鍔犺浇楂樺痉鏍囨敞
+ window.annotation = new ol.layer.Tile({
+ id: '69EB42A8',
+ visible: true,
+ source: new ol.source.XYZ({
+ wrapX: true,
+ url: `https://webst02.is.autonavi.com/appmaptile?style=8&x={x}&y={y}&z={z}`,
+ }),
+ projection: new ol.proj.get('EPSG:4326')
+ });
+ window.mapapi.addLayer(window.annotation);
+
+
+ window.hexin = new ol.layer.Tile({
+ source: new ol.source.TileWMS({
+ ratio: 3,
+ url: 'https://skyzt.bda.gov.cn/gisserver/wmsserver/YZ_BJ60',//鍥惧眰鍦板潃
+ params: {
+ 'VERSION': '1.1.1',
+ 'SRS': 'EPSG:4326',
+ 'FORMAT': 'image/png',
+ 'TILED': true,
+ "LAYERS": ''
+ }
+ })
+ })
+ window.mapapi.addLayer(window.hexin)
+
+
+ //浜﹀簞鏂板煄瑙勫垝鑼冨洿
+ window.yizhuang = new ol.layer.Tile({
+ source: new ol.source.TileWMS({
+ ratio: 3,
+ url: 'https://skyzt.bda.gov.cn/gisserver/wmsserver/YZ_BJ',//鍥惧眰鍦板潃
+ params: {
+ 'VERSION': '1.1.1',
+ 'SRS': 'EPSG:4326',
+ 'FORMAT': 'image/png',
+ 'TILED': true,
+ "LAYERS": ''
+ }
+ })
+ })
+ window.mapapi.addLayer(window.yizhuang)
+
+
+
+
setClick(true)
// leftClick()
// var url =
@@ -447,5 +509,4 @@
.colseBtn img {
width: 30px;
}
-
</style>
diff --git a/src/router/index.js b/src/router/index.js
index 6f46089..b65022e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -24,7 +24,7 @@
component: index
},
{
- path: '/index2',
+ path: '/home',
name: 'index2',
component: index2
},
diff --git a/src/utils/map.js b/src/utils/map.js
index 097ebc7..e49d709 100644
--- a/src/utils/map.js
+++ b/src/utils/map.js
@@ -447,11 +447,14 @@
}
// 鍦熷湴绠＄悊
if (store.tdglInfo.flag) {
+
+ console.log('鍧愭爣', [window.clickPOI.lon, window.clickPOI.lat])
+
axios
.get(
// "http://10.10.4.115:8022/geowinmap_xncs/ds?r=0.9158559377752831&serviceproviderid=map.vectorserviceprovider&serviceid=queryfeature&featcls=225%25E8%258C%2583%25E5%259B%25B4%25E5%2588%2586%25E5%258C%25BA%25E8%25A7%2584%25E5%2588%2592.geojson&lng=" +
- // window.gisBaseUrl + "yzxncsApi/geowinmap_xncs/ds?r=0.9158559377752831&serviceproviderid=map.vectorserviceprovider&serviceid=queryfeature&featcls=225%25E8%258C%2583%25E5%259B%25B4%25E5%2588%2586%25E5%258C%25BA%25E8%25A7%2584%25E5%2588%2592.geojson&lng=" +
- window.gisBaseUrl + "cs/geowinmap_xncs/ds?&lng=" +
+ window.gisBaseUrl + "yzxncsApi/geowinmap_xncs/ds?r=0.9158559377752831&serviceproviderid=map.vectorserviceprovider&serviceid=queryfeature&featcls=225%25E8%258C%2583%25E5%259B%25B4%25E5%2588%2586%25E5%258C%25BA%25E8%25A7%2584%25E5%2588%2592.geojson&lng=" +
+ // window.gisBaseUrl + "cs/geowinmap_xncs/ds?&lng=" +
window.clickPOI.lon +
"&lat=" +
window.clickPOI.lat +
@@ -498,8 +501,8 @@
axios
.get(
// "http://10.10.4.115:8022//poisearch/guihuacon/getInfo?ydbm=" +
- // window.gisBaseUrl + "yzxncsApi/poisearch/guihuacon/getInfo?ydbm=" +
- window.gisBaseUrl + "cs/poisearch/guihuacon/getInfo?ydbm=" +
+ window.gisBaseUrl + "yzxncsApi/poisearch/guihuacon/getInfo?ydbm=" +
+ // window.gisBaseUrl + "cs/poisearch/guihuacon/getInfo?ydbm=" +
response.data.NO
)
.then(
diff --git a/src/utils/map2.js b/src/utils/map2.js
index 02b51c5..c3571bc 100644
--- a/src/utils/map2.js
+++ b/src/utils/map2.js
@@ -134,7 +134,7 @@
)
// axios.get(window.gisBaseUrl + '/gisserver/wfsserver/qiyelianqiye?version=1.3.0&request=GetFeature&format=json&typename=浼佷笟閾句紒涓�')
.then(dataSource => {
- console.log(dataSource);
+ // console.log(dataSource);
store.qiyeJsonInfo = dataSource
})
.catch((err) => {
@@ -2252,6 +2252,7 @@
.get(
// "http://10.10.4.115:8022/geowinmap_xncs/ds?r=0.9158559377752831&serviceproviderid=map.vectorserviceprovider&serviceid=queryfeature&featcls=225%25E8%258C%2583%25E5%259B%25B4%25E5%2588%2586%25E5%258C%25BA%25E8%25A7%2584%25E5%2588%2592.geojson&lng=" +
window.gisBaseUrl + "yzxncsApi/geowinmap_xncs/ds?r=0.9158559377752831&serviceproviderid=map.vectorserviceprovider&serviceid=queryfeature&featcls=225%25E8%258C%2583%25E5%259B%25B4%25E5%2588%2586%25E5%258C%25BA%25E8%25A7%2584%25E5%2588%2592.geojson&lng=" +
+ // window.gisBaseUrl + "cs/geowinmap_xncs/ds?&lng=" +
e.coordinate[0] +
"&lat=" +
e.coordinate[1] +
@@ -2269,200 +2270,196 @@
window.tdglLine = new ol.layer.Vector({
source: new ol.source.Vector({
features: [feature] // 灏嗚绱犲璞″姞鍏ュ埌鍥惧眰婧愪腑
+ }),
+ style: new ol.style.Style({
+ stroke: new ol.style.Stroke({
+ color: 'red',
+ width: 3
+ }),
})
});
window.mapapi.addLayer(window.tdglLine)
- axios
- .get(
- // "http://10.10.4.115:8022//poisearch/guihuacon/getInfo?ydbm=" +
- window.gisBaseUrl + "yzxncsApi/poisearch/guihuacon/getInfo?ydbm=" +
- response.data.NO
- )
- .then(
- info => {
- let data = info.data.data;
- if (data.yongdishuju === null) {
- objdata = {
- POITYPE: "NOTDGL",
- zwxx: "鏆傛棤淇℃伅",
- lon: window.clickPOI.lon,
- lat: window.clickPOI.lat,
- }
- } else {
- qiyexinxi = info.data.data.qiyexinxi;
- qysl = data.qiyexinxi.length;
- if (qysl > 0) {
- ydbm = data.qiyexinxi[0]["鍦板潡缂栧彿"];
- } else {
- ydbm = data.churangxinxi["ydbh"];
- }
- try {
- ydlx = data.yongdishuju["ydlxmc"];
- } catch (e) { }
- try {
- cyfx = data.yongdishuju["cyfx"];
- } catch (e) { }
- try {
- // this.crzt = response.data["ZT"];
- switch (response.data["ZT"]) {
- case 3:
- crzt = "宸插嚭璁�";
- break;
- case 4:
- crzt = "鏈嚭璁�";
- break;
- }
- } catch (e) { }
- try {
- ydmj = parseFloat(
- "" + data.yongdishuju["ydmj"]
- ).toFixed(0);
- } catch (e) { }
- try {
- crnx = data.churangxinxi["crnx"];
- } catch (e) { }
- try {
- crnf = data.churangxinxi["crnf"];
- } catch (e) { }
- try {
- rjl = data.yongdishuju["rjl"];
- } catch (e) { }
- try {
- jzxg = data.yongdishuju["jzxg"];
- } catch (e) { }
- try {
- jzmd = data.yongdishuju["jzmd"];
- } catch (e) { }
- objdata = {
- POITYPE: "TDGL",
- ydbm,
- ydlx,
- cyfx,
- crzt,
- ydmj,
- ydbm,
- crnx,
- crnf,
- rjl,
- jzxg,
- jzmd,
- lon: e.coordinate[0],
- lat: e.coordinate[1],
- }
- }
-
- store.setTdglShow(false);
- store.setTdlgInfo({});
- store.setTdglShow(true);
- store.setTdlgInfo(objdata);
+ axios.get(
+ // "http://10.10.4.115:8022//poisearch/guihuacon/getInfo?ydbm=" +
+ window.gisBaseUrl + "yzxncsApi/poisearch/guihuacon/getInfo?ydbm=" + response.data.NO
+ ).then((info) => {
+ let data = info.data.data;
+ if (data.yongdishuju === null) {
+ objdata = {
+ POITYPE: "NOTDGL",
+ zwxx: "鏆傛棤淇℃伅",
+ lon: e.coordinate[0],
+ lat: e.coordinate[1],
}
- );
+ } else {
+ qiyexinxi = info.data.data.qiyexinxi;
+ qysl = data.qiyexinxi.length;
+ if (qysl > 0) {
+ ydbm = data.qiyexinxi[0]["鍦板潡缂栧彿"];
+ } else {
+ ydbm = data.churangxinxi["ydbh"];
+ }
+ try {
+ ydlx = data.yongdishuju["ydlxmc"];
+ } catch (e) { }
+ try {
+ cyfx = data.yongdishuju["cyfx"];
+ } catch (e) { }
+ try {
+ // this.crzt = response.data["ZT"];
+ switch (response.data["ZT"]) {
+ case 3:
+ crzt = "宸插嚭璁�";
+ break;
+ case 4:
+ crzt = "鏈嚭璁�";
+ break;
+ }
+ } catch (e) { }
+ try {
+ ydmj = parseFloat(
+ "" + data.yongdishuju["ydmj"]
+ ).toFixed(0);
+ } catch (e) { }
+ try {
+ crnx = data.churangxinxi["crnx"];
+ } catch (e) { }
+ try {
+ crnf = data.churangxinxi["crnf"];
+ } catch (e) { }
+ try {
+ rjl = data.yongdishuju["rjl"];
+ } catch (e) { }
+ try {
+ jzxg = data.yongdishuju["jzxg"];
+ } catch (e) { }
+ try {
+ jzmd = data.yongdishuju["jzmd"];
+ } catch (e) { }
+ objdata = {
+ POITYPE: "TDGL",
+ ydbm,
+ ydlx,
+ cyfx,
+ crzt,
+ ydmj,
+ ydbm,
+ crnx,
+ crnf,
+ rjl,
+ jzxg,
+ jzmd,
+ lon: e.coordinate[0],
+ lat: e.coordinate[1],
+ }
+ }
+
+ store.setTdglShow(false);
+ store.setTdlgInfo({});
+ store.setTdglShow(true);
+ store.setTdlgInfo(objdata);
+ }
+ );
})
return;
}
window.mapapi.forEachFeatureAtPixel(e.pixel, function (feature) {
- let properties = feature.getProperties().features[0].values_;
- console.log(properties, 'aaa');
- console.log(properties.values_, 'bbb');
- for (const propertyNames in properties) {
- if (propertyNames.indexOf("鐩戞帶鍚�") !== -1) {
- // objdata = {
- // POITYPE: "SPJK",
- // name: properties["JK鍚嶇О"]._value,
- // type: properties["JK绫诲瀷"]._value,
- // function: properties["鍔熻兘"]._value,
- // area: properties["鎵�鍦ㄥ尯"]._value,
- // number: properties["JK缂栧彿"]._value,
- // code: properties["JK鍐呯爜"]._value,
- // lon: lon,
- // lat: lat,
- // }
- Message({
- message: '杩炴帴鐘舵�佹煡璇腑',
- type: 'info',
- offset: 60,
- center: true,
- duration: 1000,
- });
- layerOpen(properties["JK鍚嶇О"]._value, {
- width: "100%",
- height: "40%",
- // offset: [offsetTop + "px", "380px"],
- url: "../../static/video/video.html?code=" + properties["JK鍐呯爜"]._value,
- fn: {
- success: (layero, index) => {
- SmartEarthPopupData.layerContainer = layero;
- },
- end: () => {
+ console.log(feature.getProperties(), 'aaa');
- },
- cancel: () => {
-
- },
- },
- });
- return
- } else if (propertyNames.indexOf("閮ㄤ欢鍚嶇О") !== -1) {
- objdata = {
- // 鐐逛綅绫诲瀷锛堜腑鑻辨枃閰嶇疆琛╬oiKeys.js)
- POITYPE: "CSBJ",
- // 灞曠ず瀛楁
- name: properties["閮ㄤ欢鍚嶇О"],
- address: properties["瀹夎鍦板潃"],
- code: properties["閮ㄤ欢缂栫爜"],
- type: properties["閮ㄤ欢绫诲瀷"],
- // 寮规缁忕含搴�
- lon: properties["Longtitude"],
- lat: properties["Latitude"],
- }
- } else if (propertyNames.indexOf("浜曠紪鍙�") !== -1) {
- objdata = {
- POITYPE: "YINJ",
- name: properties["浜曞悕绉�"],
- depth: properties["浜曟繁"],
- type: properties["浜曠被鍨�"],
- location: properties["浣嶇疆"],
- code: properties["浜曠紪鍙�"],
- lon: properties["Longtitude"],
- lat: properties["Latitude"],
- }
- } else if (propertyNames.indexOf("QYMC") !== -1) {
- objdata = {
- POITYPE: "QY",
- QYMC: properties["QYMC"],
- XYDM: properties["XYDM"],
- BZDZ: properties["BZDZ"],
- DZ: properties["DZ"],
- lon: properties["Longtitude"],
- lat: properties["Latitude"],
- }
- }
- }
-
- if (feature && feature.values_.desc) {
- let obj = feature.values_.desc
+ //鎼滅储鐨勭偣浣�
+ if (window.pointArr.length > 0) {
+ let obj = feature.getProperties().desc
objdata = {
POITYPE: "POINT",
name: obj.name,
address: obj.address,
}
+ } else {
+ let properties = feature.getProperties().features[0].values_;
+ for (const propertyNames in properties) {
+ if (propertyNames.indexOf("鐩戞帶鍚�") !== -1) {
+ // objdata = {
+ // POITYPE: "SPJK",
+ // name: properties["JK鍚嶇О"]._value,
+ // type: properties["JK绫诲瀷"]._value,
+ // function: properties["鍔熻兘"]._value,
+ // area: properties["鎵�鍦ㄥ尯"]._value,
+ // number: properties["JK缂栧彿"]._value,
+ // code: properties["JK鍐呯爜"]._value,
+ // lon: lon,
+ // lat: lat,
+ // }
+ Message({
+ message: '杩炴帴鐘舵�佹煡璇腑',
+ type: 'info',
+ offset: 60,
+ center: true,
+ duration: 1000,
+ });
+ layerOpen(properties["JK鍚嶇О"], {
+ width: "100%",
+ height: "40%",
+ // offset: [offsetTop + "px", "380px"],
+ url: "../../static/video/video.html?code=" + properties["JK鍐呯爜"],
+ fn: {
+ success: (layero, index) => {
+ SmartEarthPopupData.layerContainer = layero;
+ },
+ end: () => {
+ },
+ cancel: () => {
- // if (window.instance) {
- // window.instance.$destroy();
- // }
- // window.instance = new PoiLayerConstructor({
- // data: {
- // list: objdata
- // }
- // });
- // window.instance.$mount();
+ },
+ },
+ });
+ return
+ } else if (propertyNames.indexOf("閮ㄤ欢鍚嶇О") !== -1) {
+ objdata = {
+ // 鐐逛綅绫诲瀷锛堜腑鑻辨枃閰嶇疆琛╬oiKeys.js)
+ POITYPE: "CSBJ",
+ // 灞曠ず瀛楁
+ name: properties["閮ㄤ欢鍚嶇О"],
+ address: properties["瀹夎鍦板潃"],
+ code: properties["閮ㄤ欢缂栫爜"],
+ type: properties["閮ㄤ欢绫诲瀷"],
+ // 寮规缁忕含搴�
+ lon: properties["Longtitude"],
+ lat: properties["Latitude"],
+ }
+ } else if (propertyNames.indexOf("浜曠紪鍙�") !== -1) {
+ objdata = {
+ POITYPE: "YINJ",
+ name: properties["浜曞悕绉�"],
+ depth: properties["浜曟繁"],
+ type: properties["浜曠被鍨�"],
+ location: properties["浣嶇疆"],
+ code: properties["浜曠紪鍙�"],
+ lon: properties["Longtitude"],
+ lat: properties["Latitude"],
+ }
+ } else if (propertyNames.indexOf("QYMC") !== -1) {
+ objdata = {
+ POITYPE: "QY",
+ QYMC: properties["QYMC"],
+ XYDM: properties["XYDM"],
+ BZDZ: properties["BZDZ"],
+ DZ: properties["DZ"],
+ lon: properties["Longtitude"],
+ lat: properties["Latitude"],
+ }
+ }
+ }
}
+
+
+
+
store.setTdglShow(false);
store.setTdlgInfo({});
store.setdwShow(true);
diff --git a/src/utils/poiKeys.js b/src/utils/poiKeys.js
index e3c1423..a8a9f70 100644
--- a/src/utils/poiKeys.js
+++ b/src/utils/poiKeys.js
@@ -44,8 +44,6 @@
},
'POINT': {
鍚嶇О: 'name',
- 缁忓害: 'lon',
- 绾害: 'lat',
鍦板潃: 'address'
}
}
diff --git a/static/SmartEarthSDK/Workers/image/xzspj/camera.png b/static/SmartEarthSDK/Workers/image/xzspj/camera.png
new file mode 100644
index 0000000..dd710af
--- /dev/null
+++ b/static/SmartEarthSDK/Workers/image/xzspj/camera.png
Binary files differ
--
Gitblit v1.9.3