From 0cae92b7ed0a080f74df6a30c0d68d2d0b45ec70 Mon Sep 17 00:00:00 2001
From: 少年 <1392120328@qq.com>
Date: 星期三, 13 三月 2024 11:32:49 +0800
Subject: [PATCH] Merge branch 'master' of http://103.135.160.14:9034/r/PM20221203225_MobileWeb
---
src/utils/map2.js | 104 +++++++++++++++++++++++++++++++++++----------------
1 files changed, 71 insertions(+), 33 deletions(-)
diff --git a/src/utils/map2.js b/src/utils/map2.js
index 2cb9b64..2a78f53 100644
--- a/src/utils/map2.js
+++ b/src/utils/map2.js
@@ -2245,6 +2245,8 @@
//openlayer 鍦板浘鐐瑰嚮浜嬩欢
export function setClick(state) {
function handleClick(e) {
+ let coordinate = ol.proj.toLonLat(e.coordinate)
+ // console.log(coordinate, '鍦板浘鐐瑰嚮')
store.setLayerPanelShow(false);
// 鍦熷湴绠＄悊
if (store.tdglInfo.flag) {
@@ -2253,9 +2255,9 @@
// "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 + "BEApi/cs/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] +
+ coordinate[0] +
"&lat=" +
- e.coordinate[1] +
+ coordinate[1] +
"&geom=true&requesttype=json"
).then(response => {
let center = { lon: 0, lat: 0 };
@@ -2382,41 +2384,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 = {
@@ -2481,4 +2499,24 @@
zoom: 15,
duration: 1500
})
-}
\ No newline at end of file
+}
+
+//鐩戝惉鍦板浘鍙屽嚮浜嬩欢
+
+export function touchClick() {
+ let dom = document.getElementById('openlayerContainer');
+ dom.addEventListener('touchstart', onTouchStart);
+ function onTouchStart(e) {
+ let len = e.touches.length;
+ if (len === 2) {
+ window.mapapi.getView().animate({
+ center: window.mapapi.getView().getCenter(),
+ zoom: window.mapapi.getView().getZoom() - 1,
+ duration: 1000,
+ });
+ }
+ }
+}
+
+
+
--
Gitblit v1.9.3