From 6d989ac3e9902f7dfbc1d8472270929a04ddb517 Mon Sep 17 00:00:00 2001
From: wangjuncheng <1>
Date: 星期二, 10 六月 2025 11:26:49 +0800
Subject: [PATCH] 1
---
src/components/menu/CrossSectionalAnalysis.vue | 13 ++++++++++++-
src/components/tools/Ditching.vue | 2 ++
src/assets/img/tools/tools_second/日照分析.png | 0
src/assets/img/tools/tools_second/大气散射.png | 0
src/components/menu/TimeLine.vue | 2 ++
src/utils/tools.js | 19 +++++++++++--------
src/components/tools/SunAnalysis.vue | 19 ++-----------------
7 files changed, 29 insertions(+), 26 deletions(-)
diff --git "a/src/assets/img/tools/tools_second/\345\244\247\346\260\224\346\225\243\345\260\204.png" "b/src/assets/img/tools/tools_second/\345\244\247\346\260\224\346\225\243\345\260\204.png"
index 5a2c783..83cafd6 100644
--- "a/src/assets/img/tools/tools_second/\345\244\247\346\260\224\346\225\243\345\260\204.png"
+++ "b/src/assets/img/tools/tools_second/\345\244\247\346\260\224\346\225\243\345\260\204.png"
Binary files differ
diff --git "a/src/assets/img/tools/tools_second/\346\227\245\347\205\247\345\210\206\346\236\220.png" "b/src/assets/img/tools/tools_second/\346\227\245\347\205\247\345\210\206\346\236\220.png"
new file mode 100644
index 0000000..1a3b4d0
--- /dev/null
+++ "b/src/assets/img/tools/tools_second/\346\227\245\347\205\247\345\210\206\346\236\220.png"
Binary files differ
diff --git a/src/components/menu/CrossSectionalAnalysis.vue b/src/components/menu/CrossSectionalAnalysis.vue
index 0b65a1f..44bc677 100644
--- a/src/components/menu/CrossSectionalAnalysis.vue
+++ b/src/components/menu/CrossSectionalAnalysis.vue
@@ -110,7 +110,13 @@
// 閫夊彇涓や釜鏂潰鐐瑰潗鏍囧苟缁樺埗鏂潰鎴潰
function addPointToViewer(point) {
if (pickedPointsCross.value.length >= 2) {
- clearPoints();
+ for (const id of pickedEntitiesIds.value) {
+ viewer.entities.remove(viewer.entities.getById(id));
+ }
+ pickedPointsCross.value = [];
+ pickedEntitiesIds.value = [];
+ isWallCreated.value = false;
+ isUploaded.value = false;
}
pickedPointsCross.value.push(point);
drawPointOnMap(point);
@@ -218,6 +224,11 @@
pickedEntitiesIds.value = [];
isWallCreated.value = false;
isUploaded.value = false;
+ if (pickHandlerCross) {
+ pickHandlerCross.destroy();
+ pickHandlerCross = null;
+ }
+ isPicking.value = false;
}
function initPickHandler() {
if (isPicking.value) {
diff --git a/src/components/menu/TimeLine.vue b/src/components/menu/TimeLine.vue
index 7e70be8..f799f1e 100644
--- a/src/components/menu/TimeLine.vue
+++ b/src/components/menu/TimeLine.vue
@@ -595,6 +595,8 @@
}
if (crossRef.value) {
crossRef.value.clearPoints();
+ console.log('鎵ц鍒犻櫎鐐瑰姛鑳�');
+
}
emit("isColorRender", false);
setTimeout(() => {
diff --git a/src/components/tools/Ditching.vue b/src/components/tools/Ditching.vue
index 912b046..2dea1e5 100644
--- a/src/components/tools/Ditching.vue
+++ b/src/components/tools/Ditching.vue
@@ -98,6 +98,8 @@
depth: depth
};
emit('update-excavation-data', result);
+ ElMessage.success('瀹炵幇寮�鎸栧姛鑳斤紒');
+
};
const handleClear = () => {
isDrawing.value = false;
diff --git a/src/components/tools/SunAnalysis.vue b/src/components/tools/SunAnalysis.vue
index 2b11d0d..d0fd447 100644
--- a/src/components/tools/SunAnalysis.vue
+++ b/src/components/tools/SunAnalysis.vue
@@ -1,17 +1,6 @@
<template>
<div class="settings-panel">
- <el-form :model="form" label-width="80px" class="terrain-settings">
- <el-form-item label="娓叉煋澶у皬">
- <el-select v-model="form.renderSize" placeholder="璇烽�夋嫨">
- <el-option v-for="item in sizeOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="閰嶇疆閫夐」">
- <el-switch v-model="form.lightShadow" active-text="鍏夋簮闃村奖"></el-switch>
- <el-switch v-model="form.softShadow" active-text="杞槾褰�"></el-switch>
- </el-form-item>
- <el-button type="primary" @click="analyzeShadows">闃村奖鍒嗘瀽</el-button>
- </el-form>
+ <el-button type="primary" @click="analyzeShadows">闃村奖鍒嗘瀽</el-button>
</div>
</template>
<script setup>
@@ -35,11 +24,7 @@
// 闃村奖鍒嗘瀽鎸夐挳鐐瑰嚮浜嬩欢
const analyzeShadows = () => {
- let currentTime = earthCtrl.viewer.clock.currentTime.clone();
- let startTime = earthCtrl.viewer.clock.startTime.clone();
- let stopTime = earthCtrl.viewer.clock.stopTime.clone();
- let multiplier = earthCtrl.viewer.clock.multiplier;
- console.log('闃村奖鍒嗘瀽');
+ window.Viewer = earthCtrl.viewer;
mapUtils.AnalysisSunshine()
};
diff --git a/src/utils/tools.js b/src/utils/tools.js
index 29e86dc..cc49b1f 100644
--- a/src/utils/tools.js
+++ b/src/utils/tools.js
@@ -684,15 +684,18 @@
type: 2,
title: "闃村奖鍒嗘瀽",
shade: false,
- area: ["350px", "500px"],
- offset: "l",
- skin: "yyfxForm",
- content: SmartEarthRootUrl + "Workers/analysis/AnalysisSunshine.html",
+ area: ["350px", "540px"],
+ offset: "r",
+ skin: "other-class",
+ content: SmartEarthRootUrl + "Workers/analysis/AnalysisShadow.html",
end: () => {
- window._AnalysisSunshine && window._AnalysisSunshine.remove();
- window._AnalysisSunshine = undefined;
- layerIsOpen = false;
- },
+ Viewer.clock.currentTime = currentTime;
+ Viewer.clock.startTime = startTime;
+ Viewer.clock.stopTime = stopTime;
+ Viewer.clock.multiplier = multiplier;
+ Viewer.shadows = false;
+ Viewer.shadowLayer = false;
+ }
});
}
},
--
Gitblit v1.9.3