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

front/src/views/home/DetailsPageconetent.vue

@@ -320,6 +320,7 @@
         </div>
       </div>
       <div class="top-content-father" :key="listKey">
+        <!-- todo -->
         <template v-if="
           Cardsname == '组件服务' ||
           Cardsname == '应用资源' ||
@@ -493,12 +494,13 @@ export default defineComponent({
     const pageSizeOptions = ref(['5', '10', '20', '50'])
     const router = useRouter()
     let select = router.currentRoute.value.query.select || DETAIL_PAGE_CONTENT_DEFAULT_TAB
-    const select2 = router.currentRoute.value.query.select
-    const type2 = router.currentRoute.value.query.type
-    const queryName=ref('')
+    console.log('select------------>', select);
+    // 例如：组件服务是大类型，selectSubType是组件服务的智能算法或图层服务等...
+    const selectSubType = router.currentRoute.value.query.type || ''
+    const queryName = ref('')
     const str = router.currentRoute.value.query.str
     const searchValue = ref(str)
-    const searchType= ref(str)
+    const searchType = ref(str)
     let tecHnosphere = router.currentRoute.value.query.tecHnosphere
     let appLiCation = router.currentRoute.value.query.appLiCation
     const Cardsname = ref(select)
@@ -588,7 +590,7 @@ export default defineComponent({
     const tagFlag = ref('')
     const current = ref(5)
     const chagneTag = (name) => {
-      console.log('name------------>', name)
+      console.log('name----chagneTag-------->', name)
       paramsGetResources.pageNum = 1
       currentPage.value = 1
       if (tagFlag.value == name) {
@@ -803,32 +805,33 @@ export default defineComponent({
         ListContentCopy.value = JSON.parse(JSON.stringify(dataCopy))
         ListContent.records = []
         ListContent.records = JSON.parse(JSON.stringify(dataCopy))
-        if(select2=='组件服务'){
-            queryName.value='组件类型'
-           }else if(select2=='应用资源'){
-            queryName.value='应用领域'
-           }else{
-            queryName.value=''
+        if (select == '组件服务') {
+          queryName.value = '组件类型'
+        } else if (select == '应用资源') {
+          queryName.value = '应用领域'
+        } else {
+          queryName.value = ''
         }
         ListContent.records.forEach((val) => {
 
           if (!val) {
             return
           }
-           if (val.name === queryName.value ) {
+          // todo
+          if (val.name === queryName.value) {
             if (
               val.selectedTags &&
-               val.selectedTags.indexOf(type2) == -1
+              val.selectedTags.indexOf(selectSubType) == -1
             ) {
-               val.selectedTags = [type2]
+              val.selectedTags = [selectSubType]
+              // changeShrink(queryName.value)
             } else {
               val.selectedTags &&
                 val.selectedTags.splice(
-                   val.selectedTags.indexOf(type2),
+                  val.selectedTags.indexOf(selectSubType),
                   1
                 )
             }
-   
           }
         })
         // 智能算法-特殊处理
@@ -1258,6 +1261,29 @@ export default defineComponent({
       )
     }
 
+
+    // 判断是否存在二级类型（首页-能力分类-图层服务）查询条件
+    const judgeHasSubSelectType = () => {
+      if (selectSubType) {
+            paramsGetResources.infoList = []
+          if (select == '组件服务') {
+            queryName.value = '组件类型'
+          } else if (select == '应用资源') {
+            queryName.value = '应用领域'
+          } else if (select == '基础设施') {
+            searchType.value = selectSubType
+          } else {
+            queryName.value = selectSubType
+            searchType.value = ''
+          }
+          let info = { attrType: queryName.value, attrValue: selectSubType }
+            paramsGetResources.infoList.push(info)
+          }
+          // changeShrink(queryName.value)
+          paramsGetResources.type = select
+          console.log('paramsGetResources---onMounted--------->', paramsGetResources);
+    }
+
     onMounted(() => {
       // 从本地读取查询条件，赋值
       handleSetSearchData()
@@ -1266,26 +1292,11 @@ export default defineComponent({
       // 获取筛选条件
       getNewList()
       if (!tecHnosphere && !appLiCation) {
-        if (searchValue.value && !select2) {
+        if (searchValue.value && !select) {
           globalSearch()
         } else {
-           paramsGetResources.infoList=[]
-           if(select2=='组件服务'){
-            queryName.value='组件类型'
-           }else if(select2=='应用资源'){
-            queryName.value='应用领域'
-           }else if(select2=='基础设施'){
-            searchType.value=type2
-          }else{
-            queryName.value=type2
-            searchType.value=''
-           }
-           let info={attrType:queryName.value, attrValue: type2}
-          paramsGetResources.infoList.push(info)
-          paramsGetResources.type=select2
+          judgeHasSubSelectType()
           getAppResources2()
-         
-         
           listKey.value++
         }
       }
@@ -1316,6 +1327,7 @@ export default defineComponent({
     })
 
     const changeShrink = (name) => {
+      console.log('name---changeShrink--------->', name);
       ListContent.records.forEach((val) => {
         if (val.name === name) {
           console.log(val)
@@ -1325,8 +1337,8 @@ export default defineComponent({
     }
     const changeCards = (name) => {
       // 西海岸-特殊处理
-      if(whoShow1.value.itShowXiHaiAn) {
-        if(name !== '基础设施' && !xhaHasPermissionUser.list.includes(user.value.username)) {
+      if (whoShow1.value.itShowXiHaiAn) {
+        if (name !== '基础设施' && !xhaHasPermissionUser.list.includes(user.value.username)) {
           return message.warn('暂无权限')
         }
       }