|
@@ -1,6 +1,6 @@
|
|
|
<template>
|
|
<template>
|
|
|
<div class="home-container">
|
|
<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-col :span="24" class="box-col">
|
|
|
<el-card class="box-card">
|
|
<el-card class="box-card">
|
|
|
<div slot="header" class="clearfix">
|
|
<div slot="header" class="clearfix">
|
|
@@ -38,7 +38,7 @@
|
|
|
</el-col>
|
|
</el-col>
|
|
|
</el-row>
|
|
</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-col :span="18" class="box-col">
|
|
|
<el-card class="box-card">
|
|
<el-card class="box-card">
|
|
|
<div slot="header" class="clearfix">
|
|
<div slot="header" class="clearfix">
|
|
@@ -143,7 +143,7 @@
|
|
|
</el-col>
|
|
</el-col>
|
|
|
</el-row>
|
|
</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-col :span="18" class="box-col">
|
|
|
<el-card class="box-card notification-card">
|
|
<el-card class="box-card notification-card">
|
|
|
<div class="card-content">
|
|
<div class="card-content">
|
|
@@ -207,9 +207,9 @@
|
|
|
<el-row :gutter="20">
|
|
<el-row :gutter="20">
|
|
|
<el-col :span="10">
|
|
<el-col :span="10">
|
|
|
<div class="schedule-item-time">
|
|
<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>
|
|
</div>
|
|
|
</el-col>
|
|
</el-col>
|
|
|
<el-col :span="14">
|
|
<el-col :span="14">
|
|
@@ -353,11 +353,31 @@ export default {
|
|
|
const dateTime = item.startTime.split(' ');
|
|
const dateTime = item.startTime.split(' ');
|
|
|
const date = dateTime[0];
|
|
const date = dateTime[0];
|
|
|
const time = dateTime[1] || '';
|
|
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.date = date;
|
|
|
item.time = time;
|
|
item.time = time;
|
|
|
-
|
|
|
|
|
|
|
+ item.startHour = startHourOnly ? startMonthDay + ' ' + startHourOnly : '';
|
|
|
|
|
+ item.endHour = endHourOnly ? endMonthDay + ' ' + endHourOnly : '';
|
|
|
|
|
+
|
|
|
// 按日期分组
|
|
// 按日期分组
|
|
|
if (!groupedData[date]) {
|
|
if (!groupedData[date]) {
|
|
|
groupedData[date] = [];
|
|
groupedData[date] = [];
|
|
@@ -943,7 +963,7 @@ export default {
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
.mt-20 {
|
|
.mt-20 {
|
|
|
- margin-top: 8px;
|
|
|
|
|
|
|
+ margin-top: 6px;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
.box-col {
|
|
.box-col {
|
|
@@ -967,7 +987,7 @@ export default {
|
|
|
::v-deep .el-card__body {
|
|
::v-deep .el-card__body {
|
|
|
padding-top: 0;
|
|
padding-top: 0;
|
|
|
}
|
|
}
|
|
|
- .el-tabs__item {
|
|
|
|
|
|
|
+ ::v-deep .el-tabs__item {
|
|
|
font-size: 15px;
|
|
font-size: 15px;
|
|
|
font-weight: bold;
|
|
font-weight: bold;
|
|
|
}
|
|
}
|