Merge branch 'dev' of http://47.92.113.182:3000/cq_anquan/safety-eval-service-frontend into dev

src/pages/Container/MonitorManage/SurveyMonitor/index.js

@@ -1,5 +1,4 @@
 import React, { useState, useEffect } from "react";
-import dayjs from "dayjs";
 import {
   Row,
   Col,
@@ -96,21 +95,14 @@ const SurveyMonitor = (props) => {
   useEffect(() => {
     searchForm.setFieldsValue({
       ...router.query,
-      dateRange:
-        router.query.startTime && router.query.endTime
-          ? [dayjs(router.query.startTime), dayjs(router.query.endTime)]
-          : undefined,
     });
     getStat();
     getData();
   }, []);
 
   const handleSearch = (values) => {
-    const { dateRange, ...rest } = values;
     router.query = {
-      ...rest,
-      startTime: dateRange?.[0]?.format?.("YYYY-MM-DD") || undefined,
-      endTime: dateRange?.[1]?.format?.("YYYY-MM-DD") || undefined,
+      ...values,
       current: 1,
       size: 10,
     };
@@ -119,7 +111,7 @@ const SurveyMonitor = (props) => {
 
   const handleReset = (values) => {
     searchForm.resetFields();
-    router.query = { ...values, current: 1, size: 10, startTime: undefined, endTime: undefined };
+    router.query = { ...values, current: 1, size: 10 };
     getData();
   };
 
@@ -306,12 +298,6 @@ const SurveyMonitor = (props) => {
               allowClear
             />
           </Form.Item>,
-          <Form.Item key="dateRange" name="dateRange">
-            <ControlWrapper.DatePicker.RangePicker
-              label="踏勘日期"
-              style={{ width: "100%" }}
-            />
-          </Form.Item>,
           <Form.Item key="clockInStatus" name="clockInStatus">
             <ControlWrapper.Select
               label="打卡状态"