diff --git a/backend/src/main/java/io/metersphere/api/controller/APITestController.java b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
index bf555b0493..7811553000 100644
--- a/backend/src/main/java/io/metersphere/api/controller/APITestController.java
+++ b/backend/src/main/java/io/metersphere/api/controller/APITestController.java
@@ -94,6 +94,10 @@ public class APITestController {
     public String runDebug(@RequestPart("request")  SaveAPITestRequest request,  @RequestPart(value = "file") MultipartFile file, @RequestPart(value = "files") List<MultipartFile> bodyFiles) {
         return apiTestService.runDebug(request, file, bodyFiles);
     }
+    @PostMapping(value = "/checkName")
+    public void checkName(@RequestBody SaveAPITestRequest request) {
+        apiTestService.checkName(request);
+    }
 
     @PostMapping(value = "/import", consumes = {"multipart/form-data"})
     @RequiresRoles(value = {RoleConstants.TEST_USER, RoleConstants.TEST_MANAGER}, logical = Logical.OR)
diff --git a/backend/src/main/java/io/metersphere/api/service/APITestService.java b/backend/src/main/java/io/metersphere/api/service/APITestService.java
index f1fc146c74..ea5690ecae 100644
--- a/backend/src/main/java/io/metersphere/api/service/APITestService.java
+++ b/backend/src/main/java/io/metersphere/api/service/APITestService.java
@@ -245,6 +245,13 @@ public class APITestService {
             MSException.throwException(Translator.get("load_test_already_exists"));
         }
     }
