From fef7e262549d1ccea473d01aedfd87cbcbe6140c Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Wed, 9 Aug 2023 14:29:24 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=8A=A5=E5=91=8A=E7=9A=84?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E7=8E=87=E6=89=A7=E8=A1=8C=E7=8E=87=E7=B2=BE?=
 =?UTF-8?q?=E5=BA=A6=E6=94=B9=E4=B8=BA=E5=B0=8F=E6=95=B0=E7=82=B9=E5=90=8E?=
 =?UTF-8?q?2=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【【富国基金】测试计划报告通过率的计算，希望保留两位小数，不用四舍五入。】
https://www.tapd.cn/55049933/prong/stories/view/1155049933001012667
---
 .../components/PerformancePressureConfig.vue  | 277 +++++++++---------
 .../plan/service/TestPlanService.java         |  23 +-
 .../report/detail/TestPlanOverviewReport.vue  |   8 +-
 3 files changed, 163 insertions(+), 145 deletions(-)

diff --git a/performance-test/frontend/src/business/test/components/PerformancePressureConfig.vue b/performance-test/frontend/src/business/test/components/PerformancePressureConfig.vue
index 201509e448..9c0cf160c9 100644
--- a/performance-test/frontend/src/business/test/components/PerformancePressureConfig.vue
+++ b/performance-test/frontend/src/business/test/components/PerformancePressureConfig.vue
@@ -1,16 +1,16 @@
 <template>
-  <div v-loading="result.loading" v-if="threadGroups.length > 0" class="pressure-config-container">
+  <div v-loading="result.loading" v-if="loadIsOver" class="pressure-config-container">
     <el-row>
       <el-col>
         <el-form :inline="true" :disabled="isReadOnly">
           <el-form-item :label="$t('load_test.select_resource_pool')">
             <el-select v-model="resourcePool" size="mini" @change="resourcePoolChange">
               <el-option
-                  v-for="item in resourcePools"
-                  :key="item.id"
-                  :label="item.name"
-                  :disabled="!item.performance"
-                  :value="item.id">
+                v-for="item in resourcePools"
+                :key="item.id"
+                :label="item.name"
+                :disabled="!item.performance"
+                :value="item.id">
               </el-option>
             </el-select>
           </el-form-item>
@@ -81,10 +81,10 @@
               <el-form-item :label="$t('load_test.on_sample_error')">
                 <el-select v-model="threadGroup.onSampleError" size="mini">
                   <el-option
-                      v-for="item in onSampleErrors"
-                      :key="item.value"
-                      :label="item.label"
-                      :value="item.value">
+                    v-for="item in onSampleErrors"
+                    :key="item.value"
+                    :label="item.label"
+                    :value="item.value">
                   </el-option>
                 </el-select>
               </el-form-item>
@@ -213,10 +213,10 @@
                     <el-select v-model="threadGroup.resourceNodeIndex" @change="specifyNodeChange(threadGroup)"
                                size="mini">
                       <el-option
-                          v-for="(node, index) in resourceNodes"
-                          :key="node.ip"
-                          :label="node.ip"
-                          :value="index">
+                        v-for="(node, index) in resourceNodes"
+                        :key="node.ip"
+                        :label="node.ip"
+                        :value="index">
                       </el-option>
                     </el-select>
                   </el-form-item>
