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

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

@@ -31,7 +31,7 @@
           </span>
         </div>
         <div class="force-dispatch__stat">
-          <span class="force-dispatch__stat-label">挖掘机</span>
+          <span class="force-dispatch__stat-label">应急装备</span>
           <span class="force-dispatch__stat-value">
             {{ dispatchSuggestion.excavators }}
             <span class="force-dispatch__stat-unit">个</span>

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

@@ -154,7 +154,7 @@ onUnmounted(() => {
     display: flex;
     justify-content: space-between;
     align-items: center;
-    padding: vh(10) vw(16);
+    padding: vh(5) vw(16);
     // background: rgba(20, 53, 118, 0.5);
     background: rgba(6, 38, 62, 0.8);
     border-bottom: 1px solid var(--border-color);