Browse Source

优化

master
陈裕财 4 years ago
parent
commit
b58ebd4059
  1. 6
      src/styles/mdp.scss
  2. 19
      src/views/mdp/arc/tag/TagMng.vue
  3. 11
      src/views/xm/core/skill/skillMng.vue
  4. 45
      src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue
  5. 2
      src/views/xm/core/xmTask/XmTaskAdd.vue
  6. 16
      src/views/xm/core/xmTask/XmTaskEdit.vue

6
src/styles/mdp.scss

@ -101,6 +101,12 @@
.overflow-auto{
overflow: auto;
}
.overflow-x-auto{
overflow-x: auto;
}
.overflow-y-auto{
overflow-y: auto;
}
.overflow-hidden{
overflow: hidden;
}

19
src/views/mdp/arc/tag/TagMng.vue

@ -1,5 +1,5 @@
<template>
<section class="page-container page-full-height padding border">
<section class="padding border">
<el-row >
<el-row v-if="editVisible==false">
<el-col :span="10">
@ -42,7 +42,7 @@
</el-col>
</el-row>
</el-row>
<el-row class="app-container max-height-box" v-if="editVisible==false">
<el-row class="page-height-75 overflow-y-auto" v-if="editVisible==false" ref="table">
<el-row v-for="(item,index) in convertTags" :key="item.categoryId" class="padding">
<h3>
<div>
@ -61,7 +61,7 @@
</el-col>
</el-row>
</el-row>
<el-row class="app-container max-height-box" v-else>
<el-row class="page-height-75 overflow-auto" v-else ref="table">
<el-row v-for="(item,index) in convertTags" :key="item.categoryId" class="padding">
<h3>
<div>
@ -99,7 +99,7 @@
</div>
</el-col>
</el-row>
</el-row>
</el-row>
</section>
</template>
@ -212,7 +212,7 @@
},
/**begin 自定义属性请在下面加 请加备注**/
isPub: '0',
editVisible:false,
editVisible:false,
/**end 自定义属性请在上面加 请加备注**/
}
}, //end data
@ -650,7 +650,7 @@
//
},
mounted() {
this.$nextTick(() => {
this.$nextTick(() => {
this.getTags();
});
}
@ -748,10 +748,5 @@
transform: rotate(360deg);
box-shadow: 0px 0px 10px #fff;
}
}
.max-height-box{
max-height: 600px;
overflow-y: auto;
overflow-x: hidden;
}
}
</style>

11
src/views/xm/core/skill/skillMng.vue

@ -42,7 +42,7 @@
</el-col>
</el-row>
</el-row>
<el-row class="app-container max-height-box" v-if="editVisible==false">
<el-row class="app-container page-height-80 overflow-auto" v-if="editVisible==false">
<el-row v-for="(item,index) in convertSkills" :key="item.categoryId" class="padding">
<h3>
<div>
@ -61,7 +61,7 @@
</el-col>
</el-row>
</el-row>
<el-row class="app-container max-height-box" v-else>
<el-row class="app-container page-height-80 overflow-auto" v-else>
<el-row v-for="(item,index) in convertSkills" :key="item.categoryId" class="padding">
<h3>
<div>
@ -567,10 +567,5 @@ export default {
transform: rotate(360deg);
box-shadow: 0px 0px 10px #fff;
}
}
.max-height-box{
max-height: 600px;
overflow-y: auto;
overflow-x: hidden;
}
}
</style>

45
src/views/xm/core/xmProjectGroup/XmProjectGroupSelect.vue

