Merge branch 'hi-ucs-dev' of http://124.222.94.39:3001/wuhongjian/hi-ucs into hi-ucs-dev

front/src/views/capabilityCloud/components/DataResources.vue

@@ -144,7 +144,11 @@
       const object = res.data.data.filter((item) => item.type === val.name)[0]
       console.log('object', object)
       if (object) {
-        val.num = object.amount
+        if (object.type == '满足率') {
+          val.num = object.amount * 100 + '%'
+        } else {
+          val.num = object.amount
+        }
       }
     })
     const arr = res.data.data.filter((item) => item.resourceTop5)[0]

front/src/views/detailsAll/AlgorithmDetails.vue

@@ -11,6 +11,7 @@
     <algorithm-top-details :dataList="dataList.data"></algorithm-top-details>
     <!-- 导航 -->
     <algorithm-navigation
+      :associatedComponents="associatedComponents"
       :dataList="dataList.data"
       :class="{ fixed: scrollTop >= 600 }"
       :selectNow="selectNow"

front/src/views/detailsAll/BusinessDetails.vue

@@ -12,21 +12,22 @@
     <!-- 导航 -->
     <business-navigation
       :dataList="dataList.data"
+      :associatedComponents="associatedComponents"
       :class="{ fixed: scrollTop >= 600 }"
       :selectNow="selectNow"
     ></business-navigation>
-    <!-- 组件展示 -->
-    <business-presentation
-      :dataList="dataList.data"
-      id="business-presentation"
-      class="scrollBox"
-    ></business-presentation>
     <!-- 关联能力 -->
     <business-associated-ability
       :associatedComponents="associatedComponents"
       id="business-associated-ability"
       class="scrollBox"
     ></business-associated-ability>
+    <!-- 组件展示 -->
+    <business-presentation
+      :dataList="dataList.data"
+      id="business-presentation"
+      class="scrollBox"
+    ></business-presentation>
     <!-- 功能介绍-->
     <business-function-intorduction
       :dataList="dataList.data"

front/src/views/detailsAll/DeveloperComponents.vue

@@ -12,6 +12,7 @@
     <!-- 导航 -->
     <developer-navigation
       :dataList="dataList.data"
+      :associatedComponents="associatedComponents"
       :class="{ fixed: scrollTop >= 600 }"
       :selectNow="selectNow"
     ></developer-navigation>

front/src/views/detailsAll/LayerService.vue

@@ -14,9 +14,16 @@
     <!-- 导航 -->
     <layer-service-navigation
       :dataList="dataList.data"
+      :associatedComponents="associatedComponents"
       :class="{ fixed: scrollTop >= 600 }"
       :selectNow="selectNow"
     ></layer-service-navigation>
+    <!-- 关联能力 -->
+    <layer-service-associated-ability
+      :associatedComponents="associatedComponents"
+      id="layer-service-associated-ability"
+      class="scrollBox"
+    ></layer-service-associated-ability>
     <!-- 图层展示  视频 -->
     <layer-service-presentation
       :dataList="dataList.data"
@@ -29,12 +36,6 @@
       id="service-information"
       class="scrollBox"
     ></layer-service-information>
-    <!-- 关联能力 -->
-    <layer-service-associated-ability
-      :associatedComponents="associatedComponents"
-      id="layer-service-associated-ability"
-      class="scrollBox"
-    ></layer-service-associated-ability>
     <!-- 应用场景 -->
     <layer-service-application-scenarios
       :dataList="dataList.data"

front/src/views/detailsAll/components/Algorithm/AlgorithmChargingStandard.vue

@@ -46,7 +46,7 @@
               title: item.type,
               content: item.desc,
               value: item.price,
-              time: '',
+              time: '元',
               unit: '￥',
             }
             break
@@ -103,7 +103,7 @@
                   title: item.type,
                   content: item.desc,
                   value: item.price,
-                  time: '',
+                  time: '元',
                   unit: '￥',
                 }
                 break

front/src/views/detailsAll/components/Algorithm/AlgorithmNavigation.vue

@@ -26,8 +26,8 @@
   import mybus from '@/myplugins/mybus'
   import { queryPartAppByKeyId2 } from '@/api/home'
   // 获取当前路由地址
