From 45b0eda2b1db1bcc337940a25d499fdf1941e07f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 4 Feb 2023 00:33:28 +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

---
 .../xm/core/xmTestPlan/XmTestPlanInfo.vue     | 11 ++++----
 src/views/xm/rpt/CompsCard.vue                | 28 ++++++++++---------
 src/views/xm/rpt/index.vue                    | 12 ++++----
 3 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue b/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
index 651b2fc4..a3c19c4e 100644
--- a/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
@@ -43,11 +43,11 @@
                 </el-row>
                 
                 <el-row v-if="subPage=='testRpt'">
-                     <xm-test-plan-rpt  ref="rpt" :xm-test-casedb="xmTestCasedb" :xm-test-plan="xmTestPlan" :xm-product="{id:xmTestCasedb.productId,productName:xmTestCasedb.productName}" :xm-project="{id:xmTestPlan.projectId,name:xmTestPlan.projectName}" category="测试级"></xm-test-plan-rpt >
+                     <xm-test-plan-rpt key="rpt"  ref="rpt" :xm-test-casedb="xmTestCasedb" :xm-test-plan="xmTestPlan" :xm-product="{id:xmTestCasedb.productId,productName:xmTestCasedb.productName}" :xm-project="{id:xmTestPlan.projectId,name:xmTestPlan.projectName}" category="测试级" :is-rpt-show="true"></xm-test-plan-rpt >
                 </el-row>
                 
                 <el-row v-if="subPage=='xmReport'">
-                     <xm-report  ref="xmReport" :xm-test-casedb="xmTestCasedb" :xm-test-plan="xmTestPlan" :xm-product="{id:xmTestCasedb.productId,productName:xmTestCasedb.productName}" :xm-project="{id:xmTestPlan.projectId,name:xmTestPlan.projectName}"  category="测试级"></xm-report >
+                     <xm-report key="xmReport"  ref="xmReport" :xm-test-casedb="xmTestCasedb" :xm-test-plan="xmTestPlan" :xm-product="{id:xmTestCasedb.productId,productName:xmTestCasedb.productName}" :xm-project="{id:xmTestPlan.projectId,name:xmTestPlan.projectName}"  category="测试级"></xm-report >
                 </el-row>
             </el-row> 
             <xm-test-plan-mng v-else @select="onTestPlanSelect" :xm-test-casedb="xmTestCasedb"> </xm-test-plan-mng>
@@ -147,10 +147,12 @@ export default {
             this.xmTestPlan=row
         },
         showRptConfig(){
-            this.$refs['rpt'].rptConfigVisible=true
+            this.$refs['rpt'].isRptCfg=true
         },
         print(){
+            this.$refs['rpt'].isRptShow=true
            this.$refs['rpt'].showPrint()
+
         },
         calcRptData(){ 
             var row=this.xmTestPlan
@@ -168,8 +170,7 @@ export default {
     },//end methods
     mounted() {
         this.$nextTick(() => {
-            initDicts(this)
-
+            initDicts(this) 
         });
     }
 }
diff --git a/src/views/xm/rpt/CompsCard.vue b/src/views/xm/rpt/CompsCard.vue
index 0369c908..d11a179c 100644
--- a/src/views/xm/rpt/CompsCard.vue
+++ b/src/views/xm/rpt/CompsCard.vue
@@ -124,7 +124,7 @@ export default {
         xmBranchMenuDayAccumulate:()=>import('./branch/menuDayAccumulate.vue'),
         
     },
-    props:['xmTestCasedb','xmTestPlan','xmProduct','xmProject','xmIteration','showToolBar','category','showParams','isRptCfg','printVisible'],
+    props:['xmTestCasedb','xmTestPlan','xmProduct','xmProject','xmIteration','showToolBar','category','showParams','isRptCfg','printVisible','isRptShow'],
     computed: {
         ...mapGetters(['userInfo']), 
         compIds(){
@@ -165,6 +165,9 @@ export default {
                 return params;
              }
              return params;
+        },
+        toLoadXmRptConfigCpd(){
+            return this.isRptCfg || this.isRptShow
         }
         
     },