+    public void checkName(SaveAPITestRequest request) {
+        ApiTestExample example = new ApiTestExample();
+        example.createCriteria().andNameEqualTo(request.getName()).andProjectIdEqualTo(request.getProjectId());
+        if (apiTestMapper.countByExample(example) > 0) {
+            MSException.throwException(Translator.get("load_test_already_exists"));
+        }
+    }
 
     private ApiTest updateTest(SaveAPITestRequest request) {
         checkNameExist(request);
diff --git a/backend/src/main/java/io/metersphere/excel/utils/EasyExcelExporter.java b/backend/src/main/java/io/metersphere/excel/utils/EasyExcelExporter.java
index be802d3bfb..5a6b39fd20 100644
--- a/backend/src/main/java/io/metersphere/excel/utils/EasyExcelExporter.java
+++ b/backend/src/main/java/io/metersphere/excel/utils/EasyExcelExporter.java
@@ -1,8 +1,11 @@
 package io.metersphere.excel.utils;
 
 import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.write.metadata.style.WriteCellStyle;
+import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
 import io.metersphere.commons.utils.LogUtil;
 import io.metersphere.exception.ExcelException;
+import org.apache.poi.ss.usermodel.IndexedColors;
 
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -29,9 +32,12 @@ public class EasyExcelExporter {
     public void export(HttpServletResponse response, List data, String fileName, String sheetName) {
         response.setContentType("application/vnd.ms-excel");
         response.setCharacterEncoding("utf-8");
+        WriteCellStyle contentWriteCellStyle = new WriteCellStyle();
+        contentWriteCellStyle.setWrapped(true);
         try {
+            HorizontalCellStyleStrategy horizontalCellStyleStrategy = new HorizontalCellStyleStrategy(null, contentWriteCellStyle);
             response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode(fileName, "UTF-8") + ".xlsx");
-            EasyExcel.write(response.getOutputStream(), this.clazz).sheet(sheetName).doWrite(data);
+            EasyExcel.write(response.getOutputStream(), this.clazz).registerWriteHandler(horizontalCellStyleStrategy).sheet(sheetName).doWrite(data);
         } catch (UnsupportedEncodingException e) {
             LogUtil.error(e.getMessage(), e);
             throw new ExcelException("Utf-8 encoding is not supported");
diff --git a/backend/src/main/java/io/metersphere/track/service/IssuesService.java b/backend/src/main/java/io/metersphere/track/service/IssuesService.java
index 718fdcd05a..76e55cf953 100644
--- a/backend/src/main/java/io/metersphere/track/service/IssuesService.java
+++ b/backend/src/main/java/io/metersphere/track/service/IssuesService.java
@@ -224,6 +224,10 @@ public class IssuesService {
         String account = object.getString("account");
         String password = object.getString("password");
         String url = object.getString("url");
+        String issuetype = object.getString("issuetype");
+        if (StringUtils.isBlank(issuetype)) {
+            MSException.throwException("Jira 问题类型为空");
+        }
         String auth = EncryptUtils.base64Encoding(account + ":" + password);
 
         String testCaseId = issuesRequest.getTestCaseId();
@@ -252,8 +256,7 @@ public class IssuesService {
                 "        \"summary\":\"" + issuesRequest.getTitle() + "\",\n" +
                 "        \"description\": " + JSON.toJSONString(desc) + ",\n" +
                 "        \"issuetype\":{\n" +
-                "            \"id\":\"10009\",\n" +
-                "            \"name\":\"Defect\"\n" +
+                "            \"name\":\"" + issuetype + "\"\n" +
                 "        }\n" +
                 "    }\n" +
                 "}";
diff --git a/frontend/src/business/components/api/test/ApiTestList.vue b/frontend/src/business/components/api/test/ApiTestList.vue
index 4366a21153..8c2c7903f6 100644
--- a/frontend/src/business/components/api/test/ApiTestList.vue
+++ b/frontend/src/business/components/api/test/ApiTestList.vue
@@ -11,12 +11,13 @@
 
         </template>
 
-        <one-click-operation ref="OneClickOperation" :select-ids="selectIds" :select-names="selectNames"
-                             :select-project-names="selectProjectNames" @refresh="init()"></one-click-operation>
+        <one-click-operation ref="OneClickOperation" :select-ids="selectIds"
+                             :select-project-names="selectProjectNames" :select-project-id="selectProjectId"
+                             @refresh="init()"></one-click-operation>
 
         <el-table border :data="tableData" class="adjust-table table-content" @sort-change="sort"
                   @row-click="handleView"
-                  @filter-change="filter" @select-all="handleSelectAll" @select="selectionChange">
+                  @filter-change="filter" @select-all="select" @select="select">
           <el-table-column
             type="selection"></el-table-column>
           <el-table-column prop="name" :label="$t('commons.name')" width="250" show-overflow-tooltip>
@@ -59,175 +60,164 @@
 </template>
 
 <script>
-import OneClickOperation from './OneClickOperation';
-import MsTablePagination from "../../common/pagination/TablePagination";
-import MsTableHeader from "../../common/components/MsTableHeader";
-import MsTableOperator from "../../common/components/MsTableOperator";
-import MsContainer from "../../common/components/MsContainer";
-import MsMainContainer from "../../common/components/MsMainContainer";
-import MsApiTestStatus from "./ApiTestStatus";
-import MsTableOperators from "../../common/components/MsTableOperators";
-import {_filter, _sort} from "@/common/js/utils";
-import {TEST_CONFIGS} from "../../common/components/search/search-components";
-import {ApiEvent, LIST_CHANGE} from "@/business/components/common/head/ListEvent";
-import ApiCopyDialog from "./components/ApiCopyDialog";
+  import OneClickOperation from './OneClickOperation';
+  import MsTablePagination from "../../common/pagination/TablePagination";
+  import MsTableHeader from "../../common/components/MsTableHeader";
+  import MsTableOperator from "../../common/components/MsTableOperator";
+  import MsContainer from "../../common/components/MsContainer";
+  import MsMainContainer from "../../common/components/MsMainContainer";
+  import MsApiTestStatus from "./ApiTestStatus";
+  import MsTableOperators from "../../common/components/MsTableOperators";
+  import {_filter, _sort} from "@/common/js/utils";
+  import {TEST_CONFIGS} from "../../common/components/search/search-components";
+  import {ApiEvent, LIST_CHANGE} from "@/business/components/common/head/ListEvent";
+  import ApiCopyDialog from "./components/ApiCopyDialog";
 
-export default {
-  components: {
-    ApiCopyDialog,
-    OneClickOperation,
-    MsTableOperators,
-    MsApiTestStatus, MsMainContainer, MsContainer, MsTableHeader, MsTablePagination, MsTableOperator
-  },
-  data() {
-    return {
-      result: {},
-      condition: {
-        components: TEST_CONFIGS
-      },
-      projectId: null,
-      tableData: [],
-      multipleSelection: [],
-      currentPage: 1,
-      pageSize: 5,
-      total: 0,
-      loading: false,
-      selectIds: new Set(),
-      selectNames: new Set(),
-      selectProjectNames: new Set(),
-      buttons: [
-        {
-          tip: this.$t('commons.edit'), icon: "el-icon-edit",
-          exec: this.handleEdit
-        }, {
-          tip: this.$t('commons.copy'), icon: "el-icon-copy-document", type: "success",
-          exec: this.handleCopy
-        }, {
-          tip: this.$t('commons.delete'), icon: "el-icon-delete", type: "danger",
-          exec: this.handleDelete
-        }
-      ],
-      statusFilters: [
-        {text: 'Saved', value: 'Saved'},
-        {text: 'Starting', value: 'Starting'},
-        {text: 'Running', value: 'Running'},
-        {text: 'Reporting', value: 'Reporting'},
-        {text: 'Completed', value: 'Completed'},
-        {text: 'Error', value: 'Error'}
-      ]
-    }
-  },
-
-  watch: {
-    '$route': 'init'
-  },
-
-  methods: {
-    create() {
-      this.$router.push('/api/test/create');
+  export default {
+    components: {
+      ApiCopyDialog,
+      OneClickOperation,
+      MsTableOperators,
+      MsApiTestStatus, MsMainContainer, MsContainer, MsTableHeader, MsTablePagination, MsTableOperator
+    },
+    data() {
+      return {
+        result: {},
+        condition: {
+          components: TEST_CONFIGS
+        },
+        projectId: null,
+        tableData: [],
+        multipleSelection: [],
+        currentPage: 1,
+        pageSize: 5,
+        total: 0,
+        loading: false,
+        selectIds: new Set(),
+        selectProjectNames: new Set(),
+        selectProjectId: new Set(),
+        buttons: [
+          {
+            tip: this.$t('commons.edit'), icon: "el-icon-edit",
+            exec: this.handleEdit
+          }, {
+            tip: this.$t('commons.copy'), icon: "el-icon-copy-document", type: "success",
+            exec: this.handleCopy
+          }, {
+            tip: this.$t('commons.delete'), icon: "el-icon-delete", type: "danger",
+            exec: this.handleDelete
+          }
+        ],
+        statusFilters: [
+          {text: 'Saved', value: 'Saved'},
+          {text: 'Starting', value: 'Starting'},
+          {text: 'Running', value: 'Running'},
+          {text: 'Reporting', value: 'Reporting'},
+          {text: 'Completed', value: 'Completed'},
+          {text: 'Error', value: 'Error'}
+        ]
+      }
     },
 
-    handleSelectAll(selection) {
-      if (selection.length > 0) {
-        this.tableData.forEach(item => {
-          this.selectIds.add(item.id);
-          this.selectProjectNames.add(item.projectName)
-        });
-      } else {
+    watch: {
+      '$route': 'init'
+    },
+
+    methods: {
+      create() {
+        this.$router.push('/api/test/create');
+      },
+      select(selection) {
         this.selectIds.clear()
         this.selectProjectNames.clear()
-      }
-    },
-    selectionChange(selection, row) {
-      if (this.selectIds.has(row.id)) {
-        this.selectIds.delete(row.id);
-        this.selectProjectNames.delete(row.projectName)
-      } else {
-        this.selectIds.add(row.id);
-        this.selectProjectNames.add(row.projectName)
-      }
-    },
-    runTest() {
-      if (this.selectIds.size < 1) {
-        this.$warning(this.$t('test_track.plan_view.select_manipulate'));
-      } else {
-        this.$refs.OneClickOperation.openOneClickOperation();
-      }
-    },
-    search() {
-      if (this.projectId !== 'all') {
-        this.condition.projectId = this.projectId;
-      }
-      let url = "/api/list/" + this.currentPage + "/" + this.pageSize;
-      this.result = this.$post(url, this.condition, response => {
-        let data = response.data;
-        this.total = data.itemCount;
-        this.tableData = data.listObject;
-        this.tableData.forEach(item => {
-          this.selectNames.add(item.name)
+        this.selectProjectId.clear()
+        selection.forEach(s => {
+          this.selectIds.add(s.id)
+          this.selectProjectNames.add(s.projectName)
+          this.selectProjectId.add(s.projectId)
         })
-      });
-    },
-    handleSelectionChange(val) {
-      this.multipleSelection = val;
-    },
-    handleEdit(test) {
-      this.$router.push({
-        path: '/api/test/edit?id=' + test.id,
-      })
-    },
-    handleView(test) {
-      this.$router.push({
-        path: '/api/test/view?id=' + test.id,
-      })
-    },
-    handleDelete(test) {
-      this.$alert(this.$t('load_test.delete_confirm') + test.name + "？", '', {
-        confirmButtonText: this.$t('commons.confirm'),
-        callback: (action) => {
-          if (action === 'confirm') {
-            this.result = this.$post("/api/delete", {id: test.id}, () => {
-              this.$success(this.$t('commons.delete_success'));
-              this.search();
-              // 发送广播，刷新 head 上的最新列表
-              ApiEvent.$emit(LIST_CHANGE);
-            });
-          }
+      },
+      runTest() {
+        if (this.selectIds.size < 1) {
+          this.$warning(this.$t('test_track.plan_view.select_manipulate'));
+        } else {
+          this.$refs.OneClickOperation.openOneClickOperation();
         }
-      });
+      },
+      search() {
+        if (this.projectId !== 'all') {
+          this.condition.projectId = this.projectId;
+        }
+        let url = "/api/list/" + this.currentPage + "/" + this.pageSize;
+        this.result = this.$post(url, this.condition, response => {
+          let data = response.data;
+          this.total = data.itemCount;
+          this.tableData = data.listObject;
+        });
+      },
+      handleSelectionChange(val) {
+        this.multipleSelection = val;
+      },
+      handleEdit(test) {
+        this.$router.push({
+          path: '/api/test/edit?id=' + test.id,
+        })
+      },
+      handleView(test) {
+        this.$router.push({
+          path: '/api/test/view?id=' + test.id,
+        })
+      },
+      handleDelete(test) {
+        this.$alert(this.$t('load_test.delete_confirm') + test.name + "？", '', {
+          confirmButtonText: this.$t('commons.confirm'),
+          callback: (action) => {
+            if (action === 'confirm') {
+              this.result = this.$post("/api/delete", {id: test.id}, () => {
+                this.$success(this.$t('commons.delete_success'));
+                this.search();
+                // 发送广播，刷新 head 上的最新列表
+                ApiEvent.$emit(LIST_CHANGE);
+              });
+            }
+          }
+        });
+      },
+      handleCopy(test) {
+        this.$refs.apiCopy.open(test);
+      },
+      init() {
+        this.selectIds.clear()
+        this.selectProjectNames.clear()
+        this.selectIds.clear()
+        this.projectId = this.$route.params.projectId;
+        if (this.projectId && this.projectId !== "all") {
+          this.$store.commit('setProjectId', this.projectId);
+        }
+        this.search();
+      },
+      sort(column) {
+        _sort(column, this.condition);
+        this.init();
+      },
+      filter(filters) {
+        _filter(filters, this.condition);
+        this.init();
+      },
     },
-    handleCopy(test) {
-      this.$refs.apiCopy.open(test);
-    },
-    init() {
-      this.projectId = this.$route.params.projectId;
-      if (this.projectId && this.projectId !== "all") {
-        this.$store.commit('setProjectId', this.projectId);
-      }
-      this.search();
-    },
-    sort(column) {
-      _sort(column, this.condition);
+    created() {
       this.init();
-    },
-    filter(filters) {
-      _filter(filters, this.condition);
-      this.init();
-    },
-  },
-  created() {
-    this.init();
-  }
+    }
 
-}
+  }
 </script>
 
 <style scoped>
-.table-content {
-  width: 100%;
-}
+  .table-content {
+    width: 100%;
+  }
 
-.el-table {
-  cursor: pointer;
-}
+  .el-table {
+    cursor: pointer;
+  }
 </style>
diff --git a/frontend/src/business/components/api/test/OneClickOperation.vue b/frontend/src/business/components/api/test/OneClickOperation.vue
index 7a1b3285bd..3081b87d8e 100644
--- a/frontend/src/business/components/api/test/OneClickOperation.vue
+++ b/frontend/src/business/components/api/test/OneClickOperation.vue
@@ -26,7 +26,7 @@
   import MsApiScenarioConfig from "./components/ApiScenarioConfig";
   import MsApiReportStatus from "../report/ApiReportStatus";
   import MsApiReportDialog from "./ApiReportDialog";
-  import {getUUID} from "../../../../common/js/utils";
+  import {getUUID} from "@/common/js/utils";
 
 
   export default {
@@ -41,6 +41,7 @@
         tests: [],
         ruleForm: {},
         change: false,
+        projectId: "",
         rule: {
           testName: [
             {required: true, message: this.$t('api_test.input_name'), trigger: 'blur'},
@@ -61,10 +62,10 @@
       selectIds: {
         type: Set
       },
-      selectNames: {
+      selectProjectNames: {
         type: Set
       },
-      selectProjectNames: {
+      selectProjectId: {
         type: Set
       }
     },
@@ -73,26 +74,33 @@
         this.oneClickOperationVisible = true;
       },
       checkedSaveAndRunTest() {
-        if (this.selectNames.has(this.ruleForm.testName)) {
-          this.selectIds.clear()
-          this.$warning(this.$t('load_test.already_exists'));
-          this.oneClickOperationVisible = false;
-          this.$emit('refresh')
-        } else {
+        if (this.ruleForm.testName) {
           if (this.selectProjectNames.size > 1) {
-            this.selectIds.clear()
             this.$warning(this.$t('load_test.same_project_test'));
             this.oneClickOperationVisible = false;
             this.$emit('refresh')
           } else {
-            for (let x of this.selectIds) {
-              this.getTest(x)
-            }
+            this.checkNameResult(this.ruleForm.testName)
           }
+        } else {
+          this.$warning(this.$t('api_test.input_name'))
+        }
+      },
+      checkNameResult() {
+        this.checkName(() => {
+          for (let x of this.selectIds) {
+            this.getTest(x)
+          }
+        })
+      },
+      checkName(callback) {
+        for (let i of this.selectProjectId) {
+          this.result = this.$post('/api/checkName', {name: this.ruleForm.testName, projectId: i}, () => {
+            if (callback) callback();
+          })
         }
       },
       _getEnvironmentAndRunTest: function (item) {
-        let count = 0;
         this.result = this.$get('/api/environment/list/' + item.projectId, response => {
           let environments = response.data;
           let environmentMap = new Map();
diff --git a/frontend/src/business/components/performance/report/PerformanceReportView.vue b/frontend/src/business/components/performance/report/PerformanceReportView.vue
index 573ec9f502..34b33e0bd0 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,244 @@
 </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.status === 'Starting') {
+        this.clearData();
+        return;
+      }
+      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;
             }
-          })
-        }
-      },
-      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.");
+          }).catch(() => {
+            this.clearData();
+          });
       }
     },
-    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;
-
-                this.$set(this.report, "id", reportId);
-                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();
-                }
-              } else {
-                this.$error(this.$t('report.not_exist'));
-              }
-            });
-
-          }
+    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.status = 'Running';
+      this.initReportTimeInfo();
+      window.console.log('receive a message:', e.data);
+    },
+    onClose(e) {
+      if (e.code === 1005) {
+        // 强制删除之后关闭socket，不用刷新report
+        return;
+      }
+      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'))
+      }
+    });
+
+  },
+  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.$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'));
+            }
+          });
+
+        }
+      } else {
+        console.log("close socket.");
+        this.websocket.close() //离开路由之后断开websocket连接
       }
     }
   }
