From 762be6b161433d62b1c99f48f4b571ee97f9b32e Mon Sep 17 00:00:00 2001 From: zhoulingpo Date: Thu, 20 Apr 2023 17:49:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=AD=E5=BF=83=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5=20=E4=BF=AE=E6=94=B9=E6=97=A5?= =?UTF-8?q?=E6=9C=9F=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/process.js | 16 +++++-- src/store/index.js | 3 +- src/utils/date.js | 2 + .../processCenter/finishProcess.vue | 37 +++++++-------- .../userCenter/processCenter/gencyProcess.vue | 25 ++++++----- .../processCenter/monitorProcesses.vue | 31 ++++++------- .../userCenter/processCenter/sentProcess.vue | 25 ++++++----- .../processConfig/ProcessMapping.vue | 2 +- src/views/userCenter/processConfig/index.vue | 45 ++++++++++++++----- 9 files changed, 112 insertions(+), 74 deletions(-) diff --git a/src/api/modules/process.js b/src/api/modules/process.js index 84c010f..9412cc5 100644 --- a/src/api/modules/process.js +++ b/src/api/modules/process.js @@ -20,7 +20,7 @@ export default { //部署接口 deploy (data) { return request({ - url: '/api/lawss/activiti/get_list_by_instance', + url: '/api/deploy', method: 'get', params: data }) @@ -28,9 +28,9 @@ export default { //获取流程配置列表 getModelListPage (data){ return request({ - url: '/api/modelList', + url: '/api/modelListPage', method: 'get', - data: data + params: data }) }, //新增模板 @@ -40,6 +40,14 @@ export default { method: 'get', data: data }) - } + }, + //删除模板 + deleteModel (data){ + return request({ + url: '/api/deleteModel', + method: 'get', + params: data + }) + }, } diff --git a/src/store/index.js b/src/store/index.js index 8074c0e..0cb18ac 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -15,7 +15,8 @@ export default new Vuex.Store({ }, getters: { menuData: (state) => state.menuData, - menuName: (state) => state.menuName + menuName: (state) => state.menuName, + userInfo: (state) => state.userInfo, }, mutations: { saveUserInfo (state, data) { diff --git a/src/utils/date.js b/src/utils/date.js index 463ce10..a9390ae 100644 --- a/src/utils/date.js +++ b/src/utils/date.js @@ -28,7 +28,9 @@ export function formatDate (value, fmt) { } return fmt } else { + console.log(typeof value) value = value.trim() + value = value.replace('T', ' ') return value.substr(0, fmt.length) } } diff --git a/src/views/userCenter/processCenter/finishProcess.vue b/src/views/userCenter/processCenter/finishProcess.vue index 051655a..7a59bc2 100644 --- a/src/views/userCenter/processCenter/finishProcess.vue +++ b/src/views/userCenter/processCenter/finishProcess.vue @@ -4,21 +4,21 @@ - - - + - - + - + - @@ -42,8 +42,8 @@ export default { data() { return { q:{ - pageNo:1, - pageSize:10 + current:1, + size:10 }, total: 0, tableData: [] @@ -61,20 +61,21 @@ export default { }, methods: { loadData() { - this.$api.processCenter.finishProcessPage({...this.q,...this.searchForm}).then(res=>{ - this.tableData = res.data.list - this.total = res.count - }) + let userId=this.$store.getters.userInfo.usid + this.$api.processCenter.finishProcessPage({...this.q,...this.searchForm,userId:userId}).then(res=>{ + this.tableData = res.data.list + this.total = res.data.count + }) }, // 单页数据量 handleSizeChange(val) { - this.q.pageSize = val; - this.q.pageNo = 1; + this.q.size = val; + this.q.current = 1; this.loadData(); }, // 第几页 handleCurrentChange(val) { - this.q.pageNo = val; + this.q.current = val; this.loadData(); }, view() { diff --git a/src/views/userCenter/processCenter/gencyProcess.vue b/src/views/userCenter/processCenter/gencyProcess.vue index 9c83da5..5c20619 100644 --- a/src/views/userCenter/processCenter/gencyProcess.vue +++ b/src/views/userCenter/processCenter/gencyProcess.vue @@ -4,15 +4,15 @@ - - + - @@ -36,8 +36,8 @@ export default { data() { return { q:{ - pageNo:1, - pageSize:10 + current:1, + size:10 }, total: 0, tableData: [] @@ -58,20 +58,21 @@ export default { }, methods: { loadData() { - this.$api.processCenter.gencyProcessPage({...this.q,...this.searchForm}).then(res=>{ + let userId=this.$store.getters.userInfo.usid + this.$api.processCenter.gencyProcessPage({...this.q,...this.searchForm,userId:userId}).then(res=>{ this.tableData = res.data.list - this.total = res.count + this.total = res.data.count }) }, // 单页数据量 handleSizeChange(val) { - this.q.pageSize = val; - this.q.pageNo = 1; + this.q.size = val; + this.q.current = 1; this.loadData(); }, // 第几页 handleCurrentChange(val) { - this.q.pageNo = val; + this.q.current = val; this.loadData(); }, handle() { diff --git a/src/views/userCenter/processCenter/monitorProcesses.vue b/src/views/userCenter/processCenter/monitorProcesses.vue index 680c68a..d698825 100644 --- a/src/views/userCenter/processCenter/monitorProcesses.vue +++ b/src/views/userCenter/processCenter/monitorProcesses.vue @@ -4,7 +4,7 @@ - - + - - + - + - @@ -42,8 +42,8 @@ export default { data() { return { q:{ - pageNo:1, - pageSize:10 + current:1, + size:10 }, total: 0, tableData: [] @@ -61,20 +61,21 @@ export default { }, methods: { loadData() { - this.$api.processCenter.monitorProcessesPage({...this.q,...this.searchForm}).then(res=>{ + let userId=this.$store.getters.userInfo.usid + this.$api.processCenter.monitorProcessesPage({...this.q,...this.searchForm,userId:userId}).then(res=>{ this.tableData = res.data.list - this.total = res.count + this.total = res.data.count }) }, // 单页数据量 handleSizeChange(val) { - this.q.pageSize = val; - this.q.pageNo = 1; + this.q.size = val; + this.q.current = 1; this.loadData(); }, // 第几页 handleCurrentChange(val) { - this.q.pageNo = val; + this.q.current = val; this.loadData(); }, view() { diff --git a/src/views/userCenter/processCenter/sentProcess.vue b/src/views/userCenter/processCenter/sentProcess.vue index 0e516a2..0812b9a 100644 --- a/src/views/userCenter/processCenter/sentProcess.vue +++ b/src/views/userCenter/processCenter/sentProcess.vue @@ -5,7 +5,7 @@ v-table-min-height="'calc(100vh - 380px)'"> - - + - @@ -49,8 +49,8 @@ export default { color: 'rgb(236, 128, 141)', icolor: 'rgb(119,136,153)', q: { - pageNo: 1, - pageSize: 10 + current: 1, + size: 10 }, total: 0, tableData: [] @@ -68,20 +68,21 @@ export default { }, methods: { loadData() { - this.$api.processCenter.sentProcessPage({...this.q,...this.searchForm}).then(res=>{ + let userId=this.$store.getters.userInfo.usid + this.$api.processCenter.sentProcessPage({...this.q,...this.searchForm,userId:userId}).then(res=>{ this.tableData = res.data.list - this.total = res.count + this.total = res.data.count }) }, // 单页数据量 handleSizeChange(val) { - this.q.pageSize = val; - this.q.pageNo = 1; + this.q.size = val; + this.q.current = 1; this.loadData(); }, // 第几页 handleCurrentChange(val) { - this.q.pageNo = val; + this.q.current = val; this.loadData(); }, view() { diff --git a/src/views/userCenter/processConfig/ProcessMapping.vue b/src/views/userCenter/processConfig/ProcessMapping.vue index d509c6a..83f8461 100644 --- a/src/views/userCenter/processConfig/ProcessMapping.vue +++ b/src/views/userCenter/processConfig/ProcessMapping.vue @@ -17,7 +17,7 @@ return { modelId : '', name: '', - actUrl: 'http://localhost:17210/bat-wkflow/modeler.html?modelId=' + actUrl: 'http://10.0.10.87:7060/bat-wkflow/modeler.html?modelId=' } }, created() { diff --git a/src/views/userCenter/processConfig/index.vue b/src/views/userCenter/processConfig/index.vue index 45942d6..a972c4c 100644 --- a/src/views/userCenter/processConfig/index.vue +++ b/src/views/userCenter/processConfig/index.vue @@ -1,7 +1,7 @@