From 7c4546cc6f84adf52a4aaa61244635615041c178 Mon Sep 17 00:00:00 2001
From: lixuliang <lixuliang_hd@126.com>
Date: 星期三, 06 三月 2024 18:10:51 +0800
Subject: [PATCH] Merge branch 'master' of http://103.135.160.14:9034/r/PM20221203225_MobileWeb

---
 src/components/viewer2.vue |   62 +++++++++++++++----------------
 1 files changed, 30 insertions(+), 32 deletions(-)

diff --git a/src/components/viewer2.vue b/src/components/viewer2.vue
index 36f3865..01f4e22 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,touchClick } from "@/utils/map2.js";
 import _GLOBAL from "@/assets/GLOBAL2";
 // import { leftClick, loadLayer } from "@/utils/map.js";
 import leftBottom from "@/components/leftMenu/bottom2.vue";
@@ -266,18 +266,16 @@
       });
 
       window.mapapi = map;
-
       addImageLayer();
       addAnnotationLayer();
       addHxLayer();
       addYzLayer();
 
       setClick(true);
+      touchClick();
 
       getCurrentPosition();
       listenDirection();
-
-
       // leftClick()
 
       window.layerOpen = function (name, options) {
@@ -336,34 +334,34 @@
   },
   methods: {
     clicktoclose() {
-      clearTimeout(this.timer);
-      this.timer = setTimeout(() => {
-        this.count++;
-        if (this.count == 2) {
-          // console.log("鍗曞嚮浜嬩欢");
-          // 鍏抽棴鎵�鏈夊脊绐�
-          //this.$refs.menu.closeall();
-          // 娓呴櫎瀹氫綅涓殑浣嶇疆鏍囪
-          //this.$refs.menu.clearFlyPoint();
-        } else {
-          // 鎵ц鏀惧ぇ鎿嶄綔
-          // console.log("鍙屽嚮");
-          // Viewer.camera.zoomIn();
-          // console.log(window.clickPOI);
-          // let p = sgworld.Navigate.getDegrees();
-          // console.log(p);
-          // Viewer.camera.flyTo({
-          //   destination: Cesium.Cartesian3.fromDegrees(
-          //     window.clickPOI.lon,
-          //     window.clickPOI.lat,
-          //     p.height / 1.8
-          //   ),
-          //   duration: 1.0,
-          // });
-        }
-        this.count = 0;
-      }, 300);
-      this.count++;
+      // clearTimeout(this.timer);
+      // this.timer = setTimeout(() => {
+      //   this.count++;
+      //   if (this.count == 2) {
+      //     // console.log("鍗曞嚮浜嬩欢");
+      //     // 鍏抽棴鎵�鏈夊脊绐�
+      //     //this.$refs.menu.closeall();
+      //     // 娓呴櫎瀹氫綅涓殑浣嶇疆鏍囪
+      //     //this.$refs.menu.clearFlyPoint();
+      //   } else {
+      //     // 鎵ц鏀惧ぇ鎿嶄綔
+      //     // console.log("鍙屽嚮");
+      //     // Viewer.camera.zoomIn();
+      //     // console.log(window.clickPOI);
+      //     // let p = sgworld.Navigate.getDegrees();
+      //     // console.log(p);
+      //     // Viewer.camera.flyTo({
+      //     //   destination: Cesium.Cartesian3.fromDegrees(
+      //     //     window.clickPOI.lon,
+      //     //     window.clickPOI.lat,
+      //     //     p.height / 1.8
+      //     //   ),
+      //     //   duration: 1.0,
+      //     // });
+      //   }
+      //   this.count = 0;
+      // }, 300);
+      // this.count++;
     },
     datafromchild(data) {
       for (var i in data) {

--
Gitblit v1.9.3