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

public/js/config.js

@@ -3,8 +3,8 @@ const VUE_APP_URL = {
   webRtcUrl: '/webRtc' // rtsp服务器IP地址
 }
 const History_Type = {
-  // type: 'remote', // remote、vent  (remote 代表的是历史查询走的装备院的接口，vent是走的咱们的，目前神东的项目都用remote, 其他矿用vent)
-  type: 'vent', // remote、vent
+  type: 'remote', // remote、vent  (remote 代表的是历史查询走的装备院的接口，vent是走的咱们的，目前神东的项目都用remote, 其他矿用vent)
+  // type: 'vent', // remote、vent
   deviceType: []
 }
 

src/views/vent/home/billboard/billboard.api.ts

@@ -1,3 +1,4 @@
+import { queryDepartTreeSync } from '/@/api/common/api';
 import { useUserStore } from '/@/store/modules/user';
 import { defHttp } from '/@/utils/http/axios';
 
@@ -12,86 +13,87 @@ enum Api {
  * @param params
  */
 export const getSummary = () =>
-  Promise.resolve({
-    dustInfo: {
-      //矿井粉尘风险信息
-      totalNum: 8,
-      dustTypeList: [
-        {
-          deviceType: 'dusting_auto', //设备类型编码
-          warnLevel: 0, //状态（0或者101：低风险、102：一般风险、103：较大风险、104：重大风险、201：报警、1001：网络断开）
-          num: 8, //监测数量
-          typeName: '粉尘传感器', //设备类型名称
-        },
-      ],
-      dustWarnLevel: 0, //矿井粉尘风险性等级
-    },
-    fileServerInfo: {
-      //文件共享中心
-      totalNum: 29, //文档总数
-      approvalNum: 0, //待审批文档
-    },
-    fireInfo: {
-      //矿井火灾风险数据
-      tempMax: 0, //矿井温度传感器最高温度
-      fireWarnLevel: 0, //矿井火灾风险等级
-      coSensorInfo: 0, //矿井CO传感器报警等级
-      bundletubeInfo: 0, //矿井束管监测报警等级
-      smokeSensorInfo: 0, //矿井烟雾传感器报警等级
-      fiberInfo: 0, //矿井光纤测温系统报警等级
-      tempSensorInfo: 0, //矿井温度传感器报警等级
-    },
-    gasInfo: {
-      //瓦斯风险信息
-      gasWarnLevel: 0, //瓦斯风险等级
-      gasTypeList: [
-        {
-          warnLevel: 0, //当前状态
-          num: 2, //监测数量
-          typeName: '瓦斯抽采泵站', //设备类型名称
-        },
-        {
-          warnLevel: 0,
-          num: 1,
-          typeName: '瓦斯巡检',
-        },
-        {
-          warnLevel: 0,
-          num: 2,
-          typeName: '瓦斯巡检',
-        },
-      ],
-    },
-    ventInfo: {
-      //通风系统信息
-      totallength: 1562.35, //矿井巷道总长度
-      zonghuifeng: '25881.74', //总回风
-      fanMainList: [
-        {
-          sqzlfb: '31.0%-29.0%-40.0%', //三区阻力分布
-          strname: '2号回风立井', //风机名称
-          strinstallpos: '2号回风立井', //安装位置
-          Fan1m3: '12465.84', //1号风机风量
-          Fan2m3: '12493.72', //2号风机风量
-          FanFreqHz: '225', //风机频率
-        },
-        {
-          sqzlfb: '42.0%-37.0%-21.0%',
-          strname: '1号回风斜井',
-          strinstallpos: '1号回风斜井',
-          Fan1m3: '13419.83',
-          Fan2m3: '13415.9',
-          FanFreqHz: '225',
-        },
-      ],
-      xufengliang: 15065, //总需风量
-      zongjinfeng: '24987.25', //总进风
+  defHttp.post({
+    url: Api.getSummary,
+    params: {
+      userName: store.userInfo?.username,
     },
   });
-// defHttp.post({
-//   url: Api.getSummary,
-//   params: {
-//     userName: store.userInfo?.username,
+
+// Promise.resolve({
+//   dustInfo: {
+//     //矿井粉尘风险信息
+//     totalNum: 8,
+//     dustTypeList: [
+//       {
+//         deviceType: 'dusting_auto', //设备类型编码
+//         warnLevel: 0, //状态（0或者101：低风险、102：一般风险、103：较大风险、104：重大风险、201：报警、1001：网络断开）
+//         num: 8, //监测数量
+//         typeName: '粉尘传感器', //设备类型名称
+//       },
+//     ],
+//     dustWarnLevel: 0, //矿井粉尘风险性等级
+//   },
+//   fileServerInfo: {
+//     //文件共享中心
+//     totalNum: 29, //文档总数
+//     approvalNum: 0, //待审批文档
+//   },
+//   fireInfo: {
+//     //矿井火灾风险数据
+//     tempMax: 0, //矿井温度传感器最高温度
+//     fireWarnLevel: 0, //矿井火灾风险等级
+//     coSensorInfo: 0, //矿井CO传感器报警等级
+//     bundletubeInfo: 0, //矿井束管监测报警等级
+//     smokeSensorInfo: 0, //矿井烟雾传感器报警等级
+//     fiberInfo: 0, //矿井光纤测温系统报警等级
+//     tempSensorInfo: 0, //矿井温度传感器报警等级
+//   },
+//   gasInfo: {
+//     //瓦斯风险信息
+//     gasWarnLevel: 0, //瓦斯风险等级
+//     gasTypeList: [
+//       {
+//         warnLevel: 0, //当前状态
+//         num: 2, //监测数量
+//         typeName: '瓦斯抽采泵站', //设备类型名称
+//       },
+//       {
+//         warnLevel: 0,
+//         num: 1,
+//         typeName: '瓦斯巡检',
+//       },
+//       {
+//         warnLevel: 0,
+//         num: 2,
+//         typeName: '瓦斯巡检',
+//       },
+//     ],
+//   },
+//   ventInfo: {
+//     //通风系统信息
+//     totallength: 1562.35, //矿井巷道总长度
+//     zonghuifeng: '25881.74', //总回风
+//     fanMainList: [
+//       {
+//         sqzlfb: '31.0%-29.0%-40.0%', //三区阻力分布
+//         strname: '2号回风立井', //风机名称
+//         strinstallpos: '2号回风立井', //安装位置
+//         Fan1m3: '12465.84', //1号风机风量
+//         Fan2m3: '12493.72', //2号风机风量
+//         FanFreqHz: '225', //风机频率
+//       },
+//       {
+//         sqzlfb: '42.0%-37.0%-21.0%',
+//         strname: '1号回风斜井',
+//         strinstallpos: '1号回风斜井',
+//         Fan1m3: '13419.83',
+//         Fan2m3: '13415.9',
+//         FanFreqHz: '225',
+//       },
+//     ],
+//     xufengliang: 15065, //总需风量
+//     zongjinfeng: '24987.25', //总进风
 //   },
 // });
 
@@ -99,19 +101,26 @@ export const getSummary = () =>
  * 获取矿区列表
  * @param params
  */
-export const getList = () =>
-  Promise.resolve([
-    { title: '布尔台', address: 'http://10.246.95.4:8092/micro-vent-3dModal/dashboard/analysis' },
-    { title: '上湾', address: 'http://10.246.167.205:8092/micro-vent-3dModal/dashboard/analysis' },
-    { title: '大柳塔', address: 'http://10.248.135.10:8092/micro-vent-3dModal/dashboard/analysis' },
-    { title: '活鸡兔', address: 'http://10.248.135.121:8092/micro-vent-3dModal/dashboard/analysis' },
-    { title: '锦界', address: 'http://10.248.151.42:8092/micro-vent-3dModal/dashboard/analysis' },
-    { title: '哈拉沟', address: 'http://10.248.223.12:8092/micro-vent-3dModal/dashboard/analysis' },
-    { title: '石圪台', address: 'http://10.246.191.13:8092/micro-vent-3dModal/dashboard/analysis' },
-    { title: '柳塔', address: 'http://10.246.87.121:8092/micro-vent-3dModal/dashboard/analysis' },
-    { title: '补连塔', address: 'http://10.246.175.16:8092/micro-vent-3dModal/dashboard/analysis' },
-    { title: '寸草塔矿', address: 'http://10.246.23.171:8092/micro-vent-3dModal/dashboard/analysis' },
-    { title: '寸草塔二矿', address: 'http://10.246.63.5:8092/micro-vent-3dModal/dashboard/analysis' },
-    { title: '乌兰木伦', address: 'http://10.246.183.35:8092/micro-vent-3dModal/dashboard/analysis' },
-    { title: '榆家梁', address: 'http://10.248.143.211:8092/micro-vent-3dModal/dashboard/analysis' },
-  ]);
+export const getList = () => {
+  return queryDepartTreeSync().then((r) => {
+    return r.map((e) => ({
+      title: e.title,
+      address: `${e.ip}:${e.port}`,
+    }));
+  });
+};
+// Promise.resolve([
+//   { title: '布尔台', address: 'http://10.246.95.4:8092/micro-vent-3dModal/dashboard/analysis' },
+//   { title: '上湾', address: 'http://10.246.167.205:8092/micro-vent-3dModal/dashboard/analysis' },
+//   { title: '大柳塔', address: 'http://10.248.135.10:8092/micro-vent-3dModal/dashboard/analysis' },
+//   { title: '活鸡兔', address: 'http://10.248.135.121:8092/micro-vent-3dModal/dashboard/analysis' },
+//   { title: '锦界', address: 'http://10.248.151.42:8092/micro-vent-3dModal/dashboard/analysis' },
+//   { title: '哈拉沟', address: 'http://10.248.223.12:8092/micro-vent-3dModal/dashboard/analysis' },
+//   { title: '石圪台', address: 'http://10.246.191.13:8092/micro-vent-3dModal/dashboard/analysis' },
+//   { title: '柳塔', address: 'http://10.246.87.121:8092/micro-vent-3dModal/dashboard/analysis' },
+//   { title: '补连塔', address: 'http://10.246.175.16:8092/micro-vent-3dModal/dashboard/analysis' },
+//   { title: '寸草塔矿', address: 'http://10.246.23.171:8092/micro-vent-3dModal/dashboard/analysis' },
+//   { title: '寸草塔二矿', address: 'http://10.246.63.5:8092/micro-vent-3dModal/dashboard/analysis' },
+//   { title: '乌兰木伦', address: 'http://10.246.183.35:8092/micro-vent-3dModal/dashboard/analysis' },
+//   { title: '榆家梁', address: 'http://10.248.143.211:8092/micro-vent-3dModal/dashboard/analysis' },
+// ]);

src/views/vent/home/billboard/billboard.data.ts

@@ -1,6 +1,6 @@
 import DustStatus from './components/DustStatus.vue';
 import FileOverview from './components/FileOverview.vue';
-// import FireStatus from './components/FireStatus.vue';
+import FireStatus from './components/FireStatus.vue';
 import VentilationStatus from './components/VentilationStatus.vue';
 import GasStatus from './components/GasStatus.vue';
 import leftImg from '/@/assets/images/files/homes/file.svg';

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

@@ -187,7 +187,7 @@ export const tabList = [
     { id: 0, label: '烟雾传感器监测', details: '设备类型名称' },
     { id: 1, label: '温度传感器监测', details: '设备类型名称' },
     { id: 2, label: '自动喷淋灭火装置监测', details: '设备类型名称' },
-    { id: 3, label: '火焰传感器监测', details: '设备类型名称' },
+    { id: 3, label: '一氧化碳传感器监测', details: '设备类型名称' },
   ];
   //外因火灾-传感器table列
 export const columns = [