From 490e656a401d44e1515cd174335eb5bf300334dc Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Fri, 5 Nov 2021 17:06:21 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=8E=AF=E5=A2=83=E7=AE=A1=E7=90=86):=20?=
 =?UTF-8?q?=E7=8E=AF=E5=A2=83=E7=AE=A1=E7=90=86=E6=A0=B7=E5=BC=8F=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E3=80=81=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA=E9=A6=96?=
 =?UTF-8?q?=E9=A1=B5=E6=9F=B1=E7=8A=B6=E5=9B=BE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

环境管理样式修复、测试跟踪首页柱状图优化
---
 .../api/jmeter/ExecutedHandleSingleton.java   |  6 ----
 .../environment/EnvironmentGlobalScript.vue   | 34 +++++++++++++------
 .../components/track/home/TrackHome.vue       |  1 +
 3 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/jmeter/ExecutedHandleSingleton.java b/backend/src/main/java/io/metersphere/api/jmeter/ExecutedHandleSingleton.java
index 86aba524b0..8bf44a6b92 100644
--- a/backend/src/main/java/io/metersphere/api/jmeter/ExecutedHandleSingleton.java
+++ b/backend/src/main/java/io/metersphere/api/jmeter/ExecutedHandleSingleton.java
@@ -20,17 +20,11 @@ public class ExecutedHandleSingleton {
     }
 
     public synchronized static void parseEnvironment(List<String> evnStrList) {
-//        try {
-//         Thread.sleep(1000);
-//        }catch (Exception e){
-//        }
         for (String evnStr: evnStrList) {
             try {
                 Thread.sleep(1000);
             }catch (Exception e){
             }
-            System.out.println( "--------------------> \t\n" + evnStr);
-            System.out.println("---------------------<");
             apiEnvironmentRunningParamService.parseEvn(evnStr);
         }
     }
diff --git a/frontend/src/business/components/api/test/components/environment/EnvironmentGlobalScript.vue b/frontend/src/business/components/api/test/components/environment/EnvironmentGlobalScript.vue
index cbdecbd415..9ed89e3dfa 100644
--- a/frontend/src/business/components/api/test/components/environment/EnvironmentGlobalScript.vue
+++ b/frontend/src/business/components/api/test/components/environment/EnvironmentGlobalScript.vue
@@ -3,13 +3,13 @@
     <el-collapse v-model="activeNames">
       <el-collapse-item name="1">
         <template slot="title">
-          单个请求步骤后执行
+          <span class="span-style">{{title}}</span>
           <el-tooltip class="item" effect="dark" content="每一个API步骤后执行一次 如加解密" placement="right">
             <i class="el-icon-info"/>
           </el-tooltip>
 
           <div class="header-right" style="margin: 5px 5px 5px 50px" @click.stop>
-            过滤请求类型
+            <span class="span-style">过滤请求类型</span>
             <el-select multiple v-model="filterRequestArray" style="margin : 0px 10px 0px 10px; width: 214px "
                        size="small" placeholder="请选择">
               <el-option
@@ -19,16 +19,16 @@
                 :value="item.value">
               </el-option>
             </el-select>
-
-            脚本执行顺序
+            <span class="span-style" style="margin-right: 10px">脚本执行顺序</span>
             <el-select v-model="isExecAfterPrivateScript" size="small" placeholder="请选择">
               <el-option
-                v-for="item in scriptExecSort"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value">
+                  v-for="item in scriptExecSort"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value">
               </el-option>
             </el-select>
+
           </div>
 
         </template>
@@ -42,8 +42,8 @@
           <el-tooltip class="item" effect="dark" content="全部API流程结束后执行一次 如token获取，场景初始化" placement="right">
             <i class="el-icon-info"/>
           </el-tooltip>
-          <div class="header-right" style="margin: 5px 5px 5px 50px" @click.stop>
-            <el-switch v-model="isConnScenario" active-text="关联场景结果"
+          <div class="header-right" style="margin: 5px 5px 5px 50px;" @click.stop>
+            <el-switch v-model="isConnScenario" active-text="关联场景结果" style="font-size: 13px;font-weight: 300"
                        @click.stop/>
             <el-tooltip class="item" effect="dark" content="脚本步骤会统计到场景执行结果中，执行报错时会影响场景的最终执行结果" placement="right">
               <i class="el-icon-info"/>
@@ -80,6 +80,9 @@ export default {
   },
   data() {
     return {
+      title: "",
+      preTitle: "单个请求步骤前执行",
+      postTitle: "单个请求步骤后执行",
       result: {},
       activeNames: [],
       isConnScenario: false,
@@ -104,8 +107,10 @@ export default {
   created() {
     if (this.isPreProcessor) {
       this.scriptExecSort = this.scriptPreExecSort;
+      this.title = this.preTitle;
     } else {
       this.scriptExecSort = this.scriptPostExecSort;
+      this.title = this.postTitle;
     }
     this.isConnScenario = this.connScenario;
     this.isExecAfterPrivateScript = this.execAfterPrivateScript;
@@ -137,4 +142,13 @@ export default {
 .header-right {
   z-index: 1;
 }
+.span-style {
+  font-size: 13px;
+  font-weight: 400;
+}
+
+>>> .header-right .el-switch__label *{
+  font-size: 13px!important;
+  font-weight: 400;
+}
 </style>
diff --git a/frontend/src/business/components/track/home/TrackHome.vue b/frontend/src/business/components/track/home/TrackHome.vue
index e6ae5f25c0..d05cc7f3e2 100644
--- a/frontend/src/business/components/track/home/TrackHome.vue
+++ b/frontend/src/business/components/track/home/TrackHome.vue
@@ -144,6 +144,7 @@ export default {
           name: this.$t('test_track.home.function_case_count'),
           data: yAxis1,
           type: 'bar',
+          barWidth: 50,
           itemStyle: {
             color: this.$store.state.theme ? this.$store.state.theme : COUNT_NUMBER
           }