From 56c9a33ccd4d999a65746633d8953fb2a933f443 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 12 Jul 2022 11:42:43 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=8A=A5=E8=A1=A8=E7=BB=9F=E8=AE=A1):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8A=A5=E8=A1=A8=E7=BB=9F=E8=AE=A1=E4=B8=AD?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E4=B8=BA0=E6=97=B6=E5=87=BA=E7=8E=B0?=
 =?UTF-8?q?=E7=9A=84=E8=A7=A3=E6=9E=90=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复报表统计中数据为0时出现的解析错误
---
 .../reportstatistics/base/ReportHeader.vue    | 16 +++++++++++++-
 .../projectstatistics/ProjectStatistics.vue   |  6 ++++-
 .../casecount/TestCaseCountContainer.vue      | 15 ++++++++-----
 .../casecount/chart/TestCaseCountChart.vue    | 22 ++++++++++++-------
 .../track/TestAnalysisContainer.vue           |  8 +++++--
 5 files changed, 50 insertions(+), 17 deletions(-)

diff --git a/frontend/src/business/components/reportstatistics/base/ReportHeader.vue b/frontend/src/business/components/reportstatistics/base/ReportHeader.vue
index 9e45c9c027..ec764967e9 100644
--- a/frontend/src/business/components/reportstatistics/base/ReportHeader.vue
+++ b/frontend/src/business/components/reportstatistics/base/ReportHeader.vue
@@ -1,7 +1,11 @@
 <template>
   <div class="ms-header">
     <el-row>
-      <div class="ms-div">{{ title }}</div>
+      <div class="ms-div">{{ title }}
+        <span v-if="historyReportName" class="history-report-name">
+          {{ historyReportName }}
+        </span>
+      </div>
       <div class="ms-header-right">
         <el-button type="primary" v-if="isSaveAsButtonShow" size="mini" @click="handleSaveAs" :disabled="readOnly">
           {{ $t('commons.save_as') }}<i class="el-icon-files el-icon--right"></i></el-button>
@@ -29,6 +33,11 @@ export default {
   props: {
     title: String,
     historyReportId: String,
+    historyReportName: String,
+  },
+  watch: {
+    historyReportName() {
+    }
   },
   created() {
   },
@@ -119,4 +128,9 @@ export default {
   cursor: pointer;
   font-size: 18px;
 }
+
+.history-report-name {
+  margin-left: 20px;
+  color: var(--primary_color);
+}
 </style>
diff --git a/frontend/src/business/components/reportstatistics/projectstatistics/ProjectStatistics.vue b/frontend/src/business/components/reportstatistics/projectstatistics/ProjectStatistics.vue
index 39e4428a43..2443cf65ca 100644
--- a/frontend/src/business/components/reportstatistics/projectstatistics/ProjectStatistics.vue
+++ b/frontend/src/business/components/reportstatistics/projectstatistics/ProjectStatistics.vue
@@ -19,6 +19,7 @@
                :is-show-close="false" style="overflow: hidden">
       <template v-slot:header>
         <report-header :title="$t('commons.report_statistics.test_case_analysis')" :history-report-id="historyReportId"
+                       :history-report-name="historyReportName"
                        @closePage="close" @updateReport="updateReport"
                        @selectAndSaveReport="openSaveReportDialog('saveAs')"/>
       </template>
@@ -31,6 +32,7 @@
       <template v-slot:header>
         <report-header :title="$t('commons.report_statistics.test_case_count')" :history-report-id="historyReportId"
                        @closePage="close"
+                       :history-report-name="historyReportName"
                        @updateReport="updateReport"
                        @selectAndSaveReport="openSaveReportDialog('saveAs')"/>
       </template>
@@ -74,6 +76,7 @@ export default {
       testCaseTrendDrawer: false,
       testCaseCountDrawer: false,
       historyReportId: "",
+      historyReportName: "",
       reportTypes: [{id: 'track', name: this.$t('test_track.test_track')}],
       dialogFormVisible: false,
       form: {
@@ -129,8 +132,9 @@ export default {
         }
       });
     },
