Skip to content

IM
IM
提交 31a4c1fc 编写于 作者: ibizdev's avatar ibizdev
浏览文件
操作

ibizdev提交

上级 ffb53b4a
显示空白字符变更
内嵌 并排
正在显示 包含 37 行增加 和 37 行删除
app_WFWeb/src/locale/lanres/wfim/wfim_en_US.ts
浏览文件 @ 31a4c1fc
...@@ -118,14 +118,14 @@ export default { ...@@ -118,14 +118,14 @@ export default {
caption: "回退", caption: "回退",
tip: "deuiaction1_sendback", tip: "deuiaction1_sendback",
}, },
tbitem24_c47: {
caption: "送首席风险官审核",
tip: "tbitem24_c47",
},
tbitem24_c66: { tbitem24_c66: {
caption: "送会签", caption: "送会签",
tip: "tbitem24_c66", tip: "tbitem24_c66",
}, },
tbitem24_c47: {
caption: "送首席风险官审核",
tip: "tbitem24_c47",
},
tbitem24_c37: { tbitem24_c37: {
caption: "送跨公司会签", caption: "送跨公司会签",
tip: "tbitem24_c37", tip: "tbitem24_c37",
......
app_WFWeb/src/locale/lanres/wfim/wfim_zh_CN.ts
浏览文件 @ 31a4c1fc
...@@ -117,14 +117,14 @@ export default { ...@@ -117,14 +117,14 @@ export default {
caption: '回退', caption: '回退',
tip: '回退', tip: '回退',
}, },
tbitem24_c47: {
caption: '送首席风险官审核',
tip: '送首席风险官审核',
},
tbitem24_c66: { tbitem24_c66: {
caption: '送会签', caption: '送会签',
tip: '送会签', tip: '送会签',
}, },
tbitem24_c47: {
caption: '送首席风险官审核',
tip: '送首席风险官审核',
},
tbitem24_c37: { tbitem24_c37: {
caption: '送跨公司会签', caption: '送跨公司会签',
tip: '送跨公司会签', tip: '送跨公司会签',
......
app_WFWeb/src/pages/htwf/wfimwfim-w30-wfedit-view3/wfimwfim-w30-wfedit-view3-base.vue
浏览文件 @ 31a4c1fc
...@@ -19,18 +19,18 @@ ...@@ -19,18 +19,18 @@
<div slot='content'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.deuiaction1_sendback.tip')}}</div> <div slot='content'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.deuiaction1_sendback.tip')}}</div>
</tooltip> </tooltip>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem24_c47.visabled" :disabled="toolBarModels.tbitem24_c47.disabled" class='' @click="toolbar_click({ tag: 'tbitem24_c47' }, $event)"> <i-button v-show="toolBarModels.tbitem24_c66.visabled" :disabled="toolBarModels.tbitem24_c66.disabled" class='' @click="toolbar_click({ tag: 'tbitem24_c66' }, $event)">
<i class=''></i> <i class=''></i>
<span class='caption'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.tbitem24_c47.caption')}}</span> <span class='caption'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.tbitem24_c66.caption')}}</span>
</i-button> </i-button>
<div slot='content'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.tbitem24_c47.tip')}}</div> <div slot='content'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.tbitem24_c66.tip')}}</div>
</tooltip> </tooltip>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem24_c66.visabled" :disabled="toolBarModels.tbitem24_c66.disabled" class='' @click="toolbar_click({ tag: 'tbitem24_c66' }, $event)"> <i-button v-show="toolBarModels.tbitem24_c47.visabled" :disabled="toolBarModels.tbitem24_c47.disabled" class='' @click="toolbar_click({ tag: 'tbitem24_c47' }, $event)">
<i class=''></i> <i class=''></i>
<span class='caption'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.tbitem24_c66.caption')}}</span> <span class='caption'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.tbitem24_c47.caption')}}</span>
</i-button> </i-button>
<div slot='content'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.tbitem24_c66.tip')}}</div> <div slot='content'>{{$t('wfim.wfim_w30_wfeditview3toolbar_toolbar.tbitem24_c47.tip')}}</div>
</tooltip> </tooltip>
<tooltip :transfer="true" :max-width="600"> <tooltip :transfer="true" :max-width="600">
<i-button v-show="toolBarModels.tbitem24_c37.visabled" :disabled="toolBarModels.tbitem24_c37.disabled" class='' @click="toolbar_click({ tag: 'tbitem24_c37' }, $event)"> <i-button v-show="toolBarModels.tbitem24_c37.visabled" :disabled="toolBarModels.tbitem24_c37.disabled" class='' @click="toolbar_click({ tag: 'tbitem24_c37' }, $event)">
...@@ -275,10 +275,10 @@ export default class WFIMWFIM_W30_WFEditView3Base extends Vue { ...@@ -275,10 +275,10 @@ export default class WFIMWFIM_W30_WFEditView3Base extends Vue {
public toolBarModels: any = { public toolBarModels: any = {
deuiaction1_sendback: { name: 'deuiaction1_sendback', caption: '回退', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Sendback', target: 'SINGLEKEY' } }, deuiaction1_sendback: { name: 'deuiaction1_sendback', caption: '回退', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'Sendback', target: 'SINGLEKEY' } },
tbitem24_c47: { name: 'tbitem24_c47', caption: '送首席风险官审核', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'C47', target: 'MULTIKEY' } },
tbitem24_c66: { name: 'tbitem24_c66', caption: '送会签', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'C66', target: 'MULTIKEY' } }, tbitem24_c66: { name: 'tbitem24_c66', caption: '送会签', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'C66', target: 'MULTIKEY' } },
tbitem24_c47: { name: 'tbitem24_c47', caption: '送首席风险官审核', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'C47', target: 'MULTIKEY' } },
tbitem24_c37: { name: 'tbitem24_c37', caption: '送跨公司会签', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'C37', target: 'MULTIKEY' } }, tbitem24_c37: { name: 'tbitem24_c37', caption: '送跨公司会签', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'C37', target: 'MULTIKEY' } },
tbitem24_c44: { name: 'tbitem24_c44', caption: '送合规总监审批', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'C44', target: 'MULTIKEY' } }, tbitem24_c44: { name: 'tbitem24_c44', caption: '送合规总监审批', disabled: false, type: 'DEUIACTION', visabled: true, dataaccaction: '', uiaction: { tag: 'C44', target: 'MULTIKEY' } },
...@@ -451,12 +451,12 @@ export default class WFIMWFIM_W30_WFEditView3Base extends Vue { ...@@ -451,12 +451,12 @@ export default class WFIMWFIM_W30_WFEditView3Base extends Vue {
if (Object.is($event.tag, 'deuiaction1_sendback')) { if (Object.is($event.tag, 'deuiaction1_sendback')) {
this.toolbar_deuiaction1_sendback_click($event, '', $event2); this.toolbar_deuiaction1_sendback_click($event, '', $event2);
} }
if (Object.is($event.tag, 'tbitem24_c47')) {
this.toolbar_tbitem24_c47_click($event, '', $event2);
}
if (Object.is($event.tag, 'tbitem24_c66')) { if (Object.is($event.tag, 'tbitem24_c66')) {
this.toolbar_tbitem24_c66_click($event, '', $event2); this.toolbar_tbitem24_c66_click($event, '', $event2);
} }
if (Object.is($event.tag, 'tbitem24_c47')) {
this.toolbar_tbitem24_c47_click($event, '', $event2);
}
if (Object.is($event.tag, 'tbitem24_c37')) { if (Object.is($event.tag, 'tbitem24_c37')) {
this.toolbar_tbitem24_c37_click($event, '', $event2); this.toolbar_tbitem24_c37_click($event, '', $event2);
} }
...@@ -573,7 +573,7 @@ export default class WFIMWFIM_W30_WFEditView3Base extends Vue { ...@@ -573,7 +573,7 @@ export default class WFIMWFIM_W30_WFEditView3Base extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
protected toolbar_tbitem24_c47_click(params: any = {}, tag?: any, $event?: any) { protected toolbar_tbitem24_c66_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -582,14 +582,14 @@ export default class WFIMWFIM_W30_WFEditView3Base extends Vue { ...@@ -582,14 +582,14 @@ export default class WFIMWFIM_W30_WFEditView3Base extends Vue {
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {"srfwfiatag":"C47","srfwfstep":"30"}; let contextJO:any = {"srfwfiatag":"C66","srfwfstep":"30"};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()]; datas = [...xData.getDatas()];
} }
// 界面行为 // 界面行为
const curUIService:IMWFv1WFUIService = new IMWFv1WFUIService(); const curUIService:IMWFv1WFUIService = new IMWFv1WFUIService();
curUIService.IMWFv1_C47(datas,contextJO, paramJO, $event, xData,this,"WFIM"); curUIService.IMWFv1_C66(datas,contextJO, paramJO, $event, xData,this,"WFIM");
} }
/** /**
...@@ -600,7 +600,7 @@ export default class WFIMWFIM_W30_WFEditView3Base extends Vue { ...@@ -600,7 +600,7 @@ export default class WFIMWFIM_W30_WFEditView3Base extends Vue {
* @param {*} [$event] * @param {*} [$event]
* @memberof * @memberof
*/ */
protected toolbar_tbitem24_c66_click(params: any = {}, tag?: any, $event?: any) { protected toolbar_tbitem24_c47_click(params: any = {}, tag?: any, $event?: any) {
// 参数 // 参数
// 取数 // 取数
let datas: any[] = []; let datas: any[] = [];
...@@ -609,14 +609,14 @@ export default class WFIMWFIM_W30_WFEditView3Base extends Vue { ...@@ -609,14 +609,14 @@ export default class WFIMWFIM_W30_WFEditView3Base extends Vue {
const _this: any = this; const _this: any = this;
let paramJO:any = {}; let paramJO:any = {};
let contextJO:any = {"srfwfiatag":"C66","srfwfstep":"30"}; let contextJO:any = {"srfwfiatag":"C47","srfwfstep":"30"};
xData = this.$refs.form; xData = this.$refs.form;
if (xData.getDatas && xData.getDatas instanceof Function) { if (xData.getDatas && xData.getDatas instanceof Function) {
datas = [...xData.getDatas()]; datas = [...xData.getDatas()];
} }
// 界面行为 // 界面行为
const curUIService:IMWFv1WFUIService = new IMWFv1WFUIService(); const curUIService:IMWFv1WFUIService = new IMWFv1WFUIService();
curUIService.IMWFv1_C66(datas,contextJO, paramJO, $event, xData,this,"WFIM"); curUIService.IMWFv1_C47(datas,contextJO, paramJO, $event, xData,this,"WFIM");
} }
/** /**
......
config.xml
浏览文件 @ 31a4c1fc
...@@ -40,14 +40,14 @@ ...@@ -40,14 +40,14 @@
mvn install mvn install
cd .. cd ..
mvn install mvn install
cd im-boot cd im-app/im-app-wfweb
mvn clean package mvn clean package -Pprod
echo &apos;echo &quot;$para1&quot;&apos; &gt; apppasswd.sh echo &apos;echo &quot;$para1&quot;&apos; &gt; apppasswd.sh
chmod -R 777 * chmod -R 777 *
setsid env SSH_ASKPASS=&apos;./apppasswd.sh&apos; DISPLAY=&apos;none:0&apos; ssh root@172.16.102.61 &quot;mkdir -p /ibiz/nodes/node1/DEEE206E-53BF-4A76-BBB4-0DBBAFEE9439&quot; setsid env SSH_ASKPASS=&apos;./apppasswd.sh&apos; DISPLAY=&apos;none:0&apos; ssh root@172.16.102.61 &quot;mkdir -p /ibiz/nodes/node1/AAD5D106-FE84-4E18-985D-A43198FE466F&quot;
setsid env SSH_ASKPASS=&apos;./apppasswd.sh&apos; DISPLAY=&apos;none:0&apos; scp -r ./target/im.jar root@172.16.102.61:/ibiz/nodes/node1/DEEE206E-53BF-4A76-BBB4-0DBBAFEE9439 setsid env SSH_ASKPASS=&apos;./apppasswd.sh&apos; DISPLAY=&apos;none:0&apos; scp -r ./target/im-app-wfweb.jar root@172.16.102.61:/ibiz/nodes/node1/AAD5D106-FE84-4E18-985D-A43198FE466F
setsid env SSH_ASKPASS=&apos;./apppasswd.sh&apos; DISPLAY=&apos;none:0&apos; ssh root@172.16.102.61 &quot;ps -ef | grep &apos;/ibiz/nodes/node1/DEEE206E-53BF-4A76-BBB4-0DBBAFEE9439&apos;| tr -s &apos; &apos;|cut -d&apos; &apos; -f2,8,9 | grep -v grep | grep &apos;jar&apos; | cut -d&apos; &apos; -f1|xargs --no-run-if-empty kill -9&quot; setsid env SSH_ASKPASS=&apos;./apppasswd.sh&apos; DISPLAY=&apos;none:0&apos; ssh root@172.16.102.61 &quot;ps -ef | grep &apos;/ibiz/nodes/node1/AAD5D106-FE84-4E18-985D-A43198FE466F&apos;| tr -s &apos; &apos;|cut -d&apos; &apos; -f2,8,9 | grep -v grep | grep &apos;jar&apos; | cut -d&apos; &apos; -f1|xargs --no-run-if-empty kill -9&quot;
setsid env SSH_ASKPASS=&apos;./apppasswd.sh&apos; DISPLAY=&apos;none:0&apos; ssh root@172.16.102.61 &quot;source /etc/profile;source ~/.bash_profile; nohup java -jar -Xms512m -Xmx1024m -XX:PermSize=128M -XX:MaxPermSize=128m /ibiz/nodes/node1/DEEE206E-53BF-4A76-BBB4-0DBBAFEE9439/im.jar &gt;&gt;/ibiz/nodes/node1/DEEE206E-53BF-4A76-BBB4-0DBBAFEE9439/im_apiim 服务-`date --date=&apos;0 days ago&apos; +%Y-%m-%d`.log 2&gt;&amp;1 &amp;&quot; setsid env SSH_ASKPASS=&apos;./apppasswd.sh&apos; DISPLAY=&apos;none:0&apos; ssh root@172.16.102.61 &quot;source /etc/profile;source ~/.bash_profile; nohup java -jar -Xms512m -Xmx1024m -XX:PermSize=128M -XX:MaxPermSize=128m /ibiz/nodes/node1/AAD5D106-FE84-4E18-985D-A43198FE466F/im-app-wfweb.jar &gt;&gt;/ibiz/nodes/node1/AAD5D106-FE84-4E18-985D-A43198FE466F/im_appim 流程应用-`date --date=&apos;0 days ago&apos; +%Y-%m-%d`.log 2&gt;&amp;1 &amp;&quot;
</command> </command>
</hudson.tasks.Shell> </hudson.tasks.Shell>
</builders> </builders>
......
im-app/im-app-wfweb2/src/main/resources/application-wfweb2.yml
浏览文件 @ 31a4c1fc
server: server:
devmode: true devmode: false
port: 8080 port: 8203
servlet: servlet:
session: session:
cookie: cookie:
...@@ -17,11 +17,11 @@ spring: ...@@ -17,11 +17,11 @@ spring:
security: security:
cas: cas:
server: server:
host: http://passportcs.ibizlab.cn host: https://passport.ibizlab.cn
login: ${security.cas.server.host}/login login: ${security.cas.server.host}/login
logout: ${security.cas.server.host}/logout logout: ${security.cas.server.host}/logout
service: service:
host: http://localhost:${server.port} host: http://172.16.102.61:${server.port}
login: /login/cas login: /login/cas
logout: /logout logout: /logout
...@@ -36,7 +36,7 @@ logging: ...@@ -36,7 +36,7 @@ logging:
app: app:
web: web:
url: http://localhost:${server.port} url: http://172.16.102.61:${server.port}
wfstarturl: /#/%s/null/editview wfstarturl: /#/%s/null/editview
# wfviewurl: /#/dewfdataredirectview # wfviewurl: /#/dewfdataredirectview
wfviewurl: /#/appwfdataredirectview wfviewurl: /#/appwfdataredirectview
......
im-boot/src/main/resources/application-dev.yml
浏览文件 @ 31a4c1fc
server: server:
port: 8101 port: 8080
spring: spring:
application: application:
......
Markdown 格式
0% or
您添加了 0 人 到此讨论。请谨慎行事。
先完成此消息的编辑！
想要评论请 注册 或