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

资源池

This commit is contained in:
W23123 2020-03-24 16:14:27 +08:00
parent 9532e1adc0
commit c208f0705a
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/controller/TestResourcePoolController.java
View File

@ -42,7 +42,7 @@ public class TestResourcePoolController {
} }
@GetMapping("list/all") @GetMapping("list/all")
public List<TestResourcePool> listResourcePools() { public List<TestResourcePoolDTO> listResourcePools() {
PageHelper.startPage(1, 10000, true); PageHelper.startPage(1, 10000, true);
QueryResourcePoolRequest request = new QueryResourcePoolRequest(); QueryResourcePoolRequest request = new QueryResourcePoolRequest();
return testResourcePoolService.listResourcePools(request); return testResourcePoolService.listResourcePools(request);

2
frontend/src/business/components/settings/system/TestResourcePool.vue
View File

@ -334,8 +334,6 @@
this.createVisible = true; this.createVisible = true;
}, },
edit(row) { edit(row) {
window.console.log(row);
// this.loading = true;
this.updateVisible = true; this.updateVisible = true;
this.form = JSON.parse(JSON.stringify(row)); this.form = JSON.parse(JSON.stringify(row));
this.convertResources(); this.convertResources();