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

front/src/views/home/infrastructureApplication.vue

@@ -2,7 +2,7 @@
  * @Author: Light
  * @Date: 2022-11-18 11:53:43
  * @LastEditors: Light
- * @LastEditTime: 2022-11-22 14:50:32
+ * @LastEditTime: 2022-11-22 19:13:02
  * @Description: 告诉大家这是什么
 -->
 <template>
@@ -69,7 +69,10 @@
           </a-list-item>
         </template>
         <template #header>
-          <div class="title">已申请列表</div>
+          <div class="title">
+            已申请列表
+            <a-button type="link" @click="goToApply">详情</a-button>
+          </div>
         </template>
       </a-list>
     </div>
@@ -104,8 +107,7 @@
     @cancel="clear"
   >
     <div style="width: 100%; display: flex; justify-content: center">
-          <div
+      <div style="width: 100%; height: 100%; position: relative">
-            style="width: 100%; height: 100%; position: relative">
         <div class="waterMark waterMark-left-top">
           {{ userInfo.usernameShow }}
         </div>
@@ -243,10 +245,18 @@
       }
     }
   }
+  const goToApply = () => {
+    router.push({
+      path: '/personalCenter',
+      query: {
+        type: 'apply',
+      },
+    })
+  }
   const selectItem = (item) => {
     if (item.approveStatus == '通过') {
       dataList.selectItem = item
-      getVideoUrl(item.cameraInfo);
+      getVideoUrl(item.cameraInfo)
     } else {
       dataList.selectItem = {}
       showVisible.value = false
@@ -303,11 +313,11 @@
   const videoUrl = ref('')
   //获取视频控件所需播放地址
   const getVideoUrl = (data) => {
-      let param = data;
+    let param = data
     getCameraLiveStream(param).then((res) => {
       //console.log('555555rrrrr',res)
       if (res.data.data) {
-        videoUrl.value = res.data.data.url;
+        videoUrl.value = res.data.data.url
       }
       showVisible.value = true
     })

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

@@ -193,10 +193,11 @@ import { ElMessage } from 'element-plus'
       // 点击左侧根据parentId查询摄像头列表
       mybus.off('getCameraByParentId')
       mybus.on('getCameraByParentId', (parentId) => {
+        debugger
         this.mapSearchParam.parentId = parentId
         this.mapSearchParam.type = "1"
         this.mapSearchParam.pageSize = 10000
-        this.getCameraByParentId()
+        this.getCameraByParentId('','department')
       })
       //表格勾选
       mybus.off('selectTablePoint')
@@ -314,6 +315,9 @@ import { ElMessage } from 'element-plus'
           lng: item.location.x,
         }
         this.hiMapFun.mapFlyTo(latLng)
+        if(this.addressType=='2'){
+          mybus.emit('openOperationPopup', [item]);
+        }
       },
       //框选
       areaSelectResource(){
@@ -395,7 +399,7 @@ import { ElMessage } from 'element-plus'
           }
         })
       },
-      getCameraByParentId(type) {
+      getCameraByParentId(type,dataName) {
         if (!this.whoShow1.itShowXiHaiAn) {
           getCameraByParentId(this.mapSearchParam).then((res) => {
             console.log('根据parent查询摄像头', res.data.data)
@@ -431,7 +435,9 @@ import { ElMessage } from 'element-plus'
               }
             }
           }
-           //params.type='0';
+          if(dataName){
+              params.type='0';
+          }
           getCameraByCondition(params).then((res) => {
             //console.log('根据parent查询摄像头44444', res.data.data)
             if(type=='map'){