From 495b01fba372141e20cf36e8badef40a6f28a12d Mon Sep 17 00:00:00 2001 From: wangwei <707714829@qq.com> Date: Fri, 24 Jun 2022 10:00:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/modules/ability/bsdataresources.vue | 36 +++++++++++--- .../modules/ability/bsinfrastructure.vue | 42 ++++++++++++---- back/src/views/modules/project/list.vue | 48 +++++++++---------- 3 files changed, 86 insertions(+), 40 deletions(-) diff --git a/back/src/views/modules/ability/bsdataresources.vue b/back/src/views/modules/ability/bsdataresources.vue index b40ec90c..7bb034dd 100644 --- a/back/src/views/modules/ability/bsdataresources.vue +++ b/back/src/views/modules/ability/bsdataresources.vue @@ -27,7 +27,7 @@ @@ -42,6 +42,7 @@ + @@ -50,6 +51,8 @@ import mixinViewModule from '@/mixins/view-module' // import AddOrUpdate from './order-add-or-update' import {addDynamicRoute} from "@/router"; +import RelateApplication from "./bsabilityai-relate-application.vue" + export default { mixins: [mixinViewModule], data () { @@ -64,11 +67,19 @@ export default { orderId: '', status: '', userId: '' + }, + // 关联应用弹窗 + relateApplicationVisible: false, + relateInfo: { + id: '', + responseData: {}, + linkType: '' } } }, components: { - // AddOrUpdate + // AddOrUpdate, + RelateApplication, }, methods: { //重置 @@ -77,10 +88,23 @@ export default { this.page=1; // 当前页码 this.query(); }, - //关联应用 - associatedApplication(){ - - } + // 点击关联应用按钮 + showRelateApplication(row){ + this.$http.get(`dataResourceRel/queryApplicationRelByResourceId?referenceId=${row.id}`).then(({ data: res }) => { + if( res && res.data ) { + this.relateApplicationVisible = true; + this.relateInfo = { + id: row.id, + responseData: res.data, + linkType: '2' + }; + } + }).catch(() => { }) + }, + // 是否展示关联应用弹窗 + handleIsShowRelatePopup(type) { + this.relateApplicationVisible = type; + } } } diff --git a/back/src/views/modules/ability/bsinfrastructure.vue b/back/src/views/modules/ability/bsinfrastructure.vue index 6d3f4e4c..1166902c 100644 --- a/back/src/views/modules/ability/bsinfrastructure.vue +++ b/back/src/views/modules/ability/bsinfrastructure.vue @@ -23,7 +23,7 @@ @@ -38,6 +38,7 @@ + @@ -46,25 +47,35 @@ import mixinViewModule from '@/mixins/view-module' // import AddOrUpdate from './order-add-or-update' import {addDynamicRoute} from "@/router"; +import RelateApplication from "./bsabilityai-relate-application.vue" export default { mixins: [mixinViewModule], data () { return { mixinViewModuleOptions: { - getDataListURL: '/pay/order/page', + getDataListURL: '/resource/page', getDataListIsPage: true, - deleteURL: '/pay/order', + deleteURL: '', deleteIsBatch: true }, dataForm: { orderId: '', status: '', - userId: '' + userId: '', + type: "基础设施", + }, + // 关联应用弹窗 + relateApplicationVisible: false, + relateInfo: { + id: '', + responseData: {}, + linkType: '' } } }, components: { - // AddOrUpdate + // AddOrUpdate, + RelateApplication, }, methods: { //重置 @@ -73,10 +84,23 @@ export default { this.page=1; // 当前页码 this.query(); }, - //关联应用 - associatedApplication(){ - - } + // 点击关联应用按钮 + showRelateApplication(row){ + this.$http.get(`dataResourceRel/queryApplicationRelByResourceId?referenceId=${row.id}`).then(({ data: res }) => { + if( res && res.data ) { + this.relateApplicationVisible = true; + this.relateInfo = { + id: row.id, + responseData: res.data, + linkType: '2' + }; + } + }).catch(() => { }) + }, + // 是否展示关联应用弹窗 + handleIsShowRelatePopup(type) { + this.relateApplicationVisible = type; + } } } diff --git a/back/src/views/modules/project/list.vue b/back/src/views/modules/project/list.vue index a3b62138..4a2cc95b 100644 --- a/back/src/views/modules/project/list.vue +++ b/back/src/views/modules/project/list.vue @@ -3,16 +3,16 @@
- + - + - + - + {{ $t('query') }} @@ -22,15 +22,15 @@ - - - - - - - - - + + + + + + + + +