From bcf2973265776ee413e6c89f7d8e11eb61e18fb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 20 Feb 2023 09:25:07 +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/views/xm/core/xmTestCase/XmTestCaseEdit.vue     |  2 +-
 src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue     |  4 ++--
 .../xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue    | 13 +++++++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
index 7d9fd78b..36ff3f6a 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseEdit.vue
@@ -23,7 +23,7 @@
 						</el-form-item> 
 
 						<el-form-item label="测试方式" prop="testType">
-							<mdp-select-dict placeholder="测试方式" clearable :dict="dicts['testType']" v-model="editForm.testType" effect="dark" @change="editSomeFields(editForm,'testType',$event)"></mdp-select-dict> 
+							<mdp-select-dict-tag placeholder="测试方式" clearable :dict="dicts['testType']" v-model="editForm.testType" effect="dark" @change="editSomeFields(editForm,'testType',$event)"></mdp-select-dict-tag> 
 						</el-form-item>  
 						<el-form-item label="版本号" prop="verNum">
 							<el-input v-model="editForm.verNum" placeholder="版本号" :maxlength="50" @change="editSomeFields(editForm,'verNum',$event)"></el-input>
diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue b/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
index a479fcd5..f9f0d735 100644
--- a/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
@@ -18,7 +18,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>
@@ -97,7 +97,7 @@ export default {
                 return 0;
             }
             var tongGuoCases=parseInt(this.xmTestPlan.okCases?this.xmTestPlan.okCases:0)
-            var totalCases=parseInt(this.xmTestPlan.totalCases?this.xmTestPlan.totalCases:0)
+            var totalCases=parseInt(this.xmTestPlan.totalCases||0)-parseInt(this.xmTestPlan.toTestCases||0)
             if(tongGuoCases>0){
                 if(totalCases>0){
                    return parseInt( tongGuoCases*100/totalCases)
diff --git a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue
index 1e206a97..e1bf5bf2 100644
--- a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue
+++ b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseMng.vue
@@ -7,9 +7,11 @@
             </el-col>
             <el-col :span="!xmTestCase||!xmTestCase.id?18:24">
                 <el-row>
-                    <el-input v-model="filters.key" style="width: 20%;" placeholder="模糊查询"  clearable></el-input>
-                    <mdp-select-dict style="width:20%;" placeholder="用例状态" clearable :dict="dicts['testCaseStatus']" v-model="filters.caseStatus" effect="dark"></mdp-select-dict> 
-                    <mdp-select-dict style="width:20%;" placeholder="执行结果" clearable :dict="dicts['testStepTcode']" v-model="filters.execStatus" effect="dark"></mdp-select-dict> 
+                    <el-input v-model="filters.key" style="width: 15%;" placeholder="模糊查询"  clearable></el-input>
+                    <mdp-select-dict style="width:15%;" placeholder="用例状态" clearable :dict="dicts['testCaseStatus']" v-model="filters.caseStatus" effect="dark"></mdp-select-dict> 
+                    <mdp-select-dict placeholder="测试方式" style="width:15%;" clearable :dict="dicts['testType']" v-model="filters.execType" effect="dark"></mdp-select-dict> 
+
+                    <mdp-select-dict style="width:15%;" placeholder="执行结果" clearable :dict="dicts['testStepTcode']" v-model="filters.execStatus" effect="dark"></mdp-select-dict> 
 
                     <el-button v-loading="load.list" :disabled="load.list==true" @click="searchXmTestPlanCases" icon="el-icon-search">查询</el-button>
                     <span style="float:right;" v-if="!xmTestCase||!xmTestCase.id">
@@ -138,7 +140,7 @@ export default {
             filters: {
                 key: '',
                 xmFunc:null,
-                
+                execType:'',
                 caseStatus:'',
                 execStatus:''
             },
@@ -227,6 +229,9 @@ export default {
             if(this.filters.execStatus){
                 params.execStatus=this.filters.execStatus
             }
+            if(this.filters.execType){
+                params.execType=this.filters.execType
+            }
             if(this.xmTestCasedb && this.xmTestCasedb.id){
                 params.casedbId=this.xmTestCasedb.id
             }