Просмотр исходного кода

[Mod 0000] 移除风量闭合相关字样

houzekong 4 дней назад
Родитель
Сommit
efdb4e6bdf

+ 0 - 1
src/layouts/default/feature/components/LeafPopup.vue

@@ -55,7 +55,6 @@
   // 主要风险字段(与 IdentifyResult 一致)
   const riskFields = [
     { label: '风量较均值偏低', prop: 'volumeLowPercent', unit: '%' },
-    // { label: '进回风不闭合差值', prop: 'unclosedDiff', unit: 'm³/min' },
     { label: '缺失规定测风点数', prop: 'missingCount', unit: '个' },
     { label: '多测点关联异常数', prop: 'relatedAbnormal', unit: '个' },
   ];

+ 0 - 5
src/views/analysis/warningAnalysis/globalAlarm/globalAlarm.data.ts

@@ -7,7 +7,6 @@ import dayjs from 'dayjs';
 export const boardData = [
   { label: '风速超限报警', value: '-' },
   { label: '风量不足报警', value: '-' },
-  // { label: '风量不闭合报警', value: '-' },
   { label: '今日已处理报警', value: '-' },
 ];
 
@@ -15,7 +14,6 @@ export const boardData = [
 export const alarmTypeMap: Record<string, string> = {
   vaOverLimit: '风速超限',
   m3Lack: '风量不足',
-  // m3NotClosed: '风量不闭合',
   disconnect: '断线',
   vaChange: '风速波动',
 };
@@ -146,7 +144,6 @@ export const schemas: FormSchema[] = [
         { label: '全部', value: '' },
         { label: '风速超限', value: 'vaOverLimit' },
         { label: '风量不足', value: 'm3Lack' },
-        // { label: '风量不闭合', value: 'm3NotClosed' },
         { label: '风速波动', value: 'vaChange' },
         { label: '断线', value: 'disconnect' },
       ],
@@ -167,7 +164,6 @@ export const historySchemas: FormSchema[] = [
         { label: '全部', value: '' },
         { label: '风速超限', value: 'vaOverLimit' },
         { label: '风量不足', value: 'm3Lack' },
-        // { label: '风量不闭合', value: 'm3NotClosed' },
         { label: '风速波动', value: 'vaChange' },
         { label: '断线', value: 'disconnect' },
       ],
@@ -215,7 +211,6 @@ export const handleRecordColumns: BasicColumn[] = [
       const map: Record<string, string> = {
         windSpeedOver: '风速超限',
         windVolumeLow: '风量不足',
-        windVolumeUnclosed: '风量不闭合',
       };
       return map[text] || text;
     },

+ 0 - 1
src/views/analysis/warningAnalysis/globalAlarm/index.vue

@@ -213,7 +213,6 @@
       const result = await getCurrentStatistics({ deptId: params?.deptId });
       boardDataRef.value[0].value = result.vaOverLimitNum ?? '-';
       boardDataRef.value[1].value = result.m3LackNum ?? '-';
-      // boardDataRef.value[2].value = result.m3NotClosedNum ?? '-';
       // 第4卡(今日已处理报警)暂不接入,保持 '-'
     } catch {
       // 使用默认值

+ 0 - 8
src/views/analysis/warningAnalysis/windPointManage/windPointManage.data.ts

@@ -325,14 +325,6 @@ export const defaultModelConfigs = [
     unit: '%',
     description: '实测风量低于标准风量×(1-裕度)即触发风量不足报警',
   },
-  {
-    paramName: '不闭合阈值',
-    paramKey: 'unclosedThreshold',
-    currentValue: '10',
-    defaultValue: '10',
-    unit: '%',
-    description: '进风量与回风量差值占比超过此值即触发风量不闭合报警',
-  },
   {
     paramName: '缺失点位报警数',
     paramKey: 'missingPointAlarm',

+ 2 - 4
src/views/dashboard/HiddenSurface/configurable.data.ts

@@ -113,7 +113,7 @@ export const testConfigProvinceMonitor: Config[] = [
       position: 'top:30px;right:25px;',
     },
   },
-  // 3. 风速风量传感器(左下角,饼图统计 getMineData 中风量闭合/风量异常矿井数)
+  // 3. 风速风量传感器(左下角,饼图统计 getMineData 中风量异常矿井数)
   {
     deviceType: 'wind_speed_sensor',
     moduleName: '风速风量传感器',
@@ -180,7 +180,6 @@ export const testConfigProvinceMonitor: Config[] = [
             { name: '矿井名称', prop: 'mineName' },
             // { name: '父级组织', prop: 'parentArea' },
             // { name: '判识结果', prop: 'judgeResult' },
-            { name: '风量闭合', prop: 'm3Closed' },
             { name: '风量异常数', prop: 'm3Exception' },
             // { name: '最近实时上传', prop: 'lastCdssTime' },
           ],
@@ -291,11 +290,10 @@ export const testConfigVentilationMonitor: Config[] = [
           conclusion: '${conclusion}',
           items: [
             { label: '风量异常数', prop: 'm3Exception', unit: '个' },
-            { label: '风量闭合', prop: 'm3Closed' },
             { label: '测风地点数', prop: 'mineAreaCount', unit: '个' },
             { label: '测风装置数', prop: 'windrectCount', unit: '个' },
           ],
-          // suggestions: ['请现场核查疑似隐蔽巷道的通风设施状态', '建议对该区域风量不闭合点进行复测', '缺失测风点应尽快补装并接入系统'],
+          // suggestions: ['请现场核查疑似隐蔽巷道的通风设施状态', '缺失测风点应尽快补装并接入系统'],
           suggestions: ['暂无建议'],
         },
       ],

+ 0 - 7
src/views/dashboard/HiddenSurface/hiddenSurface.api.ts

@@ -13,13 +13,6 @@ export const getMineAlarmList = (_params?: any) =>
       { alarmType: '风速超限', pointName: 'FC003', alarmDesc: '实测6.8m/s超阈值6.0m/s', alarmLevel: '二级', alarmTime: '2025-07-28 14:30' },
       { alarmType: '风量不足', pointName: 'FC005', alarmDesc: '实测1920m³/min低于标准2400m³/min', alarmLevel: '三级', alarmTime: '2025-07-28 13:15' },
       { alarmType: '测风点缺失', pointName: 'FC006', alarmDesc: '注册测风点在上传数据中缺失', alarmLevel: '一级', alarmTime: '2025-07-28 08:00' },
-      /* {
-        alarmType: '风量不闭合',
-        pointName: '北翼采区',
-        alarmDesc: '进回风差值3720-2850=870m³/min超阈值10%',
-        alarmLevel: '二级',
-        alarmTime: '2025-07-28 11:45',
-      }, */
       { alarmType: '风速超限', pointName: 'FC003', alarmDesc: '实测6.5m/s超阈值6.0m/s', alarmLevel: '三级', alarmTime: '2025-07-27 22:10' },
     ],
   });

