From 240b0d3c1e1033adce9dbdfeff74f551d8a8d820 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 5 Feb 2023 18:16:34 +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/rpt/CompsCard.vue                |  2 +-
 src/views/xm/rpt/CompsCardHisDetail.vue       |  4 +-
 .../xm/rpt/branch/branchWorkItemDayList.vue   |  6 +--
 .../xm/rpt/testPlan/testPlanRptOverview.vue   | 38 +++++++++----------
 4 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/src/views/xm/rpt/CompsCard.vue b/src/views/xm/rpt/CompsCard.vue
index f6b19aca..54e89691 100644
--- a/src/views/xm/rpt/CompsCard.vue
+++ b/src/views/xm/rpt/CompsCard.vue
@@ -29,7 +29,7 @@
                     <el-empty description="暂未选择报表，请至少选择一个报表"></el-empty>
                 </div>
                 <div v-else id="printBody" ref="rptBox"> 
-                    <component style="margin-bottom:80px;" v-for="(item,index) in compCfgList" :key="index" :is="item.compId" :xm-test-plan="xmTestPlan" :xm-product="xmProduct" :xm-project="xmProject" :xm-iteration="xmIteration" :xm-test-casedb="xmTestCasedb" :category="category" :cfg="item.cfg" :ref="item.id" @delete="doDelete(item)" :init-group-by="item.initGroupBy" :show-tool-bar="false" :id="item.id" :rpt-data="item.rawDatas" :show-params="paramsVisible"></component>
+                    <component style="margin-bottom:80px;" v-for="(item,index) in compCfgList" :key="index" :is="item.compId" :xm-test-plan="xmTestPlan" :xm-product="xmProduct" :xm-project="xmProject" :xm-iteration="xmIteration" :xm-test-casedb="xmTestCasedb" :category="category" :cfg="item.cfg" :ref="item.id" @delete="doDelete(item)" :init-group-by="item.initGroupBy" :show-tool-bar="false" :id="item.id" :rpt-datas="item.rawDatas" :is-rpt-cfg="isRptCfg" :show-params="paramsVisible"></component>
                          
                 </div>
             </el-row>
diff --git a/src/views/xm/rpt/CompsCardHisDetail.vue b/src/views/xm/rpt/CompsCardHisDetail.vue
index 46763f52..9588a518 100644
--- a/src/views/xm/rpt/CompsCardHisDetail.vue
+++ b/src/views/xm/rpt/CompsCardHisDetail.vue
@@ -20,7 +20,7 @@
                     <el-empty description="暂未选择报表，请至少选择一个报表"></el-empty>
                 </div>
                 <div v-else id="printBody" ref="rptBox"> 
-                    <component style="margin-bottom:80px;" v-for="(item,index) in compCfgList" :key="index" :is="item.compId" :cfg="item" :init-group-by="item.initGroupBy" :show-tool-bar="false" :id="item.id" :rpt-datas="item.rawDatas" :show-params="paramsVisible"></component>  
+                    <component style="margin-bottom:80px;" v-for="(item,index) in compCfgList" :key="index" :is="item.compId" :cfg="item" :init-group-by="item.initGroupBy" :show-tool-bar="false" :id="item.id" :rpt-datas="item.rawDatas" :is-rpt-cfg="false" :show-params="paramsVisible"></component>  
                 </div>
             </el-row>
         </el-col> 
