end7less
/
program_xm_vue
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

优化

master
陈裕财 3 years ago
parent
f379539e59
commit
e37b39d5f1
5 changed files with 112 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/styles/mdp.scss
  2. 2
      src/views/xm/core/components/XmProjectSelect.vue
  3. 56
      src/views/xm/core/xmMenu/XmEpicFeatures.vue
  4. 11
      src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
  5. 57
      src/views/xm/core/xmTask/XmPhase.vue

2
src/styles/mdp.scss
View File

@ -309,7 +309,7 @@ table tr.hover-row{
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;
white-space: nowrap; white-space: nowrap;
max-width:20vw;
max-width:15vw;
} }
/** /**
*解决表格固定列无法滚动问题 *解决表格固定列无法滚动问题

2
src/views/xm/core/components/XmProjectSelect.vue
View File

@ -200,7 +200,7 @@
}} }}
</div> </div>
</el-link> </el-link>
<el-button type="text" size="mini" title="取消选中状态" circle plain v-if="editForm&&editForm.id" icon="el-icon-circle-close" @click.stop="clearSelect"></el-button>&nbsp;
<el-button type="text" size="mini" title="取消选中状态" circle plain v-if="editForm&&editForm.id" icon="el-icon-circle-close" @click.stop="clearSelect"></el-button>
</slot> </slot>
</span> </span>
</slot> </slot>

56
src/views/xm/core/xmMenu/XmEpicFeatures.vue
View File

@ -1,13 +1,12 @@
<template> <template>
<section class="padding"> <section class="padding">
<el-row>
<div style="display:flex;">
<el-row v-show="!batchVisible">
<div style="display:flex;justify-content: space-between;">
<xm-product-select v-if=" !xmProduct || !xmProduct.id" ref="xmProductSelect1" style="display:inline;" :auto-select="true" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected" @clear="onProductClearSelect" ></xm-product-select> <xm-product-select v-if=" !xmProduct || !xmProduct.id" ref="xmProductSelect1" style="display:inline;" :auto-select="true" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected" @clear="onProductClearSelect" ></xm-product-select>
<el-input v-else v-model="filters.key" style="width:50%;" placeholder="名称模糊查询" clearable></el-input>
&nbsp;&nbsp;
<span style="margin-left: auto;">
<el-input v-else v-model="filters.key" placeholder="名称模糊查询" clearable></el-input>
<span style="display:flex;">
<el-popover <el-popover
style="margin-left:5px;"
placement="top-start" placement="top-start"
width="250" width="250"
trigger="click" > trigger="click" >
@ -38,9 +37,11 @@
<el-button @click="showImportFromMenuTemplate()" icon="el-icon-upload2">由模板快速导入需求</el-button> <el-button @click="showImportFromMenuTemplate()" icon="el-icon-upload2">由模板快速导入需求</el-button>
</el-row> </el-row>
</el-row> </el-row>
<el-button type="primary" v-if="!disabledMng" round slot="reference" icon="el-icon-plus"></el-button>
<el-button type="primary" v-if="!disabledMng" circle plain slot="reference" icon="el-icon-plus"></el-button>
</el-popover> </el-popover>
<el-popover <el-popover
style="margin-left:5px;"
placement="top-start" placement="top-start"
title="更多操作" title="更多操作"
width="400" width="400"
@ -73,26 +74,43 @@
<el-row> <el-row>
<el-button type="primary" @click="searchXmMenus" icon="el-icon-search" title="查询" style="float:right;">查询</el-button> <el-button type="primary" @click="searchXmMenus" icon="el-icon-search" title="查询" style="float:right;">查询</el-button>
</el-row> </el-row>
<el-button slot="reference" @click="moreVisible=!moreVisible" icon="el-icon-more"></el-button>
<el-button slot="reference" @click="moreVisible=!moreVisible" icon="el-icon-more" circle plain></el-button>
</el-popover> </el-popover>
</span> </span>
</div> </div>
</el-row> </el-row>
<el-row v-show="batchVisible">
<div style="display:flex;">
<el-input v-if=" xmProduct && xmProduct.id" v-model="filters.key" placeholder="名称模糊查询" clearable></el-input>
<el-button type="danger"
style="margin-left:5px;"
@click="batchDel"
v-loading="load.del"
icon="el-icon-delete"
title="批量删除" v-if="!disabledMng"
>删除</el-button>
<el-button type="primary" @click="showParentMenu" icon="el-icon-top" title="更换上级">更换上级</el-button>
</div>
</el-row>
<el-row > <el-row >
<el-table ref="table" :row-style="{height:'46px'}" :cell-style="cellStyleCalc" :expand-row-keys="expandRowKeysCpd" :header-cell-style="cellStyleCalc" stripe fit border :height="maxTableHeight" :data="xmMenusTreeData" current-row-key="menuId" row-key="menuId" :tree-props="{children: 'children'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick" <el-table ref="table" :row-style="{height:'46px'}" :cell-style="cellStyleCalc" :expand-row-keys="expandRowKeysCpd" :header-cell-style="cellStyleCalc" stripe fit border :height="maxTableHeight" :data="xmMenusTreeData" current-row-key="menuId" row-key="menuId" :tree-props="{children: 'children'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick"
element-loading-text="努力加载中" element-loading-text="努力加载中"
element-loading-spinner="el-icon-loading" element-loading-spinner="el-icon-loading"
> >
<template v-if="!disabledMng">
<template v-if="batchVisible">
<el-table-column sortable type="selection" width="40"></el-table-column> <el-table-column sortable type="selection" width="40"></el-table-column>
</template> </template>
<el-table-column prop="menuName" label="史诗、特性名称" min-width="150" >
<template slot="header">
<el-table-column prop="menuName" label="史诗特性" min-width="150" >
<template slot="header" slot-scope="scope">
<div style="display:flex;"> <div style="display:flex;">
<div style="text-align: center;line-height: 32px;" title="史诗特性名称">史诗、特性</div>
<el-input v-if=" !xmProduct || !xmProduct.id" v-model="filters.key" style="width:50%;margin-left: auto;" placeholder="名称模糊查询" clearable></el-input>
<div style="width:40%;text-align: left;line-height: 32px;" title="史诗特性名称">史诗、特性
</div>
<div style="line-height: 32px;display:flex;justify-content: right;width:60%;">
<el-checkbox v-if="!disabledMng" title="您可以批量删除、批量更换上级等操作" v-model="batchVisible"><span style="color:#C0C4CC;">批量</span></el-checkbox>
<el-input size="mini" v-if=" !xmProduct || !xmProduct.id" v-model="filters.key" placeholder="名称模糊查询" clearable></el-input>
</div>
</div> </div>
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
@ -200,6 +218,7 @@
}, },
data() { data() {
return { return {
batchVisible:false,
columnsConfig:[/**{label:'',property:'',isShow:true} */], columnsConfig:[/**{label:'',property:'',isShow:true} */],
filters: { filters: {
key: '', key: '',
@ -416,6 +435,10 @@
}, },
//批量删除xmMenu //批量删除xmMenu
batchDel: function () { batchDel: function () {
if(!this.batchVisible){
this.$notify.warning("请先开启【批量】操作模式")
return;
}
if(this.sels.length==0){ if(this.sels.length==0){
this.$notify({position:'bottom-left',showClose:true,message: "请先选择要删除的需求", type: 'warning'}); this.$notify({position:'bottom-left',showClose:true,message: "请先选择要删除的需求", type: 'warning'});
return; return;
@ -589,6 +612,11 @@
}).catch( err => this.load.edit=false ); }).catch( err => this.load.edit=false );
}, },
showParentMenu(){ showParentMenu(){
if(!this.batchVisible){
this.$notify.warning("请先开启【批量】操作模式")
return;
}
if(this.filters.product && this.filters.product.id){ if(this.filters.product && this.filters.product.id){
if(this.sels.length==0){ if(this.sels.length==0){
this.$notify({position:'bottom-left',showClose:true,message:'请先选择一个或者多个需求',type:'warning'}) this.$notify({position:'bottom-left',showClose:true,message:'请先选择一个或者多个需求',type:'warning'})

11
src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
View File

@ -1,11 +1,14 @@
<template> <template>
<section class="padding"> <section class="padding">
<el-row> <el-row>
<div style="display:flex;">
<xm-product-select ref="xmProductSelect1" style="display:inline;" v-if="!xmProduct || !xmProduct.id" :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected" :iterationId="xmIteration?xmIteration.id:null" @clear="onProductClearSelect"></xm-product-select> <xm-product-select ref="xmProductSelect1" style="display:inline;" v-if="!xmProduct || !xmProduct.id" :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected" :iterationId="xmIteration?xmIteration.id:null" @clear="onProductClearSelect"></xm-product-select>
<el-input v-if="xmProduct && xmProduct.id" style="width:10em;" v-model="filters.key" placeholder="名称模糊查询" clearable></el-input>
<el-button icon="el-icon-search" @click="searchXmMenus()"></el-button>
<el-button v-if="showSelect!==false && multi===true" type="primary" @click="selectConfirm()">确认选择</el-button>
<el-input v-else v-model="filters.key" placeholder="名称模糊查询" clearable></el-input>
<el-button style="margin-left:5px;" icon="el-icon-search" @click="searchXmMenus()"></el-button>
<el-button style="margin-left:5px;" v-if="showSelect!==false && multi===true" type="primary" @click="selectConfirm()">确认选择</el-button>
</div>
</el-row> </el-row>
<el-row> <el-row>
<el-table element-loading-text="努力加载中" :row-style="{height:'46px'}" element-loading-spinner="el-icon-loading" stripe fit border ref="table" :height="maxTableHeight" :data="xmMenusTreeData" current-row-key="menuId" row-key="menuId" :tree-props="{children: 'children'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick"> <el-table element-loading-text="努力加载中" :row-style="{height:'46px'}" element-loading-spinner="el-icon-loading" stripe fit border ref="table" :height="maxTableHeight" :data="xmMenusTreeData" current-row-key="menuId" row-key="menuId" :tree-props="{children: 'children'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick">
@ -14,7 +17,7 @@
</el-table-column> </el-table-column>
</template> </template>
<el-table-column prop="menuName" label="史诗、特性名称" min-width="150" > <el-table-column prop="menuName" label="史诗、特性名称" min-width="150" >
<template slot="header">史诗、特性名称
<template slot="header">史诗、特性
<el-input v-if="!xmProduct || !xmProduct.id" style="width:10em;" v-model="filters.key" placeholder="名称模糊查询" clearable></el-input> <el-input v-if="!xmProduct || !xmProduct.id" style="width:10em;" v-model="filters.key" placeholder="名称模糊查询" clearable></el-input>
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">

57
src/views/xm/core/xmTask/XmPhase.vue
View File

@ -1,12 +1,12 @@
<template> <template>
<section class="padding"> <section class="padding">
<el-row>
<span>
<el-row v-show="!batchVisible">
<div style="display:flex;justify-content: space-between;">
<xm-project-select style="display:inline;" v-if="!selProject||!selProject.id" :auto-select="isTaskCenter?false:true" :link-iteration-id="xmIteration?xmIteration.id:null" :link-product-id="xmProduct?xmProduct.id:null" @row-click="onProjectRowClick" @clear="onProjectClear" ></xm-project-select> <xm-project-select style="display:inline;" v-if="!selProject||!selProject.id" :auto-select="isTaskCenter?false:true" :link-iteration-id="xmIteration?xmIteration.id:null" :link-product-id="xmProduct?xmProduct.id:null" @row-click="onProjectRowClick" @clear="onProjectClear" ></xm-project-select>
<el-input style="width:50%;" v-else v-model="filters.key" placeholder="名称模糊查询" clearable @keyup.enter.native="searchXmTasks()"></el-input>
<span style="float:right;">
<el-input v-else v-model="filters.key" placeholder="名称模糊查询" clearable @keyup.enter.native="searchXmTasks()"></el-input>
<span style="display:flex;">
<el-popover <el-popover
style="margin-left:5px;"
placement="top-start" placement="top-start"
title="选择创建计划/任务的方式" title="选择创建计划/任务的方式"
width="300" width="300"
@ -50,12 +50,14 @@
<el-button <el-button
slot="reference" slot="reference"
type="primary" type="primary"
round
circle
plain
icon="el-icon-plus" icon="el-icon-plus"
title="新建计划" title="新建计划"
></el-button> ></el-button>
</el-popover> </el-popover>
<el-popover <el-popover
style="margin-left:5px;"
placement="top-start" placement="top-start"
title="更多条件、操作" title="更多条件、操作"
width="400" width="400"
@ -92,12 +94,27 @@
> >
</span> </span>
</el-row> </el-row>
<el-button slot="reference" @click="moreVisible=!moreVisible">更多</el-button>
<el-button slot="reference" @click="moreVisible=!moreVisible" icon="el-icon-more" circle plain></el-button>
</el-popover> </el-popover>
</span> </span>
</span>
</el-row>
</div>
</el-row>
<el-row v-show="batchVisible">
<el-button type="danger"
@click="batchDel"
v-loading="load.del"
icon="el-icon-delete"
title="批量删除"
>删除</el-button
>
<el-button
@click="showParentTaskList"
title="更换任务的上级，实现任务搬家功能"
icon="el-icon-upload2"
v-loading="load.edit"
> 更换上级</el-button>
</el-row>
<el-row> <el-row>
<el-table class="task-table" :row-style="{height:'46px'}" <el-table class="task-table" :row-style="{height:'46px'}"
element-loading-text="努力加载中" element-loading-spinner="el-icon-loading" element-loading-text="努力加载中" element-loading-spinner="el-icon-loading"
@ -117,21 +134,28 @@
row-key="id" row-key="id"
ref="table" ref="table"
> >
<template v-if="batchVisible">
<el-table-column <el-table-column
label="全选" label="全选"
type="selection" type="selection"
width="50" width="50"
> >
</el-table-column> </el-table-column>
</template>
<el-table-column <el-table-column
prop="name" prop="name"
class-name="title" class-name="title"
label="计划名称" label="计划名称"
> >
<template slot="header">
<template slot="header" slot-scope="scope">
<div style="display:flex;"> <div style="display:flex;">
<div style="text-align: center;line-height: 32px;">计划名称</div>
<el-input v-if=" !selProject || !selProject.id" v-model="filters.key" style="width:50%;margin-left: auto;" placeholder="名称模糊查询" clearable></el-input>
<div style="width:40%;text-align: left;line-height: 32px;">计划名称</div>
<div style="line-height: 32px;width:60%;display: flex;justify-content: right;">
<el-checkbox title="您可以批量删除、批量更换上级等操作" v-model="batchVisible"><span style="color:#C0C4CC;">批量</span></el-checkbox>
<el-input v-if="!selProject||!selProject.id" v-model="filters.key" size="mini" style="margin-left:5px;" placeholder="名称模糊查询" clearable></el-input>
</div>
</div> </div>
</template> </template>
<template slot-scope="scope"> <template slot-scope="scope">
@ -390,6 +414,7 @@ export default {
}, },
data() { data() {
return { return {
batchVisible:false,
filters: { filters: {
key: "", key: "",
isMyTask: "0", //0不区分我的，1 时我的任务 isMyTask: "0", //0不区分我的，1 时我的任务
@ -773,6 +798,10 @@ export default {
}, },
//批量删除xmTask //批量删除xmTask
batchDel: function () { batchDel: function () {
if(!this.batchVisible){
this.$notify.warning("请先开启【批量】操作模式")
return;
}
if(this.sels.length==0){ if(this.sels.length==0){
this.$notify.warning("请先选中要删除的记录") this.$notify.warning("请先选中要删除的记录")
return; return;
@ -976,6 +1005,10 @@ export default {
return params; return params;
}, },
showParentTaskList(){ showParentTaskList(){
if(!this.batchVisible){
this.$notify.warning("请先开启【批量】操作模式")
return;
}
if(this.sels.length==0){ if(this.sels.length==0){
this.$notify({position:'bottom-left',showClose:true,message:"请先选择一个或者多个需要更换上级的计划/任务",type:'warning'}) this.$notify({position:'bottom-left',showClose:true,message:"请先选择一个或者多个需要更换上级的计划/任务",type:'warning'})
return; return;

Write Preview
Loading…
Cancel
Save