Merge branch 'hi-ucs-dev' of http://192.168.124.50:3000/wuhongjian/hi-ucs into hi-ucs-dev

front/src/views/home/infrastructurePageXha.vue

@@ -618,12 +618,17 @@
         wrapClassName="camera-popup"
         v-model:visible="operationPopupFlag"
         :width="1000"
-        :title="'视频监控点选择'"
         destroyOnClose
         footer="{null}"
         @cancel="handleCancel"
       >
-       <div style="width: 100%; display: flex; justify-content: center">
+        <template #title>
+          <span>视频预览</span>
+          <span style="color: #ff4d4f; margin-left: 10px">
+            {{ `(请申请后观看视频)` }}
+          </span>
+        </template>
+        <div style="width: 100%; display: flex; justify-content: center">
           <div
             style="width: 100%; height: 100%; position: relative"
             v-show="isXiHaiAn"
@@ -642,11 +647,13 @@
             <div class="waterMark waterMark-right-bottom">
               {{ userInfo.realNameShow }}
             </div>
-         <!--地图上点击之后弹出的操作弹窗-->
+            <!--地图上点击之后弹出的操作弹窗-->
-        <camera-popup-on-map :camera-Data-List="cameraDataList"  :reset-flag="resetFlag"></camera-popup-on-map>
+            <camera-popup-on-map
+              :camera-Data-List="cameraDataList"
+              :reset-flag="resetFlag"
+            ></camera-popup-on-map>
           </div>
         </div>
-      
       </a-modal>
     </div>
   </div>
@@ -2267,14 +2274,14 @@
   }
 
   //地图视频操作弹窗
-  const operationPopupFlag = ref(false)//地图操作弹窗显示标志位
+  const operationPopupFlag = ref(false) //地图操作弹窗显示标志位
   //关闭地图弹窗重新弹窗数字显示标志位
   const resetFlag = ref(false)
 
   //地图弹窗右上角按钮关闭事件
   const handleCancel = () => {
     //console.log('是否关');
-     resetFlag.value = true
+    resetFlag.value = true
   }
 </script>
 <style lang="less" scoped>
@@ -2741,7 +2748,7 @@
     cursor: pointer;
   }
 
-   .video-cover-new {
+  .video-cover-new {
     width: 798px;
     height: 600px;
     position: absolute;

front/src/views/home/videoSurveillance/components/CameraPopupOnMap.vue

@@ -24,11 +24,15 @@
               </div>
             </a-carousel>
           <div class="operation-content" style="position:ab">
+            <div class="text-label">
+                <span>{{defaultIndex+1}}</span>/<span>{{cameraDataList.length}}</span>
+              </div>
               <div class="video-content">
               <h5-player :video-url="videoUrl" :stop-flag="selectedFlag"></h5-player>
               </div>
-              <div class="text-label">
+              <div class="text-label des-label">
-                <span>{{defaultIndex+1}}</span>/<span>{{cameraDataList.length}}</span>
+                <span>通道名称: {{cameraDataList[defaultIndex].channelName}}</span>
+                <span>通道编码: {{cameraDataList[defaultIndex].channelId}}</span>
               </div>
               <div class="footer-button" v-if="showFlag">
                 <a-button type="primary" @click="applyNow(cameraDataList[defaultIndex])">立即申请</a-button>
@@ -306,9 +310,16 @@
       .text-label{
       width:800px;
       height:30px;
-      margin-top:10px;
+      margin-top:-20px;
       text-align:center;
       font-size: 18px;
+      // color: #1eacd6;
+      }
+      .des-label {
+        color: #000;
+        margin-top:10px;
+        display: flex;
+        justify-content: space-around;
       }
         .video-content{
      width: 750px;

front/src/views/home/videoSurveillance/index.vue

@@ -557,8 +557,8 @@ import { ElMessage } from 'element-plus'
         let params = {
         regionId: "70be8c5b664f4bcf869d82f2e8335051",
         pageNum: "1",
-        pageSize: 40000,
+        pageSize: 1000,
-        type: 0,
+        // type: 1,
         borderPolygonList: []
         }
         getCameraByCondition(params).then((res) => {