From 9c0bfaa912f88c124a16a90f56e9210d4b43573f Mon Sep 17 00:00:00 2001
From: guoyuqi <xiaomeinvG@126.com>
Date: Thu, 17 Feb 2022 10:37:30 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE):=20?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E6=A1=86=E5=AF=B9=E9=BD=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--user=郭雨琦 下拉框对齐
---
 .../api/service/ShareInfoService.java         |  4 +-
 .../project/menu/appmanage/TimingItem.vue     | 52 +++++++++++--------
 2 files changed, 32 insertions(+), 24 deletions(-)

diff --git a/backend/src/main/java/io/metersphere/api/service/ShareInfoService.java b/backend/src/main/java/io/metersphere/api/service/ShareInfoService.java
index 046db61584..7ee7c42e47 100644
--- a/backend/src/main/java/io/metersphere/api/service/ShareInfoService.java
+++ b/backend/src/main/java/io/metersphere/api/service/ShareInfoService.java
@@ -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());
diff --git a/frontend/src/business/components/project/menu/appmanage/TimingItem.vue b/frontend/src/business/components/project/menu/appmanage/TimingItem.vue
index 0ccf34ad12..066e4d23e4 100644
--- a/frontend/src/business/components/project/menu/appmanage/TimingItem.vue
+++ b/frontend/src/business/components/project/menu/appmanage/TimingItem.vue
@@ -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>