From d347e274c549962c3587e08e589303f861f263f7 Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Fri, 1 Jul 2022 15:53:16 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=BB=84=E4=BB=B6bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/detailsAll/DeveloperComponents.vue | 1 + .../Developer/DeveloperAssociatedAbility.vue | 3 ++- .../Developer/DeveloperNavigation.vue | 17 +++++++++++++++-- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/front/src/views/detailsAll/DeveloperComponents.vue b/front/src/views/detailsAll/DeveloperComponents.vue index d4cf3941..2047bcbd 100644 --- a/front/src/views/detailsAll/DeveloperComponents.vue +++ b/front/src/views/detailsAll/DeveloperComponents.vue @@ -12,6 +12,7 @@ diff --git a/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue b/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue index a584b464..9853e728 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperAssociatedAbility.vue @@ -41,9 +41,10 @@ }, }) } - if (props.associatedComponents) { + if (props.associatedComponents[0].dataList.length != 0) { flag.value = true dataFrom.value = props.associatedComponents + debugger console.log('dataFrom.value', dataFrom.value) } else { flag.value = false diff --git a/front/src/views/detailsAll/components/Developer/DeveloperNavigation.vue b/front/src/views/detailsAll/components/Developer/DeveloperNavigation.vue index dc751b18..6e3d9926 100644 --- a/front/src/views/detailsAll/components/Developer/DeveloperNavigation.vue +++ b/front/src/views/detailsAll/components/Developer/DeveloperNavigation.vue @@ -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([]) @@ -84,7 +85,13 @@ 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) { + item.show = true + } + } else { + item.show = true + } } }) select.value = navList.value.filter( @@ -121,7 +128,13 @@ 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) { + item.show = true + } + } else { + item.show = true + } } }) if (list.value.length > 0) { From e5ea56b29fa829d1782c6a95d41e903226e2c68b Mon Sep 17 00:00:00 2001 From: gaoyuanwei <2826352639@qq.com> Date: Fri, 1 Jul 2022 15:58:59 +0800 Subject: [PATCH 2/5] =?UTF-8?q?bug=20=E5=85=83--=E5=8D=95=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/Algorithm/AlgorithmChargingStandard.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/front/src/views/detailsAll/components/Algorithm/AlgorithmChargingStandard.vue b/front/src/views/detailsAll/components/Algorithm/AlgorithmChargingStandard.vue index 455161db..2768387e 100644 --- a/front/src/views/detailsAll/components/Algorithm/AlgorithmChargingStandard.vue +++ b/front/src/views/detailsAll/components/Algorithm/AlgorithmChargingStandard.vue @@ -46,7 +46,7 @@ title: item.type, content: item.desc, value: item.price, - time: '', + time: '元', unit: '￥', } break @@ -103,7 +103,7 @@ title: item.type, content: item.desc, value: item.price, - time: '', + time: '元', unit: '￥', } break From 418b5f1de78c411015b896d13304a63388249148 Mon Sep 17 00:00:00 2001 From: wuhongjian Date: Fri, 1 Jul 2022 17:03:15 +0800 Subject: [PATCH 3/5] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/infrastructurePage.vue | 33 ++++++++++++++------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/front/src/views/home/infrastructurePage.vue b/front/src/views/home/infrastructurePage.vue index c59b84f9..e357fa94 100644 --- a/front/src/views/home/infrastructurePage.vue +++ b/front/src/views/home/infrastructurePage.vue @@ -5,7 +5,7 @@
{{ item.title }} - + { res.data.data.forEach((val) => { @@ -281,10 +288,21 @@ }) }) }) + // 改变查询摄像头接口的labelCode数组 + mapSearchParam.value.labelCodes = [] + clickList.value[1].content.map((item) => { + mapSearchParam.value.labelCodes.push(item.labelCode) + }) + console.log('选中的标签code', mapSearchParam.value) + mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + '' + getCamera() } else if (name == '云资源') { tableHeight.value = 600 showMap.value = false + dataSource.value = [] + pagination.value.total = 0 clickList.value[1].content = [] + tabList.value[1].title = '云资源分类' clickList.value[indexFather].content[0] = name tabList.value[1].content = [ '云主机', @@ -300,20 +318,15 @@ tableHeight.value = 330 showMap.value = true clickList.value[1].content = [] + pagination.value.total = 0 + tabList.value[1].title = '感知资源分类' clickList.value[indexFather].content[0] = name tabList.value[1].content = [] + dataSource.value = [] } else { clickList.value[indexFather].content.push(name) } } - // 改变查询摄像头接口的labelCode数组 - mapSearchParam.value.labelCodes = [] - clickList.value[1].content.map((item) => { - mapSearchParam.value.labelCodes.push(item.labelCode) - }) - console.log('选中的标签code', mapSearchParam.value) - mapSearchParam.value.labelCodes = mapSearchParam.value.labelCodes + '' - getCamera() } // 清空 const nullClick = () => { From d0bbe8d90922f45b9fa4fb4d5faf7dfbf55f98da Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Fri, 1 Jul 2022 17:05:15 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E4=BA=91=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/capabilityCloud/components/DataResources.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/front/src/views/capabilityCloud/components/DataResources.vue b/front/src/views/capabilityCloud/components/DataResources.vue index 77d4e9eb..b4dba74f 100644 --- a/front/src/views/capabilityCloud/components/DataResources.vue +++ b/front/src/views/capabilityCloud/components/DataResources.vue @@ -144,7 +144,11 @@ const object = res.data.data.filter((item) => item.type === val.name)[0] console.log('object', object) if (object) { - val.num = object.amount + if (object.type == '满足率') { + val.num = object.amount * 100 + '%' + } else { + val.num = object.amount + } } }) const arr = res.data.data.filter((item) => item.resourceTop5)[0] From fe1c1931f060766c37bcb2ea97ef8b059997b9f5 Mon Sep 17 00:00:00 2001 From: "851673013@qq.com" <851673013@qq.com> Date: Fri, 1 Jul 2022 17:22:37 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=9B=BE=E5=B1=82=E6=9C=8D=E5=8A=A1-?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E7=BB=84=E4=BB=B6-=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E7=BB=84=E4=BB=B6bug406=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/detailsAll/AlgorithmDetails.vue | 1 + .../src/views/detailsAll/BusinessDetails.vue | 13 +++++---- front/src/views/detailsAll/LayerService.vue | 13 +++++---- .../Algorithm/AlgorithmNavigation.vue | 22 ++++++++------ .../Business/BusinessAssociatedAbility.vue | 5 ++-- .../Business/BusinessNavigation.vue | 27 ++++++++++++----- .../Developer/DeveloperAssociatedAbility.vue | 2 +- .../Developer/DeveloperNavigation.vue | 10 +++---- .../LayerServiceAssociatedAbility.vue | 5 ++-- .../LayerService/LayerServiceNavigation.vue | 29 ++++++++++++++----- 10 files changed, 81 insertions(+), 46 deletions(-) diff --git a/front/src/views/detailsAll/AlgorithmDetails.vue b/front/src/views/detailsAll/AlgorithmDetails.vue index f215bd10..581c3bf0 100644 --- a/front/src/views/detailsAll/AlgorithmDetails.vue +++ b/front/src/views/detailsAll/AlgorithmDetails.vue @@ -11,6 +11,7 @@ - - + + + + - - { + // 根据能力id查询是否存在关联应用 + queryPartAppByKeyId2({ keyId: keyId }).then((res) => { console.log('ressssssss', res) if (res.data.data.length > 0) { // 存在关联应用时在导航栏加入关联应用 navList.value.unshift({ name: '关联应用', key: 'algorithm-associated-ability', - show: true + show: true, }) // list.value.push('关联应用') console.log('navList', navList) @@ -82,8 +81,7 @@ const props = defineProps({ selectNow: { type: String, default: '' }, dataList: { type: Object, default: null }, - } - ) + }) const select = ref('algorithm-display') @@ -163,11 +161,17 @@ } }) if (list.value.length > 0) { + console.log( + '11111111111111111111111111', + (select.value = navList.value.filter( + (item) => item.name === list.value[0] + )[0]) + ) + debugger select.value = navList.value.filter( (item) => item.name === list.value[0] )[0].key } - console.log('11111111111111111111111111', list.value, navList.value) } } ) diff --git a/front/src/views/detailsAll/components/Business/BusinessAssociatedAbility.vue b/front/src/views/detailsAll/components/Business/BusinessAssociatedAbility.vue index 95e54415..0173725e 100644 --- a/front/src/views/detailsAll/components/Business/BusinessAssociatedAbility.vue +++ b/front/src/views/detailsAll/components/Business/BusinessAssociatedAbility.vue @@ -1,6 +1,6 @@