From 9163187c57705b9226f15d95a8a23662b48a6a69 Mon Sep 17 00:00:00 2001
From: chenqiang <chenqiang@yisa.com>
Date: Tue, 5 Dec 2023 16:47:27 +0800
Subject: [PATCH] =?UTF-8?q?fix():=20=E4=BF=AE=E5=A4=8D=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=88=87=E6=8D=A2bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EquipmentAly/EquipmentRunningStat/loadable.jsx   |  2 +-
 .../ParkingOverview/loadable.jsx                     | 20 +++++++++++++-------
 .../FinancialReport/BookReport/loadable.jsx          |  2 +-
 .../FinancialReport/OperationReport/loadable.jsx     |  2 +-
 .../FinancialReport/ParkCardReport/loadable.jsx      |  2 +-
 .../FinancialReport/ParkingIncomeReport/loadable.jsx |  2 +-
 .../FinancialReport/PayChannelStat/loadable.jsx      |  2 +-
 .../FinancialReport/PaySummaryReport/loadable.jsx    |  2 +-
 .../FinancialReport/PdaStat/loadable.jsx             |  2 +-
 .../FinancialReport/PreOrderReport/loadable.jsx      |  2 +-
 .../FinancialMgm/Invoice/CreateInvoice/loadable.jsx  |  2 +-
 .../Invoice/CreateInvoiceRecord/loadable.jsx         |  2 +-
 .../SettleBill/AbnormalPayment/loadable.jsx          |  2 +-
 .../FinancialMgm/SettleBill/BillDiff/loadable.jsx    |  2 +-
 .../FinancialMgm/SettleBill/PayRepeat/loadable.jsx   |  2 +-
 15 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx b/src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx
