From edba1eb33a06bfb9b64e9d6d2e3de8bc49eca333 Mon Sep 17 00:00:00 2001
From: lixuliang <lixuliang_hd@126.com>
Date: 星期三, 13 三月 2024 10:47:52 +0800
Subject: [PATCH] 20240313
---
src/components/viewer2.vue | 14 +++++--
src/components/sideMenu/layerMenu/layerPanel2.vue | 6 +-
src/utils/map2.js | 76 +++++++++++++++++++++++---------------
3 files changed, 59 insertions(+), 37 deletions(-)
diff --git a/src/components/sideMenu/layerMenu/layerPanel2.vue b/src/components/sideMenu/layerMenu/layerPanel2.vue
index 6a2f1ba..ebeab92 100644
--- a/src/components/sideMenu/layerMenu/layerPanel2.vue
+++ b/src/components/sideMenu/layerMenu/layerPanel2.vue
@@ -209,7 +209,7 @@
],
zhuantiList: ZTTitem,
//curMapModelIndex: 1,
- curEMapModelIndex: 1,
+ curEMapModelIndex: 0,
curSMapModelIndex: -1,
curAreaTypeIndex: -1,
curYjIndex: -1,
@@ -275,9 +275,9 @@
clearAll();
switch (result.name) {
case "浜岀淮鍦板浘":
- loadGeoMap();
+ // loadGeoMap();
loadBaseMap();
- addAnnotationLayer();
+ // addAnnotationLayer();
addHxLayer();
addYzLayer();
window.mapapi.getView().setZoom(14);
diff --git a/src/components/viewer2.vue b/src/components/viewer2.vue
index 01f4e22..ea35086 100644
--- a/src/components/viewer2.vue
+++ b/src/components/viewer2.vue
@@ -259,15 +259,21 @@
view: new ol.View({
center: [116.505348, 39.795592],
projection: "EPSG:4326",
- zoom: 12,
- minZoom: 9.5,
+ zoom: 15,
+ minZoom: 12,
+ maxZoom: 18,
enableRotation: false,
}),
});
window.mapapi = map;
- addImageLayer();
- addAnnotationLayer();
+ // 鍔犺浇褰卞儚搴曞浘
+ // addImageLayer();
+ // 鍔犺浇楂樺痉娉ㄨ
+ // addAnnotationLayer();
+ // 鍔犺浇鐭㈤噺鍦板浘
+ loadBaseMap();
+
addHxLayer();
addYzLayer();
diff --git a/src/utils/map2.js b/src/utils/map2.js
index 30f1293..88b586d 100644
--- a/src/utils/map2.js
+++ b/src/utils/map2.js
@@ -2382,41 +2382,57 @@
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: '杩炴帴鐘舵�佹煡璇腑',
+ const infoM = Message({
+ message: '璇ョ偣浣嶈棰戠洃鎺ф煡璇腑锛岃绋嶅悗',
type: 'info',
- offset: 60,
+ offset: 75,
center: true,
- duration: 1000,
+ duration: 0,
});
- 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: () => {
+ axios
+ .get(
+ // 璇锋眰鍦ㄧ嚎鐘舵��
+ window.gisBaseUrl + "BEApi/getCameraDetails?cameraIndexCode=" +
+ properties["JK鍐呯爜"]
+ ).then(res => {
+ if (res.data.data.status == 1) {
+ infoM.close();
+ Message({
+ message: '瑙嗛鐩戞帶鍦ㄧ嚎涓�',
+ type: 'success',
+ offset: 75,
+ center: true,
+ duration: 2000,
+ });
+ 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: () => {
+ },
+ cancel: () => {
- },
- },
- });
+ },
+ },
+ });
+ } else {
+ infoM.close();
+ Message({
+ message: '璇ョ偣浣嶈棰戠洃鎺х绾夸腑',
+ type: 'errer',
+ offset: 75,
+ center: true,
+ duration: 2000,
+ });
+ return
+ }
+ })
return
} else if (propertyNames.indexOf("閮ㄤ欢鍚嶇О") !== -1) {
objdata = {
--
Gitblit v1.9.3