Browse Source

优化

master
陈裕财 3 years ago
parent
commit
c3c6f39f2a
  1. 5
      src/styles/mdp.scss
  2. 6
      src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
  3. 34
      src/views/xm/core/xmTask/XmPhaseSelect.vue

5
src/styles/mdp.scss

@ -335,9 +335,12 @@ table tr.hover-row{
.el-dialog__header{ .el-dialog__header{
padding: 20px !important; padding: 20px !important;
} }
.el-dialog__footer{
padding: 20px !important;
}
.el-dialog__body{ .el-dialog__body{
padding-top: 0px !important; padding-top: 0px !important;
padding-bottom: 10px !important;
padding-bottom: 20px !important;
padding-left: 20px !important; padding-left: 20px !important;
padding-right: 20px !important; padding-right: 20px !important;
} }

6
src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue

@ -6,7 +6,7 @@
<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-else v-model="filters.key" placeholder="名称模糊查询" clearable></el-input> <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;" 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> <el-button style="margin-left:5px;" v-if="showSelect!==false && multi===true" type="primary" @click="selectConfirm()">确认选择</el-button>
</div> </div>
</el-row> </el-row>
@ -31,7 +31,6 @@
<i class="el-icon-document"></i> <i class="el-icon-document"></i>
</div> </div>
<span class="hidden-md-and-down">{{scope.row.seqNo}} &nbsp;</span><span>{{scope.row.menuName}} </span> <span class="hidden-md-and-down">{{scope.row.seqNo}} &nbsp;</span><span>{{scope.row.menuName}} </span>
<el-button type="text" size="mini" circle plain v-if="editForm&&editForm.menuId==scope.row.menuId" @click.stop="unselectRow()" title="取消选中状态" icon="el-icon-circle-close"></el-button>
<span style="float:right;" <span style="float:right;"
:style="{borderRadius: '30px',color:scope.row.finishRate >= 100 ? 'green' : 'blue'}" :style="{borderRadius: '30px',color:scope.row.finishRate >= 100 ? 'green' : 'blue'}"
@ -41,7 +40,8 @@
</template> </template>
</el-table-column> </el-table-column>
<template v-if="showSelect!==false && multi!==true"> <template v-if="showSelect!==false && multi!==true">
<el-table-column label="操作" width="100" >
<el-table-column label="操作" width="100"
align="right" >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button @click="select( scope.row,scope.$index)" title="选择" type="primary"> 选择</el-button> <el-button @click="select( scope.row,scope.$index)" title="选择" type="primary"> 选择</el-button>
</template> </template>

34
src/views/xm/core/xmTask/XmPhaseSelect.vue

@ -1,13 +1,14 @@
<template> <template>
<section class="padding">
<section>
<el-row> <el-row>
<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:150px;" v-model="filters.key" placeholder="名称模糊查询" clearable></el-input>
<el-button icon="el-icon-search" @click="searchXmTasks()" type="primary"></el-button>
<el-input v-else v-model="filters.key" placeholder="名称模糊查询" clearable></el-input>
<el-button style="margin-left:10px;" icon="el-icon-search" @click="searchXmTasks()">查询</el-button>
</div>
</el-row> </el-row>
<el-row class="padding-top">
<el-table class="task-table" :row-style="{height:'46px'}"
<el-table class="task-table"
element-loading-text="努力加载中" element-loading-spinner="el-icon-loading" element-loading-text="努力加载中" element-loading-spinner="el-icon-loading"
:data="tasksTreeData" :data="tasksTreeData"
@sort-change="sortChange" @sort-change="sortChange"
@ -25,13 +26,6 @@
row-key="id" row-key="id"
ref="table" ref="table"
> >
<el-table-column
label="全选"
type="selection"
width="50"
fixed="left"
>
</el-table-column>
<el-table-column <el-table-column
prop="name" prop="name"
class-name="title" class-name="title"
@ -40,7 +34,16 @@
min-width="300" show-overflow-tooltip min-width="300" show-overflow-tooltip
> >
<template slot="header">计划名称</template>
<template slot="header" slot-scope="scope">
<div style="display:flex;">
<div style="width:50%;text-align: left;line-height: 32px;">计划名称</div>
<div style="line-height: 32px;width:50%;display: flex;justify-content: right;">
<el-input v-if="!selProject||!selProject.id" v-model="filters.key" size="mini" style="margin-left:5px;" placeholder="名称模糊查询" clearable></el-input>
</div>
</div>
</template>
<template slot-scope="scope"> <template slot-scope="scope">
<div class="icon" :style="{backgroundColor: scope.row.ntype==='1'?'#E6A23C':'#409EFF'}"> <div class="icon" :style="{backgroundColor: scope.row.ntype==='1'?'#E6A23C':'#409EFF'}">
<i :class="scope.row.ntype==='1'?'el-icon-time':'el-icon-s-operation'" ></i> <i :class="scope.row.ntype==='1'?'el-icon-time':'el-icon-s-operation'" ></i>
@ -48,7 +51,6 @@
<span> <span>
{{ scope.row.sortLevel }}&nbsp; {{ scope.row.name }} {{ scope.row.sortLevel }}&nbsp; {{ scope.row.name }}
</span> </span>
<el-button type="text" size="mini" circle plain v-if="editForm&&editForm.id==scope.row.id" @click.stop="unselectRow()" title="取消选中状态" icon="el-icon-circle-close"></el-button>
</template> </template>
</el-table-column> </el-table-column>
@ -67,6 +69,7 @@
<el-table-column <el-table-column
label="操作" label="操作"
width="100" width="100"
align="right"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<div> <div>
@ -77,7 +80,7 @@
</el-table> </el-table>
</el-row>
<el-row>
<el-pagination <el-pagination
ref="pagination" ref="pagination"
layout="total, sizes, prev, pager, next" layout="total, sizes, prev, pager, next"
@ -89,6 +92,7 @@
:total="pageInfo.total" :total="pageInfo.total"
style="float: right; margin-top: 10px;" style="float: right; margin-top: 10px;"
></el-pagination> ></el-pagination>
</el-row>
</section> </section>
</template> </template>

Loading…
Cancel
Save