From 0ee76eb5c5fd792aba38d37a1af719e51e143839 Mon Sep 17 00:00:00 2001 From: huangchenhao <123673748@qq.com> Date: Tue, 25 Nov 2025 16:12:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F=20?= =?UTF-8?q?=E5=8F=8A=E4=B8=80=E4=BA=9B=E9=97=B4=E8=B7=9D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/LeftPanel/DisasterAnalysis.vue | 2 +- .../components/LeftPanel/ForceDispatch.vue | 20 +++++++++---------- .../components/LeftPanel/ForcePreset.vue | 2 +- .../components/RightPanel/DispatchCommand.vue | 2 +- .../components/shared/CollapsiblePanel.vue | 2 +- .../components/shared/DataField.vue | 6 +++--- .../3DSituationalAwarenessRefactor/index.vue | 1 + 7 files changed, 18 insertions(+), 17 deletions(-) diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/DisasterAnalysis.vue b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/DisasterAnalysis.vue index c6508f9..d8e0e2f 100644 --- a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/DisasterAnalysis.vue +++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/DisasterAnalysis.vue @@ -75,6 +75,6 @@ const { disasterInfo } = inject('disasterData') .disaster-analysis__row { display: grid; grid-template-columns: 1fr 1fr; - gap: vw(16); + gap: vw(12); } diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForceDispatch.vue b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForceDispatch.vue index 73506c1..7c981da 100644 --- a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForceDispatch.vue +++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForceDispatch.vue @@ -143,7 +143,7 @@ const handleStartDispatch = () => { margin-top: 0; display: flex; flex-direction: column; - gap: vh(16); + gap: vh(5); } /* 顶部两个卡片 */ @@ -165,17 +165,17 @@ const handleStartDispatch = () => { // border-radius: vw(4); background: url('../../assets/images/响应等级bg.png') no-repeat center center; background-size: 100% 100%; - min-height: vh(40); + min-height: vh(30); } .force-dispatch__level-label { - font-size: fs(18); + font-size: fs(15); font-family: SourceHanSansCN-Regular, sans-serif; color: var(--text-white); } .force-dispatch__level-value { - font-size: fs(18); + font-size: fs(15); font-family: SourceHanSansCN-Bold, sans-serif; font-weight: 600; color: var(--text-white); @@ -195,7 +195,7 @@ const handleStartDispatch = () => { background-size: 100% 100%; cursor: pointer; transition: all 0.3s ease; - min-height: vh(40); + min-height: vh(30); user-select: none; &:hover { @@ -211,7 +211,7 @@ const handleStartDispatch = () => { } .force-dispatch__plan-text { - font-size: fs(18); + font-size: fs(15); font-family: SourceHanSansCN-Medium, sans-serif; font-weight: 500; color: var(--text-white); @@ -231,9 +231,9 @@ const handleStartDispatch = () => { .force-dispatch__middle { display: grid; grid-template-columns: 1fr auto 1fr; - gap: vw(18); + gap: vw(10); align-items: center; - padding: vh(12) 0; + padding: vh(5) 0; // background: url('../../assets/images/ForceDispatchBg.png') center top no-repeat; } @@ -256,10 +256,10 @@ const handleStartDispatch = () => { } .force-dispatch__stat-label { - font-size: fs(12); + font-size: fs(10); font-family: SourceHanSansCN-Regular, sans-serif; color: var(--text-white); - width: 50px; + width: 45px; } .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 622af21..09ef508 100644 --- a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForcePreset.vue +++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/ForcePreset.vue @@ -203,7 +203,7 @@ const vClickOutside = { display: flex; align-items: center; justify-content: space-between; - padding: vh(8) vw(16); + padding: vh(3) vw(16); background: rgba(28, 70, 130, 0.9); border: 1px solid rgba(28, 161, 255, 0.3); border-radius: vw(8); diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/RightPanel/DispatchCommand.vue b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/RightPanel/DispatchCommand.vue index 722d8eb..f08d955 100644 --- a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/RightPanel/DispatchCommand.vue +++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/RightPanel/DispatchCommand.vue @@ -128,7 +128,7 @@ const getColumnName = (type) => { } .table-body { - min-height: vh(170); + // min-height: vh(170); max-height: vh(170); overflow-y: auto; diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/shared/CollapsiblePanel.vue b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/shared/CollapsiblePanel.vue index 7b28b25..3779a12 100644 --- a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/shared/CollapsiblePanel.vue +++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/shared/CollapsiblePanel.vue @@ -225,7 +225,7 @@ function onAfterLeave(el) { &__content { position: relative; - padding: vh(5) vw(20) vh(15); // 留出空间避免被圆角遮挡 + padding: vh(5) vw(20) vh(5); // 留出空间避免被圆角遮挡 z-index: 1; // 如果内容需要滚动 diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/shared/DataField.vue b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/shared/DataField.vue index fbbf00f..1894aa5 100644 --- a/packages/screen/src/views/3DSituationalAwarenessRefactor/components/shared/DataField.vue +++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/components/shared/DataField.vue @@ -47,7 +47,7 @@ const valueClass = computed(() => { display: flex; align-items: center; gap: vw(8); - padding: vh(4) vw(10); + padding: vh(2) vw(10); background: url('../../assets/images/DataField/快速感知_bg.png') no-repeat center center; background-size: 100% 100%; @@ -59,7 +59,7 @@ const valueClass = computed(() => { &__label { color: var(--text-white); - font-size: fs(14); + font-size: fs(13); // font-family: SourceHanSansCN-Medium, sans-serif; font-weight: 500; white-space: nowrap; @@ -67,7 +67,7 @@ const valueClass = computed(() => { &__value { color: var(--text-white); - font-size: fs(15); + font-size: fs(14); font-family: PingFangSC-Semibold, sans-serif; font-weight: 700; flex: 1; diff --git a/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue b/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue index 7390575..cadb5df 100644 --- a/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue +++ b/packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue @@ -1007,6 +1007,7 @@ provide('onDistanceChange', handleDistanceChange) min-width: 0; // 防止在窄容器中溢出 min-height: 0; // 允许 flex 子元素收缩并启用滚动 pointer-events: auto; // 恢复面板的交互能力 + height: 100%; // 左侧面板固定在左边 &--left {