Browse Source

优化

master
陈裕财 3 years ago
parent
commit
2a5a11e905
  1. 4
      src/api/imgUtil.js
  2. 2
      src/api/xm/core/xmMenu.js
  3. 4
      src/components/Mdp/index.scss
  4. 6
      src/components/MdpSelectUserX/index.vue
  5. 2
      src/permission.js
  6. 6
      src/vendor/Blob.js
  7. 4
      src/views/login/components/login.vue
  8. 18
      src/views/xm/core/components/MdpSelectUserXm/index.vue
  9. 35
      src/views/xm/core/xmTask/XmTaskMng.vue
  10. 2
      src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue

4
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 { export default {
onImgError:function(userid,$event){ onImgError:function(userid,$event){
debugger;
let img = $event.srcElement; let img = $event.srcElement;
img.src = this.getDefHeadimg(userid) img.src = this.getDefHeadimg(userid)
img.onerror = null; //防止闪图 img.onerror = null; //防止闪图
@ -124,7 +124,7 @@ getDefHeadimg:function(userid){
* @returns * @returns
*/ */
getHeadimgurl:function (userid,headimgurl,rand) { getHeadimgurl:function (userid,headimgurl,rand) {
debugger;
;
if(!userid){ if(!userid){
return null; return null;
} }

2
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'] var itemCodes=['menuStatus','demandSource','demandLvl','demandType','priority','dclass'];//在此添加要加载的字典 如['sex','grade','lvl']
if(itemCodes.length>0){ if(itemCodes.length>0){
initSimpleDicts('all',itemCodes).then(res=>{ initSimpleDicts('all',itemCodes).then(res=>{
debugger;
Object.assign(that.dicts,res.data.data) Object.assign(that.dicts,res.data.data)
}); });
} }

4
src/components/Mdp/index.scss

@ -21,6 +21,10 @@
line-height: 20px; line-height: 20px;
font-size: 0.75rem; font-size: 0.75rem;
} }
.field-value-center {
line-height: 40px;
font-size: 0.75rem;
}
.field-label { .field-label {
height: 20px; height: 20px;
line-height: 20px; line-height: 20px;

6
src/components/MdpSelectUserX/index.vue

@ -53,7 +53,7 @@
computed: { computed: {
avaterCpd(){ avaterCpd(){
debugger;
var isEmpty=this.isEmpty(this.myVal) var isEmpty=this.isEmpty(this.myVal)
var username=isEmpty?"":(this.myVal.username?this.myVal.username:this.myVal.userid) 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:''} var obj={isNull:isEmpty,icon:'el-icon-user',color:'#E4E7ED',innerText:username,userid:'',headimgurl:''}
@ -83,7 +83,7 @@
} }
} }
debugger;
return obj; return obj;
} }
@ -106,7 +106,7 @@
}, },
myVal(){ myVal(){
debugger;
if(!this.myVal||!this.myVal.userid){ if(!this.myVal||!this.myVal.userid){
if(this.value && this.value[this.useridKey]){ if(this.value && this.value[this.useridKey]){
this.value[this.useridKey]="" this.value[this.useridKey]=""

2
src/permission.js

@ -50,7 +50,7 @@ const whiteList = [
router.beforeEach((to, from, next) => { router.beforeEach((to, from, next) => {
NProgress.start() // start progress bar 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){ if(to.path==='/' || to.path.indexOf('/404')>=0 || to.path.indexOf('/401')>=0 || to.path.indexOf('/login')>=0 ||to.path.indexOf('/logout')>=0){
next() next()
NProgress.done() NProgress.done()

6
src/vendor/Blob.js

@ -63,7 +63,7 @@
, ArrayBuffer = view.ArrayBuffer , ArrayBuffer = view.ArrayBuffer
, Uint8Array = view.Uint8Array , Uint8Array = view.Uint8Array
;
FakeBlob.fake = FB_proto.fake = true; FakeBlob.fake = FB_proto.fake = true;
while (file_ex_code--) { while (file_ex_code--) {
FileException.prototype[file_ex_codes[file_ex_code]] = file_ex_code + 1; FileException.prototype[file_ex_codes[file_ex_code]] = file_ex_code + 1;
@ -75,7 +75,7 @@
var var
type = blob.type type = blob.type
, data_URI_header , data_URI_header
;
if (type === null) { if (type === null) {
type = "application/octet-stream"; type = "application/octet-stream";
} }
@ -108,7 +108,7 @@
, buf = new Uint8Array(data) , buf = new Uint8Array(data)
, i = 0 , i = 0
, buf_len = buf.length , buf_len = buf.length
;
for (; i < buf_len; i++) { for (; i < buf_len; i++) {
str += String.fromCharCode(buf[i]); str += String.fromCharCode(buf[i]);
} }

4
src/views/login/components/login.vue

@ -268,7 +268,7 @@ export default {
loginParams.branchId=params.branchId loginParams.branchId=params.branchId
} }
this.$store.dispatch("LoginByUserloginid",loginParams).then(res => { this.$store.dispatch("LoginByUserloginid",loginParams).then(res => {
;
this.loading = false this.loading = false
if(res.data.tips.isOk==true){ if(res.data.tips.isOk==true){
this.loading = true; this.loading = true;
@ -378,7 +378,7 @@ export default {
loginParams.grantType="password" loginParams.grantType="password"
loginParams.authType='password_display_userid' loginParams.authType='password_display_userid'
this.$store.dispatch("LoginByUserloginid",loginParams).then(res => { this.$store.dispatch("LoginByUserloginid",loginParams).then(res => {
;
this.loading = false this.loading = false
if(res.data.tips.isOk==true){ if(res.data.tips.isOk==true){
this.loading = true; this.loading = true;

18
src/views/xm/core/components/MdpSelectUserXm/index.vue

@ -11,10 +11,10 @@
<div class="field-info" :class="{disabled:disabled===true,enabled:disabled!==true}"> <div class="field-info" :class="{disabled:disabled===true,enabled:disabled!==true}">
<slot name="field-info" :value="myVal" > <slot name="field-info" :value="myVal" >
<span class="field-value" v-if="!avaterCpd.isNull">{{avaterCpd.innerText}} </span>
<span class="field-value" v-else><span class="label-font-color"></span></span>
<span :class="{'field-value':label,'field-value-center':!label}" v-if="!avaterCpd.isNull">{{avaterCpd.innerText}} </span>
<span :class="{'field-value':label,'field-value-center':!label}" v-else><span class="label-font-color"></span></span>
<slot name="label"> <slot name="label">
<span class="field-label">{{label}}</span>
<span class="field-label" v-if="label">{{label}}</span>
</slot> </slot>
</slot> </slot>
</div> </div>
@ -67,7 +67,7 @@
components: { UsersSelect, XmGroupSelect }, components: { UsersSelect, XmGroupSelect },
computed: { computed: {
avaterCpd(){ avaterCpd(){
debugger;
var isEmpty=this.isEmpty(this.myVal) var isEmpty=this.isEmpty(this.myVal)
var username=isEmpty?"":(this.myVal.username?this.myVal.username:this.myVal.userid) 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:''} var obj={isNull:isEmpty,icon:'el-icon-user',color:'#E4E7ED',innerText:username,userid:'',headimgurl:''}
@ -97,7 +97,7 @@
} }
} }
debugger;
return obj; return obj;
} }
@ -116,6 +116,7 @@
this.initData(); this.initData();
}, },
deep:true, deep:true,
immediate:true,
}, },
@ -216,15 +217,16 @@
}, },
initData(){ initData(){
debugger;
var myVal={userid:'',username:'',headimgurl:''} var myVal={userid:'',username:'',headimgurl:''}
if(this.value){ if(this.value){
myVal.userid=this.value[this.useridKey] myVal.userid=this.value[this.useridKey]
myVal.username=this.value[this.usernameKey] myVal.username=this.value[this.usernameKey]
myVal.headimgurl=this.value.headimgurl myVal.headimgurl=this.value.headimgurl
this.myVal=myVal
this.myVal={...myVal}
}else{ }else{
this.myVal=myVal
this.myVal={...myVal}
} }

35
src/views/xm/core/xmTask/XmTaskMng.vue

@ -468,13 +468,8 @@
show-overflow-tooltip show-overflow-tooltip
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div class="cell-text">
{{scope.row.createUsername}}
</div>
<span class="cell-bar">
<el-button @click="$refs.xmGroupDialog.open({data:scope.row,action:'createUserid'})">选负责人</el-button>
</span>
</template>
<mdp-select-user-xm v-model="scope.row" userid-key="createUserid" username-key="createUsername" :project-id="scope.row.projectId" @change="editXmTaskSomeFields(scope.row,'createUserid',$event)"></mdp-select-user-xm>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
sortable sortable
@ -483,27 +478,9 @@
width="120" width="120"
show-overflow-tooltip show-overflow-tooltip
> >
<template slot-scope="scope">
<span v-if="scope.row.ntype=='0'">
<span v-if="scope.row.crowd=='1'||scope.row.executorUserid">
<span
v-for="(item, index) in [formatExeUsernames(scope.row)]"
:key="index"
>
<el-link
:type="item.type"
@click.stop="showExecusers(scope.row)"
>{{ item.showMsg }}</el-link
>
</span>
</span>
<span v-else-if="!scope.row.executorUserid">
<el-link
@click="$refs.xmGroupDialog.open({data:scope.row,action:'executorUserid'})"
>去设置</el-link>
</span>
</span>
</template>
<template slot-scope="scope">
<mdp-select-user-xm :key="scope.row.id" v-model="scope.row" userid-key="executorUserid" username-key="executorUsername" :project-id="scope.row.projectId" @change="editXmTaskSomeFields(scope.row,'executorUserid',$event)"></mdp-select-user-xm>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column
sortable sortable
@ -1839,7 +1816,7 @@ export default {
}); });
}, },
// //
selectCreateUserConfirm(groupUsers,option) {
selectCreateUserConfirm(user) {
if(option && option.action==='createUserid'){ if(option && option.action==='createUserid'){
if (groupUsers && groupUsers.length > 0) { if (groupUsers && groupUsers.length > 0) {
var user= groupUsers[0]; var user= groupUsers[0];

2
src/views/xm/core/xmTaskWorkItem/XmSubTaskList.vue

@ -396,7 +396,7 @@ export default {
} }
editXmTaskSomeFields(params).then(res=>{ editXmTaskSomeFields(params).then(res=>{
;
var tips = res.data.tips; var tips = res.data.tips;
if(tips.isOk){ if(tips.isOk){
if(this.sels.length>0){ if(this.sels.length>0){

Loading…
Cancel
Save