flx:优化
This commit is contained in:
parent
d3ea8037cb
commit
e1d70b11f2
@ -27,6 +27,7 @@
|
|||||||
<!-- || day.duration -->
|
<!-- || day.duration -->
|
||||||
{{ day.day }}
|
{{ day.day }}
|
||||||
</div>
|
</div>
|
||||||
|
<!-- v-if="day.isBeforeDay || day.isCurrentDay" -->
|
||||||
<div
|
<div
|
||||||
class="calendar-box1"
|
class="calendar-box1"
|
||||||
:class="day.duration ? 'bg-color88' : 'bg-colord0'"
|
:class="day.duration ? 'bg-color88' : 'bg-colord0'"
|
||||||
@ -46,7 +47,7 @@
|
|||||||
class="calendar-day_box2"
|
class="calendar-day_box2"
|
||||||
:class="{ 'box2-center': day.duration }"
|
:class="{ 'box2-center': day.duration }"
|
||||||
>
|
>
|
||||||
{{ day.duration }}h
|
{{ durationHour(day.duration) }}h
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -80,6 +81,12 @@ export default {
|
|||||||
return dayjs(dateTime).isBefore(dayjs());
|
return dayjs(dateTime).isBefore(dayjs());
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
durationHour() {
|
||||||
|
return (seconds) => {
|
||||||
|
if (!seconds) return 0;
|
||||||
|
return (seconds / 60 / 60).toFixed(2);
|
||||||
|
};
|
||||||
|
},
|
||||||
currentYear() {
|
currentYear() {
|
||||||
return dayjs(this.currentDate).year();
|
return dayjs(this.currentDate).year();
|
||||||
},
|
},
|
||||||
@ -104,6 +111,7 @@ export default {
|
|||||||
date: date.format("YYYY-MM-DD"),
|
date: date.format("YYYY-MM-DD"),
|
||||||
isOtherMonth: true,
|
isOtherMonth: true,
|
||||||
isCurrentDay: false,
|
isCurrentDay: false,
|
||||||
|
isBeforeDay: false,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -116,6 +124,7 @@ export default {
|
|||||||
date: date.format("YYYY-MM-DD"),
|
date: date.format("YYYY-MM-DD"),
|
||||||
isOtherMonth: false,
|
isOtherMonth: false,
|
||||||
isCurrentDay: date.isSame(dayjs(), "day"),
|
isCurrentDay: date.isSame(dayjs(), "day"),
|
||||||
|
isBeforeDay: date.isBefore(dayjs(), "day"),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -128,6 +137,7 @@ export default {
|
|||||||
date: date.format("YYYY-MM-DD"),
|
date: date.format("YYYY-MM-DD"),
|
||||||
isOtherMonth: true,
|
isOtherMonth: true,
|
||||||
isCurrentDay: false,
|
isCurrentDay: false,
|
||||||
|
isBeforeDay: false,
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
const resultList = [
|
const resultList = [
|
||||||
@ -228,7 +238,7 @@ export default {
|
|||||||
display: grid;
|
display: grid;
|
||||||
grid-template-columns: repeat(7, 1fr);
|
grid-template-columns: repeat(7, 1fr);
|
||||||
gap: 0px;
|
gap: 0px;
|
||||||
height: 700px;
|
height: 570px;
|
||||||
grid-auto-rows: auto;
|
grid-auto-rows: auto;
|
||||||
}
|
}
|
||||||
.calendar-day1:hover .calendar-day_box1 {
|
.calendar-day1:hover .calendar-day_box1 {
|
||||||
|
|||||||
@ -326,7 +326,7 @@
|
|||||||
</el-form-item>
|
</el-form-item>
|
||||||
<el-form-item label="工单号">
|
<el-form-item label="工单号">
|
||||||
<el-input
|
<el-input
|
||||||
v-model="pageInfo.id"
|
v-model="pageInfo.workTicketNumber"
|
||||||
placeholder="请输入"
|
placeholder="请输入"
|
||||||
></el-input>
|
></el-input>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
@ -398,7 +398,7 @@
|
|||||||
<template v-if="activeName == 'second'">
|
<template v-if="activeName == 'second'">
|
||||||
<div class="card-flex">
|
<div class="card-flex">
|
||||||
<div class="card-num webkit-clamp_1">
|
<div class="card-num webkit-clamp_1">
|
||||||
{{ item.fileName }}
|
{{ item.workTicketNumber }}
|
||||||
</div>
|
</div>
|
||||||
<div class="card-num">
|
<div class="card-num">
|
||||||
{{
|
{{
|
||||||
@ -614,7 +614,7 @@ export default {
|
|||||||
pageNo: 1, //页数
|
pageNo: 1, //页数
|
||||||
pageSize: 12, //条数
|
pageSize: 12, //条数
|
||||||
total: 0, //总条数
|
total: 0, //总条数
|
||||||
id: "",
|
workTicketNumber: "",
|
||||||
startTime: [],
|
startTime: [],
|
||||||
},
|
},
|
||||||
defaultProps: {
|
defaultProps: {
|
||||||
@ -1034,7 +1034,7 @@ export default {
|
|||||||
this.getRiskListDetailPage();
|
this.getRiskListDetailPage();
|
||||||
},
|
},
|
||||||
onRefresh() {
|
onRefresh() {
|
||||||
this.pageInfo.id = "";
|
this.pageInfo.workTicketNumber = "";
|
||||||
this.pageInfo.startTime = [];
|
this.pageInfo.startTime = [];
|
||||||
this.onQuery();
|
this.onQuery();
|
||||||
},
|
},
|
||||||
@ -1059,7 +1059,7 @@ export default {
|
|||||||
pageSize: this.pageInfo.pageSize,
|
pageSize: this.pageInfo.pageSize,
|
||||||
projectSn: this.$store.state.projectSn,
|
projectSn: this.$store.state.projectSn,
|
||||||
itemId: this.riskListDetailInfo.id,
|
itemId: this.riskListDetailInfo.id,
|
||||||
id: this.pageInfo.id,
|
workTicketNumber: this.pageInfo.workTicketNumber,
|
||||||
fileType:
|
fileType:
|
||||||
this.activeName == "second"
|
this.activeName == "second"
|
||||||
? 3
|
? 3
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -274,6 +274,8 @@
|
|||||||
range-separator="至"
|
range-separator="至"
|
||||||
start-placeholder="开始日期"
|
start-placeholder="开始日期"
|
||||||
end-placeholder="结束日期"
|
end-placeholder="结束日期"
|
||||||
|
:clearable="false"
|
||||||
|
:picker-options="handleTimeChange(queryParams.dayTime, 'day')"
|
||||||
>
|
>
|
||||||
</el-date-picker>
|
</el-date-picker>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user