Merge branch 'develop' of http://120.27.195.166:3000/chenglb/PMS_Frontend_v1.0.0 into develop

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)
+      }
     }
   }
 

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
     }

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",

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",

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",

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",

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,

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",

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);
 

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;

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;
 

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(`设备类型不可为空`);

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(`枪口数量不可为空`);

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)
       }
     });
   }

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) {