(*)主动上报巡检功能调整

web/client/src/sections/issueHandle/containers/patrolRecord.js

@@ -119,7 +119,7 @@ const PatrolRecord = (props) => {
             dataIndex: 'source',
             key: 'source',
             showInDetail: true,
-            render: (text, record, index) => '巡检上报' //暂定巡检上报 后续会增加平台录入
+            render: (text, record, index) => record?.patrolPlanId == -1 ? '主动上报' : '巡检上报' //暂定巡检上报 后续会增加平台录入
         },
         {
             title: '严重等级',

web/client/src/sections/patrolManage/containers/patrolRecord.js

@@ -43,7 +43,7 @@ const PatrolRecord = (props) => {
         width: '10%',
         showInDetail: true,
         render: (text, record, index) => {
-            return !record.points?.project ? '' : <div>{record.points.project.name}</div>
+            return !record.points?.project ? '--' : <div>{record.points.project.name}</div>
         }
     }, {
         title: '巡检计划',
@@ -52,7 +52,7 @@ const PatrolRecord = (props) => {
         width: '10%',
         showInDetail: true,
         render: (text, record, index) => {
-            return !record.patrolPlan ? '' : <div>{record.patrolPlan.name}</div>
+            return !record.patrolPlan ? '--' : <div>{record?.patrolPlan?.name || '-'}</div>
         }
     }, {
         title: '巡检点位',
@@ -61,7 +61,7 @@ const PatrolRecord = (props) => {
         showInDetail: true,
         width: '10%',
         render: (text, record, index) => {
-            return !record.points?.user ? '' : <div>{record.points.itemData.name}</div>
+            return !record.points?.user ? '--' : <div>{record.points.itemData.name}</div>
         }
     }, {
         title: '巡检人',
@@ -70,7 +70,7 @@ const PatrolRecord = (props) => {
         showInDetail: true,
         width: '10%',
         render: (text, record, index) => {
-            return !record.points?.user ? '' : <div>{record.points.user.name}</div>
+            return !record.points?.user ? '--' : <div>{record.points.user.name}</div>
         }
     }, {
         title: '巡检单位',
@@ -79,7 +79,7 @@ const PatrolRecord = (props) => {
         key: 'type',
         width: '10%',
         render: (text, record, index) => {
-            return !record.points?.user ? '' : <div>{record.points.user.department.name}</div>
+            return !record.points?.user ? '--' : <div>{record.points.user.department.name}</div>
         }
     }, {
         title: '巡检频次',
@@ -88,7 +88,7 @@ const PatrolRecord = (props) => {
         showInDetail: true,
         width: '10%',
         render: (text, record, index) => {
-            return !record.points ? '' : <div>{record.points.frequency}</div>
+            return !record.points ? '--' : <div>{record.points.frequency || '-'}</div>
         }
     }, {
         title: '上次巡检日期',