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

fix(项目设置): 下拉框对齐 

--user=郭雨琦 下拉框对齐
This commit is contained in:
guoyuqi 2022-02-17 10:37:30 +08:00 committed by xiaomeinvG
parent 208176bbe5
commit 9c0bfaa912
2 changed files with 32 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/metersphere/api/service/ShareInfoService.java
View File

@ -522,10 +522,10 @@ public class ShareInfoService {
}
String type = "";
if(shareInfo.getShareType().equals("PERFORMANCE_REPORT")){
type = ProjectApplicationType.TRACK_SHARE_REPORT_TIME.toString();
type = ProjectApplicationType.PERFORMANCE_SHARE_REPORT_TIME.toString();
}
if(shareInfo.getShareType().equals("PLAN_DB_REPORT")){
type = ProjectApplicationType.PERFORMANCE_SHARE_REPORT_TIME.toString();
type = ProjectApplicationType.TRACK_SHARE_REPORT_TIME.toString();
}
if(StringUtils.isBlank(type)){
millisCheck(System.currentTimeMillis() - shareInfo.getUpdateTime() ,1000 * 60 * 60 * 24,shareInfo.getId());

52
frontend/src/business/components/project/menu/appmanage/TimingItem.vue
View File

@ -1,28 +1,36 @@
<template>
<app-manage-item :title="title" :append-span="3" :middle-span="12" :prepend-span="9">
<template #middle>
<span class="timing_name" v-if="shareLink">{{ $t('commons.validity_period') }}</span>
<span class="timing_name" v-if="!shareLink">{{ $t('project.keep_recent') }}</span>
<el-select v-model="selfQuantity" placeholder=" " size="mini" filterable
allow-create
class="timing_select" :disabled="selfChoose">
<el-option
v-for="item in quantityOptions"
:key="item"
:label="item"
:value="item">
</el-option>
</el-select>
<el-select v-model="selfUnit" placeholder=" " size="mini"
class="timing_select" :disabled="selfChoose">
<el-option
v-for="item in unitOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
<span class="timing_name" v-if="!shareLink" style="margin-left: 3px;">{{ $t('commons.report') }}</span>
<el-row>
<el-col span="5">
<div class="timing_name" v-if="shareLink">{{ $t('commons.validity_period') }}</div>
<div class="timing_name" v-if="!shareLink">{{ $t('project.keep_recent') }}</div>
</el-col>
<el-col span="16">
<el-select v-model="selfQuantity" placeholder=" " size="mini" filterable
allow-create
class="timing_select" :disabled="selfChoose">
<el-option
v-for="item in quantityOptions"
:key="item"
:label="item"
:value="item">
</el-option>
</el-select>
<el-select v-model="selfUnit" placeholder=" " size="mini"
class="timing_select" :disabled="selfChoose">
<el-option
v-for="item in unitOptions"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-col>
<el-col span="3">
<div class="timing_name" v-if="!shareLink" style="margin-left: 3px;">{{ $t('commons.report') }}</div>
</el-col>
</el-row>
</template>
<template #append>
<el-switch v-model="selfChoose" @change="chooseChange"></el-switch>