@ -1,28 +1,23 @@
<template>
<section class="page-container padding border">
<el-row class="padding">
<el-col :span="8">
<el-button type="primary" @click="userConfirm" icon="el-icon-finished">确认选择用户</el-button>
<section class="border padding-left">
<el-row class="padding-top">
<el-col :span="6">
<el-button type="primary" @click="userConfirm" icon="el-icon-finished">确认选择</el-button>
</el-col>
<el-col :span="8" class="hidden-sm-and-down">
<el-tooltip content="黄色表示选中"><span class="addXmProjectGroupFormworkSquare"></span></el-tooltip>
<el-button @click="selectProjectVisible=true">选择项目团队</el-button>
{{this.filters.selProject?"当前项目:":""}}<el-tag type="primary" v-if="this.filters.selProject" closable @close="filters.selProject=null">{{this.filters.selProject.name}}</el-tag>
<el-tag v-else type="warning">未选择项目</el-tag>
</el-col>
<el-col :span="8" class="hidden-sm-and-down">
<el-button @click="selectProductVisible=true">选择产品团队</el-button>
{{this.filters.xmProduct?"当前产品:":""}}<el-tag type="primary" v-if="this.filters.xmProduct&&this.filters.xmProduct.id" @close="filters.xmProduct=null">{{this.filters.xmProduct.productName}}</el-tag>
<el-tag v-else type="warning">未选择产品</el-tag>
<el-col :span="18" class="hidden-sm-and-down">
<el-tooltip content="黄色表示选中"><span class="addXmProjectGroupFormworkSquare"></span></el-tooltip>
{{this.filters.selProject?"项目:":""}}<el-tag type="primary" @click="selectProjectVisible=true" v-if="this.filters.selProject" closable @close="onProjectClose">{{this.filters.selProject.name}}</el-tag>
<el-tag v-else type="warning" @click="selectProjectVisible=true"> 选择项目</el-tag>
&nbsp;&nbsp;
{{this.filters.xmProduct?"产品:":""}}<el-tag type="primary" @click="selectProductVisible=true" v-if="this.filters.xmProduct&&this.filters.xmProduct.id" closable @close="onProductClose">{{this.filters.xmProduct.productName}}</el-tag>
<el-tag v-else type="warning" @click="selectProductVisible=true">选择产品</el-tag>
</el-col>
</el-row>
<el-row class="page-main " v-loading="load.list">
<el-row v-for="(item,index) in xmProjectGroupFormworkSels" :key="index" class="padding ">
<h4>
<div class="padding-bottom">{{item.groupName + ":"}}
</div>
</h4>
<el-col :span="24" style="margin-left:30px;display:flex;flex-wrap: wrap;">
<el-row class="page-height-70 padding-top" v-loading="load.list">
<el-row v-for="(item,index) in xmProjectGroupFormworkSels" :key="index">
<div class="padding-top"> <font color="#ccc">{{item.groupName + ":"}} </font>
</div>
<el-col :span="24" style="margin-left:30px;display:flex;flex-wrap: wrap;font-size:12px;padding-top:5px;">
<div :class="v.isSelected=='1'?'checkCopyButton':'copyButton'" v-for="(v,valueIndex) in item.groupUsers" :key="valueIndex" @click="toggleSelected(index,valueIndex)">
{{v.username}}
</div>
@ -188,6 +183,14 @@ import XmProductSelect from '../xmProduct/XmProductSelect.vue';
this.selectProductVisible=false;
this.getGroups();
},
onProjectClose(){
this.filters.selProject=null
this.getGroups();
},
onProductClose(){
this.filters.xmProduct=null
this.getGroups();
}
/**end 自定义函数请在上面加**/
}, //end methods

2
src/views/xm/core/xmTask/XmTaskAdd.vue

@ -183,7 +183,7 @@
<el-drawer append-to-body title="选择负责人" :visible.sync="groupUserSelectVisible" size="80%" :close-on-click-modal="false">
<xm-project-group-select :visible="groupUserSelectVisible" :sel-project="xmProject" :isSelectSingleUser="1" @user-confirm="groupUserSelectConfirm"></xm-project-group-select>
</el-drawer>
<el-drawer append-to-body title="新增技能" :visible.sync="skillVisible" size="50%" :close-on-click-modal="false">
<el-drawer append-to-body title="新增技能" :visible.sync="skillVisible" size="60%" :close-on-click-modal="false">
<skill-mng :task-skills="taskSkills" :jump="true" @select-confirm="onTaskSkillsSelected"></skill-mng>
</el-drawer>