-  const router = useRouter();
+  const router = useRouter()
-  const keyId = router.currentRoute.value.query.id;
+  const keyId = router.currentRoute.value.query.id
   console.log('123', keyId)
   const navList = ref([
     {
@@ -64,16 +64,15 @@
     },
   ])
   const list = ref([])
-    // 根据能力id查询是否存在关联应用
+  // 根据能力id查询是否存在关联应用
-  queryPartAppByKeyId2({keyId: keyId}).then(
+  queryPartAppByKeyId2({ keyId: keyId }).then((res) => {
-    res=>{
     console.log('ressssssss', res)
     if (res.data.data.length > 0) {
       // 存在关联应用时在导航栏加入关联应用
       navList.value.unshift({
         name: '关联应用',
         key: 'algorithm-associated-ability',
-        show: true
+        show: true,
       })
       // list.value.push('关联应用')
       console.log('navList', navList)
@@ -82,8 +81,7 @@
   const props = defineProps({
     selectNow: { type: String, default: '' },
     dataList: { type: Object, default: null },
-  }
+  })
-  )
 
   const select = ref('algorithm-display')
 
@@ -163,11 +161,17 @@
           }
         })
         if (list.value.length > 0) {
+          console.log(
+            '11111111111111111111111111',
+            (select.value = navList.value.filter(
+              (item) => item.name === list.value[0]
+            )[0])
+          )
+          debugger
           select.value = navList.value.filter(
             (item) => item.name === list.value[0]
           )[0].key
         }
-        console.log('11111111111111111111111111', list.value, navList.value)
       }
     }
   )

front/src/views/detailsAll/components/Business/BusinessAssociatedAbility.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="application-associated-ability" v-if="flag">
-    <detals-title title="关联能力" type="RELEVANCE"></detals-title>
+    <detals-title title="关联应用" type="RELEVANCE"></detals-title>
     <div class="application-associated-ability-main">
       <div
         class="associated-ability-card"
@@ -41,9 +41,10 @@
       },
     })
   }
-  if (props.associatedComponents) {
+  if (props.associatedComponents[0].dataList.length != 0) {
     flag.value = true
     dataFrom.value = props.associatedComponents
+    debugger
     console.log('dataFrom.value', dataFrom.value)
   } else {
     flag.value = false

front/src/views/detailsAll/components/Business/BusinessNavigation.vue

@@ -29,7 +29,7 @@
       key: 'business-presentation',
     },
     {
-      name: '关联能力',
+      name: '关联应用',
       key: 'business-associated-ability',
     },
     {
@@ -55,6 +55,7 @@
     },
   ])
   const props = defineProps({
+    associatedComponents: { type: Array, default: null },
     selectNow: { type: String, default: '' },
     dataList: { type: Object, default: null },
   })
@@ -69,7 +70,7 @@
     list.value = []
     let arr = [
       '组件视频介绍',
-      '关联能力',
+      '关联应用',
       '功能介绍',
       '应用场景',
       '应用案例',
@@ -93,12 +94,18 @@
         list.value.push('组件展示')
       }
     })
-    list.value.push('关联能力')
+    list.value.push('关联应用')
     list.value.push('使用方式')
     navList.value.forEach((item) => {
       console.log(item)
       if (list.value.indexOf(item.name) > -1) {
-        item.show = true
+        if (item.name == '关联应用') {
+          if (props.associatedComponents[0].dataList.length != 0) {
+            item.show = true
+          }
+        } else {
+          item.show = true
+        }
       }
     })
     select.value = navList.value.filter(
@@ -119,7 +126,7 @@
         list.value = []
         let arr = [
           '组件视频介绍',
-          '关联能力',
+          '关联应用',
           '功能介绍',
           '应用场景',
           '应用案例',
@@ -144,12 +151,18 @@
             list.value.push('组件展示')
           }
         })
