Merge branch 'dev' of http://222.212.85.86:8222/bdzl2/bxztApp into dev

- 在 `StretchableModal` 头部新增名为 `extraButtons` 的插槽，用于放置附加控制组件
- 确保 `StretchableModal` 始终渲染底部插槽（footer slot），移除条件显示逻辑
- 调整 `CollapsiblePanel` 的下边距（margin-bottom），使其仅在非最后一个子元素时生效，从而消除末尾的冗余空间
- 为额外按钮区域添加悬停发光效果样式

packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/LocationPanel.vue

@@ -78,6 +78,11 @@ const locationInfo = [
   min-width: 248px;
   max-width: 100%;
   // min-height: 160px;
+  &:hover {
+    // border: 2px solid rgba(255, 80, 80, 0.6);
+    box-shadow: 0 0 10px rgba(255, 80, 80, 0.6), 0 0 20px rgba(255, 0, 0, 0.4),
+      0 0 35px rgba(255, 0, 0, 0.25);
+  }
 }
 
 // 2x2 网格布局

packages/screen/src/views/3DSituationalAwarenessRefactor/components/LeftPanel/index.vue

@@ -173,7 +173,7 @@ const handleQuickResponseToggle = () => {
   box-sizing: border-box;
 
   &::-webkit-scrollbar {
-    width: vw(6);
+    width: vw(0);
   }
 
   &::-webkit-scrollbar-track {

packages/screen/src/views/3DSituationalAwarenessRefactor/components/RightPanel/index.vue

@@ -1,5 +1,6 @@
 <template>
   <div class="right-panel">
+    <div class="right-panel__content">
     <CollapsiblePanel title="快速处置" subtitle="「调度指挥」">
       <DispatchCommand />
     </CollapsiblePanel>
@@ -18,6 +19,7 @@
     <!-- <CollapsiblePanel title="协同信息" subtitle="「多部门联动」">
     </CollapsiblePanel> -->
     <CollaborationInfo />
+    </div>
   </div>
 </template>
 
@@ -42,10 +44,18 @@ import CollaborationInfo from './CollaborationInfo.vue'
   overscroll-behavior: contain;
   padding-right: vw(40); // 为右侧折叠按钮预留空间
   padding-top: var(--sa-header-height);
+  padding-left: 10px;
   box-sizing: border-box;
+  &__content {
+    &:hover {
+      // border: 2px solid rgba(255, 80, 80, 0.6);
+      box-shadow: 0 0 10px rgba(255, 80, 80, 0.6), 0 0 20px rgba(255, 0, 0, 0.4),
+        0 0 35px rgba(255, 0, 0, 0.25);
+    }
+  }
 
   &::-webkit-scrollbar {
-    width: vw(6);
+    width: vw(0);
   }
 
   &::-webkit-scrollbar-track {

packages/screen/src/views/3DSituationalAwarenessRefactor/components/shared/CollapsiblePanel.vue

@@ -160,7 +160,9 @@ function onAfterLeave(el) {
 .collapsible-panel {
   display: flex;
   flex-direction: column;
-  margin-bottom: vh(17);
+  &:not(:last-child) {
+    margin-bottom: vh(17);
+  }
   border: 2px solid transparent; /* 防止 hover 时抖动 */
 
   &__header {

packages/screen/src/views/3DSituationalAwarenessRefactor/components/shared/StretchableModal.vue

@@ -15,6 +15,9 @@
           <div class="stretchable-modal__header">
             <slot name="header">
               <h3 class="stretchable-modal__title">{{ title }}</h3>
+              <div class="stretchable-modal__extra">
+                <slot name="extraButtons"></slot>
+              </div>
             </slot>
             <button
               v-if="showClose"
@@ -36,7 +39,7 @@
           </div>
 
           <!-- 底部：大弹窗bottom切图.png -->
-          <div v-if="$slots.footer" class="stretchable-modal__footer">
+          <div class="stretchable-modal__footer">
             <slot name="footer"></slot>
           </div>
         </div>
@@ -212,6 +215,20 @@ onUnmounted(() => {
     margin: 0;
   }
 
+  &__extra {
+    position: absolute;
+    right: 125px;
+    top: 18px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    &:hover {
+    // border: 2px solid rgba(255, 80, 80, 0.6);
+    box-shadow: 0 0 10px rgba(255, 80, 80, 0.6), 0 0 20px rgba(255, 0, 0, 0.4),
+      0 0 35px rgba(255, 0, 0, 0.25);
+  }
+  }
+
   &__close {
     position: absolute;
     top: 34px;

packages/screen/src/views/3DSituationalAwarenessRefactor/index.vue

@@ -204,7 +204,7 @@
       />
 
       <!-- 底部一键启动按钮 -->
-      <template #footer>
+      <template #extraButtons>
         <ActionButton
           text="响应调度"
           type="inModal"