test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

refactor(系统设置): 重命名获取环境的方法名 

--user=郭雨琦
This commit is contained in:
guoyuqi 2022-11-07 18:56:57 +08:00 committed by xiaomeinvG
parent cb609764d9
commit 79754ee36a
5 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api-test/frontend/src/business/automation/scenario/EnvGroup.vue
View File

@ -27,7 +27,7 @@
<script> <script>
import EnvironmentGroup from "@/business/commons/EnvironmentGroupList"; import EnvironmentGroup from "@/business/commons/EnvironmentGroupList";
import {environmentGetALl, getEnvironmentMapByGroupId} from "metersphere-frontend/src/api/environment"; import {environmentGetALL, getEnvironmentMapByGroupId} from "metersphere-frontend/src/api/environment";
export default { export default {
name: "EnvGroup", name: "EnvGroup",
@ -67,7 +67,7 @@ export default {
this.envGroupId = this.groupId; this.envGroupId = this.groupId;
}, },
init() { init() {
environmentGetALl().then(res => { environmentGetALL().then(res => {
let data = res.data; let data = res.data;
this.groups = data ? data : []; this.groups = data ? data : [];
}) })

2
framework/sdk-parent/frontend/src/api/environment.js
View File

@ -48,7 +48,7 @@ export function addGroupEnvironment(params) {
return post('/environment/group/add', params); return post('/environment/group/add', params);
} }
export function environmentGetALl() { export function environmentGetALL() {
return post('/environment/group/get/all', {}); return post('/environment/group/get/all', {});
} }

1
test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java
View File

@ -1843,7 +1843,6 @@ public class TestPlanService {
this.setPlanCaseEnv(testPlanId, runModeConfig); this.setPlanCaseEnv(testPlanId, runModeConfig);
} else if (StringUtils.equals(testplanRunRequest.getEnvironmentType(), "GROUP") && StringUtils.isNotBlank(testplanRunRequest.getEnvironmentGroupId())) { } else if (StringUtils.equals(testplanRunRequest.getEnvironmentType(), "GROUP") && StringUtils.isNotBlank(testplanRunRequest.getEnvironmentGroupId())) {
runModeConfig.setEnvironmentGroupId(testplanRunRequest.getEnvironmentGroupId()); runModeConfig.setEnvironmentGroupId(testplanRunRequest.getEnvironmentGroupId());
runModeConfig.setEnvMap(testplanRunRequest.getEnvMap());
this.setPlanCaseEnv(testPlanId, runModeConfig); this.setPlanCaseEnv(testPlanId, runModeConfig);
} }
} }

4
test-track/frontend/src/business/plan/env/EnvGroup.vue vendored
View File

@ -27,7 +27,7 @@
<script> <script>
import EnvironmentGroup from "./EnvironmentGroupList"; import EnvironmentGroup from "./EnvironmentGroupList";
import {environmentGetALl, getEnvironmentMapByGroupId} from "metersphere-frontend/src/api/environment"; import {environmentGetALL, getEnvironmentMapByGroupId} from "metersphere-frontend/src/api/environment";
export default { export default {
name: "EnvGroup", name: "EnvGroup",
@ -67,7 +67,7 @@ export default {
this.envGroupId = this.groupId; this.envGroupId = this.groupId;
}, },
init() { init() {
environmentGetALl().then(res => { environmentGetALL().then(res => {
let data = res.data; let data = res.data;
this.groups = data ? data : []; this.groups = data ? data : [];
}) })

4
test-track/frontend/src/business/plan/env/EnvSelectPopover.vue vendored
View File

@ -56,7 +56,7 @@
<script> <script>
import {ENV_TYPE} from "metersphere-frontend/src/utils/constants"; import {ENV_TYPE} from "metersphere-frontend/src/utils/constants";
import {environmentGetALl} from "metersphere-frontend/src/api/environment"; import {environmentGetALL} from "metersphere-frontend/src/api/environment";
import MsTag from "metersphere-frontend/src/components/MsTag"; import MsTag from "metersphere-frontend/src/components/MsTag";
import EnvironmentGroup from "@/business/plan/env/EnvironmentGroupList"; import EnvironmentGroup from "@/business/plan/env/EnvironmentGroupList";
import {getEnvironmentByProjectId} from "@/api/remote/api/api-environment"; import {getEnvironmentByProjectId} from "@/api/remote/api/api-environment";
@ -114,7 +114,7 @@ export default {
this.visible = true; this.visible = true;
}, },
getgroups(){ getgroups(){
environmentGetALl().then(res => { environmentGetALL().then(res => {
let data = res.data; let data = res.data;
this.groups = data ? data : []; this.groups = data ? data : [];
}) })