+}
 </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>
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: {
diff --git a/frontend/src/business/components/settings/organization/IssuesManagement.vue b/frontend/src/business/components/settings/organization/IssuesManagement.vue
index f8c58a3d72..b92784626b 100644
--- a/frontend/src/business/components/settings/organization/IssuesManagement.vue
+++ b/frontend/src/business/components/settings/organization/IssuesManagement.vue
@@ -25,6 +25,9 @@
         <el-form-item :label="$t('organization.integration.jira_url')" prop="url" v-if="platform === 'Jira'">
           <el-input v-model="form.url" :placeholder="$t('organization.integration.input_jira_url')"/>
         </el-form-item>
+        <el-form-item :label="$t('organization.integration.jira_issuetype')" prop="issuetype" v-if="platform === 'Jira'">
+          <el-input v-model="form.issuetype" :placeholder="$t('organization.integration.input_jira_issuetype')"/>
+        </el-form-item>
       </el-form>
     </div>
 
@@ -43,10 +46,13 @@
     <div class="defect-tip">
       <div>{{$t('organization.integration.use_tip')}}</div>
       <div>
-        1. {{$t('organization.integration.use_tip_one')}}
+        1. {{$t('organization.integration.use_tip_tapd')}}
       </div>
       <div>
-        2. {{$t('organization.integration.use_tip_two')}}
+        2. {{$t('organization.integration.use_tip_jira')}}
+      </div>
+      <div>
+        3. {{$t('organization.integration.use_tip_two')}}
         <router-link to="/track/project/all" style="margin-left: 5px">
           {{$t('organization.integration.link_the_project_now')}}
         </router-link>
@@ -85,6 +91,11 @@
             required: true,
             message: this.$t('organization.integration.input_jira_url'),
             trigger: ['change', 'blur']
+          },
+          issuetype: {
+            required: true,
+            message: this.$t('organization.integration.input_jira_issuetype'),
+            trigger: ['change', 'blur']
           }
         },
       }