@@ -156,7 +156,7 @@ export default {
         exportToPdf(){
             this.paramsVisible=false
             this.$nextTick(()=>{
-                this.$PDFSave(this.$refs.rptBox, this.rptConfigParamsCpd.name+"-报告");  
+                this.$PDFSave(this.$refs.rptBox, this.xmRptData.rptName);  
             })
             
         }, 
diff --git a/src/views/xm/rpt/branch/branchWorkItemDayList.vue b/src/views/xm/rpt/branch/branchWorkItemDayList.vue
index 395576ed..ae0e2eca 100644
--- a/src/views/xm/rpt/branch/branchWorkItemDayList.vue
+++ b/src/views/xm/rpt/branch/branchWorkItemDayList.vue
@@ -1,7 +1,7 @@
 <template> 
 			<el-row :gutter="5" >
 				<el-col :span="showParams?23:24">  
-					<div class="rpt-box">
+					<el-row class="rpt-box">
 						<el-row v-if="isRptCfg">
 							<el-row class="row-box padding-top">
 								<span class="title">{{title?title:'请输入标题'}}</span><el-input class="input" v-model="title" placeholder="请输入标题"></el-input>
@@ -19,10 +19,10 @@
 								<span class="remark">{{remark}}</span>
 							</el-row>
 						</el-row>
-						<el-row> 
+					</el-row> 
+					<el-row> 
 							<div class="echart-box" :id="this.id"></div> 
 						</el-row>
-					</div>
 				</el-col>
 				
 				<el-col :span="showParams?1:0" v-if="showParams"> 
diff --git a/src/views/xm/rpt/testPlan/testPlanRptOverview.vue b/src/views/xm/rpt/testPlan/testPlanRptOverview.vue
index 45f1d024..9dc94d23 100644
--- a/src/views/xm/rpt/testPlan/testPlanRptOverview.vue
+++ b/src/views/xm/rpt/testPlan/testPlanRptOverview.vue
@@ -1,5 +1,8 @@
 <template>
 	<section  class="padding"> 
+		<el-row class="padding-bottom">
+			<my-input v-model="rawDatas.name" placeholder="计划名称" :maxlength="255" @change="editSomeFields(rawDatas,'name',$event)"></my-input>
+		</el-row>
 		<el-row class="padding-bottom">
 			<span>报告概览</span>
 		</el-row>
@@ -7,7 +10,7 @@
 			<el-row class="box">
 				<el-col :span="6" class="box-red">
 					<div class="box-info">  
-							<div class="num">{{xmTestPlan.totalCases?xmTestPlan.totalCases:'0'}}个</div>
+							<div class="num">{{rawDatas.totalCases?rawDatas.totalCases:'0'}}个</div>
 							<div class="label">用例数</div>   
 					</div>
 				</el-col>
@@ -25,18 +28,13 @@
 				</el-col>
 				<el-col :span="6" class="box-orange">
 					<div class="box-info">  
-							<div class="num">{{xmTestPlan.bugCnt?xmTestPlan.bugCnt:0}}个</div>
+							<div class="num">{{rawDatas.bugCnt?rawDatas.bugCnt:0}}个</div>
 							<div class="label">缺陷数</div>   
 					</div>
 				</el-col>
 			</el-row>
 		<!--编辑界面 XmTestPlan 测试计划--> 
-			<el-form :model="rawDatas"  label-width="120px" :rules="rawDatasRules" ref="rawDatasRef" label-position="left"> 
-				 <el-form-item prop="name" label-width="0px">
-				  <el-row class="padding-bottom">
-					<my-input v-model="rawDatas.name" placeholder="计划名称" :maxlength="255" @change="editSomeFields(rawDatas,'name',$event)"></my-input>
- 				  </el-row>
-				  </el-form-item>
+			<el-form :model="rawDatas"  label-width="120px" :rules="rawDatasRules" ref="rawDatasRef" label-position="left">  
 				<el-row class="padding">
 					<el-col :span="8">
 						<mdp-select-user-xm label="负责人" userid-key="cuserid" username-key="cusername" v-model="rawDatas" @change="editSomeFields(rawDatas,'cuserid',$event)"></mdp-select-user-xm>
@@ -101,27 +99,27 @@ import  MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修
 		computed: {
 		    ...mapGetters([ 'userInfo'  ]),
 			caseFuGaiLv(){
-				if(!this.xmTestPlan.totalCases){
+				if(!this.rawDatas.totalCases){
 					return 0
 				}
-				var okCases=parseInt(this.xmTestPlan.okCases>0?this.xmTestPlan.okCases:0)
-				var errCases=parseInt(this.xmTestPlan.errCases>0?this.xmTestPlan.errCases:0)
-				var igCases=parseInt(this.xmTestPlan.igCases>0?this.xmTestPlan.igCases:0)
-				var blCases=parseInt(this.xmTestPlan.blCases>0?this.xmTestPlan.blCases:0)
+				var okCases=parseInt(this.rawDatas.okCases>0?this.rawDatas.okCases:0)
+				var errCases=parseInt(this.rawDatas.errCases>0?this.rawDatas.errCases:0)
+				var igCases=parseInt(this.rawDatas.igCases>0?this.rawDatas.igCases:0)
+				var blCases=parseInt(this.rawDatas.blCases>0?this.rawDatas.blCases:0)
 				var totalExecs=okCases+errCases+igCases+blCases
-				var rate=parseInt(totalExecs/this.xmTestPlan.totalCases*100)
+				var rate=parseInt(totalExecs/this.rawDatas.totalCases*100)
 				return rate;
 			},
 			caseTongGuoLv(){
-				if(!this.xmTestPlan.totalCases){
+				if(!this.rawDatas.totalCases){
 					return 0
 				}
-				var okCases=parseInt(this.xmTestPlan.okCases>0?this.xmTestPlan.okCases:0)
-				var errCases=parseInt(this.xmTestPlan.errCases>0?this.xmTestPlan.errCases:0)
-				var igCases=parseInt(this.xmTestPlan.igCases>0?this.xmTestPlan.igCases:0)
-				var blCases=parseInt(this.xmTestPlan.blCases>0?this.xmTestPlan.blCases:0)
+				var okCases=parseInt(this.rawDatas.okCases>0?this.rawDatas.okCases:0)
+				var errCases=parseInt(this.rawDatas.errCases>0?this.rawDatas.errCases:0)
+				var igCases=parseInt(this.rawDatas.igCases>0?this.rawDatas.igCases:0)
+				var blCases=parseInt(this.rawDatas.blCases>0?this.rawDatas.blCases:0)
 				var totalExecs=okCases+igCases
-				var rate=parseInt(totalExecs/this.xmTestPlan.totalCases*100)
+				var rate=parseInt(totalExecs/this.rawDatas.totalCases*100)
 				return rate;
 			}