From a7ef7d303dae4ac7998ff2cf90bf6f2eefb23313 Mon Sep 17 00:00:00 2001 From: Zhao Qiqi <1287235164@qq.com> Date: Sat, 2 Jul 2022 15:39:43 +0800 Subject: [PATCH] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86,=E5=AD=98?= =?UTF-8?q?=E6=94=BE=E5=9C=B0=E7=82=B9=E5=8F=98=E6=9B=B4=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cunfangdidianbiangeng.vue | 35 ++++++++------- anrui-system-ui/babel.config.js | 6 ++- anrui-system-ui/package.json | 5 ++- anrui-system-ui/src/views/flow/doneList.vue | 5 ++- anrui-system-ui/src/views/flow/todoList.vue | 44 +++++++++---------- 5 files changed, 53 insertions(+), 42 deletions(-) diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangeng.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangeng.vue index 0da41ed55c..8ab605f934 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangeng.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/cunfangdidianbiangengFlow/cunfangdidianbiangeng.vue @@ -233,41 +233,46 @@ export default { }, '*') }, created() { - console.log('url:' + window.location.href) - var a = window.location.href.indexOf('?') + 1 // 第一个?后面的一个字符的位置 - var b = window.location.href.indexOf('#data') // 第一个#data出现的位置 - const info = window.location.href.slice(a, b) - var sid = info.substr(info.indexOf('=') + 1) - this.showInfo(sid) + // console.log('url:' + window.location.href) + // var a = window.location.href.indexOf('?') + 1 // 第一个?后面的一个字符的位置 + // var b = window.location.href.indexOf('#data') // 第一个#data出现的位置 + // const info = window.location.href.slice(a, b) + // var sid = info.substr(info.indexOf('=') + 1) + // this.showInfo(sid) // ===获取参数 - var one = window.location.href.lastIndexOf('#') + 1 - var two = window.location.href.lastIndexOf('}') + 1 - const data = decodeURI(window.location.href.slice(one, two)) // url解码unescape()已从web中移除,尽量不使用 - var tar = data.substr(data.indexOf('=') + 1) - const obj = JSON.parse(tar) + var one = window.location.href.indexOf('?data') + 6 + console.log('iframe页面获取的one:', one) + var two = window.location.href.lastIndexOf('&') //+ 1 + console.log('iframe页面获取的two:', two) + const data = window.location.href.slice(one, two) // url解码unescape()已从web中移除,尽量不使用 + console.log('iframe页面获取的data:', data) + // var tar = data.substr(data.indexOf('=') + 1) + // console.log('iframe页面获取的tar:', tar) + const obj = JSON.parse(decodeURIComponent(data)) console.log('iframe页面获取的obj:', obj) // 同意列表 - this.agreeList.businessSid = sid + this.agreeList.businessSid = obj.sid this.agreeList.instanceId = obj.instanceId this.agreeList.taskId = obj.taskId this.agreeList.taskDefKey = obj.taskDefKey - this.agreeList.userSid = obj.userSid + this.agreeList.userSid = window.sessionStorage.getItem('userSid') this.agreeList.orgSidPath = window.sessionStorage.getItem('orgSidPath') this.current.taskDefKey = obj.taskDefKey this.current.taskName = obj.taskName // 驳回列表 - this.regectList.businessSid = sid + this.regectList.businessSid = obj.sid this.regectList.instanceId = obj.instanceId this.regectList.taskId = obj.taskId this.regectList.userSid = obj.userSid // 终止列表 - this.stopList.businessSid = sid + this.stopList.businessSid = obj.sid this.stopList.instanceId = obj.instanceId this.stopList.taskId = obj.taskId this.stopList.userSid = obj.userSid // 办理状态 this.transactState = obj.transactState // 加载流程图相关的数据 + this.showInfo(obj.sid) this.getModelDetail(obj.deployId) this.getFlowViewer(obj.instanceId) }, diff --git a/anrui-system-ui/babel.config.js b/anrui-system-ui/babel.config.js index fb82b2715f..f851c1aff5 100644 --- a/anrui-system-ui/babel.config.js +++ b/anrui-system-ui/babel.config.js @@ -1,8 +1,10 @@ module.exports = { - presets: [ + /* presets: [ // https://github.com/vuejs/vue-cli/tree/master/packages/@vue/babel-preset-app '@vue/cli-plugin-babel/preset' - ], + ],*/ + presets: [ [ "@vue/app", { useBuiltIns: "entry" } ] ], + 'env': { 'development': { // babel-plugin-dynamic-import-node plugin only does one thing by converting all import() to require(). diff --git a/anrui-system-ui/package.json b/anrui-system-ui/package.json index 9ec6594bbb..77a6c3ac7a 100644 --- a/anrui-system-ui/package.json +++ b/anrui-system-ui/package.json @@ -15,6 +15,7 @@ }, "dependencies": { "axios": "0.18.1", + "bpmn-js": "^9.2.2", "core-js": "^3.19.3", "element-ui": "2.13.2", "js-cookie": "2.2.0", @@ -29,7 +30,8 @@ "vue-amap": "^0.5.10", "vue-router": "3.0.6", "vuex": "3.1.0", - "vuex-persistedstate": "^4.0.0" + "vuex-persistedstate": "^4.0.0", + "xcrud": "^0.4.19" }, "devDependencies": { "@vue/cli-plugin-babel": "4.4.4", @@ -44,6 +46,7 @@ "babel-polyfill": "^6.26.0", "chalk": "2.4.2", "connect": "3.6.6", + "css-loader": "^6.7.1", "eslint": "6.7.2", "eslint-plugin-vue": "6.2.2", "html-webpack-plugin": "3.2.0", diff --git a/anrui-system-ui/src/views/flow/doneList.vue b/anrui-system-ui/src/views/flow/doneList.vue index d37e268d15..e602e774a7 100644 --- a/anrui-system-ui/src/views/flow/doneList.vue +++ b/anrui-system-ui/src/views/flow/doneList.vue @@ -261,6 +261,7 @@ this.selectUrl_list.taskDefKey = row.taskDefKey this.selectUrl_list.type = 2 // 详情 const parameter_list = { + businessSid: row.processVariables.businessSid, instanceId: row.procInsId, taskId: row.taskId, taskDefKey: row.taskDefKey, @@ -271,8 +272,8 @@ } selectUrl(this.selectUrl_list).then((response) => { if (response.code === '200') { - // this.url = 'http://120.46.131.15' + response.data.url + '?row=' + row.processVariables.businessSid + '#data=' + JSON.stringify(parameter_list) + '?token=' + getStorage() - this.url = 'http://localhost:9531' + response.data.url + '?row=' + row.processVariables.businessSid + '#data=' + JSON.stringify(parameter_list) + '?token=123456abc' + this.url = 'http://localhost:9531' + response.data.url + '?data=' + encodeURI((JSON.stringify(parameter_list))) + '&token=' + getStorage() + // this.url = 'http://120.46.131.15' + response.data.url + '?data=' + JSON.stringify(parameter_list) + '&token=' + getStorage() } else { this.$notify({ title: '提示', diff --git a/anrui-system-ui/src/views/flow/todoList.vue b/anrui-system-ui/src/views/flow/todoList.vue index 14ad06e46b..4808a4e8a4 100644 --- a/anrui-system-ui/src/views/flow/todoList.vue +++ b/anrui-system-ui/src/views/flow/todoList.vue @@ -154,24 +154,25 @@