From 2984c2e1e2a0b7033534b27c8084b1cdf63f2e2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 7 Feb 2023 17:11:12 +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/xmTask/XmPhase.vue                      | 1 -
 src/views/xm/core/xmTask/XmPhaseSelect.vue                | 3 +--
 src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue           | 2 +-
 src/views/xm/core/xmTestPlan/XmTestPlanListForProject.vue | 7 ++++++-
 src/views/xm/core/xmTestPlan/XmTestPlanMng.vue            | 4 ++--
 src/views/xm/core/xmTestPlan/XmTestPlanSelect.vue         | 4 +++-
 src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue          | 2 +-
 7 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue
index 45eb4a02..b56a4f92 100644
--- a/src/views/xm/core/xmTask/XmPhase.vue
+++ b/src/views/xm/core/xmTask/XmPhase.vue
@@ -116,7 +116,6 @@
               :tree-props="{ children: 'children'  }"
               row-key="id"
               ref="table"
-              :row-style="{height:'60px'}"
             >
               <el-table-column
                 label="全选"
diff --git a/src/views/xm/core/xmTask/XmPhaseSelect.vue b/src/views/xm/core/xmTask/XmPhaseSelect.vue
index f7ef60eb..b899cd04 100644
--- a/src/views/xm/core/xmTask/XmPhaseSelect.vue
+++ b/src/views/xm/core/xmTask/XmPhaseSelect.vue
@@ -23,8 +23,7 @@
               :height="tableHeight"
               :tree-props="{ children: 'children'  }"
               row-key="id"
-              ref="table"
-              :row-style="{height:'60px'}"
+              ref="table" 
             >
               <el-table-column
                 label="全选"
diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue b/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
index c1613d75..499a49ca 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=" xmTestPlan && xmTestPlan.id">
                 <el-row class="border padding-left padding-right">
-                     <el-button icon="el-icon-back" @click="goBackToPlanList()" type="text"></el-button>
+                     <el-button icon="el-icon-back" @click="goBackToPlanList()" type="primary" plain></el-button>
                      <el-divider direction="vertical"></el-divider>
                      {{xmTestPlan.name}}
                      <el-divider direction="vertical"></el-divider>
diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanListForProject.vue b/src/views/xm/core/xmTestPlan/XmTestPlanListForProject.vue
index a46144cc..bacac26d 100644
--- a/src/views/xm/core/xmTestPlan/XmTestPlanListForProject.vue
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanListForProject.vue
@@ -16,9 +16,14 @@
 				    <span class="cell-bar"><el-input style="display:inline;" v-model="scope.row.username" placeholder="" @change="editSomeFields(scope.row,'username',$event)" :maxlength="22"></el-input></span>
 				</el-table-column>
 				-->
- 				<el-table-column prop="name" label="计划名称" min-width="250" show-overflow-tooltip>
+ 				<el-table-column prop="name" label="计划名称" min-width="250">
 				    <template slot-scope="scope">
 				        <span>  {{scope.row.name}} </span> 
+                    </template>
+				</el-table-column>  
+ 				<el-table-column prop="projectName" label="项目" min-width="150">
+				    <template slot-scope="scope">
+				        <span>  {{scope.row.projectName}} </span> 
                     </template>
 				</el-table-column>  
 				<el-table-column prop="status" label="状态" width="120" show-overflow-tooltip>
diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue b/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
index b98fa5d5..507cba2a 100644
--- a/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
@@ -22,7 +22,7 @@
 				    <span class="cell-bar"><el-input style="display:inline;" v-model="scope.row.username" placeholder="" @change="editSomeFields(scope.row,'username',$event)" :maxlength="22"></el-input></span>
 				</el-table-column>
 				-->
- 				<el-table-column prop="name" label="计划名称" min-width="250" show-overflow-tooltip>
+ 				<el-table-column prop="name" label="计划名称" min-width="250">
 				    <template slot-scope="scope">
 				        <span> <el-link @click="goToTestPlanCase(scope.row)"> {{scope.row.name}}</el-link> </span>
                         <span  class="tool-bar"> 
@@ -30,7 +30,7 @@
                          </span>
                     </template>
 				</el-table-column>  
-                <el-table-column prop="projectName" label="项目" min-width="120" show-overflow-tooltip> 
+                <el-table-column prop="projectName" label="项目" min-width="120"> 
 				</el-table-column> 
                 <el-table-column prop="cusername" label="负责人" min-width="120" show-overflow-tooltip>
 				    <template slot-scope="scope"> 
diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanSelect.vue b/src/views/xm/core/xmTestPlan/XmTestPlanSelect.vue
index 74225fd2..efd4a79d 100644
--- a/src/views/xm/core/xmTestPlan/XmTestPlanSelect.vue
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanSelect.vue
@@ -17,11 +17,13 @@
 				    <span class="cell-bar"><el-input style="display:inline;" v-model="scope.row.username" placeholder="" @change="editSomeFields(scope.row,'username',$event)" :maxlength="22"></el-input></span>
 				</el-table-column>
 				-->
- 				<el-table-column prop="name" label="计划名称" min-width="250" show-overflow-tooltip>
+ 				<el-table-column prop="name" label="计划名称" min-width="250">
 				    <template slot-scope="scope">
 				        <span>  {{scope.row.name}} </span> 
                     </template>
 				</el-table-column>  
+                <el-table-column prop="projectName" label="项目" min-width="120"> 
+				</el-table-column> 
 				<el-table-column prop="status" label="状态" width="120" show-overflow-tooltip>
 				    <template slot-scope="scope"> 
                         <mdp-select-dict-tag :dict="dicts['testPlanStatus']" v-model="scope.row.status" effect="dark" :disabled="true"></mdp-select-dict-tag> 
diff --git a/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue b/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue
index 41656cfb..fc3a0cff 100644
--- a/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue
+++ b/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue
@@ -120,7 +120,7 @@
 					return 0
 				}else{   
 					return this.rawDatas.reduce((n, i) => {
-						return (n += i.useTimes);
+						return (n += i.caseNum);
 					}, 0)
 				} 
 			},