From 478c98ac21f4af39d1b9c42bc6152b7a2a17c6f5 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 23 Mar 2021 18:05:51 +0800
Subject: [PATCH 1/9] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E5=9C=BA=E6=99=AF=E6=AD=A5=E9=AA=A4=E6=96=AD?=
 =?UTF-8?q?=E8=A8=80=E8=A7=84=E5=88=99=E5=A2=9E=E5=8A=A0=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/assertion/ApiAssertionJsr223.vue | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/frontend/src/business/components/api/definition/components/assertion/ApiAssertionJsr223.vue b/frontend/src/business/components/api/definition/components/assertion/ApiAssertionJsr223.vue
index b1294b679d..c32bfb8ef7 100644
--- a/frontend/src/business/components/api/definition/components/assertion/ApiAssertionJsr223.vue
+++ b/frontend/src/business/components/api/definition/components/assertion/ApiAssertionJsr223.vue
@@ -18,6 +18,7 @@
         {{ assertion.desc }}
       </div>
       <div class="assertion-item btn circle">
+        <i class="el-icon-view el-button el-button--primary el-button--mini is-circle" circle @click="showPage"/>
         <el-button :disabled="isReadOnly" type="success" size="mini" icon="el-icon-edit" circle @click="detail"/>
         <el-button :disabled="isReadOnly" type="danger" size="mini" icon="el-icon-delete" circle @click="remove"/>
       </div>
@@ -27,23 +28,23 @@
       <el-row type="flex" justify="space-between" align="middle" class="quick-script-block">
         <div class="assertion-item input">
           <el-input size="small" v-model="assertion.variable"
-                    :placeholder="$t('api_test.request.assertions.variable_name')" @change="quickScript"/>
+                    :placeholder="$t('api_test.request.assertions.variable_name')" @change="quickScript" :disabled="disabled"/>
         </div>
 
         <div class="assertion-item select">
           <el-select v-model="assertion.operator" :placeholder="$t('commons.please_select')" size="small"
-                     @change="changeOperator">
+                     @change="changeOperator" :disabled="disabled">
             <el-option v-for="o in operators" :key="o.value" :label="$t(o.label)" :value="o.value"/>
           </el-select>
         </div>
         <div class="assertion-item input">
           <el-input size="small" v-model="assertion.value" :placeholder="$t('api_test.value')"
-                    @change="quickScript" v-if="!hasEmptyOperator"/>
+                    @change="quickScript" v-if="!hasEmptyOperator" :disabled="disabled"/>
         </div>
       </el-row>
       <el-input size="small" v-model="assertion.desc" :placeholder="$t('api_test.request.assertions.script_name')"
-                class="quick-script-block"/>
-      <ms-jsr233-processor ref="jsr233" :is-read-only="isReadOnly" :jsr223-processor="assertion" :templates="templates"
+                class="quick-script-block" :disabled="disabled"/>
+      <ms-jsr233-processor ref="jsr233" :is-read-only="disabled" :jsr223-processor="assertion" :templates="templates"
                            :height="300" @languageChange="quickScript"/>
       <template v-slot:footer v-if="!edit">
         <ms-dialog-footer
@@ -84,6 +85,7 @@
     data() {
       return {
         visible: false,
+        disabled: false,
         operators: {
           EQ: {
             label: "commons.adv_search.operators.equals",
@@ -260,6 +262,11 @@
         }
       },
       detail() {
+        this.disabled = false;
+        this.visible = true;
+      },
+      showPage() {
+        this.disabled = true;
         this.visible = true;
       },
       close() {

From 4640746de5b423bb99647ecda5f604394702d8fa Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 23 Mar 2021 18:20:31 +0800
Subject: [PATCH 2/9] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E5=8C=96):=20=E5=9C=BA=E6=99=AF=E6=AD=A5=E9=AA=A4=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=E5=B1=95=E7=A4=BA=E5=8F=8A=E5=8F=A6=E5=AD=98=E4=B8=BA?=
 =?UTF-8?q?=E6=96=B0=E6=8E=A5=E5=8F=A3=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/automation/scenario/api/AddBasisApi.vue     |  3 +++
 .../automation/scenario/common/ApiBaseComponent.vue | 13 ++++++++++++-
 .../scenario/component/StepExtendBtns.vue           |  6 ++++--
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/frontend/src/business/components/api/automation/scenario/api/AddBasisApi.vue b/frontend/src/business/components/api/automation/scenario/api/AddBasisApi.vue
index 60ef124715..13f043723f 100644
--- a/frontend/src/business/components/api/automation/scenario/api/AddBasisApi.vue
+++ b/frontend/src/business/components/api/automation/scenario/api/AddBasisApi.vue
@@ -244,6 +244,9 @@
         });
       },
       list(data) {
+        if (data.protocol === "dubbo://") {
+          data.protocol = "DUBBO";
+        }
         let url = "/api/module/list/" + getCurrentProjectID() + "/" + data.protocol;
         this.result = this.$get(url, response => {
           if (response.data != undefined && response.data != null) {
diff --git a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
index 0e9f8d2806..cf5fa0edc0 100644
--- a/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
+++ b/frontend/src/business/components/api/automation/scenario/common/ApiBaseComponent.vue
@@ -6,7 +6,7 @@
           <div class="el-step__icon-inner">{{data.index}}</div>
         </div>
         <el-tag class="ms-left-btn" size="small" :style="{'color': color, 'background-color': backgroundColor}">{{title}}</el-tag>
-        <el-tag size="mini" v-if="data.method">{{data.method}}</el-tag>
+        <el-tag size="mini" v-if="data.method">{{getMethod()}}</el-tag>
       </slot>
 
       <span>
@@ -125,6 +125,17 @@
         //this.$set(this.data, 'active', !this.data.active);
         this.$emit('active');
       },
+      getMethod() {
+        if (this.data.protocol === "HTTP") {
+          return this.data.method;
+        }
+        else if (this.data.protocol === "dubbo://") {
+          return "DUBBO";
+        }
+        else {
+          return this.data.protocol;
+        }
+      },
       copyRow() {
         this.$emit('copy');
       },
diff --git a/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue b/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue
index 3e81f770a1..d028acef6b 100644
--- a/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue
+++ b/frontend/src/business/components/api/automation/scenario/component/StepExtendBtns.vue
@@ -13,7 +13,7 @@
       </el-dropdown-menu>
     </el-dropdown>
     <ms-variable-list ref="scenarioParameters"/>
-    <ms-add-basis-api ref="api"/>
+    <ms-add-basis-api :currentProtocol="currentProtocol" ref="api"/>
   </div>
 </template>
 
@@ -32,6 +32,7 @@
     data() {
       return {
         allSamplers: ELEMENTS.get('AllSamplerProxy'),
+        currentProtocol: "HTTP",
       }
     },
     methods: {
@@ -63,7 +64,8 @@
           }
         });
       },
-      saveAsApi(){
+      saveAsApi() {
+        this.currentProtocol = this.data.protocol;
         this.$refs.api.open(this.data);
       }
     }

From cc541f8859253d554a70e971dd4a3d2551b23e11 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 23 Mar 2021 18:33:07 +0800
Subject: [PATCH 3/9] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):?=
 =?UTF-8?q?=20=E9=A6=96=E9=A1=B5=E5=A4=B1=E8=B4=A5=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E6=9C=AA=E5=B1=95=E7=A4=BA=E6=8E=A5=E5=8F=A3=E7=94=A8=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtApiDefinitionExecResultMapper.xml   | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
index 95189a5806..22a84abd24 100644
--- a/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
+++ b/backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiDefinitionExecResultMapper.xml
@@ -36,9 +36,12 @@
         SELECT * FROM (
             SELECT testCase.testCaseID,testCase.testCaseName AS caseName,testCase.testPlanName AS testPlan ,caseErrorCountData.dataCountNumber AS failureTimes,'apiCase' AS caseType
             FROM (
-            SELECT apiCase.id AS testCaseID,apiCase.`name` AS testCaseName,group_concat(testPlan.`name`)  AS testPlanName FROM api_test_case apiCase
+            SELECT apiCase.id AS testCaseID,apiCase.`name` AS testCaseName,group_concat(testPlan.`name`)  AS testPlanName, testPlanCase.update_time as updateTime
+            FROM api_test_case apiCase
+            inner join api_definition on api_definition.id = apiCase.api_definition_id
            INNER JOIN test_plan_api_case testPlanCase ON testPlanCase.api_case_id = apiCase.id
            INNER JOIN test_plan testPlan ON testPlan.id = testPlanCase.test_plan_id
+            and api_definition.status != 'Trash'
             GROUP BY apiCase.id
             ORDER BY apiCase.create_time DESC
             )testCase
@@ -48,7 +51,7 @@
                 SELECT id FROM api_test_case WHERE project_id = #{projectId}
                 ) and `status` = 'error' GROUP BY resource_id
             ) caseErrorCountData ON caseErrorCountData.testCaseID =testCase.testCaseID
-            WHERE caseErrorCountData.executeTime >= #{startTimestamp}
+            WHERE testCase.updateTime >= #{startTimestamp}
             UNION
             SELECT scene.id AS testCaseID,scene.`name` AS caseName,apiScene.testPlanName AS testPlan,count(report.id) AS failureTimes,'scenario' AS caseType
             FROM api_scenario_report report

