Merge remote-tracking branch 'origin/apps_dev' into apps_dev
This commit is contained in:
3120626891@qq.com
commit
dd3dcf3884
@ -13,4 +13,4 @@
|
|||||||
var mainType = "<#mainType>";
|
var mainType = "<#mainType>";
|
||||||
var uid = "<#uid>";
|
var uid = "<#uid>";
|
||||||
var wHref = "./w";
|
var wHref = "./w";
|
||||||
var jdHref = "./jd";</script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-18ba0bf3.b9b5de63.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-1fd5b92a.9170273e.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-3a7599c6.bb861d84.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-532765fe.0cca68dd.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-604dda2c.3d2e96af.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-6c83edf4.6c467910.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-866d5568.59811566.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-9d1e04c4.d1caea12.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-f3e4ff48.721c4dc9.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-18ba0bf3.d0d27872.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-1fd5b92a.07c16352.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0ab156.ca03ae9d.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0b25b0.3ebfc816.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0f078a.3038704d.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d216d3a.96ada280.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224b23.e62adedc.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224ef1.44cb7f2b.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-3a7599c6.5d555915.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-532765fe.9bb04323.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-5ca06e36.c64d879b.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-604dda2c.97f6b8da.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-6c83edf4.93b8726a.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-866d5568.463c2fdd.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-9d1e04c4.ddede9a0.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-bf7921b8.1d6eee48.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-f3e4ff48.6d7f9787.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.634e376c.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal/main/js/app.7019d6cd.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.bd2b52b4.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.634e376c.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.bd2b52b4.js></script><script src=../apps/com.actionsoft.apps.coe.pal/main/js/app.7019d6cd.js></script></body></html>
|
var jdHref = "./jd";</script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-03c6285a.7d5e2b5a.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-0df035f6.e83dbaa2.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-21453108.a3fd01d3.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-23a660f0.0ecc4095.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-62973164.df722ecd.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-79148172.dc3e7967.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-7f2e89b2.e0cd2ccf.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-b158b92a.fe2f3f84.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/chunk-bb3b9f20.f7f4b256.css rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-03c6285a.ad686911.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-0df035f6.5d5601d8.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-21453108.ee636e90.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-23a660f0.a0811617.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0ab156.128f137a.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d0f078a.b230933d.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d212b99.1061dc70.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d216d3a.7474d207.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224b23.5d50ea7e.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-2d224ef1.3618651e.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-3178e2bf.e4bd60ae.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-3a9b7577.1c8372d8.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-62973164.e58c040a.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-79148172.6e616cff.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-7f2e89b2.005521e6.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-b158b92a.011e3ae6.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-bb3b9f20.90babfc9.js rel=prefetch><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.b58aa8df.css rel=preload as=style><link href=../apps/com.actionsoft.apps.coe.pal/main/js/app.5b0b673e.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.54a27270.js rel=preload as=script><link href=../apps/com.actionsoft.apps.coe.pal/main/css/app.b58aa8df.css rel=stylesheet></head><body style=margin:0;><div id=app></div><script src=../apps/com.actionsoft.apps.coe.pal/main/js/chunk-vendors.54a27270.js></script><script src=../apps/com.actionsoft.apps.coe.pal/main/js/app.5b0b673e.js></script></body></html>
|
||||||
@ -4533,8 +4533,6 @@ var Designer = {
|
|||||||
//判断如果岗位多个数据,...显示 by zhaolei
|
//判断如果岗位多个数据,...显示 by zhaolei
|
||||||
if (jjj.value != "") {
|
if (jjj.value != "") {
|
||||||
debugger;
|
debugger;
|
||||||
if(jj.value!=undefined){
|
|
||||||
if (jj.value.indexOf(',') > -1){
|
|
||||||
var lenth = jjj.value.match(/,/g).length;
|
var lenth = jjj.value.match(/,/g).length;
|
||||||
if (lenth >= 2) {
|
if (lenth >= 2) {
|
||||||
var index1 = jjj.value.indexOf(",");
|
var index1 = jjj.value.indexOf(",");
|
||||||
@ -4543,10 +4541,9 @@ var Designer = {
|
|||||||
} else {
|
} else {
|
||||||
l += jjj.value;
|
l += jjj.value;
|
||||||
}
|
}
|
||||||
|
|
||||||
}else{
|
}else{
|
||||||
l += jjj.value;
|
l += jjj.value;
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@ -1 +0,0 @@
|
|||||||
#commonRepository[data-v-5a94998a] .el-dialog__body,#commonRepository[data-v-5a94998a] .el-main{padding:0 20px}#commonRepository[data-v-5a94998a] .el-footer{padding:0}#commonRepository[data-v-5a94998a] .el-table__row .operate-icon-display{display:none}#commonRepository[data-v-5a94998a] .el-table__row:hover .operate-icon-display{display:inline-block}
|
|
||||||
File diff suppressed because one or more lines are too long
@ -0,0 +1 @@
|
|||||||
|
#commonRepository[data-v-c633f5ea] .el-dialog__body,#commonRepository[data-v-c633f5ea] .el-main{padding:0 20px}#commonRepository[data-v-c633f5ea] .el-footer{padding:0}#commonRepository[data-v-c633f5ea] .el-table__row .operate-icon-display{display:none}#commonRepository[data-v-c633f5ea] .el-table__row:hover .operate-icon-display{display:inline-block}
|
||||||
|
Before Width: | Height: | Size: 158 KiB After Width: | Height: | Size: 158 KiB |
|
Before Width: | Height: | Size: 1.2 MiB After Width: | Height: | Size: 1.2 MiB |
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -1 +1 @@
|
|||||||
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0ab156"],{1485:function(a,t,e){"use strict";e.r(t);var i=function(){var a=this,t=a._self._c;return t("div",{staticStyle:{width:"100%",height:"100%"}},[t("iframe",{staticStyle:{border:"0"},attrs:{id:"iframe",width:"100%",height:"100%",name:"iframe",src:a.src}})])},s=[],n={name:"MappingManagement",data(){return{src:"./w?sid="+this.$store.state.sessionId+"&cmd=com.actionsoft.apps.coe.pal.mappingmanagement_main_page&dataType="+this.$route.params.dataType}}},r=n,c=e("0b56"),p=Object(c["a"])(r,i,s,!1,null,"56fd105e",null);t["default"]=p.exports}}]);
|
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0ab156"],{1485:function(a,t,e){"use strict";e.r(t);var i=function(){var a=this,t=a._self._c;return t("div",{staticStyle:{width:"100%",height:"100%"}},[t("iframe",{staticStyle:{border:"0"},attrs:{id:"iframe",width:"100%",height:"100%",name:"iframe",src:a.src}})])},s=[],n={name:"MappingManagement",data(){return{src:"./w?sid="+this.$store.state.sessionId+"&cmd=com.actionsoft.apps.coe.pal.mappingmanagement_main_page&dataType="+this.$route.params.dataType}}},r=n,c=e("2877"),p=Object(c["a"])(r,i,s,!1,null,"56fd105e",null);t["default"]=p.exports}}]);
|
||||||
@ -1 +1 @@
|
|||||||
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0f078a"],{"9d09":function(t,e,i){"use strict";i.r(e);var s=function(){var t=this,e=t._self._c;return e("div",{style:{width:"100%",height:t.mainHeight}},[e("iframe",{staticStyle:{border:"0"},attrs:{id:"orgIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"orgIframe",src:t.src}})])},n=[],r={name:"BPMOrg",data(){return{src:"./w?sid="+this.$store.state.sessionId+"&cmd=com.actionsoft.apps.coe.pal_average_user_org",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},a=r,o=i("0b56"),h=Object(o["a"])(a,s,n,!1,null,"2280cc48",null);e["default"]=h.exports}}]);
|
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0f078a"],{"9d09":function(t,e,i){"use strict";i.r(e);var s=function(){var t=this,e=t._self._c;return e("div",{style:{width:"100%",height:t.mainHeight}},[e("iframe",{staticStyle:{border:"0"},attrs:{id:"orgIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"orgIframe",src:t.src}})])},n=[],r={name:"BPMOrg",data(){return{src:"./w?sid="+this.$store.state.sessionId+"&cmd=com.actionsoft.apps.coe.pal_average_user_org",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},a=r,o=i("2877"),h=Object(o["a"])(a,s,n,!1,null,"2280cc48",null);e["default"]=h.exports}}]);
|
||||||
@ -1,4 +1,4 @@
|
|||||||
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d0b25b0"],{2480:function(t,e,n){"use strict";
|
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d212b99"],{aa47:function(t,e,n){"use strict";
|
||||||
/**!
|
/**!
|
||||||
* Sortable 1.10.2
|
* Sortable 1.10.2
|
||||||
* @author RubaXa <trash@rubaxa.org>
|
* @author RubaXa <trash@rubaxa.org>
|
||||||
@ -1 +1 @@
|
|||||||
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d216d3a"],{c3b6:function(t,e,i){"use strict";i.r(e);var a=function(){var t=this,e=t._self._c;return e("div",{style:{width:"100%",height:t.mainHeight},attrs:{id:"cooperation"}},[e("iframe",{staticStyle:{border:"0"},attrs:{id:"coopIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"coopIframe",src:t.src}})])},n=[],s={name:"cooperationCreate",data(){return{src:wHref+"?sid="+this.$store.state.sessionId+"&mainPage=create&cmd=com.actionsoft.apps.coe.pal.cooperation_main",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},o=s,r=i("0b56"),c=Object(r["a"])(o,a,n,!1,null,"6a826a48",null);e["default"]=c.exports}}]);
|
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d216d3a"],{c3b6:function(t,e,i){"use strict";i.r(e);var a=function(){var t=this,e=t._self._c;return e("div",{style:{width:"100%",height:t.mainHeight},attrs:{id:"cooperation"}},[e("iframe",{staticStyle:{border:"0"},attrs:{id:"coopIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"coopIframe",src:t.src}})])},n=[],s={name:"cooperationCreate",data(){return{src:wHref+"?sid="+this.$store.state.sessionId+"&mainPage=create&cmd=com.actionsoft.apps.coe.pal.cooperation_main",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},o=s,r=i("2877"),c=Object(r["a"])(o,a,n,!1,null,"6a826a48",null);e["default"]=c.exports}}]);
|
||||||
@ -1 +1 @@
|
|||||||
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d224b23"],{e0df:function(t,e,i){"use strict";i.r(e);var a=function(){var t=this,e=t._self._c;return e("div",{style:{width:"100%",height:t.mainHeight},attrs:{id:"cooperationUpdate"}},[e("iframe",{staticStyle:{border:"0"},attrs:{id:"coopIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"coopIframe",src:t.src}})])},n=[],s={name:"CooperationUpdate",data(){return{src:wHref+"?sid="+this.$store.state.sessionId+"&mainPage=update&cmd=com.actionsoft.apps.coe.pal.cooperation_main",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},o=s,r=i("0b56"),p=Object(r["a"])(o,a,n,!1,null,"543345d8",null);e["default"]=p.exports}}]);
|
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d224b23"],{e0df:function(t,e,i){"use strict";i.r(e);var a=function(){var t=this,e=t._self._c;return e("div",{style:{width:"100%",height:t.mainHeight},attrs:{id:"cooperationUpdate"}},[e("iframe",{staticStyle:{border:"0"},attrs:{id:"coopIframe",width:"100%",height:parseInt(t.mainHeight)-4+"px",name:"coopIframe",src:t.src}})])},n=[],s={name:"CooperationUpdate",data(){return{src:wHref+"?sid="+this.$store.state.sessionId+"&mainPage=update&cmd=com.actionsoft.apps.coe.pal.cooperation_main",mainHeight:parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}},computed:{listenTopMainHeight(){return this.$store.getters.getTopMainHeightFn}},watch:{listenTopMainHeight:function(t,e){this.mainHeight=parseInt(this.$store.getters.getTopMainHeightFn)-4+"px"}}},o=s,r=i("2877"),p=Object(r["a"])(o,a,n,!1,null,"543345d8",null);e["default"]=p.exports}}]);
|
||||||
@ -1 +1 @@
|
|||||||
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d224ef1"],{e1f5:function(e,s,t){"use strict";t.r(s);var n=function(){var e=this,s=e._self._c;return s("div",{staticClass:"devGetSession"},[e._v(" 正在获取session ")])},a=[],d=t("a18c"),o=t("0f08"),i=t("4360");o["a"].post({url:"jd",data:{userid:devUserInfo.userid,pwd:devUserInfo.pwd,lang:"cn",cmd:"com.actionsoft.apps.getsession.get",deviceType:"pc"}}).then((function(e){"error"==e.result?alert("获取session错误："+e.msg):(i["a"].commit("edit",{sessionId:e.data.sid}),d["a"].replace("/"))}));var r={data(){return{dwList:[]}},methods:{},mounted(){}},c=r,u=t("0b56"),l=Object(u["a"])(c,n,a,!1,null,null,null);s["default"]=l.exports}}]);
|
(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d224ef1"],{e1f5:function(e,s,t){"use strict";t.r(s);var n=function(){var e=this,s=e._self._c;return s("div",{staticClass:"devGetSession"},[e._v(" 正在获取session ")])},a=[],d=t("a18c"),o=t("0f08"),i=t("4360");o["a"].post({url:"jd",data:{userid:devUserInfo.userid,pwd:devUserInfo.pwd,lang:"cn",cmd:"com.actionsoft.apps.getsession.get",deviceType:"pc"}}).then((function(e){"error"==e.result?alert("获取session错误："+e.msg):(i["a"].commit("edit",{sessionId:e.data.sid}),d["a"].replace("/"))}));var r={data(){return{dwList:[]}},methods:{},mounted(){}},c=r,u=t("2877"),l=Object(u["a"])(c,n,a,!1,null,null,null);s["default"]=l.exports}}]);
|
||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user