diff --git a/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx
index 529b1f6..bfa2996 100644
--- a/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx
+++ b/src/pages/InRoadMgm/PersonMgm/Performance/SalesStat/loadable.jsx
@@ -23,7 +23,7 @@ function SalesStat(props) {
})
const parameter = {
name: '',//登录名
- start_time: moment().format('YYYY-MM-DD 00:00:00'),
+ start_time: moment().subtract(1, 'days').startOf('day').format('YYYY-MM-DD 00:00:00'),
end_time: moment().format("YYYY-MM-DD 23:59:59"),
pn: 1,
length: Number(pageSizeOptions[0]), // 每页条数
diff --git a/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx b/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
index 6099e52..19b9d32 100644
--- a/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
+++ b/src/pages/InRoadMgm/RoadMgm/ConfigRoad/loadable.jsx
@@ -660,7 +660,7 @@ const ConfigRoad = (props) => {
},
search: function (params) {
ajax
- .getPoleListData(params)
+ .getPoleListDatas(params)
.then((res) => {
if (res.status === 20000) {
setResultData({
diff --git a/src/pages/NewEnergy/ChargeDeviceMgm/ElectricModal/loadable.jsx b/src/pages/NewEnergy/ChargeDeviceMgm/ElectricModal/loadable.jsx
index c9b4463..a081a13 100644
--- a/src/pages/NewEnergy/ChargeDeviceMgm/ElectricModal/loadable.jsx
+++ b/src/pages/NewEnergy/ChargeDeviceMgm/ElectricModal/loadable.jsx
@@ -145,10 +145,13 @@ function BillingRule() {
}
const handelOk = () => {
var numberRegex = /^\d+$/;
+ var letterNumber = /^[0-9a-zA-Z]+$/;
if (addFormData.producer_id === '') {
message.error('请选择设备生产商')
} else if (addFormData.model === '') {
message.error('请输入设备型号')
+ } else if (!letterNumber.test(addFormData.model)) {
+ message.error('设备型号只能输入英文和数字')
} else if (addFormData.type === '') {
message.error('请选择设备类型')
} else if (addFormData.power === '') {
diff --git a/src/services/InroadMgm/RoadMgm/RoadMgm.js b/src/services/InroadMgm/RoadMgm/RoadMgm.js
index 7a14694..59f911f 100644
--- a/src/services/InroadMgm/RoadMgm/RoadMgm.js
+++ b/src/services/InroadMgm/RoadMgm/RoadMgm.js
@@ -114,7 +114,7 @@ const addToll = (params) => {
///api/bpm/device/road_set_pole_position_list 杆位管理-获取列表
-const getPoleListData = (params) => {
+const getPoleListDatas = (params) => {
return ajax({
url: "/api/bpm/device/road_set_pole_position_list",
type: "post",
@@ -385,7 +385,7 @@ export default {
getRoadInfo,
addToll,
getEtcData,
- getPoleListData,
+ getPoleListDatas,
getRoadRuleList,
delToll,
getEditInRoadData,