From 334ee90a1a392217c4fc82ba066c40686e069890 Mon Sep 17 00:00:00 2001
From: wangjuncheng <1>
Date: 星期二, 03 六月 2025 09:41:03 +0800
Subject: [PATCH] Merge branch 'master' of http://103.135.160.14:9034/r/NslWeb
---
src/components/menu/Location.vue | 103 +++++++++++++++++++++++++++++++++------------------
1 files changed, 67 insertions(+), 36 deletions(-)
diff --git a/src/components/menu/Location.vue b/src/components/menu/Location.vue
index ce8911a..1830e67 100644
--- a/src/components/menu/Location.vue
+++ b/src/components/menu/Location.vue
@@ -5,13 +5,30 @@
</div>
<div class="left-content district-content">
+ <div style="margin-left: 5px; margin-bottom: 5px">
+ <span style="color: white">鍖椾含甯傦細</span>
+ <el-select
+ @change="handleChange1"
+ v-model="selectValue1"
+ placeholder="Select"
+ size="mini"
+ style="width: 240px"
+ >
+ <el-option
+ v-for="item in BJoptions"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
+ />
+ </el-select>
+ </div>
<div style="margin-left: 5px">
<span style="color: white">閲嶇偣娌燂細</span>
<el-select
@change="handleChange"
v-model="selectValue"
placeholder="Select"
- size="large"
+ size="mini"
style="width: 240px"
>
<el-option
@@ -24,10 +41,13 @@
</div>
<!-- 婊氬姩鍖哄煙 -->
- <div style="overflow-y: auto; height: 95%">
+ <div style="overflow-y: auto; height: 91%; position: relative">
<!-- 鍔犺浇閬僵灞� -->
<div v-if="loading" class="loading-overlay">
- <div class="spinner"></div>
+ <div class="loading-content">
+ <el-icon class="loading-icon"><Loading /></el-icon>
+ <span class="loading-text">鏁版嵁鍔犺浇涓�...</span>
+ </div>
</div>
<div
v-else
@@ -50,6 +70,8 @@
import { useSimStore } from "@/store/simulation";
import { initeWaterPrimitiveView } from "@/utils/water"; //鐩告満flyTo鍑芥暟锛屽悗缁璷ptions鍒楄〃涓湁瀵瑰簲缁忕含搴﹀悗寮冪敤
import { useRoute, onBeforeRouteUpdate } from "vue-router";
+import { Loading } from "@element-plus/icons-vue";
+
const simStore = useSimStore();
// onBeforeRouteUpdate((to, from, next) => {
// if (to.path !== "/yhgl") {
@@ -65,6 +87,10 @@
}
});
const selectValue = ref("瀛欒儭娌�");
+
+const selectValue1 = ref("鍖椾含甯�");
+
+const BJoptions = ref([]);
const options = ref([
{
@@ -187,7 +213,7 @@
onMounted(() => {
handleCleanup();
- initeWaterPrimitiveView();
+ // initeWaterPrimitiveView();
// 榛樿鍏堟鏌ヤ竴閬嶆暟鎹�
if (simStore.DangerPoint && simStore.DangerPoint.length > 0) {
filterDataByArea("瀛欒儭娌�");
@@ -199,35 +225,6 @@
</script>
<style lang="less" scoped>
-.loading-overlay {
- position: absolute;
- top: 120px;
- left: 0px;
- right: 0px;
- bottom: 10px;
- background-color: rgba(47, 44, 44, 0.5);
- /* 鍗婇�忔槑閬僵 */
- display: flex;
- align-items: center;
- justify-content: center;
- z-index: 999;
-}
-
-.spinner {
- width: 40px;
- height: 40px;
- border: 4px solid #fff;
- border-top: 4px solid transparent;
- border-radius: 50%;
- animation: spin 1s linear infinite;
-}
-
-@keyframes spin {
- to {
- transform: rotate(360deg);
- }
-}
-
.district {
position: absolute;
width: 345px;
@@ -246,6 +243,8 @@
.district-content {
padding: 10px;
box-sizing: border-box;
+ height: calc(100% - 70px);
+ position: relative;
}
.district-item-icon {
@@ -263,12 +262,44 @@
overflow: hidden;
text-overflow: ellipsis;
}
+.loading-overlay {
+ position: absolute;
+ top: 0;
+ left: 0;
+ right: 0;
+ bottom: 0;
+ // background-color: rgba(0, 0, 0, 0.7);
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ z-index: 100;
+ // border-radius: 4px;
+}
+
+.loading-content {
+ display: flex;
+ flex-direction: column;
+ align-items: center;
+ color: #fff;
+}
+
+.loading-icon {
+ font-size: 24px;
+ margin-bottom: 8px;
+ animation: rotating 2s linear infinite;
+}
.loading-text {
- color: white;
font-size: 14px;
- text-align: center;
- margin-top: 20px;
+}
+
+@keyframes rotating {
+ 0% {
+ transform: rotate(0deg);
+ }
+ 100% {
+ transform: rotate(360deg);
+ }
}
/deep/ .el-select__placeholder {
--
Gitblit v1.9.3