Merge branch 'master' of https://gitea.anxinyun.cn/free-sun/Inspection

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

@@ -95,7 +95,7 @@ const PatrolRecord = (props) => {
         dataIndex: 'describe',
         showInDetail: true,
         key: 'describe',
-        render: (text, record, index) => moment(record.lastInspectionTime).format('YYYY-MM-DD HH:mm:ss') || '--'
+        render: (text, record, index) => record.lastInspectionTime ? moment(record.lastInspectionTime).format('YYYY-MM-DD HH:mm:ss') : '--'
     }, {
         title: '本次巡检日期',
         dataIndex: 'describe',
@@ -217,8 +217,8 @@ const PatrolRecord = (props) => {
                             dataArr.push(
                                 <>
                                     <Row>
-                                        <Col span={4} style={{}}>{k} ：</Col>
-                                        <Col span={20}>
+                                        <Col span={5} style={{}}>{k} ：</Col>
+                                        <Col span={19}>
                                             {
                                                 inspectContent[k].isNormal ? '正常' :
                                                     <Collapse ghost style={{ padding: 0 }}>