fix:修复布局问题

This commit is contained in:
2026-04-06 22:21:11 +08:00
parent 7eeac7c465
commit 08999c608d
3 changed files with 10 additions and 5 deletions

View File

@@ -11,6 +11,7 @@
} }
section { section {
width: 100%;
.info-container, .record-container { .info-container, .record-container {
.info-item { .info-item {
padding: 1vh 1vw; padding: 1vh 1vw;

View File

@@ -110,6 +110,14 @@ const calculatePeriodDay = (date: string, cycleLength = 28, duration = 5) => {
for (const dateStr of allDates) { for (const dateStr of allDates) {
const currentDate = dayjs(dateStr) const currentDate = dayjs(dateStr)
if (dailyInfo.menstruateDateList.includes(formatDate(currentDate))) {
continue
}
if (dailyInfo.sexDateList.includes(formatDate(currentDate))) {
continue
}
// 判断月经期,跳过 // 判断月经期,跳过
if (currentDate.isSame(startDate, 'day') || checkIsMenstruateDate(currentDate, startDate, duration)) { if (currentDate.isSame(startDate, 'day') || checkIsMenstruateDate(currentDate, startDate, duration)) {
if (!dailyInfo.menstruateDateList.includes(dateStr)) { if (!dailyInfo.menstruateDateList.includes(dateStr)) {
@@ -122,10 +130,6 @@ const calculatePeriodDay = (date: string, cycleLength = 28, duration = 5) => {
continue continue
} }
if (dailyInfo.sexDateList.includes(formatDate(currentDate))) {
continue
}
// 判断排卵日 // 判断排卵日
if (currentDate.isSame(ovulationDate, 'day')) { if (currentDate.isSame(ovulationDate, 'day')) {
dailyInfo.attrs.push({ dailyInfo.attrs.push({

View File

@@ -19,7 +19,7 @@
<el-form-item label="旅行日期" prop="date"> <el-form-item label="旅行日期" prop="date">
<el-date-picker <el-date-picker
v-model="travelStore.currentTravelRecord.date" v-model="travelStore.currentTravelRecord.date"
type="date" placeholder="请选择日期" type="date" placeholder="请选择日期" :editable="false"
value-format="YYYY-MM-DD"/> value-format="YYYY-MM-DD"/>
</el-form-item> </el-form-item>