瓦斯日报，分站管理修改-提交

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

@@ -10,6 +10,27 @@ 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',
@@ -38,7 +59,7 @@ export const columns: BasicColumn[] = [
                 align: 'center',
               },
               {
-                title: 'o2(%)',
+                title: 'O2(%)',
                 dataIndex: 'o2Night1',
                 key: 'o2Night1',
                 width: 100,
@@ -51,6 +72,7 @@ export const columns: BasicColumn[] = [
                 width: 100,
                 align: 'center',
               },
+
             ],
           },
           {
@@ -112,7 +134,7 @@ export const columns: BasicColumn[] = [
                 align: 'center',
               },
               {
-                title: 'o2(%)',
+                title: 'O2(%)',
                 dataIndex: 'o2Night2',
                 key: 'o2Night2',
                 width: 100,
@@ -162,6 +184,27 @@ export const columns: BasicColumn[] = [
             title: '第一次',
             children: [
               {
+                title: '区队',
+                dataIndex: 'districtTeam_dictText',
+                key: 'districtTeam_dictText',
+                width: 100,
+                align: 'center',
+              },
+              {
+                title: '检测地点',
+                dataIndex: 'strInstallPos',
+                key: 'strInstallPos',
+                width: 120,
+                align: 'center',
+              },
+              {
+                title: '检查工',
+                dataIndex: 'checkPersonEarly',
+                key: 'checkPersonEarly',
+                width: 80,
+                align: 'center',
+              },
+              {
                 title: '检测时间',
                 dataIndex: 'timeEarly1',
                 key: 'timeEarly1',
@@ -191,7 +234,7 @@ export const columns: BasicColumn[] = [
                 align: 'center',
               },
               {
-                title: 'o2(%)',
+                title: 'O2(%)',
                 dataIndex: 'o2Early1',
                 key: 'o2Early1',
                 width: 100,
@@ -265,7 +308,7 @@ export const columns: BasicColumn[] = [
                 align: 'center',
               },
               {
-                title: 'o2(%)',
+                title: 'O2(%)',
                 dataIndex: 'o2Early2',
                 key: 'o2Early2',
                 width: 100,
@@ -315,6 +358,27 @@ 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: 'checkPersonNoon',
+                key: 'checkPersonNoon',
+                width: 80,
+                align: 'center',
+              },
+              {
                 title: '检测时间',
                 dataIndex: 'timeNoon1',
                 key: 'timeNoon1',
@@ -344,7 +408,7 @@ export const columns: BasicColumn[] = [
                 align: 'center',
               },
               {
-                title: 'o2(%)',
+                title: 'O2(%)',
                 dataIndex: 'o2Noon1',
                 key: 'o2Noon1',
                 width: 100,
@@ -418,7 +482,7 @@ export const columns: BasicColumn[] = [
                 align: 'center',
               },
               {
-                title: 'o2(%)',
+                title: 'O2(%)',
                 dataIndex: 'o2Noon2',
                 key: 'o2Noon2',
                 width: 100,

src/views/vent/monitorManager/fireDoorMonitor/fireDoor.threejs.ts

@@ -1,7 +1,7 @@
 import * as THREE from 'three';
 import UseThree from '../../../../utils/threejs/useThree';
 import FireDoor from './fireDoor.threejs.fire';
-import FireDoorF from './fireDoor.threejs.fireF';
+// import FireDoorF from './fireDoor.threejs.fireF';
 import { animateCamera } from '/@/utils/threejs/util';
 import useEvent from '../../../../utils/threejs/useEvent';
 import { useGlobSetting } from '/@/hooks/setting';
@@ -140,7 +140,7 @@ export const mountedThree = () => {
     fireDoor = new FireDoor(model);
     fireDoor.mountedThree();
 
-    fireDoorF = new FireDoorF(model);
+    // fireDoorF = new FireDoorF(model);
     fireDoorF.mountedThree();
     resolve(null);
     setControls();

src/views/vent/safetyList/common/detail.vue

@@ -59,11 +59,11 @@
                                     <div v-for="item in text.split(',')" :key="item">
                                         <span
                                             v-if="item.substring(item.indexOf(':') + 1) && !isNaN(parseFloat(item.substring(item.indexOf(':') + 1)))"
-                                            style="display: inline-block;width: 45%;text-align: right; color:rgb(0, 242, 255);margin-right:5px">{{
+                                            style="display: inline-block;width: 42%;text-align: right; color:rgb(0, 242, 255);margin-right:5px">{{
                                                 item.substring(0, item.indexOf(':') + 1) }}</span>
                                         <span
                                             v-if="item.substring(item.indexOf(':') + 1) && !isNaN(parseFloat(item.substring(item.indexOf(':') + 1)))"
-                                            style="display: inline-block; width:50%;text-align: left; color:#fff">{{
+                                            style="display: inline-block; width:52%;text-align: left; color:#fff">{{
                                                 item.substring(item.indexOf(':') + 1) === '1' ? '正风' :
                                                     item.substring(item.indexOf(':') + 1) === '2' ?
                                                         '反风' : item.substring(item.indexOf(':') + 1) }} </span>

src/views/vent/safetyList/safetyList.data.ts

@@ -17,7 +17,7 @@ export const columns: BasicColumn[] = [
         title: 'Ip地址',
         dataIndex: 'stripC',
         key: 'stripC',
-        width: 80,
+        width: 90,
         align: 'center',
     },
     {
@@ -37,7 +37,7 @@ export const columns: BasicColumn[] = [
         title: '电池容量(%)',
         dataIndex: 'dcrl',
         key: 'dcrl',
-        width: 110,
+        width: 90,
         align: 'center',
     },
     {
@@ -55,13 +55,13 @@ export const columns: BasicColumn[] = [
         align: 'center',
     },
 
-    {
-        title: '时间',
-        dataIndex: 'updateTime',
-        key: 'updateTime',
-        width: 120,
-        align: 'center',
-    },
+    // {
+    //     title: '时间',
+    //     dataIndex: 'updateTime',
+    //     key: 'updateTime',
+    //     width: 120,
+    //     align: 'center',
+    // },
     {
         title: '操作',
         dataIndex: 'action',