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

front/src/api/file.js

@@ -117,7 +117,7 @@ export function getPlaceType() {
 //西海岸 根据标签树查询视频列表
 export function CameraConditionPlaceType(params) {
     return axios.post(
-        'http://10.134.135.92:9537/data_service/getCamera/CameraConditionPlaceType' +
+        'http://10.134.135.92:9537/data_service/getCamera/CameraConditionPlaceType' ,
         params,
         config2
     )

front/src/views/home/detailsPageInfrastructureTreeXha.vue

@@ -140,7 +140,6 @@ export default defineComponent({
     const bumenImg = require('@/assets/newHome/bumen.png')
     const biaoqianImg = require('@/assets/newHome/biaoqian.png')
     const router = useRouter()
-    const whoShow1 = ref(whoShow)
     const showKey = ref(0)
     const treeData = ref([])
     const selectId = ref('')
@@ -149,6 +148,24 @@ export default defineComponent({
     //切换tab
     const btnClick = (index) => {
       itemIndex.value = index
+    if(index===2){
+      if(chooseId.value !==''){
+        let placeTypeCode =[]
+      placeTypeCode.push(chooseId.value)
+      mybus.emit('CameraConditionPlaceType', placeTypeCode)
+    }else{
+      mybus.emit('clearLeftSelect')
+    }
+    }else{
+      if(selectId.value!==''){
+        mybus.emit('getCameraByParentId', selectId.value)
+      }else{
+      mybus.emit('clearLeftSelect')
+      }
+    }
+     
+  
+   
     }
     //选择标签内容
     const tabClick = (id) => {
@@ -156,6 +173,7 @@ export default defineComponent({
         chooseId.value = ''
         mybus.emit('clearLeftSelect')
       }else{
+  
         chooseId.value = id
       let placeTypeCode =[]
       placeTypeCode.push(id)
@@ -175,14 +193,10 @@ export default defineComponent({
       if (select == '基础设施') {
   
         let res = {}
-        if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
+   
-          res = await getCameraAllOrgan({ parentId: 'S4NbecfYB1DBH8HNULGS34' })
-        } else {
-          // 西海岸
           res = await getCameraInfoByAreaId({
             areaId: '70be8c5b664f4bcf869d82f2e8335051',
           })
-        }
         treeData.value = (res.data && res.data.data) || []
         let tabs={}
         tabs = await getPlaceType()
@@ -203,13 +217,8 @@ export default defineComponent({
     })
     const onSelect = async (item, val, child) => {
 
-      // if(selectId.value===val.id){
-      //   selectId.value=''
-      //     mybus.emit('clearLeftSelect')
-      // }else{
         let res = {}
          mybus.emit('getCameraByParentId', val.id)
-
         res = await getCameraInfoByAreaId({ areaId: val.id })
       treeData.value.map((treeDataItem, index) => {
         if (item.id == treeDataItem.id) {
@@ -222,36 +231,33 @@ export default defineComponent({
         }
       })
       if (child) {
+        
           if(selectId.value===child.id){
         selectId.value=''
-          mybus.emit('clearLeftSelect')
+        
       }else{
         selectId.value = child.id
       }
       
       }
-     // }
+ 
      
     }
 
     watch(selectId, (newVal) => {
 
       if (newVal == '') { 
-        mybus.emit('getCameraByParentId', '')
+          mybus.emit('clearLeftSelect')
-        mybus.emit('getListByParentId', '')
+        // mybus.emit('getCameraByParentId', '')
+        // mybus.emit('getListByParentId', '')
       }
     })
 
     const showBottom = async (item) => {
       item.show = !item.show
       let res = {}
-      if (whoShow1.value && !whoShow1.value.itShowXiHaiAn) {
-        res = await getCameraAllOrgan({ parentId: item.id })
-      } else {
         // 西海岸
         res = await getCameraInfoByAreaId({ areaId: item.id })
-      }
-
       treeData.value.map((treeDataItem, index) => {
         if (item.id == treeDataItem.id) {
           treeData.value[index].children = (res.data && res.data.data) || []
@@ -268,7 +274,7 @@ export default defineComponent({
         // 取消选中
         if (!val.show) {
           selectId.value = ''
-          mybus.emit('clearLeftSelect')
+         // mybus.emit('clearLeftSelect')
         }
       }
     }

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

@@ -46,15 +46,11 @@
     LeftCircleOutlined,
     RightCircleOutlined,
   } from '@ant-design/icons-vue'
-  // import { useRouter } from 'vue-router'
+  import { useRouter } from 'vue-router'
   import H5Player from '@/views/home/components/H5Player.vue'
   import mybus from '@/myplugins/mybus'
-  import { message } from 'ant-design-vue'
   import { getStreamByChannelCode } from '@/api/videoSurveillance'
   import {getCameraLiveStream} from '@/api/file'
-  import {willApplyCameraSelect,
-    getApplyCameraListXha,
-  } from '@/api/home'
   export default {
     name: '',
     components: {
@@ -85,7 +81,7 @@
         videoStream: '',  
          videoUrl:'', //视频预览url
          defaultIndex:0,//默认显示列表中的对一个
-        //  router:useRouter()
+         router:useRouter()
       }
     },
     methods: {
@@ -98,59 +94,13 @@
       },
       //立即申请
       applyNow(item){
-        getApplyCameraListXha().then(res => {
+        console.log('applyNowapplyNow',item);
-          let flag = true
+       //跳转至申请页面
-          if (res.data.code == 0) {
+          this.router.push({
-            res.data.data.map((val) => {
-              val.cameraInfo = JSON.parse(val.cameraInfo)
-              console.log('applyNowapplyNow',val.cameraInfo);
-              if(flag && val.cameraInfo.channelId == item.channelId){
-                flag = false
-              }
-            })
-            if(flag){
-              willApplyCameraSelect().then(res => {
-                if (res.data.code == 0) {
-                  res.data.data.map(val => {
-                    if(item.channelId == val.channelId){
-                      item.id = val.id
-                    }
-                  })
-                }
-                let obj = {
-                  arr: [
-                    {
-                      checked: true,
-                      delFlag: 0,
-                      id: '1593084734789996545',
-                      idtCameraChannel: '790582098133127168',
-                      loading: false,
-                      note1: '',
-                      resourceId: '1522550195055828996',
-                      resourceName: '摄像头列表',
-                      type: '基础设施',
-                    },
-                  ],
-                  deptName: '西海岸新区工业和信息化局',
-                  deptId: '732560225344761856',
-                }
-                item.type = '基础设施'
-                item.delFlag = 0
-                item.resourceId = item.channelId
-                item.resourceName = item.channelName
-                obj.arr[0].note1 = JSON.stringify([item])
-                if (obj.arr.length > 0) {
-                  localStorage.setItem('applyList', JSON.stringify([obj]))
-                  console.log('applyNowapplyNowobj',obj);
-                  this.$router.push({
           path: '/apply',
-                  })
+          query: {
-                }
+         
-              })
+          },
-            }else{
-              message.warning('该摄像头已申请！')
-            }
-          }
         })
       },
       //加入申购车

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

@@ -523,7 +523,7 @@ import { ElMessage } from 'element-plus'
         if(queryString){
           getCameraByCondition({
             pageNum: 1,
-            pageSize: 30000,
+            pageSize: 10,
             regionId: "70be8c5b664f4bcf869d82f2e8335051",
             type: "0",
             name:queryString,