|
|
@ -25,24 +25,25 @@ const DetailForm = (props) => { |
|
|
{ key: '养护路段', name: 'roadSectionStart' }, |
|
|
{ key: '养护路段', name: 'roadSectionStart' }, |
|
|
{ key: '具体位置', name: 'address' }, |
|
|
{ key: '具体位置', name: 'address' }, |
|
|
{ key: '路面类型', name: 'roadType' }, |
|
|
{ key: '路面类型', name: 'roadType' }, |
|
|
{ key: '路面宽度', name: 'roadWidth' }, |
|
|
{ key: '路面宽度(米)', name: 'roadWidth' }, |
|
|
{ key: '错车道', name: 'wrongLane' }, |
|
|
{ key: '错车道（个）', name: 'wrongLane' }, |
|
|
{ key: '行道树', name: 'roadsideTrees' }, |
|
|
{ key: '行道树（棵）', name: 'roadsideTrees' }, |
|
|
{ key: '边沟', name: 'roadsideDitch' }, |
|
|
{ key: '边沟（米）', name: 'roadsideDitch' }, |
|
|
{ key: '护栏', name: 'guardrail' }, |
|
|
{ key: '护栏（米）', name: 'guardrail' }, |
|
|
{ key: '标线', name: 'roadMarking' }, |
|
|
{ key: '标线（米）', name: 'roadMarking' }, |
|
|
{ key: '养护人员人数', name: 'maintenanceStaffCount' }, |
|
|
{ key: '养护人员人数（人）', name: 'maintenanceStaffCount' }, |
|
|
{ key: '修整路肩', name: 'shoulderRepair' }, |
|
|
{ key: '修整路肩（平方米）', name: 'shoulderRepair' }, |
|
|
{ key: '清理边沟', name: 'ditchCleaning' }, |
|
|
{ key: '清理边沟（米）', name: 'ditchCleaning' }, |
|
|
{ key: '修补沥青路面', name: 'asphaltRepair' }, |
|
|
{ key: '修补沥青路面（平方米）', name: 'asphaltRepair' }, |
|
|
{ key: '修补水泥路面', name: 'concreteRepair' }, |
|
|
{ key: '修补水泥路面（平方米）', name: 'concreteRepair' }, |
|
|
{ key: '除草', name: 'grassMowing' }, |
|
|
{ key: '除草（米）', name: 'grassMowing' }, |
|
|
{ key: '树刷白', name: 'treeWhitening' }, |
|
|
{ key: '树刷白（株/公里）', name: 'treeWhitening' }, |
|
|
{ key: '桩刷白', name: 'pileWhitening' }, |
|
|
{ key: '桩刷白（个）', name: 'pileWhitening' }, |
|
|
{ key: '维护护栏', name: 'guardrailMaintenance' }, |
|
|
{ key: '维护护栏（个）', name: 'guardrailMaintenance' }, |
|
|
{ key: '修复端头', name: 'endHeadRepair' }, |
|
|
{ key: '修复端头（块）', name: 'endHeadRepair' }, |
|
|
{ key: '其他养护内容', name: 'otherDescription' }, |
|
|
{ key: '其他养护内容', name: 'otherDescription' }, |
|
|
{ key: '养护前图片', name: 'conserveBeforePic' }, |
|
|
{ key: '养护前图片', name: 'conserveBeforePic' }, |
|
|
|
|
|
{ key: '养护中图片', name: 'conserveUnderwayPic' }, |
|
|
{ key: '养护后图片', name: 'conserveAfterPic' }, |
|
|
{ key: '养护后图片', name: 'conserveAfterPic' }, |
|
|
{ key: '上报视频', name: 'videoUrl' }, |
|
|
{ key: '上报视频', name: 'videoUrl' }, |
|
|
|
|
|
|
|
|
@ -62,14 +63,14 @@ const DetailForm = (props) => { |
|
|
]; |
|
|
]; |
|
|
const renderContent = (data) => { |
|
|
const renderContent = (data) => { |
|
|
if (data) { |
|
|
if (data) { |
|
|
if ( moment(data.time).isAfter(moment('2023-08-03 00:00:00'))) { |
|
|
if (moment(data.time).isAfter(moment('2023-08-03 00:00:00'))) { |
|
|
return keyList.map(obj => { |
|
|
return keyList.map(obj => { |
|
|
return <div style={{ display: 'flex', width: '100%', justifyContent: 'space-between', margin: '12px 0' }}> |
|
|
return <div style={{ display: 'flex', width: '100%', justifyContent: 'space-between', margin: '12px 0' }}> |
|
|
<span style={{ fontSize: 16, color: 'gray', minWidth: '26%' }}>{obj.key}</span> |
|
|
<span style={{ fontSize: 16, color: 'gray', minWidth: '26%' }}>{obj.key}</span> |
|
|
{ |
|
|
{ |
|
|
obj.name != 'conserveBeforePic' && obj.name != 'conserveAfterPic' && obj.name != 'roadSectionStart' && obj.name != 'videoUrl' && obj.name.indexOf('conserve') == -1 ? |
|
|
obj.name != 'conserveBeforePic' && obj.name != 'conserveAfterPic' && obj.name != 'roadSectionStart' && obj.name != 'videoUrl' && obj.name.indexOf('conserve') == -1 ? |
|
|
<Input |
|
|
<Input |
|
|
style={{ width: '70%' }} |
|
|
style={{ width: '60%' }} |
|
|
value={ |
|
|
value={ |
|
|
obj.name == 'id' ? |
|
|
obj.name == 'id' ? |
|
|
moment(data.time).format("YYYYMMDD") * 10000 + data.id |
|
|
moment(data.time).format("YYYYMMDD") * 10000 + data.id |
|
|
@ -91,7 +92,7 @@ const DetailForm = (props) => { |
|
|
</div> |
|
|
</div> |
|
|
}) : '暂无图片' |
|
|
}) : '暂无图片' |
|
|
} |
|
|
} |
|
|
</div> : obj.name != 'videoUrl' ? <div style={{ width: '70%', display: 'flex', position: 'relative', flexWrap: 'wrap' }}> |
|
|
</div> : obj.name != 'videoUrl' ? <div style={{ width: '60%', display: 'flex', position: 'relative', flexWrap: 'wrap' }}> |
|
|
<Input style={{ width: '100%' }} disabled value={data[obj.name] + '-' + data['roadSectionEnd']} /> |
|
|
<Input style={{ width: '100%' }} disabled value={data[obj.name] + '-' + data['roadSectionEnd']} /> |
|
|
|
|
|
|
|
|
</div> : <div style={{ width: '70%', display: 'flex', position: 'relative', flexWrap: 'wrap' }}> |
|
|
</div> : <div style={{ width: '70%', display: 'flex', position: 'relative', flexWrap: 'wrap' }}> |
|
|
@ -217,13 +218,13 @@ const DetailList = (props) => { |
|
|
dataIndex: 'projectType', |
|
|
dataIndex: 'projectType', |
|
|
align: 'center', |
|
|
align: 'center', |
|
|
render: (text, record) => { |
|
|
render: (text, record) => { |
|
|
return record.projectType?.length > 0 ? reportTypeText(text) : (record.codeRoad && record.codeRoad.length > 0) |
|
|
return record.projectType?.length > 0 ? reportTypeText(text) : (record.codeRoad && record.codeRoad.length > 0) |
|
|
? record.codeRoad[0] === 'X' |
|
|
? record.codeRoad[0] === 'X' |
|
|
? '县道' |
|
|
? '县道' |
|
|
: record.codeRoad[0] === 'Y' |
|
|
: record.codeRoad[0] === 'Y' |
|
|
? '乡道' |
|
|
? '乡道' |
|
|
: '村道' |
|
|
: '村道' |
|
|
: '' |
|
|
: '' |
|
|
} |
|
|
} |
|
|
}, { |
|
|
}, { |
|
|
title: '所属道路', |
|
|
title: '所属道路', |
|
|
@ -648,7 +649,7 @@ const MaintenanceTable = (props) => { |
|
|
); |
|
|
); |
|
|
}; |
|
|
}; |
|
|
|
|
|
|
|
|
function mapStateToProps (state) { |
|
|
function mapStateToProps(state) { |
|
|
const { auth, depMessage, userList, reportList, reportDetail, depUser, global, allDepUsers } = state; |
|
|
const { auth, depMessage, userList, reportList, reportDetail, depUser, global, allDepUsers } = state; |
|
|
const pakData = (dep) => { |
|
|
const pakData = (dep) => { |
|
|
return dep.map((d) => { |
|
|
return dep.map((d) => { |
|
|
|
dengyinhuan
2 years ago