From 0f479dfec467e0980addc1a0e704df4a05efd573 Mon Sep 17 00:00:00 2001 From: gongjiale <942894820@qq.com> Date: Fri, 4 Nov 2022 13:59:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- back/src/mixins/view-module.js | 22 +++++++++----- .../modules/ability/bsabilityservice.vue | 10 ------- .../views/modules/abilityStatistics/index.vue | 29 ++++++++++++++----- .../modules/activiti/my-work-dynamics.vue | 9 ++++-- front/src/views/home/detailBack.vue | 26 +++++++---------- .../personalCenter/components/Collection.vue | 7 +++-- 6 files changed, 57 insertions(+), 46 deletions(-) diff --git a/back/src/mixins/view-module.js b/back/src/mixins/view-module.js index fae86b9b..c92ac8e4 100644 --- a/back/src/mixins/view-module.js +++ b/back/src/mixins/view-module.js @@ -95,13 +95,13 @@ export default { this.$http.get('/sys/user/info').then(userRes => { console.log('当前用户信息===========>', userRes.data.data.id) const userId = userRes.data.data.id - this.dataList = this.dataList.filter(item => { - // userId creator - console.log(item.params.creator) - if (!(item.params.creator === userId) && !(item.params.userId === userId)) { - return item - } - }) + // this.dataList = this.dataList.filter(item => { + // // userId creator + // console.log(item.params.creator) + // if (!(item.params.creator === userId) && !(item.params.userId === userId)) { + // return item + // } + // }) this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0 }) } else { @@ -355,7 +355,12 @@ export default { }, deleteHandle2(id) { - console.log('删除========================》', id, this.dataListSelections) + if(id==undefined && this.dataListSelections.length < 1){ + this.$message({ + type: 'info', + message: '请选择要删除的数据' + }) + }else{ this.$confirm('确认是否删除?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -385,6 +390,7 @@ export default { // message: '已取消删除' // }); }); + } }, // 导出 exportHandle() { diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue index 668a0668..21e55945 100644 --- a/back/src/views/modules/ability/bsabilityservice.vue +++ b/back/src/views/modules/ability/bsabilityservice.vue @@ -354,7 +354,6 @@ export default { // this.disabled = true }, showDocument (val) { - console.log(val) window.open( window.SITE_CONFIG.frontUrl + '?id=' + val.id + '&&type=' + val.type, '_blank' @@ -459,7 +458,6 @@ export default { // }, // 应用与组件 applyAndAssembly (val) { - console.log('vvvv', val) // 根据id和类型查询已关联的组件，将id,type和查出来的数据传递给组件 const type = '组件服务' const id = val.id @@ -475,7 +473,6 @@ export default { if (res.code !== 0) { return this.$message.error(res.msg) } - console.log('rrrrressssz', res.data) this.relateApplicationResourceVisible = true this.relationData = { id: id, @@ -483,13 +480,11 @@ export default { responseData: res.data } this.topNameArray = ['未关联组件名称', '已关联组件名称'] - console.log(' this.relationData', this.relationData) // 将数据传递给引入的组件 }) }, // 应用与数据资源 applyAndDataResource (val) { - console.log('数据资源') }, // 应用与项目 applyAndProject (val) { @@ -507,7 +502,6 @@ export default { if (res.code !== 0) { return this.$message.error(res.msg) } - console.log('rrrrressssx', res.data) this.relateApplicationResourceVisible = true this.relationData = { id: id, @@ -534,7 +528,6 @@ export default { if (res.code !== 0) { return this.$message.error(res.msg) } - console.log('rrrrressssj', res.data) this.relateApplicationResourceVisible = true this.relationData = { id: id, @@ -575,7 +568,6 @@ export default { this.showPutOnTheShelfFlag2 = true this.$http.get('/category/getCategoryTree').then(res => { this.insertList = res.data.data.filter(item => item.name === '应用资源一')[0] - console.log(this.insertList, this, this.radio, 'hhhhhhhhhhh') this.putOnTheShelfList = this.insertList.children }) }, @@ -670,7 +662,6 @@ export default { }) this.submitFrom.infoList = this.submitFrom.infoList.sort((a, b) => arr.indexOf(a.attrType) - arr.indexOf(b.attrType)) this.notFilled = [] - console.log(this.submitFrom, '表单验证') if (!this.submitFrom.name) { this.notFilled.push('应用名称') } @@ -711,7 +702,6 @@ export default { val.attrValue = this.radio } }) - console.log('编辑===============>', this.submitFrom) // 检验是否有空值 this.submitFrom.infoList = this.submitFrom.infoList.filter(item => item.attrValue) this.$http diff --git a/back/src/views/modules/abilityStatistics/index.vue b/back/src/views/modules/abilityStatistics/index.vue index f3d58a61..cfc70af3 100644 --- a/back/src/views/modules/abilityStatistics/index.vue +++ b/back/src/views/modules/abilityStatistics/index.vue @@ -68,6 +68,12 @@ + + + + + + @@ -341,6 +347,7 @@ export default { abilityType: '', // 能力 beginTime: '', // 开始时间 endTime: '', // 结束时间 + resourceName:'',//资源名称 typeOptions: [ { name: '智能算法', value: 1 }, { name: '图层服务', value: 2 }, @@ -523,7 +530,8 @@ export default { approveStatus: this.status, deptId: this.abilityDepartment, startDate: this.startDate, - endDate: this.endDate + endDate: this.endDate, + resourceName:this.resourceName }) }) }, @@ -589,7 +597,9 @@ export default { approveStatus: this.status, deptId: this.abilityDepartment, startDate: this.startDate, - endDate: this.endDate + endDate: this.endDate, + resourceName:this.resourceName + }) }) }, @@ -658,7 +668,8 @@ export default { deptId: this.abilityDepartment, type: this.abilityType, startDate: this.startDate, - endDate: this.endDate + endDate: this.endDate, + resourceName:this.resourceName } }) .then((res) => { @@ -670,7 +681,8 @@ export default { approveStatus: this.status, deptId: this.abilityDepartment, startDate: this.startDate, - endDate: this.endDate + endDate: this.endDate, + resourceName:this.resourceName }) }) }, @@ -697,7 +709,8 @@ export default { deptId: this.abilityDepartment, type: this.abilityType, startDate: this.startDate, - endDate: this.endDate + endDate: this.endDate, + resourceName:this.resourceName } }) .then((res) => { @@ -708,7 +721,8 @@ export default { approveStatus: this.status, deptId: this.abilityDepartment, startDate: this.startDate, - endDate: this.endDate + endDate: this.endDate, + resourceName:this.resourceName }) }) }, @@ -952,7 +966,8 @@ export default { approveStatus: this.status, deptId: this.abilityDepartment, startDate: this.startDate, - endDate: this.endDate + endDate: this.endDate, + resourceName:this.resourceName }) if (this.departmentId === 1) { // if (this.detailFlag) { diff --git a/back/src/views/modules/activiti/my-work-dynamics.vue b/back/src/views/modules/activiti/my-work-dynamics.vue index 83c0809c..7e1bbb0a 100644 --- a/back/src/views/modules/activiti/my-work-dynamics.vue +++ b/back/src/views/modules/activiti/my-work-dynamics.vue @@ -508,7 +508,12 @@ export default { }, // 删除数据 deleteData (row) { - console.log(row) + if (this.deleteDataArr.length < 1) { + this.$message({ + type: 'info', + message: '请选择要删除的数据' + }) + }else{ this.$confirm('此操作将删除当前数据, 是否继续?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -542,7 +547,7 @@ export default { type: 'info', message: '已取消删除' }) - }) + })} }, // 预览工作动态信息 async openPreviewData (row) { diff --git a/front/src/views/home/detailBack.vue b/front/src/views/home/detailBack.vue index 501ac261..1ca3b1f5 100644 --- a/front/src/views/home/detailBack.vue +++ b/front/src/views/home/detailBack.vue @@ -7,30 +7,24 @@ import { reactive, ref, watch, defineProps } from 'vue' import { useRouter } from 'vue-router' import { useStore } from 'vuex' -const store = useStore() const router = useRouter() - +const oldValue1= ref('') const props = defineProps({ textColor: { type: String, default: '' }, }) const previousPage = () => { - // debugger -// let a =store.state.previousRouter -// if (store.state.previousRouter.name) { -// this.$router.push({name: this.$store.state.previousRouter.name}); -// } -// // let val = router.go(-1) -debugger -let current= router.currentRoute.value.path -if(current==='/integrationServicesDetails'){ - router.push({ - path: '/integrationServices', + if (window.history.state.back){ + window.history.go(-1) + } else{ + router.push({ + path: '/integrationServices', }) -}else{ - window.history.go(-1) -} + } + } + +