-        list.value.push('关联能力')
+        list.value.push('关联应用')
         list.value.push('使用方式')
         navList.value.forEach((item) => {
           console.log(item)
           if (list.value.indexOf(item.name) > -1) {
-            item.show = true
+            if (item.name == '关联应用') {
+              if (props.associatedComponents[0].dataList.length != 0) {
+                item.show = true
+              }
+            } else {
+              item.show = true
+            }
           }
         })
         if (list.value.length > 0) {

front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="application-associated-ability" v-if="flag">
-    <detals-title title="关联能力" type="RELEVANCE"></detals-title>
+    <detals-title title="关联应用" type="RELEVANCE"></detals-title>
     <div class="application-associated-ability-main">
       <div
         class="associated-ability-card"
@@ -41,9 +41,10 @@
       },
     })
   }
-  if (props.associatedComponents) {
+  if (props.associatedComponents[0].dataList.length != 0) {
     flag.value = true
     dataFrom.value = props.associatedComponents
+    debugger
     console.log('dataFrom.value', dataFrom.value)
   } else {
     flag.value = false

front/src/views/detailsAll/components/Developer/DeveloperNavigation.vue

@@ -29,7 +29,7 @@
       key: 'eveloper-presentation',
     },
     {
-      name: '关联能力',
+      name: '关联应用',
       key: 'developer-associated-ability',
     },
     {
@@ -60,6 +60,7 @@
   const props = defineProps({
     selectNow: { type: String, default: '' },
     dataList: { type: Object, default: null },
+    associatedComponents: { type: Array, default: null },
   })
   const select = ref('algorithm-display')
   const list = ref([])
@@ -80,11 +81,17 @@
         list.value.push('组件展示')
       }
     })
-    list.value.push('关联能力')
+    list.value.push('关联应用')
     navList.value.forEach((item) => {
       console.log(item)
       if (list.value.indexOf(item.name) > -1) {
-        item.show = true
+        if (item.name == '关联应用') {
+          if (props.associatedComponents[0].dataList.length != 0) {
+            item.show = true
+          }
+        } else {
+          item.show = true
+        }
       }
     })
     select.value = navList.value.filter(
@@ -115,13 +122,19 @@
             list.value.push('组件展示')
           }
         })
-        list.value.push('关联能力')
+        list.value.push('关联应用')
         list.value.push('组件试用')
         list.value.push('使用方式')
         navList.value.forEach((item) => {
           console.log(item)
           if (list.value.indexOf(item.name) > -1) {
-            item.show = true
+            if (item.name == '关联应用') {
+              if (props.associatedComponents[0].dataList.length != 0) {
+                item.show = true
+              }
+            } else {
+              item.show = true
+            }
           }
         })
         if (list.value.length > 0) {

front/src/views/detailsAll/components/LayerService/LayerServiceAssociatedAbility.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="application-associated-ability" v-if="flag">
-    <detals-title title="关联能力" type="RELEVANCE"></detals-title>
+    <detals-title title="关联应用" type="RELEVANCE"></detals-title>
     <div class="application-associated-ability-main">
       <div
         class="associated-ability-card"
@@ -41,9 +41,10 @@
       },
     })
   }
-  if (props.associatedComponents) {
+  if (props.associatedComponents[0].dataList.length != 0) {
     flag.value = true
     dataFrom.value = props.associatedComponents
+    debugger
     console.log('dataFrom.value', dataFrom.value)
   } else {
     flag.value = false

front/src/views/detailsAll/components/LayerService/LayerServiceNavigation.vue

@@ -24,6 +24,10 @@
   import { ref, defineProps, watch } from 'vue'
   import mybus from '@/myplugins/mybus'
   const navList = ref([
+    {
+      name: '关联应用',
+      key: 'layer-service-associated-ability',
+    },
     {
       name: '图层展示',
       key: 'service-presentation',
@@ -32,10 +36,6 @@
       name: '图层信息',
       key: 'service-information',
     },
-    {
-      name: '关联能力',
-      key: 'layer-service-associated-ability',
-    },
     {
       name: '应用场景',
       key: 'service-application-scenarios',
@@ -60,6 +60,7 @@
   const props = defineProps({
     selectNow: { type: String, default: '' },
     dataList: { type: Object, default: null },
+    associatedComponents: { type: Array, default: null },
   })
   const select = ref('service-presentation')
   const list = ref([])
@@ -121,11 +122,17 @@
         list.value.push('使用方式')
       }
     })
-    list.value.push('关联能力')
+    list.value.push('关联应用')
     navList.value.forEach((item) => {
       console.log(item)
       if (list.value.indexOf(item.name) > -1) {
-        item.show = true
+        if (item.name == '关联应用') {
+          if (props.associatedComponents[0].dataList.length != 0) {
+            item.show = true
+          }
+        } else {
+          item.show = true
+        }
       }
     })
     select.value = navList.value.filter(
@@ -196,11 +203,17 @@
             list.value.push('使用方式')
           }
         })
