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

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',
               },
             ],

src/views/vent/home/colliery/components/main-monitor.vue

@@ -26,8 +26,8 @@
     <div class="main-contents">
       <div class="point-des-box">
         <div>工况点</div>
-        <div>负压: {{ `${selectDataObj.dataH}Pa` }}</div>
-        <div>风量: {{ `${(selectDataObj.dataQ * 60).toFixed(2)}m³/min`  }}</div>
+        <div>负压(Pa): {{ selectDataObj.dataH }}</div>
+        <div>风量(m³/min): {{ (selectDataObj.dataQ * 60).toFixed(2)  }}</div>
       </div>
       <div class="main" ref="main"></div>
     </div>

src/views/vent/monitorManager/alarmMonitor/common.data.ts

@@ -108,8 +108,8 @@ export const ventilateTopList = [
     value: null,
     text: '',
     list: [
-      { id: 0, label: 'O₂', value: 0 },
-      { id: 1, label: 'CO', value: 0 },
+      { id: 0, label: 'O₂', value: '--' },
+      { id: 1, label: 'CO', value: '--' },
     ],
   },
 ];

src/views/vent/monitorManager/alarmMonitor/warn/deviceWarn.vue

@@ -2,6 +2,7 @@
   <customHeader :options="options" @change="getSelectRow" :optionValue="optionValue"> 设备监测预警 </customHeader>
   <div class="alarm-modal">
     <a-button
+      v-if="hasPermission('fan:remote')"
       preIcon="ant-design:rollback-outlined"
       type="text"
       size="small"
@@ -55,11 +56,11 @@
   import { useSystemSelect } from '/@/hooks/vent/useSystemSelect';
   import { useRouter } from 'vue-router';
   import { getAssetURL } from '/@/utils/ui';
-
+  import { usePermission } from '/@/hooks/web/usePermission';
   // const props = defineProps({
   //   deviceId: { type: String },
   // });
-
+  const { hasPermission } = usePermission();
   let iconsMonitor = reactive({
     // fanmain: {
     //   url: getAssetURL('home-container/device/zhushan.png'),

src/views/vent/monitorManager/alarmMonitor/warn/dustWarn.vue

@@ -3,6 +3,7 @@
   <div class="dustWarn">
     <div class="top-dust">
       <a-button
+       v-if="hasPermission('fan:remote')"
         preIcon="ant-design:rollback-outlined"
         type="text"
         size="small"
@@ -80,7 +81,9 @@
   import { useSystemSelect } from '/@/hooks/vent/useSystemSelect';
   import { useRouter } from 'vue-router';
   import CustomHeader from '/@/components/vent/customHeader.vue';
-
+  import { usePermission } from '/@/hooks/web/usePermission';
+  
+  const { hasPermission } = usePermission();
   const { options, optionValue, getSelectRow, getSysDataSource } = useSystemSelect('sys_surface_caimei'); // 参数为场景类型（设备类型管理中可以查询到）
   //左侧数据列表
   let menuList = reactive<any[]>([]);

src/views/vent/monitorManager/alarmMonitor/warn/fireWarn.vue

@@ -2,6 +2,7 @@
   <customHeader :options="options" @change="getSelectRow" :optionValue="optionValue"> 火灾监测预警 </customHeader>
   <div class="fireWarn">
     <a-button
+     v-if="hasPermission('fan:remote')"
       preIcon="ant-design:rollback-outlined"
       type="text"
       size="small"
@@ -36,7 +37,9 @@
   import { useGlobSetting } from '/@/hooks/setting';
   import { useRouter } from 'vue-router';
   import CustomHeader from '/@/components/vent/customHeader.vue';
-
+  import { usePermission } from '/@/hooks/web/usePermission';
+  
+  const { hasPermission } = usePermission();
   const { options, optionValue, getSelectRow, getSysDataSource } = useSystemSelect('sys_surface_caimei'); // 参数为场景类型（设备类型管理中可以查询到）
   //当前加载组件
   let currentLoad = ref('');

src/views/vent/monitorManager/alarmMonitor/warn/gasWarn.vue

@@ -2,6 +2,7 @@
   <customHeader :options="options" @change="getSelectRow" :optionValue="optionValue"> 瓦斯监测预警 </customHeader>
   <div class="gasWarn">
     <a-button
+     v-if="hasPermission('fan:remote')"
       preIcon="ant-design:rollback-outlined"
       type="text"
       size="small"
@@ -112,7 +113,9 @@
   import warnTargetGas from '../common/warnTargetGas.vue';
   import gasParamter from '../common/gasParamter.vue';
   import { typeMenuListGas } from '../common.data';
-
+  import { usePermission } from '/@/hooks/web/usePermission';
+  
+  const { hasPermission } = usePermission();
   const { options, optionValue, getSelectRow, getSysDataSource } = useSystemSelect('sys_surface_caimei'); // 参数为场景类型（设备类型管理中可以查询到）
   //当前左侧激活菜单的索引
   let activeIndex1 = ref(0);

src/views/vent/monitorManager/alarmMonitor/warn/ventilateWarn.vue

@@ -3,6 +3,7 @@
   <div class="ventilateWarn">
     <div class="ventilate-top">
       <a-button
+      v-if="hasPermission('fan:remote')"
         preIcon="ant-design:rollback-outlined"
         type="text"
         size="small"
@@ -37,7 +38,7 @@
               <div class="value">
                 <div class="content-box" v-for="(items, ind) in item.list" :key="ind">
                   <span style="color: #b3b8cc">{{ `${items.label} :` }}</span>
-                  <span style="color: #3df6ff; margin-left: 10px">{{ `${items.value}%` }}</span>
+                  <span style="color: #3df6ff; margin-left: 10px">{{ items.value }}</span>
                 </div>
               </div>
             </div>
@@ -91,7 +92,9 @@
   import { ventilateTopList } from '../common.data';
   import CustomHeader from '/@/components/vent/customHeader.vue';
   import echartLine from '../common/echartLine.vue';
+  import { usePermission } from '/@/hooks/web/usePermission';
 
+  const { hasPermission } = usePermission();
   const { options, optionValue, getSelectRow, getSysDataSource } = useSystemSelect('sys_surface_caimei'); // 参数为场景类型（设备类型管理中可以查询到）
   let router = useRouter();
   //左侧数据列表

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

@@ -678,6 +678,7 @@ async function getStationList1() {
     res.forEach(el => {
         el.key = el.id
         el.linkIdC = el.linkId || ''
+        el.stripC=el.strip  || ''
         el.linkstatusC = el.linkstatus ? '连接' : '断开'
         el.gdmsC = el.gdms == '1' ? '直流供电' : el.gdms == '0' ? '交流供电' : ''
         // el.debugTitle = '调试'
@@ -685,6 +686,7 @@ async function getStationList1() {
         el.children.forEach(v => {
             v.key = v.id
             v.debugTitle = '调试'
+            v.stripC=v.strserno || ''
             v.linkstatusC = v.netStatus ? '连接' : '断开'
             v.linkIdC = v.linkId == '0' ? '未启用' : v.linkId == '1' ? '启用' : v.linkId == '2' ? '设备异常' : ''
             v.updateTime = v.time

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

@@ -14,6 +14,13 @@ export const columns: BasicColumn[] = [
         align: 'center',
     },
     {
+        title: 'Ip地址',
+        dataIndex: 'stripC',
+        key: 'stripC',
+        width: 80,
+        align: 'center',
+    },
+    {
         title: '监测值',
         dataIndex: 'valueJc',
         key: 'valueJc',