From 6a323fe3f85046a68ae20c72bbad8a26e3c9efcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 20 Jan 2023 00:22:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/xm/core/xmTestPlan.js                 |  1 +
 .../xm/core/xmTestPlan/XmTestPlanInfo.vue     |  4 +--
 .../xm/core/xmTestPlan/XmTestPlanMng.vue      | 29 +++++++++++++++----
 3 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/src/api/xm/core/xmTestPlan.js b/src/api/xm/core/xmTestPlan.js
index 958a1686..239b9b36 100644
--- a/src/api/xm/core/xmTestPlan.js
+++ b/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 calcXmTestPlan = params => { return axios.post(`${base}/xm/core/xmTestPlan/calc`, params); };
 
 /**-------------------------前端mng|add|edit界面公共函数---------------请写在下面----------------------------------------------- */
 //初始化页面上的字典
diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue b/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
index 9b7dda08..f834f372 100644
--- a/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
@@ -6,7 +6,7 @@
 		<el-row>
             <el-row v-if="activeIndex=='testPlanCase'&& xmTestPlan && xmTestPlan.id">
                 <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>
                      {{xmTestPlan.name}}
                      <el-divider direction="vertical"></el-divider>
@@ -20,7 +20,7 @@
                      <span style="float:right;">
                         <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> 
-                          <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>
                         </span>
diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue b/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
index 4450b2d9..a456d1c3 100644
--- a/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
@@ -47,12 +47,22 @@
                     </template>
 				</el-table-column> 
 				<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-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>
-				</el-table-column>   
+				</el-table-column>    
 				<el-table-column prop="stime" label="开始时间"  width="120" show-overflow-tooltip>
 				    <template slot-scope="scope">
 				        <span> {{scope.row.stime}} </span>
@@ -84,7 +94,7 @@
 
 import util from '@/common/js/util';//全局公共库
 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  MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修改界面
 import { mapGetters } from 'vuex'
@@ -316,6 +326,15 @@ export default {
         },
         goToTestPlanCase(row){ 
             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