From a6069df12050e0bff8aaa2d530b9cc8d348910ca Mon Sep 17 00:00:00 2001
From: 少年 <1392120328@qq.com>
Date: 星期二, 06 二月 2024 17:28:21 +0800
Subject: [PATCH] Merge branch 'master' of http://106.120.22.35:48888/r/PM20221203225_MobileWeb
---
src/components/viewer2.vue | 120 +++++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 99 insertions(+), 21 deletions(-)
diff --git a/src/components/viewer2.vue b/src/components/viewer2.vue
index efd53eb..2358e2a 100644
--- a/src/components/viewer2.vue
+++ b/src/components/viewer2.vue
@@ -3,6 +3,15 @@
<!-- 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" />
@@ -52,13 +61,14 @@
<!-- 鍦熷湴绠＄悊寮圭獥 -->
<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,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";
@@ -66,9 +76,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";
@@ -76,8 +86,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 sliderAlpha from "./sideMenu/sliderAlpha/main.vue";
+import landAdminInfo from "./poplayer/landAdmin2.vue";
+import poplayer from "./poplayer/main2.vue";
+import sliderAlpha from "./sideMenu/sliderAlpha/main2.vue";
import Axios from "axios";
// import Map from "ol/Map.js";
@@ -112,6 +123,7 @@
"my-history": history,
"my-land-admin-info": landAdminInfo,
"my-slider": sliderAlpha,
+ "my-poplayer": poplayer
},
data() {
return {
@@ -134,7 +146,7 @@
state: store.history,
};
},
- created() {},
+ created() { },
mounted() {
this.$nextTick(function () {
console.log("openlayer init");
@@ -173,7 +185,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,
@@ -251,10 +263,11 @@
});
window.map = 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,
@@ -347,16 +360,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 +406,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);
});
@@ -407,7 +420,8 @@
width: 100%;
height: 100%;
background: black;
- position: absolute !important;
+ /* position: absolute !important; */
+ z-index: 0;
}
.titleBg {
@@ -431,13 +445,77 @@
.bottomLeft {
display: none;
}
+
.colseBtn {
position: absolute;
z-index: 2;
top: 0.55rem;
left: 0.2rem;
}
+
.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