From e8ec0a53b3fddeaf0f70ef38abad9a2ad1207c93 Mon Sep 17 00:00:00 2001
From: ZhAkps <46207005+ZhAkps@users.noreply.github.com>
Date: 星期二, 06 二月 2024 15:39:02 +0800
Subject: [PATCH] Merge branch 'master' of http://106.120.22.35:48888/r/PM20221203225_MobileWeb
---
src/components/viewer2.vue | 63 ++++++++++++++++++++++++-------
1 files changed, 48 insertions(+), 15 deletions(-)
diff --git a/src/components/viewer2.vue b/src/components/viewer2.vue
index efd53eb..17b3c6f 100644
--- a/src/components/viewer2.vue
+++ b/src/components/viewer2.vue
@@ -3,6 +3,14 @@
<!-- 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" />
@@ -52,11 +60,12 @@
<!-- 鍦熷湴绠＄悊寮圭獥 -->
<my-land-admin-info></my-land-admin-info>
<my-slider></my-slider>
+ <my-poplayer></my-poplayer>
</div>
</template>
<script>
import store from "@/utils/store2.js";
-
+import { setClick } from '@/utils/map2.js'
import _GLOBAL from "@/assets/GLOBAL2";
import { leftClick, loadLayer } from "@/utils/map.js";
import leftBottom from "@/components/leftMenu/bottom2.vue";
@@ -66,9 +75,9 @@
import NavigationBar from "./rightNavigation/NavigationBar2.vue";
import layertree from "@/components/rightMenu/layerTree2.vue";
import settingPanel from "./sideMenu/settingMenu/main.vue";
-import collectionPanel from "./sideMenu/collectionMenu/main.vue";
+import collectionPanel from "./sideMenu/collectionMenu/main2.vue";
import directionPanel from "./sideMenu/directionMenu/main.vue";
-import addCollectionPanel from "./sideMenu/addCollectionMenu/main.vue";
+import addCollectionPanel from "./sideMenu/addCollectionMenu/main2.vue";
import statisticsPanel from "./sideMenu/statisticsMenu/main.vue";
import manholePanel from "./sideMenu/manholeStatistics/main.vue";
import videoPanel from "./sideMenu/videoStatistics/main.vue";
@@ -77,6 +86,7 @@
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 Axios from "axios";
@@ -112,6 +122,7 @@
"my-history": history,
"my-land-admin-info": landAdminInfo,
"my-slider": sliderAlpha,
+ "my-poplayer": poplayer
},
data() {
return {
@@ -134,7 +145,7 @@
state: store.history,
};
},
- created() {},
+ created() { },
mounted() {
this.$nextTick(function () {
console.log("openlayer init");
@@ -251,7 +262,7 @@
});
window.map = map;
-
+ setClick(true)
// var url =
// "https://skyzt.bda.gov.cn/gisserver/tmsserver/chengshiguihua_dikuaibianhao_tms/";
@@ -347,16 +358,16 @@
// console.log("鍙屽嚮");
// Viewer.camera.zoomIn();
// console.log(window.clickPOI);
- let p = sgworld.Navigate.getDegrees();
+ // 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,
- });
+ // Viewer.camera.flyTo({
+ // destination: Cesium.Cartesian3.fromDegrees(
+ // window.clickPOI.lon,
+ // window.clickPOI.lat,
+ // p.height / 1.8
+ // ),
+ // duration: 1.0,
+ // });
}
this.count = 0;
}, 300);
@@ -393,7 +404,7 @@
console.log(window.gisBaseUrl);
Axios.get(
window.gisBaseUrl +
- "/gisserver/wfsserver/qiyelianqiye?version=1.3.0&request=GetFeature&format=json&typename=浼佷笟閾句紒涓�"
+ "/gisserver/wfsserver/qiyelianqiye?version=1.3.0&request=GetFeature&format=json&typename=浼佷笟閾句紒涓�"
).then((res) => {
console.log(res);
});
@@ -408,6 +419,7 @@
height: 100%;
background: black;
position: absolute !important;
+ z-index: 0;
}
.titleBg {
@@ -431,13 +443,34 @@
.bottomLeft {
display: none;
}
+
.colseBtn {
position: absolute;
z-index: 2;
top: 0.55rem;
left: 0.2rem;
}
+
.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