diff --git a/front/src/views/detailsAll/ApplicationDetails.vue b/front/src/views/detailsAll/ApplicationDetails.vue index 32fc2079..904c5c29 100644 --- a/front/src/views/detailsAll/ApplicationDetails.vue +++ b/front/src/views/detailsAll/ApplicationDetails.vue @@ -14,6 +14,7 @@ @@ -28,6 +29,7 @@ :dataList="dataList.data" id="application-associated-components" class="scrollBox" + v-if="false" > item.name === list.value[0]) ) if (navList.value.filter((item) => item.name === list.value[0])[0]) { - debugger select.value = navList.value.filter( (item) => item.name === list.value[0] )[0].key diff --git a/front/src/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue b/front/src/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue index f907d4bb..d2c19f96 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationAssociatedAbility.vue @@ -46,7 +46,11 @@ }, }) } - if (props.associatedComponents) { + if ( + props.associatedComponents[0].dataList.length > 0 || + props.associatedComponents[1].dataList.length > 0 || + props.associatedComponents[2].dataList.length > 0 + ) { flag.value = true dataFrom.value = props.associatedComponents console.log('dataFrom.value', dataFrom.value) diff --git a/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue b/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue index 9a224818..bb92e834 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationNavigation.vue @@ -32,10 +32,10 @@ name: '功能介绍', key: 'function-introduction', }, - { - name: '关联组件', - key: 'application-associated-components', - }, + // { + // name: '关联组件', + // key: 'application-associated-components', + // }, { name: '关联组件', key: 'application-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([]) @@ -85,7 +86,17 @@ 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 || + props.associatedComponents[1].dataList.length != 0 || + props.associatedComponents[2].dataList.length != 0 + ) { + item.show = true + } + } else { + item.show = true + } } }) select.value = navList.value.filter( @@ -122,7 +133,17 @@ 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 || + props.associatedComponents[1].dataList.length != 0 || + props.associatedComponents[2].dataList.length != 0 + ) { + item.show = true + } + } else { + item.show = true + } } }) if (list.value.length > 0) { diff --git a/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue b/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue index e9787da0..2a6f75bc 100644 --- a/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue +++ b/front/src/views/detailsAll/components/Application/ApplicationOwningDepartmentAndServiceProvider.vue @@ -73,9 +73,12 @@ item.attrType === '服务商' || item.attrType === '服务商联系人' || item.attrType === '服务商联系电话' || - item.attrType === '服务商名' + item.attrType.indexOf('服务商名') != -1 ) { - if (item.attrType === '服务商' || item.attrType === '服务商名') { + if ( + item.attrType === '服务商' || + item.attrType.indexOf('服务商名') != -1 + ) { dataFrom.value.content[1].childrenContent[0] = item if (dataFrom.value.content[1].childrenContent[0].attrValue == '') { dataFrom.value.content[1].childrenContent[0].attrValue = '------' @@ -121,9 +124,12 @@ item.attrType === '服务商' || item.attrType === '服务商联系人' || item.attrType === '服务商联系电话' || - item.attrType === '服务商名' + item.attrType.indexOf('服务商名') != -1 ) { - if (item.attrType === '服务商' || item.attrType === '服务商名') { + if ( + item.attrType === '服务商' || + item.attrType.indexOf('服务商名') != -1 + ) { dataFrom.value.content[1].childrenContent.push(item) if ( dataFrom.value.content[1].childrenContent[0].attrValue == ''