From e1d70b11f245b6dfbedb57b72767a4c96abe8e0e Mon Sep 17 00:00:00 2001
From: Rain_ <904416525@qq.com>
Date: Fri, 21 Nov 2025 18:12:19 +0800
Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/calendarView.vue               |   14 +-
 .../bodyWornCamera/equipmentMonitor.vue       |   10 +-
 .../projectFront/carManage/vehicleReal.vue    | 1073 +++++++++--------
 .../monthAttendanceReport.vue                 |    2 +
 4 files changed, 600 insertions(+), 499 deletions(-)

diff --git a/src/views/projectFront/bodyWornCamera/components/calendarView.vue b/src/views/projectFront/bodyWornCamera/components/calendarView.vue
index 2cb9e684..43050a93 100644
--- a/src/views/projectFront/bodyWornCamera/components/calendarView.vue
+++ b/src/views/projectFront/bodyWornCamera/components/calendarView.vue
@@ -27,6 +27,7 @@
                         <!-- || day.duration -->
                         {{ day.day }}
                     </div>
+                    <!-- v-if="day.isBeforeDay || day.isCurrentDay" -->
                     <div
                         class="calendar-box1"
                         :class="day.duration ? 'bg-color88' : 'bg-colord0'"
@@ -46,7 +47,7 @@
                     class="calendar-day_box2"
                     :class="{ 'box2-center': day.duration }"
                 >
-                    {{ day.duration }}h
+                    {{ durationHour(day.duration) }}h
                 </div>
             </div>
         </div>
@@ -80,6 +81,12 @@ export default {
                 return dayjs(dateTime).isBefore(dayjs());
             };
         },
+        durationHour() {
+            return (seconds) => {
+                if (!seconds) return 0;
+                return (seconds / 60 / 60).toFixed(2);
+            };
+        },
         currentYear() {
             return dayjs(this.currentDate).year();
         },
@@ -104,6 +111,7 @@ export default {
                     date: date.format("YYYY-MM-DD"),
                     isOtherMonth: true,
                     isCurrentDay: false,
+                    isBeforeDay: false,
                 });
             }
 
@@ -116,6 +124,7 @@ export default {
                     date: date.format("YYYY-MM-DD"),
                     isOtherMonth: false,
                     isCurrentDay: date.isSame(dayjs(), "day"),
+                    isBeforeDay: date.isBefore(dayjs(), "day"),
                 });
             }
 