index 7d19685..295235f 100644
--- a/src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/EquipmentAly/EquipmentRunningStat/loadable.jsx
@@ -711,7 +711,7 @@ function ExceptionParkReport() {
                 total={Data.total}
                 current={FormData.pn}
                 pageSize={FormData.page_size}
-                pageSizeOptions={dictionary?.pageSizeOptions}
+                pageSizeOptions={dictionary?.pageSizeOptions1}
                 onChange={onShowSizeChange}
                 onShowSizeChange={onShowSizeChange}
               />
diff --git a/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx
index 36246cd..4301e7d 100644
--- a/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx
+++ b/src/pages/DataAnalysisPrediction/ParkingOverview/loadable.jsx
@@ -96,8 +96,8 @@ function ParkingOverview() {
   const defaultform = {
     berthCode: "", //编号
     parkingName: "", //停车场
-    operatorId: "", //商户
-    berthType: "", //泊位类型
+    operatorId: "0", //商户
+    berthType: 0, //泊位类型
     plate: "", //车牌
     pn: 1,
     size: dictionary?.pageSizeOptions1[0],
@@ -417,7 +417,6 @@ function ParkingOverview() {
         timer = setTimeout(() => {
           setWei(data);
         }, 1000);
-
         // ajax.ParkingOverview.searchGeocode({
         //   key: "a54fb01ed4e07686adc0eddf4e18afd7",
         //   address: data,
@@ -1091,7 +1090,14 @@ function ParkingOverview() {
   }, []);
   return (
     <div className="ParkingOverview">
-      <div className="pk_header" onClick={()=>{navigate('/nav')}}>西海岸新区停车信息管理平台</div>
+      <div
+        className="pk_header"
+        onClick={() => {
+          navigate("/nav");
+        }}
+      >
+        西海岸新区停车信息管理平台
+      </div>
       <div className="left_home">
         <div className="pkh_title">停车业务概览</div>
         <div className="dlex_f">
@@ -1160,6 +1166,7 @@ function ParkingOverview() {
           style={{
             width: 232,
           }}
+          placeholder={Selectq == "1" ? "请输入停车场" : "请输入位置"}
           value={Value}
           options={Option}
           onSelect={onSelect}
@@ -1373,11 +1380,10 @@ function ParkingOverview() {
           iconSize={[30, 40]}
           iconAnchor={[15, 20]} // 图片偏移量
           tooltipKey={"name"} // 提示信息的key
-          // contentCb, // 生成弹窗显示内容方法事件
           mover={true}
           clickCb={(ele) => {
             ClickMap(ele);
-          }} // 点击事件
+          }}
         />
         <MarkCenter data={Center} />
       </BaseMap>
@@ -1585,7 +1591,7 @@ function ParkingOverview() {
                   total={Data.total}
                   current={FormData.pn}
                   pageSize={FormData.size}
-                  pageSizeOptions={dictionary?.pageSizeOptions}
+                  pageSizeOptions={dictionary?.pageSizeOptions1}
                   onChange={onShowSizeChange}
                   onShowSizeChange={onShowSizeChange}
                 />
diff --git a/src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx
index 72d757f..0bb10d4 100644
--- a/src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx
+++ b/src/pages/FinancialMgm/FinancialReport/BookReport/loadable.jsx
@@ -805,7 +805,7 @@ function BookReport() {
                 total={Data.total}
                 current={FormData.pn}
                 pageSize={FormData.page_size}
-                pageSizeOptions={dictionary?.pageSizeOptions}
+                pageSizeOptions={dictionary?.pageSizeOptions1}
                 onChange={onShowSizeChange}
                 onShowSizeChange={onShowSizeChange}
               />
diff --git a/src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx
index f798653..8338c25 100644
--- a/src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx
+++ b/src/pages/FinancialMgm/FinancialReport/OperationReport/loadable.jsx
@@ -1074,7 +1074,7 @@ function OperationReport() {
                 total={Data.total}
                 current={FormData.pn}
                 pageSize={FormData.page_size}
-                pageSizeOptions={dictionary?.pageSizeOptions}
+                pageSizeOptions={dictionary?.pageSizeOptions1}
                 onChange={onShowSizeChange}
                 onShowSizeChange={onShowSizeChange}
               />
diff --git a/src/pages/FinancialMgm/FinancialReport/ParkCardReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/ParkCardReport/loadable.jsx
index c44b099..fd1e3ea 100644
--- a/src/pages/FinancialMgm/FinancialReport/ParkCardReport/loadable.jsx
+++ b/src/pages/FinancialMgm/FinancialReport/ParkCardReport/loadable.jsx
@@ -514,7 +514,7 @@ function ParkCardReport() {
                 total={Data.total}
                 current={FormData.pn}
                 pageSize={FormData.page_size}
-                pageSizeOptions={dictionary?.pageSizeOptions}
+                pageSizeOptions={dictionary?.pageSizeOptions1}
                 onChange={onShowSizeChange}
                 onShowSizeChange={onShowSizeChange}
               />
diff --git a/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx
index 40bb4d9..35c01b4 100644
--- a/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx
+++ b/src/pages/FinancialMgm/FinancialReport/ParkingIncomeReport/loadable.jsx
@@ -990,7 +990,7 @@ function ParkingIncomeReport() {
                 total={Data.total}
                 current={FormData.pn}
                 pageSize={FormData.page_size}
-                pageSizeOptions={dictionary?.pageSizeOptions}
+                pageSizeOptions={dictionary?.pageSizeOptions1}
                 onChange={onShowSizeChange}
                 onShowSizeChange={onShowSizeChange}
               />
diff --git a/src/pages/FinancialMgm/FinancialReport/PayChannelStat/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/PayChannelStat/loadable.jsx
index 7594c04..7cc531e 100644
--- a/src/pages/FinancialMgm/FinancialReport/PayChannelStat/loadable.jsx
+++ b/src/pages/FinancialMgm/FinancialReport/PayChannelStat/loadable.jsx
@@ -790,7 +790,7 @@ function PayChannelStat() {
                 total={Data.total}
                 current={FormData.pn}
                 pageSize={FormData.page_size}
-                pageSizeOptions={dictionary?.pageSizeOptions}
+                pageSizeOptions={dictionary?.pageSizeOptions1}
                 onChange={onShowSizeChange}
                 onShowSizeChange={onShowSizeChange}
               />
diff --git a/src/pages/FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx
index 6ea8bcb..99d03db 100644
--- a/src/pages/FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx
+++ b/src/pages/FinancialMgm/FinancialReport/PaySummaryReport/loadable.jsx
@@ -698,7 +698,7 @@ function PaySummaryReport() {
                 total={Data.total}
                 current={FormData.pn}
                 pageSize={FormData.page_size}
-                pageSizeOptions={dictionary?.pageSizeOptions}
+                pageSizeOptions={dictionary?.pageSizeOptions1}
                 onChange={onShowSizeChange}
                 onShowSizeChange={onShowSizeChange}
               />
diff --git a/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx
index 8b33b3f..3e66989 100644
--- a/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx
+++ b/src/pages/FinancialMgm/FinancialReport/PdaStat/loadable.jsx
@@ -642,7 +642,7 @@ function PdaStat() {
                 total={Data.total}
                 current={FormData.pn}
                 pageSize={FormData.page_size}
-                pageSizeOptions={dictionary?.pageSizeOptions}
+                pageSizeOptions={dictionary?.pageSizeOptions1}
                 onChange={onShowSizeChange}
                 onShowSizeChange={onShowSizeChange}
               />
diff --git a/src/pages/FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx b/src/pages/FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx
index 3ed77a7..b03eae5 100644
--- a/src/pages/FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx
+++ b/src/pages/FinancialMgm/FinancialReport/PreOrderReport/loadable.jsx
@@ -603,7 +603,7 @@ function PreOrderReport() {
                 total={Data.total}
                 current={FormData.pn}
                 pageSize={FormData.page_size}
-                pageSizeOptions={dictionary?.pageSizeOptions}
+                pageSizeOptions={dictionary?.pageSizeOptions1}
                 onChange={onShowSizeChange}
                 onShowSizeChange={onShowSizeChange}
               />
diff --git a/src/pages/FinancialMgm/Invoice/CreateInvoice/loadable.jsx b/src/pages/FinancialMgm/Invoice/CreateInvoice/loadable.jsx
index 943f570..f05f0e0 100644
--- a/src/pages/FinancialMgm/Invoice/CreateInvoice/loadable.jsx
+++ b/src/pages/FinancialMgm/Invoice/CreateInvoice/loadable.jsx
@@ -682,7 +682,7 @@ function CreateInvoice() {
                 total={Data.total}
                 current={FormData.pn}
                 pageSize={FormData.page_size}
-                pageSizeOptions={dictionary?.pageSizeOptions}
+                pageSizeOptions={dictionary?.pageSizeOptions1}
                 onChange={onShowSizeChange}
                 onShowSizeChange={onShowSizeChange}
               />
diff --git a/src/pages/FinancialMgm/Invoice/CreateInvoiceRecord/loadable.jsx b/src/pages/FinancialMgm/Invoice/CreateInvoiceRecord/loadable.jsx
index a7efaae..ad11860 100644
--- a/src/pages/FinancialMgm/Invoice/CreateInvoiceRecord/loadable.jsx
+++ b/src/pages/FinancialMgm/Invoice/CreateInvoiceRecord/loadable.jsx
@@ -815,7 +815,7 @@ function CreateInvoiceRecord() {
                 total={Data.total}
                 current={FormData.pn}
                 pageSize={FormData.page_size}
-                pageSizeOptions={dictionary?.pageSizeOptions}
+                pageSizeOptions={dictionary?.pageSizeOptions1}
                 onChange={onShowSizeChange}
                 onShowSizeChange={onShowSizeChange}
               />
diff --git a/src/pages/FinancialMgm/SettleBill/AbnormalPayment/loadable.jsx b/src/pages/FinancialMgm/SettleBill/AbnormalPayment/loadable.jsx
index 2322de3..70ca1d0 100644
--- a/src/pages/FinancialMgm/SettleBill/AbnormalPayment/loadable.jsx
+++ b/src/pages/FinancialMgm/SettleBill/AbnormalPayment/loadable.jsx
@@ -631,7 +631,7 @@ function AbnormalPayment() {
                 total={Data.total}
                 current={FormData.pn}
                 pageSize={FormData.page_size}
-                pageSizeOptions={dictionary?.pageSizeOptions}
+                pageSizeOptions={dictionary?.pageSizeOptions1}
                 onChange={onShowSizeChange}
                 onShowSizeChange={onShowSizeChange}
               />
diff --git a/src/pages/FinancialMgm/SettleBill/BillDiff/loadable.jsx b/src/pages/FinancialMgm/SettleBill/BillDiff/loadable.jsx
index 8fc1a03..ee29dc5 100644
--- a/src/pages/FinancialMgm/SettleBill/BillDiff/loadable.jsx
+++ b/src/pages/FinancialMgm/SettleBill/BillDiff/loadable.jsx
@@ -778,7 +778,7 @@ function BillDiff() {
                 total={Data.total}
                 current={FormData.pn}
                 pageSize={FormData.page_size}
-                pageSizeOptions={dictionary?.pageSizeOptions}
+                pageSizeOptions={dictionary?.pageSizeOptions1}
                 onChange={onShowSizeChange}
                 onShowSizeChange={onShowSizeChange}
               />
diff --git a/src/pages/FinancialMgm/SettleBill/PayRepeat/loadable.jsx b/src/pages/FinancialMgm/SettleBill/PayRepeat/loadable.jsx
index 017f9a0..a7de47d 100644
--- a/src/pages/FinancialMgm/SettleBill/PayRepeat/loadable.jsx
+++ b/src/pages/FinancialMgm/SettleBill/PayRepeat/loadable.jsx
@@ -873,7 +873,7 @@ function PayRepeat() {
                 total={Data.total}
                 current={FormData.pn}
                 pageSize={FormData.page_size}
-                pageSizeOptions={dictionary?.pageSizeOptions}
+                pageSizeOptions={dictionary?.pageSizeOptions1}
                 onChange={onShowSizeChange}
                 onShowSizeChange={onShowSizeChange}
               />