Browse Source

优化

master
陈裕财 3 years ago
parent
commit
2576d7018d
  1. 2
      src/views/xm/core/xmFunc/XmFuncSelect.vue
  2. 4
      src/views/xm/core/xmMenu/XmEpicFeatures.vue
  3. 2
      src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
  4. 19
      src/views/xm/core/xmTask/XmPhase.vue
  5. 5
      src/views/xm/core/xmTask/XmPhaseSelect.vue
  6. 2
      src/views/xm/core/xmTestPlan/XmTestPlanMng.vue

2
src/views/xm/core/xmFunc/XmFuncSelect.vue

@ -17,7 +17,7 @@
<span> {{scope.row.name}}</span> <span> {{scope.row.name}}</span>
<div class="tool-bar"> <div class="tool-bar">
<el-popover :open-delay="500"
<el-popover :open-delay=500
placement="top-start" placement="top-start"
title="增删改" title="增删改"
width="400" width="400"

4
src/views/xm/core/xmMenu/XmEpicFeatures.vue

@ -79,7 +79,7 @@
</div> </div>
</el-row> </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"
> >
@ -110,7 +110,7 @@
<el-popover class="tool-bar" v-if="!disabledMng" @click.stop <el-popover class="tool-bar" v-if="!disabledMng" @click.stop
placement="top" placement="top"
width="100" width="100"
open-delay="500"
:open-delay=500
trigger="hover"> trigger="hover">
<el-button type="primary" style="margin-left:0px;margin-bottom: 10px;" v-if=" scope.row.dclass==='1' " @click.stop="showSubAdd( scope.row,scope.$index)" icon="el-icon-plus" title="新建特性" > 新建特性 </el-button> <el-button type="primary" style="margin-left:0px;margin-bottom: 10px;" v-if=" scope.row.dclass==='1' " @click.stop="showSubAdd( scope.row,scope.$index)" icon="el-icon-plus" title="新建特性" > 新建特性 </el-button>

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

@ -8,7 +8,7 @@
<el-button v-if="showSelect!==false && multi===true" type="primary" @click="selectConfirm()">确认选择</el-button> <el-button v-if="showSelect!==false && multi===true" type="primary" @click="selectConfirm()">确认选择</el-button>
</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">
<template v-if="showSelect!==false && multi===true"> <template v-if="showSelect!==false && multi===true">
<el-table-column label="" type="selection" width="60" > <el-table-column label="" type="selection" width="60" >
</el-table-column> </el-table-column>

19
src/views/xm/core/xmTask/XmPhase.vue

@ -99,7 +99,7 @@
</el-row> </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"
:data="tasksTreeData" :data="tasksTreeData"
@sort-change="sortChange" @sort-change="sortChange"
@ -148,11 +148,9 @@
</span> </span>
<span> {{ scope.row.name }} <span> {{ scope.row.name }}
</span> </span>
<div class="tool-bar" @click.stop>
<el-popover
<el-popover class="tool-bar" @click.stop
placement="top-start" placement="top-start"
open-delay="500"
title="创建、修改计划"
:open-delay=500
trigger="hover" trigger="hover"
> >
<el-row> <el-row>
@ -181,18 +179,15 @@
<el-button @click.stop="showEdit( scope.row,scope.$index)" icon="el-icon-edit" title="编辑" > 编辑计划</el-button> <el-button @click.stop="showEdit( scope.row,scope.$index)" icon="el-icon-edit" title="编辑" > 编辑计划</el-button>
</el-row> </el-row>
<el-row>
<el-button v-if="editForm && editForm.id==scope.row.id" @click.stop="unselectRow()" icon="el-icon-close" title="编辑" > 取消选中状态状态</el-button>
</el-row>
<el-button slot="reference" icon="el-icon-setting" title="新建\修改计划" circle plain > </el-button>
<el-button type="text" slot="reference" icon="el-icon-setting" size="mini" circle plain></el-button>
</el-popover> </el-popover>
</div>
<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>
<el-tag style="float: right;" class="hidden-md-and-down" v-for="(item,index) in formatDictsWithClass(dicts,'taskState',scope.row.taskState)" :key="index" :type="item.className">{{item.name}}</el-tag> <el-tag style="float: right;" class="hidden-md-and-down" v-for="(item,index) in formatDictsWithClass(dicts,'taskState',scope.row.taskState)" :key="index" :type="item.className">{{item.name}}</el-tag>
<el-link <el-link
style="border-radius: 30px; float: right;"
style="float: right;line-height: 24px;height: 24px;"
:type="scope.row.rate >= 100 ? 'success' : 'warning'" :type="scope.row.rate >= 100 ? 'success' : 'warning'"
@click.stop="calcProgress(scope.row)" @click.stop="calcProgress(scope.row)"
class="el-icon-refresh" class="el-icon-refresh"

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

@ -7,7 +7,7 @@
</el-row> </el-row>
<el-row class="padding-top"> <el-row class="padding-top">
<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"
:data="tasksTreeData" :data="tasksTreeData"
@sort-change="sortChange" @sort-change="sortChange"
@ -40,7 +40,7 @@
min-width="300" show-overflow-tooltip min-width="300" show-overflow-tooltip
> >
<template slot="header">计划名称 &nbsp;<el-button type="text" @click="unselectRow()">取消选中状态</el-button></template>
<template slot="header">计划名称</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,6 +48,7 @@
<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>

2
src/views/xm/core/xmTestPlan/XmTestPlanMng.vue

@ -54,7 +54,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="totalCases" label="进度" min-width="120" show-overflow-tooltip> <el-table-column prop="totalCases" label="进度" min-width="120" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<el-tooltip :open-delay="300" :content="'总用例数:'+scope.row.totalCases+' 成功:'+scope.row.okCases +' 失败:'+scope.row.errCases+' 忽略:'+scope.row.igCases+' 阻塞:'+scope.row.blCases">
<el-tooltip open-delay=300 :content="'总用例数:'+scope.row.totalCases+' 成功:'+scope.row.okCases +' 失败:'+scope.row.errCases+' 忽略:'+scope.row.igCases+' 阻塞:'+scope.row.blCases">
<el-progress :stroke-width="22" :text-inside="true" :status="scope.row.totalCases>0 && scope.row.errCases<=0 ?'success':'exception'" :percentage="scope.row.totalCases>0?parseInt((parseInt(scope.row.okCases)+parseInt(scope.row.igCases)+parseInt(scope.row.errCases)+parseInt(scope.row.blCases))*100/parseInt(scope.row.totalCases)):0"></el-progress> <el-progress :stroke-width="22" :text-inside="true" :status="scope.row.totalCases>0 && scope.row.errCases<=0 ?'success':'exception'" :percentage="scope.row.totalCases>0?parseInt((parseInt(scope.row.okCases)+parseInt(scope.row.igCases)+parseInt(scope.row.errCases)+parseInt(scope.row.blCases))*100/parseInt(scope.row.totalCases)):0"></el-progress>
</el-tooltip> </el-tooltip>
</template> </template>

Loading…
Cancel
Save