From 94cfc15f29212c722f294b6b90c88dbb4197a496 Mon Sep 17 00:00:00 2001
From: wangyawei <1796609990@qq.com>
Date: 星期五, 18 四月 2025 14:23:32 +0800
Subject: [PATCH] Merge branch 'master' of http://103.135.160.14:9034/r/NslWeb
---
src/components/tools/Tools.vue | 88 +++++++++++++++++++++++++++----------------
1 files changed, 55 insertions(+), 33 deletions(-)
diff --git a/src/components/tools/Tools.vue b/src/components/tools/Tools.vue
index 56ab6ec..32dcd30 100644
--- a/src/components/tools/Tools.vue
+++ b/src/components/tools/Tools.vue
@@ -42,16 +42,18 @@
<div v-show="echartsShow" id="sectionCharts" class="sectionChars">
<div id="echartsView1" style="width: 100%; height: 100%"></div>
</div>
- <!-- 鍧″悜鍒嗘瀽 -->
+ <!-- 鍧″害鍧″悜鍒嗘瀽 -->
<Aspect
v-show="showAspect"
@draw="SlopeArrow"
@clear="SlopeArrowClose"
+ @handleaspect="handleaspect"
+ @handleSlope="handleSlope"
class="popup-menu-see"
/>
<SlopeAnalysis
@draw="SlopeAnalysiss"
- v-show="showSlope"
+ v-show="isContourLabel"
class="popup-menu-see"
@update-slope="onUpdateSlope"
/>
@@ -128,9 +130,6 @@
// 鍧″悜绠ご寮圭獥
const showAspect = ref(false);
-// 鍧″害鍒嗘瀽寮圭獥
-const showSlope = ref(false);
-
// 宸ュ叿鍒楄〃
const toolList = ref([
{
@@ -162,8 +161,7 @@
active: false,
options: [
{ name: "鐐逛綅淇℃伅鎻愬彇", icon: "鐐逛綅淇℃伅鎻愬彇" },
- { name: "鍧″害鍒嗘瀽", icon: "鍧″害鍧″悜鎻愬彇" },
- { name: "鍧″悜鍒嗘瀽", icon: "鍧″害鍧″悜鎻愬彇" },
+ { name: "鍧″害鍧″悜鍒嗘瀽", icon: "鍧″害鍧″悜鎻愬彇" },
{ name: "鍓栭潰鎻愬彇", icon: "鍓栭潰鎻愬彇" },
{ name: "鎸栧～鏂硅绠�", icon: "鎸栧～鏂硅绠�" },
{ name: "绛夐珮绾垮垎鏋�", icon: "绛夐珮绾垮垎鏋�" },
@@ -201,7 +199,25 @@
// 澶勭悊宸ュ叿鐐瑰嚮浜嬩欢
function handleClick(tool, event) {
+ toolList.value.forEach((item) => {
+ item.active =
+ item.name === tool.name && currentToolOptions.value !== tool.options;
+ });
console.log(tool.options);
+ // 濡傛灉褰撳墠宸ュ叿宸茬粡鏄縺娲荤姸鎬侊紝鍒欏叧闂畠
+ if (currentToolOptions.value === tool.options) {
+ currentToolOptions.value = null; // 娓呯┖褰撳墠宸ュ叿閫夐」
+ isPopupVisible.value = false; // 闅愯棌寮圭獥
+ seeAnalyzeShow.value = false; // 鍙鍩�
+ topographyShow.value = false; // 鍓栭潰
+ echartsShow.value = false; // 鍓栭潰echarts
+ showAspect.value = false; // 鍧″害鍧″悜鍒嗘瀽
+ showRain.value = false; // 闆ㄥぉ
+ showSnow.value = false; // 闆ぉ
+ isContourLabel.value = false; //绛夐珮绾�
+
+ return;
+ }
// 濡傛灉宸ュ叿鍚嶇О鏄� "鍥惧眰绠＄悊"
if (tool.name === "鍥惧眰绠＄悊") {
showLayerTree.value = !showLayerTree.value; // 鍒囨崲鍥惧眰鏍戠殑鏄剧ず鐘舵��
@@ -210,9 +226,10 @@
topographyShow.value = false; //鍓栭潰
echartsShow.value = false; //鍓栭潰echarts
showAspect.value = false; //鍧″悜绠ご
- showSlope.value = false; //鍧″悜绠ご
showRain.value = false; //闆ㄥぉ
showSnow.value = false; //闆ㄥぉ
+ isContourLabel.value = false; //绛夐珮绾�
+
return;
}
@@ -224,15 +241,18 @@
topographyShow.value = false; //鍓栭潰
echartsShow.value = false; //鍓栭潰echarts
showAspect.value = false; //鍧″悜绠ご
- showSlope.value = false; //鍧″悜绠ご
showRain.value = false; //闆ㄥぉ
- showSnow.value = false; //闆ㄥぉ
+ showSnow.value = false; //闆ぉ
+ isContourLabel.value = false; //绛夐珮绾�
}
+
+const currentOption = ref(null);
// 澶勭悊寮圭獥閫夐」鐐瑰嚮浜嬩欢
function handleOptionClick(option) {
isPopupVisible.value = false;
- console.log("Selected option:", option);
+ currentOption.value = option.name;
+ console.log("Selected option:", currentOption.value);
const actionMap = {
鏄剧ず鍥惧眰: () => (showLayerTree.value = true),
闅愯棌鍥惧眰: () => (showLayerTree.value = false),
@@ -278,11 +298,16 @@
鍓栭潰鎻愬彇: () => {
topographyShow.value = true;
},
- 鍧″害鍒嗘瀽: () => {
- showSlope.value = true;
- },
- 鍧″悜鍒嗘瀽: () => {
+ 鍧″害鍧″悜鍒嗘瀽: () => {
showAspect.value = true;
+ },
+ 绛夐珮绾垮垎鏋�: () => {
+ isContourLabel.value = true;
+ // if (isContourLabel.value === false) {
+ // mapUtils.createContourLabel();
+ // } else {
+ // mapUtils.closeContourLabel();
+ // }
},
鐐逛綅淇℃伅鎻愬彇: () => {
isPickActive.value = !isPickActive.value;
@@ -302,14 +327,6 @@
mapUtils.FloodAnalysis("close");
} else {
mapUtils.FloodAnalysis();
- }
- },
- 绛夐珮绾垮垎鏋�: () => {
- isContourLabel.value = !isContourLabel.value;
- if (isContourLabel.value === false) {
- mapUtils.createContourLabel();
- } else {
- mapUtils.closeContourLabel();
}
},
};
@@ -374,6 +391,14 @@
mapUtils.handleClear();
};
+// 鍒掑垎鍖哄煙
+const SlopeArrow = () => {
+ mapUtils.hfqy();
+};
+// 鍧″害鍒嗘瀽
+const handleaspect = () => {
+ mapUtils.pdfx();
+};
//鍧″害鐨勭澶磋搴�(瑙掑害涓�0~1,鑼冨洿鍐呯殑鍧囧寑鎻掑��)
const angles = [
0.0, 0.1, 0.15, 0.2, 0.25, 0.3, 0.35, 0.4, 0.45, 0.5, 0.55, 0.6, 0.65, 0.7,
@@ -401,18 +426,17 @@
"#F0AD56",
"#F2CC45",
];
-
-const SlopeArrow = () => {
+// 鍧″悜鍒嗘瀽
+const handleSlope = () => {
mapUtils.pxjt(colors, angles);
};
-// 鍏抽棴鍧″悜绠ご
+// 鍏抽棴鍧″害鍧″悜鍒嗘瀽
const SlopeArrowClose = () => {
- mapUtils.cleanupAnalysisTools();
+ mapUtils.clearPreviousAnalysis();
};
-// 鍧″害鍒嗘瀽
+// 绛夐珮绾�
const formData = reactive({
- terrainRender: 0,
contourLines: false,
color: "red",
spacing: 50,
@@ -420,14 +444,12 @@
});
const SlopeAnalysiss = () => {
- mapUtils.pdfx(formData);
+ mapUtils.dgxfx(formData);
};
-
-// 鍧″害
const onUpdateSlope = (newOption) => {
Object.assign(formData, newOption);
- mapUtils.pdfx(formData);
+ mapUtils.dgxfx(formData);
};
// 闆�
--
Gitblit v1.9.3