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

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

@@ -62,7 +62,7 @@ export const getDefaultSchemas: (dictOptions: any[], deviceOptions: any[]) => Fo
         // },
       },
       colProps: {
-        span: 4,
+        span: 6,
       },
     },
     {
@@ -81,7 +81,7 @@ export const getDefaultSchemas: (dictOptions: any[], deviceOptions: any[]) => Fo
         // },
       },
       colProps: {
-        span: 4,
+        span: 3,
       },
     },
     // {
@@ -140,7 +140,7 @@ export const getDefaultSchemas: (dictOptions: any[], deviceOptions: any[]) => Fo
         ],
       },
       colProps: {
-        span: 4,
+        span: 3,
       },
     },
   ];
@@ -166,7 +166,7 @@ export const defaultTableProps: BasicTableProps = {
 /** 默认的查询表单props，参考 BasicForm 组件 */
 export const defaultFormProps: FormProps = {
   labelAlign: 'left',
-  labelCol: { span: 8 },
+  labelWidth: 80,
   showAdvancedButton: false,
   showSubmitButton: false,
   showResetButton: false,

src/views/vent/monitorManager/comment/HistoryTable.vue

@@ -345,6 +345,7 @@
       tableLayout: 'auto',
       formConfig: {
         labelAlign: 'left',
+        labelWidth: 80,
         showAdvancedButton: false,
         showSubmitButton: false,
         showResetButton: false,
@@ -412,7 +413,7 @@
                     },
                   },
                   colProps: {
-                    span: 4,
+                    span: 5,
                   },
                 },
                 {
@@ -461,7 +462,7 @@
                     ],
                   },
                   colProps: {
-                    span: 4,
+                    span: 3,
                   },
                 },
               ],

src/views/vent/monitorManager/compressor/components/nitrogenHome_bet.vue

@@ -496,7 +496,7 @@
     () => props.deviceId,
     async (deviceId) => {
       if (deviceId) {
-        await getCamera(deviceId, playerRef.value, 'nitrogen');
+        await getCamera(deviceId, playerRef.value);
         getDataSource(props.deviceId, true);
       }
     }
@@ -510,7 +510,7 @@
     await mountedThree().then(() => {
       loading.value = false;
     });
-    await getCamera(props.deviceId, playerRef.value, 'nitrogen');
+    await getCamera(props.deviceId, playerRef.value);
   });
 
   onUnmounted(() => {

src/views/vent/monitorManager/gateMonitor/components/AlarmHistoryTableHj.vue

@@ -33,7 +33,7 @@
     },
     list: {
       type: Function,
-      default: (params) => defHttp.get({ url: '/safety/ventanalyAlarmLog/getHZGateAlarmLog', params }),
+      default: (params) => defHttp.post({ url: '/safety/ventanalyAlarmLog/getHZGateAlarmLog', params }),
     },
   });
 

src/views/vent/monitorManager/nitrogen/nitrogen.dataCc.ts

@@ -51,7 +51,7 @@ export const preMonitorList = [
     code: 'signal',
     child: [
       {
-        title: `加载卸载`,
+        title: `加载`,
         code: `PRE_CPR_LoadorUnload`,
         isWaring: false,
       },
@@ -139,8 +139,8 @@ export const preFanMonitorData = [
 ];
 export const totalData = [
   {
-    title: '总进风管流量',
-    code: 'TotalInPipeFlow',
+    title: '总出风管流量',
+    code: 'TotalOutPipeFlow',
     unit: 'm³/h',
   },
   {