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 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 @@ @@ -42,8 +42,8 @@ -
- + @@ -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; +} 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 }