1. 通风预警涨到阻变故障分析修改

2. 上湾双道风窗电子屏内容修改
3. 大柳塔注氮字段修改

src/views/vent/deviceManager/comment/warningTabel/warning.api.ts

@@ -138,12 +138,12 @@ export const backWindControlDevicePointDelete = (params) => {
 export const warningLogList = (params) => defHttp.get({ url: Api.warningLogList, params });
 export const warningLogAdd = (params) => defHttp.post({ url: Api.warningLogAdd, params });
 export const warningLogEdit = (params) => defHttp.put({ url: Api.warningLogEdit, params });
-export const warningLogDeleteById = (params) => defHttp.delete({ url: Api.warningLogDeleteById, params });
+export const warningLogDeleteById = (params) => defHttp.delete({ url: Api.warningLogDeleteById, params }, { joinParamsToUrl: true }).then(() => {});
 
 // 模型灾变预案配置
 export const modelAlarmAutoList = (params) => defHttp.get({ url: Api.modelAlarmAutoList, params });
 export const modelAlarmAutoAdd = (params) => defHttp.post({ url: Api.modelAlarmAutoAdd, params });
 export const modelAlarmAutoAddBatch = (params) => defHttp.post({ url: Api.modelAlarmAutoAddBatch, params });
-export const modelAlarmAutoDelete = (params) => defHttp.delete({ url: Api.modelAlarmAutoDelete, params }, { joinParamsToUrl: true });
+export const modelAlarmAutoDelete = (params) => defHttp.delete({ url: Api.modelAlarmAutoDelete, params }, { joinParamsToUrl: true }).then(() => {});
 export const modelAlarmAutoDeleteBatch = (params) => defHttp.delete({ url: Api.modelAlarmAutoDeleteBatch, params });
 export const modelAlarmAutoEdit = (params) => defHttp.post({ url: Api.modelAlarmAutoEdit, params });

src/views/vent/monitorManager/alarmMonitor/alarm.api.ts

@@ -1,6 +1,8 @@
 import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
+  modalParam = '/ventanaly-model/Vmodel/modelParamPub/list',
+
   list = '/ventanaly-device/monitor/device',
   baseList = '/safety/ventanalyWindow/list',
   warningList = '/safety/ventanalyAlarmLog/now_alarmlist',
@@ -11,6 +13,7 @@ enum Api {
   sysWarn = '/ventanaly-device/safety/ventanalyAlarmLog/sysWarn',
   getReferenceValue = '/safety/managesysDevice/getReferenceValue',
   realTimeNetCal = '/ventanaly-model/Vmodel/VentanalyAirthmeticJson/windTimenetcal',
+  getModel = '/ventanaly-model/Vmodel/ventanalyModel/getModel',
 }
 /**
  * 列表接口
@@ -47,3 +50,5 @@ export const sysWarn = (params) => defHttp.post({ url: Api.sysWarn, params });
 export const getReferenceValue = (params) => defHttp.get({ url: Api.getReferenceValue, params });
 
 export const realTimeNetCal = (params) => defHttp.post({ url: Api.realTimeNetCal, params });
+
+export const modalParam = (params) => defHttp.get({ url: Api.modalParam, params });

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

@@ -106,7 +106,7 @@
   import echartLine from '../common/echartLine.vue';
   import MeasurePoint from '../common/measurePoint.vue';
   import { ventTunColumns } from '../alarm.data';
-  import { realTimeNetCal } from '../alarm.api';
+  import { realTimeNetCal, modalParam } from '../alarm.api';
   // import moment from 'moment';
 
   //巷道阻力分析数据
@@ -382,30 +382,33 @@
     }
   }
   async function getRealTimeNetData() {
-    const res = await realTimeNetCal({ modelID: '8110' });
-    if (res && res['result']) ventTunDataSource.value = res['result']['tuns'];
-    let data = [];
-    ventTunDataSource.value.forEach((el) => {
-      if (el['dHTotal'] && el['oldHTotal']) {
-        el['leveld'] = ((el['dHTotal'] - el['oldHTotal']) / el['oldHTotal']) * 100;
-        data.push(el['leveld']);
+    const modalData = await modalParam({});
+    if (modalData && modalData.param && modalData.param.records.length && modalData.param.records.length > 0) {
+      const res = await realTimeNetCal({ modelID: modalData.param.records[0]['defaultmodelid'] });
+      if (res && res['result']) ventTunDataSource.value = res['result']['tuns'];
+      let data = [];
+      ventTunDataSource.value.forEach((el) => {
+        if (el['dHTotal'] && el['oldHTotal']) {
+          el['leveld'] = ((el['dHTotal'] - el['oldHTotal']) / el['oldHTotal']) * 100;
+          data.push(el['leveld']);
+        } else {
+          data = [];
+        }
+      });
+      let maxLevel = data.length != 0 ? data.reduce((a, b) => (a.leveld > b.leveld ? a : b)).leveld : 0;
+      // hdData.address = data.length != 0 ? data.reduce((a, b) => (a.leveld > b.leveld ? a : b)).strName : '';
+      console.log(hdData.maxLevel);
+      if (maxLevel == 0) {
+        hdData.maxLevel = '正常';
+      } else if (maxLevel > 0 && maxLevel <= 1) {
+        hdData.maxLevel = '低风险';
+      } else if (maxLevel > 1 && maxLevel <= 3) {
+        hdData.maxLevel = '一般风险';
+      } else if (maxLevel > 3 && maxLevel <= 5) {
+        hdData.maxLevel = '较大风险';
       } else {
-        data = [];
+        hdData.maxLevel = '重大风险';
       }
-    });
-    let maxLevel = data.length != 0 ? data.reduce((a, b) => (a.leveld > b.leveld ? a : b)).leveld : 0;
-    // hdData.address = data.length != 0 ? data.reduce((a, b) => (a.leveld > b.leveld ? a : b)).strName : '';
-    console.log(hdData.maxLevel);
-    if (maxLevel == 0) {
-      hdData.maxLevel = '正常';
-    } else if (maxLevel > 0 && maxLevel <= 1) {
-      hdData.maxLevel = '低风险';
-    } else if (maxLevel > 1 && maxLevel <= 3) {
-      hdData.maxLevel = '一般风险';
-    } else if (maxLevel > 3 && maxLevel <= 5) {
-      hdData.maxLevel = '较大风险';
-    } else {
-      hdData.maxLevel = '重大风险';
     }
   }
 

src/views/vent/monitorManager/compressor/nitrogen.data.dlt1.ts

@@ -208,33 +208,15 @@ export const preMonitorList = [
     unit: '℃',
     child: [],
   },
-  // {
-  //   title: `加载时间`,
-  //   code: `LoadTime`,
-  //   unit: 'h',
-  //   child: [],
-  // },
   {
-    title: `运行时间`,
-    code: `RunTime3`,
+    title: `加载时间`,
+    code: `LoadTime`,
     unit: 'h',
     child: [],
   },
   {
     title: `运行时间`,
-    code: `RunTime2`,
-    unit: 'min',
-    child: [],
-  },
-  {
-    title: `运行时间`,
-    code: `RunTime1`,
-    unit: 's',
-    child: [],
-  },
-  {
-    title: `保养时间`,
-    code: `RunTime4`,
+    code: `RunTime`,
     unit: 'h',
     child: [],
   },

src/views/vent/monitorManager/fanLocalMonitor/fanLocal.three.ts

@@ -278,7 +278,7 @@ export const addCssText = () => {
       fanLocalCSS3D.name = 'text2';
       fanLocalCSS3D.scale.set(0.1, 0.1, 0.1);
       fanLocalCSS3D.rotation.y = -Math.PI / 2;
-      fanLocalCSS3D.position.set(74.63, 13.54, 3.84);
+      fanLocalCSS3D.position.set(57.84, 13.54, 3.84);
       group.add(fanLocalCSS3D);
     }
   }

src/views/vent/monitorManager/windowMonitor/shuangdaoFcSw.threejs.ts

@@ -76,7 +76,7 @@ class doubleWindow {
         y: 90,
       },
       {
-        text: `${selectData.OpenDegree1 ? '前窗开度值(°)' : selectData.forntArea ? '前窗过风面积(㎡)' : '前窗过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree1 ? '窗1开度值(°)' : selectData.forntArea ? '窗1过风面积(㎡)' : '窗1过风面积(㎡)'}:`,
         font: 'normal 30px Arial',
         color: '#009900',
         strokeStyle: '#002200',
@@ -95,9 +95,8 @@ class doubleWindow {
         x: 330,
         y: 145,
       },
-
       {
-        text: `${selectData.OpenDegree2 ? '后窗开度值(°)' : selectData.forntArea ? '后窗过风面积(㎡)' : '后窗过风面积(㎡)'}:`,
+        text: `${selectData.OpenDegree2 ? '窗2开度值(°)' : selectData.forntArea ? '窗2过风面积(㎡)' : '窗2过风面积(㎡)'}:`,
         font: 'normal 30px Arial',
         color: '#009900',
         strokeStyle: '#002200',

src/views/vent/monitorManager/windowMonitor/window.threejs.ts

@@ -168,7 +168,7 @@ export const play = (rotationParam, flag) => {
 export const setModelType = (type) => {
   // if (!model || !model.scene) return;
   const { sysOrgCode } = useGlobSetting();
-  // const sysOrgCode = 'sdmtjtyjlmk';
+  // const sysOrgCode = 'sdmtjtswmk';
   windowType = type;
   return new Promise((resolve) => {
     // 显示双道风窗
@@ -234,7 +234,7 @@ export const setModelType = (type) => {
 
 export const mountedThree = (playerDom) => {
   const { sysOrgCode } = useGlobSetting();
-  // const sysOrgCode = 'sdmtjtbltmk';
+  // const sysOrgCode = 'sdmtjtswmk';
   return new Promise(async (resolve) => {
     model = new UseThree('#window3D');
     if (!model || !model.renderer || !model.camera) return;