From 26385d2c91d763259eb1ef55c3255e5ca01717a5 Mon Sep 17 00:00:00 2001
From: ZhAkps <46207005+ZhAkps@users.noreply.github.com>
Date: 星期二, 06 二月 2024 18:18:08 +0800
Subject: [PATCH] Merge branch 'master' of http://106.120.22.35:48888/r/PM20221203225_MobileWeb
---
src/components/viewer2.vue | 83 +++--------------------------------------
1 files changed, 7 insertions(+), 76 deletions(-)
diff --git a/src/components/viewer2.vue b/src/components/viewer2.vue
index b8e22f5..65aad7c 100644
--- a/src/components/viewer2.vue
+++ b/src/components/viewer2.vue
@@ -3,15 +3,6 @@
<!-- 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" />
@@ -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";
@@ -86,9 +77,9 @@
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 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 {
@@ -264,6 +255,7 @@
window.map = map;
setClick(true)
+ leftClick()
// var url =
// "https://skyzt.bda.gov.cn/gisserver/tmsserver/chengshiguihua_dikuaibianhao_tms/";
@@ -456,65 +448,4 @@
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