From 19f85cee5dd152005b68780ac5bbb93192e0ddd8 Mon Sep 17 00:00:00 2001
From: fengxiang <361798944@qq.com>
Date: Tue, 19 Dec 2023 15:06:12 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E7=9B=91=E6=8E=A7=E8=BD=A6=E8=BE=86?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableModule/index.jsx                        | 13 +++++++++++--
 .../OperationCenter/DataMonitor/MonitorCarSet/loadable.jsx  | 12 ++++++++----
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/components/TableModule/index.jsx b/src/components/TableModule/index.jsx
index e677b26..d0d183d 100644
--- a/src/components/TableModule/index.jsx
+++ b/src/components/TableModule/index.jsx
@@ -171,10 +171,19 @@ const TableModule = forwardRef((props, ref) => {
   }, [formData])
   const [getForm, setGetForm] = useState({})
   //查询函数
-  function fetch(pn) {
+  function fetch(pn, update) {
     // setLoading(true);
     let pnno = pn ? { pn: 1 } : {}
-    let form = { ...searchForm.getFieldsValue(), ...pageData, ...otherData, ...pnno };
+    let updateData = update ? update : {}
+    if (update) {
+      searchForm.setFieldsValue(update);
+      setSessionTabList({ ...sessionTabList, ...update});
+      if(pageData?.pn != 1){
+        setPageData({ ...pageData, pn: 1 });
+        return
+      }
+    }
+    let form = { ...searchForm.getFieldsValue(), ...pageData, ...otherData, ...pnno, ...updateData };
     if (timeFlag) {
       form = {
         ...form,
diff --git a/src/pages/OperationCenter/DataMonitor/MonitorCarSet/loadable.jsx b/src/pages/OperationCenter/DataMonitor/MonitorCarSet/loadable.jsx
index 9456ada..160af91 100644
--- a/src/pages/OperationCenter/DataMonitor/MonitorCarSet/loadable.jsx
+++ b/src/pages/OperationCenter/DataMonitor/MonitorCarSet/loadable.jsx
@@ -115,7 +115,7 @@ function MonitorCarSet() {
 
   // 提交
   function handleSave() {
-    if (rowData?.plate_color == "" || rowData?.plate_color == undefined) {
+    if (rowData?.plate_color === "" || rowData?.plate_color === undefined) {
       message.error("请选择车牌颜色");
       return;
     }
@@ -128,7 +128,7 @@ function MonitorCarSet() {
         if (parseInt(res?.status) === 20000) {
           message.success(res?.message);
           setVisible(false);
-          tableRef.current.fetch();
+          tableRef.current.fetch(1, { end_time: moment() });
         } else {
           message.error(res?.message);
         }
@@ -151,7 +151,7 @@ function MonitorCarSet() {
           (res) => {
             if (parseInt(res?.status) === 20000) {
               message.success(res?.message);
-              tableRef.current.fetch();
+              tableRef.current.fetch(1, { end_time: moment() });
             } else {
               message.error(res?.message);
             }
@@ -221,7 +221,11 @@ function MonitorCarSet() {
             className="form-con"
             placeholder="请选择"
             options={sysConfig?.plateColor?.filter((v, i) => i)}
-            value={parseInt(rowData?.plate_color) || 0}
+            value={
+              rowData?.plate_color !== "" && rowData?.plate_color !== undefined
+                ? parseInt(rowData?.plate_color)
+                : undefined
+            }
             onChange={(e) =>
               setRowData({
                 ...rowData,