From b37aea3e032a573ad0ae6172ee4e08144db6758f Mon Sep 17 00:00:00 2001
From: suerprisePlus <15810472099@163.com>
Date: 星期二, 19 十一月 2024 17:48:27 +0800
Subject: [PATCH] 功能优化
---
src/components/menu/signalling.vue | 30 +++++++++++++++++++-----------
src/components/right/FCFH.vue | 7 +++++--
sw.zip | 0
src/components/left/leftmenu.vue | 4 ++--
src/components/menu/tools/special.vue | 17 +++++++++++------
5 files changed, 37 insertions(+), 21 deletions(-)
diff --git a/src/components/left/leftmenu.vue b/src/components/left/leftmenu.vue
index 77209a2..b06adab 100644
--- a/src/components/left/leftmenu.vue
+++ b/src/components/left/leftmenu.vue
@@ -853,8 +853,8 @@
coord[2]
),
orientation: {
- heading: Cesium.Math.toRadians(coord[3] ? coord[3] : -90),
- pitch: Cesium.Math.toRadians(coord[4] ? coord[4] : 0),
+ heading: Cesium.Math.toRadians(coord[3] ? coord[3] : 0),
+ pitch: Cesium.Math.toRadians(coord[4] ? coord[4] : -90),
roll: Cesium.Math.toRadians(0.0)
},
duration: 2 //椋炶鏃堕棿8s
diff --git a/src/components/menu/signalling.vue b/src/components/menu/signalling.vue
index 5b1b699..bc6c72f 100644
--- a/src/components/menu/signalling.vue
+++ b/src/components/menu/signalling.vue
@@ -15,16 +15,18 @@
</div>
</div>
<div class="signaSlider">
-
- <el-slider v-model="sliderValue" @change="handleSliderChange" :format-tooltip="formatTooltip"
- :marks="silderMark" :step="1" :min="0" :max="47" show-stops>
- </el-slider>
- </div>
- <div class="signaButton">
- <div class="signalling_play" @click="signallingPlay()">
- <img src="~@/assets/img/new/rightArrow.png" />
+ <div class="signaButton">
+ <div class="signalling_play" @click="signallingPlay()">
+ <img src="~@/assets/img/new/rightArrow.png" />
+ </div>
+ </div>
+ <div class="sliderBox">
+ <el-slider v-model="sliderValue" @change="handleSliderChange" :format-tooltip="formatTooltip"
+ :marks="silderMark" :step="1" :min="0" :max="47" show-stops>
+ </el-slider>
</div>
</div>
+
<!-- <div class="signalling_describe">鍗曚綅锛氫竾浜�</div>
<div>
<ul class="signalling_ul">
@@ -95,15 +97,21 @@
}
.signaSlider {
- margin: 20px 20px;
+ display: flex;
+ align-items: center;
+ margin: 10px 0px;
+ width: 100%;
}
.signaButton {
- width: 100%;
+ width: 40px;
display: flex;
justify-content: center;
+ margin-right: 10px;
}
-
+.sliderBox{
+ flex: 1;
+}
.signalling_type {
diff --git a/src/components/menu/tools/special.vue b/src/components/menu/tools/special.vue
index 79c7c47..9a0ac40 100644
--- a/src/components/menu/tools/special.vue
+++ b/src/components/menu/tools/special.vue
@@ -226,6 +226,7 @@
window.divPoint3 = null;
window.instance = null;
let tooltipHTML;
+let tooltip;
window.divPoint1 = null;
window.pickFeature = null;
window.imgUrl = null;
@@ -565,6 +566,10 @@
sgworld.Creator.DeleteObject(buildingPolygon);
buildingPolygon = null;
}
+ if (tooltip) {
+ tooltip.show(false);
+ tooltip = null;
+ }
if (nPickFeature.primitive instanceof Cesium.Billboard) {
if (nPickFeature.id.length > 0) {
return;
@@ -794,11 +799,11 @@
value && (tooltipHTML += `<p>${i}锛�${value || "鏃�"}</p>`);
}
- // if (tooltip) {
- // tooltip.show(false);
- // tooltip = null;
- // }
- var tooltip = sgworld.Core.CreateResultTooltip(window.Viewer, {
+ if (tooltip) {
+ tooltip.show(false);
+ tooltip = null;
+ }
+ tooltip = sgworld.Core.CreateResultTooltip(window.Viewer, {
color: "black",
addY: 0,
far: 200000,
@@ -810,7 +815,7 @@
}
},
});
- console.log(tooltipHTML);
+
let description = `<div style=' border: 1px solid #fff;border-radius: 5px;background: rgba(0, 0, 0, 0.8);color: #fff;padding: 15px;'>${tooltipHTML}</div>`;
tooltip.showAt(
diff --git a/src/components/right/FCFH.vue b/src/components/right/FCFH.vue
index af8b8f1..9e2f4c4 100644
--- a/src/components/right/FCFH.vue
+++ b/src/components/right/FCFH.vue
@@ -11,7 +11,7 @@
</select>
</div>
<br />
- <div id="deviation">
+ <div id="deviation" style="display:none">
鍋忕Щ鏂瑰悜锛�
<input name="offset" id="offsetX" class="styled" value="x" checked type="radio" />
<label>X杞�</label>
@@ -21,8 +21,9 @@
<input name="offset" id="offsetZ" class="styled" value="z" type="radio" />
<label>Z杞�</label>
+ <br />
</div>
- <br />
+
<div class="checkbox checkbox-primary checkbox-inline" id="selectBox">
鏌ョ湅灞傜骇锛�
<select id="selectlevel">
@@ -124,8 +125,10 @@
if (val.indexOf('YHYQ1') > -1) {
$("#selectBox").show();
$("#toolbar").show();
+ $("#deviation").hide();
document.getElementById('offsetX').checked = true;
} else {
+ $("#deviation").show();
falg = true;
$("#selectBox").hide();
$("#toolbar").hide();
diff --git a/sw.zip b/sw.zip
new file mode 100644
index 0000000..1d860e6
--- /dev/null
+++ b/sw.zip
Binary files differ
--
Gitblit v1.9.3