瓦斯日报列表修改-提交

src/views/vent/gas/gasReport/gas-report.data.ts

@@ -10,135 +10,90 @@ export const columns: BasicColumn[] = [
             title: '第一次',
             children: [
               {
-                title: '区队',
-                dataIndex: 'districtTeam',
-                key: 'districtTeam',
-                width: 100,
-                align: 'center',
-              },
-              {
-                title: '检测地点',
-                dataIndex: 'strInstallPos',
-                key: 'strInstallPos',
-                width: 120,
-                align: 'center',
-              },
-              {
-                title: '检查工',
-                dataIndex: 'checkPersonNight',
-                key: 'checkPersonNight',
-                width: 80,
-                align: 'center',
-              },
-              {
                 title: '检测时间',
                 dataIndex: 'timeNight1',
                 key: 'timeNight1',
-                width: 100,
-                align: 'center',
-              },
-              {
-                title: '温度',
-                dataIndex: 'tNight1',
-                key: 'tNight1',
-                width: 80,
-                align: 'center',
-              },
-              {
-                title: '便携仪',
-                dataIndex: 'bxySdzNight1',
-                key: 'bxySdzNight1',
-                width: 80,
-                align: 'center',
-              },
-              {
-                title: '光瓦',
-                dataIndex: 'gwSdzNight1',
-                key: 'gwSdzNight1',
-                width: 80,
-                align: 'center',
-              },
-              {
-                title: '甲烷传感器',
-                dataIndex: 'jwSdzNight1',
-                key: 'jwSdzNight1',
-                width: 80,
+                width: 120,
                 align: 'center',
               },
               {
                 title: 'CH4(%)',
                 dataIndex: 'ch4Night1',
                 key: 'ch4Night1',
-                width: 60,
+                width: 100,
                 align: 'center',
               },
-
               {
                 title: 'CO2(%)',
                 dataIndex: 'co2Night1',
                 key: 'co2Night1',
-                width: 60,
+                width: 100,
                 align: 'center',
               },
               {
                 title: 'CO(ppm)',
                 dataIndex: 'coNight1',
                 key: 'coNight1',
-                width: 60,
+                width: 100,
                 align: 'center',
               },
               {
                 title: 'o2(%)',
                 dataIndex: 'o2Night1',
                 key: 'o2Night1',
-                width: 60,
+                width: 100,
+                align: 'center',
+              },
+              {
+                title: 'T(℃)',
+                dataIndex: 'tNight1',
+                key: 'tNight1',
+                width: 100,
                 align: 'center',
               },
             ],
           },
           {
-            title: '第二次',
+            title: '三对照',
             children: [
               {
-                title: '检测时间',
-                dataIndex: 'timeNight2',
-                key: 'timeNight2',
+                title: '甲烷传感器(%)',
+                dataIndex: 'jwSdzNight1',
+                key: 'jwSdzNight1',
                 width: 100,
                 align: 'center',
               },
               {
-                title: '温度',
-                dataIndex: 'tNight2',
-                key: 'tNight2',
-                width: 80,
-                align: 'center',
-              },
-              {
-                title: '便携仪',
-                dataIndex: 'bxySdzNight2',
-                key: 'bxySdzNight2',
-                width: 80,
+                title: '光瓦测量数据(%)',
+                dataIndex: 'gwSdzNight1',
+                key: 'gwSdzNight1',
+                width: 100,
                 align: 'center',
               },
               {
-                title: '光瓦',
-                dataIndex: 'gwSdzNight2',
-                key: 'gwSdzNight2',
-                width: 80,
+                title: '便携仪测量数据(%)',
+                dataIndex: 'bxySdzNight1',
+                key: 'bxySdzNight1',
+                width: 100,
                 align: 'center',
               },
+            ],
+          },
+          {
+            title: '第二次',
+            children: [
               {
-                title: '甲烷传感器',
-                dataIndex: 'jwSdzNight2',
-                key: 'jwSdzNight2',
-                width: 80,
+                title: '检测时间',
+                dataIndex: 'timeNight2',
+                key: 'timeNight2',
+                width: 120,
                 align: 'center',
               },
               {
                 title: 'CH4(%)',
                 dataIndex: 'ch4Night2',
                 key: 'ch4Night2',
-                width: 60,
+                width: 100,
                 align: 'center',
               },
 
@@ -146,94 +101,78 @@ export const columns: BasicColumn[] = [
                 title: 'CO2(%)',
                 dataIndex: 'co2Night2',
                 key: 'co2Night2',
-                width: 60,
+                width: 100,
                 align: 'center',
               },
               {
                 title: 'CO(ppm)',
                 dataIndex: 'coNight2',
                 key: 'coNight2',
-                width: 60,
+                width: 100,
                 align: 'center',
               },
               {
                 title: 'o2(%)',
                 dataIndex: 'o2Night2',
                 key: 'o2Night2',
-                width: 60,
+                width: 100,
+                align: 'center',
+              },
+              {
+                title: 'T(℃)',
+                dataIndex: 'tNight2',
+                key: 'tNight2',
+                width: 100,
                 align: 'center',
               },
             ],
           },
