From 2a5a11e9055b629bab6be3b6ea0d4be58a8b627c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sat, 14 Jan 2023 21:35:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/imgUtil.js | 4 +- src/api/xm/core/xmMenu.js | 2 +- src/components/Mdp/index.scss | 4 ++ src/components/MdpSelectUserX/index.vue | 6 +-- src/permission.js | 2 +- src/vendor/Blob.js | 6 +-- src/views/login/components/login.vue | 4 +- .../core/components/MdpSelectUserXm/index.vue | 20 +++++----- src/views/xm/core/xmTask/XmTaskMng.vue | 37 ++++--------------- .../xm/core/xmTaskWorkItem/XmSubTaskList.vue | 2 +- 10 files changed, 35 insertions(+), 52 deletions(-) diff --git a/src/api/imgUtil.js b/src/api/imgUtil.js index 4a4ff609..807adb04 100644 --- a/src/api/imgUtil.js +++ b/src/api/imgUtil.js @@ -89,7 +89,7 @@ h55,h56,h57,h58,h59,h60,h61,h62,h63,h64,h64,h66,h67,h68,h69,h70 export default { onImgError:function(userid,$event){ - debugger; + let img = $event.srcElement; img.src = this.getDefHeadimg(userid) img.onerror = null; //防止闪图 @@ -124,7 +124,7 @@ getDefHeadimg:function(userid){ * @returns */ getHeadimgurl:function (userid,headimgurl,rand) { - debugger; + ; if(!userid){ return null; } diff --git a/src/api/xm/core/xmMenu.js b/src/api/xm/core/xmMenu.js index 58b54e7f..54a92d93 100644 --- a/src/api/xm/core/xmMenu.js +++ b/src/api/xm/core/xmMenu.js @@ -59,7 +59,7 @@ export const initDicts = (that) => { var itemCodes=['menuStatus','demandSource','demandLvl','demandType','priority','dclass'];//在此添加要加载的字典 如['sex','grade','lvl'] if(itemCodes.length>0){ initSimpleDicts('all',itemCodes).then(res=>{ - debugger; + Object.assign(that.dicts,res.data.data) }); } diff --git a/src/components/Mdp/index.scss b/src/components/Mdp/index.scss index 934409be..d66f2448 100644 --- a/src/components/Mdp/index.scss +++ b/src/components/Mdp/index.scss @@ -21,6 +21,10 @@ line-height: 20px; font-size: 0.75rem; } + .field-value-center { + line-height: 40px; + font-size: 0.75rem; + } .field-label { height: 20px; line-height: 20px; diff --git a/src/components/MdpSelectUserX/index.vue b/src/components/MdpSelectUserX/index.vue index 7b6177fa..a5873b0f 100644 --- a/src/components/MdpSelectUserX/index.vue +++ b/src/components/MdpSelectUserX/index.vue @@ -53,7 +53,7 @@ computed: { avaterCpd(){ - debugger; + var isEmpty=this.isEmpty(this.myVal) var username=isEmpty?"":(this.myVal.username?this.myVal.username:this.myVal.userid) var obj={isNull:isEmpty,icon:'el-icon-user',color:'#E4E7ED',innerText:username,userid:'',headimgurl:''} @@ -83,7 +83,7 @@ } } - debugger; + return obj; } @@ -106,7 +106,7 @@ }, myVal(){ - debugger; + if(!this.myVal||!this.myVal.userid){ if(this.value && this.value[this.useridKey]){ this.value[this.useridKey]="" diff --git a/src/permission.js b/src/permission.js index 2d15d3bf..6de58184 100644 --- a/src/permission.js +++ b/src/permission.js @@ -50,7 +50,7 @@ const whiteList = [ router.beforeEach((to, from, next) => { NProgress.start() // start progress bar - debugger; + ; if(to.path==='/' || to.path.indexOf('/404')>=0 || to.path.indexOf('/401')>=0 || to.path.indexOf('/login')>=0 ||to.path.indexOf('/logout')>=0){ next() NProgress.done() diff --git a/src/vendor/Blob.js b/src/vendor/Blob.js index 26382ccd..03cf82d3 100644 --- a/src/vendor/Blob.js +++ b/src/vendor/Blob.js @@ -63,7 +63,7 @@ , ArrayBuffer = view.ArrayBuffer , Uint8Array = view.Uint8Array - ; + FakeBlob.fake = FB_proto.fake = true; while (file_ex_code--) { FileException.prototype[file_ex_codes[file_ex_code]] = file_ex_code + 1; @@ -75,7 +75,7 @@ var type = blob.type , data_URI_header - ; + if (type === null) { type = "application/octet-stream"; } @@ -108,7 +108,7 @@ , buf = new Uint8Array(data) , i = 0 , buf_len = buf.length - ; + for (; i < buf_len; i++) { str += String.fromCharCode(buf[i]); } diff --git a/src/views/login/components/login.vue b/src/views/login/components/login.vue index 7d59fd8c..3679cbf9 100644 --- a/src/views/login/components/login.vue +++ b/src/views/login/components/login.vue @@ -268,7 +268,7 @@ export default { loginParams.branchId=params.branchId } this.$store.dispatch("LoginByUserloginid",loginParams).then(res => { - ; + this.loading = false if(res.data.tips.isOk==true){ this.loading = true; @@ -378,7 +378,7 @@ export default { loginParams.grantType="password" loginParams.authType='password_display_userid' this.$store.dispatch("LoginByUserloginid",loginParams).then(res => { - ; + this.loading = false if(res.data.tips.isOk==true){ this.loading = true; diff --git a/src/views/xm/core/components/MdpSelectUserXm/index.vue b/src/views/xm/core/components/MdpSelectUserXm/index.vue index dc275739..048e3b7c 100644 --- a/src/views/xm/core/components/MdpSelectUserXm/index.vue +++ b/src/views/xm/core/components/MdpSelectUserXm/index.vue @@ -11,10 +11,10 @@
- {{avaterCpd.innerText}} - 无 + {{avaterCpd.innerText}} + 无 - {{label}} + {{label}}
@@ -67,7 +67,7 @@ components: { UsersSelect, XmGroupSelect }, computed: { avaterCpd(){ - debugger; + var isEmpty=this.isEmpty(this.myVal) var username=isEmpty?"":(this.myVal.username?this.myVal.username:this.myVal.userid) var obj={isNull:isEmpty,icon:'el-icon-user',color:'#E4E7ED',innerText:username,userid:'',headimgurl:''} @@ -97,7 +97,7 @@ } } - debugger; + return obj; } @@ -116,6 +116,7 @@ this.initData(); }, deep:true, + immediate:true, }, @@ -215,16 +216,17 @@ }, - initData(){ - debugger; + initData(){ + var myVal={userid:'',username:'',headimgurl:''} if(this.value){ + myVal.userid=this.value[this.useridKey] myVal.username=this.value[this.usernameKey] myVal.headimgurl=this.value.headimgurl - this.myVal=myVal + this.myVal={...myVal} }else{ - this.myVal=myVal + this.myVal={...myVal} } diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue index f89334fd..9fd80917 100644 --- a/src/views/xm/core/xmTask/XmTaskMng.vue +++ b/src/views/xm/core/xmTask/XmTaskMng.vue @@ -467,14 +467,9 @@ width="120" show-overflow-tooltip > - + - + 0) { var user= groupUsers[0]; diff --git a/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue b/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue index 6acd64e5..a07e5e23 100644 --- a/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue +++ b/src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue @@ -396,7 +396,7 @@ export default { } editXmTaskSomeFields(params).then(res=>{ - ; + var tips = res.data.tips; if(tips.isOk){ if(this.sels.length>0){