@@ -128,6 +137,7 @@ export default {
                     date: date.format("YYYY-MM-DD"),
                     isOtherMonth: true,
                     isCurrentDay: false,
+                    isBeforeDay: false,
                 });
             }
             const resultList = [
@@ -228,7 +238,7 @@ export default {
     display: grid;
     grid-template-columns: repeat(7, 1fr);
     gap: 0px;
-    height: 700px;
+    height: 570px;
     grid-auto-rows: auto;
 }
 .calendar-day1:hover .calendar-day_box1 {
diff --git a/src/views/projectFront/bodyWornCamera/equipmentMonitor.vue b/src/views/projectFront/bodyWornCamera/equipmentMonitor.vue
index 360770f4..2dba5de3 100644
--- a/src/views/projectFront/bodyWornCamera/equipmentMonitor.vue
+++ b/src/views/projectFront/bodyWornCamera/equipmentMonitor.vue
@@ -326,7 +326,7 @@
                     </el-form-item>
                     <el-form-item label="工单号">
                         <el-input
-                            v-model="pageInfo.id"
+                            v-model="pageInfo.workTicketNumber"
                             placeholder="请输入"
                         ></el-input>
                     </el-form-item>
@@ -398,7 +398,7 @@
                         <template v-if="activeName == 'second'">
                             <div class="card-flex">
                                 <div class="card-num webkit-clamp_1">
-                                    {{ item.fileName }}
+                                    {{ item.workTicketNumber }}
                                 </div>
                                 <div class="card-num">
                                     {{
@@ -614,7 +614,7 @@ export default {
                 pageNo: 1, //页数
                 pageSize: 12, //条数
                 total: 0, //总条数
-                id: "",
+                workTicketNumber: "",
                 startTime: [],
             },
             defaultProps: {
@@ -1034,7 +1034,7 @@ export default {
             this.getRiskListDetailPage();
         },
         onRefresh() {
-            this.pageInfo.id = "";
+            this.pageInfo.workTicketNumber = "";
             this.pageInfo.startTime = [];
             this.onQuery();
         },
@@ -1059,7 +1059,7 @@ export default {
                     pageSize: this.pageInfo.pageSize,
                     projectSn: this.$store.state.projectSn,
                     itemId: this.riskListDetailInfo.id,
-                    id: this.pageInfo.id,
+                    workTicketNumber: this.pageInfo.workTicketNumber,
                     fileType:
                         this.activeName == "second"
                             ? 3
diff --git a/src/views/projectFront/carManage/vehicleReal.vue b/src/views/projectFront/carManage/vehicleReal.vue
index 10a20c88..8bd10673 100644
--- a/src/views/projectFront/carManage/vehicleReal.vue
+++ b/src/views/projectFront/carManage/vehicleReal.vue
@@ -1,531 +1,620 @@
 <template>
-  <div class="fullHeight">
-    <div class="searchBox whiteBlock">
-      <el-form
-        :inline="true"
-        :model="pageInfo"
-        class="demo-form-inline"
-        ref="queryForm"
-        label-width="70px"
-        size="small"
-      >
-        <el-form-item label="车牌号码">
-          <el-input
-            v-model="pageInfo.carNumber"
-            placeholder="请输入"
-            @keyup.enter.native="getList"
-          ></el-input>
-        </el-form-item>
-
-        <el-form-item label="设备名称">
-          <el-input
-            v-model="pageInfo.deviceName"
-            placeholder="请输入"
-            @keyup.enter.native="getList"
-          ></el-input>
-        </el-form-item>
-
-        <el-form-item label="上传时间">
-          <el-date-picker
-            v-model="updateDate"
-            type="datetimerange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            format="yyyy-MM-dd HH:mm:ss"
-          ></el-date-picker>
-        </el-form-item>
-
-        <el-form-item>
-          <el-button type="primary" size="medium" plain @click="getList">搜索</el-button>
-          <el-button type="warning" size="medium" plain @click="resetQuery"
-            >刷新</el-button
-          >
-          <el-button
-            v-permission="{
-              key: 'add',
-              menuPath: '/project/carManage/vehicleReal',
-            }"
-            size="medium"
-            @click="carAdd(1)"
-            type="primary"
-            >新增</el-button
-          >
-        </el-form-item>
-      </el-form>
-    </div>
-
-    <div class="table_wrap whiteBlock">
-      <el-table class="tables" :data="List" height="520px">
-        <el-table-column
-          prop="deviceName"
-          align="center"
-          label="抓拍设备"
-        ></el-table-column>
-        <el-table-column prop="carNumber" align="center" label="车牌号"></el-table-column>
-
-        <el-table-column prop="isExceed" align="center" label="是否超出阈值">
-          <template slot-scope="scope">
-            {{ scope.row.isExceed == 1 ? "是" : "否" }}
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          width="200"
-          prop="currentSpeed"
-          align="center"
-          label="时速(km/h)"
-        ></el-table-column>
-
-        <el-table-column
-          width="300"
-          prop="exceedingThreshold"
-          align="center"
-          label="超出阈值"
-        ></el-table-column>
-        <el-table-column width="300" prop="snapshotImage" align="center" label="抓拍照片">
-          <template slot-scope="scope">
-            <el-image
-              style="width: 50px; height: 50px"
-              :src="$store.state.FILEURL + scope.row.snapshotImage"
-              :preview-src-list="[$store.state.FILEURL + scope.row.snapshotImage]"
+    <div class="fullHeight">
+        <div class="searchBox whiteBlock">
+            <el-form
+                :inline="true"
+                :model="pageInfo"
+                class="demo-form-inline"
+                ref="queryForm"
+                label-width="70px"
+                size="small"
             >
-              <div slot="error" class="image-slot">
-                <i class="el-icon-picture-outline"></i>
-              </div>
-            </el-image>
-          </template>
-        </el-table-column>
-        <el-table-column
-          width="300"
-          prop="uploadTime"
-          align="center"
-          label="备案时间"
-        ></el-table-column>
-        <el-table-column label="操作" align="center">
-          <template slot-scope="scope">
-            <div class="">
-              <el-button
-                
-                style="border: 0 !important; margin-left: 10px"
-                type="text"
-                icon="el-icon-edit"
-                @click="carAdd(2, scope.row)"
-                >编辑</el-button
-              >
-              <el-button
-                
-                style="border: 0 !important; color: #f56c6c; margin-left: 10px"
-                type="text"
-                icon="el-icon-delete"
-                @click="deletePressureTest(scope.row)"
-                >删除</el-button
-              >
+                <el-form-item label="车牌号码">
+                    <el-input
+                        v-model="pageInfo.carNumber"
+                        placeholder="请输入"
+                        @keyup.enter.native="getList"
+                    ></el-input>
+                </el-form-item>
+
+                <el-form-item label="设备名称">
+                    <el-input
+                        v-model="pageInfo.deviceName"
+                        placeholder="请输入"
+                        @keyup.enter.native="getList"
+                    ></el-input>
+                </el-form-item>
+
+                <el-form-item label="上传时间">
+                    <el-date-picker
+                        v-model="updateDate"
+                        type="datetimerange"
+                        range-separator="至"
+                        start-placeholder="开始日期"
+                        end-placeholder="结束日期"
+                        value-format="yyyy-MM-dd HH:mm:ss"
+                        format="yyyy-MM-dd HH:mm:ss"
+                    ></el-date-picker>
+                </el-form-item>
+
+                <el-form-item>
+                    <el-button
+                        type="primary"
+                        size="medium"
+                        plain
+                        @click="getList"
+                        >搜索</el-button
+                    >
+                    <el-button
+                        type="warning"
+                        size="medium"
+                        plain
+                        @click="resetQuery"
+                        >刷新</el-button
+                    >
+                    <el-button
+                        v-permission="{
+                            key: 'add',
+                            menuPath: '/project/carManage/vehicleReal',
+                        }"
+                        size="medium"
+                        @click="carAdd(1)"
+                        type="primary"
+                        >新增</el-button
+                    >
+                </el-form-item>
+            </el-form>
+        </div>
+
+        <div class="table_wrap whiteBlock">
+            <el-table class="tables" :data="List" height="520px">
+                <el-table-column
+                    prop="deviceName"
+                    align="center"
+                    label="抓拍设备"
+                ></el-table-column>
+                <el-table-column
+                    prop="carNumber"
+                    align="center"
+                    label="车牌号"
+                ></el-table-column>
+
+                <el-table-column
+                    prop="isExceed"
+                    align="center"
+                    label="是否超出阈值"
+                >
+                    <template slot-scope="scope">
+                        {{ scope.row.isExceed == 1 ? "是" : "否" }}
+                    </template>
+                </el-table-column>
+
+                <el-table-column
+                    width="200"
+                    prop="currentSpeed"
+                    align="center"
+                    label="时速(km/h)"
+                ></el-table-column>
+
+                <el-table-column
+                    width="300"
+                    prop="exceedingThreshold"
+                    align="center"
+                    label="超出阈值"
+                ></el-table-column>
+                <el-table-column
+                    width="300"
+                    prop="snapshotImage"
+                    align="center"
+                    label="抓拍照片"
+                >
+                    <template slot-scope="scope">
+                        <el-image
+                            style="width: 50px; height: 50px"
+                            :src="
+                                $store.state.FILEURL + scope.row.snapshotImage
+                            "
+                            :preview-src-list="[
+                                $store.state.FILEURL + scope.row.snapshotImage,
+                            ]"
+                        >
+                            <div slot="error" class="image-slot">
+                                <i class="el-icon-picture-outline"></i>
+                            </div>
+                        </el-image>
+                    </template>
+                </el-table-column>
+                <el-table-column
+                    width="300"
+                    prop="uploadTime"
+                    align="center"
+                    label="上传时间"
+                ></el-table-column>
+                <el-table-column label="操作" align="center">
+                    <template slot-scope="scope">
+                        <div class="">
+                            <el-button
+                                style="border: 0 !important; margin-left: 10px"
+                                type="text"
+                                icon="el-icon-edit"
+                                @click="carAdd(2, scope.row)"
+                                >编辑</el-button
+                            >
+                            <el-button
+                                style="
+                                    border: 0 !important;
+                                    color: #f56c6c;
+                                    margin-left: 10px;
+                                "
+                                type="text"
+                                icon="el-icon-delete"
+                                @click="deletePressureTest(scope.row)"
+                                >删除</el-button
+                            >
+                        </div>
+                    </template>
+                </el-table-column>
+            </el-table>
+        </div>
+
+        <div class="Pagination-but">
+            <el-pagination
+                class="pagerBox"
+                @size-change="handleSizeChange"
+                @current-change="handleCurrentChange"
+                :current-page="pageInfo.pageNo"
+                :page-sizes="[10, 50, 100]"
+                :page-size="pageInfo.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="pageInfo.total"
+                background
+            ></el-pagination>
+        </div>
+        <!-- 新增 -->
+        <el-dialog
+            :visible.sync="dealShow"
+            width="600px"
+            append-to-body
+            :title="dealTitle"
+        >
+            <el-form
+                ref="dealForm"
+                :model="dealForm"
+                :rules="dealFormRules"
+                size="medium"
+                label-width="210px"
+                class="dealForm"
+            >
+                <template v-if="dealType == 1 || dealType == 2">
+                    <el-form-item label="抓拍设备" prop="devSn">
+                        <el-select
+                            v-model="dealForm.devSn"
+                            placeholder="请选择"
+                            clearable
+                            filterable
+                        >
+                            <el-option
+                                v-for="(item, index) in carWashDevList"
+                                :key="item.devSn"
+                                :label="item.deviceName"
+                                :value="item.devSn"
+                            ></el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="车牌号" prop="carNumber">
+                        <el-input
+                            v-model="dealForm.carNumber"
+                            placeholder="请输入"
+                        ></el-input>
+                    </el-form-item>
+                    <el-form-item label="是否超出阈值" prop="isExceed">
+                        <el-radio-group v-model="dealForm.isExceed">
+                            <el-radio :label="1">是</el-radio>
+                            <el-radio :label="0">否</el-radio>
+                        </el-radio-group>
+                    </el-form-item>
+                    <el-form-item label="时速(km/h)" prop="currentSpeed">
+                        <el-input-number
+                            :controls="false"
+                            v-model="dealForm.currentSpeed"
+                            controls-position="right"
+                            placeholder="请输入"
+                        ></el-input-number>
+                    </el-form-item>
+                    <el-form-item label="抓拍图片" prop="fileList">
+                        <el-upload
+                            :action="$store.state.UPLOADURL"
+                            name="files"
+                            list-type="picture-card"
+                            :limit="1"
+                            :on-success="handleAvatarSuccess"
+                            :file-list="dealForm.fileList"
+                            :on-remove="handleDelete"
+                            :on-exceed="handleExceed"
+                            accept=".jpg,.jpeg,.png"
+                        >
+                            <i class="el-icon-plus"></i>
+                            <!-- <div slot="tip" class="el-upload__tip">只支持.jpg格式</div> -->
+                        </el-upload>
+                    </el-form-item>
+                    <el-form-item label="上传时间" prop="uploadTime">
+                        <el-date-picker
+                            value-format="yyyy-MM-dd hh:mm:ss"
+                            type="datetime"
+                            placeholder="开始时间"
+                            v-model="dealForm.uploadTime"
+                        ></el-date-picker>
+                    </el-form-item>
+                </template>
+            </el-form>
+            <div slot="footer" style="text-align: center">
+                <el-button size="medium" @click="dealFormCancel"
+                    >取消</el-button
+                >
+                <el-button size="medium" type="primary" @click="submitDealForm"
+                    >保存</el-button
+                >
             </div>
-          </template>
-        </el-table-column>
-      </el-table>
+        </el-dialog>
     </div>
-
-    <div class="Pagination-but">
-      <el-pagination
-        class="pagerBox"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"
-        :current-page="pageInfo.pageNo"
-        :page-sizes="[10, 50, 100]"
-        :page-size="pageInfo.pageSize"
-        layout="total, sizes, prev, pager, next, jumper"
-        :total="pageInfo.total"
-        background
-      ></el-pagination>
-    </div>
-    <!-- 新增 -->
-    <el-dialog :visible.sync="dealShow" width="600px" append-to-body :title="dealTitle">
-      <el-form
-        ref="dealForm"
-        :model="dealForm"
-        :rules="dealFormRules"
-        size="medium"
-        label-width="210px"
-        class="dealForm"
-      >
-        <template v-if="dealType == 1 || dealType == 2">
-          <el-form-item label="抓拍设备" prop="devSn">
-            <el-select v-model="dealForm.devSn" placeholder="请选择" clearable filterable>
-              <el-option
-                v-for="(item, index) in carWashDevList"
-                :key="item.devSn"
-                :label="item.deviceName"
-                :value="item.devSn"
-              ></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="车牌号" prop="carNumber">
-            <el-input v-model="dealForm.carNumber" placeholder="请输入"></el-input>
-          </el-form-item>
-          <el-form-item label="是否超出阈值" prop="isExceed">
-            <el-radio-group v-model="dealForm.isExceed">
-              <el-radio :label="1">是</el-radio>
-              <el-radio :label="0">否</el-radio>
-            </el-radio-group>
-          </el-form-item>
-          <el-form-item label="时速(km/h)" prop="currentSpeed">
-            <el-input-number
-              :controls="false"
-              v-model="dealForm.currentSpeed"
-              controls-position="right"
-              placeholder="请输入"
-            ></el-input-number>
-          </el-form-item>
-          <el-form-item label="抓拍图片" prop="fileList">
-            <el-upload
-              :action="$store.state.UPLOADURL"
-              name="files"
-              list-type="picture-card"
-              :limit="1"
-              :on-success="handleAvatarSuccess"
-              :file-list="dealForm.fileList"
-              :on-remove="handleDelete"
-              :on-exceed="handleExceed"
-              accept=".jpg,.jpeg,.png"
-            >
-              <i class="el-icon-plus"></i>
-              <!-- <div slot="tip" class="el-upload__tip">只支持.jpg格式</div> -->
-            </el-upload>
-          </el-form-item>
-          <el-form-item label="备案时间" prop="uploadTime">
-            <el-date-picker
-              value-format="yyyy-MM-dd hh:mm:ss"
-              type="datetime"
-              placeholder="开始时间"
-              v-model="dealForm.uploadTime"
-            ></el-date-picker>
-          </el-form-item>
-        </template>
-      </el-form>
-      <div slot="footer" style="text-align: center">
-        <el-button size="medium" @click="dealFormCancel">取消</el-button>
-        <el-button size="medium" type="primary" @click="submitDealForm">保存</el-button>
-      </div>
-    </el-dialog>
-  </div>
 </template>
 <script>
 import {
-  carMeasureSpeedData,
-  carMeasureSpeedDevListApi,
-  carMeasureSpeedDataAdd,
-  carMeasureSpeedDataEdit,
-  carMeasureSpeedDatadeleteApi,
+    carMeasureSpeedData,
+    carMeasureSpeedDevListApi,
+    carMeasureSpeedDataAdd,
+    carMeasureSpeedDataEdit,
+    carMeasureSpeedDatadeleteApi,
 } from "../../../assets/js/api/carManage";
 import dayjs from "dayjs";
 export default {
-  mounted() {
-    this.getList();
-    this.carMeasureSpeedDevList();
-  },
-  data() {
-    return {
-      addEditForm: {
-        gateName: "",
-        gateNumber: "",
-        type: 1,
-      },
-      formRules: {
-        gateName: [
-          {
-            required: true,
-            message: this.$t("message.personnelPosition.required"),
-            trigger: "blur",
-          },
-        ],
-        gateNumber: [
-          {
-            required: true,
-            message: this.$t("message.personnelPosition.required"),
-            trigger: "blur",
-          },
-        ],
-      },
-      List: [],
-      Popup: {
-        type: "add",
-        show: false,
-      },
-      // 分页查询
-      pageInfo: {
-        // 总条数
-        total: 0,
-        // 当前页
-        pageNo: 1,
-        // 每页条数
-        pageSize: 15,
-        // 车牌
-        carNumber: null,
-        // 设备
-        deviceName: null,
-        // uploadTime_begin: "2024-09-02 00:00:00",
-        // uploadTime_end: "2024-09-03 00:00:00",
-        uploadTime_begin: "",
-        uploadTime_end: "",
-      },
-      // 上传时间
-      updateDate: [
-        new Date(new Date().setHours(8, 0, 0, 0))
-          .toISOString()
-          .slice(0, 19)
-          .replace("T", " "),
-        new Date(new Date().setHours(32, 0, 0, 0))
-          .toISOString()
-          .slice(0, 19)
-          .replace("T", " "),
-      ],
+    mounted() {
+        this.getList();
+        this.carMeasureSpeedDevList();
+    },
+    data() {
+        return {
+            addEditForm: {
+                gateName: "",
+                gateNumber: "",
+                type: 1,
+            },
+            formRules: {
+                gateName: [
+                    {
+                        required: true,
+                        message: this.$t("message.personnelPosition.required"),
+                        trigger: "blur",
+                    },
+                ],
+                gateNumber: [
+                    {
+                        required: true,
+                        message: this.$t("message.personnelPosition.required"),
+                        trigger: "blur",
+                    },
+                ],
+            },
+            List: [],
+            Popup: {
+                type: "add",
+                show: false,
+            },
+            // 分页查询
+            pageInfo: {
+                // 总条数
+                total: 0,
+                // 当前页
+                pageNo: 1,
+                // 每页条数
+                pageSize: 15,
+                // 车牌
+                carNumber: null,
+                // 设备
+                deviceName: null,
+                // uploadTime_begin: "2024-09-02 00:00:00",
+                // uploadTime_end: "2024-09-03 00:00:00",
+                uploadTime_begin: "",
+                uploadTime_end: "",
+            },
+            // 上传时间
+            updateDate: [
+                new Date(new Date().setHours(8, 0, 0, 0))
+                    .toISOString()
+                    .slice(0, 19)
+                    .replace("T", " "),
+                new Date(new Date().setHours(32, 0, 0, 0))
+                    .toISOString()
+                    .slice(0, 19)
+                    .replace("T", " "),
+            ],
 
-      materialDetailInfo: {},
-      dealShow: false,
-      dealForm: {
-        devSn: "",
-        projectName: "",
-        constructionSite: "",
-        taskNumber: "",
-        operator: "",
-        dischargeTime: "",
-        useLayer: "",
-        proportionName: "",
-        plateWeight: "",
-        whetstoneRatio: "",
-        useStatus: "",
-      },
-      dealType: 1,
-      dealTitle: "",
-      dealFormRules: {
-        devSn: [{ required: true, message: "请选择抓拍设备", trigger: "change" }],
-        carNumber: [{ required: true, message: "请输入车牌号", trigger: "blur" }],
-        isExceed: [{ required: true, message: "请选择是否超出阈值", trigger: "change" }],
-        currentSpeed: [{ required: true, message: "请输入时速", trigger: "blur" }],
-        // fileList: [{ type: Array, required: true, message: "请上传抓拍图片", trigger: "change" }],
-        uploadTime: [{ required: true, message: "请选择备案时间", trigger: "change" }],
-      },
-      carWashDevList: [],
-      carInfoList: [],
-    };
-  },
-  methods: {
-    handleAvatarSuccess(res, file) {
-      if (res.status == "SUCCESS") {
-        this.dealForm.fileList.push({
-          name: file.response.data[0].imageUrl,
-          url: this.$store.state.FILEURL + file.response.data[0].imageUrl,
-        });
-      }
-    },
-    handleExceed(files, fileList) {
-      this.$message.warning(
-        this.$t("message.docManage.dialog_upload_files.limitingChoice")
-      );
-    },
-    handleDelete(file, fileList) {
-      this.dealForm.fileList = fileList;
-    },
-    initDealForm() {
-      if (this.dealType == 1) {
-        this.dealForm = {
-          devSn: "",
-          carNumber: "",
-          isExceed: "",
-          currentSpeed: "",
-          snapshotImage: "",
-          uploadTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
-          fileList: [],
+            materialDetailInfo: {},
+            dealShow: false,
+            dealForm: {
+                devSn: "",
+                projectName: "",
+                constructionSite: "",
+                taskNumber: "",
+                operator: "",
+                dischargeTime: "",
+                useLayer: "",
+                proportionName: "",
+                plateWeight: "",
+                whetstoneRatio: "",
+                useStatus: "",
+            },
+            dealType: 1,
+            dealTitle: "",
+            dealFormRules: {
+                devSn: [
+                    {
+                        required: true,
+                        message: "请选择抓拍设备",
+                        trigger: "change",
+                    },
+                ],
+                carNumber: [
+                    {
+                        required: true,
+                        message: "请输入车牌号",
+                        trigger: "blur",
+                    },
+                ],
+                isExceed: [
+                    {
+                        required: true,
+                        message: "请选择是否超出阈值",
+                        trigger: "change",
+                    },
+                ],
+                currentSpeed: [
+                    { required: true, message: "请输入时速", trigger: "blur" },
+                ],
+                // fileList: [{ type: Array, required: true, message: "请上传抓拍图片", trigger: "change" }],
+                uploadTime: [
+                    {
+                        required: true,
+                        message: "请选择上传时间",
+                        trigger: "change",
+                    },
+                ],
+            },
+            carWashDevList: [],
+            carInfoList: [],
         };
-      }
     },
-    // 新增
-    carAdd(type, row) {
-      this.dealType = type;
-      if (type == 1) {
-        this.initDealForm();
-        this.dealTitle = "新增";
-      } else if (type == 2) {
-        this.dealForm = {
-          ...row,
-          fileList: row.snapshotImage ? [{ name: row.snapshotImage, url: this.$store.state.FILEURL + row.snapshotImage }] : []
-        };
-        this.dealTitle = "编辑";
-      }
-      this.$nextTick(() => {
-        this.$refs["dealForm"] && this.$refs["dealForm"].clearValidate();
-      });
-      this.dealShow = true;
-    },
-    submitDealForm() {
-      this.$refs["dealForm"].validate((valid) => {
-        if (valid) {
-          let params = Object.assign({}, this.dealForm);
-          if (this.dealTitle == "新增" && this.dealType == 1) {
-            if (this.dealForm.fileList.length > 0) {
-              params.snapshotImage = this.dealForm.fileList[0].name;
+    methods: {
+        handleAvatarSuccess(res, file) {
+            if (res.status == "SUCCESS") {
+                this.dealForm.fileList.push({
+                    name: file.response.data[0].imageUrl,
+                    url:
+                        this.$store.state.FILEURL +
+                        file.response.data[0].imageUrl,
+                });
             }
-            carMeasureSpeedDataAdd({
-              ...params,
-              projectSn: this.projectSn,
-            }).then((result) => {
-              if (result.success) {
-                this.$message.success(result.message);
-                this.getList();
-                this.dealShow = false;
-              }
-            });
-          } else if (this.dealTitle == "编辑" && this.dealType == 2) {
-            if (this.dealForm.fileList.length > 0) {
-              params.snapshotImage = this.dealForm.fileList[0].name;
+        },
+        handleExceed(files, fileList) {
+            this.$message.warning(
+                this.$t("message.docManage.dialog_upload_files.limitingChoice")
+            );
+        },
+        handleDelete(file, fileList) {
+            this.dealForm.fileList = fileList;
+        },
+        initDealForm() {
+            if (this.dealType == 1) {
+                this.dealForm = {
+                    devSn: "",
+                    carNumber: "",
+                    isExceed: "",
+                    currentSpeed: "",
+                    snapshotImage: "",
+                    uploadTime: dayjs().format("YYYY-MM-DD HH:mm:ss"),
+                    fileList: [],
+                };
             }
-            carMeasureSpeedDataEdit({
-              ...params,
-              projectSn: this.projectSn,
-            }).then((result) => {
-              if (result.success) {
-                this.$message.success(result.message);
-                this.getList();
-                this.dealShow = false;
-              }
+        },
+        // 新增
+        carAdd(type, row) {
+            this.dealType = type;
+            if (type == 1) {
+                this.initDealForm();
+                this.dealTitle = "新增";
+            } else if (type == 2) {
+                this.dealForm = {
+                    ...row,
+                    fileList: row.snapshotImage
+                        ? [
+                              {
+                                  name: row.snapshotImage,
+                                  url:
+                                      this.$store.state.FILEURL +
+                                      row.snapshotImage,
+                              },
+                          ]
+                        : [],
+                };
+                this.dealTitle = "编辑";
+            }
+            this.$nextTick(() => {
+                this.$refs["dealForm"] &&
+                    this.$refs["dealForm"].clearValidate();
             });
-          }
-        }
-      });
-    },
-    dealFormCancel() {
-      this.initDealForm();
-      this.$refs["dealForm"].resetFields();
-      this.dealShow = false;
-    },
-    deletePressureTest(row) {
-      this.$confirm("删除后操作不可恢复，请谨慎操作！", "警告", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        type: "warning",
-      })
-        .then(() => {
-          carMeasureSpeedDatadeleteApi({ id: row.id }).then((res) => {
+            this.dealShow = true;
+        },
+        submitDealForm() {
+            this.$refs["dealForm"].validate((valid) => {
+                if (valid) {
+                    let params = Object.assign({}, this.dealForm);
+                    if (this.dealTitle == "新增" && this.dealType == 1) {
+                        if (this.dealForm.fileList.length > 0) {
+                            params.snapshotImage =
+                                this.dealForm.fileList[0].name;
+                        }
+                        carMeasureSpeedDataAdd({
+                            ...params,
+                            projectSn: this.projectSn,
+                        }).then((result) => {
+                            if (result.success) {
+                                this.$message.success(result.message);
+                                this.getList();
+                                this.dealShow = false;
+                            }
+                        });
+                    } else if (this.dealTitle == "编辑" && this.dealType == 2) {
+                        if (this.dealForm.fileList.length > 0) {
+                            params.snapshotImage =
+                                this.dealForm.fileList[0].name;
+                        }
+                        carMeasureSpeedDataEdit({
+                            ...params,
+                            projectSn: this.projectSn,
+                        }).then((result) => {
+                            if (result.success) {
+                                this.$message.success(result.message);
+                                this.getList();
+                                this.dealShow = false;
+                            }
+                        });
+                    }
+                }
+            });
+        },
+        dealFormCancel() {
+            this.initDealForm();
+            this.$refs["dealForm"].resetFields();
+            this.dealShow = false;
+        },
+        deletePressureTest(row) {
+            this.$confirm("删除后操作不可恢复，请谨慎操作！", "警告", {
+                confirmButtonText: "确定",
+                cancelButtonText: "取消",
+                type: "warning",
+            })
+                .then(() => {
+                    carMeasureSpeedDatadeleteApi({ id: row.id }).then((res) => {
+                        this.getList();
+                    });
+                })
+                .catch(() => {});
+        },
+        carMeasureSpeedDevList() {
+            carMeasureSpeedDevListApi({
+                projectSn: this.$store.state.projectSn,
+            }).then((result) => {
+                if (result.success) {
+                    this.carWashDevList = result.result;
+                }
+            });
+        },
+        // 搜索
+        resetQuery() {
+            // console.log("pageinfo", this.pageInfo);
+            this.pageInfo.pageNo = 1;
+            this.pageInfo.pageSize = 10;
+            this.pageInfo.carNumber = null;
+            this.pageInfo.deviceName = null;
+            // this.pageInfo.uploadTime_begin = null;
+            // this.pageInfo.uploadTime_end = null;
+            // this.updateDate = [];
             this.getList();
-          });
-        })
-        .catch(() => {});
-    },
-    carMeasureSpeedDevList() {
-      carMeasureSpeedDevListApi({ projectSn: this.$store.state.projectSn }).then(
-        (result) => {
-          if (result.success) {
-            this.carWashDevList = result.result;
-          }
-        }
-      );
-    },
-    // 搜索
-    resetQuery() {
-      // console.log("pageinfo", this.pageInfo);
-      this.pageInfo.pageNo = 1;
-      this.pageInfo.pageSize = 10;
-      this.pageInfo.carNumber = null;
-      this.pageInfo.deviceName = null;
-      // this.pageInfo.uploadTime_begin = null;
-      // this.pageInfo.uploadTime_end = null;
-      // this.updateDate = [];
-      this.getList();
-    },
-    handle(type, show) {
-      //打开弹窗前的统一处理
-      this.Popup = {
-        type: type,
-        show: show,
-      };
-    },
-    Change() {},
+        },
+        handle(type, show) {
+            //打开弹窗前的统一处理
+            this.Popup = {
+                type: type,
+                show: show,
+            };
+        },
+        Change() {},
 
-    getList() {
-      // 处理时间
-      console.log("this.updateDate.length", this.updateDate);
-      // console.log("this.updateDate.length", this.updateDate[0]);
-      // console.log("this.updateDate.length", this.updateDate[1]);
+        getList() {
+            // 处理时间
+            console.log("this.updateDate.length", this.updateDate);
+            // console.log("this.updateDate.length", this.updateDate[0]);
+            // console.log("this.updateDate.length", this.updateDate[1]);
 
-      if (this.updateDate instanceof Array && this.updateDate.length > 1) {
-        this.pageInfo.uploadTime_begin = this.updateDate[0];
-        this.pageInfo.uploadTime_end = this.updateDate[1];
-        // this.pageInfo.updateDate = []
-      }
+            if (
+                this.updateDate instanceof Array &&
+                this.updateDate.length > 1
+            ) {
+                this.pageInfo.uploadTime_begin = this.updateDate[0];
+                this.pageInfo.uploadTime_end = this.updateDate[1];
+                // this.pageInfo.updateDate = []
+            }
 
-      console.log("pageinfo", this.pageInfo);
+            console.log("pageinfo", this.pageInfo);
 
-      carMeasureSpeedData({
-        ...this.pageInfo,
-        projectSn: this.$store.state.projectSn,
-      }).then((result) => {
-        if (result.success) {
-          this.List = result.result.records;
-          this.pageInfo.total = Number(result.result.total);
-          // console.log("列表", result.result.records);
-        }
-      });
+            carMeasureSpeedData({
+                ...this.pageInfo,
+                projectSn: this.$store.state.projectSn,
+            }).then((result) => {
+                if (result.success) {
+                    this.List = result.result.records;
+                    this.pageInfo.total = Number(result.result.total);
+                    // console.log("列表", result.result.records);
+                }
+            });
+        },
+
+        close() {
+            this.addEditForm = {
+                isEnable: 0,
+            };
+        },
+
+        // 分页 左右 点击 输入
+        handleSizeChange(val) {
+            // console.log(`每页 ${val} 条`);
+            this.pageInfo.pageSize = val;
+            this.getList();
+        },
+
+        // 分页多少条点击事件
+        handleCurrentChange(val) {
+            // console.log(`当前页: ${val}`);
+            this.pageInfo.pageNo = val;
+            this.getList();
+        },
     },
-
-    close() {
-      this.addEditForm = {
-        isEnable: 0,
-      };
-    },
-
-    // 分页 左右 点击 输入
-    handleSizeChange(val) {
-      // console.log(`每页 ${val} 条`);
-      this.pageInfo.pageSize = val;
-      this.getList();
-    },
-
-    // 分页多少条点击事件
-    handleCurrentChange(val) {
-      // console.log(`当前页: ${val}`);
-      this.pageInfo.pageNo = val;
-      this.getList();
-    },
-  },
 };
 </script>
 <style lang="less">
 .dealForm {
-  display: flex;
-  flex-wrap: wrap;
+    display: flex;
+    flex-wrap: wrap;
 
-  .el-input {
-    width: 220px;
-  }
-  .el-form-item {
-    width: 100%;
-  }
+    .el-input {
+        width: 220px;
+    }
+    .el-form-item {
+        width: 100%;
+    }
 }
 .tableBtns {
-  display: flex;
-  justify-content: center;
+    display: flex;
+    justify-content: center;
 }
 
 .yj-dialogFormBox {
-  width: 462px;
+    width: 462px;
 }
 
 .fullHeight {
-  position: relative;
+    position: relative;
 
-  .Pagination-but {
-    width: 100%;
-    padding: 20px 0;
-    // background: skyblue;
-    position: absolute;
-    bottom: 30px;
-    right: 20px;
+    .Pagination-but {
+        width: 100%;
+        padding: 20px 0;
+        // background: skyblue;
+        position: absolute;
+        bottom: 30px;
+        right: 20px;
 
-    display: flex;
-    justify-content: center;
-  }
+        display: flex;
+        justify-content: center;
+    }
 }
 </style>
diff --git a/src/views/projectFront/laborManage/allAttendanceManageComponents/monthAttendanceReport.vue b/src/views/projectFront/laborManage/allAttendanceManageComponents/monthAttendanceReport.vue
index 7fcf6570..2f9f3d75 100644
--- a/src/views/projectFront/laborManage/allAttendanceManageComponents/monthAttendanceReport.vue
+++ b/src/views/projectFront/laborManage/allAttendanceManageComponents/monthAttendanceReport.vue
@@ -274,6 +274,8 @@
                 range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
+                :clearable="false"
+                :picker-options="handleTimeChange(queryParams.dayTime, 'day')"
               >
               </el-date-picker>
             </el-form-item>