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

refactor: 调整菜单位置

This commit is contained in:
shiziyuan9527 2021-10-21 17:27:30 +08:00 committed by 刘瑞斌
parent 7f4182f923
commit 2b77eb721d
4 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
backend/src/main/java/io/metersphere/api/service/ApiTestCaseService.java
View File

@ -168,7 +168,7 @@ public class ApiTestCaseService {
filters.put("status", new ArrayList<>());
}
}
if(request.isToUpdate()){
if (request.isToUpdate()) {
Long timestamp = DateUtils.getTimestamp(-3);
request.setUpdateTime(timestamp);
}
@ -1126,7 +1126,12 @@ public class ApiTestCaseService {
return null;
}
// "environmentId"
environmentId = environmentId.substring(1,environmentId.length()-1);
return apiTestEnvironmentMapper.selectByPrimaryKey(environmentId);
try {
environmentId = environmentId.substring(1, environmentId.length() - 1);
return apiTestEnvironmentMapper.selectByPrimaryKey(environmentId);
} catch (Exception e) {
LogUtil.error("api case environmentId incorrect parsing. api case id: " + caseId);
}
return null;
}
}

2
backend/src/main/java/io/metersphere/base/mapper/ext/ExtApiTestCaseMapper.java
View File

@ -64,4 +64,6 @@ public interface ExtApiTestCaseMapper {
* @return ApiEnvironment
*/
String getApiCaseEnvironment(@Param("caseId") String caseId);
int moduleCount(@Param("request")ApiTestCaseRequest request);
}

6
frontend/src/business/components/project/head/ProjectHeaderMenus.vue
View File

@ -20,13 +20,13 @@
popper-class="submenu">
{{ $t('project.file_manage') }}
</el-menu-item>
<el-menu-item :index="'/project/log'" popper-class="submenu" v-permission="['PROJECT_OPERATING_LOG:READ']">
{{ $t('project.log') }}
</el-menu-item>
<el-menu-item :index="'/project/code/segment'" popper-class="submenu"
v-permission="['PROJECT_CUSTOM_CODE:READ']">
{{ $t('project.code_segment.code_segment') }}
</el-menu-item>
<el-menu-item :index="'/project/log'" popper-class="submenu" v-permission="['PROJECT_OPERATING_LOG:READ']">
{{ $t('project.log') }}
</el-menu-item>
<el-menu-item popper-class="submenu" @click="clickPlanMenu" class="hidden-sm-and-down">
{{ $t('project.version_manage') }}
</el-menu-item>

22
frontend/src/business/components/project/home/ProjectHome.vue
View File

@ -71,17 +71,6 @@
<span class="desc">{{ $t('project.file_desc') }}</span>
</div>
</div>
<div class="div-item">
<div style="float: left">
<i class="el-icon-s-flag icon-color"
@click="click('/project/log', ['PROJECT_OPERATING_LOG:READ'])"></i>
</div>
<div style="float: left">
<span class="title" @click="click('/project/log', ['PROJECT_OPERATING_LOG:READ'])">
{{ $t('project.log') }}</span><br/>
<span class="desc">{{ $t('project.log_desc') }}</span>
</div>
</div>
<div class="div-item">
<div style="float: left">
<i class="el-icon-document icon-color"
@ -94,6 +83,17 @@
<span class="desc">{{ $t('project.code_segment_desc') }}</span>
</div>
</div>
<div class="div-item">
<div style="float: left">
<i class="el-icon-s-flag icon-color"
@click="click('/project/log', ['PROJECT_OPERATING_LOG:READ'])"></i>
</div>
<div style="float: left">
<span class="title" @click="click('/project/log', ['PROJECT_OPERATING_LOG:READ'])">
{{ $t('project.log') }}</span><br/>
<span class="desc">{{ $t('project.log_desc') }}</span>
</div>
</div>
</div>
</el-card>
</el-col>