diff --git a/web/client/src/sections/fillion/components/fileTable.js b/web/client/src/sections/fillion/components/fileTable.js index 7fb11321..a0dbc8d9 100644 --- a/web/client/src/sections/fillion/components/fileTable.js +++ b/web/client/src/sections/fillion/components/fileTable.js @@ -281,7 +281,11 @@ const RoadNameList = (props) => { return { onClick: () => { if (record) { - setSelectRoad(record.rId); + let id = record.rId + if(selectRoad == record.rId){ + id = null + } + setSelectRoad(id); onChange(record); } }, @@ -413,7 +417,7 @@ const FileTable = (props) => { }} > - + diff --git a/web/client/src/sections/fillion/components/maintenanceTable.js b/web/client/src/sections/fillion/components/maintenanceTable.js index 07207b78..c26c6c8d 100644 --- a/web/client/src/sections/fillion/components/maintenanceTable.js +++ b/web/client/src/sections/fillion/components/maintenanceTable.js @@ -102,12 +102,12 @@ const DetailList = (props) => { align: 'center', render: (text, record) => { let day = moment(record.time).format("YYYYMMDD") - if(!basicDate){ + if (!basicDate) { basicDate = day; - counter +=1; - } else if(basicDate == day){ counter += 1; - } else if(basicDate != day){ + } else if (basicDate == day) { + counter += 1; + } else if (basicDate != day) { basicDate = day; counter = 1; } @@ -303,7 +303,11 @@ const MaintenanceTable = (props) => { useEffect(() => { if (record) { - let query = { userId: record.id, reportType: 'conserve' , asc: true} + let query = { + userId: record.id, + reportType: 'conserve', + asc: true + } if ((dateRange && dateRange instanceof Array && dateRange[0] != '')) { query.startTime = moment(dateRange[0]).startOf('day').format('YYYY-MM-DD HH:mm:ss') query.endTime = moment(dateRange[1]).endOf('day').format('YYYY-MM-DD HH:mm:ss') @@ -320,7 +324,11 @@ const MaintenanceTable = (props) => { } const handelRefresh = () => { - let query = { userId: record.id, reportType: 'patrol', asc: true } + let query = { + userId: record.id, + reportType: 'conserve', + asc: true + } dispatch(getReportList(query)); } @@ -343,7 +351,10 @@ const MaintenanceTable = (props) => { - + { switch (text) { case 'road': return '道路'; case 'bridge': return '桥梁'; - case 'culvert ': return '涵洞'; + case 'culvert': return '涵洞'; case 'other': return '其他'; default: return text; } diff --git a/web/client/src/sections/fillion/containers/maintenance.js b/web/client/src/sections/fillion/containers/maintenance.js index d08a032d..b02e7dd6 100644 --- a/web/client/src/sections/fillion/containers/maintenance.js +++ b/web/client/src/sections/fillion/containers/maintenance.js @@ -25,7 +25,7 @@ const Maintenance = (props) => { let reportIds = ids.toString(); window.open( '/_api/' + - `data/export?exp=patrol&ids=${reportIds}&token=${user.token}`) + `data/export?exp=maintenance&ids=${reportIds}&token=${user.token}`) } return ( <>