From 18dbbfc42d63f6b085931e9299a91227b0cd41e8 Mon Sep 17 00:00:00 2001
From: gongjiale <942894820@qq.com>
Date: Fri, 16 Dec 2022 14:16:37 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E8=9E=8D=E5=90=88=E6=9C=8D=E5=8A=A1?=
=?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../views/home/components/CanAssignCase.vue | 1 +
front/src/views/home/components/header.vue | 1 +
.../home/components/searchResultList.vue | 1 +
front/src/views/home/detailBack.vue | 105 ++++++++++--------
front/src/views/home/integrationServices.vue | 17 ++-
.../views/home/integrationServicesDetails.vue | 3 +-
.../personalCenter/components/Collection.vue | 1 +
7 files changed, 80 insertions(+), 49 deletions(-)
diff --git a/front/src/views/home/components/CanAssignCase.vue b/front/src/views/home/components/CanAssignCase.vue
index 9070763f..a3b8676d 100644
--- a/front/src/views/home/components/CanAssignCase.vue
+++ b/front/src/views/home/components/CanAssignCase.vue
@@ -58,6 +58,7 @@ function toView(item) {
path: '/integrationServicesDetails',
query: {
id: item.id,
+ type:'典型赋能场景'
},
})
}
diff --git a/front/src/views/home/components/header.vue b/front/src/views/home/components/header.vue
index 851592a9..2b51a89d 100644
--- a/front/src/views/home/components/header.vue
+++ b/front/src/views/home/components/header.vue
@@ -557,6 +557,7 @@
justify-content: center;
.img {
+ cursor: pointer;
width: 0.3rem;
height: 0.3rem;
border-radius: 0.1rem;
diff --git a/front/src/views/home/components/searchResultList.vue b/front/src/views/home/components/searchResultList.vue
index e5f91849..75ae67f6 100644
--- a/front/src/views/home/components/searchResultList.vue
+++ b/front/src/views/home/components/searchResultList.vue
@@ -627,6 +627,7 @@
path: '/integrationServicesDetails',
query: {
id: item.id,
+ type:'打包模式'
},
})
} else {
diff --git a/front/src/views/home/detailBack.vue b/front/src/views/home/detailBack.vue
index ffb21602..6caeb975 100644
--- a/front/src/views/home/detailBack.vue
+++ b/front/src/views/home/detailBack.vue
@@ -17,66 +17,79 @@
diff --git a/front/src/views/home/integrationServices.vue b/front/src/views/home/integrationServices.vue
index f0d84e89..b9f8efb6 100644
--- a/front/src/views/home/integrationServices.vue
+++ b/front/src/views/home/integrationServices.vue
@@ -121,6 +121,7 @@
const pageSizeOptions = ref(['2', '5', '10', '20', '50'])
const router = useRouter()
const select = router.currentRoute.value.query.select
+ const returnType = router.currentRoute.value.query.returnType
const searchValue = ref('')
const Cardsname = ref(select)
const resourceList = reactive({ data: [] })
@@ -290,11 +291,22 @@
}
onMounted(() => {
- if (storageSearchInfo) {
+ if(returnType=='典型赋能场景'){
+ changeCards(0)
+ }else if(returnType=='打包模式'){
+ changeCards(1)
+ }else{
+ if (storageSearchInfo) {
handleSetSearchData()
} else {
getIntegrationList()
}
+ }
+ // if (storageSearchInfo) {
+ // handleSetSearchData()
+ // } else {
+ // getIntegrationList()
+ // }
})
return {
@@ -312,6 +324,7 @@
loading,
titleName,
changeCards,
+ returnType,
number,
loadingData,
onShowSizeChange,
@@ -366,7 +379,7 @@
height: 17px;
background: url('~@/assets/home/searchInner.png');
position: absolute;
- top: 139px;
+ top: 119px;
left: 500px;
}
}
diff --git a/front/src/views/home/integrationServicesDetails.vue b/front/src/views/home/integrationServicesDetails.vue
index e331b162..8ca335e1 100644
--- a/front/src/views/home/integrationServicesDetails.vue
+++ b/front/src/views/home/integrationServicesDetails.vue
@@ -2,7 +2,7 @@
-
+
Date: Fri, 16 Dec 2022 14:21:04 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E4=BC=9A?=
=?UTF-8?q?=E5=AE=A2=E5=8E=85=E8=B7=B3=E8=BD=AC=20=20=20=20=E8=83=BD?=
=?UTF-8?q?=E5=8A=9B=E6=8C=82=E6=8E=A5=E9=A1=B5=E9=9D=A2=20=E9=83=A8?=
=?UTF-8?q?=E9=97=A8=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
back/src/mixins/process-module.js | 37 ++++++++++++-------
.../src/views/modules/ability/bsabilityai.vue | 18 ++++++---
.../modules/ability/bsabilityservice.vue | 17 +++++++--
.../modules/myAgent/CompetencyApplication.vue | 15 +++++++-
.../workBench/components/dept-todo-view.vue | 4 +-
5 files changed, 65 insertions(+), 26 deletions(-)
diff --git a/back/src/mixins/process-module.js b/back/src/mixins/process-module.js
index 0d303cd2..95fc3287 100644
--- a/back/src/mixins/process-module.js
+++ b/back/src/mixins/process-module.js
@@ -47,20 +47,31 @@ export default {
}
},
// 获取流程定义的表单路由配置信息
- getProcDefRouteSet (data, callback) {
- this.$http.get(`/act/process/getProcDefBizRoute/${data.processDefinitionId}`).then(({ data: res }) => {
- if (res.code !== 0) {
- return this.$message.error(res.msg)
+ getProcDefRouteSet (data, callback, str) {
+ if (data.resourceName && !data.processDefinitionId) {
+ switch (str) {
+ case '待办':
+ this.$router.push({ name: 'activiti-RoomExamineAdmin' })
+ break
+ case '已办':
+ this.$router.push({ name: 'activiti-RoomExamineAdminDone' })
+ break
}
- if (!res.data || !res.data.bizRoute) {
- return this.$message.error(this.$t('process.routeError'))
- }
- var param = {
- ...data,
- ...res.data
- }
- callback(param)
- }).catch(() => { })
+ } else {
+ this.$http.get(`/act/process/getProcDefBizRoute/${data.processDefinitionId}`).then(({ data: res }) => {
+ if (res.code !== 0) {
+ return this.$message.error(res.msg)
+ }
+ if (!res.data || !res.data.bizRoute) {
+ return this.$message.error(this.$t('process.routeError'))
+ }
+ var param = {
+ ...data,
+ ...res.data
+ }
+ callback(param)
+ }).catch(() => { })
+ }
},
getProcDefBizRouteAndProcessInstance (params, callback) {
this.$http.get('/act/process/getProcDefBizRouteAndProcessInstance', {
diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue
index 53dd6b22..6c76a265 100644
--- a/back/src/views/modules/ability/bsabilityai.vue
+++ b/back/src/views/modules/ability/bsabilityai.vue
@@ -288,7 +288,8 @@ export default {
getDataListIsPage: true,
exportURL: '/ability/bsabilityai/export',
deleteURL: '/resource/delete',
- deleteIsBatch: true
+ deleteIsBatch: true,
+ createdIsNeed: false
},
disabled: false,
sceneArr: dictionaries.sceneArr,
@@ -300,7 +301,8 @@ export default {
infoList: [],
delFlag: 0,
type: '组件服务',
- name: ''
+ name: '',
+ deptIds: []
},
// qp: false,
// 关联应用弹窗
@@ -326,8 +328,12 @@ export default {
this.dataForm.name = ''
this.dataForm.type = '组件服务'
this.$http.get('/sys/user/info').then(res => {
- console.log('res', res.data.data)
+ 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 () {
@@ -391,7 +397,8 @@ export default {
infoList: [],
delFlag: 0,
type: '组件服务',
- name: ''
+ name: '',
+ deptIds: this.dataForm.deptIds
}
)
.then(({ data: res }) => {
@@ -546,7 +553,8 @@ export default {
infoList: [],
delFlag: 0,
type: '组件服务',
- name: names
+ name: names,
+ deptIds: this.dataForm.deptIds
}
)
.then(({ data: res }) => {
diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue
index a9886b3c..56772eae 100644
--- a/back/src/views/modules/ability/bsabilityservice.vue
+++ b/back/src/views/modules/ability/bsabilityservice.vue
@@ -249,7 +249,8 @@ export default {
getDataListIsPage: true,
exportURL: '/ability/bsabilityai/export',
deleteURL: '/resource/delete',
- deleteIsBatch: true
+ deleteIsBatch: true,
+ createdIsNeed: false
},
disabled: false,
sceneArr: dictionaries.sceneArr,
@@ -260,7 +261,8 @@ export default {
creator: '',
selectType: 0,
delFlag: 0,
- type: '应用资源'
+ type: '应用资源',
+ deptId: ''
},
qp: false,
relateApplicationResourceVisible: false,
@@ -297,6 +299,11 @@ 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 () {
@@ -319,7 +326,8 @@ export default {
delFlag: 0,
creator: '',
type: '应用资源',
- name: ''
+ name: '',
+ deptIds: this.dataForm.deptId
})
)
.then(({ data: res }) => {
@@ -405,7 +413,8 @@ export default {
creator: '',
selectType: 0,
delFlag: 0,
- name: names
+ name: names,
+ deptIds: this.dataForm.deptId
})
)
.then(({ data: res }) => {
diff --git a/back/src/views/modules/myAgent/CompetencyApplication.vue b/back/src/views/modules/myAgent/CompetencyApplication.vue
index 941afd35..bfb11a81 100644
--- a/back/src/views/modules/myAgent/CompetencyApplication.vue
+++ b/back/src/views/modules/myAgent/CompetencyApplication.vue
@@ -2,7 +2,7 @@
* @Author: hisense.liangjunhua
* @Date: 2022-06-27 11:27:22
* @LastEditors: Light
- * @LastEditTime: 2022-12-06 10:18:28
+ * @LastEditTime: 2022-12-15 10:28:03
* @Description: 能力申请
-->
@@ -83,11 +83,22 @@
+
+ {{
+ scope.row.assigneeName + (scope.row.synergism ? '('+scope.row.auditTeamName+')':'')
+ }}
+
+
+
Date: Fri, 16 Dec 2022 16:06:57 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E8=83=BD=E5=8A=9B=E6=8C=82=E6=8E=A5?=
=?UTF-8?q?=E6=A0=B9=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('下载失败')
}
}
}