From 7a1966fcaf11102e608d248532eb60eafb878b2c Mon Sep 17 00:00:00 2001
From: 少年 <1392120328@qq.com>
Date: 星期二, 27 二月 2024 15:16:52 +0800
Subject: [PATCH] youhua

---
 src/components/viewer2.vue |  160 +++++++++++++++++++++++++----------------------------
 1 files changed, 76 insertions(+), 84 deletions(-)

diff --git a/src/components/viewer2.vue b/src/components/viewer2.vue
index b8e22f5..f136701 100644
--- a/src/components/viewer2.vue
+++ b/src/components/viewer2.vue
@@ -3,21 +3,12 @@
     <!-- openlayer -->
     <div id="openlayerContainer" @click="clicktoclose"></div>
 
-    <div id="ponitPanel">
-      <div id="ponitPanel-close" @click.stop="closehandle"></div>
-      <div class="title">鐐逛綅璇︽儏</div>
-      <div id="ponitPanel-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" />
@@ -43,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>
     <!-- 绐ㄤ簳銆佹憚鍍忓ご缁熻闈㈡澘 -->
@@ -66,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";
@@ -85,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/main2.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";
@@ -123,7 +114,7 @@
     "my-history": history,
     "my-land-admin-info": landAdminInfo,
     "my-slider": sliderAlpha,
-    "my-poplayer": poplayer
+    "my-poplayer": mainPoplayer
   },
   data() {
     return {
@@ -244,13 +235,13 @@
         id: "cva_c",
         source: wmtsSource2,
       });
-      wmtsLayer2.setVisible(false);
+      // wmtsLayer2.setVisible(false);
       ////鍗槦褰卞儚
       layers.push(wmtsLayer);
       ////浜岀淮鍦板浘
       layers.push(wmtsLayer2);
       ////璺綉
-      layers.push(wmtsLayer1);
+      // layers.push(wmtsLayer1);
 
       const map = new ol.Map({
         layers: layers,
@@ -259,11 +250,74 @@
           center: [116.505348, 39.795592],
           projection: "EPSG:4326",
           zoom: 12,
+          minZoom: 8.5
         }),
       });
 
-      window.map = map;
+      window.mapapi = map;
+
+      //鍔犺浇鑸媿褰卞儚
+      window.ImageLayer = new ol.layer.Tile({
+        id: 'C0698021',
+        visible: true,
+        source: new ol.source.XYZ({
+          wrapX: true,
+          url: `${'https://services.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer'}/tile/{z}/{y}/{x}`,
+        }),
+        projection: new ol.proj.get('EPSG:4326')
+      });
+      window.mapapi.addLayer(window.ImageLayer);
+
+      //鍔犺浇楂樺痉鏍囨敞
+      window.annotation = new ol.layer.Tile({
+        id: '69EB42A8',
+        visible: true,
+        source: new ol.source.XYZ({
+          wrapX: true,
+          url: `https://webst02.is.autonavi.com/appmaptile?style=8&x={x}&y={y}&z={z}`,
+        }),
+        projection: new ol.proj.get('EPSG:4326')
+      });
+      window.mapapi.addLayer(window.annotation);
+
+
+      window.hexin = new ol.layer.Tile({
+        source: new ol.source.TileWMS({
+          ratio: 3,
+          url: 'https://skyzt.bda.gov.cn/gisserver/wmsserver/YZ_BJ60',//鍥惧眰鍦板潃
+          params: {
+            'VERSION': '1.1.1',
+            'SRS': 'EPSG:4326',
+            'FORMAT': 'image/png',
+            'TILED': true,
+            "LAYERS": ''
+          }
+        })
+      })
+      window.mapapi.addLayer(window.hexin)
+
+
+      //浜﹀簞鏂板煄瑙勫垝鑼冨洿
+      window.yizhuang = new ol.layer.Tile({
+        source: new ol.source.TileWMS({
+          ratio: 3,
+          url: 'https://skyzt.bda.gov.cn/gisserver/wmsserver/YZ_BJ',//鍥惧眰鍦板潃
+          params: {
+            'VERSION': '1.1.1',
+            'SRS': 'EPSG:4326',
+            'FORMAT': 'image/png',
+            'TILED': true,
+            "LAYERS": ''
+          }
+        })
+      })
+      window.mapapi.addLayer(window.yizhuang)
+
+
+
+
       setClick(true)
+      // leftClick()
       // var url =
       //   "https://skyzt.bda.gov.cn/gisserver/tmsserver/chengshiguihua_dikuaibianhao_tms/";
 
@@ -287,7 +341,7 @@
       //     },
       //   }),
       // });
-      // window.map.addLayer(tmslayer);
+      // window.mapapi.addLayer(tmslayer);
 
       window.layerOpen = function (name, options) {
         layuiLayer.close(SmartEarthPopupData.layerProp);
@@ -454,67 +508,5 @@
 
 .colseBtn img {
   width: 30px;
-}
-
-#ponitPanel {
-  /* display: none; */
-  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;
-  font-size: 16px;
-  pointer-events: all;
-}
-
-.title {
-  width: 100%;
-  text-align: center;
-  font-size: 20px;
-  font-weight: 700;
-  letter-spacing: 4px;
-  padding-left: 26px;
-}
-
-
-#ponitPanel-close {
-  pointer-events: all;
-  width: 28px;
-  height: 28px;
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  background-image: url("./poplayer/img/close.png");
-  margin-top: 8px;
-  margin-right: 5px;
-  float: right;
-  cursor: pointer;
-}
-
-#ponitPanel-content {
-  width: 100%;
-  margin: auto;
-}
-
-.ponitPanel-item {
-  width: 90%;
-  overflow: hidden;
-  margin-bottom: 7px;
-  margin-left: 25px;
-  margin-right: 20px;
-  word-break: break-all;
-}
-
-.ponitPanel-name {
-  /* min-width: 100px; */
-  float: left;
-}
-
-.ponitPanel-value {
-  max-width: 400px;
-  float: left;
-  color: aqua;
 }
 </style>

--
Gitblit v1.9.3