diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue index 1d49c640..75b853ec 100644 --- a/front/src/views/home/DetailsPageconetent.vue +++ b/front/src/views/home/DetailsPageconetent.vue @@ -513,31 +513,35 @@ export default defineComponent({ } const searchResultListDom = ref(null) - // 读取本地存储查询条件 - const storageSearchInfo = localStorage.getItem('DetailsPageconetent') && JSON.parse( - localStorage.getItem('DetailsPageconetent') - ) - const handleSetSearchData = () => { - console.log('storageSearchInfo------------>', storageSearchInfo) - // 读取本地存储:表单赋值 - if (storageSearchInfo) { - paramsGetResources = Object.assign({}, paramsGetResources, storageSearchInfo) - // 搜索名称 - searchValue.value = storageSearchInfo.name; - currentPage.value = storageSearchInfo.pageNum; - currentPageSize.value = storageSearchInfo.pageSize; - paramsGetResources.pageNum = storageSearchInfo.pageNum; - paramsGetResources.pageSize = storageSearchInfo.pageSize; - paramsGetResources.deptIds = storageSearchInfo.deptIds; - paramsGetResources.districtId = storageSearchInfo.districtId; - // 延迟使用,因为还没有返回跟挂载 - nextTick(() => { - searchResultListDom.value.changeCondition({ - value: storageSearchInfo.orderField, - orderType: storageSearchInfo.orderType, - }, true) - }) + // 读取本地存储查询条件 + let storageSearchInfo = null + const handleSetSearchData = () => { + if (whoShow1.value.itShowXiHaiAn) { + if (localStorage.getItem('DetailsPageconetent')) { + storageSearchInfo = JSON.parse(localStorage.getItem('DetailsPageconetent')); + } + console.log('storageSearchInfo------------>', storageSearchInfo) + // 读取本地存储:表单赋值 + if (storageSearchInfo) { + paramsGetResources = Object.assign({}, paramsGetResources, storageSearchInfo) + // 搜索名称 + searchValue.value = storageSearchInfo.name; + currentPage.value = storageSearchInfo.pageNum; + currentPageSize.value = storageSearchInfo.pageSize; + paramsGetResources.pageNum = storageSearchInfo.pageNum; + paramsGetResources.pageSize = storageSearchInfo.pageSize; + paramsGetResources.deptIds = storageSearchInfo.deptIds; + paramsGetResources.districtId = storageSearchInfo.districtId; + + // 延迟使用,因为还没有返回跟挂载 + nextTick(() => { + searchResultListDom.value.changeCondition({ + value: storageSearchInfo.orderField, + orderType: storageSearchInfo.orderType, + }, true) + }) + } } } @@ -631,20 +635,22 @@ export default defineComponent({ paramsGetResources.pageNum = 1 currentPage.value = 1 console.log('点击筛选条件=================>', tag, checked, name) - // 智能算法 特殊处理 - if (tag.dict_label == '智能算法' && checked) { - ListContent.records.splice(2, 1, ListContentCopy.value[2]) - } else { - if (name == '组件类型') { - ListContent.records.splice(2, 1) - paramsGetResources.infoList = paramsGetResources.infoList.filter( - (item) => componentTypeArray.includes(item.attrType) - ) + + // 西海岸-智能算法 特殊处理 + if (whoShow1.value.itShowXiHaiAn) { + if (tag.dict_label == '智能算法' && checked) { + ListContent.records.splice(2, 1, ListContentCopy.value[2]) + } else { + if (name == '组件类型') { + ListContent.records.splice(2, 1) + paramsGetResources.infoList = paramsGetResources.infoList.filter( + (item) => componentTypeArray.includes(item.attrType) + ) + } } } ListContent.records.forEach((val) => { - if (!val) { return; } @@ -661,10 +667,13 @@ export default defineComponent({ } else { val.selectedTags && val.selectedTags.splice(val.selectedTags.indexOf(tag.dict_label), 1) } - // - if ((val.selectedTags.length == 0 && tag.dict_label == '智能算法' && !checked) || (tag.dict_label !== '智能算法' && name == '组件类型')) { - if (ListContentCopy.value[2]) { - ListContentCopy.value[2].selectedTags = [] + + // 西海岸-智能算法 特殊处理 + if (whoShow1.value.itShowXiHaiAn) { + if ((val.selectedTags.length == 0 && tag.dict_label == '智能算法' && !checked) || (tag.dict_label !== '智能算法' && name == '组件类型')) { + if (ListContentCopy.value[2]) { + ListContentCopy.value[2].selectedTags = [] + } } } } diff --git a/front/src/views/home/components/ComponentServiceTag.vue b/front/src/views/home/components/ComponentServiceTag.vue new file mode 100644 index 00000000..029b6035 --- /dev/null +++ b/front/src/views/home/components/ComponentServiceTag.vue @@ -0,0 +1,46 @@ + + + + \ No newline at end of file diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue index 0fd2870a..b6c5ed53 100644 --- a/front/src/views/home/components/searchResultList.vue +++ b/front/src/views/home/components/searchResultList.vue @@ -19,10 +19,6 @@ selectCardsname !== '数据资源' "> {{ item.name }} - - - - -
@@ -95,6 +90,8 @@
{{ item.name }} + +
- +