+ 7 - 19
src/views/dashboard/HiddenSurface/index.vue

@@ -64,10 +64,9 @@
     suspectedNum: 0, // 疑似隐蔽工作面数量
     vaOverLimitNum: 0, // 风速超限异常数量
     m3LackNum: 0, // 风量不足异常数量
-    // m3NotClosedNum: 0, // 风量不闭合异常数量
     disconnectNum: [] as any[], // 数据掉线点列表
     enforceOffices: null, // 执法处判识情况列表
-    windClosedStats: [] as any[], // 风量闭合/风量异常饼图统计(getMineData)
+    windClosedStats: [] as any[], // 风量异常饼图统计(getMineData)
     hiddenWorkfaces: [] as any[], // 疑似隐蔽工作面列表
   });
 
@@ -80,14 +79,12 @@
     suspectedNum: 0,
     vaOverLimitNum: 0,
     m3LackNum: 0,
-    // m3NotClosedNum: 0,
     disconnectNum: [] as any[],
     pointRecords: [] as any[], // 测风点实时数据
     identifyData: {
       // 判识结果数据(对接 getMineData → Mine 记录)
       conclusion: '正常',
       m3Exception: 0, // 风量异常数
-      m3Closed: '数据不足', // 风量闭合
       mineAreaCount: 0, // 测风地点数
       windrectCount: 0, // 测风装置数
     },
