From 076cd08a4abcae33957e4de5b15babfcb6fed8ce Mon Sep 17 00:00:00 2001
From: Jin Lei <jinlei_182@163.com>
Date: 星期六, 11 十一月 2023 15:32:39 +0800
Subject: [PATCH] [viewer]解决合并冲突
---
src/components/menu/tools/special.vue | 52 +++++++++++++++++++++++++++++++---------------------
1 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/src/components/menu/tools/special.vue b/src/components/menu/tools/special.vue
index 8d097a1..7ecf400 100644
--- a/src/components/menu/tools/special.vue
+++ b/src/components/menu/tools/special.vue
@@ -65,7 +65,7 @@
<el-button> <img src="@/assets/img/left/ztfx/yqfk.png" /> </el-button
></el-tooltip>
</div>
- <div class="specialTool" @click="kuangxuan()">
+ <div class="specialTool" @click="rangeQuery()">
<el-tooltip
class="item"
effect="dark"
@@ -76,6 +76,17 @@
<el-button> <img src="@/assets/img/left/ztfx/sjxq.png" /> </el-button
></el-tooltip>
</div>
+ <!-- <div class="specialTool" @click="guanxian(openGX)">
+ <el-tooltip
+ class="item"
+ effect="dark"
+ content="鍦颁笅绠＄嚎"
+ placement="top-start"
+ popper-class="item_tooltip"
+ >
+ <el-button> <img src="@/assets/img/left/ztfx/spl.png" /> </el-button
+ ></el-tooltip>
+ </div> -->
<!-- <div class="specialTool" @click="sceneRoaming">
<el-tooltip
class="item"
@@ -122,7 +133,7 @@
/* border-radius: 30px; */
box-shadow: 0px 0px 7px rgba(76, 165, 248, 0.8) inset;
background-color: rgba(14, 50, 143, 0.5);
- width: 460px;
+ width: 350px;
}
.specialTools {
margin-left: 20px;
@@ -207,7 +218,6 @@
import Bus from "../../tools/Bus";
import { roman } from "../../../assets/json/index.js";
import URLInCode from "@/assets/js/urlInCode";
-
let handler;
let pickFeature;
let tooltipHTML;
@@ -220,12 +230,14 @@
let video2;
let video3;
let video4;
+let promiseS3M;
//浜ら�氬浘灞�
let panoramaLayer;
export default {
name: "special",
data() {
return {
+ openGX: "open",
showPointInfo: true,
romanOption: [
{ name: "鏍稿績鍖�" },
@@ -462,7 +474,7 @@
yqfkHandle() {
this.setYqfk(!this.yqfk);
},
- kuangxuan() {
+ rangeQuery() {
Bus.$emit("showRangeBox", true);
},
tdglHandle() {
@@ -547,9 +559,7 @@
handler.setInputAction((event) => {
let nPickFeature = sgworld.Viewer.scene.pick(event.position);
if (Cesium.defined(nPickFeature)) {
- // console.log(nPickFeature);
if (nPickFeature.primitive instanceof Cesium.Billboard) {
- console.log(nPickFeature.id);
if (nPickFeature.id.length > 0) {
return;
}
@@ -568,7 +578,6 @@
if (nPickFeature.id.tag) {
let properties = nPickFeature.id.properties;
let propertyNames = nPickFeature.id.properties.propertyNames;
- // console.log(propertyNames);
if (propertyNames.indexOf("鐩戞帶鍚�") !== -1) {
obj["JK鍚嶇О"] = properties["JK鍚嶇О"]._value;
obj["JK绫诲瀷"] = properties["JK绫诲瀷"]._value;
@@ -798,20 +807,7 @@
});
});
},
- spjkHandle() {
- if (window.sxtkGeojson) {
- window.sxtkGeojson.deleteObject();
- window.sxtkGeojson = null;
- window.sxthandler.destroy();
- //鍏抽棴寮圭獥
- Bus.$emit("closeRightPop", true);
- layuiLayer.close(SmartEarthPopupData.layerProp);
- return;
- } else {
- Bus.$emit("showSPJK");
- // this.spjkLoad();
- }
- },
+
handleCommand(command) {
switch (command) {
case "qytj":
@@ -887,6 +883,20 @@
video && video.destroy();
video = undefined;
},
+ guanxian(params) {
+ if (params == "open") {
+ promiseS3M = sgworld.coreMap.scene.open(
+ "http://192.162.2.2:8090/iserver/services/3D-GX/rest/realspace"
+ );
+ this.openGX = "close";
+ } else {
+ promiseS3M.then((res) => {
+ res.forEach((item) => {
+ item.visible = false;
+ });
+ });
+ }
+ },
},
};
</script>
--
Gitblit v1.9.3