@@ -283,7 +283,7 @@ const RATIOS = "ratios";
 
 const hexToRgb = function (hex) {
   return 'rgb(' + parseInt('0x' + hex.slice(1, 3)) + ',' + parseInt('0x' + hex.slice(3, 5))
-      + ',' + parseInt('0x' + hex.slice(5, 7)) + ')';
+    + ',' + parseInt('0x' + hex.slice(5, 7)) + ')';
 };
 
 export default {
@@ -320,6 +320,7 @@ export default {
       step: 0,
       rpsLimit: 0,
       rpsLimitEnable: false,
+      loadIsOver: true,
       options: {},
       resourcePool: null,
       setPoolNull: false,
@@ -397,136 +398,138 @@ export default {
   methods: {
     getResourcePools() {
       getResourcePools(this.isShare)
-          .then(response => {
-            this.resourcePools = response.data;
-            // 如果当前的资源池无效 设置 null
-            if (this.resourcePool) {
-              if (response.data.filter(p => p.id === this.resourcePool && p.performance).length === 0) {
-                this.resourcePool = null;
-                // 标记因资源池无效而将资源池ID置为null
-                this.setPoolNull = true;
-              }
+        .then(response => {
+          this.resourcePools = response.data;
+          // 如果当前的资源池无效 设置 null
+          if (this.resourcePool) {
+            if (response.data.filter(p => p.id === this.resourcePool && p.performance).length === 0) {
+              this.resourcePool = null;
+              // 标记因资源池无效而将资源池ID置为null
+              this.setPoolNull = true;
             }
+          }
 
-            this.resourcePoolChange();
-          });
+          this.resourcePoolChange();
+        });
     },
     getLoadConfig() {
       getLoadConfig(this.testId, this.reportId, this.isShare)
-          .then(response => {
-            let data = JSON.parse(response.data);
-            for (let i = 0; i < this.threadGroups.length; i++) {
-              data[i].forEach(item => {
-                switch (item.key) {
-                  case TARGET_LEVEL:
-                    this.threadGroups[i].threadNumber = item.value;
-                    break;
-                  case RAMP_UP:
-                    this.threadGroups[i].rampUpTime = item.value;
-                    break;
-                  case ITERATE_RAMP_UP:
-                    this.threadGroups[i].iterateRampUp = item.value;
-                    break;
-                  case DURATION:
-                    this.threadGroups[i].duration = item.value;
-                    break;
-                  case DURATION_HOURS:
-                    this.threadGroups[i].durationHours = item.value;
-                    break;
-                  case DURATION_MINUTES:
-                    this.threadGroups[i].durationMinutes = item.value;
-                    break;
-                  case DURATION_SECONDS:
-                    this.threadGroups[i].durationSeconds = item.value;
-                    break;
-                  case UNIT:
-                    this.threadGroups[i].unit = item.value;
-                    break;
-                  case STEPS:
-                    this.threadGroups[i].step = item.value;
-                    break;
-                  case RPS_LIMIT:
-                    this.threadGroups[i].rpsLimit = item.value;
-                    break;
-                  case RPS_LIMIT_ENABLE:
-                    this.threadGroups[i].rpsLimitEnable = item.value;
-                    break;
-                  case THREAD_TYPE:
-                    this.threadGroups[i].threadType = item.value;
-                    break;
-                  case ITERATE_NUM:
-                    this.threadGroups[i].iterateNum = item.value;
-                    break;
-                  case ENABLED:
-                    this.threadGroups[i].enabled = item.value;
-                    break;
-                  case DELETED:
-                    this.threadGroups[i].deleted = item.value;
-                    break;
-                  case HANDLER:
-                    this.threadGroups[i].handler = item.value;
-                    break;
-                  case THREAD_GROUP_TYPE:
-                    this.threadGroups[i].tgType = item.value;
-                    break;
-                  case ON_SAMPLE_ERROR:
-                    this.threadGroups[i].onSampleError = item.value;
-                    break;
-                  case STRATEGY:
-                    this.threadGroups[i].strategy = item.value;
-                    break;
-                  case RESOURCE_NODE_INDEX:
-                    this.threadGroups[i].resourceNodeIndex = item.value;
-                    break;
-                  case RATIOS:
-                    this.threadGroups[i].ratios = item.value;
-                    break;
-                  case SERIALIZE_THREAD_GROUPS:
-                    this.serializeThreadGroups = item.value;// 所有的线程组值一样
-                    break;
-                  case AUTO_STOP:
-                    this.autoStop = item.value;// 所有的线程组值一样
-                    break;
-                  case AUTO_STOP_DELAY:
-                    this.autoStopDelay = item.value;// 所有的线程组值一样
-                    break;
-                  default:
-                    break;
-                }
-                //
-                this.$set(this.threadGroups[i], "unit", this.threadGroups[i].unit || 'S');
-                this.$set(this.threadGroups[i], "threadType", this.threadGroups[i].threadType || 'DURATION');
-                this.$set(this.threadGroups[i], "iterateNum", this.threadGroups[i].iterateNum || 1);
-                this.$set(this.threadGroups[i], "iterateRampUp", this.threadGroups[i].iterateRampUp || 10);
-                this.$set(this.threadGroups[i], "enabled", this.threadGroups[i].enabled || 'true');
-                this.$set(this.threadGroups[i], "deleted", this.threadGroups[i].deleted || 'false');
-                this.$set(this.threadGroups[i], "onSampleError", this.threadGroups[i].onSampleError || 'continue');
-              });
-            }
-            for (let i = 0; i < this.threadGroups.length; i++) {
-              let tg = this.threadGroups[i];
-              tg.durationHours = Math.floor(tg.duration / 3600);
-              tg.durationMinutes = Math.floor((tg.duration / 60 % 60));
-              tg.durationSeconds = Math.floor((tg.duration % 60));
-            }
-            this.resourcePoolChange();
-            this.calculateTotalChart();
-          });
+        .then(response => {
+          let data = JSON.parse(response.data);
+          this.loadIsOver = false;
+          for (let i = 0; i < this.threadGroups.length; i++) {
+            data[i].forEach(item => {
+              switch (item.key) {
+                case TARGET_LEVEL:
+                  this.threadGroups[i].threadNumber = item.value;
+                  break;
+                case RAMP_UP:
+                  this.threadGroups[i].rampUpTime = item.value;
+                  break;
+                case ITERATE_RAMP_UP:
+                  this.threadGroups[i].iterateRampUp = item.value;
+                  break;
+                case DURATION:
+                  this.threadGroups[i].duration = item.value;
+                  break;
+                case DURATION_HOURS:
+                  this.threadGroups[i].durationHours = item.value;
+                  break;
+                case DURATION_MINUTES:
+                  this.threadGroups[i].durationMinutes = item.value;
+                  break;
+                case DURATION_SECONDS:
+                  this.threadGroups[i].durationSeconds = item.value;
+                  break;
+                case UNIT:
+                  this.threadGroups[i].unit = item.value;
+                  break;
+                case STEPS:
+                  this.threadGroups[i].step = item.value;
+                  break;
+                case RPS_LIMIT:
+                  this.threadGroups[i].rpsLimit = item.value;
+                  break;
+                case RPS_LIMIT_ENABLE:
+                  this.threadGroups[i].rpsLimitEnable = item.value;
+                  break;
+                case THREAD_TYPE:
+                  this.threadGroups[i].threadType = item.value;
+                  break;
+                case ITERATE_NUM:
+                  this.threadGroups[i].iterateNum = item.value;
+                  break;
+                case ENABLED:
+                  this.threadGroups[i].enabled = item.value;
+                  break;
+                case DELETED:
+                  this.threadGroups[i].deleted = item.value;
+                  break;
+                case HANDLER:
+                  this.threadGroups[i].handler = item.value;
+                  break;
+                case THREAD_GROUP_TYPE:
+                  this.threadGroups[i].tgType = item.value;
+                  break;
+                case ON_SAMPLE_ERROR:
+                  this.threadGroups[i].onSampleError = item.value;
+                  break;
+                case STRATEGY:
+                  this.threadGroups[i].strategy = item.value;
+                  break;
+                case RESOURCE_NODE_INDEX:
+                  this.threadGroups[i].resourceNodeIndex = item.value;
+                  break;
+                case RATIOS:
+                  this.threadGroups[i].ratios = item.value;
+                  break;
+                case SERIALIZE_THREAD_GROUPS:
+                  this.serializeThreadGroups = item.value;// 所有的线程组值一样
+                  break;
+                case AUTO_STOP:
+                  this.autoStop = item.value;// 所有的线程组值一样
+                  break;
+                case AUTO_STOP_DELAY:
+                  this.autoStopDelay = item.value;// 所有的线程组值一样
+                  break;
+                default:
+                  break;
+              }
+              //
+              this.$set(this.threadGroups[i], "unit", this.threadGroups[i].unit || 'S');
+              this.$set(this.threadGroups[i], "threadType", this.threadGroups[i].threadType || 'DURATION');
+              this.$set(this.threadGroups[i], "iterateNum", this.threadGroups[i].iterateNum || 1);
+              this.$set(this.threadGroups[i], "iterateRampUp", this.threadGroups[i].iterateRampUp || 10);
+              this.$set(this.threadGroups[i], "enabled", this.threadGroups[i].enabled || 'true');
+              this.$set(this.threadGroups[i], "deleted", this.threadGroups[i].deleted || 'false');
+              this.$set(this.threadGroups[i], "onSampleError", this.threadGroups[i].onSampleError || 'continue');
+            });
+          }
+          for (let i = 0; i < this.threadGroups.length; i++) {
+            let tg = this.threadGroups[i];
+            tg.durationHours = Math.floor(tg.duration / 3600);
+            tg.durationMinutes = Math.floor((tg.duration / 60 % 60));
+            tg.durationSeconds = Math.floor((tg.duration % 60));
+          }
+          this.loadIsOver = true;
+          this.resourcePoolChange();
+          this.calculateTotalChart();
+        });
     },
     getJmxContent() {
       let threadGroups = [];
       getJmxContent(this.testId, this.reportId, this.isShare)
-          .then(response => {
-            response.data.forEach(d => {
-              threadGroups = threadGroups.concat(findThreadGroup(d.jmx, d.name));
-              threadGroups.forEach(tg => {
-                tg.options = {};
-              });
+        .then(response => {
+          response.data.forEach(d => {
+            threadGroups = threadGroups.concat(findThreadGroup(d.jmx, d.name));
+            threadGroups.forEach(tg => {
+              tg.options = {};
             });
-            this.threadGroups = threadGroups;
-            this.$emit('fileChange', threadGroups);
-            this.getLoadConfig();
           });
+          this.threadGroups = threadGroups;
+          this.$emit('fileChange', threadGroups);
+          this.getLoadConfig();
+        });
     },
     resourcePoolChange() {
       let result = this.resourcePools.filter(p => p.id === this.resourcePool);
@@ -607,8 +610,8 @@ export default {
         let tg = handler.threadGroups[i];
 
         if (tg.enabled === 'false' ||
-            tg.deleted === 'true' ||
-            tg.threadType === 'ITERATION') {
+          tg.deleted === 'true' ||
+          tg.threadType === 'ITERATION') {
           continue;
         }
         if (this.getDuration(tg) < tg.rampUpTime) {
@@ -733,7 +736,7 @@ export default {
         }
 
         if (!tg.threadNumber || !tg.duration
-            || !tg.rampUpTime || !tg.step || !tg.iterateNum) {
+          || !tg.rampUpTime || !tg.step || !tg.iterateNum) {
           this.$warning(this.$t('load_test.pressure_config_params_is_empty'));
           this.$emit('changeActive', '1');
           return false;
diff --git a/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java b/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java
index 556a345a02..c169f95f73 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java
@@ -80,6 +80,7 @@ import java.io.InputStreamReader;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.nio.charset.StandardCharsets;
+import java.text.DecimalFormat;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.Function;
@@ -1750,15 +1751,29 @@ public class TestPlanService {
             }
             issuesService.calculateReportByIssueList(testPlanCaseReportResultDTO.getIssueList(), report);
 
+            DecimalFormat rateFormat = new DecimalFormat("#0.00");
+            rateFormat.setMinimumFractionDigits(2);
+            rateFormat.setMaximumFractionDigits(2);
+
             if (report.getExecuteCount() != 0 && report.getCaseCount() != null) {
-                report.setExecuteRate(report.getExecuteCount() * 0.1 * 10 / report.getCaseCount());
+                double executeRate = Double.parseDouble(rateFormat.format((double) report.getExecuteCount() / (double) report.getCaseCount()));
+                if (executeRate == 1 && report.getExecuteCount() < report.getCaseCount()) {
+                    report.setExecuteRate(0.99);
+                } else {
+                    report.setExecuteRate(executeRate);
+                }
             } else {
-                report.setExecuteRate(0.0);
+                report.setExecuteRate(0.00);
             }
             if (report.getPassCount() != 0 && report.getCaseCount() != null) {
-                report.setPassRate(report.getPassCount() * 0.1 * 10 / report.getCaseCount());
+                double passRate = Double.parseDouble(rateFormat.format((double) report.getPassCount() / (double) report.getCaseCount()));
+                if (passRate == 1 && report.getPassCount() < report.getCaseCount()) {
+                    report.setPassRate(0.99);
+                } else {
+                    report.setPassRate(passRate);
+                }
             } else {
-                report.setPassRate(0.0);
+                report.setPassRate(0.00);
             }
 
             report.setName(testPlan.getName());
diff --git a/test-track/frontend/src/business/plan/view/comonents/report/detail/TestPlanOverviewReport.vue b/test-track/frontend/src/business/plan/view/comonents/report/detail/TestPlanOverviewReport.vue
index 48901c4e5d..0a3bd3c595 100644
--- a/test-track/frontend/src/business/plan/view/comonents/report/detail/TestPlanOverviewReport.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/report/detail/TestPlanOverviewReport.vue
@@ -19,7 +19,7 @@
             {{ resourcePool }}
           </el-form-item>
         </el-col>
-        <el-col :span="8"> </el-col>
+        <el-col :span="8"></el-col>
       </el-row>
       <el-row
         class="select-time"
@@ -70,7 +70,7 @@
             :label="$t('test_track.report.executive_finish_rate') + ':'"
           >
             {{
-              (report.executeRate ? (report.executeRate * 100).toFixed(1) : 0) +
+              (report.executeRate ? (report.executeRate * 100).toFixed(2) : 0) +
               "%"
             }}
             <ms-instructions-icon
@@ -81,7 +81,7 @@
         <el-col :span="8">
           <el-form-item :label="$t('test_track.report.passing_rate') + ':'">
             {{
-              (report.passRate ? (report.passRate * 100).toFixed(1) : 0) + "%"
+              (report.passRate ? (report.passRate * 100).toFixed(2) : 0) + "%"
             }}
             <ms-instructions-icon
               :content="$t('test_track.report.passing_rate_tip')"
@@ -98,7 +98,7 @@ import MsFormDivider from "metersphere-frontend/src/components/MsFormDivider";
 import TestPlanReportContainer from "@/business/plan/view/comonents/report/detail/TestPlanReportContainer";
 import MsInstructionsIcon from "metersphere-frontend/src/components/MsInstructionsIcon";
 import MsTag from "metersphere-frontend/src/components/MsTag";
-import { datetimeFormat } from "fit2cloud-ui/src/filters/time";
+import {datetimeFormat} from "fit2cloud-ui/src/filters/time";
 
 export default {
   name: "TestPlanOverviewReport",