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

# Conflicts:
#	front/src/views/home/infrastructurePage.vue

front/src/views/home/infrastructurePage.vue

@@ -5,13 +5,11 @@
     <div class="infrastructrue-tab">
       <div v-for="(item, index) in tabList" :key="index" class="tabBox">
         <b class="leftType">{{ item.title }}</b>
-        <a-button @click="nullClick" v-if="item.title == '视频标签'">
-          清空
-        </a-button>
+        <button @click="nullClick" v-if="item.title == '视频标签'">清空</button>
         <span
           v-for="itemContent in item.content"
           :key="itemContent"
-          @click="tabClick(index, itemContent, item)"
+          @click="tabClick(index, itemContent)"
           :class="
             clickList[index].content.indexOf(itemContent.labelName) != -1 ||
             clickList[index].content.indexOf(itemContent) != -1
@@ -117,8 +115,8 @@
 </template>
 <script setup>
   import VideoSurveillance from '@/views/home/videoSurveillance'
-  import { getCategoryTreePage } from '@/api/personalCenter'
-  import { dataType } from 'element-plus/es/components/table-v2/src/common'
+  // import { getCategoryTreePage } from '@/api/personalCenter'
+  // import { dataType } from 'element-plus/es/components/table-v2/src/common'
   import { useRouter } from 'vue-router'
   import { message } from 'ant-design-vue'
   import { ref, reactive, onMounted } from 'vue'
@@ -245,7 +243,7 @@
       clickList.value.push(params)
     })
     mybus.off('tranferToList')
-    mybus.on('tranferToList', (data) => {
+    mybus.on('tranferToList', () => {
       console.log('获取到的列表数据')
     })
   }
@@ -255,7 +253,6 @@
   let tableHeight = ref('600')
   //tab切换点击事件
   const tabClick = (indexFather, name) => {
-    console.log(clickList.value, indexFather, name)
     selectedRowKeys.value = []
     selectedList.value = []
     if (clickList.value[indexFather].content.indexOf(name) != -1) {
@@ -341,7 +338,11 @@
     })
     console.log('选中的标签code', mapSearchParam.value)
     mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
-    if (name == '视频资源') {
+    let fatherName = ref('视频资源')
+    if (name == '视频资源' || name == '云资源' || name == '感知资源') {
+      fatherName.value == name
+    }
+    if (fatherName.value == '视频资源') {
       getCamera()
     } else {
       dataSource.value = []
@@ -395,10 +396,10 @@
       message.error('请选择需要申请的数据')
     }
   }
-  // 添加至购物车
-  const addShopCar = () => {
-    console.log('添加至购物车')
-  }
+  // // 添加至购物车
+  // const addShopCar = () => {
+  //   console.log('添加至购物车')
+  // }
   const getCamera = () => {
     console.log('初始化调用')
     getCameraByParentId(mapSearchParam.value).then((res) => {
@@ -445,7 +446,7 @@
       key: 'channelId',
     },
   ])
-  const allClick = ref([])
+  // const allClick = ref([])
   const onSelectChange = (record, selected, selectedRows, nativeEvent) => {
     console.log('hahhahah', record, selected, selectedRows, nativeEvent)
     if (selected) {
@@ -541,19 +542,6 @@
       }
       .tabBox {
         margin-bottom: 0.16rem;
-        :deep(.ant-btn:active) {
-          color: unset;
-          border-color: unset;
-        }
-        :deep(.ant-btn) {
-          margin-left: 10px;
-          border: 1px solid #666666;
-          color: #666666;
-          border-radius: 10px;
-        }
-        :deep(.ant-btn:hover) {
-          color: #40a9ff;
-        }
       }
       .tabBox:last-of-type {
         margin-bottom: 0;