Merge remote-tracking branch 'origin/v1.2' into v1.2

frontend/src/business/components/performance/report/PerformanceReportView.vue

@@ -91,8 +91,6 @@
 import MsMainContainer from "../../common/components/MsMainContainer";
 
 import {checkoutTestManagerOrTestUser} from "@/common/js/utils";
-  import writer from "file-writer";
-  import ResumeCss from "../../../../common/css/main.css";
 
 export default {
   name: "PerformanceReportView",
@@ -290,22 +288,7 @@
               this.$set(this.report, "status", data.status);
 
               this.checkReportStatus(data.status);
-                if (this.status === "Completed") {
-                  this.result = this.$get("/performance/report/content/report_time/" + this.reportId).then(res => {
-                    let data = res.data.data;
-                    if (data) {
-                      this.startTime = data.startTime;
-                      this.endTime = data.endTime;
-                      let duration = data.duration;
-                      this.minutes = Math.floor(duration / 60);
-                      this.seconds = duration % 60;
-                    }
-                  }).catch(() => {
-                    this.clearData();
-                  })
-                } else {
-                  this.clearData();
-                }
+              this.initReportTimeInfo();
             } else {
               this.$error(this.$t('report.not_exist'));
             }

frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue

@@ -164,6 +164,7 @@ export default {
       } else {
         this.calculateChart();
       }
+      this.getResourcePools();
     },
   },
   methods: {