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 |   87 ++++++++++++++++++++++++-------------------
 1 files changed, 48 insertions(+), 39 deletions(-)

diff --git a/src/components/viewer2.vue b/src/components/viewer2.vue
index dbd4d81..ea35086 100644
--- a/src/components/viewer2.vue
+++ b/src/components/viewer2.vue
@@ -4,9 +4,9 @@
     <div id="openlayerContainer" @click="clicktoclose"></div>
 
     <!-- 椤甸潰鏍囬 -->
-    <div class="titleBg">
+    <!-- <div class="titleBg">
       <img src="@/assets/img/title/title.png" />
-    </div>
+    </div> -->
     <!-- 鍘嗗彶褰卞儚 -->
     <my-history v-if="state.show"></my-history>
     <!-- 鍘嗗彶褰卞儚鍏抽棴鎸夐挳 -->
@@ -24,7 +24,7 @@
     <!-- 鍘熷乏涓嬭彍鍗� -->
     <!-- <my-menu v-on:getshowsta="datafromchild" ref="menu"></my-menu> -->
     <!-- 宸︿笅蹇嵎鍖哄煙锛堝浣嶃�佹寚鍖楃瓑锛� -->
-    <my-left-bottom :test="childrendata"></my-left-bottom>
+    <!-- <my-left-bottom :test="childrendata"></my-left-bottom> -->
     <!-- 鍙充笅蹇嵎鍖哄煙锛堟斁澶х缉灏忥級 -->
     <my-right-bottom :test="childrendata"></my-right-bottom>
 
@@ -34,7 +34,7 @@
     <!-- 浣嶇疆闈㈡澘 -->
     <my-collection-panel></my-collection-panel>
     <!-- 鎸囧寳閽堥潰鏉� -->
-    <my-direction-panel></my-direction-panel>
+    <!-- <my-direction-panel></my-direction-panel> -->
     <!-- 鏂板鏀惰棌闈㈡澘 -->
     <my-add-collection-panel></my-add-collection-panel>
     <!-- 绐ㄤ簳銆佹憚鍍忓ご缁熻闈㈡澘 -->
@@ -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";
@@ -87,7 +87,8 @@
   addHxLayer,
   addYzLayer,
   loadBaseMap,
-  getCurrentPosition,
+  listenDirection,
+  getCurrentPosition
 } from "@/utils/tool";
 // import Map from "ol/Map.js";
 // import TileLayer from "ol/layer/Tile.js";
@@ -258,21 +259,29 @@
         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,
         }),
-        // events: ["singleclick", "pointermove"],
       });
 
       window.mapapi = map;
+      // 鍔犺浇褰卞儚搴曞浘
+      // addImageLayer();
+      // 鍔犺浇楂樺痉娉ㄨ
+      // addAnnotationLayer();
+      // 鍔犺浇鐭㈤噺鍦板浘
+      loadBaseMap();
 
-      addImageLayer();
-      addAnnotationLayer();
       addHxLayer();
       addYzLayer();
 
       setClick(true);
+      touchClick();
+
       getCurrentPosition();
+      listenDirection();
       // leftClick()
 
       window.layerOpen = function (name, options) {
@@ -331,34 +340,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