diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue index 37634e781..79c79f8e8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-1.vue @@ -828,7 +828,17 @@ export default { if (valid) { this.isSubmit = true this.$http.post('lawss/activiti/startProcessRollBack', { - type: '3' + id: '', + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: '3', + json: JSON.stringify({ + form: this.form, + roleForm: this.roleForm, + commentText1: this.commentText1, + filesId: this.addFjList, + filesName: this.form.fjListName + }) }, {}, res => { if (res.ok) { var json = Object.assign(this.form, this.roleForm) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue index 1f8aea227..03d162d87 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1-9.vue @@ -61,7 +61,7 @@
-
+
{{ item.name }}
-
+
{{ item.name }}
-
+
{{ item.name }}
-
+
{{ item.name }}
-
+
{{ item.name }}
-
+
{{ item.name }}
-
+
{{ item.name }}
-
+
{{ item.name }}
-
+
{{ item.name }}
- - - - - - - - - - - - - + + +
+ + +
+
+
diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index 16614fc66..a6096515a 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -6,25 +6,21 @@ // 服务器地址 // const devIp = '39.98.140.126' // const devInterfacePORT = '10005' -// const devIp = '192.168.10.6' -const devIp = '62.234.136.153' -const devInterfacePORT = '8033' -// const devIp = '10.19.11.243' -// const devInterfacePORT = '4304' +// const devIp = '192.168.1.42' +// const devInterfacePORT = '9999' +const devIp = '39.98.140.126' +const devInterfacePORT = '4201' +// const devIp = '62.234.136.153' +// const devInterfacePORT = '8033' // 配置 idm 认证 const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri=' - -const ssoLogout = 'http://sso.foton.com.cn/logout?service=' // 配置 前端服务 -const devWebUrl = 'https://srms.foton.com.cn/#/' +const devWebUrl = 'http://62.234.136.153:8038/#/' // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录) const webLoginType = 'dev' // 配置onlyOffice 前端服务 -const onlyOfficeUrl = 'http://10.100.5.116:8088' - -// 配置 kkFileView 前端服务 -const kkFileViewUrl = 'https://srms.foton.com.cn/preview' +const onlyOfficeUrl = 'http://127.0.0.1:8080' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' @@ -48,10 +44,10 @@ const processPort = '17210' *****************************************************************/ // 生产环境配置 -// const prodIp = '62.234.136.153' -// const prodInterfacePORT = '8033' -const prodIp = 'srms.foton.com.cn' -const prodInterfacePORT = '' +const prodIp = '39.98.140.126' +const prodInterfacePORT = '4201' +// const prodIp = 'slrs.foton.com.cn' +// const prodInterfacePORT = '' // 判断环境 const serverIP = process.env.NODE_ENV === 'production' ? prodIp : devIp @@ -62,10 +58,8 @@ module.exports = { baseUrl: 'http://' + serverIP + ':' + interfacePORT, webLoginType: webLoginType, ssoLoginUrlDev: ssoLogin + devWebUrl, - ssoLogoutUrlDev: ssoLogout + devWebUrl, ssoLoginUrl: ssoLogin, onlyOfficeUrl: onlyOfficeUrl, - kkFileViewUrl: kkFileViewUrl, devWebUrl: devWebUrl, serverUrl: 'http://' + serverIP, // 服务器IP地址 interfaceUrl: 'http://' + serverIP + ':' + interfacePORT + '/api/', // 服务器端接口访问地址,