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

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