From 307f5bb4ced4aa2aa8b96309080bca9a234d6765 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Fri, 16 Dec 2022 16:06:57 +0800 Subject: [PATCH] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E6=8C=82=E6=8E=A5=E6=A0=B9?= =?UTF-8?q?=E6=8D=AE=E8=B4=A6=E5=8F=B7=E7=AD=9B=E9=80=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/src/views/modules/ability/bsabilityai.vue | 16 +++++++--------- .../views/modules/ability/bsabilityservice.vue | 14 ++++---------- front/src/views/demandCenter/demandDetails.vue | 7 ++++++- .../components/AbilityApplication.vue | 2 ++ .../personalCenter/components/ApplyDetails.vue | 2 ++ 5 files changed, 21 insertions(+), 20 deletions(-) diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue index 6c76a265..b0af3265 100644 --- a/back/src/views/modules/ability/bsabilityai.vue +++ b/back/src/views/modules/ability/bsabilityai.vue @@ -288,8 +288,7 @@ export default { getDataListIsPage: true, exportURL: '/ability/bsabilityai/export', deleteURL: '/resource/delete', - deleteIsBatch: true, - createdIsNeed: false + deleteIsBatch: true }, disabled: false, sceneArr: dictionaries.sceneArr, @@ -302,7 +301,8 @@ export default { delFlag: 0, type: '组件服务', name: '', - deptIds: [] + deptIds: [], + region: true }, // qp: false, // 关联应用弹窗 @@ -330,10 +330,6 @@ export default { this.$http.get('/sys/user/info').then(res => { console.log('res', res.data.data, !res.data.data.superAdmin, this.$store.state.user.roleIdList) this.superAdmin = res.data.data.superAdmin - if (!(res.data.data.superAdmin || this.$store.state.user.roleIdList.indexOf('运维管理员') !== -1)) { - this.dataForm.deptIds = [res.data.data.deptId] - } - this.query() }) }, mounted () { @@ -398,7 +394,8 @@ export default { delFlag: 0, type: '组件服务', name: '', - deptIds: this.dataForm.deptIds + deptIds: [], + region: true } ) .then(({ data: res }) => { @@ -554,7 +551,8 @@ export default { delFlag: 0, type: '组件服务', name: names, - deptIds: this.dataForm.deptIds + deptIds: [], + region: true } ) .then(({ data: res }) => { diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue index 56772eae..1a90ce73 100644 --- a/back/src/views/modules/ability/bsabilityservice.vue +++ b/back/src/views/modules/ability/bsabilityservice.vue @@ -249,8 +249,7 @@ export default { getDataListIsPage: true, exportURL: '/ability/bsabilityai/export', deleteURL: '/resource/delete', - deleteIsBatch: true, - createdIsNeed: false + deleteIsBatch: true }, disabled: false, sceneArr: dictionaries.sceneArr, @@ -262,7 +261,7 @@ export default { selectType: 0, delFlag: 0, type: '应用资源', - deptId: '' + region: true }, qp: false, relateApplicationResourceVisible: false, @@ -299,11 +298,6 @@ export default { this.$http.get('/sys/user/info').then(res => { console.log('res', res.data.data) this.superAdmin = res.data.data.superAdmin - this.superAdmin = res.data.data.superAdmin - if (!(res.data.data.superAdmin || this.$store.state.user.roleIdList.indexOf('运维管理员') !== -1)) { - this.dataForm.deptId = [res.data.data.deptId] - } - this.query() }) }, mounted () { @@ -327,7 +321,7 @@ export default { creator: '', type: '应用资源', name: '', - deptIds: this.dataForm.deptId + region: true }) ) .then(({ data: res }) => { @@ -414,7 +408,7 @@ export default { selectType: 0, delFlag: 0, name: names, - deptIds: this.dataForm.deptId + region: true }) ) .then(({ data: res }) => { diff --git a/front/src/views/demandCenter/demandDetails.vue b/front/src/views/demandCenter/demandDetails.vue index 58aa69e9..535c36ab 100644 --- a/front/src/views/demandCenter/demandDetails.vue +++ b/front/src/views/demandCenter/demandDetails.vue @@ -159,7 +159,9 @@ text-align: center; cursor: pointer; " - @click="downloadFile(formName.enclosure, '申请附件')" + @click=" + downloadFile(formName.enclosure, formName.enclosureName) + " > 下载 @@ -362,6 +364,7 @@ xhr.responseType = 'blob' xhr.send() xhr.onload = function () { + console.log('下载', path, this.status, navigator) if (this.status === 200 || this.status === 304) { // 如果是IE10及以上，不支持download属性，采用msSaveOrOpenBlob方法，但是IE10以下也不支持msSaveOrOpenBlob if ('msSaveOrOpenBlob' in navigator) { @@ -379,6 +382,8 @@ a.click() document.body.removeChild(a) URL.revokeObjectURL(url) + } else { + message.warning('下载失败') } } } diff --git a/front/src/views/personalCenter/components/AbilityApplication.vue b/front/src/views/personalCenter/components/AbilityApplication.vue index d02f6d53..7b9def09 100644 --- a/front/src/views/personalCenter/components/AbilityApplication.vue +++ b/front/src/views/personalCenter/components/AbilityApplication.vue @@ -536,6 +536,8 @@ a.click() document.body.removeChild(a) URL.revokeObjectURL(url) + } else { + message.warning('下载失败') } } } diff --git a/front/src/views/personalCenter/components/ApplyDetails.vue b/front/src/views/personalCenter/components/ApplyDetails.vue index 23d0f3ab..7436671a 100644 --- a/front/src/views/personalCenter/components/ApplyDetails.vue +++ b/front/src/views/personalCenter/components/ApplyDetails.vue @@ -157,6 +157,8 @@ a.click() document.body.removeChild(a) URL.revokeObjectURL(url) + } else { + message.warning('下载失败') } } }