Merge branch 'master' of http://182.92.126.35:3000/hrx/mky-vent-base

src/views/vent/gas/gasReportInspect/gasReportInspect.data.ts

@@ -52,12 +52,12 @@ export const columnsType: BasicColumn[] = [
         key: 'checkPerson',
         align: 'center',
     },  
-    // {
-    //     title: '检查时间',
-    //     dataIndex: 'checkTime',
-    //     key: 'checkTime',
-    //     align: 'center',
-    // },  
+    {
+        title: '检查时间',
+        dataIndex: 'checkTime',
+        key: 'checkTime',
+        align: 'center',
+    },  
 ];
 export const columnsGas1: BasicColumn[] = [
     {

src/views/vent/monitorManager/comment/comment.data.ts

@@ -715,12 +715,12 @@ export const ColumnsReport: BasicColumn[] = [
     key: 'checkPerson',
     align: 'center',
   },
-  // {
-  //   title: '检查时间',
-  //   dataIndex: 'checkTime',
-  //   key: 'checkTime',
-  //   align: 'center',
-  // },
+  {
+    title: '检查时间',
+    dataIndex: 'checkTime',
+    key: 'checkTime',
+    align: 'center',
+  },
   {
     title: '操作',
     dataIndex: 'action',