@@ -97,7 +94,6 @@
   // WindrectData.status:1正常、0已删除
   const windrectStatusMap: Record<string, string> = { '1': '正常', '0': '已删除' };
   const judgeResultMap: Record<string, string> = { '0': '数据不足', '1': '疑似', '2': '正常' };
-  const m3ClosedMap: Record<string, string> = { '0': '数据不足', /* '1': '不闭合', */ '2': '闭合' };
 
   /** WindrectData 分页记录 → 首页风速风量传感器表格行 */
   function mapWindrectRecords(records: any[]) {
@@ -119,21 +115,16 @@
         mineName: r.mineName,
         parentArea: r.parentArea,
         judgeResult: judgeResultMap[String(r.judgeResult)] ?? '-',
-        m3Closed: m3ClosedMap[String(r.m3Closed)] ?? '-',
         m3Exception: r.m3Exception ?? '-',
         lastCdssTime: r.lastCdssTime,
       }));
   }
 
-  /** Mine 分页记录 → 风量闭合/风量异常饼图统计(闭合矿井数 m3Closed==2;风量异常矿井数 m3Exception>0) */
+  /** Mine 分页记录 → 风量异常饼图统计(风量异常矿井数 m3Exception>0) */
   function countWindClosedStats(records: any[]) {
     const list = records || [];
-    const closedNum = list.filter((r) => Number(r.m3Closed) === 2).length;
     const exceptionNum = list.filter((r) => Number(r.m3Exception) > 0).length;
-    return [
-      { name: '风量闭合', value: closedNum },
-      { name: '风量异常', value: exceptionNum },
-    ];
+    return [{ name: '风量异常', value: exceptionNum }];
   }
 
   async function fetchHomeData() {
@@ -152,7 +143,7 @@
             console.error('执法处判识情况获取失败:', e);
             return null;
           }),
-        // 一次 getMineData 同时派生:左下角饼图(风量闭合/风量异常)+ 右下角疑似隐蔽工作面表格
+        // 一次 getMineData 同时派生:左下角饼图(风量异常)+ 右下角疑似隐蔽工作面表格
         getMineData({ deptId, pageNo: 1, pageSize: 100 })
           .then((r) => {
             const records = r?.records || [];
@@ -162,7 +153,7 @@
             };
           })
           .catch((e) => {
-            console.error('隐蔽工作面/风量闭合风量异常数据获取失败:', e);
+            console.error('隐蔽工作面/风量异常数据获取失败:', e);
             return { windClosedStats: [], hiddenWorkfaces: [] };
           }),
       ]);
@@ -175,7 +166,6 @@
         suspectedNum: statistics.suspectedNum ?? 0,
         vaOverLimitNum: statistics.vaOverLimitNum ?? 0,
         m3LackNum: statistics.m3LackNum ?? 0,
-        // m3NotClosedNum: statistics.m3NotClosedNum ?? 0,
         disconnectNum: Array.isArray(statistics.disconnectNum) ? statistics.disconnectNum : [],
         enforceOffices: judgeList,
         windClosedStats: mineStats.windClosedStats,
@@ -205,14 +195,13 @@
             return {
               conclusion: judgeResultMap[String(mine.judgeResult)] ?? '数据不足',
               m3Exception: mine.m3Exception ?? 0,
-              m3Closed: m3ClosedMap[String(mine.m3Closed)] ?? '数据不足',
               mineAreaCount: Array.isArray(mine.mineAreaList) ? mine.mineAreaList.length : 0,
               windrectCount: Array.isArray(mine.windrectList) ? mine.windrectList.length : 0,
             };
           })
           .catch((e) => {
             console.error('判识结果获取失败:', e);
-            return { conclusion: '正常', m3Exception: 0, m3Closed: '数据不足', mineAreaCount: 0, windrectCount: 0 };
+            return { conclusion: '正常', m3Exception: 0, mineAreaCount: 0, windrectCount: 0 };
           }),
 
         getWindrectData({ deptId, pageNo: 1, pageSize: 20 })
@@ -231,10 +220,9 @@
         suspectedNum: statistics.suspectedNum ?? 0,
         vaOverLimitNum: statistics.vaOverLimitNum ?? 0,
         m3LackNum: statistics.m3LackNum ?? 0,
-        // m3NotClosedNum: statistics.m3NotClosedNum ?? 0,
         disconnectNum: Array.isArray(statistics.disconnectNum) ? statistics.disconnectNum : [],
         pointRecords: windrectPage,
