From 0757d0f6ab27f841e0383ce3e2b9136705abc50c Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 28 Aug 2020 16:03:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E6=B1=A0=E4=B8=8B=E6=8B=89=E6=A1=86=E6=98=BE=E7=A4=BAuuid?=
 =?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

---
 .../performance/test/components/PerformancePressureConfig.vue    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
index 6cefcff2df..6837672908 100644
--- a/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
+++ b/frontend/src/business/components/performance/test/components/PerformancePressureConfig.vue
@@ -164,6 +164,7 @@ export default {
       } else {
         this.calculateChart();
       }
+      this.getResourcePools();
     },
   },
   methods: {

From 8298781148c4b84fcd96ac885aadd106abfb66d3 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Fri, 28 Aug 2020 16:26:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E8=B7=AF=E7=94=B1=E4=B9=8B=E5=90=8E=E6=89=A7=E8=A1=8C=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=B2=A1=E6=9C=89=E6=9F=A5=E8=AF=A2=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../report/PerformanceReportView.vue          | 429 +++++++++---------
 1 file changed, 206 insertions(+), 223 deletions(-)

diff --git a/frontend/src/business/components/performance/report/PerformanceReportView.vue b/frontend/src/business/components/performance/report/PerformanceReportView.vue
index 573ec9f502..6492b79630 100644
--- a/frontend/src/business/components/performance/report/PerformanceReportView.vue
+++ b/frontend/src/business/components/performance/report/PerformanceReportView.vue
@@ -22,9 +22,9 @@
                          @click="rerun(testId)">
                 {{ $t('report.test_execute_again') }}
               </el-button>
-             <!-- <el-button :disabled="isReadOnly" type="info" plain size="mini" @click="exports(reportName)">
-                {{$t('report.export')}}
-              </el-button>-->
+              <!-- <el-button :disabled="isReadOnly" type="info" plain size="mini" @click="exports(reportName)">
+                 {{$t('report.export')}}
+               </el-button>-->
               <!--
               <el-button :disabled="isReadOnly" type="warning" plain size="mini">
                 {{$t('report.compare')}}
@@ -82,252 +82,235 @@
 </template>
 
 <script>
-  import MsReportErrorLog from './components/ErrorLog';
-  import MsReportLogDetails from './components/LogDetails';
-  import MsReportRequestStatistics from './components/RequestStatistics';
-  import MsReportTestOverview from './components/TestOverview';
-  import MsPerformancePressureConfig from "./components/PerformancePressureConfig";
-  import MsContainer from "../../common/components/MsContainer";
-  import MsMainContainer from "../../common/components/MsMainContainer";
+import MsReportErrorLog from './components/ErrorLog';
+import MsReportLogDetails from './components/LogDetails';
+import MsReportRequestStatistics from './components/RequestStatistics';
+import MsReportTestOverview from './components/TestOverview';
+import MsPerformancePressureConfig from "./components/PerformancePressureConfig";
+import MsContainer from "../../common/components/MsContainer";
+import MsMainContainer from "../../common/components/MsMainContainer";
 
-  import {checkoutTestManagerOrTestUser} from "@/common/js/utils";
-  import writer from "file-writer";
-  import ResumeCss from "../../../../common/css/main.css";
+import {checkoutTestManagerOrTestUser} from "@/common/js/utils";
 
-  export default {
-    name: "PerformanceReportView",
-    components: {
-      MsReportErrorLog,
-      MsReportLogDetails,
-      MsReportRequestStatistics,
-      MsReportTestOverview,
-      MsContainer,
-      MsMainContainer,
-      MsPerformancePressureConfig
-    },
-    data() {
-      return {
-        result: {},
-        active: '1',
-        reportId: '',
-        status: '',
-        reportName: '',
-        testId: '',
-        testName: '',
-        projectId: '',
-        projectName: '',
-        startTime: '0',
-        endTime: '0',
-        minutes: '0',
-        seconds: '0',
-        title: 'Logging',
-        report: {},
-        isReadOnly: false,
-        websocket: null,
-        dialogFormVisible: false,
-        testPlan: {testResourcePoolId: null}
+export default {
+  name: "PerformanceReportView",
+  components: {
+    MsReportErrorLog,
+    MsReportLogDetails,
+    MsReportRequestStatistics,
+    MsReportTestOverview,
+    MsContainer,
+    MsMainContainer,
+    MsPerformancePressureConfig
+  },
+  data() {
+    return {
+      result: {},
+      active: '1',
+      reportId: '',
+      status: '',
+      reportName: '',
+      testId: '',
+      testName: '',
+      projectId: '',
+      projectName: '',
+      startTime: '0',
+      endTime: '0',
+      minutes: '0',
+      seconds: '0',
+      title: 'Logging',
+      report: {},
+      isReadOnly: false,
+      websocket: null,
+      dialogFormVisible: false,
+      testPlan: {testResourcePoolId: null}
+    }
+  },
+  methods: {
+    initBreadcrumb() {
+      if (this.reportId) {
+        this.result = this.$get("/performance/report/test/pro/info/" + this.reportId, res => {
+          let data = res.data;
+          if (data) {
+            this.reportName = data.name;
+            this.testId = data.testId;
+            this.testName = data.testName;
+            this.projectId = data.projectId;
+            this.projectName = data.projectName;
+          }
+        })
       }
     },
-    methods: {
-      initBreadcrumb() {
-        if (this.reportId) {
-          this.result = this.$get("/performance/report/test/pro/info/" + this.reportId, res => {
-            let data = res.data;
+    initReportTimeInfo() {
+      if (this.reportId) {
+        this.result = this.$get("/performance/report/content/report_time/" + this.reportId)
+          .then(res => {
+            let data = res.data.data;
             if (data) {
-              this.reportName = data.name;
-              this.testId = data.testId;
-              this.testName = data.testName;
-              this.projectId = data.projectId;
-              this.projectName = data.projectName;
+              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();
           })
-        }
-      },
-      initReportTimeInfo() {
-        if (this.reportId) {
-          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();
-            })
-        }
-      },
-      initWebSocket() {
-        let protocol = "ws://";
-        if (window.location.protocol === 'https:') {
-          protocol = "wss://";
-        }
-        const uri = protocol + window.location.host + "/performance/report/" + this.reportId;
-        this.websocket = new WebSocket(uri);
-        this.websocket.onmessage = this.onMessage;
-        this.websocket.onopen = this.onOpen;
-        this.websocket.onerror = this.onError;
-        this.websocket.onclose = this.onClose;
-      },
-      checkReportStatus(status) {
-        switch (status) {
-          case 'Error':
-            this.$warning(this.$t('report.generation_error'));
-            break;
-          case 'Starting':
-            this.$alert(this.$t('report.start_status'));
-            break;
-          case 'Reporting':
-          case 'Running':
-          case 'Completed':
-          default:
-            break;
-        }
-      },
-      clearData() {
-        this.startTime = '0';
-        this.endTime = '0';
-        this.minutes = '0';
-        this.seconds = '0';
-      },
-      stopTest(forceStop) {
-        this.result = this.$get('/performance/stop/' + this.reportId + '/' + forceStop, () => {
-          this.$success(this.$t('report.test_stop_success'));
-          if (forceStop) {
-            this.$router.push('/performance/report/all');
-          } else {
-            this.report.status = 'Completed';
-          }
-        });
-        this.dialogFormVisible = false;
-      },
-      rerun(testId) {
-        this.$confirm(this.$t('report.test_rerun_confirm'), '', {
-          confirmButtonText: this.$t('commons.confirm'),
-          cancelButtonText: this.$t('commons.cancel'),
-          type: 'warning'
-        }).then(() => {
-          this.result = this.$post('/performance/run', {id: testId, triggerMode: 'MANUAL'}, (response) => {
-            this.reportId = response.data;
-            this.$router.push({path: '/performance/report/view/' + this.reportId});
-            // 注册 socket
-            this.initWebSocket();
-          })
-        }).catch(() => {
-        });
-      },
-      onOpen() {
-        window.console.log("socket opening.");
-      },
-      onError(e) {
-        window.console.error(e)
-      },
-      onMessage(e) {
-        this.$set(this.report, "refresh", e.data); // 触发刷新
-        this.$set(this.report, "status", 'Running');
-        this.initReportTimeInfo();
-        window.console.log('receive a message:', e.data);
-      },
-      onClose(e) {
-        this.$set(this.report, "refresh", Math.random()); // 触发刷新
-        this.$set(this.report, "status", 'Completed');
-        this.initReportTimeInfo();
-        window.console.log("socket closed.");
       }
     },
-    created() {
-      this.isReadOnly = false;
-      if (!checkoutTestManagerOrTestUser()) {
-        this.isReadOnly = true;
+    initWebSocket() {
+      let protocol = "ws://";
+      if (window.location.protocol === 'https:') {
+        protocol = "wss://";
       }
-      this.reportId = this.$route.path.split('/')[4];
-      this.result = this.$get("/performance/report/" + this.reportId, res => {
-        let data = res.data;
-        if (data) {
-          this.status = data.status;
-          this.$set(this.report, "id", this.reportId);
-          this.$set(this.report, "status", data.status);
-          this.$set(this.report, "testId", data.testId);
-          this.$set(this.report, "loadConfiguration", data.loadConfiguration);
-          this.checkReportStatus(data.status);
-          if (this.status === "Completed" || this.status === "Running") {
-            this.initReportTimeInfo();
-          }
-          this.initBreadcrumb();
-          this.initWebSocket();
+      const uri = protocol + window.location.host + "/performance/report/" + this.reportId;
+      this.websocket = new WebSocket(uri);
+      this.websocket.onmessage = this.onMessage;
+      this.websocket.onopen = this.onOpen;
+      this.websocket.onerror = this.onError;
+      this.websocket.onclose = this.onClose;
+    },
+    checkReportStatus(status) {
+      switch (status) {
+        case 'Error':
+          this.$warning(this.$t('report.generation_error'));
+          break;
+        case 'Starting':
+          this.$alert(this.$t('report.start_status'));
+          break;
+        case 'Reporting':
+        case 'Running':
+        case 'Completed':
+        default:
+          break;
+      }
+    },
+    clearData() {
+      this.startTime = '0';
+      this.endTime = '0';
+      this.minutes = '0';
+      this.seconds = '0';
+    },
+    stopTest(forceStop) {
+      this.result = this.$get('/performance/stop/' + this.reportId + '/' + forceStop, () => {
+        this.$success(this.$t('report.test_stop_success'));
+        if (forceStop) {
+          this.$router.push('/performance/report/all');
         } else {
-          this.$error(this.$t('report.not_exist'))
+          this.report.status = 'Completed';
         }
       });
-
+      this.dialogFormVisible = false;
     },
-    beforeDestroy() {
-      this.websocket.close() //离开路由之后断开websocket连接
+    rerun(testId) {
+      this.$confirm(this.$t('report.test_rerun_confirm'), '', {
+        confirmButtonText: this.$t('commons.confirm'),
+        cancelButtonText: this.$t('commons.cancel'),
+        type: 'warning'
+      }).then(() => {
+        this.result = this.$post('/performance/run', {id: testId, triggerMode: 'MANUAL'}, (response) => {
+          this.reportId = response.data;
+          this.$router.push({path: '/performance/report/view/' + this.reportId});
+          // 注册 socket
+          this.initWebSocket();
+        })
+      }).catch(() => {
+      });
     },
-    watch: {
-      '$route'(to) {
-        if (to.name === "perReportView") {
-          this.isReadOnly = false;
-          if (!checkoutTestManagerOrTestUser()) {
-            this.isReadOnly = true;
-          }
-          let reportId = to.path.split('/')[4];
-          this.reportId = reportId;
-          if (reportId) {
-            this.$get("/performance/report/test/pro/info/" + reportId, response => {
-              let data = response.data;
-              if (data) {
-                this.status = data.status;
-                this.reportName = data.name;
-                this.testName = data.testName;
-                this.testId = data.testId;
-                this.projectName = data.projectName;
+    onOpen() {
+      window.console.log("socket opening.");
+    },
+    onError(e) {
+      window.console.error(e)
+    },
+    onMessage(e) {
+      this.$set(this.report, "refresh", e.data); // 触发刷新
+      this.$set(this.report, "status", 'Running');
+      this.initReportTimeInfo();
+      window.console.log('receive a message:', e.data);
+    },
+    onClose(e) {
+      this.$set(this.report, "refresh", Math.random()); // 触发刷新
+      this.$set(this.report, "status", 'Completed');
+      this.initReportTimeInfo();
+      window.console.log("socket closed.");
+    }
+  },
+  created() {
+    this.isReadOnly = false;
+    if (!checkoutTestManagerOrTestUser()) {
+      this.isReadOnly = true;
+    }
+    this.reportId = this.$route.path.split('/')[4];
+    this.result = this.$get("/performance/report/" + this.reportId, res => {
+      let data = res.data;
+      if (data) {
+        this.status = data.status;
+        this.$set(this.report, "id", this.reportId);
+        this.$set(this.report, "status", data.status);
+        this.$set(this.report, "testId", data.testId);
+        this.$set(this.report, "loadConfiguration", data.loadConfiguration);
+        this.checkReportStatus(data.status);
+        if (this.status === "Completed" || this.status === "Running") {
+          this.initReportTimeInfo();
+        }
+        this.initBreadcrumb();
+        this.initWebSocket();
+      } else {
+        this.$error(this.$t('report.not_exist'))
+      }
+    });
 
-                this.$set(this.report, "id", reportId);
-                this.$set(this.report, "status", data.status);
+  },
+  beforeDestroy() {
+    this.websocket.close() //离开路由之后断开websocket连接
+  },
+  watch: {
+    '$route'(to) {
+      if (to.name === "perReportView") {
+        this.isReadOnly = false;
+        if (!checkoutTestManagerOrTestUser()) {
+          this.isReadOnly = true;
+        }
+        let reportId = to.path.split('/')[4];
+        this.reportId = reportId;
+        if (reportId) {
+          this.$get("/performance/report/test/pro/info/" + reportId, response => {
+            let data = response.data;
+            if (data) {
+              this.status = data.status;
+              this.reportName = data.name;
+              this.testName = data.testName;
+              this.testId = data.testId;
+              this.projectName = data.projectName;
 
-                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();
-                }
-              } else {
-                this.$error(this.$t('report.not_exist'));
-              }
-            });
+              this.$set(this.report, "id", reportId);
+              this.$set(this.report, "status", data.status);
+
+              this.checkReportStatus(data.status);
+              this.initReportTimeInfo();
+            } else {
+              this.$error(this.$t('report.not_exist'));
+            }
+          });
 
-          }
         }
       }
     }
   }
+}
 </script>
 
 <style scoped>
 
-  .ms-report-view-btns {
-    margin-top: 15px;
-  }
+.ms-report-view-btns {
+  margin-top: 15px;
+}
 
-  .ms-report-time-desc {
-    text-align: left;
-    display: block;
-    color: #5C7878;
-  }
+.ms-report-time-desc {
+  text-align: left;
+  display: block;
+  color: #5C7878;
+}
 
 </style>