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..622af21 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 }} + +
+
应急人员 @@ -95,21 +102,23 @@
-
- station -
- {{ station.name }} - 距离灾害点{{ station.distance }}公里 +
+
+ station +
+ {{ station.name }} + 距离灾害点{{ station.distance }}公里 +
@@ -323,7 +332,7 @@ const vClickOutside = { .stat-group { display: flex; justify-content: center; - gap: vw(22); + // gap: vw(22); .stat-card { // flex: 1; @@ -332,21 +341,23 @@ const vClickOutside = { align-items: center; justify-content: center; gap: vh(8); - padding: vh(12) vw(12) vh(30); + 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{ + .flexBox { display: flex; align-items: center; } @@ -385,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); } @@ -397,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); 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 diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue b/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue index 1e98532..145d1d4 100644 --- a/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue +++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue @@ -200,7 +200,7 @@