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

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

This commit is contained in:
chenjianxing 2020-11-09 13:55:47 +08:00
parent fcf879d06f e6231fc07e
commit f087d3cbb4
3 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/src/main/java/io/metersphere/track/service/TestCaseNodeService.java
View File

@ -191,17 +191,19 @@ public class TestCaseNodeService {
* 获取当前计划下
* 有关联数据的节点
*
* @param planId
* @return
* @param planId plan id
* @return List<TestCaseNodeDTO>
*/
public List<TestCaseNodeDTO> getNodeByPlanId(String planId) {
List<TestCaseNodeDTO> list = new ArrayList<>();
List<String> projectIds = testPlanProjectService.getProjectIdsByPlanId(planId);
projectIds.forEach(id -> {
String name = projectMapper.selectByPrimaryKey(id).getName();
Project project = projectMapper.selectByPrimaryKey(id);
String name = project.getName();
List<TestCaseNodeDTO> nodeList = getNodeDTO(id, planId);
TestCaseNodeDTO testCaseNodeDTO = new TestCaseNodeDTO();
testCaseNodeDTO.setId(project.getId());
testCaseNodeDTO.setName(name);
testCaseNodeDTO.setLabel(name);
testCaseNodeDTO.setChildren(nodeList);

10
backend/src/main/resources/db/migration/V41__set_ui.sql Normal file
View File

@ -0,0 +1,10 @@
INSERT INTO system_parameter (param_key, param_value, type, sort)
VALUES ('ui.loginImage', NULL, 'file', 3);
INSERT INTO system_parameter (param_key, param_value, type, sort)
VALUES ('ui.loginLogo', NULL, 'file', 2);
INSERT INTO system_parameter (param_key, param_value, type, sort)
VALUES ('ui.loginTitle', '', 'text', 4);
INSERT INTO system_parameter (param_key, param_value, type, sort)
VALUES ('ui.logo', NULL, 'file', 1);
INSERT INTO system_parameter (param_key, param_value, type, sort)
VALUES ('ui.title', '', 'text', 5);

18
frontend/src/business/components/api/report/components/RequestResult.vue
View File

@ -4,15 +4,25 @@
<el-row :gutter="10" type="flex" align="middle" class="info">
<el-col :span="4">
<div class="method">
{{request.method}}
{{ request.method }}
</div>
</el-col>
<el-col :span="20">
<div class="name">{{request.name}}</div>
<el-col :span="15">
<div class="name">{{ request.name }}</div>
<el-tooltip effect="dark" :content="request.url" placement="bottom" :open-delay="800">
<div class="url">{{request.url}}</div>
<div class="url">{{ request.url }}</div>
</el-tooltip>
</el-col>
<el-col :span="5">
<div class="success">
<el-tag size="mini" type="success" v-if="request.success">
{{ $t('api_report.success') }}
</el-tag>
<el-tag size="mini" type="danger" v-else>
{{ $t('api_report.fail') }}
</el-tag>
</div>
</el-col>
</el-row>
</div>
</div>