16
src/views/xm/core/xmTask/XmTaskEdit.vue

@ -185,33 +185,33 @@
<!-- <el-drawer append-to-body :title="'技能要求'" :visible.sync="skillVisible" size="80%" append-to-body :close-on-click-modal="false">
<xm-skill-mng :visible="skillVisible" :task-id="editForm.id" @cancel="skillVisible=false" @getSkill="getSkill"></xm-skill-mng>
</el-drawer> -->
<el-drawer append-to-body title="选择负责人" :visible.sync="groupUserSelectVisible" size="80%" :close-on-click-modal="false">
<el-drawer append-to-body title="选择负责人" :visible.sync="groupUserSelectVisible" size="60%" :close-on-click-modal="false">
<xm-project-group-select :visible="groupUserSelectVisible" :sel-project="xmProject" :isSelectSingleUser="1" @user-confirm="groupUserSelectConfirm"></xm-project-group-select>
</el-drawer>
<el-drawer append-to-body title="新增技能" :visible.sync="skillVisible" size="60%" :close-on-click-modal="false">
<el-drawer append-to-body title="新增技能" :visible.sync="skillVisible" size="60%" :close-on-click-modal="false">
<skill-mng :task-skills="taskSkills" :jump="true" @select-confirm="onTaskSkillsSelected"></skill-mng>
</el-drawer>
<el-drawer append-to-body title="需求选择" :visible.sync="menuVisible" size="80%" :close-on-click-modal="false">
<el-drawer append-to-body title="需求选择" :visible.sync="menuVisible" size="80%" :close-on-click-modal="false">
<xm-menu-select :is-select-menu="true" @selected="onMenuSelected" :sel-project="xmProject"></xm-menu-select>
</el-drawer>
<el-drawer title="选中任务" :visible.sync="selectTaskVisible" size="80%" append-to-body :close-on-click-modal="false">
<el-drawer title="选中任务" :visible.sync="selectTaskVisible" size="80%" append-to-body :close-on-click-modal="false">
<xm-task-list :sel-project="xmProject" @task-selected="onSelectedTask"></xm-task-list>
</el-drawer>
<el-drawer :title="'任务'+editForm.name+'的执行人'" :visible.sync="execUserVisible" fullscreen size="80%" append-to-body :close-on-click-modal="false">
<el-drawer :title="'任务'+editForm.name+'的执行人'" :visible.sync="execUserVisible" fullscreen size="60%" append-to-body :close-on-click-modal="false">
<xm-execuser-mng :visible="execUserVisible" :xm-task="editForm" @after-add-submit="afterAddExecSubmit" @after-edit-submit="afterEditExecSubmit" @after-delete-submit="afterEditExecSubmit" ref="execuserMng"></xm-execuser-mng>
</el-drawer>
<el-drawer append-to-body title="需求明细" :visible.sync="menuDetailVisible" size="80%" :close-on-click-modal="false">
<el-drawer append-to-body title="需求明细" :visible.sync="menuDetailVisible" size="80%" :close-on-click-modal="false">
<xm-menu-rich-detail :visible="menuDetailVisible" :reload="true" :xm-menu="{menuId:editForm.menuId,menuName:editForm.menuName}" ></xm-menu-rich-detail>
</el-drawer>
<el-dialog append-to-body title="标签" :visible.sync="tagSelectVisible" class="dialog-body" width="60%">
<el-drawer append-to-body title="标签" :visible.sync="tagSelectVisible" size="60%">
<tag-mng :tagIds="editForm.tagIds?editForm.tagIds.split(','):[]" :jump="true" @select-confirm="onTagSelected">
</tag-mng>
</el-dialog>
</el-drawer>
</section>
</template>

Loading…
Cancel
Save