-        list.value.push('关联能力')
+        list.value.push('关联应用')
         navList.value.forEach((item) => {
           console.log(item)
           if (list.value.indexOf(item.name) > -1) {
-            item.show = true
+            if (item.name == '关联应用') {
+              if (props.associatedComponents[0].dataList.length != 0) {
+                item.show = true
+              }
+            } else {
+              item.show = true
+            }
           }
         })
         if (list.value.length > 0) {

front/src/views/home/infrastructurePage.vue

@@ -5,7 +5,7 @@
     <div class="infrastructrue-tab">
       <div v-for="(item, index) in tabList" :key="index" class="tabBox">
         <b class="leftType">{{ item.title }}</b>
-        <button @click="nullClick" v-if="item.title == '视频细分'">清空</button>
+        <button @click="nullClick" v-if="item.title == '视频标签'">清空</button>
         <span
           v-for="itemContent in item.content"
           :key="itemContent"
@@ -206,7 +206,7 @@
       content: ['视频资源', '云资源', '感知资源'],
     },
     {
-      title: '视频细分',
+      title: '视频标签',
       content: [],
     },
   ])
@@ -255,12 +255,18 @@
       if (name == '视频资源') {
         tableHeight.value = 330
         showMap.value = true
+        tabList.value[1].title = '视频标签'
       } else if (name == '云资源') {
         tableHeight.value = 600
         showMap.value = false
+        dataSource.value = []
+        pagination.value.total = 0
+        tabList.value[1].title = '云资源分类'
       } else if (name == '感知资源') {
         tableHeight.value = 330
         showMap.value = true
+        dataSource.value = []
+        pagination.value.total = 0
       }
       clickList.value[indexFather].content.splice(
         clickList.value[indexFather].content.indexOf(name),
@@ -272,6 +278,7 @@
         showMap.value = true
         tabList.value[1].content = []
         clickList.value[1].content = []
+        tabList.value[1].title = '视频标签'
         clickList.value[indexFather].content[0] = name
         getCameraAllLabel().then((res) => {
           res.data.data.forEach((val) => {
@@ -281,10 +288,21 @@
             })
           })
         })
+        // 改变查询摄像头接口的labelCode数组
+        mapSearchParam.value.labelCodes = []
+        clickList.value[1].content.map((item) => {
+          mapSearchParam.value.labelCodes.push(item.labelCode)
+        })
+        console.log('选中的标签code', mapSearchParam.value)
+        mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
+        getCamera()
       } else if (name == '云资源') {
         tableHeight.value = 600
         showMap.value = false
+        dataSource.value = []
+        pagination.value.total = 0
         clickList.value[1].content = []
+        tabList.value[1].title = '云资源分类'
         clickList.value[indexFather].content[0] = name
         tabList.value[1].content = [
           '云主机',
@@ -300,20 +318,15 @@
         tableHeight.value = 330
         showMap.value = true
         clickList.value[1].content = []
+        pagination.value.total = 0
+        tabList.value[1].title = '感知资源分类'
         clickList.value[indexFather].content[0] = name
         tabList.value[1].content = []
+        dataSource.value = []
       } else {
         clickList.value[indexFather].content.push(name)
       }
     }
-    // 改变查询摄像头接口的labelCode数组
-    mapSearchParam.value.labelCodes = []
-    clickList.value[1].content.map((item) => {
-      mapSearchParam.value.labelCodes.push(item.labelCode)
-    })
-    console.log('选中的标签code', mapSearchParam.value)
-    mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + ''
-    getCamera()
   }
   // 清空
   const nullClick = () => {