From 5f20a63b3bbafd897f0252be75bb323725824389 Mon Sep 17 00:00:00 2001 From: chenglb Date: Tue, 30 Jan 2024 21:39:08 +0800 Subject: [PATCH 1/5] =?UTF-8?q?fix:=20=E6=BB=9A=E5=8A=A8=E6=9D=A1=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/FinancialMgm/FinancialReport/BookReport/index.scss | 8 ++++++-- src/pages/FinancialMgm/FinancialReport/ParkCardReport/index.scss | 2 +- src/pages/FinancialMgm/FinancialReport/PdaStat/index.scss | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/pages/FinancialMgm/FinancialReport/BookReport/index.scss b/src/pages/FinancialMgm/FinancialReport/BookReport/index.scss index 0c302a4..05a7972 100644 --- a/src/pages/FinancialMgm/FinancialReport/BookReport/index.scss +++ b/src/pages/FinancialMgm/FinancialReport/BookReport/index.scss @@ -275,7 +275,7 @@ $color-primary : var(--color-primary); width: 24px; height: 50px; position: fixed; - right: 20px; + right: 33px; top: 202px; padding: 10px 8px; z-index: 12; @@ -286,7 +286,7 @@ $color-primary : var(--color-primary); } .showas { - top: 328px + top: 320px } } @@ -325,6 +325,10 @@ $color-primary : var(--color-primary); } } + .ant-table-cell-scrollbar{ + border: unset !important + } + .ant-table-body { @include scrollBar(var(--color-user-list-bg), #3B97FF); diff --git a/src/pages/FinancialMgm/FinancialReport/ParkCardReport/index.scss b/src/pages/FinancialMgm/FinancialReport/ParkCardReport/index.scss index 3fa1210..4cc4169 100644 --- a/src/pages/FinancialMgm/FinancialReport/ParkCardReport/index.scss +++ b/src/pages/FinancialMgm/FinancialReport/ParkCardReport/index.scss @@ -230,7 +230,7 @@ $color-primary : var(--color-primary); width: 24px; height: 50px; position: fixed; - right: 20px; + right: 33px; top: 202px; z-index: 12; padding: 10px 8px; diff --git a/src/pages/FinancialMgm/FinancialReport/PdaStat/index.scss b/src/pages/FinancialMgm/FinancialReport/PdaStat/index.scss index 131e610..c5aa4bf 100644 --- a/src/pages/FinancialMgm/FinancialReport/PdaStat/index.scss +++ b/src/pages/FinancialMgm/FinancialReport/PdaStat/index.scss @@ -195,8 +195,8 @@ $color-primary : var(--color-primary); width: 24px; height: 50px; position: fixed; - right: 20px; - top: 167px; + right: 33px; + top: 161px; z-index: 12; padding: 10px 8px; From ee2f009c08098076a3b57cd432083205a351ddb4 Mon Sep 17 00:00:00 2001 From: chenglb Date: Tue, 30 Jan 2024 21:58:56 +0800 Subject: [PATCH 2/5] =?UTF-8?q?fix:=20=E9=9D=9E20000=E7=9A=84=E5=BC=82?= =?UTF-8?q?=E5=B8=B8=E5=BF=85=E9=A1=BB=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/OffPeak/OffPeakParkMgm/BookInfo/loadable.jsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/pages/OffPeak/OffPeakParkMgm/BookInfo/loadable.jsx b/src/pages/OffPeak/OffPeakParkMgm/BookInfo/loadable.jsx index 264efce..39b9bf1 100644 --- a/src/pages/OffPeak/OffPeakParkMgm/BookInfo/loadable.jsx +++ b/src/pages/OffPeak/OffPeakParkMgm/BookInfo/loadable.jsx @@ -139,6 +139,8 @@ function BookInfo(props) { if (res.status === 20000) { setTableData(res.data.list); setTotal(res.data.total); + }else{ + message.error(res.message) } }); } From 009fd75ba4d70c81d20e3db3d8c3bb3928ecb6d4 Mon Sep 17 00:00:00 2001 From: wanghx Date: Wed, 31 Jan 2024 09:35:46 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix():=20=E9=94=99=E5=B3=B0=E5=87=BA?= =?UTF-8?q?=E8=A1=8C=E8=A1=A8=E5=8D=95=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/infoModal/index.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/infoModal/index.jsx b/src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/infoModal/index.jsx index 9b3d88d..587be7f 100644 --- a/src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/infoModal/index.jsx +++ b/src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/infoModal/index.jsx @@ -39,7 +39,7 @@ function InfoModal (props) { const validateCws = (_, value) => { const total = baseForm.getFieldValue('total'); - if (Number.isInteger(value)) { + if (!Number.isInteger(value)) { return Promise.reject(new Error('可预约车位数必须为整数')); } if (value < 0) { From 8bceea45bb165a407f9993fd1e0ad4f2043ba464 Mon Sep 17 00:00:00 2001 From: wanghx Date: Wed, 31 Jan 2024 10:04:35 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix():=20=E4=BF=AE=E5=A4=8D=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E7=AE=A1=E7=90=86=E5=B7=B2=E7=9F=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ImportBtn/index.jsx | 12 +++++++----- .../ParkingIncomeAly/ArrearageAly/loadable.jsx | 2 +- .../ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx | 2 +- .../ParkingIncomeAly/CityArrearageAly/loadable.jsx | 2 +- .../ParkingIncomeAly/CityIncomeAly/loadable.jsx | 2 +- .../ParkingIncomeAly/CityIncomeStat/loadable.jsx | 2 +- .../ParkingIncomeAly/OrderArrearageAly/loadable.jsx | 2 +- .../ParkingIncomeAly/PriceAly/loadable.jsx | 2 +- 8 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/components/ImportBtn/index.jsx b/src/components/ImportBtn/index.jsx index eb1ad37..56aa2b8 100644 --- a/src/components/ImportBtn/index.jsx +++ b/src/components/ImportBtn/index.jsx @@ -19,11 +19,13 @@ function ImportBtn(props) { const handleUploadChange = (file, fileList, e) => { - setFileList(file.fileList) - if (e && e.status == 20000) { - setMsg(e.message) - } else { - message.error(e?.message) + if (file.file.status == 'done') { + setFileList(file.fileList) + if (file.file.response.status == 20000) { + setMsg(file.file.response?.message) + } else { + message.error(file.file.response?.message) + } } } diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/loadable.jsx index c7cd69a..63d0ce2 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageAly/loadable.jsx @@ -20,7 +20,7 @@ let currentValue; function ArrearageAly(props) { const defaultData = { - region: [], + region: ["0"], park_text: "", pay_merchant_id: 0 } diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx index 7dbb21c..58766b6 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/ArrearageRecoverAly/loadable.jsx @@ -16,7 +16,7 @@ function ArrearageRecoverAly(props) { const [loading, setLoading] = useState(false) const defaultFormData = { - region: [], + region: ["0"], operator_id: "0", park_type: 0, date_type: "day", diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityArrearageAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityArrearageAly/loadable.jsx index 03ee9d0..1ef595b 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityArrearageAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityArrearageAly/loadable.jsx @@ -16,7 +16,7 @@ function CityArrearageAly(props) { const [loading, setLoading] = useState(false) const defaultFormData = { - region: [], + region: ["0"], operator_id: "0", park_type: 0, date_type: "day", diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityIncomeAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityIncomeAly/loadable.jsx index 0a7d14c..5504109 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityIncomeAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityIncomeAly/loadable.jsx @@ -18,7 +18,7 @@ function CityIncomeAly(props) { const [loading, setLoading] = useState(false) const defaultFormData = { - region: [], + region: ['0'], operator_id: "0", park_type: 0, date_type: "day", diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityIncomeStat/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityIncomeStat/loadable.jsx index 6acfcde..1e121e5 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityIncomeStat/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/CityIncomeStat/loadable.jsx @@ -16,7 +16,7 @@ function CityIncomeStat(props) { const [loading, setLoading] = useState(false) const defaultFormData = { - region: [], + region: ['0'], operator_id: "0", park_type: 0, date_type: "day", diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/OrderArrearageAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/OrderArrearageAly/loadable.jsx index 80fe9b9..4a327da 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/OrderArrearageAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/OrderArrearageAly/loadable.jsx @@ -20,7 +20,7 @@ function OrderArrearageAly(props) { const [loading, setLoading] = useState(false) const defaultFormData = { - region: [], + region: ['0'], operator_id: "0", park_type: 0, pay_merchant_id: 0, diff --git a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/PriceAly/loadable.jsx b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/PriceAly/loadable.jsx index e42a83d..5483ba9 100644 --- a/src/pages/DataAnalysisPrediction/ParkingIncomeAly/PriceAly/loadable.jsx +++ b/src/pages/DataAnalysisPrediction/ParkingIncomeAly/PriceAly/loadable.jsx @@ -19,7 +19,7 @@ function PriceAly(props) { const [loading, setLoading] = useState(false) const defaultFormData = { - region: [], + region: ["0"], operator_id: "0", park_type: 0, date_type: "day", From eb770a0f83d7158d973f4f0413bcebfd209132bd Mon Sep 17 00:00:00 2001 From: He Huan Date: Wed, 31 Jan 2024 10:09:09 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix():=E4=BF=AE=E6=94=B9=E7=89=A9=E7=90=86?= =?UTF-8?q?=E6=A1=A9=E5=92=8C=E5=9C=B0=E9=94=81=E7=AE=A1=E7=90=86=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E7=9A=84=E6=96=B0=E5=A2=9E=E8=BE=93=E5=85=A5=E8=A7=84?= =?UTF-8?q?=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChargeDeviceMgm/GroundLockManagement/loadable.jsx | 14 +++++++++++++- .../ChargeDeviceMgm/PhysicalPileManagement/loadable.jsx | 16 ++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/pages/NewEnergy/ChargeDeviceMgm/GroundLockManagement/loadable.jsx b/src/pages/NewEnergy/ChargeDeviceMgm/GroundLockManagement/loadable.jsx index d3ab0e5..80571af 100644 --- a/src/pages/NewEnergy/ChargeDeviceMgm/GroundLockManagement/loadable.jsx +++ b/src/pages/NewEnergy/ChargeDeviceMgm/GroundLockManagement/loadable.jsx @@ -170,15 +170,27 @@ function GroundLockManagement() { } // 确定 const handleOk = () => { + let chineseReg = /^(?:[\u4e00-\u9fa5·]{1,16})$/ + let reg = /^[0-9a-zA-Z]*$/g; if(!rowData.name||rowData.name.match(/^\s+$/)){ message.destroy(); message.warning(`设备名称不可为空`); return - }else if(!rowData.code||rowData.code.match(/^\s+$/)){ + }else if(!chineseReg.test(rowData?.name)){ + message.destroy(); + message.warning(`设备名称不能为数字或英文`); + return + } + else if(!rowData.code||rowData.code.match(/^\s+$/)){ message.destroy(); message.warning(`设备编码不可为空`); return } + else if(!reg.test(rowData?.code)){ + message.destroy(); + message.warning(`设备编码不能包含汉字`); + return + } else if(!rowData.model){ message.destroy(); message.warning(`设备类型不可为空`); diff --git a/src/pages/NewEnergy/ChargeDeviceMgm/PhysicalPileManagement/loadable.jsx b/src/pages/NewEnergy/ChargeDeviceMgm/PhysicalPileManagement/loadable.jsx index 4dcd37e..7cd0045 100644 --- a/src/pages/NewEnergy/ChargeDeviceMgm/PhysicalPileManagement/loadable.jsx +++ b/src/pages/NewEnergy/ChargeDeviceMgm/PhysicalPileManagement/loadable.jsx @@ -97,20 +97,36 @@ function PhysicalPileManagement() { } // 确定 const handleOk = () => { + let chineseReg = /^(?:[\u4e00-\u9fa5·]{1,16})$/ + let reg = /^[0-9a-zA-Z]*$/g; if(!rowData.name||rowData.name.match(/^\s+$/)){ message.destroy(); message.warning(`设备名称不可为空`); return + }else if(!chineseReg.test(rowData?.name)){ + message.destroy(); + message.warning(`设备名称不能为数字或英文`); + return }else if(!rowData.code||rowData.code.match(/^\s+$/)){ message.destroy(); message.warning(`硬件编码不可为空`); return } + else if(!reg.test(rowData?.code)){ + message.destroy(); + message.warning(`硬件编码不能包含汉字`); + return + } else if(!rowData.model||rowData.model.match(/^\s+$/)){ message.destroy(); message.warning(`设备型号不可为空`); return } + else if(!reg.test(rowData?.model)){ + message.destroy(); + message.warning(`设备型号不能包含汉字`); + return + } else if(!rowData.muzzle_num){ message.destroy(); message.warning(`枪口数量不可为空`);