@@ -176,18 +179,16 @@ export default {
             },
             deep:true,
         },
-        isRptCfg(){
-            if(this.isRptCfg==true){
-                this.$nextTick(()=>{
-                    this.compCfgList.forEach(k=>{
-                        this.sizeAutoChange(k);
-                    })
+        toLoadXmRptConfigCpd(){ 
+            this.getXmRptConfig();
+            this.$nextTick(()=>{
+                this.compCfgList.forEach(k=>{
+                    this.sizeAutoChange(k);
                 })
-                
-            }
+            }) 
         }, 
         rptConfigParamsCpd(){
-            if(this.isRptCfg){
+            if(this.isRptCfg ||this.isRptShow){
                 this.getXmRptConfig()
             }
         }
@@ -226,11 +227,12 @@ export default {
         initData(){
            this.getXmRptConfig();
         },
-        getXmRptConfig(){ 
-            if(!this.isRptCfg){
+        getXmRptConfig(){  
+            if(!this.toLoadXmRptConfigCpd){
                 return;
             }
-            listXmRptConfig(this.rptConfigParamsCpd).then(res=>{
+            var params={bizType:this.rptConfigParamsCpd.bizType,bizId:this.rptConfigParamsCpd.bizId}
+            listXmRptConfig(params).then(res=>{
                 this.xmRptConfig=res.data.data[0] 
             })
         },
diff --git a/src/views/xm/rpt/index.vue b/src/views/xm/rpt/index.vue
index b7ae8247..38a8da84 100644
--- a/src/views/xm/rpt/index.vue
+++ b/src/views/xm/rpt/index.vue
@@ -1,10 +1,10 @@
 <template> 
 <section>
-  <el-row v-if="rptConfigVisible">
-   <span style="float:right;"> <el-button @click="rptConfigVisible=false">取消配置</el-button><el-button @click="saveXmRptConfig" type="primary">保存配置</el-button></span>
+  <el-row v-if="isRptCfg">
+   <span style="float:right;"> <el-button @click="isRptCfg=false">取消配置</el-button><el-button @click="saveXmRptConfig" type="primary">保存配置</el-button></span>
   </el-row>
   <el-row>
-     <comps-card ref="compsCard" :category="category" :xm-test-plan="xmTestPlan" :xm-product="xmProduct" :xm-project="xmProject" :xm-iteration="xmIteration" :xm-test-casedb="xmTestCasedb" :show-params="true" :show-tool-bar="true" :is-rpt-cfg="rptConfigVisible"/>  
+     <comps-card ref="compsCard" :category="category" :xm-test-plan="xmTestPlan" :xm-product="xmProduct" :xm-project="xmProject" :xm-iteration="xmIteration" :xm-test-casedb="xmTestCasedb" :show-params="true" :show-tool-bar="true" :is-rpt-cfg="isRptCfg" :is-rpt-show="isRptShow"/>  
   </el-row>
 </section>     
 </template>
@@ -18,7 +18,7 @@ import { mapGetters } from 'vuex'
 import dayjs from 'dayjs'
 
 export default {
-  props:['xmProduct','xmIteration','xmProject','xmTestCasedb','xmTestPlan','category'],
+  props:['xmProduct','xmIteration','xmProject','xmTestCasedb','xmTestPlan','category','isRptShow'],
   components: {compsSet, compsCard}, 
   computed: {
     ...mapGetters([
@@ -31,14 +31,14 @@ export default {
 
   data() {
     return { 
-      rptConfigVisible:false,
+      isRptCfg:false, 
     }
   },
 
   methods: {  
     saveXmRptConfig(){
       var callback=()=>{
-        this.rptConfigVisible=false;
+        this.isRptCfg=false;
       }
       this.$refs['compsCard'].submitXmPrtConfig(callback)
     },