From f7ab8838f095134c65d2628fe54a6fb8c5df146e Mon Sep 17 00:00:00 2001
From: 少年 <1392120328@qq.com>
Date: 星期三, 07 二月 2024 16:52:38 +0800
Subject: [PATCH] 111

---
 src/components/viewer2.vue |   53 ++++++++++++++---------------------------------------
 1 files changed, 14 insertions(+), 39 deletions(-)

diff --git a/src/components/viewer2.vue b/src/components/viewer2.vue
index 17b3c6f..534a607 100644
--- a/src/components/viewer2.vue
+++ b/src/components/viewer2.vue
@@ -3,20 +3,12 @@
     <!-- openlayer -->
     <div id="openlayerContainer" @click="clicktoclose"></div>
 
-    <div id="ponitPanel">
-      <div class="title">鐐逛綅璇︽儏</div>
-      <div class="content">
-
-      </div>
-
-    </div>
-
     <!-- 椤甸潰鏍囬 -->
     <div class="titleBg">
       <img src="@/assets/img/title/title.png" />
     </div>
     <!-- 鍘嗗彶褰卞儚 -->
-    <!-- <my-history v-if="state.show"></my-history> -->
+    <my-history v-if="state.show"></my-history>
     <!-- 鍘嗗彶褰卞儚鍏抽棴鎸夐挳 -->
     <!-- <div class="colseBtn" v-if="state.show" @click="closeHistory(false)">
       <img class="searchBtn" src="@/assets/closeinput1.png" />
@@ -65,9 +57,9 @@
 </template>
 <script>
 import store from "@/utils/store2.js";
-import { setClick } from '@/utils/map2.js'
+import { setClick,leftClick } from '@/utils/map2.js'
 import _GLOBAL from "@/assets/GLOBAL2";
-import { leftClick, loadLayer } from "@/utils/map.js";
+// import { leftClick, loadLayer } from "@/utils/map.js";
 import leftBottom from "@/components/leftMenu/bottom2.vue";
 import rightBottom from "@/components/rightMenu/bottom2.vue";
 import sousuo from "@/components/leftMenu/sousuo2.vue";
@@ -84,10 +76,10 @@
 import layerPanel from "./sideMenu/layerMenu/main2.vue";
 import roamPanel from "./sideMenu/roamPanel/main.vue";
 import layerTreePanel from "./sideMenu/layerTreePanel/main2.vue";
-import history from "./poplayer/history.vue";
-import landAdminInfo from "./poplayer/landAdmin.vue";
-import poplayer from "./poplayer/main.vue";
-import sliderAlpha from "./sideMenu/sliderAlpha/main.vue";
+import history from "./poplayer/history2.vue";
+import landAdminInfo from "./poplayer/landAdmin2.vue";
+import mainPoplayer from "./poplayer/poplayer2.vue";
+import sliderAlpha from "./sideMenu/sliderAlpha/main2.vue";
 import Axios from "axios";
 
 // import Map from "ol/Map.js";
@@ -122,7 +114,7 @@
     "my-history": history,
     "my-land-admin-info": landAdminInfo,
     "my-slider": sliderAlpha,
-    "my-poplayer": poplayer
+    "my-poplayer":mainPoplayer
   },
   data() {
     return {
@@ -184,7 +176,7 @@
         resolutions[z] = width / (256 * Math.pow(2, z));
         matrixIds[z] = z;
       }
-      let wmtsTileGrid = new  ol.tilegrid.WMTS({
+      let wmtsTileGrid = new ol.tilegrid.WMTS({
         origin: origin,
         resolutions: resolutions,
         matrixIds: matrixIds,
@@ -261,11 +253,12 @@
         }),
       });
 
-      window.map = map;
+      window.mapapi = map;
       setClick(true)
+      // leftClick()
       // var url =
       //   "https://skyzt.bda.gov.cn/gisserver/tmsserver/chengshiguihua_dikuaibianhao_tms/";
-      
+
       // var tmslayer = new ol.layer.Tile({
       //   source: new ol.source.XYZ({
       //     projection: projection,
@@ -286,7 +279,7 @@
       //     },
       //   }),
       // });
-      // window.map.addLayer(tmslayer);
+      // window.mapapi.addLayer(tmslayer);
 
       window.layerOpen = function (name, options) {
         layuiLayer.close(SmartEarthPopupData.layerProp);
@@ -418,7 +411,7 @@
   width: 100%;
   height: 100%;
   background: black;
-  position: absolute !important;
+  /* position: absolute !important; */
   z-index: 0;
 }
 
@@ -454,23 +447,5 @@
 .colseBtn img {
   width: 30px;
 }
-
-#ponitPanel {
-  width: 80vw;
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  background-image: url("./poplayer/img/bg.png");
-  z-index: 999;
-  color: #fff;
-  font-family: SourceHanSansSC-R;
-  padding: 10px 5px 10px 5px;
-  box-sizing: border-box;
-  font-size: 16px;
-  pointer-events: all;
-  position: absolute;
-  bottom: 12px;
-  left: -50px;
-}
-
 
 </style>

--
Gitblit v1.9.3