admin/zhgdyun
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

flx：优化

Browse Source
This commit is contained in:
Rain_ 2025-11-21 17:00:21 +08:00
parent 98f65f70d3
commit 29ba5d4efa
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/views/projectFront/carManage/vehicleReal.vue
View File

@ -101,7 +101,7 @@
width="300" width="300"
prop="uploadTime" prop="uploadTime"
align="center" align="center"
label="备案时间" label="上传时间"
></el-table-column> ></el-table-column>
<el-table-column label="操作" align="center"> <el-table-column label="操作" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
@ -195,7 +195,7 @@
<!-- <div slot="tip" class="el-upload__tip">只支持.jpg格式</div> --> <!-- <div slot="tip" class="el-upload__tip">只支持.jpg格式</div> -->
</el-upload> </el-upload>
</el-form-item> </el-form-item>
<el-form-item label="备案时间" prop="uploadTime"> <el-form-item label="上传时间" prop="uploadTime">
<el-date-picker <el-date-picker
value-format="yyyy-MM-dd hh:mm:ss" value-format="yyyy-MM-dd hh:mm:ss"
type="datetime" type="datetime"
@ -306,7 +306,7 @@ export default {
isExceed: [{ required: true, message: "请选择是否超出阈值", trigger: "change" }], isExceed: [{ required: true, message: "请选择是否超出阈值", trigger: "change" }],
currentSpeed: [{ required: true, message: "请输入时速", trigger: "blur" }], currentSpeed: [{ required: true, message: "请输入时速", trigger: "blur" }],
// fileList: [{ type: Array, required: true, message: "请上传抓拍图片", trigger: "change" }], // fileList: [{ type: Array, required: true, message: "请上传抓拍图片", trigger: "change" }],
uploadTime: [{ required: true, message: "请选择备案时间", trigger: "change" }], uploadTime: [{ required: true, message: "请选择上传时间", trigger: "change" }],
}, },
carWashDevList: [], carWashDevList: [],
carInfoList: [], carInfoList: [],

9
src/views/projectFront/laborManage/allAttendanceManageComponents/monthAttendanceReport.vue
View File

@ -268,14 +268,15 @@
> >
<el-form-item label="选择日期" prop="startDate"> <el-form-item label="选择日期" prop="startDate">
<el-date-picker <el-date-picker
value-format="yyyy-MM-dd"
v-model="exportSettingInfo.startDate" v-model="exportSettingInfo.startDate"
type="daterange" type="daterange"
value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
> :clearable="false"
</el-date-picker> :picker-options="handleTimeChange(queryParams.dayTime, 'day')"
></el-date-picker>
</el-form-item> </el-form-item>
<el-form-item label="导出维度" prop="groupByType"> <el-form-item label="导出维度" prop="groupByType">
<el-radio-group v-model="exportSettingInfo.groupByType"> <el-radio-group v-model="exportSettingInfo.groupByType">
@ -536,6 +537,7 @@ export default {
handleTimeChange(diffTime, type) { handleTimeChange(diffTime, type) {
return { return {
onPick: (pick) => { onPick: (pick) => {
console.log(888, pick);
this.pickDate = pick; this.pickDate = pick;
}, },
disabledDate: (time) => { disabledDate: (time) => {
@ -552,6 +554,7 @@ export default {
} }
// date1.diff(date2) > 0 // date1.diff(date2) > 0
if (type == "day") { if (type == "day") {
console.log(1111, minDate);
const thirtyDaysLater = dayjs(minDate).add(31, "day"); const thirtyDaysLater = dayjs(minDate).add(31, "day");
const thirtyDaysAgo = dayjs(minDate).subtract(31, "day"); const thirtyDaysAgo = dayjs(minDate).subtract(31, "day");
// 禁用超过 30 天前和 30 天后的日期 // 禁用超过 30 天前和 30 天后的日期