Browse Source

优化

master
陈裕财 3 years ago
parent
commit
6a323fe3f8
  1. 1
      src/api/xm/core/xmTestPlan.js
  2. 4
      src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
  3. 29
      src/views/xm/core/xmTestPlan/XmTestPlanMng.vue

1
src/api/xm/core/xmTestPlan.js

@ -31,6 +31,7 @@ export const addXmTestPlan = params => { return axios.post(`${base}/xm/core/xmTe
export const editSomeFieldsXmTestPlan = params => { return axios.post(`${base}/xm/core/xmTestPlan/editSomeFields`, params); }; export const editSomeFieldsXmTestPlan = params => { return axios.post(`${base}/xm/core/xmTestPlan/editSomeFields`, params); };
export const calcXmTestPlan = params => { return axios.post(`${base}/xm/core/xmTestPlan/calc`, params); };
/**-------------------------前端mng|add|edit界面公共函数---------------请写在下面----------------------------------------------- */ /**-------------------------前端mng|add|edit界面公共函数---------------请写在下面----------------------------------------------- */
//初始化页面上的字典 //初始化页面上的字典

4
src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue

@ -6,7 +6,7 @@
<el-row> <el-row>
<el-row v-if="activeIndex=='testPlanCase'&& xmTestPlan && xmTestPlan.id"> <el-row v-if="activeIndex=='testPlanCase'&& xmTestPlan && xmTestPlan.id">
<el-row class="border padding-left padding-right"> <el-row class="border padding-left padding-right">
<el-button icon="el-icon-back" @click="activeIndex=testPlan" type="text"></el-button>
<el-button icon="el-icon-back" @click="activeIndex='testPlan'" type="text"></el-button>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
{{xmTestPlan.name}} {{xmTestPlan.name}}
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
@ -20,7 +20,7 @@
<span style="float:right;"> <span style="float:right;">
<span > <span >
<el-tag style="margin-top:5px;" v-for="(item,index) in formatDictsWithClass(dicts,'testPlanStatus',xmTestPlan.status)" :key="index" :type="item.className">{{item.name}}</el-tag> <el-tag style="margin-top:5px;" v-for="(item,index) in formatDictsWithClass(dicts,'testPlanStatus',xmTestPlan.status)" :key="index" :type="item.className">{{item.name}}</el-tag>
<span style="color:#C0C4CC;">&nbsp;通过率&nbsp;</span>{{calcTongGuoRate}}&nbsp;&nbsp;<span style="color:#C0C4CC;">&nbsp;已测&nbsp;</span>{{calcYiCeshiCases}}&nbsp;/&nbsp;{{calcTotalCases}}&nbsp;&nbsp;
<span style="color:#C0C4CC;">&nbsp;通过率&nbsp;</span>{{calcTongGuoRate}}&nbsp;&nbsp;<span style="color:#C0C4CC;">&nbsp;已测/总用例&nbsp;</span>{{calcYiCeshiCases}}&nbsp;/&nbsp;{{calcTotalCases}}&nbsp;&nbsp;
<div style="display:inline-flex"><el-progress style="width:100px;" :stroke-width="22" :text-inside="true" :status="calcYiCeshiCases>0 && xmTestPlan.errCases<=0 ?'success':'exception'" :percentage="calcProgress"></el-progress> <div style="display:inline-flex"><el-progress style="width:100px;" :stroke-width="22" :text-inside="true" :status="calcYiCeshiCases>0 && xmTestPlan.errCases<=0 ?'success':'exception'" :percentage="calcProgress"></el-progress>
</div> </div>
</span> </span>

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

@ -47,12 +47,22 @@
</template> </template>
</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">
<el-tooltip :open-delay="500" :content="'总用例数:'+scope.row.totalCases+' 成功:'+scope.row.okCases +' 失败:'+scope.row.errCases+' 忽略:'+scope.row.igCases+' 阻塞:'+scope.row.blCases">
<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-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>
</el-table-column>
<el-table-column prop="totalCases" label="统计" width="80" show-overflow-tooltip>
<template slot-scope="scope">
<el-tooltip content="点击统计进度"
><el-button
icon="el-icon-video-play"
@click.stop="calcXmTestPlan(scope.row)"
></el-button
></el-tooltip>
</template> </template>
</el-table-column>
</el-table-column>
<el-table-column prop="stime" label="开始时间" width="120" show-overflow-tooltip> <el-table-column prop="stime" label="开始时间" width="120" show-overflow-tooltip>
<template slot-scope="scope"> <template slot-scope="scope">
<span> {{scope.row.stime}} </span> <span> {{scope.row.stime}} </span>
@ -84,7 +94,7 @@
import util from '@/common/js/util';// import util from '@/common/js/util';//
import config from '@/common/config';// import config from '@/common/config';//
import { initDicts,listXmTestPlan, delXmTestPlan, batchDelXmTestPlan,editSomeFieldsXmTestPlan } from '@/api/xm/core/xmTestPlan';
import { initDicts,listXmTestPlan, delXmTestPlan, batchDelXmTestPlan,editSomeFieldsXmTestPlan,calcXmTestPlan } from '@/api/xm/core/xmTestPlan';
import XmTestPlanEdit from './XmTestPlanEdit';// import XmTestPlanEdit from './XmTestPlanEdit';//
import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';// import MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
@ -316,6 +326,15 @@ export default {
}, },
goToTestPlanCase(row){ goToTestPlanCase(row){
this.$emit('select',row);// @row-click="rowClick" this.$emit('select',row);// @row-click="rowClick"
},
calcXmTestPlan(row){
calcXmTestPlan({id:row.id}).then(res=>{
var tips=res.data.tips
this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
if(tips.isOk){
this.searchXmTestPlans();
}
})
} }
},//end methods },//end methods

Loading…
Cancel
Save