diff --git a/web/client/src/sections/fillion/components/patrolTable.js b/web/client/src/sections/fillion/components/patrolTable.js index 52261a1c..745e41fa 100644 --- a/web/client/src/sections/fillion/components/patrolTable.js +++ b/web/client/src/sections/fillion/components/patrolTable.js @@ -42,8 +42,8 @@ const DetailForm = (props) => { const keyList = [ // { key: '编号', name: 'id' }, // isPatrol ?'巡查管理详情' :isRoad ? '建设上报详情' : '异常反馈详情' - { key: '工程类型', name: 'projectType', skip: isPatrol }, - { key: '反馈类型', name: 'projectType', skip: !isAnomaly }, + //{ key: '工程类型', name: 'projectType', skip: isPatrol }, + //{ key: '反馈类型', name: 'projectType', skip: !isAnomaly }, { key: '工程名称', name: 'projectName', skip: !isRoad }, { key: '所在路段', name: 'road', skip: isPatrol }, { key: '具体位置', name: 'address', skip: isPatrol }, @@ -54,6 +54,7 @@ const DetailForm = (props) => { { key: '处理图片', name: 'handlePic', skip: !isAnomaly }, { key: '处理人', name: 'performerName', skip: !isAnomaly }, + { key: '道路类型', name: 'reportType', skip: !isPatrol }, { key: '其他', name: 'projectType', skip: !isPatrol }, { key: '路线名称', name: 'road', skip: !isPatrol }, @@ -111,10 +112,10 @@ const DetailForm = (props) => { obj.name == 'id' ? moment(data.time).format("YYYYMMDD") * 10000 + data.id : - obj.name == 'reportType' ? + obj.name === 'projectType' ? reportTypeText(data[obj.name]) - : obj.name == 'projectType' && data['codeRoad'] ? data['codeRoad'][0] === 'X' ? '县道' - : data['codeRoad'][0] === 'Y' ? '乡道' : '村道' : + : obj.name === 'reportType' ? data['codeRoad'] && data['codeRoad'].length ? data['codeRoad'][0] === 'X' ? '县道' + : data['codeRoad'][0] === 'Y' ? '乡道' : '村道' : '' : data[obj.name] } disabled diff --git a/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js b/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js index 777488a0..d70e1bd6 100644 --- a/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js +++ b/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js @@ -36,8 +36,8 @@ const DetailForm = (props) => { } const keyList = [ { key: '路线代码', name: 'codeRoad' }, - { key: '其他', name: 'reportType' }, - { key: '道路类型', name: 'projectType' }, + { key: '其他', name: 'projectType' }, + { key: '道路类型', name: 'reportType' }, { key: '路线名称', name: 'road' }, { key: '养护路段', name: 'roadSectionStart' }, { key: '具体位置', name: 'address' },