Browse Source

故障修改

dev
LUCAS 3 years ago
parent
commit
08e6d7ea38
  1. 6
      web/client/src/sections/fillion/components/maintenanceTable.js
  2. 4
      web/client/src/sections/fillion/components/patrolTable.js

6
web/client/src/sections/fillion/components/maintenanceTable.js

@ -18,7 +18,7 @@ const DetailForm = (props) => {
{ key: '所在路段', name: 'road' }, { key: '所在路段', name: 'road' },
{ key: '具体位置', name: 'address' }, { key: '具体位置', name: 'address' },
{ key: '巡查内容', name: 'content' }, { key: '巡查内容', name: 'content' },
{ key: '病害照片', name: 'scenePic' }, // { key: '病害照片', name: 'scenePic' },
{ key: '养护前', name: 'conserveBeforePic' }, { key: '养护前', name: 'conserveBeforePic' },
{ key: '养护中', name: 'conserveUnderwayPic' }, { key: '养护中', name: 'conserveUnderwayPic' },
{ key: '养护后', name: 'conserveAfterPic' }, { key: '养护后', name: 'conserveAfterPic' },
@ -56,7 +56,7 @@ const DetailForm = (props) => {
visible={visible} visible={visible}
footer={null} footer={null}
onCancel={handleClose} onCancel={handleClose}
title={'巡更详细'} title={'养护管理详情'}
> >
<Spin spinning={loading}> <Spin spinning={loading}>
{renderContent(data)} {renderContent(data)}
@ -269,7 +269,7 @@ const MaintenanceTable = (props) => {
useEffect(() => { useEffect(() => {
if (record) { if (record) {
let query = { userId: record.id, reportType: 'conserve' } let query = { userId: record.id, reportType: 'conserve' }
if ((dateRange && dateRange instanceof Array)) { if ((dateRange && dateRange instanceof Array && dateRange[0] != '')) {
query.startTime = moment(dateRange[0]).startOf('day').format('YYYY-MM-DD HH:mm:ss') 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') query.endTime = moment(dateRange[1]).endOf('day').format('YYYY-MM-DD HH:mm:ss')
} }

4
web/client/src/sections/fillion/components/patrolTable.js

@ -57,7 +57,7 @@ const DetailForm = (props) => {
visible={visible} visible={visible}
footer={null} footer={null}
onCancel={handleClose} onCancel={handleClose}
title={'巡更详细'} title={'巡更管理详情'}
> >
<Spin spinning={loading}> <Spin spinning={loading}>
{renderContent(data)} {renderContent(data)}
@ -273,7 +273,7 @@ const PatrolTable = (props) => {
const queryData = () => { const queryData = () => {
let query = { userId: record.id, reportType: 'patrol' } let query = { userId: record.id, reportType: 'patrol' }
if ((dateRange && dateRange instanceof Array)) { if ((dateRange && dateRange instanceof Array && dateRange[0] != '')) {
query.startTime = moment(dateRange[0]).startOf('day').format('YYYY-MM-DD HH:mm:ss') 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') query.endTime = moment(dateRange[1]).endOf('day').format('YYYY-MM-DD HH:mm:ss')
} }

Loading…
Cancel
Save