From 83c414932a830fe479b0b3268b465a6f4090a9b7 Mon Sep 17 00:00:00 2001 From: huangchenhao <123673748@qq.com> Date: Tue, 25 Nov 2025 10:48:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8E=92=E7=89=88=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=BA=94=E6=80=A5=E7=89=A9=E8=B5=84=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/LeftPanel/ForceDispatch.vue | 9 ++------- .../components/LeftPanel/ForcePreset.vue | 19 ++++++++++++++----- .../composables/useDisasterData.js | 1 + 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForceDispatch.vue b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForceDispatch.vue index c34282b..73506c1 100644 --- a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForceDispatch.vue +++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForceDispatch.vue @@ -24,7 +24,7 @@
- 应急基地与预置点 + 应急基地与预置点 {{ dispatchSuggestion.stations }} 个 @@ -259,12 +259,7 @@ const handleStartDispatch = () => { font-size: fs(12); font-family: SourceHanSansCN-Regular, sans-serif; color: var(--text-white); -} - -.force-dispatch__stat-label_small { - font-size: fs(8); - font-family: SourceHanSansCN-Regular, sans-serif; - color: var(--text-white); + width: 50px; } .force-dispatch__stat-value { diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForcePreset.vue b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForcePreset.vue index b04720c..f922f96 100644 --- a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForcePreset.vue +++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForcePreset.vue @@ -63,7 +63,7 @@
应急基地 + >应急基地与预置点 台
+
+ 应急物资 +
+ {{ forcePreset.materials }} + 台 +
+
应急人员 @@ -323,7 +330,7 @@ const vClickOutside = { .stat-group { display: flex; justify-content: center; - gap: vw(22); + // gap: vw(22); .stat-card { // flex: 1; @@ -331,19 +338,21 @@ const vClickOutside = { flex-direction: column; align-items: center; justify-content: center; - gap: vh(8); - padding: vh(12) vw(12) vh(30); + // gap: vh(8); + padding: vh(12) 0 vh(30); border-radius: vw(6); position: relative; background: url("../../assets/images/完成里程.png") no-repeat center bottom; // background-size: 100% 100%; - width: vw(104); + width: vw(90); .stat-label { color: var(--text-white); font-size: fs(14); font-family: SourceHanSansCN-Medium, sans-serif; + height: 20px; + width:70px; } .flexBox{ diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useDisasterData.js b/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useDisasterData.js index 173bd6c..b1bdf01 100644 --- a/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useDisasterData.js +++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/composables/useDisasterData.js @@ -21,6 +21,7 @@ export function useDisasterData() { // 力量预置信息 const forcePreset = ref({ equipment: 0, + materials: 0, bases: 0, personnel: 0, searchRadius: 30, // km From e1a6f8be3e7aadade638c54ea0d67a822e91faa0 Mon Sep 17 00:00:00 2001 From: huangchenhao <123673748@qq.com> Date: Tue, 25 Nov 2025 10:58:51 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=8A=9B=E9=87=8F=E9=A2=84=E5=88=B6?= =?UTF-8?q?=E9=83=A8=E5=88=86=20=E6=BB=9A=E5=8A=A8=E6=9D=A1=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=BB=9A=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/LeftPanel/ForcePreset.vue | 69 +++++++++++++------ 1 file changed, 47 insertions(+), 22 deletions(-) diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForcePreset.vue b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForcePreset.vue index f922f96..85f2313 100644 --- a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForcePreset.vue +++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForcePreset.vue @@ -102,21 +102,23 @@
-
- station -
- {{ station.name }} - 距离灾害点{{ station.distance }}公里 +
+
+ station +
+ {{ station.name }} + 距离灾害点{{ station.distance }}公里 +
@@ -352,10 +354,10 @@ const vClickOutside = { font-size: fs(14); font-family: SourceHanSansCN-Medium, sans-serif; height: 20px; - width:70px; + width: 70px; } - .flexBox{ + .flexBox { display: flex; align-items: center; } @@ -394,10 +396,26 @@ const vClickOutside = { display: flex; flex-direction: column; gap: vh(8); + position: relative; max-height: vw(120); - overflow-y: auto; + overflow-y: hidden; + margin: vh(5) 0; - // 滚动条 + &-inner { + display: flex; + flex-direction: column; + gap: vh(8); + animation: scroll 40s linear infinite; + will-change: transform; + padding-right: vw(4); // 保留滚动条空间 + + // 鼠标悬停暂停滚动 + &:hover { + animation-play-state: paused; + } + } + + &::-webkit-scrollbar { width: vw(4); } @@ -406,18 +424,25 @@ const vClickOutside = { background: rgba(20, 53, 118, 0.5); border-radius: vw(2); } - + @keyframes scroll { + 0% { + transform: translateY(0); + } + 100% { + transform: translateY(calc(-100% + vw(120))); + } + } + .station-item { display: flex; align-items: center; gap: vw(12); padding: vh(0) vw(12); - // background: rgba(20, 53, 118, 0.3); background: url("../../assets/images/文本线条框.png") no-repeat center center; background-size: 100% 100%; border-radius: vw(6); - + flex-shrink: 0; .station-icon { width: vw(32); height: vh(32); From 00488a301f0522d3d51db5380c7bf30732ed5fc1 Mon Sep 17 00:00:00 2001 From: huangchenhao <123673748@qq.com> Date: Tue, 25 Nov 2025 11:34:31 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=96=87=E5=AD=97=E6=8E=92=E7=89=88?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/LeftPanel/ForcePreset.vue | 2 +- .../screen/src/views/3DSituationalAwarenessRefactor/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForcePreset.vue b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForcePreset.vue index 85f2313..622af21 100644 --- a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForcePreset.vue +++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForcePreset.vue @@ -340,7 +340,7 @@ const vClickOutside = { flex-direction: column; align-items: center; justify-content: center; - // gap: vh(8); + gap: vh(8); padding: vh(12) 0 vh(30); border-radius: vw(6); position: relative; diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue b/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue index b7be8de..7390575 100644 --- a/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue +++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue @@ -200,7 +200,7 @@