From 38dc484e31723adb7b5e0869d91cc60e6590ee6a Mon Sep 17 00:00:00 2001
From: lixuliang <lixuliang_hd@126.com>
Date: 星期五, 22 十二月 2023 17:17:40 +0800
Subject: [PATCH] 测试结果修复
---
static/NameConf.js | 12 +--
static/SmartEarthSDK/Workers/image/point-16px.png | 0
src/components/map/viewer.vue | 65 +++++++++++++++------
src/components/menu/tools/special.vue | 44 ++++++++++++--
4 files changed, 89 insertions(+), 32 deletions(-)
diff --git a/src/components/map/viewer.vue b/src/components/map/viewer.vue
index a29d709..b8e0ad5 100644
--- a/src/components/map/viewer.vue
+++ b/src/components/map/viewer.vue
@@ -3,29 +3,53 @@
<div id="sdkContainer"></div>
<div class="listBox" v-show="viewer1Show && !isLand">
<ul id="viewer_lsyx">
- <li v-for="(item, index) in arr" :key="index" @click="changeLeftMap($event, item, index)">
+ <li
+ v-for="(item, index) in arr"
+ :key="index"
+ @click="changeLeftMap($event, item, index)"
+ >
{{ item }}
</li>
</ul>
</div>
<layerTreeTwoScreen v-if="layerTreeTwoScreen" />
<!-- <div id="bottomInfo" v-html="bottomInfo"></div> -->
- <div id="switchImagerLayer" :style="{
- transform: `scale(${scale}) translate(${offset},${offset})`,
- '-webkit-transform': `scale(${scale}) translate(${offset},${offset})`,
- '-moz-transform': `scale(${scale}) translate(${offset},${offset})`,
- '-o-transform': `scale(${scale}) translate(${offset},${offset})`,
- '-ms-transform': `scale(${scale}) translate(${offset},${offset})`,
- }">
- <transition name="animate__animated animate__bounce" @click="switchImagerLayerShowOrHide"
- enter-active-class="animate__backInRight" leave-active-class="animate__backOutRight" appear>
+ <div
+ id="switchImagerLayer"
+ :style="{
+ transform: `scale(${scale}) translate(${offset},${offset})`,
+ '-webkit-transform': `scale(${scale}) translate(${offset},${offset})`,
+ '-moz-transform': `scale(${scale}) translate(${offset},${offset})`,
+ '-o-transform': `scale(${scale}) translate(${offset},${offset})`,
+ '-ms-transform': `scale(${scale}) translate(${offset},${offset})`,
+ }"
+ >
+ <transition
+ name="animate__animated animate__bounce"
+ @click="switchImagerLayerShowOrHide"
+ enter-active-class="animate__backInRight"
+ leave-active-class="animate__backOutRight"
+ appear
+ >
<switchImagerLayer ref="switchImagerLayer" v-show="switchImagerLayer" />
</transition>
- <img class="swichImg" @click="switchImagerLayerShowOrHide" :src="switchImage" />
+ <img
+ class="swichImg"
+ @click="switchImagerLayerShowOrHide"
+ :src="switchImage"
+ />
<div class="bgbox">
- <img class="swichImg" @click="switchImagerLayerShowOrHide" src="@/assets/img/new/shiliang.png" />
- <img class="swichImg bgbox" @click="switchImagerLayerShowOrHide" src="@/assets/img/new/shiliang.png" />
+ <img
+ class="swichImg"
+ @click="switchImagerLayerShowOrHide"
+ src="@/assets/img/new/shiliang.png"
+ />
+ <img
+ class="swichImg bgbox"
+ @click="switchImagerLayerShowOrHide"
+ src="@/assets/img/new/shiliang.png"
+ />
</div>
</div>
</div>
@@ -145,7 +169,7 @@
}
);
window.Viewer = sgworld._Viewer;
-
+ sgworld._Viewer.scene.moon.show = false;
window.sgwfs = new SmartEarth.WFSTool(sgworld._Viewer, Cesium);
Viewer.shadows = false;
//娣卞害妫�娴�
@@ -264,7 +288,7 @@
},
initLSYX() {
let ul = document.getElementById("viewer_lsyx");
- let lis = ul.getElementsByTagName('li');
+ let lis = ul.getElementsByTagName("li");
lis[19].click();
},
destroyImageLayer() {
@@ -297,14 +321,12 @@
nLayer = null;
}
nLayer = this.loadBJ54ImageLayer(year);
- if (!LWLayer||Viewer.imageryLayers.indexOf(LWLayer)<0) {
- if(LWLayer)
- {
+ if (!LWLayer || Viewer.imageryLayers.indexOf(LWLayer) < 0) {
+ if (LWLayer) {
LWLayer.destroy();
}
LWLayer = this.loadBJ54LWLayer();
}
-
},
loadBJ54LWLayer() {
let url = "http://172.26.64.84/service/ImageEngine/picdis/abc";
@@ -452,6 +474,11 @@
cancel: function () {
if (cancelFn && typeof cancelFn === "function") {
cancelFn();
+ if (window.pickFeature && window.pickFeature.primitive) {
+ window.pickFeature.primitive.image = imgUrl;
+ window.pickFeature.primitive.scale = scale;
+ window.pickFeature = null;
+ }
}
},
end: function () {
diff --git a/src/components/menu/tools/special.vue b/src/components/menu/tools/special.vue
index e9ef033..53e8e52 100644
--- a/src/components/menu/tools/special.vue
+++ b/src/components/menu/tools/special.vue
@@ -243,6 +243,7 @@
import { roman } from "../../../assets/json/index.js";
import URLInCode from "@/assets/js/urlInCode";
import keyName from "@/utils/poiKeys";
+import LayerField from "../../../../static/NameConf";
let handler;
let tooltipHTML;
window.divPoint1 = null;
@@ -599,9 +600,9 @@
// console.log(nPickFeature);
imgUrl = nPickFeature.primitive.image;
scale = nPickFeature.primitive.scale;
- nPickFeature.primitive.scale = 1;
nPickFeature.primitive.image =
window.SmartEarthRootUrl + "Workers/image/point.png";
+ nPickFeature.primitive.scale = 1;
//鐐瑰嚮寮规
let obj = {};
let lon;
@@ -640,15 +641,46 @@
}
if (!isCamera) {
tooltipHTML = "";
+ //閲嶇疆LayerField鏁版嵁
+ for (let item in LayerField) {
+ LayerField[item] = 0;
+ }
// 鍒犻櫎瀛楁
let { OBJECTID, ID, BZDZ, Latitude, Longtitude, ...userData } =
obj;
- for (let i in userData) {
- let value = userData[i];
- let name = keyName[i] || i;
- value && (tooltipHTML += `<p>${name}锛�${value || "鏃�"}</p>`);
- console.log(tooltipHTML);
+
+ // 鍒ゆ柇灞曠ず鐨勭被鍨�
+ if (
+ userData.hasOwnProperty("閮ㄤ欢鍚嶇О") ||
+ userData.hasOwnProperty("浜曠紪鍙�")
+ ) {
+ //淇敼LayerField鏁版嵁
+ for (let itemName in userData) {
+ let CnName = keyName[itemName] || itemName;
+ if (LayerField.hasOwnProperty(CnName)) {
+ LayerField[CnName] = userData[itemName];
+ if (CnName == "缁忓害" || CnName == "绾害") {
+ let str = Number(LayerField[CnName]);
+ LayerField[CnName] = str.toFixed(6);
+ }
+ }
+ }
+ // 灞曠ずLayerField鏁版嵁
+ for (let item in LayerField) {
+ let value = LayerField[item];
+ value && (tooltipHTML += `<p>${item}锛�${value || "鏃�"}</p>`);
+ }
+ } else {
+ // 鐩存帴灞曠ず
+ for (let itemName in userData) {
+ let value = userData[itemName];
+ let CnName = keyName[itemName] || itemName;
+ value &&
+ (tooltipHTML += `<p>${CnName}锛�${value || "鏃�"}</p>`);
+ console.log(tooltipHTML);
+ }
}
+
let description = `
<div id="pointInfoBox" class="pointInfoBox" style="pointer-events:auto;">
<span style="position: absolute; right: 12px; top: 6px;">脳</span>
diff --git a/static/NameConf.js b/static/NameConf.js
index 586b07e..8f619f6 100644
--- a/static/NameConf.js
+++ b/static/NameConf.js
@@ -1,21 +1,19 @@
const LayerField = {
ID: 0,
- 浜曞悕绉�: 0,
浜曠紪鍙�: 0,
- 鏍囨澶�: 0,
+ 浜曠被鍨�: 0,
+ 琛屾斂鍖哄煙缂�: 0,
浣嶇疆: 0,
- 琛屾斂鍖�: 0,
+ 鏍囨澶�: 0,
+
閮ㄤ欢鍚嶇О: 0,
閮ㄤ欢缂栫爜: 0,
瀹夎鍦板潃: 0,
- 璺悕: 0,
- 璁惧鏉冨睘: 0,
- 閮ㄤ欢绫诲瀷: 0,
鎵�灞炲尯鍩�: 0,
+ 璁惧鏉冨睘: 0,
缁忓害: 0,
绾害: 0
-
}
export default LayerField
\ No newline at end of file
diff --git a/static/SmartEarthSDK/Workers/image/point-16px.png b/static/SmartEarthSDK/Workers/image/point-16px.png
index a8c9456..2df2a10 100644
--- a/static/SmartEarthSDK/Workers/image/point-16px.png
+++ b/static/SmartEarthSDK/Workers/image/point-16px.png
Binary files differ
--
Gitblit v1.9.3