Merge branch 'master' of https://github.com/metersphere/metersphere

backend/src/main/java/io/metersphere/track/service/TestPlanService.java

@@ -95,10 +95,6 @@ public class TestPlanService {
 
         testPlan.setId(testPlanId);
         testPlan.setStatus(TestPlanStatus.Prepare.name());
-        testPlan.setPlannedStartTime(System.currentTimeMillis());
-        testPlan.setPlannedEndTime(System.currentTimeMillis());
-        testPlan.setActualStartTime(System.currentTimeMillis());
-        testPlan.setActualEndTime(System.currentTimeMillis());
         testPlan.setCreateTime(System.currentTimeMillis());
         testPlan.setUpdateTime(System.currentTimeMillis());
         testPlanMapper.insert(testPlan);
@@ -120,16 +116,14 @@ public class TestPlanService {
         testPlan.setUpdateTime(System.currentTimeMillis());
         checkTestPlanExist(testPlan);
         //进行中状态，写入实际开始时间
-        if ("Underway".equals(testPlan.getStatus())) {
+        if (TestPlanStatus.Underway.name().equals(testPlan.getStatus())) {
             testPlan.setActualStartTime(System.currentTimeMillis());
-            return testPlanMapper.updateByPrimaryKeySelective(testPlan);
+
-        } else if("Completed".equals(testPlan.getStatus())){
+        } else if(TestPlanStatus.Completed.name().equals(testPlan.getStatus())){
             //已完成，写入实际完成时间
             testPlan.setActualEndTime(System.currentTimeMillis());
-            return testPlanMapper.updateByPrimaryKeySelective(testPlan);
-        } else {
-            return 0;
         }
+        return testPlanMapper.updateByPrimaryKeySelective(testPlan);
     }
 
     private void editTestPlanProject(TestPlanDTO testPlan) {

frontend/src/business/components/api/test/components/request/ApiHttpRequestForm.vue

@@ -156,7 +156,7 @@ export default {
         let url = new URL(urlStr);
         url.searchParams.forEach((value, key) => {
           if (key && value) {
-            this.request.parameters.splice(0, 0, new KeyValue({name: name, value: value}));
+            this.request.parameters.splice(0, 0, new KeyValue({name: key, value: value}));
           }
         });
         return url;

frontend/src/business/components/settings/system/BaseSetting.vue

@@ -6,6 +6,7 @@
         <el-col>
           <el-form-item :label="$t('system_config.base.url')" prop="url">
             <el-input v-model="formInline.url" :placeholder="$t('system_config.base.url_tip')"/>
+            <i>(示例:https://rdmetersphere.fit2cloud.com)</i>
           </el-form-item>
         </el-col>
       </el-row>

frontend/src/business/components/track/home/components/ReviewList.vue

@@ -54,7 +54,7 @@
 
       <el-table-column
         prop="projectName"
-        :label="$t('test_track.home.test_rate')"
+        :label="$t('test_track.home.review_progress')"
         min-width="100"
         show-overflow-tooltip>
         <template v-slot:default="scope">

frontend/src/business/components/track/plan/components/TestPlanEdit.vue

@@ -271,6 +271,8 @@ export default {
           this.form.stage = '';
           this.form.description = '';
           this.form.status = null;
+          this.form.plannedStartTime = null;
+          this.form.plannedEndTime = null;
           return true;
         });
       }

frontend/src/i18n/en-US.js

@@ -794,6 +794,7 @@ export default {
       my_plan: "My plan",
       test_rate: "Test rate",
       tested_case: "Tested case",
+      review_progress: "Review progress"
     },
     plan_view: {
       plan: "Plan",

frontend/src/i18n/zh-CN.js

@@ -800,6 +800,7 @@ export default {
       my_plan: "我的计划",
       test_rate: "测试进度",
       tested_case: "已测用例",
+      review_progress: "评审进度"
     },
     plan_view: {
       plan: "计划",

frontend/src/i18n/zh-TW.js

@@ -796,6 +796,7 @@ export default {
       my_plan: "我的計劃",
       test_rate: "測試進度",
       tested_case: "已測用例",
+      review_progress: "評審進度"
     },
     plan_view: {
       plan: "計劃",