-    initHistoryReportId(reportId) {
+    initHistoryReportId(reportId, reportName) {
       this.historyReportId = reportId;
+      this.historyReportName = reportName;
     },
     handleCloseSaveReportDialog() {
       this.form.reportName = "";
diff --git a/frontend/src/business/components/reportstatistics/projectstatistics/casecount/TestCaseCountContainer.vue b/frontend/src/business/components/reportstatistics/projectstatistics/casecount/TestCaseCountContainer.vue
index fbfa336a30..a698b05027 100644
--- a/frontend/src/business/components/reportstatistics/projectstatistics/casecount/TestCaseCountContainer.vue
+++ b/frontend/src/business/components/reportstatistics/projectstatistics/casecount/TestCaseCountContainer.vue
@@ -125,9 +125,11 @@ export default {
           this.pieOption.width = pieData.width;
           this.chartWidth = pieData.width;
         }
-        this.pieOption.series.forEach(item => {
-          item.type = this.$refs.analysisChart.chartType;
-        });
+        if (this.pieOption.series) {
+          this.pieOption.series.forEach(item => {
+            item.type = this.$refs.analysisChart.chartType;
+          });
+        }
       }
       if (selectTableData) {
         this.tableData = selectTableData;
@@ -180,6 +182,7 @@ export default {
       });
     },
     selectReport(selectId) {
+      let selectName = "";
       if (selectId) {
         this.loading = true;
         let paramObj = {
@@ -188,6 +191,7 @@ export default {
         this.$post('/history/report/selectById', paramObj, response => {
           let reportData = response.data;
           if (reportData) {
+            selectName = reportData.name;
             if (reportData.dataOption) {
               let dataOptionObj = JSON.parse(reportData.dataOption);
               if (dataOptionObj.chartType) {
@@ -203,14 +207,15 @@ export default {
             }
             this.loading = false;
           }
+          this.$emit('initHistoryReportId', selectId, selectName);
         }, (error) => {
           this.loading = false;
+          this.removeHistoryReportId();
         });
-        this.$emit('initHistoryReportId', selectId);
       }
     },
     removeHistoryReportId() {
-      this.$emit('initHistoryReportId', "");
+      this.$emit('initHistoryReportId', "", "");
     },
     getGroupNameStr(groupName) {
       if (groupName === 'creator') {
diff --git a/frontend/src/business/components/reportstatistics/projectstatistics/casecount/chart/TestCaseCountChart.vue b/frontend/src/business/components/reportstatistics/projectstatistics/casecount/chart/TestCaseCountChart.vue
index 839fc5b7a2..4b7345b1cf 100644
--- a/frontend/src/business/components/reportstatistics/projectstatistics/casecount/chart/TestCaseCountChart.vue
+++ b/frontend/src/business/components/reportstatistics/projectstatistics/casecount/chart/TestCaseCountChart.vue
@@ -31,7 +31,8 @@
       <el-row>
         <div class="chart-style">
           <ms-chart ref="chart1" v-if="!loading" :options="dataOption"
-                    :style="{width: chartWidthNumber+'px', height: (h-70) + 'px'}" class="chart-config" :autoresize="true"
+                    :style="{width: chartWidthNumber+'px', height: (h-70) + 'px'}" class="chart-config"
+                    :autoresize="true"
                     id="picChart"/>
         </div>
       </el-row>
@@ -40,7 +41,6 @@
 </template>
 
 <script>
-import echarts from "echarts";
 import MsChart from "@/business/components/common/chart/MsChart";
 
 export default {
@@ -75,7 +75,10 @@ export default {
         {id: 'pie', name: this.$t('commons.report_statistics.pie')}
       ],
       order: "",
-      orders: [{id: '', name: this.$t('commons.sort_default')}, {id: 'desc', name: this.$t('commons.report_statistics.desc')}, {
+      orders: [{id: '', name: this.$t('commons.sort_default')}, {
+        id: 'desc',
+        name: this.$t('commons.report_statistics.desc')
+      }, {
         id: 'asc',
         name: this.$t('commons.report_statistics.asc')
       }],
@@ -120,12 +123,14 @@ export default {
       } else {
         this.dataOption = this.loadOption;
       }
-      this.dataOption.series.forEach(item => {
-        item.type = this.chartType;
-      });
+      if (this.dataOption.series) {
+        this.dataOption.series.forEach(item => {
+          item.type = this.chartType;
+        });
+      }
       this.reload();
     },
-    setPieOptionAndBarOption(barOption,pieOption) {
+    setPieOptionAndBarOption(barOption, pieOption) {
       if (barOption) {
         this.loadOption = barOption;
       }
@@ -233,9 +238,10 @@ export default {
   height: calc(100vh / 1.95);
 }
 
-.chart-style{
+.chart-style {
   overflow: auto;
 }
+
 .tip {
   float: left;
   font-size: 14px;
diff --git a/frontend/src/business/components/reportstatistics/projectstatistics/track/TestAnalysisContainer.vue b/frontend/src/business/components/reportstatistics/projectstatistics/track/TestAnalysisContainer.vue
index 8c88acded3..d40cdd62e2 100644
--- a/frontend/src/business/components/reportstatistics/projectstatistics/track/TestAnalysisContainer.vue
+++ b/frontend/src/business/components/reportstatistics/projectstatistics/track/TestAnalysisContainer.vue
@@ -140,6 +140,7 @@ export default {
       this.loading = false;
     },
     selectReport(selectId) {
+      let selectName = "";
       if (selectId) {
         this.loading = true;
         let paramObj = {
@@ -148,6 +149,7 @@ export default {
         this.$post('/history/report/selectById', paramObj, response => {
           let reportData = response.data;
           if (reportData) {
+            selectName = reportData.name;
             if (reportData.dataOption) {
               let dataOptionObj = JSON.parse(reportData.dataOption);
               this.initPic(dataOptionObj.loadOption, dataOptionObj.pieOption, dataOptionObj.tableData);
@@ -157,15 +159,17 @@ export default {
               this.$refs.analysisFilter.initSelectOption(selectOptionObj);
             }
           }
+          this.$emit('initHistoryReportId', selectId, selectName);
           this.loading = false;
         }, (error) => {
           this.loading = false;
+          this.removeHistoryReportId();
         });
-        this.$emit('initHistoryReportId', selectId);
+
       }
     },
     removeHistoryReportId() {
-      this.$emit('initHistoryReportId', "");
+      this.$emit('initHistoryReportId', "", "");
     },
     selectAndSaveReport(reportName) {
       let opt = this.$refs.analysisFilter.getOption();