-        identifyData: identifyResult || { conclusion: '正常', m3Exception: 0, m3Closed: '数据不足', mineAreaCount: 0, windrectCount: 0 },
+        identifyData: identifyResult || { conclusion: '正常', m3Exception: 0, mineAreaCount: 0, windrectCount: 0 },
       };
       updateData(mineData.value);
     } catch (error) {

+ 0 - 29
src/views/dashboard/basicInfo/minesInfo/minesInfo.data.ts

@@ -52,22 +52,6 @@ export const columns: BasicColumn[] = [
       return h('span', { style: { color: info.color } }, info.label);
     },
   },
-  {
-    title: '风量闭合状态',
-    dataIndex: 'm3Closed',
-    width: 100,
-    customRender: ({ record }) => {
-      const text = String(record.m3Closed);
-      if (isEmpty(text)) return h('span', '-');
-      const map: Record<string, { label: string; color: string }> = {
-        '0': { label: '数据不足', color: StatusColorEnum.gray },
-        /* '1': { label: '不闭合', color: StatusColorEnum.red }, */
-        '2': { label: '闭合', color: StatusColorEnum.green },
-      };
-      const info = map[text] || { label: '-', color: StatusColorEnum.gray };
-      return h('span', { style: { color: info.color } }, info.label);
-    },
-  },
   {
     title: '测风地点数',
     dataIndex: 'mineAreaList',
@@ -177,17 +161,4 @@ export const searchFormSchema: FormSchema[] = [
     },
     colProps: { span: 6 },
   },
-  {
-    field: 'm3Closed',
-    label: '风量闭合',
-    component: 'Select',
-    componentProps: {
-      options: [
-        { label: '数据不足', value: '0' },
-        /* { label: '不闭合', value: '1' }, */
-        { label: '闭合', value: '2' },
-      ],
-    },
-    colProps: { span: 6 },
-  },
 ];

+ 0 - 30
src/views/monitor/surfaceMonitor/surfaceMonitor.data.ts

@@ -24,13 +24,6 @@ export const judgeResultMap: Record<string, string> = {
   '2': '正常',
 };
 
-/** 风量闭合结果映射(Mine.m3Closed:0数据不足、1不闭合、2闭合) */
-export const m3ClosedMap: Record<string, string> = {
-  '0': '数据不足',
-  /* '1': '不闭合', */
-  '2': '闭合',
-};
-
 /** 隐蔽工作面判识全览实时表格列(getMineData → Mine) */
 export const columns: BasicColumn[] = [
   {
@@ -81,16 +74,6 @@ export const columns: BasicColumn[] = [
       return h('span', { style: { color, fontWeight: 'bold' } }, label);
     },
   },
-  {
-    title: '风量闭合',
-    dataIndex: 'm3Closed',
-    width: 110,
-    customRender: ({ text }) => {
-      const label = m3ClosedMap[String(text)] ?? '-';
-      const color = String(text) === '1' ? StatusColorEnum.red : String(text) === '2' ? StatusColorEnum.green : StatusColorEnum.gray;
-      return h('span', { style: { color, fontWeight: 'bold' } }, label);
-    },
-  },
   {
     title: '风量异常数',
     dataIndex: 'm3Exception',
@@ -185,19 +168,6 @@ export const schemas: FormSchema[] = [
       ],
     },
   },
-  {
-    label: '风量闭合',
-    field: 'm3Closed',
-    component: 'Select',
-    colProps: { span: 6 },
-    componentProps: {
-      options: [
-        { label: '数据不足', value: 0 },
-        /* { label: '不闭合', value: 1 }, */
-        { label: '闭合', value: 2 },
-      ],
-    },
-  },
 ];
 
 /** 历史数据查询表单(暂无接口,占位) */

+ 0 - 1
src/views/system/cadFile/components/GoafPopup.vue

@@ -34,7 +34,6 @@ const props = defineProps<Props>();
 const alarmTypeMap: Record<string, string> = {
   vaOverLimit: '风速超限',
   m3Lack: '风量不足',
-  // m3NotClosed: '风量不闭合',
   disconnect: '断线',
   vaChange: '风速波动',
 };