From 186e5efa1d55a7e84c8d10567cef0ac40ae3f67d Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Tue, 23 Mar 2021 18:43:25 +0800
Subject: [PATCH 4/9] =?UTF-8?q?fix:=E5=88=9B=E5=BB=BA=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/case/components/TestCaseCreate.vue       | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/frontend/src/business/components/track/case/components/TestCaseCreate.vue b/frontend/src/business/components/track/case/components/TestCaseCreate.vue
index 9f39733f06..8c76567982 100644
--- a/frontend/src/business/components/track/case/components/TestCaseCreate.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseCreate.vue
@@ -105,15 +105,21 @@ export default {
           this.testCaseForm.projectId = getCurrentProjectID();
           this.testCaseForm.type = "";
           this.testCaseForm.priority = "P0";
-          if (this.currentModule !== undefined || this.currentModule !== null || this.currentModule !== 0 || this.currentModule !== "") {
-            this.testCaseForm.nodePath = this.currentModule.path;
-            this.testCaseForm.nodeId = this.currentModule.id;
+          console.log(this.currentModule)
+          if (this.currentModule !== undefined && this.currentModule !== null && this.currentModule !== 0 && this.currentModule !== "") {
+            if (this.currentModule.path !== undefined && this.currentModule.path !== null && this.currentModule.path !== 0 && this.currentModule.path !== "") {
+              this.testCaseForm.nodePath = this.currentModule.path;
+              this.testCaseForm.nodeId = this.currentModule.id;
+            } else {
+              this.testCaseForm.nodePath = "/全部用例"
+              this.testCaseForm.nodeId = "root"
+            }
           } else {
             this.testCaseForm.nodePath = "/全部用例"
             this.testCaseForm.nodeId = "root"
           }
           this.result = this.$post(path, this.testCaseForm, response => {
-            this.testCaseForm.id=response.data.id
+            this.testCaseForm.id = response.data.id
             this.$success(this.$t('commons.save_success'));
             this.visible = false;
             if (saveAs) {

From 41c46740b3b94aa5f1210afe8621cca7f9074af8 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 23 Mar 2021 19:05:42 +0800
Subject: [PATCH 5/9] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89):?=
 =?UTF-8?q?=20=E5=88=87=E6=8D=A2code=E9=80=89=E9=A1=B9=E6=A0=BC=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/api/definition/components/body/ApiBody.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/api/definition/components/body/ApiBody.vue b/frontend/src/business/components/api/definition/components/body/ApiBody.vue
index f8da47035c..b2a506a3b1 100644
--- a/frontend/src/business/components/api/definition/components/body/ApiBody.vue
+++ b/frontend/src/business/components/api/definition/components/body/ApiBody.vue
@@ -42,7 +42,7 @@
     </div>
 
     <div class="ms-body" v-if="body.type == 'XML'">
-      <ms-code-edit :read-only="isReadOnly" :data.sync="body.raw" :modes="modes" :mode="'xml'" ref="codeEdit"/>
+      <ms-code-edit :read-only="isReadOnly" :data.sync="body.raw" :modes="modes" :mode="'text'" ref="codeEdit"/>
     </div>
 
     <div class="ms-body" v-if="body.type == 'Raw'">

From c02b8dff1b5966fb946c565d0724a9c4135b17ec Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Tue, 23 Mar 2021 19:37:48 +0800
Subject: [PATCH 6/9] =?UTF-8?q?fix(=E6=8E=A5=E5=8F=A3=E5=AE=9A=E4=B9=89?=
 =?UTF-8?q?=EF=BC=8C=E6=8E=A5=E5=8F=A3=E8=87=AA=E5=8A=A8=E5=8C=96):=20?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=A0=91=E8=8A=82=E7=82=B9=20=EF=BC=8C?=
 =?UTF-8?q?=E5=8F=B3=E4=BE=A7Tab=E6=81=A2=E5=A4=8D=E5=88=B0=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/automation/ApiAutomation.vue          |   3 +
 .../api/definition/ApiDefinition.vue          | 275 +++++++++---------
 2 files changed, 142 insertions(+), 136 deletions(-)

diff --git a/frontend/src/business/components/api/automation/ApiAutomation.vue b/frontend/src/business/components/api/automation/ApiAutomation.vue
index 95a3ab2f8b..4548ab4f3a 100644
--- a/frontend/src/business/components/api/automation/ApiAutomation.vue
+++ b/frontend/src/business/components/api/automation/ApiAutomation.vue
@@ -133,6 +133,9 @@
             });
           }
         }
