diff --git a/web/client/src/sections/fillion/components/maintenanceTable.js b/web/client/src/sections/fillion/components/maintenanceTable.js index c98ed09a..a1cbe2b4 100644 --- a/web/client/src/sections/fillion/components/maintenanceTable.js +++ b/web/client/src/sections/fillion/components/maintenanceTable.js @@ -73,8 +73,10 @@ const DetailForm = (props) => { obj.name == 'id' ? moment(data.time).format("YYYYMMDD") * 10000 + data.id : - obj.name == 'projectType' || obj.name == 'reportType' ? - reportTypeText(data[obj.name]) : obj.name == 'inspectionNoException' ? changeBoolean(data[obj.name]) : + obj.name === 'projectType' ? + reportTypeText(data[obj.name]) + : 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/components/patrolTable.js b/web/client/src/sections/fillion/components/patrolTable.js index 745e41fa..35e7cd56 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 }, @@ -60,7 +60,7 @@ const DetailForm = (props) => { { key: '路线名称', name: 'road', skip: !isPatrol }, { key: '巡查路段', name: 'roadSectionStart', skip: !isPatrol }, { key: '具体位置', name: 'address', skip: !isPatrol }, - { key: '是否有异常', name: 'inspectionNoException', skip: !isPatrol }, + { key: '巡查结果无异常', name: 'inspectionNoException', skip: !isPatrol }, // insectionNoException { key: '路面损坏', name: 'roadDamage', skip: !isPatrol }, { key: '安防损坏', name: 'securityDamage', skip: !isPatrol }, @@ -113,7 +113,9 @@ const DetailForm = (props) => { moment(data.time).format("YYYYMMDD") * 10000 + data.id : obj.name === 'projectType' ? + reportTypeText(data[obj.name]) + // : obj.name === 'inspectionNoException' ? changeBoolean(data[]) : obj.name === 'reportType' ? data['codeRoad'] && data['codeRoad'].length ? data['codeRoad'][0] === 'X' ? '县道' : data['codeRoad'][0] === 'Y' ? '乡道' : '村道' : '' : data[obj.name] diff --git a/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js b/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js index d70e1bd6..3e1b430f 100644 --- a/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js +++ b/web/client/src/sections/fillion/containers/maintenanceSpotCheck.js @@ -116,7 +116,7 @@ const DetailForm = (props) => { data[obj.name] && data[obj.name] instanceof Array ? data[obj.name].map(videoUrl => { return