From 9458140821d004d909b67c0d8f8c2b3ce8ff02a9 Mon Sep 17 00:00:00 2001 From: wanghx Date: Tue, 30 Jan 2024 15:26:59 +0800 Subject: [PATCH 1/8] =?UTF-8?q?fix():=20=E5=A4=84=E7=90=86=E5=8C=BA?= =?UTF-8?q?=E5=9F=9F=E7=AE=A1=E7=90=86=EF=BC=8C=E5=9C=B0=E5=9B=BE=E9=80=89?= =?UTF-8?q?=E7=82=B9=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../OffPeak/OffPeakShareRecords/ShareParkMgm/infoModal/index.jsx | 3 +++ src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx | 5 +++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/infoModal/index.jsx b/src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/infoModal/index.jsx index 4017725..9b3d88d 100644 --- a/src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/infoModal/index.jsx +++ b/src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/infoModal/index.jsx @@ -39,6 +39,9 @@ function InfoModal (props) { const validateCws = (_, value) => { const total = baseForm.getFieldValue('total'); + if (Number.isInteger(value)) { + return Promise.reject(new Error('可预约车位数必须为整数')); + } if (value < 0) { return Promise.reject(new Error('可预约车位数错误')); } diff --git a/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx b/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx index 5061818..6c04899 100644 --- a/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx +++ b/src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx @@ -31,8 +31,8 @@ function ModalAreaAdd(props) { lng: '' } if (formData.latlng && formData.latlng.split(',').length) { - latlngObj['lat'] = formData.latlng.split(',')[0] - latlngObj['lng'] = formData.latlng.split(',')[1] + latlngObj['lat'] = formData.latlng.split(',')[1] + latlngObj['lng'] = formData.latlng.split(',')[0] } onOk(formData={...formData,id: editForm.id, ...latlngObj}, editStatus, ) form.resetFields() @@ -60,6 +60,7 @@ function ModalAreaAdd(props) { ...editForm, latlng: latlng }) + setAreaType(editForm.type) } else { form.setFieldsValue({ pid: pid, From 4d505391f6719b985a6a4ce7c7ab43571589ce87 Mon Sep 17 00:00:00 2001 From: zhangjian Date: Tue, 30 Jan 2024 15:28:14 +0800 Subject: [PATCH 2/8] =?UTF-8?q?fixed():=E4=BF=AE=E5=A4=8Dui=E8=B5=B0?= =?UTF-8?q?=E6=9F=A5=E6=8F=90=E5=87=BA=E6=9D=A5=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/fonts/font_pda/demo_index.html | 144 ++++++++++++++++++++- src/assets/fonts/font_pda/iconfont.css | 30 ++++- src/assets/fonts/font_pda/iconfont.js | 2 +- src/assets/fonts/font_pda/iconfont.json | 42 ++++++ src/assets/fonts/font_pda/iconfont.ttf | Bin 28768 -> 29740 bytes src/assets/fonts/font_pda/iconfont.woff | Bin 18240 -> 18724 bytes src/assets/fonts/font_pda/iconfont.woff2 | Bin 15664 -> 16096 bytes src/assets/images/search-map.png | Bin 0 -> 600 bytes src/pages/NewEnergy/NewEnergyOverview/Map.jsx | 26 ++-- src/pages/NewEnergy/NewEnergyOverview/index.scss | 18 +-- src/pages/NewEnergy/NewEnergyOverview/loadable.jsx | 10 +- 11 files changed, 245 insertions(+), 27 deletions(-) create mode 100644 src/assets/images/search-map.png diff --git a/src/assets/fonts/font_pda/demo_index.html b/src/assets/fonts/font_pda/demo_index.html index 1dc32e3..a6eeb54 100644 --- a/src/assets/fonts/font_pda/demo_index.html +++ b/src/assets/fonts/font_pda/demo_index.html @@ -57,6 +57,42 @@