diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue index b8fcc4c9..49d2ed6f 100644 --- a/front/src/views/home/DetailsPageconetent.vue +++ b/front/src/views/home/DetailsPageconetent.vue @@ -262,7 +262,7 @@
- +
@@ -409,7 +409,7 @@
模糊搜索 -
@@ -494,8 +494,11 @@ export default defineComponent({ 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('') const str = router.currentRoute.value.query.str const searchValue = ref(str) + const searchType= ref(str) let tecHnosphere = router.currentRoute.value.query.tecHnosphere let appLiCation = router.currentRoute.value.query.appLiCation const Cardsname = ref(select) @@ -682,6 +685,7 @@ export default defineComponent({ } ListContent.records.forEach((val) => { + if (!val) { return } @@ -689,6 +693,7 @@ export default defineComponent({ paramsGetResources.infoList = paramsGetResources.infoList.filter( (item) => item.attrType !== name ) + if ( val.selectedTags && val.selectedTags.indexOf(tag.dict_label) == -1 @@ -798,7 +803,34 @@ 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='' + } + ListContent.records.forEach((val) => { + + if (!val) { + return + } + if (val.name === queryName.value ) { + if ( + val.selectedTags && + val.selectedTags.indexOf(type2) == -1 + ) { + val.selectedTags = [type2] + } else { + val.selectedTags && + val.selectedTags.splice( + val.selectedTags.indexOf(type2), + 1 + ) + } + + } + }) // 智能算法-特殊处理 if (whoShow1.value.itShowXiHaiAn) { if (!storageSearchInfo) { @@ -859,6 +891,7 @@ export default defineComponent({ // 校验 const re = /^[0-9\u4E00-\u9FA5]*$/ const getAppResources2 = () => { + globalFlag.value = false if ( whoShow1.value.itShowQingDao && @@ -1236,7 +1269,24 @@ export default defineComponent({ if (searchValue.value && !select2) { 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 getAppResources2() + + + listKey.value++ } } }) diff --git a/front/src/views/home/components/integrationServiceOrder.vue b/front/src/views/home/components/integrationServiceOrder.vue index 0c62dfb6..fc13a08c 100644 --- a/front/src/views/home/components/integrationServiceOrder.vue +++ b/front/src/views/home/components/integrationServiceOrder.vue @@ -47,6 +47,7 @@ const integrationOrder = reactive({ // 融合服务--排序 const changeOrder = (i, val, type) => { + console.log('i, val, type------------>', i, val, type); integrationOrder.orderField = val integrationOrder.orderType = type; diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue index 96d345a2..99d22fcc 100644 --- a/front/src/views/home/components/searchResultList.vue +++ b/front/src/views/home/components/searchResultList.vue @@ -230,6 +230,21 @@
+
+ 发布时间: + + +
发布时间: