Przeglądaj źródła

fix(ui): 调整页面布局间距和标签文案

liujt 2 miesięcy temu
rodzic
commit
ae09056af4

+ 3 - 3
src/views/bpm/documents/noticeIssuance/index.vue

@@ -8,7 +8,7 @@
         <el-tab-pane label="草稿" name="0"></el-tab-pane>
         <el-tab-pane label="审核中" name="1"></el-tab-pane>
         <el-tab-pane label="驳回" name="3"></el-tab-pane>
-        <el-tab-pane label="办结" name="2"></el-tab-pane>
+        <el-tab-pane label="已通过" name="2"></el-tab-pane>
       </el-tabs>
       <!-- 数据表格 -->
       <ele-pro-table
@@ -129,13 +129,13 @@
         statusOpt: [
           { label: '待发布', value: '1' },
           { label: '已发布', value: '2' },
-          { label: '作废', value: '3' }
+          { label: '作废', value: '3' }
         ],
         approvalStatusOp: [
           { label: '草稿', value: '0' },
           { label: '审核中', value: '1' },
           { label: '驳回', value: '3' },
-          { label: '办结', value: '2' }
+          { label: '已通过', value: '2' }
         ],
         selection: [],
         cacheKeyUrl: '7cc8e5d2-wt-noticeIssuance-index',

+ 31 - 11
src/views/home/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="home-container">
-    <el-row :gutter="12" style="height: 148px;">
+    <el-row :gutter="6" style="height: 148px;">
       <el-col :span="24" class="box-col">
         <el-card class="box-card">
           <div slot="header" class="clearfix">
@@ -38,7 +38,7 @@
       </el-col>
     </el-row>
 
-    <el-row :gutter="12" class="mt-20" style="height: 232px;">
+    <el-row :gutter="6" class="mt-20" style="height: 232px;">
       <el-col :span="18" class="box-col">
         <el-card class="box-card">
           <div slot="header" class="clearfix">
@@ -143,7 +143,7 @@
       </el-col>
     </el-row>
 
-    <el-row :gutter="12" class="mt-20" style="height: 404px;">
+    <el-row :gutter="6" class="mt-20" style="height: 404px;">
       <el-col :span="18" class="box-col">
         <el-card class="box-card notification-card">
           <div class="card-content">
@@ -207,9 +207,9 @@
                 <el-row :gutter="20">
                   <el-col :span="10">
                     <div class="schedule-item-time">
-                      <div>{{ item.startTime }}</div>
-                      <div>~</div>
-                      <div>{{ item.endTime }}</div>
+                      <span>{{ item.startHour }}</span>
+                      <span>~</span>
+                      <span>{{ item.endHour }}</span>
                     </div>
                   </el-col>
                   <el-col :span="14">
@@ -353,11 +353,31 @@ export default {
             const dateTime = item.startTime.split(' ');
             const date = dateTime[0];
             const time = dateTime[1] || '';
-            
-            // 添加日期和时间属性
+
+            // 从 startTime 提取小时(去掉分秒)
+            const startHourOnly = time.split(':')[0] || '';
+            // 提取月日(去掉年份)
+            const startDateParts = date.split('-');
+            const startMonthDay = startDateParts[1] + '-' + startDateParts[2];
+
+            // 从 endTime 提取小时
+            let endHourOnly = '';
+            let endMonthDay = '';
+            if (item.endTime) {
+              const endDateTime = item.endTime.split(' ');
+              const endDate = endDateTime[0] || '';
+              const endDateParts = endDate.split('-');
+              endMonthDay = endDateParts[1] + '-' + endDateParts[2];
+              const endTime = endDateTime[1] || '';
+              endHourOnly = endTime.split(':')[0] || '';
+            }
+
+            // 添加日期和时间属性(保持原有的 date 和 time 不变)
             item.date = date;
             item.time = time;
-            
+            item.startHour = startHourOnly ? startMonthDay + ' ' + startHourOnly : '';
+            item.endHour = endHourOnly ? endMonthDay + ' ' + endHourOnly : '';
+
             // 按日期分组
             if (!groupedData[date]) {
               groupedData[date] = [];
@@ -943,7 +963,7 @@ export default {
   }
 }
 .mt-20 {
-  margin-top: 8px;
+  margin-top: 6px;
 }
 
 .box-col {
@@ -967,7 +987,7 @@ export default {
   ::v-deep .el-card__body {
     padding-top: 0;
   }
-  .el-tabs__item {
+  ::v-deep .el-tabs__item {
     font-size: 15px;
     font-weight: bold;
   }