diff --git a/flowable-engine-java/src/main/resources/application-dev.yml b/flowable-engine-java/src/main/resources/application-dev.yml index f3a5a69..05b0f30 100644 --- a/flowable-engine-java/src/main/resources/application-dev.yml +++ b/flowable-engine-java/src/main/resources/application-dev.yml @@ -13,9 +13,9 @@ spring: max-lifetime: 1800000 connection-test-query: SELECT 1 datasource: - url: jdbc:mysql://162.14.111.170:3306/flowable_web?userUnicode=true&characterEncodinf=UTF-8&autoReconnect=true - username: flowable_web - password: 3SZ3tBeEG5TXBSGp + url: jdbc:mysql://192.168.101.108:3306/flowable_web?userUnicode=true&characterEncodinf=UTF-8&autoReconnect=true + username: activiti7 + password: activiti7 logging: config: classpath:logback-dev.xml diff --git a/flowable-engine-java/src/main/resources/mapper/FlowDataMapper.xml b/flowable-engine-java/src/main/resources/mapper/FlowDataMapper.xml index f494165..0bc356d 100644 --- a/flowable-engine-java/src/main/resources/mapper/FlowDataMapper.xml +++ b/flowable-engine-java/src/main/resources/mapper/FlowDataMapper.xml @@ -32,7 +32,7 @@ is_delete, is_stop, logo, - flowData.process, + process, remark, settings, sort, diff --git a/flowable-engine-web/src/views/workspace/DisposalTask.vue b/flowable-engine-web/src/views/workspace/DisposalTask.vue index bee0562..815765a 100644 --- a/flowable-engine-web/src/views/workspace/DisposalTask.vue +++ b/flowable-engine-web/src/views/workspace/DisposalTask.vue @@ -31,11 +31,40 @@ - - - - - + + + + + Clay + + + + 未命名表单1 + 进行中 + + + 编号: + 442bbc6a-83a6-11ed-a551-fa28000d2c27 + + + + + + + + + + + + + + + + + @@ -47,7 +76,8 @@ export default { name: "DisposalTask", data() { return { - tableData: [] + tableData: [], + approveOpen: false, } }, created() { @@ -71,23 +101,24 @@ export default { }) }, clickRow(row){ - axios({ - method: "get", - url: "http://localhost:8000/workflow/process/task/"+ row.taskId, - // data: this.setup.process, - headers: { - 'Content-Type': 'application/json', - "authorization": sessionStorage.getItem("token") - }, - }).then(res => { - let data = res.data; - if (data.code == 401){ - this.getToken() - } - console.log(data) - }) - - console.log(row) + this.approveOpen = true; + // axios({ + // method: "get", + // url: "http://localhost:8000/workflow/process/task/"+ row.taskId, + // // data: this.setup.process, + // headers: { + // 'Content-Type': 'application/json', + // "authorization": sessionStorage.getItem("token") + // }, + // }).then(res => { + // let data = res.data; + // if (data.code == 401){ + // this.getToken() + // } + // console.log(data) + // }) + // + // console.log(row) }, getList(){ let token = sessionStorage.getItem("token");