From 42fe9d8df898baef937f90cbeec042e97c42f312 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Tue, 18 Jan 2022 16:16:39 +0800
Subject: [PATCH] =?UTF-8?q?chore(=E7=BB=9F=E8=AE=A1=E6=8A=A5=E8=A1=A8):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=8A=A5=E8=A1=A8=E6=95=B0=E6=8D=AE=E5=B1=95=E7=8E=B0?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1009196 --user=宋天阳 【报表统计】测试用例统计报表，纵轴要搜索两次才能显示正确
https://www.tapd.cn/55049933/s/1093461
---
 backend/pom.xml                               |  2 +-
 .../components/common/chart/MsChart.vue       | 30 ++++++++++++-------
 .../casecount/TestCaseCountContainer.vue      |  1 +
 .../casecount/chart/TestCaseCountChart.vue    | 12 ++++++--
 4 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 691480506c..7f65db0fc0 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -148,7 +148,7 @@
         <dependency>
             <groupId>io.metersphere</groupId>
             <artifactId>ms-jmeter-core</artifactId>
-            <version>1.0.6</version>
+            <version>1.0.7</version>
         </dependency>
 
         <!--   排除jmeter中的 xstream 解决bug     -->
diff --git a/frontend/src/business/components/common/chart/MsChart.vue b/frontend/src/business/components/common/chart/MsChart.vue
index 116c9afa15..30f2bb4021 100644
--- a/frontend/src/business/components/common/chart/MsChart.vue
+++ b/frontend/src/business/components/common/chart/MsChart.vue
@@ -1,16 +1,17 @@
 <template>
   <chart
-    :style="{'height': chartHeight, 'width': chartWidth}"
-    class="ms-chart"
-    :init-options="defaultInitOptions"
-    :option="options"
-    :theme="theme"
-    :group="group"
-    @click="onClick"
-    @datazoom="datazoom"
-    :watch-shallow="watchShallow"
-    :manual-update="manualUpdate"
-    :autoresize="autoresize" id="chartsShow"/>
+      v-if="loaded"
+      :style="{'height': chartHeight, 'width': chartWidth}"
+      class="ms-chart"
+      :init-options="defaultInitOptions"
+      :option="options"
+      :theme="theme"
+      :group="group"
+      @click="onClick"
+      @datazoom="datazoom"
+      :watch-shallow="watchShallow"
+      :manual-update="manualUpdate"
+      :autoresize="autoresize" id="chartsShow"/>
 </template>
 
 <script>
@@ -41,6 +42,7 @@ export default {
   },
   data() {
     return {
+      loaded: true,
       defaultInitOptions: this.initOptions
     };
   },
@@ -75,6 +77,12 @@ export default {
     onClick(params) {
       this.$emit('onClick', params.data);
     },
+    reload() {
+      this.loaded = false;
+      this.$nextTick(() => {
+        this.loaded = true;
+      })
+    },
     exportCharts(fileName, type) {
       if (document.getElementsByClassName('ms-chart')) {
         let chartsCanvas = document.getElementsByClassName('ms-chart')[0].querySelectorAll('canvas')[0];
diff --git a/frontend/src/business/components/reportstatistics/projectstatistics/casecount/TestCaseCountContainer.vue b/frontend/src/business/components/reportstatistics/projectstatistics/casecount/TestCaseCountContainer.vue
index 11d326be38..f54d77266a 100644
--- a/frontend/src/business/components/reportstatistics/projectstatistics/casecount/TestCaseCountContainer.vue
+++ b/frontend/src/business/components/reportstatistics/projectstatistics/casecount/TestCaseCountContainer.vue
@@ -132,6 +132,7 @@ export default {
       if (selectTableData) {
         this.tableData = selectTableData;
       }
+      this.$refs.analysisChart.setPieOptionAndBarOption(this.loadOption,this.pieOption);
       this.loading = false;
       this.$refs.analysisChart.generateOption(this.chartType);
     },
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 ef4eebeeb5..839fc5b7a2 100644
--- a/frontend/src/business/components/reportstatistics/projectstatistics/casecount/chart/TestCaseCountChart.vue
+++ b/frontend/src/business/components/reportstatistics/projectstatistics/casecount/chart/TestCaseCountChart.vue
@@ -47,8 +47,6 @@ export default {
   name: "TestCaseCountChart",
   components: {MsChart},
   props: {
-    loadOption: {},
-    pieOption: {},
     chartWidth: Number,
     needFullScreen: Boolean,
     readOnly: Boolean,
@@ -56,6 +54,8 @@ export default {
   data() {
     return {
       dataOption: {},
+      loadOption: {},
+      pieOption: {},
       x: 0,
       y: 0,
       w: document.documentElement.clientWidth - 760,
@@ -125,6 +125,14 @@ export default {
       });
       this.reload();
     },
+    setPieOptionAndBarOption(barOption,pieOption) {
+      if (barOption) {
+        this.loadOption = barOption;
+      }
+      if (pieOption) {
+        this.pieOption = pieOption;
+      }
+    },
     reload() {
       this.loading = true
       this.$nextTick(() => {