@@ -105,6 +116,7 @@
             this.$set(this.form, 'account', config.account);
             this.$set(this.form, 'password', config.password);
             this.$set(this.form, 'url', config.url);
+            this.$set(this.form, 'issuetype', config.issuetype);
           } else {
             this.clear();
           }
@@ -153,7 +165,8 @@
         let auth = {
           account: this.form.account,
           password: this.form.password,
-          url: this.form.url
+          url: this.form.url,
+          issuetype: this.form.issuetype
         };
         param.organizationId = getCurrentUser().lastOrganizationId;
         param.platform = this.platform;
@@ -188,6 +201,7 @@
             this.$set(this.form, 'account', config.account);
             this.$set(this.form, 'password', config.password);
             this.$set(this.form, 'url', config.url);
+            this.$set(this.form, 'issuetype', config.issuetype);
           } else {
             this.clear();
           }
@@ -197,6 +211,7 @@
         this.$set(this.form, 'account', '');
         this.$set(this.form, 'password', '');
         this.$set(this.form, 'url', '');
+        this.$set(this.form, 'issuetype', '');
         this.$nextTick(() => {
           this.$refs.form.clearValidate();
         });
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index 8a77480bea..6a289f5443 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -352,8 +352,8 @@ export default {
     handleAddStep(index, data) {
       let step = {};
       step.num = data.num + 1;
-      step.desc = null;
-      step.result = null;
+      step.desc = "";
+      step.result = "";
       this.form.steps.forEach(step => {
         if (step.num > data.num) {
           step.num++;
diff --git a/frontend/src/i18n/en-US.js b/frontend/src/i18n/en-US.js
index 0ec14010a0..398045b91b 100644
--- a/frontend/src/i18n/en-US.js
+++ b/frontend/src/i18n/en-US.js
@@ -186,11 +186,14 @@ export default {
       api_account: 'API account',
       api_password: 'API password',
       jira_url: 'JIRA url',
+      jira_issuetype: 'JIRA issuetype',
       input_api_account: 'please enter account',
       input_api_password: 'Please enter password',
       input_jira_url: 'Please enter Jira address, for example: https://metersphere.atlassian.net/',
+      input_jira_issuetype: 'Please enter the question type',
       use_tip: 'Usage guidelines:',
-      use_tip_one: 'Basic Auth account information is queried in "Company Management-Security and Integration-Open Platform"',
+      use_tip_tapd: 'Basic Auth account information is queried in "Company Management-Security and Integration-Open Platform"',
+      use_tip_jira: 'Jira software server authentication information is account password, Jira software cloud authentication information is account + token (account settings-security-create API token)',
       use_tip_two: 'After saving the Basic Auth account information, you need to manually associate the ID/key in the Metersphere project',
       link_the_project_now: 'Link the project now',
       cancel_edit: 'Cancel edit',
diff --git a/frontend/src/i18n/zh-CN.js b/frontend/src/i18n/zh-CN.js
index 974ac9d8ab..53136704ea 100644
--- a/frontend/src/i18n/zh-CN.js
+++ b/frontend/src/i18n/zh-CN.js
@@ -187,11 +187,14 @@ export default {
       api_account: 'API 账号',
       api_password: 'API 口令',
       jira_url: 'JIRA 地址',
+      jira_issuetype: '问题类型',
       input_api_account: '请输入账号',
       input_api_password: '请输入口令',
       input_jira_url: '请输入Jira地址，例：https://metersphere.atlassian.net/',
+      input_jira_issuetype: '请输入问题类型',
       use_tip: '使用指引：',
-      use_tip_one: 'Basic Auth 账号信息在"公司管理-安全与集成-开放平台"中查询',
+      use_tip_tapd: 'Tapd Basic Auth 账号信息在"公司管理-安全与集成-开放平台"中查询',
+      use_tip_jira: 'Jira software server 认证信息为 账号密码，Jira software cloud 认证信息为 账号+令牌(账户设置-安全-创建API令牌)',
       use_tip_two: '保存 Basic Auth 账号信息后，需要在 Metersphere 项目中手动关联 ID/key',
       link_the_project_now: '马上关联项目',
       cancel_edit: '取消编辑',
diff --git a/frontend/src/i18n/zh-TW.js b/frontend/src/i18n/zh-TW.js
index 681aa06395..2e1ec0b27c 100644
--- a/frontend/src/i18n/zh-TW.js
+++ b/frontend/src/i18n/zh-TW.js
@@ -185,11 +185,14 @@ export default {
       api_account: 'API 賬號',
       api_password: 'API 口令',
       jira_url: 'JIRA 地址',
+      jira_issuetype: '問題類型',
       input_api_account: '請輸入賬號',
       input_api_password: '請輸入口令',
       input_jira_url: '請輸入Jira地址，例：https://metersphere.atlassian.net/',
+      input_jira_issuetype: '請輸入問題類型',
       use_tip: '使用指引：',
-      use_tip_one: 'Basic Auth 賬號信息在"公司管理-安全與集成-開放平台"中查詢',
+      use_tip_tapd: 'Basic Auth 賬號信息在"公司管理-安全與集成-開放平台"中查詢',
+      use_tip_jira: 'Jira software server 認證信息為 賬號密碼，Jira software cloud 認證信息為 賬號+令牌(賬戶設置-安全-創建API令牌)',
       use_tip_two: '保存 Basic Auth 賬號信息後，需要在 Metersphere 項目中手動關聯 ID/key',
       link_the_project_now: '馬上關聯項目',
       cancel_edit: '取消編輯',