+      },
+      selectNodeIds() {
+        this.activeName = "default";
       }
     },
     methods: {
diff --git a/frontend/src/business/components/api/definition/ApiDefinition.vue b/frontend/src/business/components/api/definition/ApiDefinition.vue
index dc13136a3c..6f7a3c3e0a 100644
--- a/frontend/src/business/components/api/definition/ApiDefinition.vue
+++ b/frontend/src/business/components/api/definition/ApiDefinition.vue
@@ -1,152 +1,152 @@
 <template>
   <div>
-  <ms-container v-if="renderComponent">
-    <ms-aside-container>
-      <ms-api-module
-        @nodeSelectEvent="nodeChange"
-        @protocolChange="handleProtocolChange"
-        @refreshTable="refresh"
-        @exportAPI="exportAPI"
-        @debug="debug"
-        @saveAsEdit="editApi"
-        @setModuleOptions="setModuleOptions"
-        @setNodeTree="setNodeTree"
-        @enableTrash="enableTrash"
-        :type="'edit'"
-        ref="nodeTree"/>
-    </ms-aside-container>
+    <ms-container v-if="renderComponent">
+      <ms-aside-container>
+        <ms-api-module
+          @nodeSelectEvent="nodeChange"
+          @protocolChange="handleProtocolChange"
+          @refreshTable="refresh"
+          @exportAPI="exportAPI"
+          @debug="debug"
+          @saveAsEdit="editApi"
+          @setModuleOptions="setModuleOptions"
+          @setNodeTree="setNodeTree"
+          @enableTrash="enableTrash"
+          :type="'edit'"
+          ref="nodeTree"/>
+      </ms-aside-container>
 
-    <ms-main-container>
-      <!-- 主框架列表 -->
-      <el-tabs v-model="apiDefaultTab" @edit="handleTabRemove" @tab-click="addTab">
-        <el-tab-pane v-for="(item) in apiTabs"
-                     :key="item.name"
-                     :label="item.title"
-                     :closable="item.closable"
-                     :name="item.name">
-          <ms-tab-button
-            v-if="item.type === 'list'"
-            :active-dom.sync="activeDom"
-            :left-tip="$t('api_test.definition.api_title')"
-            :right-tip="$t('api_test.definition.doc_title')"
-            :middle-tip="$t('api_test.definition.case_title')"
-            left-content="API"
-            middle-content="CASE"
-            :right-content="$t('api_test.definition.doc_title')">
-            <!-- 列表集合 -->
-            <ms-api-list
-              v-if="activeDom==='left'"
-              @runTest="runTest"
-              :module-tree="nodeTree"
-              :module-options="moduleOptions"
-              :current-protocol="currentProtocol"
-              :visible="visible"
-              :currentRow="currentRow"
-              :select-node-ids="selectNodeIds"
-              :trash-enable="trashEnable"
-              :queryDataType="queryDataType"
-              :selectDataRange="selectDataRange"
-              :is-read-only="isReadOnly"
-              @changeSelectDataRangeAll="changeSelectDataRangeAll"
-              @editApi="editApi"
-              @handleCase="handleCase"
-              @showExecResult="showExecResult"
-              ref="apiList"/>
-            <!--测试用例列表-->
-            <api-case-simple-list
-              v-if="activeDom==='middle'"
-              :current-protocol="currentProtocol"
-              :visible="visible"
-              :currentRow="currentRow"
-              :select-node-ids="selectNodeIds"
-              :trash-enable="trashEnable"
-              :queryDataType="queryDataType"
-              :is-read-only="isReadOnly"
-              @changeSelectDataRangeAll="changeSelectDataRangeAll"
-              @handleCase="handleCase"
-              @showExecResult="showExecResult"
-              ref="apiList"/>
-            <api-documents-page class="api-doc-page"
-              v-if="activeDom==='right'"
-              :project-id="projectId"
-              :module-ids="selectNodeIds"/>
-          </ms-tab-button>
-          <!-- 添加/编辑测试窗口-->
-          <div v-if="item.type=== 'ADD'" class="ms-api-div">
-            <ms-api-config :syncTabs="syncTabs" @runTest="runTest" @saveApi="saveApi" @createRootModel="createRootModel" ref="apiConfig"
-                           :current-api="item.api"
-                           :project-id="projectId"
-                           :currentProtocol="currentProtocol"
-                           :moduleOptions="moduleOptions"/>
-          </div>
-          <!-- 快捷调试 -->
-          <div v-else-if="item.type=== 'debug'" class="ms-api-div">
-            <ms-debug-http-page :currentProtocol="currentProtocol" :testCase="item.api" @saveAs="editApi"
-                                v-if="currentProtocol==='HTTP'"/>
-            <ms-debug-jdbc-page :currentProtocol="currentProtocol" :testCase="item.api" @saveAs="editApi"
-                                v-if="currentProtocol==='SQL'"/>
-            <ms-debug-tcp-page :currentProtocol="currentProtocol" :testCase="item.api" @saveAs="editApi"
-                               v-if="currentProtocol==='TCP'"/>
-            <ms-debug-dubbo-page :currentProtocol="currentProtocol" :testCase="item.api" @saveAs="editApi"
-                                 v-if="currentProtocol==='DUBBO'"/>
-          </div>
+      <ms-main-container>
+        <!-- 主框架列表 -->
+        <el-tabs v-model="apiDefaultTab" @edit="handleTabRemove" @tab-click="addTab">
+          <el-tab-pane v-for="(item) in apiTabs"
+                       :key="item.name"
+                       :label="item.title"
+                       :closable="item.closable"
+                       :name="item.name">
+            <ms-tab-button
+              v-if="item.type === 'list'"
+              :active-dom.sync="activeDom"
+              :left-tip="$t('api_test.definition.api_title')"
+              :right-tip="$t('api_test.definition.doc_title')"
+              :middle-tip="$t('api_test.definition.case_title')"
+              left-content="API"
+              middle-content="CASE"
+              :right-content="$t('api_test.definition.doc_title')">
+              <!-- 列表集合 -->
+              <ms-api-list
+                v-if="activeDom==='left'"
+                @runTest="runTest"
+                :module-tree="nodeTree"
+                :module-options="moduleOptions"
+                :current-protocol="currentProtocol"
+                :visible="visible"
+                :currentRow="currentRow"
+                :select-node-ids="selectNodeIds"
+                :trash-enable="trashEnable"
+                :queryDataType="queryDataType"
+                :selectDataRange="selectDataRange"
+                :is-read-only="isReadOnly"
+                @changeSelectDataRangeAll="changeSelectDataRangeAll"
+                @editApi="editApi"
+                @handleCase="handleCase"
+                @showExecResult="showExecResult"
+                ref="apiList"/>
+              <!--测试用例列表-->
+              <api-case-simple-list
+                v-if="activeDom==='middle'"
+                :current-protocol="currentProtocol"
+                :visible="visible"
+                :currentRow="currentRow"
+                :select-node-ids="selectNodeIds"
+                :trash-enable="trashEnable"
+                :queryDataType="queryDataType"
+                :is-read-only="isReadOnly"
+                @changeSelectDataRangeAll="changeSelectDataRangeAll"
+                @handleCase="handleCase"
+                @showExecResult="showExecResult"
+                ref="apiList"/>
+              <api-documents-page class="api-doc-page"
+                                  v-if="activeDom==='right'"
+                                  :project-id="projectId"
+                                  :module-ids="selectNodeIds"/>
+            </ms-tab-button>
+            <!-- 添加/编辑测试窗口-->
+            <div v-if="item.type=== 'ADD'" class="ms-api-div">
+              <ms-api-config :syncTabs="syncTabs" @runTest="runTest" @saveApi="saveApi" @createRootModel="createRootModel" ref="apiConfig"
+                             :current-api="item.api"
+                             :project-id="projectId"
+                             :currentProtocol="currentProtocol"
+                             :moduleOptions="moduleOptions"/>
+            </div>
+            <!-- 快捷调试 -->
+            <div v-else-if="item.type=== 'debug'" class="ms-api-div">
+              <ms-debug-http-page :currentProtocol="currentProtocol" :testCase="item.api" @saveAs="editApi"
+                                  v-if="currentProtocol==='HTTP'"/>
+              <ms-debug-jdbc-page :currentProtocol="currentProtocol" :testCase="item.api" @saveAs="editApi"
+                                  v-if="currentProtocol==='SQL'"/>
+              <ms-debug-tcp-page :currentProtocol="currentProtocol" :testCase="item.api" @saveAs="editApi"
+                                 v-if="currentProtocol==='TCP'"/>
+              <ms-debug-dubbo-page :currentProtocol="currentProtocol" :testCase="item.api" @saveAs="editApi"
+                                   v-if="currentProtocol==='DUBBO'"/>
+            </div>
 
-          <!-- 测试-->
-          <div v-else-if="item.type=== 'TEST'" class="ms-api-div">
-            <ms-run-test-http-page :syncTabs="syncTabs" :currentProtocol="currentProtocol" :api-data="item.api" :project-id="projectId"
-                                   @saveAsApi="editApi" @refresh="refresh" v-if="currentProtocol==='HTTP'"/>
-            <ms-run-test-tcp-page :syncTabs="syncTabs" :currentProtocol="currentProtocol" :api-data="item.api" :project-id="projectId"
-                                  @saveAsApi="editApi" @refresh="refresh" v-if="currentProtocol==='TCP'"/>
-            <ms-run-test-sql-page :syncTabs="syncTabs" :currentProtocol="currentProtocol" :api-data="item.api" :project-id="projectId"
-                                  @saveAsApi="editApi" @refresh="refresh" v-if="currentProtocol==='SQL'"/>
-            <ms-run-test-dubbo-page :syncTabs="syncTabs" :currentProtocol="currentProtocol" :api-data="item.api" :project-id="projectId"
-                                    @saveAsApi="editApi" @refresh="refresh" v-if="currentProtocol==='DUBBO'"/>
-          </div>
-        </el-tab-pane>
+            <!-- 测试-->
+            <div v-else-if="item.type=== 'TEST'" class="ms-api-div">
+              <ms-run-test-http-page :syncTabs="syncTabs" :currentProtocol="currentProtocol" :api-data="item.api" :project-id="projectId"
+                                     @saveAsApi="editApi" @refresh="refresh" v-if="currentProtocol==='HTTP'"/>
+              <ms-run-test-tcp-page :syncTabs="syncTabs" :currentProtocol="currentProtocol" :api-data="item.api" :project-id="projectId"
+                                    @saveAsApi="editApi" @refresh="refresh" v-if="currentProtocol==='TCP'"/>
+              <ms-run-test-sql-page :syncTabs="syncTabs" :currentProtocol="currentProtocol" :api-data="item.api" :project-id="projectId"
+                                    @saveAsApi="editApi" @refresh="refresh" v-if="currentProtocol==='SQL'"/>
+              <ms-run-test-dubbo-page :syncTabs="syncTabs" :currentProtocol="currentProtocol" :api-data="item.api" :project-id="projectId"
+                                      @saveAsApi="editApi" @refresh="refresh" v-if="currentProtocol==='DUBBO'"/>
+            </div>
+          </el-tab-pane>
 
-        <el-tab-pane name="add">
-          <template v-slot:label>
-            <el-dropdown @command="handleCommand" v-tester>
-              <el-button type="primary" plain icon="el-icon-plus" size="mini" v-tester/>
-              <el-dropdown-menu slot="dropdown">
-                <el-dropdown-item command="debug">{{ $t('api_test.definition.request.fast_debug') }}</el-dropdown-item>
-                <el-dropdown-item command="ADD">{{ $t('api_test.definition.request.title') }}</el-dropdown-item>
-                <el-dropdown-item command="CLOSE_ALL">{{ $t('api_test.definition.request.close_all_label') }}
-                </el-dropdown-item>
-              </el-dropdown-menu>
-            </el-dropdown>
-          </template>
-        </el-tab-pane>
-      </el-tabs>
+          <el-tab-pane name="add">
+            <template v-slot:label>
+              <el-dropdown @command="handleCommand" v-tester>
+                <el-button type="primary" plain icon="el-icon-plus" size="mini" v-tester/>
+                <el-dropdown-menu slot="dropdown">
+                  <el-dropdown-item command="debug">{{ $t('api_test.definition.request.fast_debug') }}</el-dropdown-item>
+                  <el-dropdown-item command="ADD">{{ $t('api_test.definition.request.title') }}</el-dropdown-item>
+                  <el-dropdown-item command="CLOSE_ALL">{{ $t('api_test.definition.request.close_all_label') }}
+                  </el-dropdown-item>
+                </el-dropdown-menu>
+              </el-dropdown>
+            </template>
+          </el-tab-pane>
+        </el-tabs>
 
 
-    </ms-main-container>
-  </ms-container>
+      </ms-main-container>
+    </ms-container>
 
   </div>
 </template>
 <script>
-import MsApiList from './components/list/ApiList';
-import MsContainer from "../../common/components/MsContainer";
-import MsMainContainer from "../../common/components/MsMainContainer";
-import MsAsideContainer from "../../common/components/MsAsideContainer";
-import MsApiConfig from "./components/ApiConfig";
-import MsDebugHttpPage from "./components/debug/DebugHttpPage";
-import MsDebugJdbcPage from "./components/debug/DebugJdbcPage";
-import MsDebugTcpPage from "./components/debug/DebugTcpPage";
-import MsDebugDubboPage from "./components/debug/DebugDubboPage";
+  import MsApiList from './components/list/ApiList';
+  import MsContainer from "../../common/components/MsContainer";
+  import MsMainContainer from "../../common/components/MsMainContainer";
+  import MsAsideContainer from "../../common/components/MsAsideContainer";
+  import MsApiConfig from "./components/ApiConfig";
+  import MsDebugHttpPage from "./components/debug/DebugHttpPage";
+  import MsDebugJdbcPage from "./components/debug/DebugJdbcPage";
+  import MsDebugTcpPage from "./components/debug/DebugTcpPage";
+  import MsDebugDubboPage from "./components/debug/DebugDubboPage";
 
-import MsRunTestHttpPage from "./components/runtest/RunTestHTTPPage";
-import MsRunTestTcpPage from "./components/runtest/RunTestTCPPage";
-import MsRunTestSqlPage from "./components/runtest/RunTestSQLPage";
-import MsRunTestDubboPage from "./components/runtest/RunTestDubboPage";
-import {checkoutTestManagerOrTestUser, getCurrentUser, getUUID} from "@/common/js/utils";
-import MsApiModule from "./components/module/ApiModule";
-import ApiCaseSimpleList from "./components/list/ApiCaseSimpleList";
+  import MsRunTestHttpPage from "./components/runtest/RunTestHTTPPage";
+  import MsRunTestTcpPage from "./components/runtest/RunTestTCPPage";
+  import MsRunTestSqlPage from "./components/runtest/RunTestSQLPage";
+  import MsRunTestDubboPage from "./components/runtest/RunTestDubboPage";
+  import {checkoutTestManagerOrTestUser, getCurrentUser, getUUID} from "@/common/js/utils";
+  import MsApiModule from "./components/module/ApiModule";
+  import ApiCaseSimpleList from "./components/list/ApiCaseSimpleList";
 
   import ApiDocumentsPage from "@/business/components/api/definition/components/list/ApiDocumentsPage";
-import MsTableButton from "@/business/components/common/components/MsTableButton";
-import MsTabButton from "@/business/components/common/components/MsTabButton";
+  import MsTableButton from "@/business/components/common/components/MsTableButton";
+  import MsTabButton from "@/business/components/common/components/MsTabButton";
 
   export default {
     name: "ApiDefinition",
@@ -157,7 +157,7 @@ import MsTabButton from "@/business/components/common/components/MsTabButton";
         this.changeRedirectParam(redirectIDParam);
         return routeParam;
       },
-      isReadOnly(){
+      isReadOnly() {
         return !checkoutTestManagerOrTestUser();
       },
       projectId() {
@@ -221,6 +221,9 @@ import MsTabButton from "@/business/components/common/components/MsTabButton";
       currentProtocol() {
         this.handleCommand("CLOSE_ALL");
       },
+      selectNodeIds() {
+        this.apiDefaultTab = "default";
+      },
       redirectID() {
         this.renderComponent = false;
         this.$nextTick(() => {

From 266fbd008f803ab3809fca2c17e78bff8597c9c0 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Tue, 23 Mar 2021 19:44:50 +0800
Subject: [PATCH 7/9] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):?=
 =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5=E5=9B=BE=E8=A1=A8?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../track/service/TrackService.java            |  9 ---------
 .../components/track/home/TrackHome.vue        | 18 +++++++++++-------
 2 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/track/service/TrackService.java b/backend/src/main/java/io/metersphere/track/service/TrackService.java
index 36377ea65c..a2aae3ce11 100644
--- a/backend/src/main/java/io/metersphere/track/service/TrackService.java
+++ b/backend/src/main/java/io/metersphere/track/service/TrackService.java
@@ -23,7 +23,6 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 @Service
 @Transactional(rollbackFor = Exception.class)
@@ -87,18 +86,10 @@ public class TrackService {
     public List<ChartsData> getCaseMaintenanceBar(String projectId) {
         List<TrackCountResult> funcMaintainer = extTestCaseMapper.countFuncMaintainer(projectId);
         List<TrackCountResult> relevanceMaintainer = extTestCaseMapper.countRelevanceMaintainer(projectId);
-        List<String> list = relevanceMaintainer.stream().map(TrackCountResult::getGroupField).collect(Collectors.toList());
 
         List<ChartsData> charts = new ArrayList<>();
         for (TrackCountResult result : funcMaintainer) {
             String groupField = result.getGroupField();
-            if (!list.contains(groupField)) {
-                // 创建了功能用例，但是未关联测试
-                TrackCountResult trackCount = new TrackCountResult();
-                trackCount.setCountNumber(0);
-                trackCount.setGroupField(groupField);
-                relevanceMaintainer.add(trackCount);
-            }
             ChartsData chartsData = new ChartsData();
             chartsData.setxAxis(groupField);
             chartsData.setyAxis(BigDecimal.valueOf(result.getCountNumber()));
diff --git a/frontend/src/business/components/track/home/TrackHome.vue b/frontend/src/business/components/track/home/TrackHome.vue
index 206a2af82e..db7d4f2ad3 100644
--- a/frontend/src/business/components/track/home/TrackHome.vue
+++ b/frontend/src/business/components/track/home/TrackHome.vue
@@ -34,7 +34,8 @@
         </el-col>
         <el-col :span="6">
           <div class="square">
-            <relevance-case-card :relevance-count-data="relevanceCountData" class="track-card" @redirectPage="redirectPage"/>
+            <relevance-case-card :relevance-count-data="relevanceCountData" class="track-card"
+                                 @redirectPage="redirectPage"/>
           </div>
         </el-col>
         <el-col :span="12">
@@ -73,7 +74,7 @@ import MsMainContainer from "@/business/components/common/components/MsMainConta
 import MsContainer from "@/business/components/common/components/MsContainer";
 import CaseCountCard from "@/business/components/track/home/components/CaseCountCard";
 import RelevanceCaseCard from "@/business/components/track/home/components/RelevanceCaseCard";
-import {getCurrentProjectID,getUUID} from "@/common/js/utils";
+import {getCurrentProjectID, getUUID} from "@/common/js/utils";
 import CaseMaintenance from "@/business/components/track/home/components/CaseMaintenance";
 import {COUNT_NUMBER, COUNT_NUMBER_SHALLOW} from "@/common/js/constants";
 import BugCountCard from "@/business/components/track/home/components/BugCountCard";
@@ -136,8 +137,8 @@ export default {
           xAxis.push(d.xAxis);
         }
       });
-      let yAxis1 = data.filter(d => d.groupName === 'FUNCTIONCASE').map(d => d.yAxis);
-      let yAxis2 = data.filter(d => d.groupName === 'RELEVANCECASE').map(d => d.yAxis);
+      let yAxis1 = data.filter(d => d.groupName === 'FUNCTIONCASE').map(d => [d.xAxis, d.yAxis]);
+      let yAxis2 = data.filter(d => d.groupName === 'RELEVANCECASE').map(d => [d.xAxis, d.yAxis]);
       let option = {
         tooltip: {
           trigger: 'axis',
@@ -186,12 +187,15 @@ export default {
       };
       this.caseOption = option;
     },
-    redirectPage(page,dataType,selectType){
+    redirectPage(page, dataType, selectType) {
       //test_plan 页面跳转
       // this.$router.push('/track/plan/view/'+selectType);
-      switch (page){
+      switch (page) {
         case "case":
-          this.$router.push({name:'testCase',params:{dataType:dataType,dataSelectRange:selectType, projectId: getCurrentProjectID()}});
+          this.$router.push({
+            name: 'testCase',
+            params: {dataType: dataType, dataSelectRange: selectType, projectId: getCurrentProjectID()}
+          });
           break;
       }
     }

From b60b534f481cab45a45ac3e5ef0d426f55490867 Mon Sep 17 00:00:00 2001
From: "Captain.B" <bin@fit2cloud.com>
Date: Tue, 23 Mar 2021 20:10:47 +0800
Subject: [PATCH 8/9] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA?=
 =?UTF-8?q?=E6=80=A7=E8=83=BD=E6=B5=8B=E8=AF=95=E6=9F=A5=E8=AF=A2=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=98=AF=E5=90=A6=E5=AD=98=E5=9C=A8=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../test/components/ExistFiles.vue            | 47 ++++++++++---------
 1 file changed, 24 insertions(+), 23 deletions(-)

diff --git a/frontend/src/business/components/performance/test/components/ExistFiles.vue b/frontend/src/business/components/performance/test/components/ExistFiles.vue
index 9a3843f6c4..ad48447019 100644
--- a/frontend/src/business/components/performance/test/components/ExistFiles.vue
+++ b/frontend/src/business/components/performance/test/components/ExistFiles.vue
@@ -201,7 +201,7 @@ export default {
       });
 
     },
-    async beforeUploadFile(file) {
+    beforeUploadFile(file) {
       if (!this.fileValidator(file)) {
         /// todo: 显示错误信息
         return false;
@@ -211,14 +211,14 @@ export default {
         this.$error(this.$t('load_test.delete_file'));
         return false;
       }
-      let valid = false;
-
+    },
+    checkFileExist(file, callback) {
       // 检查数据库是否存在同名文件
       async function f() {
         return await axios.post('/performance/file/' + getCurrentProjectID() + '/getMetadataByName', {name: file.name})
       }
 
-      await f().then(res => {
+      f().then(res => {
         let response = res.data;
         if (response.data.length === 0) {
           let type = file.name.substring(file.name.lastIndexOf(".") + 1);
@@ -229,33 +229,34 @@ export default {
             type: type.toUpperCase(),
             updateTime: file.lastModified,
           });
-          valid = true;
+
+          callback();
         } else {
           this.$error(this.$t('load_test.project_file_exist'));
         }
       });
-
-
-      return valid;
     },
     handleUpload(uploadResources) {
       let self = this;
+
       let file = uploadResources.file;
-      self.uploadList.push(file);
-      let type = file.name.substring(file.name.lastIndexOf(".") + 1);
-      if (type.toLowerCase() !== 'jmx') {
-        return;
-      }
-      let jmxReader = new FileReader();
-      jmxReader.onload = (event) => {
-        let threadGroups = findThreadGroup(event.target.result, file.name);
-        threadGroups.forEach(tg => {
-          tg.options = {};
-          this.scenarios.push(tg);
-        });
-        self.$emit('fileChange', self.scenarios);
-      };
-      jmxReader.readAsText(file);
+      this.checkFileExist(file, () => {
+        self.uploadList.push(file);
+        let type = file.name.substring(file.name.lastIndexOf(".") + 1);
+        if (type.toLowerCase() !== 'jmx') {
+          return;
+        }
+        let jmxReader = new FileReader();
+        jmxReader.onload = (event) => {
+          let threadGroups = findThreadGroup(event.target.result, file.name);
+          threadGroups.forEach(tg => {
+            tg.options = {};
+            self.scenarios.push(tg);
+          });
+          self.$emit('fileChange', self.scenarios);
+        };
+        jmxReader.readAsText(file);
+      })
     },
     handleExceed() {
       this.$error(this.$t('load_test.file_size_limit'));

From b2514df3637d62278dad26a8a15a8a7ca322e80c Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Tue, 23 Mar 2021 20:10:55 +0800
Subject: [PATCH 9/9] =?UTF-8?q?fix:=20=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA?=
 =?UTF-8?q?=E4=BB=8Evuex=E8=8E=B7=E5=8F=96=E9=A1=B9=E7=9B=AEid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/FailureTestCaseList.vue        |  9 +-
 .../homepage/components/RunningTaskList.vue   |  9 +-
 .../components/track/case/TestCase.vue        | 16 ++--
 .../track/case/components/TestCaseCreate.vue  | 11 ++-
 .../track/case/components/TestCaseEdit.vue    | 17 ++--
 .../track/case/components/TestCaseList.vue    | 12 +--
 .../track/common/TestCaseNodeTree.vue         | 13 +--
 .../track/common/minder/TestCaseMinder.vue    |  2 +-
 .../track/common/minder/minderUtils.js        | 86 ++++++++++---------
 .../components/track/home/TrackHome.vue       | 15 +++-
 .../components/track/plan/TestPlan.vue        |  8 +-
 .../track/plan/components/TestPlanEdit.vue    |  2 +-
 .../track/plan/components/TestPlanList.vue    | 12 +--
 .../comonents/api/TestPlanApiCaseList.vue     |  4 +-
 .../comonents/api/TestPlanApiScenarioList.vue |  9 +-
 .../comonents/base/TestCaseRelevanceBase.vue  |  2 +-
 .../functional/FunctionalTestCaseList.vue     | 12 +--
 .../functional/TestPlanFunctional.vue         |  8 +-
 .../track/report/TestPlanReport.vue           |  1 -
 .../report/components/TestPlanReportList.vue  |  8 +-
 .../track/review/TestCaseReview.vue           |  8 +-
 .../review/components/TestCaseReviewEdit.vue  |  2 +-
 .../review/components/TestCaseReviewList.vue  | 12 ++-
 .../view/components/TestReviewFunction.vue    |  9 +-
 24 files changed, 163 insertions(+), 124 deletions(-)

diff --git a/frontend/src/business/components/api/homepage/components/FailureTestCaseList.vue b/frontend/src/business/components/api/homepage/components/FailureTestCaseList.vue
index f22e9c5533..69b2797d52 100644
--- a/frontend/src/business/components/api/homepage/components/FailureTestCaseList.vue
+++ b/frontend/src/business/components/api/homepage/components/FailureTestCaseList.vue
@@ -41,7 +41,6 @@
 </template>
 
 <script>
-import {getCurrentProjectID} from "@/common/js/utils";
 import MsTag from "@/business/components/common/components/MsTag";
 
 export default {
@@ -58,10 +57,14 @@ export default {
       loading: false
     }
   },
-
+  computed: {
+    projectId() {
+      return this.$store.state.projectId
+    },
+  },
   methods: {
     search() {
-      let projectID = getCurrentProjectID();
+      let projectID = this.projectId;
       this.result = this.$get("/api/faliureCaseAboutTestPlan/"+projectID+"/10", response => {
         this.tableData = response.data;
       });
diff --git a/frontend/src/business/components/api/homepage/components/RunningTaskList.vue b/frontend/src/business/components/api/homepage/components/RunningTaskList.vue
index 4594a6682c..91ad2ea5bf 100644
--- a/frontend/src/business/components/api/homepage/components/RunningTaskList.vue
+++ b/frontend/src/business/components/api/homepage/components/RunningTaskList.vue
@@ -57,7 +57,7 @@
 </template>
 
 <script>
-import {checkoutTestManagerOrTestUser, getCurrentProjectID} from "@/common/js/utils";
+import {checkoutTestManagerOrTestUser} from "@/common/js/utils";
 import MsTag from "@/business/components/common/components/MsTag";
 export default {
   name: "MsRunningTaskList",
@@ -80,12 +80,15 @@ export default {
   computed:{
     isReadOnly(){
       return !checkoutTestManagerOrTestUser();
-    }
+    },
+    projectId() {
+      return this.$store.state.projectId
+    },
   },
 
   methods: {
     search() {
-      let projectID = getCurrentProjectID();
+      let projectID = this.projectId;
       this.result = this.$get("/api/runningTask/"+projectID+"/"+this.callFrom, response => {
         this.tableData = response.data;
       });
diff --git a/frontend/src/business/components/track/case/TestCase.vue b/frontend/src/business/components/track/case/TestCase.vue
index 75448aa19f..6e9658aea6 100644
--- a/frontend/src/business/components/track/case/TestCase.vue
+++ b/frontend/src/business/components/track/case/TestCase.vue
@@ -99,7 +99,7 @@ import SelectMenu from "../common/SelectMenu";
 import MsContainer from "../../common/components/MsContainer";
 import MsAsideContainer from "../../common/components/MsAsideContainer";
 import MsMainContainer from "../../common/components/MsMainContainer";
-import {checkoutTestManagerOrTestUser, getCurrentProjectID, getUUID} from "../../../../common/js/utils";
+import {checkoutTestManagerOrTestUser, getUUID} from "../../../../common/js/utils";
 import TestCaseNodeTree from "../common/TestCaseNodeTree";
 
 import MsTabButton from "@/business/components/common/components/MsTabButton";
@@ -132,12 +132,10 @@ export default {
       loading: false,
       type:'',
       activeDom: 'left',
-      projectId: ""
     }
   },
   mounted() {
     this.init(this.$route);
-    this.projectId = getCurrentProjectID();
   },
   watch: {
     redirectID() {
@@ -151,7 +149,6 @@ export default {
       this.init(to);
       if (to.path.indexOf('/track/case/all') == -1) {
         if (this.$refs && this.$refs.autoScenarioConfig) {
-          console.log(this.$refs.autoScenarioConfig);
           this.$refs.autoScenarioConfig.forEach(item => {
             /*item.removeListener();*/
           });
@@ -168,7 +165,10 @@ export default {
     isRedirectEdit: function () {
       let redirectParam = this.$route.params.dataSelectRange;
       return redirectParam;
-    }
+    },
+    projectId() {
+      return this.$store.state.projectId
+    },
   },
   methods: {
     handleCommand(e) {
@@ -197,7 +197,6 @@ export default {
       }
     },
     addTab(tab) {
-      this.projectId=getCurrentProjectID();
       if (!this.projectId) {
         this.$warning(this.$t('commons.check_project_tip'));
         return;
@@ -238,6 +237,10 @@ export default {
       }
     },
     exportTestCase(){
+      if (this.activeDom !== 'left') {
+        this.$warning('请切换成接口列表导出！');
+        return;
+      }
       this.$refs.testCaseList.exportTestCase()
     },
     addListener() {
@@ -258,7 +261,6 @@ export default {
           this.testCaseReadOnly = true;
         }
         let caseId = this.$route.params.caseId;
-        this.projectId=getCurrentProjectID();
         if (!this.projectId) {
           this.$warning(this.$t('commons.check_project_tip'));
           return;
diff --git a/frontend/src/business/components/track/case/components/TestCaseCreate.vue b/frontend/src/business/components/track/case/components/TestCaseCreate.vue
index 9f39733f06..5407b07229 100644
--- a/frontend/src/business/components/track/case/components/TestCaseCreate.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseCreate.vue
@@ -58,7 +58,7 @@
 </template>
 
 <script>
-import {getCurrentProjectID, getCurrentUser, getUUID} from "@/common/js/utils";
+import {getCurrentUser} from "@/common/js/utils";
 import {WORKSPACE_ID} from "@/common/js/constants";
 import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
 import {buildNodePath} from "@/business/components/api/definition/model/NodeTree";
@@ -97,15 +97,20 @@ export default {
       this.getModuleOptions();
     },
   },
+  computed: {
+    projectId() {
+      return this.$store.state.projectId
+    },
+  },
   methods: {
     saveTestCase(saveAs) {
       this.$refs['testCaseForm'].validate((valid) => {
         if (valid) {
           let path = "/test/case/save";
-          this.testCaseForm.projectId = getCurrentProjectID();
+          this.testCaseForm.projectId = this.projectId;
           this.testCaseForm.type = "";
           this.testCaseForm.priority = "P0";
-          if (this.currentModule !== undefined || this.currentModule !== null || this.currentModule !== 0 || this.currentModule !== "") {
+          if (this.currentModule && this.currentModule !== 0) {
             this.testCaseForm.nodePath = this.currentModule.path;
             this.testCaseForm.nodeId = this.currentModule.id;
           } else {
diff --git a/frontend/src/business/components/track/case/components/TestCaseEdit.vue b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
index 6534d3d646..558840eba0 100644
--- a/frontend/src/business/components/track/case/components/TestCaseEdit.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseEdit.vue
@@ -287,10 +287,8 @@
 import {TokenKey, WORKSPACE_ID} from '@/common/js/constants';
 import MsDialogFooter from '../../../common/components/MsDialogFooter'
 import {getCurrentUser, listenGoBack, removeGoBackListener} from "@/common/js/utils";
-import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
 import {Message} from "element-ui";
 import TestCaseAttachment from "@/business/components/track/case/components/TestCaseAttachment";
-import {getCurrentProjectID} from "../../../../../common/js/utils";
 import {buildNodePath} from "../../../api/definition/model/NodeTree";
 import CaseComment from "@/business/components/track/case/components/CaseComment";
 import MsInputTag from "@/business/components/api/automation/scenario/MsInputTag";
@@ -324,11 +322,9 @@ export default {
             resolve(nodes)
           }
           if(node.level==1){
-            this.projectId = getCurrentProjectID()
             this.testOptions = [];
             let url = '';
             this.form.type=node.data.value
-            console.log(this.form.type)
             if (this.form.type === 'testcase' || this.form.type === 'automation') {
               url = '/api/' + this.form.type + '/list/' + this.projectId
             } else if (this.form.type === 'performance' || this.form.type === 'api') {
@@ -354,7 +350,6 @@ export default {
       statuOptions:API_STATUS,
       comments: [],
       result: {},
-      projectId: "",
       dialogFormVisible: false,
       form: {
         name: '',
@@ -434,6 +429,11 @@ export default {
     },
     type: String
   },
+  computed: {
+    projectId() {
+      return this.$store.state.projectId
+    },
+  },
   mounted() {
     this.getSelectOptions();
     if (this.type === 'edit' || this.type === 'copy') {
@@ -499,9 +499,6 @@ export default {
       this.$nextTick(() => (this.isStepTableAlive = true));
     },
     open(testCase) {
-      console.log("测试用例")
-      console.log(testCase)
-      this.projectId = getCurrentProjectID();
       if (window.history && window.history.pushState) {
         history.pushState(null, null, document.URL);
         window.addEventListener('popstate', this.close);
@@ -587,7 +584,6 @@ export default {
       /*
             this.form.testId=testCase.selected
       */
-      console.log(this.form.selected)
       this.getFileMetaData(testCase);
     },
     setTestCaseExtInfo(testCase) {
@@ -692,7 +688,6 @@ export default {
     buildParam() {
       let param = {};
       Object.assign(param, this.form);
-      console.log(this.form)
       param.steps = JSON.stringify(this.form.steps);
       param.nodeId = this.form.module;
       this.moduleOptions.forEach(item => {
@@ -781,7 +776,6 @@ export default {
       });
     },
     getTestOptions(val) {
-      this.projectId = getCurrentProjectID()
       this.testOptions = [];
       let url = '';
       if (this.form.type === 'testcase' || this.form.type === 'automation') {
@@ -803,7 +797,6 @@ export default {
     },
     getDemandOptions() {
       if (this.demandOptions.length === 0) {
-        this.projectId = getCurrentProjectID();
         this.result = {loading : true};
         this.$get("demand/list/" + this.projectId).then(response => {
           this.demandOptions = response.data.data;
diff --git a/frontend/src/business/components/track/case/components/TestCaseList.vue b/frontend/src/business/components/track/case/components/TestCaseList.vue
index af835039b4..0a62011f1f 100644
--- a/frontend/src/business/components/track/case/components/TestCaseList.vue
+++ b/frontend/src/business/components/track/case/components/TestCaseList.vue
@@ -210,7 +210,6 @@ import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEve
 import StatusTableItem from "@/business/components/track/common/tableItems/planview/StatusTableItem";
 import TestCaseDetail from "./TestCaseDetail";
 import ReviewStatus from "@/business/components/track/case/components/ReviewStatus";
-import {downloadFile, getCurrentProjectID, getCurrentUser} from "../../../../../common/js/utils";
 import MsTag from "@/business/components/common/components/MsTag";
 import {
   _filter,
@@ -330,7 +329,6 @@ export default {
         maintainer: [],
       },
       currentCaseId: null,
-      projectId: "",
       selectDataCounts: 0,
       selectDataRange: "all"
     }
@@ -353,6 +351,11 @@ export default {
       default: false,
     }
   },
+  computed: {
+    projectId() {
+      return this.$store.state.projectId
+    },
+  },
   created: function () {
     this.$emit('setCondition', this.condition);
     if (this.trashEnable) {
@@ -390,7 +393,6 @@ export default {
       this.selectDataRange = dataType === 'case' ? dataRange : 'all';
     },
     initTableData() {
-      this.projectId = getCurrentProjectID();
       this.condition.planId = "";
       this.condition.nodeIds = [];
       initCondition(this.condition);
@@ -538,14 +540,14 @@ export default {
       this.selectDataCounts = getSelectDataCounts(this.condition, this.total, this.selectRows);
     },
     importTestCase() {
-      if (!getCurrentProjectID()) {
+      if (!this.projectId) {
         this.$warning(this.$t('commons.check_project_tip'));
         return;
       }
       this.$refs.testCaseImport.open();
     },
     exportTestCase() {
-      if (!getCurrentProjectID()) {
+      if (!this.projectId) {
         this.$warning(this.$t('commons.check_project_tip'));
         return;
       }
diff --git a/frontend/src/business/components/track/common/TestCaseNodeTree.vue b/frontend/src/business/components/track/common/TestCaseNodeTree.vue
index 37dfbfb333..b66e83caba 100644
--- a/frontend/src/business/components/track/common/TestCaseNodeTree.vue
+++ b/frontend/src/business/components/track/common/TestCaseNodeTree.vue
@@ -44,9 +44,7 @@
 
 <script>
 import NodeEdit from "./NodeEdit";
-import {getCurrentProjectID} from "../../../../common/js/utils";
 import MsNodeTree from "./NodeTree";
-import {buildNodePath} from "@/business/components/api/definition/model/NodeTree";
 import TestCaseCreate from "@/business/components/track/case/components/TestCaseCreate";
 import TestCaseImport from "@/business/components/track/case/components/TestCaseImport";
 
@@ -61,7 +59,6 @@ export default {
       },
       result: {},
       treeNodes: [],
-      projectId: "",
       condition: {
         filterText: "",
         trashEnable: false
@@ -83,12 +80,16 @@ export default {
     },
   },
   mounted() {
-    this.projectId = getCurrentProjectID();
     this.list();
   },
+  computed: {
+    projectId() {
+      return this.$store.state.projectId
+    },
+  },
   methods: {
     addTestCase(){
-      if (!getCurrentProjectID()) {
+      if (!this.projectId) {
         this.$warning(this.$t('commons.check_project_tip'));
         return;
       }
@@ -109,7 +110,7 @@ export default {
           this.addTestCase();
           break;
         case "import":
-          if (!getCurrentProjectID()) {
+          if (!this.projectId) {
             this.$warning(this.$t('commons.check_project_tip'));
             return;
           }
diff --git a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
index c6121feaf7..90a5e80e7f 100644
--- a/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
+++ b/frontend/src/business/components/track/common/minder/TestCaseMinder.vue
@@ -124,7 +124,7 @@ name: "TestCaseMinder",
       if (isChange) {
         saveCases.push(testCase);
       }
-      if (testCase.nodeId.length < 15) {
+      if (testCase.nodeId !== 'root' && testCase.nodeId.length < 15) {
         let tip = this.$t('test_track.case.create_case') + "'" + testCase.name + "'" + this.$t('test_track.case.minder_create_tip');
         this.$error(tip)
         throw new Error(tip);
diff --git a/frontend/src/business/components/track/common/minder/minderUtils.js b/frontend/src/business/components/track/common/minder/minderUtils.js
index 696958b8ac..e8147ba655 100644
--- a/frontend/src/business/components/track/common/minder/minderUtils.js
+++ b/frontend/src/business/components/track/common/minder/minderUtils.js
@@ -1,39 +1,41 @@
 export function getTestCaseDataMap(testCase, isDisable, setParamCallback) {
   let dataMap = new Map();
-  testCase.forEach(item => {
-    item.steps = JSON.parse(item.steps);
-    // if (item.tags && item.tags.length > 0) {
-    //   item.tags = JSON.parse(item.tags);
-    // }
-    let mapItem = dataMap.get(item.nodeId);
-    let nodeItem = {
-      data: {
-        id: item.id,
-        text: item.name,
-        priority: Number.parseInt(item.priority.substring(item.priority.length - 1 )) + 1,
-        resource: ["用例"],
-        type: item.type,
-        method: item.method,
-        maintainer: item.maintainer
+  if (testCase) {
+    testCase.forEach(item => {
+      item.steps = JSON.parse(item.steps);
+      // if (item.tags && item.tags.length > 0) {
+      //   item.tags = JSON.parse(item.tags);
+      // }
+      let mapItem = dataMap.get(item.nodeId);
+      let nodeItem = {
+        data: {
+          id: item.id,
+          text: item.name,
+          priority: Number.parseInt(item.priority.substring(item.priority.length - 1 )) + 1,
+          resource: ["用例"],
+          type: item.type,
+          method: item.method,
+          maintainer: item.maintainer
+        }
       }
-    }
-    if (setParamCallback) {
-      setParamCallback(nodeItem.data, item);
-    }
-    if (isDisable) {
-      nodeItem.data.disable = true;
-      // 用例节点可以打标签
-      nodeItem.data.allowDisabledTag = true;
-    }
-    parseChildren(nodeItem, item, isDisable);
-    if (mapItem) {
-      mapItem.push(nodeItem);
-    } else {
-      mapItem = [];
-      mapItem.push(nodeItem);
-      dataMap.set(item.nodeId, mapItem);
-    }
-  })
+      if (setParamCallback) {
+        setParamCallback(nodeItem.data, item);
+      }
+      if (isDisable) {
+        nodeItem.data.disable = true;
+        // 用例节点可以打标签
+        nodeItem.data.allowDisabledTag = true;
+      }
+      parseChildren(nodeItem, item, isDisable);
+      if (mapItem) {
+        mapItem.push(nodeItem);
+      } else {
+        mapItem = [];
+        mapItem.push(nodeItem);
+        dataMap.set(item.nodeId, mapItem);
+      }
+    })
+  }
   return dataMap;
 }
 
@@ -41,14 +43,16 @@ function parseChildren(nodeItem, item, isDisable) {
   nodeItem.children = [];
   let children = [];
   _parseChildren(children, item.prerequisite, "前置条件", isDisable);
-  item.steps.forEach((step) => {
-    let descNode = _parseChildren(children, step.desc, undefined, isDisable);
-    if (descNode) {
-      descNode.data.num = step.num;
-      descNode.children = [];
-      _parseChildren(descNode.children, step.result, undefined, isDisable);
-    }
-  });
+  if (item.steps) {
+    item.steps.forEach((step) => {
+      let descNode = _parseChildren(children, step.desc, undefined, isDisable);
+      if (descNode) {
+        descNode.data.num = step.num;
+        descNode.children = [];
+        _parseChildren(descNode.children, step.result, undefined, isDisable);
+      }
+    });
+  }
   _parseChildren(children, item.remark, "备注", isDisable);
   nodeItem.children = children;
 }
diff --git a/frontend/src/business/components/track/home/TrackHome.vue b/frontend/src/business/components/track/home/TrackHome.vue
index 206a2af82e..831e756651 100644
--- a/frontend/src/business/components/track/home/TrackHome.vue
+++ b/frontend/src/business/components/track/home/TrackHome.vue
@@ -73,7 +73,6 @@ import MsMainContainer from "@/business/components/common/components/MsMainConta
 import MsContainer from "@/business/components/common/components/MsContainer";
 import CaseCountCard from "@/business/components/track/home/components/CaseCountCard";
 import RelevanceCaseCard from "@/business/components/track/home/components/RelevanceCaseCard";
-import {getCurrentProjectID,getUUID} from "@/common/js/utils";
 import CaseMaintenance from "@/business/components/track/home/components/CaseMaintenance";
 import {COUNT_NUMBER, COUNT_NUMBER_SHALLOW} from "@/common/js/constants";
 import BugCountCard from "@/business/components/track/home/components/BugCountCard";
@@ -108,13 +107,18 @@ export default {
     this.checkTipsType();
     this.init();
   },
+  computed: {
+    projectId() {
+      return this.$store.state.projectId
+    },
+  },
   methods: {
     checkTipsType() {
       let random = Math.floor(Math.random() * (4 - 1 + 1)) + 1;
       this.tipsType = random + "";
     },
     init() {
-      let selectProjectId = getCurrentProjectID();
+      let selectProjectId = this.projectId;
 
       this.$get("/track/count/" + selectProjectId, response => {
         this.trackCountData = response.data;
@@ -191,7 +195,12 @@ export default {
       // this.$router.push('/track/plan/view/'+selectType);
       switch (page){
         case "case":
-          this.$router.push({name:'testCase',params:{dataType:dataType,dataSelectRange:selectType, projectId: getCurrentProjectID()}});
+          this.$router.push({
+            name:'testCase',
+            params:{
+              dataType:dataType,dataSelectRange:selectType, projectId: this.projectId
+            }
+          });
           break;
       }
     }
diff --git a/frontend/src/business/components/track/plan/TestPlan.vue b/frontend/src/business/components/track/plan/TestPlan.vue
index 6974f8cead..cc037332c2 100644
--- a/frontend/src/business/components/track/plan/TestPlan.vue
+++ b/frontend/src/business/components/track/plan/TestPlan.vue
@@ -20,7 +20,6 @@
   import TestPlanEdit from './components/TestPlanEdit';
   import MsContainer from "../../common/components/MsContainer";
   import MsMainContainer from "../../common/components/MsMainContainer";
-  import {getCurrentProjectID} from "../../../../common/js/utils";
 
   export default {
     name: "TestPlan",
@@ -29,6 +28,11 @@
       return {
       }
     },
+    computed: {
+      projectId() {
+        return this.$store.state.projectId
+      },
+    },
     mounted() {
       if (this.$route.path.indexOf("/track/plan/create") >= 0){
         this.openTestPlanEditDialog();
@@ -38,7 +42,7 @@
     watch: {
       '$route'(to, from) {
         if (to.path.indexOf("/track/plan/create") >= 0){
-          if (!getCurrentProjectID()) {
+          if (!this.projectId) {
             this.$warning(this.$t('commons.check_project_tip'));
             return;
           }
diff --git a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
index 525236deda..1773b19e59 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanEdit.vue
@@ -125,7 +125,7 @@
 
 import {WORKSPACE_ID} from '@/common/js/constants';
 import TestPlanStatusButton from "../common/TestPlanStatusButton";
-import {getCurrentProjectID, listenGoBack, removeGoBackListener} from "@/common/js/utils";
+import {listenGoBack, removeGoBackListener} from "@/common/js/utils";
 import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
 import MsInputTag from "@/business/components/api/automation/scenario/MsInputTag";
 
diff --git a/frontend/src/business/components/track/plan/components/TestPlanList.vue b/frontend/src/business/components/track/plan/components/TestPlanList.vue
index 872be37362..473047b812 100644
--- a/frontend/src/business/components/track/plan/components/TestPlanList.vue
+++ b/frontend/src/business/components/track/plan/components/TestPlanList.vue
@@ -220,11 +220,10 @@ import TestCaseReportView from "../view/comonents/report/TestCaseReportView";
 import MsDeleteConfirm from "../../../common/components/MsDeleteConfirm";
 import {TEST_PLAN_CONFIGS} from "../../../common/components/search/search-components";
 import {LIST_CHANGE, TrackEvent} from "@/business/components/common/head/ListEvent";
-import {getCurrentProjectID} from "../../../../../common/js/utils";
 import MsScheduleMaintain from "@/business/components/api/automation/schedule/ScheduleMaintain"
 import {_filter, _sort, getLabel} from "@/common/js/tableUtils";
-import {TEST_CASE_LIST, TEST_PLAN_LIST} from "@/common/js/constants";
-import {Test_Plan_List, Track_Test_Case} from "@/business/components/common/model/JsonData";
+import {TEST_PLAN_LIST} from "@/common/js/constants";
+import {Test_Plan_List} from "@/business/components/common/model/JsonData";
 import HeaderCustom from "@/business/components/common/head/HeaderCustom";
 import HeaderLabelOperate from "@/business/components/common/head/HeaderLabelOperate";
 import MsTag from "@/business/components/common/components/MsTag";
@@ -282,6 +281,9 @@ export default {
   },
   created() {
     this.projectId = this.$route.params.projectId;
+    if (!this.projectId) {
+      this.projectId = this.$store.state.projectId;
+    }
     this.isTestManagerOrTestUser = checkoutTestManagerOrTestUser();
     this.initTableData();
   },
@@ -296,7 +298,7 @@ export default {
       if (this.selectNodeIds && this.selectNodeIds.length > 0) {
         this.condition.nodeIds = this.selectNodeIds;
       }
-      if (!getCurrentProjectID()) {
+      if (!this.projectId) {
         return;
       }
       this.result = this.$post(this.buildPagePath(this.queryPath), this.condition, response => {
@@ -320,7 +322,7 @@ export default {
       return path + "/" + this.currentPage + "/" + this.pageSize;
     },
     testPlanCreate() {
-      if (!getCurrentProjectID()) {
+      if (!this.projectId) {
         this.$warning(this.$t('commons.check_project_tip'));
         return;
       }
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
index af559f4c91..c8b3526287 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiCaseList.vue
@@ -151,7 +151,7 @@ import MsBottomContainer from "../../../../../api/definition/components/BottomCo
 import ShowMoreBtn from "../../../../case/components/ShowMoreBtn";
 import BatchEdit from "@/business/components/track/case/components/BatchEdit";
 import {API_METHOD_COLOUR, CASE_PRIORITY, RESULT_MAP} from "../../../../../api/definition/model/JsonData";
-import {getCurrentProjectID, strMapToObj} from "@/common/js/utils";
+import {strMapToObj} from "@/common/js/utils";
 import ApiListContainer from "../../../../../api/definition/components/list/ApiListContainer";
 import PriorityTableItem from "../../../../common/tableItems/planview/PriorityTableItem";
 import {getBodyUploadFiles, getUUID} from "../../../../../../../common/js/utils";
@@ -539,7 +539,7 @@ export default {
     },
     getProjectId() {
       if (!this.isRelevanceModel) {
-        return getCurrentProjectID();
+        return this.$store.state.projectId;
       } else {
         return this.currentCaseProjectId;
       }
diff --git a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
index ace6c4148a..5bb04bf0b3 100644
--- a/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/api/TestPlanApiScenarioList.vue
@@ -103,7 +103,7 @@ import MsTableHeader from "@/business/components/common/components/MsTableHeader
 import MsTablePagination from "@/business/components/common/pagination/TablePagination";
 import ShowMoreBtn from "@/business/components/track/case/components/ShowMoreBtn";
 import MsTag from "../../../../../common/components/MsTag";
-import {getUUID, getCurrentProjectID, getCurrentUser, strMapToObj} from "@/common/js/utils";
+import {getUUID, strMapToObj} from "@/common/js/utils";
 import MsApiReportDetail from "../../../../../api/automation/report/ApiReportDetail";
 import MsTableMoreBtn from "../../../../../api/automation/scenario/TableMoreBtn";
 import MsScenarioExtendButtons from "@/business/components/api/automation/scenario/ScenarioExtendBtns";
@@ -162,7 +162,6 @@ export default {
       status: 'default',
       infoDb: false,
       runVisible: false,
-      projectId: "",
       runData: [],
       buttons: [
         {
@@ -182,8 +181,12 @@ export default {
       },
     }
   },
+  computed: {
+    projectId() {
+      return this.$store.state.projectId
+    },
+  },
   created() {
-    this.projectId = getCurrentProjectID();
     this.search();
   },
   watch: {
diff --git a/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue b/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
index c3c1a9dd0b..4561337c72 100644
--- a/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/base/TestCaseRelevanceBase.vue
@@ -94,7 +94,7 @@
         this.result = this.$get("/project/listAll", res => {
           let data = res.data;
           if (data) {
-            const index = data.findIndex(d => d.id === getCurrentProjectID());
+            const index = data.findIndex(d => d.id === this.$store.state.projectId);
             this.projects = data;
             if (index !== -1) {
               this.projectId = data[index].id;
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
index 8b86c9210f..09a693c76d 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/FunctionalTestCaseList.vue
@@ -1,7 +1,5 @@
 <template>
   <div class="card-container">
-<!--    <el-card class="card-content" v-loading="result.loading">-->
-<!--      <template v-slot:header>-->
         <ms-table-header :is-tester-permission="true" :condition.sync="condition" @search="initTableData"
                          :show-create="false" :tip="$t('commons.search_by_id_name_tag')">
 
@@ -18,14 +16,8 @@
             <ms-table-button :is-tester-permission="true" icon="el-icon-connection"
                              :content="$t('test_track.plan_view.relevance_test_case')"
                              @click="$emit('openTestCaseRelevanceDialog')"/>
-
-<!--            删除 “取消全部关联” 按钮-->
-<!--            <ms-table-button :is-tester-permission="true" icon="el-icon-document-remove"-->
-<!--                             :content="$t('test_track.plan_view.cancel_all_relevance')" @click="handleDeleteBatch"/>-->
-
           </template>
         </ms-table-header>
-<!--      </template>-->
 
       <executor-edit ref="executorEdit" :select-ids="new Set(Array.from(this.selectRows).map(row => row.id))"
                      @refresh="initTableData"/>
@@ -712,4 +704,8 @@ export default {
 .el-tag {
   margin-left: 10px;
 }
+
+.ms-table-header >>> .table-title {
+  height: 0px;
+}
 </style>
diff --git a/frontend/src/business/components/track/plan/view/comonents/functional/TestPlanFunctional.vue b/frontend/src/business/components/track/plan/view/comonents/functional/TestPlanFunctional.vue
index d00481b0a8..0549812265 100644
--- a/frontend/src/business/components/track/plan/view/comonents/functional/TestPlanFunctional.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/functional/TestPlanFunctional.vue
@@ -51,7 +51,6 @@
     import FunctionalTestCaseList from "./FunctionalTestCaseList";
     import MsTabButton from "@/business/components/common/components/MsTabButton";
     import TestPlanMinder from "@/business/components/track/common/minder/TestPlanMinder";
-    import {getCurrentProjectID} from "@/common/js/utils";
 
     export default {
       name: "TestPlanFunctional",
@@ -71,7 +70,6 @@
           selectParentNodes: [],
           treeNodes: [],
           activeDom: 'left',
-          projectId: ""
         }
       },
       props: [
@@ -80,9 +78,13 @@
         'clickType'
       ],
       mounted() {
-        this.projectId = getCurrentProjectID();
         this.initData();
       },
+      computed: {
+        projectId() {
+          return this.$store.state.projectId
+        },
+      },
       activated(){
         this.initData();
         this.openTestCaseEdit(this.$route.path);
diff --git a/frontend/src/business/components/track/report/TestPlanReport.vue b/frontend/src/business/components/track/report/TestPlanReport.vue
index 1fb16b0a50..4bc9d02ba2 100644
--- a/frontend/src/business/components/track/report/TestPlanReport.vue
+++ b/frontend/src/business/components/track/report/TestPlanReport.vue
@@ -13,7 +13,6 @@
 import TestPlanReportList from './components/TestPlanReportList';
 import MsContainer from "../../common/components/MsContainer";
 import MsMainContainer from "../../common/components/MsMainContainer";
-import {getCurrentProjectID} from "../../../../common/js/utils";
 
 export default {
   name: "TestPlanReport",
diff --git a/frontend/src/business/components/track/report/components/TestPlanReportList.vue b/frontend/src/business/components/track/report/components/TestPlanReportList.vue
index a9b2ec3191..b4b7049506 100644
--- a/frontend/src/business/components/track/report/components/TestPlanReportList.vue
+++ b/frontend/src/business/components/track/report/components/TestPlanReportList.vue
@@ -66,7 +66,6 @@ import MsTableOperatorButton from "../../../common/components/MsTableOperatorBut
 import MsTableOperator from "../../../common/components/MsTableOperator";
 import {checkoutTestManagerOrTestUser} from "@/common/js/utils";
 import {TEST_PLAN_REPORT_CONFIGS} from "../../../common/components/search/search-components";
-import {getCurrentProjectID} from "../../../../../common/js/utils";
 import TestPlanReportView from "@/business/components/track/report/components/TestPlanReportView";
 import ReportTriggerModeItem from "@/business/components/common/tableItem/ReportTriggerModeItem";
 import MsTag from "@/business/components/common/components/MsTag";
@@ -124,6 +123,9 @@ export default {
   },
   created() {
     this.projectId = this.$route.params.projectId;
+    if (!this.projectId) {
+      this.projectId = this.$store.state.projectId;
+    }
     this.isTestManagerOrTestUser = checkoutTestManagerOrTestUser();
     this.initTableData();
   },
@@ -139,7 +141,7 @@ export default {
       if (this.selectNodeIds && this.selectNodeIds.length > 0) {
         this.condition.nodeIds = this.selectNodeIds;
       }
-      if (!getCurrentProjectID()) {
+      if (!this.projectId) {
         return;
       }
       this.result = this.$post(this.buildPagePath(this.queryPath), this.condition, response => {
@@ -214,7 +216,7 @@ export default {
             let deleteParam = {};
             let ids = Array.from(this.selectRows).map(row => row.id);
             deleteParam.dataIds = ids;
-            deleteParam.projectId = getCurrentProjectID();
+            deleteParam.projectId = this.projectId;
             deleteParam.selectAllDate = this.isSelectAllDate;
             deleteParam.unSelectIds = this.unSelection;
             deleteParam = Object.assign(deleteParam, this.condition);
diff --git a/frontend/src/business/components/track/review/TestCaseReview.vue b/frontend/src/business/components/track/review/TestCaseReview.vue
index a69630973b..06708f59ca 100644
--- a/frontend/src/business/components/track/review/TestCaseReview.vue
+++ b/frontend/src/business/components/track/review/TestCaseReview.vue
@@ -18,7 +18,6 @@ import TestCaseReviewList from "./components/TestCaseReviewList";
 import TestCaseReviewEdit from "./components/TestCaseReviewEdit";
 import MsMainContainer from "../../common/components/MsMainContainer";
 import MsContainer from "../../common/components/MsContainer";
-import {getCurrentProjectID} from "../../../../common/js/utils";
 
 export default {
   name: "TestCaseReview",
@@ -33,6 +32,11 @@ export default {
 
     }
   },
+  computed: {
+    projectId() {
+      return this.$store.state.projectId
+    },
+  },
   mounted() {
     if (this.$route.path.indexOf("/track/review/create") >= 0){
       this.openCaseReviewEditDialog();
@@ -42,7 +46,7 @@ export default {
   watch: {
     '$route'(to) {
       if (to.path.indexOf("/track/review/create") >= 0){
-        if (!getCurrentProjectID()) {
+        if (!this.projectId) {
           this.$warning(this.$t('commons.check_project_tip'));
           return;
         }
diff --git a/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue b/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue
index 0abc731263..bd18176244 100644
--- a/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue
+++ b/frontend/src/business/components/track/review/components/TestCaseReviewEdit.vue
@@ -101,7 +101,7 @@
 
 import TestPlanStatusButton from "../../plan/common/TestPlanStatusButton";
 import {WORKSPACE_ID} from "@/common/js/constants";
-import {getCurrentProjectID, listenGoBack, removeGoBackListener} from "@/common/js/utils";
+import {listenGoBack, removeGoBackListener} from "@/common/js/utils";
 import MsInputTag from "@/business/components/api/automation/scenario/MsInputTag";
 
 export default {
diff --git a/frontend/src/business/components/track/review/components/TestCaseReviewList.vue b/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
index 9908e46940..798c2b32b6 100644
--- a/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
+++ b/frontend/src/business/components/track/review/components/TestCaseReviewList.vue
@@ -120,7 +120,6 @@ import MsCreateBox from "../../../settings/CreateBox";
 import MsTablePagination from "../../../common/pagination/TablePagination";
 import {
   checkoutTestManagerOrTestUser,
-  getCurrentProjectID, getCurrentUser,
   getCurrentWorkspaceId
 } from "../../../../../common/js/utils";
 import {_filter, _sort, getLabel} from "@/common/js/tableUtils";
@@ -176,6 +175,11 @@ export default {
     this.isTestManagerOrTestUser = checkoutTestManagerOrTestUser();
     this.initTableData();
   },
+  computed: {
+    projectId() {
+      return this.$store.state.projectId
+    },
+  },
   methods: {
     customHeader() {
       this.$refs.headerCustom.open(this.tableLabel)
@@ -185,10 +189,10 @@ export default {
       getLabel(this, TEST_CASE_REVIEW_LIST);
       let lastWorkspaceId = getCurrentWorkspaceId();
       this.condition.workspaceId = lastWorkspaceId;
-      if (!getCurrentProjectID()) {
+      if (!this.projectId) {
         return;
       }
-      this.condition.projectId = getCurrentProjectID();
+      this.condition.projectId = this.projectId;
       this.result = this.$post("/test/case/review/list/" + this.currentPage + "/" + this.pageSize, this.condition, response => {
         let data = response.data;
         this.total = data.itemCount;
@@ -219,7 +223,7 @@ export default {
       this.$router.push('/track/review/view/' + row.id);
     },
     testCaseReviewCreate() {
-      if (!getCurrentProjectID()) {
+      if (!this.projectId) {
         this.$warning(this.$t('commons.check_project_tip'));
         return;
       }
diff --git a/frontend/src/business/components/track/review/view/components/TestReviewFunction.vue b/frontend/src/business/components/track/review/view/components/TestReviewFunction.vue
index aca888ab7d..2b4440984f 100644
--- a/frontend/src/business/components/track/review/view/components/TestReviewFunction.vue
+++ b/frontend/src/business/components/track/review/view/components/TestReviewFunction.vue
@@ -49,7 +49,6 @@ import TestReviewRelevance from "@/business/components/track/review/view/compone
 import TestReviewTestCaseList from "@/business/components/track/review/view/components/TestReviewTestCaseList";
 import MsTabButton from "@/business/components/common/components/MsTabButton";
 import TestReviewMinder from "@/business/components/track/common/minder/TestReviewMinder";
-import {getCurrentProjectID} from "@/common/js/utils";
 
 export default {
   name: "TestReviewFunction",
@@ -69,7 +68,6 @@ export default {
       treeNodes: [],
       isMenuShow: true,
       activeDom: 'left',
-      projectId: ""
     }
   },
   props: [
@@ -79,11 +77,14 @@ export default {
   ],
   mounted() {
     this.getNodeTreeByReviewId()
-    this.projectId = getCurrentProjectID();
   },
   activated() {
     this.getNodeTreeByReviewId()
-
+  },
+  computed: {
+    projectId() {
+      return this.$store.state.projectId
+    },
   },
   methods: {
     refresh() {