Merge branch 'dev-bxy' into 'dev'

fix: 保卫保密总览保密要害部位监控当前active部位相机判断条件修正

See merge request product-group-fe/sfy-safety-group/sfy-safety!231

src/views/security-confidentiality/overview/components/ConfidentialityPosition.vue

@@ -42,7 +42,10 @@
           <div class="switch-camera-page-content">
             <div
               class="switch-camera-page-content-item"
-              :class="{ active: curPlayPositionCamera?.id === item.id }"
+              :class="{
+                active:
+                  curPlayPositionCamera?.id === item.id && curPlayPositionCamera?.positionName === item.positionName,
+              }"
               v-for="item in confidentialityPositionCameraInfo"
               :key="item.id"
               @click="switchCamera(item)"