共享条件
diff --git a/front/src/views/home/apply.vue b/front/src/views/home/apply.vue
index 8683e7da..670312fb 100644
--- a/front/src/views/home/apply.vue
+++ b/front/src/views/home/apply.vue
@@ -75,7 +75,7 @@
/>
-
+
{
+ item.arr.map((val) => {
+ let obj = item.children.filter((type) => type.id == val.id)[0]
+ if (obj) {
+ console.log('11111111111111111111111111111', obj, flag.value)
+ if (obj.type !== '应用资源') {
+ flag.value = true
+ }
+ }
+ })
if (item.checkedList) {
console.log(item)
num.value += Number(item.checkedList.length)
@@ -290,9 +300,7 @@
? list.value[0].children
.filter((val) => val.id == list.value[0].checkedList[0])[0]
.resourceName.concat(
- list.value[0].checkedList.length > 1
- ? '等能力申请' + num.value + '个'
- : '能力申请'
+ num.value > 1 ? '等能力申请' + num.value + '个' : '能力申请'
)
: list.value[0].arr[0].resourceName.concat('能力申请'), // 标题
applicationSystem: [], // 应用系统
@@ -656,6 +664,7 @@
handleFocus,
systemOptions,
applicationSceneOpthion,
+ flag,
}
},
}
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index 8444e1a0..190d0a68 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -30,7 +30,6 @@
@click="changeCondition(item.value)"
v-show="
item.show &&
- !(item.name === '申请量' && selectCardsname == '应用资源') &&
item.name !== '评分' &&
selectCardsname !== '数据资源'
"
@@ -115,7 +114,7 @@
p-id="3062"
width="40"
height="40"
- v-if="item.applyState == '通过' && item.type !== '应用资源'"
+ v-if="item.applyState == '通过'"
style="margin-left: 10px"
>
申请量：{{ item.applyCount || 0 }}次
@@ -221,7 +220,12 @@