-        ],
-      },
-      {
-        title: '早班',
-        children: [
           {
-            title: '第一次',
+            title: '三对照',
             children: [
               {
-                title: '区队',
-                dataIndex: 'districtTeam_dictText',
-                key: 'districtTeam_dictText',
+                title: '甲烷传感器(%)',
+                dataIndex: 'jwSdzNight2',
+                key: 'jwSdzNight2',
                 width: 100,
                 align: 'center',
               },
               {
-                title: '检测地点',
-                dataIndex: 'strInstallPos',
-                key: 'strInstallPos',
-                width: 120,
+                title: '光瓦测量数据(%)',
+                dataIndex: 'gwSdzNight2',
+                key: 'gwSdzNight2',
+                width: 100,
                 align: 'center',
               },
               {
-                title: '检查工',
-                dataIndex: 'checkPersonEarly',
-                key: 'checkPersonEarly',
-                width: 80,
+                title: '便携仪测量数据(%)',
+                dataIndex: 'bxySdzNight2',
+                key: 'bxySdzNight2',
+                width: 100,
                 align: 'center',
               },
+            ],
+          },
+        ],
+      },
+      {
+        title: '早班',
+        children: [
+          {
+            title: '第一次',
+            children: [
               {
                 title: '检测时间',
                 dataIndex: 'timeEarly1',
                 key: 'timeEarly1',
-                width: 100,
-                align: 'center',
-              },
-              {
-                title: '温度',
-                dataIndex: 'tEarly1',
-                key: 'tEarly1',
-                width: 80,
-                align: 'center',
-              },
-              {
-                title: '便携仪',
-                dataIndex: 'bxySdzEarly1',
-                key: 'bxySdzEarly1',
-                width: 80,
-                align: 'center',
-              },
-              {
-                title: '光瓦',
-                dataIndex: 'gwSdzEarly1',
-                key: 'gwSdzEarly1',
-                width: 80,
-                align: 'center',
-              },
-              {
-                title: '甲烷传感器',
-                dataIndex: 'jwSdzEarly1',
-                key: 'jwSdzEarly1',
-                width: 80,
+                width: 120,
                 align: 'center',
               },
               {
                 title: 'CH4(%)',
                 dataIndex: 'ch4Early1',
                 key: 'ch4Early1',
-                width: 60,
+                width: 100,
                 align: 'center',
               },
 
@@ -241,68 +180,73 @@ export const columns: BasicColumn[] = [
                 title: 'CO2(%)',
                 dataIndex: 'co2Early1',
                 key: 'co2Early1',
-                width: 60,
+                width: 100,
                 align: 'center',
               },
               {
                 title: 'CO(ppm)',
                 dataIndex: 'coEarly1',
                 key: 'coEarly1',
-                width: 65,
+                width: 100,
                 align: 'center',
               },
               {
                 title: 'o2(%)',
                 dataIndex: 'o2Early1',
                 key: 'o2Early1',
-                width: 60,
+                width: 100,
+                align: 'center',
+              },
+              {
+                title: 'T(℃)',
+                dataIndex: 'tEarly1',
+                key: 'tEarly1',
+                width: 100,
                 align: 'center',
               },
             ],
           },
           {
-            title: '第二次',
+            title: '三对照',
             children: [
               {
-                title: '检测时间',
-                dataIndex: 'timeEarly2',
-                key: 'timeEarly2',
+                title: '甲烷传感器(%)',
+                dataIndex: 'jwSdzEarly1',
+                key: 'jwSdzEarly1',
                 width: 100,
                 align: 'center',
               },
               {
-                title: '温度',
-                dataIndex: 'tEarly2',
-                key: 'tEarly2',
-                width: 80,
-                align: 'center',
-              },
-              {
-                title: '便携仪',
-                dataIndex: 'bxySdzEarly2',
-                key: 'bxySdzEarly2',
-                width: 80,
+                title: '光瓦测量数据(%)',
+                dataIndex: 'gwSdzEarly1',
+                key: 'gwSdzEarly1',
+                width: 100,
                 align: 'center',
               },
               {
-                title: '光瓦',
-                dataIndex: 'gwSdzEarly2',
-                key: 'gwSdzEarly2',
-                width: 80,
+                title: '便携仪测量数据(%)',
+                dataIndex: 'bxySdzEarly1',
+                key: 'bxySdzEarly1',
+                width: 100,
                 align: 'center',
               },
+            ],
+          },
+          {
+            title: '第二次',
+            children: [
               {
-                title: '甲烷传感器',
-                dataIndex: 'jwSdzEarly2',
-                key: 'jwSdzEarly2',
-                width: 80,
+                title: '检测时间',
+                dataIndex: 'timeEarly2',
+                key: 'timeEarly2',
+                width: 120,
                 align: 'center',
               },
               {
                 title: 'CH4(%)',
                 dataIndex: 'ch4Early2',
                 key: 'ch4Early2',
-                width: 60,
+                width: 100,
                 align: 'center',
               },
 
@@ -310,94 +254,78 @@ export const columns: BasicColumn[] = [
                 title: 'CO2(%)',
                 dataIndex: 'co2Early2',
                 key: 'co2Early2',
-                width: 60,
+                width: 100,
                 align: 'center',
               },
               {
                 title: 'CO(ppm)',
                 dataIndex: 'coEarly2',
                 key: 'coEarly2',
-                width: 60,
+                width: 100,
                 align: 'center',
               },
               {
                 title: 'o2(%)',
                 dataIndex: 'o2Early2',
                 key: 'o2Early2',
-                width: 60,
+                width: 100,
+                align: 'center',
+              },
+              {
+                title: 'T(℃)',
+                dataIndex: 'tEarly2',
+                key: 'tEarly2',
+                width: 100,
                 align: 'center',
               },
             ],
           },
-        ],
-      },
-      {
-        title: '中班',
-        children: [
           {
-            title: '第一次',
+            title: '三对照',
             children: [
               {
-                title: '区队',
-                dataIndex: 'districtTeam',
-                key: 'districtTeam',
+                title: '甲烷传感器(%)',
+                dataIndex: 'jwSdzEarly2',
+                key: 'jwSdzEarly2',
                 width: 100,
                 align: 'center',
               },
               {
-                title: '检测地点',
-                dataIndex: 'strInstallPos',
-                key: 'strInstallPos',
-                width: 120,
+                title: '光瓦测量数据(%) ',
+                dataIndex: 'gwSdzEarly2',
+                key: 'gwSdzEarly2',
+                width: 100,
                 align: 'center',
               },
               {
-                title: '检查工',
-                dataIndex: 'checkPersonNoon',
-                key: 'checkPersonNoon',
-                width: 80,
+                title: '便携仪测量数据(%)',
+                dataIndex: 'bxySdzEarly2',
+                key: 'bxySdzEarly2',
+                width: 100,
                 align: 'center',
               },
+            ],
+          },
+        ],
+      },
+      {
+        title: '中班',
+        children: [
+          {
+            title: '第一次',
+            children: [
               {
                 title: '检测时间',
                 dataIndex: 'timeNoon1',
                 key: 'timeNoon1',
-                width: 100,
-                align: 'center',
-              },
-              {
-                title: '温度',
-                dataIndex: 'tNoon1',
-                key: 'tNoon1',
-                width: 80,
-                align: 'center',
-              },
-              {
-                title: '便携仪',
-                dataIndex: 'bxySdzNoon1',
-                key: 'bxySdzNoon1',
-                width: 80,
-                align: 'center',
-              },
-              {
-                title: '光瓦',
-                dataIndex: 'gwSdzNoon1',
-                key: 'gwSdzNoon1',
-                width: 80,
-                align: 'center',
-              },
-              {
-                title: '甲烷传感器',
-                dataIndex: 'jwSdzNoon1',
-                key: 'jwSdzNoon1',
-                width: 80,
+                width: 120,
                 align: 'center',
               },
               {
                 title: 'CH4(%)',
                 dataIndex: 'ch4Noon1',
                 key: 'ch4Noon1',
-                width: 60,
+                width: 100,
                 align: 'center',
               },
 
@@ -405,68 +333,73 @@ export const columns: BasicColumn[] = [
                 title: 'CO2(%)',
                 dataIndex: 'co2Noon1',
                 key: 'co2Noon1',
-                width: 60,
+                width: 100,
                 align: 'center',
               },
               {
                 title: 'CO(ppm)',
                 dataIndex: 'coNoon1',
                 key: 'coNoon1',
-                width: 60,
+                width: 100,
                 align: 'center',
               },
               {
                 title: 'o2(%)',
                 dataIndex: 'o2Noon1',
                 key: 'o2Noon1',
-                width: 60,
+                width: 100,
+                align: 'center',
+              },
+              {
+                title: 'T(℃)',
+                dataIndex: 'tNoon1',
+                key: 'tNoon1',
+                width: 100,
                 align: 'center',
               },
             ],
           },
           {
-            title: '第二次',
+            title: '三对照',
             children: [
               {
-                title: '检测时间',
-                dataIndex: 'timeNoon2',
-                key: 'timeNoon2',
+                title: '甲烷传感器(%)',
+                dataIndex: 'jwSdzNoon1',
+                key: 'jwSdzNoon1',
                 width: 100,
                 align: 'center',
               },
               {
-                title: '温度',
-                dataIndex: 'tNoon2',
-                key: 'tNoon2',
-                width: 80,
-                align: 'center',
-              },
-              {
-                title: '便携仪',
-                dataIndex: 'bxySdzNoon2',
-                key: 'bxySdzNoon2',
-                width: 80,
+                title: '光瓦测量数据(%)',
+                dataIndex: 'gwSdzNoon1',
+                key: 'gwSdzNoon1',
+                width: 100,
                 align: 'center',
               },
               {
-                title: '光瓦',
-                dataIndex: 'gwSdzNoon2',
-                key: 'gwSdzNoon2',
-                width: 80,
+                title: '便携仪测量数据(%)',
+                dataIndex: 'bxySdzNoon1',
+                key: 'bxySdzNoon1',
+                width: 100,
                 align: 'center',
               },
+            ],
+          },
+          {
+            title: '第二次',
+            children: [
               {
-                title: '甲烷传感器',
-                dataIndex: 'jwSdzNoon2',
-                key: 'jwSdzNoon2',
-                width: 80,
+                title: '检测时间',
+                dataIndex: 'timeNoon2',
+                key: 'timeNoon2',
+                width: 120,
                 align: 'center',
               },
               {
                 title: 'CH4(%)',
                 dataIndex: 'ch4Noon2',
                 key: 'ch4Noon2',
-                width: 60,
+                width: 100,
                 align: 'center',
               },
 
@@ -474,21 +407,54 @@ export const columns: BasicColumn[] = [
                 title: 'CO2(%)',
                 dataIndex: 'co2Noon2',
                 key: 'co2Noon2',
-                width: 60,
+                width: 100,
                 align: 'center',
               },
               {
                 title: 'CO(ppm)',
                 dataIndex: 'coNoon2',
                 key: 'coNoon2',
-                width: 60,
+                width: 100,
                 align: 'center',
               },
               {
                 title: 'o2(%)',
                 dataIndex: 'o2Noon2',
                 key: 'o2Noon2',
-                width: 60,
+                width: 100,
+                align: 'center',
+              },
+              {
+                title: 'T(℃)',
+                dataIndex: 'tNoon2',
+                key: 'tNoon2',
+                width: 100,
+                align: 'center',
+              },
+            ],
+          },
+          {
+            title: '三对照',
+            children: [
+              {
+                title: '甲烷传感器(%)',
+                dataIndex: 'jwSdzNoon2',
+                key: 'jwSdzNoon2',
+                width: 100,
+                align: 'center',
+              },
+              {
+                title: '光瓦测量数据(%)',
+                dataIndex: 'gwSdzNoon2',
+                key: 'gwSdzNoon2',
+                width: 100,
+                align: 'center',
+              },
+              {
+                title: '便携仪测量数据(%)',
+                dataIndex: 'bxySdzNoon2',
+                key: 'bxySdzNoon2',
+                width: 100,
                 align: 'center',
               },
             ],