diff --git a/src/components/TableModule/index.jsx b/src/components/TableModule/index.jsx
index cb6236f..1c774b2 100644
--- a/src/components/TableModule/index.jsx
+++ b/src/components/TableModule/index.jsx
@@ -272,7 +272,7 @@ const TableModule = forwardRef((props, ref) => {
setFormData({ ...searchForm.getFieldsValue(), plateValue: '' })
//search({ ...searchForm.getFieldsValue() })
setTimeGroup({
- timeType: '',
+ timeType: '1',
timeRanges: {
start_time: moment().subtract(1, "day").format('YYYY-MM-DD 00:00:00'),
end_time: moment().format("YYYY-MM-DD 23:59:59"),
diff --git a/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx b/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx
index e8c6bc0..dc744a5 100644
--- a/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx
+++ b/src/pages/InRoadMgm/BusinessMgm/SpecialRecord/loadable.jsx
@@ -473,8 +473,8 @@ function CollectorWorkStat(props) {
} else {
fileList.map(res => {
imgUrl.push(res.response?.data)
- getImage.map(item => {
- imgUrl.push(item)
+ getImage?.map(item => {
+ imgUrl?.push(item)
})
})
}
diff --git a/src/pages/InRoadMgm/PersonMgm/Attendance/Fence/loadable.jsx b/src/pages/InRoadMgm/PersonMgm/Attendance/Fence/loadable.jsx
index e542a6c..afeab8f 100644
--- a/src/pages/InRoadMgm/PersonMgm/Attendance/Fence/loadable.jsx
+++ b/src/pages/InRoadMgm/PersonMgm/Attendance/Fence/loadable.jsx
@@ -65,11 +65,11 @@ function Fence(props) {
// }
let res = [];
if (options) {
- let last = options[options.length - 1];
- if (last.children) {
- addChild(last, res);
- }
- res.push(last.id);
+ let last = options[options.length - 1];
+ if (last.children) {
+ addChild(last, res);
+ }
+ res.push(last.id);
}
console.log(res);
setAreaSelectedList(res);
@@ -157,7 +157,7 @@ function Fence(props) {
key: 'attendDistance',
render: (text, record) => {
return <>
-
{record.attendDistance == '1' ? '无电子围栏' : '指定范围'}
+ {record.attendmin == '' ? '无电子围栏' : record.attendmin + '米'}
>
}
},
@@ -246,9 +246,9 @@ function Fence(props) {
}
//检索数据
const getSearchData = (data = formData) => {
- setFormData(Object.assign({}, formData, { pn: 1}))
+ setFormData(Object.assign({}, formData, { pn: 1 }))
setLastFormData(Object.assign({}, lastFormData, { pn: 1 }))
- getData({...data, pn: 1})
+ getData({ ...data, pn: 1 })
}
//批量设置
const setUp = () => {
@@ -283,7 +283,7 @@ function Fence(props) {
setGetEditModal({ ...getEditModal, attendDistance: v })
setGetMap(v)
if (v === '1') {
- setGetEditModal({ ...getEditModal, attendDistance: v ,attendmin:''})
+ setGetEditModal({ ...getEditModal, attendDistance: v, attendmin: '' })
}
}
//有效范围输入区间
@@ -317,8 +317,9 @@ function Fence(props) {
console.log(reg.test(getModalData.attendmin));
if (getModalData.attendmin === '' && getStatus == '2') {
message.error('请输入有效范围')
- } else if (!reg.test(getModalData.attendmin)) {
- message.error('有效范围输入区间为[100,2000]')
+ if (!reg.test(getModalData.attendmin)) {
+ message.error('有效范围输入区间为[100,2000]')
+ }
} else if (getScopeValue === '2' && targetKeys.length === 0) {
message.error('请选择停车场')
} else {
@@ -487,8 +488,8 @@ function Fence(props) {
-