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

src/api/vent/index.ts

@@ -1,4 +1,6 @@
 import { defHttp } from '/@/utils/http/axios';
+import { AesEncryption } from '/@/utils/cipher';
+import { loginCipher } from '/@/settings/encryptionSetting';
 
 enum Api {
   DEVICE_CONTROL = '/safety/ventanalyMonitorData/devicecontrol', // 开关控制
@@ -6,4 +8,9 @@ enum Api {
 
 // Get personal center-basic settings
 
-export const deviceControlApi = (data) => defHttp.put({ url: Api.DEVICE_CONTROL, data });
+export const deviceControlApi = (data) => {
+  // 加密password
+  const encryption = new AesEncryption({ key: loginCipher.key, iv: loginCipher.iv });
+  data.password = encryption.encryptByAES(data.password);
+  return defHttp.put({ url: Api.DEVICE_CONTROL, data });
+};

src/views/vent/bundle/bundleMonitorTable/bundle-table.api.ts

@@ -1,9 +1,9 @@
 import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
-  getBundleInfo = '/ventanaly-device/safety/reportLocalData/queryReportData',
-  getFileList = '/ventanaly-device/safety/reportLocalData/list',
-  getFileListById = '/ventanaly-device/safety/reportLocalData/queryById',
+  getBundleInfo = '/safety/reportLocalData/queryReportData',
+  getFileList = '/safety/reportLocalData/list',
+  getFileListById = '/safety/reportLocalData/queryById',
 }
 /**
  *

src/views/vent/bundleSpy/bundleSpyTable/bundleSpy-table.api.ts

@@ -1,9 +1,9 @@
 import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
-  getbunudleSpyInfo = '/ventanaly-device/safety/reportLocalData/queryReportData',
-  getFileList = '/ventanaly-device/safety/reportLocalData/list',
-  getFileListById = '/ventanaly-device/safety/reportLocalData/queryById',
+  getbunudleSpyInfo = '/safety/reportLocalData/queryReportData',
+  getFileList = '/safety/reportLocalData/list',
+  getFileListById = '/safety/reportLocalData/queryById',
 }
 /**
  *

src/views/vent/comment/threejs/SmokePartical.ts

@@ -95,15 +95,16 @@ export default class SmokePartical {
           obj.path0.copy(vec);
         }
       } else if (obj.spreadDirection != 0) {
+        const len = 1;
         const vec = new THREE.Vector3(
-          (Math.random() * 2 - 1) * 3 + obj.path0.x,
-          (Math.random() * 2 - 1) * obj.spreadDirection + obj.path0.y,
-          (Math.random() * 2 - 1) * 3 + obj.path0.z
+          (Math.random() * 2 - 1) * 3 * len + obj.path0.x,
+          (Math.random() * 2 - 1) * obj.spreadDirection * len + obj.path0.y,
+          (Math.random() * 2 - 1) * 3 * len + obj.path0.z
         );
         const vec1 = new THREE.Vector3(
-          (Math.random() * 2 - 1) * 3 + obj.path1.x,
-          (Math.random() * 2 - 1) * obj.spreadDirection + obj.path1.y,
-          (Math.random() * 2 - 1) * 3 + obj.path1.z
+          (Math.random() * 2 - 1) * 3 * len + obj.path1.x,
+          (Math.random() * 2 - 1) * obj.spreadDirection * len + obj.path1.y,
+          (Math.random() * 2 - 1) * 3 * len + obj.path1.z
         );
         obj.path0.copy(vec);
         obj.path1.copy(vec1);

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

@@ -39,12 +39,12 @@ enum Api {
   backWindControlDevicePointDelete = '/safety/managesysAuto/delete',
   backWindControlDevicePointEdit = '/safety/managesysAuto/edit',
 
-  modelAlarmAutoList = '/ventanaly-device/safety/modelAlarmAuto/list',
-  modelAlarmAutoEdit = '/ventanaly-device/safety/modelAlarmAuto/edit',
-  modelAlarmAutoDelete = '/ventanaly-device/safety/modelAlarmAuto/delete',
-  modelAlarmAutoAdd = '/ventanaly-device/safety/modelAlarmAuto/add',
-  modelAlarmAutoDeleteBatch = '/ventanaly-device/safety/modelAlarmAuto/deleteBatch',
-  modelAlarmAutoAddBatch = '/ventanaly-device/safety/modelAlarmAuto/addBatch',
+  modelAlarmAutoList = '/safety/modelAlarmAuto/list',
+  modelAlarmAutoEdit = '/safety/modelAlarmAuto/edit',
+  modelAlarmAutoDelete = '/safety/modelAlarmAuto/delete',
+  modelAlarmAutoAdd = '/safety/modelAlarmAuto/add',
+  modelAlarmAutoDeleteBatch = '/safety/modelAlarmAuto/deleteBatch',
+  modelAlarmAutoAddBatch = '/safety/modelAlarmAuto/addBatch',
 }
 /**
  * 导出api

src/views/vent/dust/dustMonitorTable/dsut-table.api.ts

@@ -1,9 +1,9 @@
 import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
-  getDustInfo = '/ventanaly-device/safety/reportLocalData/queryReportData',
-  getFileList = '/ventanaly-device/safety/reportLocalData/list',
-  getFileListById = '/ventanaly-device/safety/reportLocalData/queryById',
+  getDustInfo = '/safety/reportLocalData/queryReportData',
+  getFileList = '/safety/reportLocalData/list',
+  getFileListById = '/safety/reportLocalData/queryById',
 }
 /**
  * 获取粉尘监测结果报表

src/views/vent/gas/gasHome/gasHome.api.ts

@@ -2,7 +2,7 @@ import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
   list = '/monitor/system',
-  gasSystem = '/ventanaly-device/monitor/gasSystem',
+  gasSystem = '/monitor/gasSystem',
 }
 /**
  * 列表接口

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

@@ -5,9 +5,9 @@ import { get } from '../billboard/utils';
 enum Api {
   list = '/safety/ventanalyDevice/homedata2',
   getHomeData = '/safety/ventanalyDevice/homedata',
-  getDisHome = '/ventanaly-device/monitor/disaster/getDisHome',
-  getBDDustData = '/ventanaly-device/monitor/disaster/getDisDustHome',
-  getBDFireData = '/ventanaly-device/monitor/disaster/getDisFireHome',
+  getDisHome = '/monitor/disaster/getDisHome',
+  getBDDustData = '/monitor/disaster/getDisDustHome',
+  getBDFireData = '/monitor/disaster/getDisFireHome',
 }
 
 // 搞这个缓存是由于：目前代码上的设计是多个模块发出多次请求，每个模块自己负责消费前者的响应。

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

@@ -3,14 +3,14 @@ import { defHttp } from '/@/utils/http/axios';
 enum Api {
   modalParam = '/ventanaly-model/Vmodel/modelParamPub/list',
 
-  list = '/ventanaly-device/monitor/device',
+  list = '/monitor/device',
   baseList = '/safety/ventanalyWindow/list',
   warningList = '/safety/ventanalyAlarmLog/now_alarmlist',
   warningHistoryList = '/safety/ventanalyAlarmLog/list',
   totalList = '/safety/ventanalyAlarmLog/total',
 
-  sysTypeWarnList = '/ventanaly-device/safety/ventanalyAlarmLog/sysTypeWarn',
-  sysWarn = '/ventanaly-device/safety/ventanalyAlarmLog/sysWarn',
+  sysTypeWarnList = '/safety/ventanalyAlarmLog/sysTypeWarn',
+  sysWarn = '/safety/ventanalyAlarmLog/sysWarn',
   getReferenceValue = '/safety/managesysDevice/getReferenceValue',
   realTimeNetCal = '/ventanaly-model/Vmodel/VentanalyAirthmeticJson/windTimenetcal',
   getModel = '/ventanaly-model/Vmodel/ventanalyModel/getModel',

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

@@ -1,9 +1,9 @@
 import { defHttp } from '/@/utils/http/axios';
 
 enum Api {
-  sysTypeWarnList = '/ventanaly-device/safety/ventanalyAlarmLog/sysTypeWarn',
-  sysWarn = '/ventanaly-device/safety/ventanalyAlarmLog/sysWarn',
-  getDevice = '/ventanaly-device/monitor/device',
+  sysTypeWarnList = '/safety/ventanalyAlarmLog/sysTypeWarn',
+  sysWarn = '/safety/ventanalyAlarmLog/sysWarn',
+  getDevice = '/monitor/device',
 }
 
 /**

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

@@ -65,7 +65,7 @@
     },
   });
 
-  const getDeviceListApi = (params) => defHttp.post({ url: '/ventanaly-device/monitor/device', params });
+  const getDeviceListApi = (params) => defHttp.post({ url: '/monitor/device', params });
   const globalConfig = inject('globalConfig');
   const alarmHistory = ref();
   const columns = ref([]);

src/views/vent/monitorManager/comment/comment.api.ts

@@ -6,8 +6,8 @@ enum Api {
   input = '/safety/ventanalyDeviceInfo/input',
   sysList = '/safety/ventanalyManageSystem/list',
   sysInput = '/safety/ventanalyManageSystem/input',
-  getInfo = '/ventanaly-device/safety/reportLocalData/queryReportData',
-  getFileList = '/ventanaly-device/safety/reportLocalData/list',
+  getInfo = '/safety/reportLocalData/queryReportData',
+  getFileList = '/safety/reportLocalData/list',
 }
 
 /**

src/views/vent/monitorManager/comment/components/LinkControlDesModal.vue

@@ -7,7 +7,7 @@
   import { onMounted, ref, defineEmits, onUnmounted, computed } from 'vue';
   import { defHttp } from '/@/utils/http/axios';
 
-  const getLinkAlarmInfo = (params?) => defHttp.post({ url: '/ventanaly-device/safety/ventanalyDeviceInfo/getLinkAlarmInfo', params });
+  const getLinkAlarmInfo = (params?) => defHttp.post({ url: '/safety/ventanalyDeviceInfo/getLinkAlarmInfo', params });
 
   const emit = defineEmits(['close']);
   const props = withDefaults(

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

@@ -9,7 +9,12 @@
     <a-spin :spinning="loading" />
     <div v-for="groupNum in monitorDataGroupNum" :key="groupNum" class="modal-monitor">
       <fourBorderBg :class="`kyj${groupNum}`" :id="`nitrogenMonitor${groupNum}`">
-        <div class="title">{{ monitorData[groupNum - 1]['strname'] }} </div>
+        <div class="title">
+          {{ monitorData[groupNum - 1]['strname'] }}
+          <span :style="{ color: monitorData[groupNum - 1]['AirCompressor_Status'] == '1' ? '#67fc00' : '#e9170b' }">
+            {{ monitorData[groupNum - 1]['AirCompressor_Status'] == '1' ? '(运行)' : '(停止)' }}
+          </span>
+        </div>
         <template v-for="(preMonitor, preMonitorIndex) in preMonitorList" :key="preMonitorIndex">
           <div v-if="preMonitor.code !== 'signal'" class="monitor-item">
             <span class="monitor-title">{{ preMonitor.title }}:</span>
@@ -247,11 +252,12 @@
     if (res) {
       const result = res;
       if (!result || result.msgTxt.length < 1) return;
+      monitorData.value = [];
       result.msgTxt.forEach((item) => {
         if (item.type && item.type.startsWith('nitrogen')) {
           airCompressorState.length = 0;
           let netStatus = 0;
-          monitorData.value = item['datalist'].filter((data) => {
+          const dataList: any[] = item['datalist'].filter((data) => {
             const readData = data.readData;
             if (data['netStatus'] == 1) {
               netStatus = 1;
@@ -264,23 +270,23 @@
             });
             return Object.assign(data, readData);
           });
+          monitorData.value.push(...dataList);
           monitorNetStatus.value = netStatus;
-          console.log(monitorData, 'monitorData.value---===');
-          const airCompressor = { readTime: monitorData.value[0]['readTime'].substring(11) };
-          const dataArr = lodash.cloneDeep(echartData.value);
-          //图表数据
-          if (dataArr.length <= 5) {
-            monitorData.value.forEach((el, index) => {
-              airCompressor[`InputFlux${index + 1}`] = el['InputFlux'] || 0;
-            });
-            dataArr.push(airCompressor);
-          } else {
-            dataArr.shift();
-            dataArr.push(airCompressor);
-          }
-          echartData.value = dataArr;
         }
       });
+      const airCompressor = { readTime: monitorData.value[0]['readTime'].substring(11) };
+      const dataArr = lodash.cloneDeep(echartData.value);
+      //图表数据
+      if (dataArr.length <= 5) {
+        monitorData.value.forEach((el, index) => {
+          airCompressor[`InputFlux${index + 1}`] = el['InputFlux'] || 0;
+        });
+        dataArr.push(airCompressor);
+      } else {
+        dataArr.shift();
+        dataArr.push(airCompressor);
+      }
+      echartData.value = dataArr;
       if (flag) monitorDataGroupNum.value = monitorData.value.length;
       refresh.value = true;
       nextTick(() => {

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

@@ -214,7 +214,7 @@ export const zhudanOption = reactive({
 
 export function getMonitorComponent() {
   const { sysOrgCode } = useGlobSetting();
-  // const sysOrgCode = 'sdmtjtbdmk';
+  // const sysOrgCode = 'sdmtjtbltmk';
   let nitrogenHome;
   switch (sysOrgCode) {
     case 'sdmtjtdltmk': //dltj sdmtjtdltmk

src/views/vent/monitorManager/deviceMonitorWarn/deviceMonitorWarn.api.ts

@@ -3,7 +3,7 @@ import { defHttp } from '/@/utils/http/axios';
 enum Api {
   // totalList = '/safety/ventanalyAlarmLog/total',
   totalList = '/safety/ventanalyDevice/homedata2',
-  getAlarmLogList = '/ventanaly-device/monitor/groupCompany/getAlarmLogList', //获取各矿预警统计信息
+  getAlarmLogList = '/monitor/groupCompany/getAlarmLogList', //获取各矿预警统计信息
 }
 
 

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

@@ -70,7 +70,7 @@ export function setModelType(modelType: 'fanLocal' | 'fanLocalDual' | string, su
     if (!model) return reject('模型控制器未初始化');
     // 判断是否是同一个/类模型
     if (cacheKey === `${modelType}-${subModelType}`) return resolve(null);
-    const isUpdate = cacheKey.startsWith(modelType);
+    // const isUpdate = cacheKey.startsWith(modelType);
     cacheKey = `${modelType}-${subModelType}`;
 
     modelContextList.forEach(({ type, context }) => {
@@ -102,10 +102,10 @@ export function setModelType(modelType: 'fanLocal' | 'fanLocalDual' | string, su
           animateCamera(oldCameraPosition, { x: 0, y: 0, z: 0 }, { x: -1.85, y: 13.58, z: 37.39 }, { x: -1.83, y: 2.58, z: -0.75 }, model, 0.8);
         }
         if (type == 'fanLocalDual') {
-          if (!isUpdate) {
-            const oldCameraPosition = { x: -693, y: 474, z: 398 };
-            animateCamera(oldCameraPosition, { x: 0, y: 0, z: 0 }, { x: 14.83, y: 16.9, z: 36.46 }, { x: 0, y: 0, z: 0 }, model, 0.8);
-          }
+          // if (!isUpdate) {
+          const oldCameraPosition = { x: -693, y: 474, z: 398 };
+          animateCamera(oldCameraPosition, { x: 0, y: 0, z: 0 }, { x: 14.83, y: 16.9, z: 36.46 }, { x: 0, y: 0, z: 0 }, model, 0.8);
+          // }
         }
 
         resolve(null);

src/views/vent/monitorManager/fanLocalMonitor/fanLocalDual.threejs.base.ts

@@ -34,7 +34,13 @@ class ModelContext {
     // optional implementation
   }
 
-  /** 设置模型类型并切换，不同的类型通常对应不同的具体模型，在模型总控制器下的具体模型会根据传入的参数彼此交互、切换 */
+  /**
+   * 设置模型类型并切换，不同的类型通常对应不同的具体模型，在模型总控制器下的具体模型会根据传入的参数彼此交互、切换
+   *
+   * 本模型分为外侧（右侧）风机、内侧（左侧）风机，用户选择一个风机后，详情参数的框需要高亮，风机之间需要联动形成风流
+   *
+   * @param data 风机数据，第一项应为外侧（右侧）风机，第二项为内侧（左侧）
+   */
   setModelType(modelType: 'inner' | 'outer' | string, data: any[]) {
     const fanOuter1Run = get<string>(data[0], 'Fan1StartStatus', '0') == '1';
     const fanInner1Run = get<string>(data[1], 'Fan1StartStatus', '0') == '1';
@@ -58,7 +64,7 @@ class ModelContext {
     }
   }
 
-  execute(cmdname: string) {
+  private execute(cmdname: string) {
     this.modules.forEach(({ name, context, behavior }) => {
       if (name === cmdname) {
         behavior(context);
@@ -71,20 +77,21 @@ class ModelContext {
       this.model.setGLTFModel([this.modelName]).then(async (gltf) => {
         this.group = gltf[0];
         if (this.group) {
-          // const material = new THREE.MeshBasicMaterial({
-          //   color: '#000',
-          //   transparent: true,
-          //   opacity: 0.3,
-          //   side: THREE.DoubleSide, // 这里是双面渲染的意思
-          // });
-          // [
-          //   this.group.getObjectByName('Cylinder1054'),
-          //   this.group.getObjectByName('BuErTaiJuBuFengJi_shupailie_baiseziti'),
-          //   this.group.getObjectByName('pCylinder1'),
-          // ].forEach((e: THREE.Mesh) => {
-          //   e.material = material;
-          //   // e.renderOrder = 300;
-          // });
+          // 将管道由黑色不透光的材质修改为半透明材质
+          const material = new THREE.MeshBasicMaterial({
+            color: '#000',
+            transparent: true,
+            opacity: 0.3,
+            side: THREE.DoubleSide, // 这里是双面渲染的意思
+          });
+          [
+            this.group.getObjectByName('Cylinder1054'),
+            this.group.getObjectByName('BuErTaiJuBuFengJi_shupailie_baisezitiCylinder1054'),
+            this.group.getObjectByName('pCylinder1'),
+          ].forEach((e: THREE.Mesh) => {
+            e.material = material;
+            // e.renderOrder = 300;
+          });
           // this.group.scale.set(2, 2, 2);
           // setModalCenter(this.group);
           this.addLight();
@@ -165,40 +172,92 @@ class ModelContext {
   async initModules() {
     if (this.elements.length > 0) return;
     // 右侧风机-主风机进风
-    const curveFan1Right = this.generateSmokePath(['dian', 'dian1', 'dian2', 'dian3', 'dian4', 'dian5', 'dian6', 'dian7', 'dian8'], true);
+    const curveFan1Right = this.generateSmokePath(
+      [
+        new THREE.Vector3(-85.69, 2.18, 51.89),
+        new THREE.Vector3(-85.69, 2.18, 41.89),
+        new THREE.Vector3(-85.69, 2.18, 35.32),
+        new THREE.Vector3(-85.69, 0.78, 33.08),
+        new THREE.Vector3(-85.69, 0.78, 27.84),
+        new THREE.Vector3(-85.69, 4.72, 21.56),
+        new THREE.Vector3(-85.69, 4.72, -13),
+        new THREE.Vector3(-26.2, 4.72, -13.24),
+        new THREE.Vector3(-25.61, 4.72, -47.03),
+        new THREE.Vector3(80.03, 4.72, -47.03),
+      ],
+      true
+    );
     // 右侧风机-备风机进风
-    const curveFan2Right = this.generateSmokePath(['dian9', 'dian10', 'dian2', 'dian3', 'dian4', 'dian5', 'dian6', 'dian7', 'dian8'], true);
+    const curveFan2Right = this.generateSmokePath(
+      [
+        new THREE.Vector3(-85.69, -0.53, 51.89),
+        new THREE.Vector3(-85.69, -0.53, 41.89),
+        new THREE.Vector3(-85.69, -0.51, 35.32),
+        new THREE.Vector3(-85.69, 0.78, 33.08),
+        new THREE.Vector3(-85.69, 0.78, 27.84),
+        new THREE.Vector3(-85.69, 4.72, 21.56),
+        new THREE.Vector3(-85.69, 4.72, -13),
+        new THREE.Vector3(-26.2, 4.72, -13.24),
+        new THREE.Vector3(-25.61, 4.72, -47.03),
+        new THREE.Vector3(80.03, 4.72, -47.03),
+      ],
+      true
+    );
     // 左侧风机-主风机进风
-    const curveFan1Left = this.generateSmokePath(['dian11', 'dian12', 'dian15', 'dian16', 'dian17'], true);
+    const curveFan1Left = this.generateSmokePath(
+      [
+        new THREE.Vector3(-85.69, 2.18, 12.72),
+        new THREE.Vector3(-85.69, 2.18, 2.72),
+        new THREE.Vector3(-85.69, 2.18, -3.85),
+        new THREE.Vector3(-85.69, 0.78, -6.09),
+        new THREE.Vector3(-85.69, 0.78, -12.92),
+        new THREE.Vector3(80.25, 0.78, -12.92),
+      ],
+      true
+    );
     // 左侧风机-备风机进风
-    const curveFan2Left = this.generateSmokePath(['dian14', 'dian13', 'dian15', 'dian16', 'dian17'], true);
+    const curveFan2Left = this.generateSmokePath(
+      [
+        new THREE.Vector3(-85.69, -0.53, 12.72),
+        new THREE.Vector3(-85.69, -0.53, 2.72),
+        new THREE.Vector3(-85.69, -0.51, -3.85),
+        new THREE.Vector3(-85.69, 0.78, -6.09),
+        new THREE.Vector3(-85.69, 0.78, -12.92),
+        new THREE.Vector3(80.25, 0.78, -12.92),
+      ],
+      true
+    );
     // 右侧巷道-回风前段
-    const curveTunnelRight = this.generateSmokePath(['dian18', 'dian19', 'dian20']);
+    const curveTunnelRight = this.generateSmokePath([
+      new THREE.Vector3(86.67, 0.78, -16.57),
+      new THREE.Vector3(30.11, 0.78, -16.57),
+      new THREE.Vector3(30.11, 0.78, -50.39),
+    ]);
     // 左侧巷道-回风前段
-    const curveTunnelLeft = this.generateSmokePath(['dian20', 'dian22']);
+    const curveTunnelLeft = this.generateSmokePath([new THREE.Vector3(30.11, 0.78, -50.39), new THREE.Vector3(-72.58, 0.78, -50.17)]);
     // 左侧巷道-回风全长
-    const curveTunnelMajor = this.generateSmokePath(['dian21', 'dian22']);
+    const curveTunnelMajor = this.generateSmokePath([new THREE.Vector3(86.55, 0.78, -50.39), new THREE.Vector3(-72.58, 0.78, -50.17)]);
 
     const group1 = new THREE.Group();
-    const smokeFan1Right = new Smoke('/model/img/texture-smoke.png', '#ffffff', 10, 0.75, 0.5, 400);
+    const smokeFan1Right = new Smoke('/model/img/texture-smoke.png', '#ffffff', 1, 0.75, 0.5, 600);
     smokeFan1Right.setPath(curveFan1Right);
     this.elements.push(smokeFan1Right);
     const smokeFan2Right = new Smoke('/model/img/texture-smoke.png', '#ffffff', 10, 0.75, 0.5, 400);
     smokeFan2Right.setPath(curveFan2Right);
     this.elements.push(smokeFan2Right);
-    const smokeFan1Left = new Smoke('/model/img/texture-smoke.png', '#ffffff', 10, 0.75, 0.5, 400);
+    const smokeFan1Left = new Smoke('/model/img/texture-smoke.png', '#ffffff', 10, 0.75, 0.5, 600);
     smokeFan1Left.setPath(curveFan1Left);
     this.elements.push(smokeFan1Left);
     const smokeFan2Left = new Smoke('/model/img/texture-smoke.png', '#ffffff', 10, 0.75, 0.5, 400);
     smokeFan2Left.setPath(curveFan2Left);
     this.elements.push(smokeFan2Left);
-    const smokeTunnelRight = new Smoke('/model/img/texture-smoke.png', '#ffffff', 0, 0.35, 1.5, 200);
+    const smokeTunnelRight = new Smoke('/model/img/texture-smoke.png', '#ffffff', 0, 0.35, 1.5, 150);
     smokeTunnelRight.setPath(curveTunnelRight);
     this.elements.push(smokeTunnelRight);
-    const smokeTunnelLeft = new Smoke('/model/img/texture-smoke.png', '#ffffff', 0, 0.35, 1.5, 200);
+    const smokeTunnelLeft = new Smoke('/model/img/texture-smoke.png', '#ffffff', 0, 0.35, 1.5, 150);
     smokeTunnelLeft.setPath(curveTunnelLeft);
     this.elements.push(smokeTunnelLeft);
-    const smokeTunnelMajor = new Smoke('/model/img/texture-smoke.png', '#ffffff', 0, 0.35, 1.5, 200);
+    const smokeTunnelMajor = new Smoke('/model/img/texture-smoke.png', '#ffffff', 0, 0.35, 1.5, 150);
     smokeTunnelMajor.setPath(curveTunnelMajor);
     this.elements.push(smokeTunnelMajor);
 
@@ -379,13 +438,9 @@ class ModelContext {
   }
 
   /** 生成适用于 Smoke 的曲线数据，输入途径点，输出路径，如果是进风类型，首个线段将有扩散效果，出风则是末尾线段有扩散效果 */
-  generateSmokePath(namelist: string[], airIn?: boolean, airOut?: boolean) {
+  generateSmokePath(points: THREE.Vector3[], airIn?: boolean, airOut?: boolean) {
     if (!this.group) return;
     const result: any[] = [];
-    const points: THREE.Vector3[] = namelist.map((name) => {
-      const obj = this.group?.getObjectByName(name);
-      return obj?.position as THREE.Vector3;
-    });
     for (let index = 1; index < points.length; index++) {
       const path0 = points[index - 1];
       const path1 = points[index];
@@ -394,21 +449,21 @@ class ModelContext {
         path1,
         isSpread: false,
         spreadDirection: 0,
-        spreadRang: -10,
+        // spreadRang: -10,
       };
-      if (airIn) {
+      if (airIn && index === 1) {
         // 首个线段需要扩散，由大变小
-        path.isSpread = index === 1;
+        path.isSpread = true;
         path.spreadDirection = -1;
       }
-      if (airOut) {
-        // 首个线段需要扩散，由小变大
-        path.isSpread = index === points.length - 1;
+      if (airOut && index === points.length - 1) {
+        // 末个线段需要扩散，由小变大
+        path.isSpread = false;
         path.spreadDirection = 1;
       }
       if (!airIn && !airOut) {
         path.isSpread = false;
-        path.spreadDirection = 1;
+        path.spreadDirection = 2;
       }
       result.push(path);
     }

src/views/vent/monitorManager/fanLocalMonitor/index.vue

@@ -6,34 +6,40 @@
       <div style="z-index: -1; position: relative" v-if="hasPermission('show:sensorMonitor')">
         <div class="elementTag" id="inputBox0">
           <div class="elementContent" v-if="selectData.windInputSpeed1 || selectData.windInputSpeed_merge">
-            <p v-if="selectData.windInputSpeed1 || selectData.windInputSpeed_merge"
-              >局扇工作面风速：<span class="value">{{
-                selectData.windInputSpeed1 ? selectData.windInputSpeed1 : selectData.windInputSpeed_merge ? selectData.windInputSpeed_merge : '-'
-              }}</span>
+            <p v-if="selectData.windInputSpeed1 || selectData.windInputSpeed_merge">
+              局扇工作面风速：
+              <span class="value">
+                {{
+                  selectData.windInputSpeed1 ? selectData.windInputSpeed1 : selectData.windInputSpeed_merge ? selectData.windInputSpeed_merge : '-'
+                }}
+              </span>
               <span class="unit"> m/s</span>
             </p>
-            <p v-if="selectData.windQuantity1 || selectData.inletAirVolume_merge"
-              >风筒入口风量：<span class="value">{{
-                selectData.windQuantity1 ? selectData.windQuantity1 : selectData.inletAirVolume_merge ? selectData.inletAirVolume_merge : '-'
-              }}</span>
+            <p v-if="selectData.windQuantity1 || selectData.inletAirVolume_merge">
+              风筒入口风量：
+              <span class="value">
+                {{ selectData.windQuantity1 ? selectData.windQuantity1 : selectData.inletAirVolume_merge ? selectData.inletAirVolume_merge : '-' }}
+              </span>
               <span class="unit"> m³/min</span>
             </p>
           </div>
         </div>
         <div class="elementTag" id="inputBox1">
           <div class="elementContent" v-if="selectData.windSpeed1 || selectData.gas3 || selectData.windQuantity1 || selectData.inletAirVolume_merge">
-            <p v-if="selectData.windSpeed1"
-              >风筒入口风速：<span class="value">{{ selectData.windSpeed1 ? selectData.windSpeed1 : '-' }}</span> <span class="unit"> m/s</span></p
-            >
-            <p v-if="selectData.windQuantity1 || selectData.inletAirVolume_merge"
-              >风筒入口风量：<span class="value">{{
-                selectData.windQuantity1 ? selectData.windQuantity1 : selectData.inletAirVolume_merge ? selectData.inletAirVolume_merge : '-'
-              }}</span>
+            <p v-if="selectData.windSpeed1">
+              风筒入口风速：
+              <span class="value">{{ selectData.windSpeed1 ? selectData.windSpeed1 : '-' }}</span> <span class="unit"> m/s</span>
+            </p>
+            <p v-if="selectData.windQuantity1 || selectData.inletAirVolume_merge">
+              风筒入口风量：
+              <span class="value">
+                {{ selectData.windQuantity1 ? selectData.windQuantity1 : selectData.inletAirVolume_merge ? selectData.inletAirVolume_merge : '-' }}
+              </span>
               <span class="unit"> m³/min</span>
             </p>
             <p v-if="selectData.gas3"
-              >风筒入口瓦斯浓度: <span class="value">{{ selectData.gas3 ? selectData.gas3 : '-' }}</span> <span class="unit"> %</span></p
-            >
+              >风筒入口瓦斯浓度: <span class="value">{{ selectData.gas3 ? selectData.gas3 : '-' }}</span> <span class="unit"> %</span>
+            </p>
           </div>
         </div>
         <div class="elementTag" id="outBox">
@@ -160,51 +166,51 @@
           </div>
         </div>
         <div class="elementTag" id="T1_1">
-          <div class="elementContent" v-if="fanDualArray[0].gas1">
+          <div class="elementContent" v-if="fanDualArray[0].gasT1">
             <!-- <div class="elementContent"> -->
-            <p v-if="fanDualArray[0].gas1">
-              掘进工作面混合风流处甲烷传感器T₁：
-              <span class="value">{{ fanDualArray[0].gas1 }}</span>
+            <p v-if="fanDualArray[0].gasT1">
+              掘进面甲烷T1：
+              <span class="value">{{ fanDualArray[0].gasT1 }}</span>
               <span class="unit">(%)</span>
             </p>
           </div>
         </div>
         <div class="elementTag" id="T1_2">
-          <div class="elementContent" v-if="fanDualArray[1].gas1">
+          <div class="elementContent" v-if="fanDualArray[1].gasT1">
             <!-- <div class="elementContent"> -->
-            <p v-if="fanDualArray[1].gas1">
-              掘进工作面混合风流处甲烷传感器T₁：
-              <span class="value">{{ fanDualArray[1].gas1 }}</span>
+            <p v-if="fanDualArray[1].gasT1">
+              掘进面甲烷T1：
+              <span class="value">{{ fanDualArray[1].gasT1 }}</span>
               <span class="unit">(%)</span>
             </p>
           </div>
         </div>
         <div class="elementTag" id="T2_1">
-          <div class="elementContent" v-if="fanDualArray[0].gas2">
+          <div class="elementContent" v-if="fanDualArray[0].gasT2">
             <!-- <div class="elementContent"> -->
-            <p v-if="fanDualArray[0].gas2">
-              掘进工作面回风流处甲烷传感器T₂：
-              <span class="value">{{ fanDualArray[0].gas2 }}</span>
+            <p v-if="fanDualArray[0].gasT2">
+              掘进面回风甲烷T2：
+              <span class="value">{{ fanDualArray[0].gasT2 }}</span>
               <span class="unit">(%)</span>
             </p>
           </div>
         </div>
         <div class="elementTag" id="T2_2">
-          <div class="elementContent" v-if="fanDualArray[1].gas2">
+          <div class="elementContent" v-if="fanDualArray[1].gasT2">
             <!-- <div class="elementContent"> -->
-            <p v-if="fanDualArray[1].gas2">
-              掘进工作面回风流处甲烷传感器T₂：
-              <span class="value">{{ fanDualArray[1].gas2 }}</span>
+            <p v-if="fanDualArray[1].gasT2">
+              掘进面回风甲烷T2：
+              <span class="value">{{ fanDualArray[1].gasT2 }}</span>
               <span class="unit">(%)</span>
             </p>
           </div>
         </div>
         <div class="elementTag" id="T3">
-          <div class="elementContent" v-if="fanDualArray[1].gas3">
+          <div class="elementContent" v-if="fanDualArray[1].gasT3">
             <!-- <div class="elementContent"> -->
-            <p v-if="fanDualArray[1].gas3">
-              掘进工作面进风流处甲烷传感器T₃：
-              <span class="value">{{ fanDualArray[1].gas3 }}</span>
+            <p v-if="fanDualArray[1].gasT3">
+              双巷掘进面混合回风流甲烷T3：
+              <span class="value">{{ fanDualArray[1].gasT3 }}</span>
               <span class="unit">(%)</span>
             </p>
           </div>

src/views/vent/monitorManager/gasPumpMonitor/components/gasPumpHome.vue

@@ -15,8 +15,13 @@
     <!-- 布尔台新瓦斯泵模型上的数据 -->
     <div class="elementContent" style="position: absolute; display: none">
       <div v-for="(tag, index) in modelMonitorTags" :key="index" :id="tag.domId" class="modal-monitor-box">
-        <div class="title">{{ tag.title }}</div
-        ><div class="signal-round" :class="{ 'signal-round-gry': selectData[tag.code] != 1, 'signal-round-run': selectData[tag.code] == 1 }"></div>
+        <div class="title">{{ tag.title }}</div>
+        <div
+          v-if="tag.type == 'sign'"
+          class="signal-round"
+          :class="{ 'signal-round-gry': selectData[tag.code] != 1, 'signal-round-run': selectData[tag.code] == 1 }"
+        ></div>
+        <div v-else class="value">{{ selectData[tag.code] }}</div>
       </div>
     </div>
     <div v-if="selectData['netStatus'] == 0" class="device-state">网络断开</div>
@@ -222,7 +227,7 @@
     waterPumpData,
     dewateringPumpData,
     modelMonitor,
-    modelMonitorTags,
+    getModelMonitorTags,
     valveCtrlType,
   } from '../gasPump.data';
   import { list } from '../gasPump.api';
@@ -249,6 +254,7 @@
     },
   });
   const [register, { openModal }] = useModal();
+  const modelMonitorTags = getModelMonitorTags();
   const loading = ref(false);
   const tabActiveKey = ref(1);
   const passwordModalIsShow = ref(false);
@@ -462,9 +468,16 @@
     display: flex;
     align-items: center;
     justify-content: center;
+    .title {
+      margin-right: 5px;
+    }
     .signal-round {
       margin-left: 5px;
     }
+    .value {
+      width: 30px;
+      color: #efae05;
+    }
   }
   .device-state {
     width: 100%;

src/views/vent/monitorManager/gasPumpMonitor/components/gasPumpHomeCC.vue

@@ -6,7 +6,7 @@
       class="FlowSensor-box"
       style="position: absolute; display: none"
     >
-      <div class="elementContent">
+      <!-- <div class="elementContent">
         <fourBorderBg>
           <div v-for="(item, index) in deviceProperty.modelMonitor" :key="index" class="gas-monitor-row">
             <div class="title">{{ item.title }}</div>
@@ -27,8 +27,22 @@
             </template>
           </div>
         </fourBorderBg>
+      </div> -->
+      <div class="elementContent" style="position: absolute; display: none">
+        <div v-for="(tag, index) in modelMonitorTags" :key="index" :id="tag.domId" class="modal-monitor-box">
+          <template v-if="selectData[tag.code]">
+            <div class="title">{{ tag.title }}</div>
+            <div
+              v-if="tag.type == 'sign'"
+              class="signal-round"
+              :class="{ 'signal-round-gry': selectData[tag.code] != 1, 'signal-round-run': selectData[tag.code] == 1 }"
+            ></div>
+            <div v-else class="value">{{ selectData[tag.code] }}</div>
+          </template>
+        </div>
       </div>
     </div>
+
     <div v-if="selectData['netStatus'] == 0" class="device-state">网络断开</div>
     <div class="btn-group">
       <a-button v-if="deviceProperty.detailCtrl.length > 0" class="btn-item" type="primary" @click="openModal">瓦斯泵控制</a-button>
@@ -85,6 +99,21 @@
     </div>
     <div class="lr right-box">
       <div class="item-box sensor-container">
+        <ventBox1 class="">
+          <template #title>
+            <div>泵站监测详情</div>
+          </template>
+          <template #container>
+            <ListItem
+              v-for="(item, index) in deviceProperty.modelMonitor"
+              :key="index"
+              class="w-100% mb-5px"
+              :value="selectData[item.code]"
+              :label="item.title"
+              label-width="250px"
+            />
+          </template>
+        </ventBox1>
         <ventBox1 v-for="(device, rightIndex) in deviceProperty.rightMonitor" :key="rightIndex" class="vent-margin-t-10">
           <template #title>
             <div>{{ device.title }}</div>
@@ -169,7 +198,7 @@
   import { ref, onMounted, onUnmounted, reactive, defineProps, watch, inject, nextTick, onBeforeUnmount } from 'vue';
   import ventBox1 from '/@/components/vent/ventBox1.vue';
   import { setModelType } from '../gasPump.threejs';
-  import { getMonitorData, devicePropertyType } from '../gasPump.data';
+  import { getMonitorData, devicePropertyType, getModelMonitorTags } from '../gasPump.data';
   // import { leftMonitor, rightMonitor, modelMonitor, detailCtrl } from '../gasPump.dataCc2_2';
   import { list } from '../gasPump.api';
   import { SvgIcon } from '/@/components/Icon';
@@ -181,6 +210,7 @@
   import { message } from 'ant-design-vue';
   import fourBorderBg from '/@/components/vent/fourBorderBg.vue';
   import { useCamera } from '/@/hooks/system/useCamera';
+  import ListItem from '@/views/vent/gas/components/list/listItem.vue';
 
   const globalConfig = inject('globalConfig');
 
@@ -205,6 +235,7 @@
     modelMonitor: [] as devicePropertyType[],
     detailCtrl: [] as devicePropertyType[],
   });
+  const modelMonitorTags = getModelMonitorTags();
 
   // 监测数据
   const selectData = reactive({});
@@ -237,6 +268,235 @@
 
   async function getDataSource(systemID) {
     const res = await list({ devicetype: props.deviceType, ids: systemID });
+    // const res = {
+    //   cmd: 'monitordata',
+    //   msgTxt: [
+    //     {
+    //       datalist: [
+    //         {
+    //           msgType: null,
+    //           deviceID: '1773155914577469442',
+    //           strname: '22煤瓦斯泵站',
+    //           strinstallpos: '22煤瓦斯泵站',
+    //           fsectarea: 'null',
+    //           stationname: '22煤瓦斯泵站',
+    //           stationtype: 'redis',
+    //           deviceType: 'pump_under',
+    //           typeName: '地下瓦斯泵站',
+    //           netStatus: 1,
+    //           warnFlag: 0,
+    //           warnLevel: 0,
+    //           warnLevel_str: '正常',
+    //           syswarnLevel: null,
+    //           syswarnLevel_str: null,
+    //           syswarnLevel_des: null,
+    //           warnTime: null,
+    //           readTime: '2025-03-03 15:09:59',
+    //           warnDes: '',
+    //           frontGateOpenCtrl: null,
+    //           rearGateOpenCtrl: null,
+    //           readData: {
+    //             FeedSG101_Ib: '0',
+    //             Starter4_CloseAllow: '0',
+    //             FeedSG101_Ic: '0',
+    //             TemperatureSensor_TemperatureLowAlarm: '0',
+    //             SubmarinePump_MOT_AvgVoltage: '0',
+    //             VSL_LiquidLevelSensor_Level: '0',
+    //             GVL_CloseLimit: '0',
+    //             FeedSG102_Uca: '1242',
+    //             FeedSG102_CBStatus: '1',
+    //             Starter1_SwitchOffOutput: '0',
+    //             FeedSG101_Ia: '0',
+    //             CentrifugalPump2_GVL1_CloseLimit: '1',
+    //             Starter2_RunTimerOpen: '0',
+    //             Starter5_Uab: '0',
+    //             CentrifugalPump1_MOT_PhaseBTemp: '16',
+    //             CentrifugalPump2_GVL1_OpenFail: '0',
+    //             CentrifugalPump1_GVL1_CloseFail: '0',
+    //             CentrifugalPump2_GVL2_OnOutput: '0',
+    //             SubmarinePump2_MOT_Power: '0',
+    //             CentrifugalPump1_MOT_Ic: '0',
+    //             SubmarinePump2_MOT_AvgVoltage: '1121',
+    //             CentrifugalPump2_PU_InterlockReady: '1',
+    //             CentrifugalPump1_MOT_Ib: '0',
+    //             T101_HighVoltSwitch_Temp: '0',
+    //             CentrifugalPump2_PU_Healthy: '1',
+    //             CentrifugalPump1_PU_InterlockStarting: '0',
+    //             SubmarinePump2_PU_Healthy: '1',
+    //             CentrifugalPump1_PU_InterlockStoping: '0',
+    //             SubmarinePump2_MOT_OpenFail: '0',
+    //             CentrifugalPump2_GVL2_CloseFail: '0',
+    //             T101_LowVoltSwith_Current: '0',
+    //             CentrifugalPump2_GVL2_CtrlMode: '0',
+    //             Starter2_RunTimerClose: '0',
+    //             CentrifugalPump1_MOT_OpenFail: '0',
+    //             CentrifugalPump2_MOT_OpenFail: '0',
+    //             Starter2_SwitchOnOutput: '0',
+    //             SubmarinePump1_PU_Healthy: '1',
+    //             CentrifugalPump2_GVL2_CloseLimit: '1',
+    //             CentrifugalPump2_MOT_BackAxleOverTempAlarm: '1',
+    //             GVL_CloseFail: '0',
+    //             CentrifugalPump2_MOT_PhaseBTempAlarm: '0',
+    //             CentrifugalPump2_MOT_PhaseBTemp: '16',
+    //             CentrifugalPump2_GVL1_CloseFail: '0',
+    //             T102_CBStatus: '1',
+    //             SubmarinePump_MOT_OpenFail: '0',
+    //             FeedSG101_CBStatus: '0',
+    //             CentrifugalPump1_MOT_PhaseBTempAlarm: '0',
+    //             FanPre: '-5.0',
+    //             CentrifugalPump2_GVL2_OffOutput: '0',
+    //             Starter5_PLCState: '1',
+    //             CentrifugalPump1_GVL1_CloseLimit: '1',
+    //             FeedSG102_Healthy: '1',
+    //             PumpStopAlarm1: '1',
+    //             FeedSG101_ControlState: '0',
+    //             SubmarinePump_MOT_Power: '0',
+    //             Starter5_CloseAllow: '0',
+    //             CentrifugalPump2_GVL2_CloseReady: '1',
+    //             Starter2_SwitchOnNoReturn: '0',
+    //             CentrifugalPump2_PU_InterlockStoping: '0',
+    //             Starter5_SwitchOnNoReturn: '0',
+    //             T102_HighVoltSwitch_Temp: '49',
+    //             CentrifugalPump1_GVL1_OnOutput: '0',
+    //             Starter1_RunTimerClose: '0',
+    //             GVL_OpenLimit: '0',
+    //             CentrifugalPump1_MOT_BackAxleTemp: '870',
+    //             GVL_OpenFail: '1',
+    //             Starter1_CBStatus: '0',
+    //             CentrifugalPump1_GVL1_OpenLimit: '0',
+    //             CentrifugalPump2_GVL1_CtrlMode: '0',
+    //             CentrifugalPump1_GVL1_OffOutput: '0',
+    //             CentrifugalPump1_MOT_FrontAxleTemp: '870',
+    //             CentrifugalPump2_PU_InterlockStop: '0',
+    //             Starter4_SwitchOffOutput: '0',
+    //             CentrifugalPump2_GVL1_OnOutput: '0',
+    //             CentrifugalPump2_GVL2_OpenFail: '0',
+    //             CentrifugalPump2_PU_HMIStart: '0',
+    //             CentrifugalPump1_MOT_BackAxleOverTempAlarm: '1',
+    //             CentrifugalPump2_GVL2_OpenLimit: '0',
+    //             CentrifugalPump1_PU_InterlockStartFail: '0',
+    //             CentrifugalPump2_GVL2_Healthy: '0',
+    //             SubmarinePump2_MOT_Ic: '0',
+    //             SubmarinePump2_MOT_Ib: '0',
+    //             SubmarinePump2_MOT_Ia: '0',
+    //             Starter3_PLCState: '1',
+    //             CentrifugalPump1_GVL2_OffOutput: '0',
+    //             CentrifugalPump1_PU_Healthy: '0',
+    //             Starter4_SwitchOnOutput: '0',
+    //             FeedSG101_Uca: '0',
+    //             sign: '0',
+    //             T102_HighVoltSwitch_Current: '0',
+    //             CentrifugalPump1_MOT_PhaseATempAlarm: '2',
+    //             CentrifugalPump1_MOT_PhaseATemp: '16',
+    //             CentrifugalPump2_PU_InterlockStart: '0',
+    //             CentrifugalPump2_MOT_FrontAxleTemp: '870',
+    //             GVL_OnOutput: '1',
+    //             Starter3_CBStatus: '0',
+    //             CentrifugalPump1_GVL2_CtrlMode: '0',
+    //             SubmarinePump3_PU_Healthy: '1',
+    //             FeedSG102_ControlState: '1',
+    //             FeedSG101_Healthy: '0',
+    //             VSL_LiquidLevelSensor_HighWaterAlarm: '0',
+    //             CentrifugalPump1_GVL2_OpenFail: '0',
+    //             Starter5_OpenFail: '0',
+    //             Reset: '0',
+    //             GVL_OffOutput: '0',
+    //             Starter2_SwitchOffOutput: '0',
+    //             Starter5_SwitchOffOutput: '0',
+    //             CentrifugalPump1_GVL2_OnOutput: '0',
+    //             FeedSG102_Ic: '0',
+    //             Starter1_PLCState: '1',
+    //             CentrifugalPump1_GVL1_Healthy: '0',
+    //             CentrifugalPump2_MOT_PhaseATempAlarm: '2',
+    //             CentrifugalPump1_MOT_Power: '0',
+    //             CentrifugalPump1_MOT_FrontAxleOverTempAlarm: '1',
+    //             Starter1_SwitchOnOutput: '0',
+    //             CentrifugalPump1_MOT_PhaseCTemp: '16',
+    //             Starter4_CBStatus: '0',
+    //             CentrifugalPump2_GVL1_Healthy: '0',
+    //             T101_LowVoltSwith_SysVoltage: '0',
+    //             CentrifugalPump2_GVL1_OpenLimit: '0',
+    //             FeedSG102_Ia: '0',
+    //             TemperatureSensor_Temp: '8700',
+    //             FeedSG102_Ib: '0',
+    //             FeedSG101_CloseReady: '0',
+    //             Starter3_CloseAllow: '0',
+    //             CentrifugalPump1_GVL1_CtrlMode: '0',
+    //             CentrifugalPump1_MOT_AvgVoltage: '0',
+    //             GVL_CtrlMode: '0',
+    //             CentrifugalPump1_GVL2_CloseLimit: '1',
+    //             SubmarinePump_MOT_Ic: '0',
+    //             CentrifugalPump1_GVL2_CloseFail: '0',
+    //             CentrifugalPump1_GVL2_OpenLimit: '0',
+    //             SubmarinePump_MOT_Ib: '0',
+    //             FeedSG102_CloseReady: '1',
+    //             SubmarinePump_MOT_Ia: '0',
+    //             CentrifugalPump2_PU_InterlockStartFail: '0',
+    //             Starter3_SwitchOffOutput: '0',
+    //             T102_LowVoltSwith_Current: '0',
+    //             CentrifugalPump1_PU_InterlockReady: '0',
+    //             CentrifugalPump2_MOT_AvgVoltage: '1141',
+    //             CentrifugalPump1_GVL1_CloseReady: '0',
+    //             TemperatureSensor_TemperatureHighAlarm: '1',
+    //             Starter2_CBStatus: '0',
+    //             Starter2_PLCState: '1',
+    //             Starter3_SwitchOnOutput: '0',
+    //             Starter1_RunTimerOpen: '0',
+    //             CentrifugalPump2_PU_InterlockStarting: '0',
+    //             CentrifugalPump2_MOT_PhaseCTemp: '16',
+    //             Starter5_Ia: '0',
+    //             CentrifugalPump2_MOT_Ia: '0',
+    //             CentrifugalPump2_MOT_Ib: '0',
+    //             T102_LowVoltSwith_SysVoltage: '1135',
+    //             Starter5_Ic: '0',
+    //             CentrifugalPump1_MOT_Ia: '0',
+    //             Starter5_Ib: '0',
+    //             Starter5_CBStatus: '0',
+    //             T102_HighVoltSwitch_SysVoltage: '9978',
+    //             CentrifugalPump1_MOT_PhaseCTempAlarm: '0',
+    //             T101_CBStatus: '0',
+    //             Starter1_SwitchOnNoReturn: '0',
+    //             CentrifugalPump2_MOT_Ic: '0',
+    //             GVL_Healthy: '1',
+    //             VSL_LiquidLevelSensor_LowWaterAlarm: '1',
+    //             Starter4_PLCState: '1',
+    //             T101_HighVoltSwitch_Current: '0',
+    //             CentrifugalPump2_MOT_BackAxleTemp: '882',
+    //             CentrifugalPump2_GVL1_OffOutput: '0',
+    //             Starter5_SwitchOnOutput: '0',
+    //             CentrifugalPump2_MOT_FrontAxleOverTempAlarm: '1',
+    //             CentrifugalPump2_PU_HMIStop: '0',
+    //             isRun: '-2',
+    //             CentrifugalPump2_MOT_PhaseATemp: '16',
+    //             CentrifugalPump1_GVL2_Healthy: '0',
+    //             CentrifugalPump1_GVL1_OpenFail: '0',
+    //             T101_HighVoltSwitch_SysVoltage: '0',
+    //           },
+    //           readDataDes: null,
+    //           summaryHour: [],
+    //           summaryDay: [],
+    //           history: [],
+    //           dayhistory: [],
+    //           totalInfo: null,
+    //           sign: null,
+    //           cameras: [],
+    //           links: [],
+    //           avgParam: {},
+    //           other1: null,
+    //           other2: null,
+    //           other3: null,
+    //           remarkInfo: null,
+    //           linkInfo: null,
+    //           addrIndex: null,
+    //           warnLogNotOkCount: 0,
+    //           otherInfo: null,
+    //           orderNum: 0,
+    //         },
+    //       ],
+    //       type: 'pump_under',
+    //     },
+    //   ],
+    // };
     const result = res.msgTxt[0]['datalist'][0];
     Object.assign(result, result['readData']);
     return result;
@@ -345,21 +605,24 @@
       background-color: #061c2a55;
       box-shadow: 0 0 15px #3b567f55;
       background-color: #38383833;
-      .gas-monitor-row {
-        display: flex;
-        flex-direction: row;
-        flex-wrap: wrap;
-        color: #fff;
-        line-height: 32px;
-        .title {
-          width: 250px;
-          color: #baeaff;
-        }
-        .value {
-          width: 80px;
-          color: #efae05;
-        }
-      }
+    }
+  }
+  .modal-monitor-box {
+    background-color: #000;
+    color: #fff;
+    padding: 0 5px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    .title {
+      margin-right: 5px;
+    }
+    .signal-round {
+      margin-left: 5px;
+    }
+    .value {
+      width: 30px;
+      color: #efae05;
     }
   }
 

src/views/vent/monitorManager/gasPumpMonitor/gasPump.data.ts

@@ -293,72 +293,157 @@ export const modelMonitor = [
   },
 ];
 
-export const modelMonitorTags = [
-  {
-    domId: 'jsf1',
-    title: '进水阀1#',
-    code: 'CentrifugalPump1_WaterInValve1_OpenLimit',
-    // value: '0',
-    position: [-5.26, 0.28, 0.6],
-  },
-  {
-    domId: 'jsf2',
-    title: '进水阀2#',
-    code: 'CentrifugalPump2_WaterInValve1_OpenLimit',
-    // value: '0',
-    position: [-8.75, 0.3, 0.6],
-  },
-  {
-    domId: 'csf1',
-    title: '出水阀1#',
-    code: 'CentrifugalPump1_WaterOutValve2_OpenLimit',
-    // value: '0',
-    position: [-5.74, 0.35, 0.27],
-  },
-  {
-    domId: 'csf2',
-    title: '出水阀2#',
-    code: 'CentrifugalPump2_WaterOutValve2_OpenLimit',
-    // value: '0',
-    position: [-9.42, 0.35, 0.3],
-  },
-  {
-    domId: 'jqf1',
-    title: '进气阀1#',
-    code: 'CentrifugalPump1_AirInValve1_OpenLimit',
-    // value: '0',
-    position: [-4.41, 1.28, 0.03],
-  },
-  {
-    domId: 'jqf2',
-    title: '进气阀2#',
-    code: 'CentrifugalPump2_AirInValve1_OpenLimit',
-    // value: '0',
-    position: [-7.7, 1.31, -0.14],
-  },
-  {
-    domId: 'cqf1',
-    title: '出气阀1#',
-    code: 'CentrifugalPump1_AirOutValve2_OpenLimit',
-    // value: '0',
-    position: [-6.2, 1.55, 0.06],
-  },
-  {
-    domId: 'cqf2',
-    title: '出气阀2#',
-    code: 'CentrifugalPump2_AirOutValve2_OpenLimit',
-    // value: '0',
-    position: [-9.58, 1.55, -0.13],
-  },
-];
+export const getModelMonitorTags = () => {
+  const { sysOrgCode } = useGlobSetting();
+  // const sysOrgCode = 'sdmtjtcctrk';
+  if (sysOrgCode !== 'sdmtjtcctrk') {
+    return [
+      {
+        domId: 'jsf1',
+        title: '进水阀1#',
+        code: 'CentrifugalPump1_WaterInValve1_OpenLimit',
+        type: 'sign',
+        // value: '0',
+        position: [-5.26, 0.28, 0.6],
+      },
+      {
+        domId: 'jsf2',
+        title: '进水阀2#',
+        code: 'CentrifugalPump2_WaterInValve1_OpenLimit',
+        type: 'sign',
+        // value: '0',
+        position: [-8.75, 0.3, 0.6],
+      },
+      {
+        domId: 'csf1',
+        title: '出水阀1#',
+        code: 'CentrifugalPump1_WaterOutValve2_OpenLimit',
+        type: 'sign',
+        // value: '0',
+        position: [-5.74, 0.35, 0.27],
+      },
+      {
+        domId: 'csf2',
+        title: '出水阀2#',
+        code: 'CentrifugalPump2_WaterOutValve2_OpenLimit',
+        type: 'sign',
+        // value: '0',
+        position: [-9.42, 0.35, 0.3],
+      },
+      {
+        domId: 'jqf1',
+        title: '进气阀1#',
+        code: 'CentrifugalPump1_AirInValve1_OpenLimit',
+        type: 'sign',
+        // value: '0',
+        position: [-4.41, 1.28, 0.03],
+      },
+      {
+        domId: 'jqf2',
+        title: '进气阀2#',
+        code: 'CentrifugalPump2_AirInValve1_OpenLimit',
+        type: 'sign',
+        // value: '0',
+        position: [-7.7, 1.31, -0.14],
+      },
+      {
+        domId: 'cqf1',
+        title: '出气阀1#',
+        code: 'CentrifugalPump1_AirOutValve2_OpenLimit',
+        type: 'sign',
+        // value: '0',
+        position: [-6.2, 1.55, 0.06],
+      },
+      {
+        domId: 'cqf2',
+        title: '出气阀2#',
+        code: 'CentrifugalPump2_AirOutValve2_OpenLimit',
+        type: 'sign',
+        // value: '0',
+        position: [-9.58, 1.55, -0.13],
+      },
+    ];
+  } else {
+    return [
+      {
+        domId: 'jsf1',
+        title: '进水阀1#',
+        code: 'CentrifugalPump1_WaterInValve1_OpenLimit',
+        type: 'sign',
+        // value: '0',
+        position: [-5.26, 0.28, 0.6],
+      },
+      {
+        domId: 'jsf2',
+        title: '进水阀2#',
+        code: 'CentrifugalPump2_WaterInValve1_OpenLimit',
+        type: 'sign',
+        // value: '0',
+        position: [-8.75, 0.3, 0.6],
+      },
+      {
+        domId: 'csf1',
+        title: '出水阀1#',
+        code: 'CentrifugalPump1_WaterOutValve2_OpenLimit',
+        type: 'sign',
+        // value: '0',
+        position: [-5.74, 0.35, 0.27],
+      },
+      {
+        domId: 'csf2',
+        title: '出水阀2#',
+        code: 'CentrifugalPump2_WaterOutValve2_OpenLimit',
+        type: 'sign',
+        // value: '0',
+        position: [-9.42, 0.35, 0.3],
+      },
+      {
+        domId: 'jqf1',
+        title: '进气阀1#开度',
+        code: 'CentrifugalPump1_AirInValve1_OpenLimit',
+        type: 'value',
+        // value: '0',
+        position: [-4.41, 1.28, 0.03],
+      },
+      {
+        domId: 'jqf2',
+        title: '进气阀2#开度',
+        code: 'CentrifugalPump2_AirInValve1_OpenLimit',
+        type: 'value',
+        // value: '0',
+        position: [-7.7, 1.31, -0.14],
+      },
+      {
+        domId: 'cqf1',
+        title: '出气阀1#开度',
+        code: 'CentrifugalPump1_AirOutValve2_OpenLimit',
+        type: 'value',
+        // value: '0',
+        position: [-6.2, 1.55, 0.06],
+      },
+      {
+        domId: 'cqf2',
+        title: '出气阀2#开度',
+        code: 'CentrifugalPump2_AirOutValve2_OpenLimit',
+        type: 'value',
+        // value: '0',
+        position: [-9.58, 1.55, -0.13],
+      },
+    ];
+  }
+};
 
 export function getComponent() {
   const { sysOrgCode } = useGlobSetting();
+  // const sysOrgCode = 'sdmtjtcctrk';
   let gasPumpHome;
   switch (sysOrgCode) {
     case 'sdmtjtbetmk': // 布尔台
       gasPumpHome = defineAsyncComponent(() => import('./components/gasPumpHome.vue'));
       return gasPumpHome;
+    case 'sdmtjtcctrk': // 布尔台
+      gasPumpHome = defineAsyncComponent(() => import('./components/gasPumpHomeCC.vue'));
+      return gasPumpHome;
     default:
       gasPumpHome = defineAsyncComponent(() => import('./components/gasPumpHome.vue'));
       return gasPumpHome;
@@ -366,8 +451,9 @@ export function getComponent() {
 }
 
 export async function getMonitorData(deviceType) {
-  const globSetting = useGlobSetting();
-  switch (globSetting.sysOrgCode) {
+  const { sysOrgCode } = useGlobSetting();
+  // const sysOrgCode = 'sdmtjtcctrk';
+  switch (sysOrgCode) {
     case 'sdmtjtcctmk':
       return await import('./gasPump.dataCc');
     case 'sdmtjtcctrk':

src/views/vent/monitorManager/gasPumpMonitor/gasPump.dataCc2_1.ts

@@ -49,6 +49,21 @@ export const leftMonitor = [
             code: 'Ic',
             type: '',
           },
+          // {
+          //   title: 'A相绕组温度(℃)',
+          //   code: 'PhaseATemp',
+          //   type: '',
+          // },
+          // {
+          //   title: 'B相绕组温度(℃)',
+          //   code: 'PhaseBTemp',
+          //   type: '',
+          // },
+          // {
+          //   title: 'C相绕组温度(℃)',
+          //   code: 'PhaseCTemp',
+          //   type: '',
+          // },
           {
             title: '前轴温度(℃)',
             code: 'FrontAxleTemp',
@@ -110,63 +125,63 @@ export const leftMonitor = [
 ];
 
 export const rightMonitor = [
-  {
-    type: 'table',
-    title: '磁力启动器运行状态',
-    stateHeader: ['设备名称', '断路器', '合闸输出', '分闸输出', '状态'],
-    children: [
-      {
-        title: '启动器1',
-        key: ['Starter1_'],
-        childTitle: ['启动器1'],
-      },
-      {
-        title: '启动器2',
-        key: ['Starter2_'],
-        childTitle: ['启动器2'],
-      },
-      {
-        title: '启动器3',
-        key: ['Starter3_'],
-        childTitle: ['启动器3'],
-      },
-      {
-        title: '启动器4',
-        key: ['Starter4_'],
-        childTitle: ['启动器4'],
-      },
-      {
-        title: '启动器5',
-        key: ['Starter5_'],
-        childTitle: ['启动器5'],
-      },
-    ],
-    list: [
-      {
-        title: '断路器',
-        type: '',
-        code: 'CBStatus',
-        dict: { '1': '合闸', '0': '分闸' },
-      },
-      {
-        title: '合闸输出',
-        type: '',
-        code: 'SwitchOnOutput',
-      },
-      {
-        title: '分闸输出',
-        type: '',
-        code: 'SwitchOffOutput',
-      },
+  // {
+  //   type: 'table',
+  //   title: '磁力启动器运行状态',
+  //   stateHeader: ['设备名称', '断路器', '合闸输出', '分闸输出', '状态'],
+  //   children: [
+  //     {
+  //       title: '启动器1',
+  //       key: ['Starter1_'],
+  //       childTitle: ['启动器1'],
+  //     },
+  //     {
+  //       title: '启动器2',
+  //       key: ['Starter2_'],
+  //       childTitle: ['启动器2'],
+  //     },
+  //     {
+  //       title: '启动器3',
+  //       key: ['Starter3_'],
+  //       childTitle: ['启动器3'],
+  //     },
+  //     {
+  //       title: '启动器4',
+  //       key: ['Starter4_'],
+  //       childTitle: ['启动器4'],
+  //     },
+  //     {
+  //       title: '启动器5',
+  //       key: ['Starter5_'],
+  //       childTitle: ['启动器5'],
+  //     },
+  //   ],
+  //   list: [
+  //     {
+  //       title: '断路器',
+  //       type: '',
+  //       code: 'CBStatus',
+  //       dict: { '1': '合闸', '0': '分闸' },
+  //     },
+  //     {
+  //       title: '合闸输出',
+  //       type: '',
+  //       code: 'SwitchOnOutput',
+  //     },
+  //     {
+  //       title: '分闸输出',
+  //       type: '',
+  //       code: 'SwitchOffOutput',
+  //     },
 
-      {
-        title: '状态',
-        type: '',
-        code: 'PLCState',
-        dict: { '1': '连接', '0': '断开' },
-      },
-    ],
-  },
+  //     {
+  //       title: '状态',
+  //       type: '',
+  //       code: 'PLCState',
+  //       dict: { '1': '连接', '0': '断开' },
+  //     },
+  //   ],
+  // },
   {
     type: 'table',
     title: '阀门运行状态',
@@ -391,28 +406,4 @@ export const modelMonitor = [
     code: 'LiquidLevelSensor_HighWaterAlarm',
     type: 'warning',
   },
-  {
-    title: '1#瓦斯泵A相绕组温度(℃)',
-    code: 'CentrifugalPump1_MOT_PhaseATemp',
-  },
-  {
-    title: '2#瓦斯泵A相绕组温度(℃)',
-    code: 'CentrifugalPump2_MOT_PhaseATemp',
-  },
-  {
-    title: '1#瓦斯泵B相绕组温度(℃)',
-    code: 'CentrifugalPump1_MOT_PhaseBTemp',
-  },
-  {
-    title: '2#瓦斯泵B相绕组温度(℃)',
-    code: 'CentrifugalPump2_MOT_PhaseBTemp',
-  },
-  {
-    title: '1#瓦斯泵C相绕组温度(℃)',
-    code: 'CentrifugalPump1_MOT_PhaseCTemp',
-  },
-  {
-    title: '2#瓦斯泵C相绕组温度(℃)',
-    code: 'CentrifugalPump2_MOT_PhaseCTemp',
-  },
 ];

src/views/vent/monitorManager/gasPumpMonitor/gasPump.dataCc2_2.ts

@@ -56,23 +56,18 @@ export const leftMonitor = [
             type: '',
           },
           {
-            title: '进气阀开度(°)',
-            code: 'GVL1_OpenDegree',
+            title: 'A相绕组温度(℃)',
+            code: 'MOT_PhaseATemp',
             type: '',
           },
           {
-            title: '排气阀开度(°)',
-            code: 'GVL2_OpenDegree',
+            title: 'B相绕组温度(℃)',
+            code: 'MOT_PhaseBTemp',
             type: '',
           },
           {
-            title: '进水阀开度(°)',
-            code: 'GVL4_Status',
-            type: '',
-          },
-          {
-            title: '排水阀开度(°)',
-            code: 'GVL3_Status',
+            title: 'C相绕组温度(℃)',
+            code: 'MOT_PhaseCTemp',
             type: '',
           },
         ],
@@ -153,49 +148,49 @@ export const rightMonitor = [
 ];
 
 export const detailCtrl = [
-  {
-    title: '回路控制',
-    type: [
-      {
-        title: '1回路',
-        childTitle: ['1回路'],
-        key: ['PD13_SG1_Loop1'],
-      },
-      {
-        title: '2回路',
-        childTitle: ['2回路'],
-        key: ['PD13_SG1_Loop2'],
-      },
-      {
-        title: '3回路',
-        childTitle: ['3回路'],
-        key: ['PD13_SG1_Loop3'],
-      },
-      {
-        title: '4回路',
-        childTitle: ['4回路'],
-        key: ['PD13_SG1_Loop4'],
-      },
-    ],
-    items: [
-      {
-        title: '分闸运行',
-        code: '_HMISwitchOff',
-      },
-      {
-        title: '合闸运行',
-        code: '_HMISwitchOn',
-      },
-      {
-        title: '远程短路试验',
-        code: '_HMIShortTest',
-      },
-      {
-        title: '远程漏电试验',
-        code: '_HMILeakageTest',
-      },
-    ],
-  },
+  // {
+  //   title: '回路控制',
+  //   type: [
+  //     {
+  //       title: '1回路',
+  //       childTitle: ['1回路'],
+  //       key: ['PD13_SG1_Loop1'],
+  //     },
+  //     {
+  //       title: '2回路',
+  //       childTitle: ['2回路'],
+  //       key: ['PD13_SG1_Loop2'],
+  //     },
+  //     {
+  //       title: '3回路',
+  //       childTitle: ['3回路'],
+  //       key: ['PD13_SG1_Loop3'],
+  //     },
+  //     {
+  //       title: '4回路',
+  //       childTitle: ['4回路'],
+  //       key: ['PD13_SG1_Loop4'],
+  //     },
+  //   ],
+  //   items: [
+  //     {
+  //       title: '分闸运行',
+  //       code: '_HMISwitchOff',
+  //     },
+  //     {
+  //       title: '合闸运行',
+  //       code: '_HMISwitchOn',
+  //     },
+  //     {
+  //       title: '远程短路试验',
+  //       code: '_HMIShortTest',
+  //     },
+  //     {
+  //       title: '远程漏电试验',
+  //       code: '_HMILeakageTest',
+  //     },
+  //   ],
+  // },
   {
     title: '泵站控制',
     type: [
@@ -230,40 +225,40 @@ export const detailCtrl = [
       },
     ],
   },
-  {
-    title: '阀门控制',
-    type: [
-      {
-        title: '注水阀',
-        childTitle: ['1#注水阀', '2#注水阀'],
-        key: ['PD13_SG1', 'PD13_SG2'],
-      },
-      {
-        title: '抽气阀',
-        childTitle: ['1#抽气阀', '2#抽气阀'],
-        key: ['PD13_SG4', 'PD13_SG6'],
-      },
-      {
-        title: '排气阀',
-        childTitle: ['1#排气阀', '2#排气阀'],
-        key: ['PD13_SG3', 'PD13_SG5'],
-      },
-    ],
-    items: [
-      {
-        title: '开启',
-        code: '_HMIOpen',
-      },
-      {
-        title: '关闭',
-        code: '_HMIClose',
-      },
-      {
-        title: '停止',
-        code: '_HMIStop',
-      },
-    ],
-  },
+  // {
+  //   title: '阀门控制',
+  //   type: [
+  //     {
+  //       title: '注水阀',
+  //       childTitle: ['1#注水阀', '2#注水阀'],
+  //       key: ['PD13_SG1', 'PD13_SG2'],
+  //     },
+  //     {
+  //       title: '抽气阀',
+  //       childTitle: ['1#抽气阀', '2#抽气阀'],
+  //       key: ['PD13_SG4', 'PD13_SG6'],
+  //     },
+  //     {
+  //       title: '排气阀',
+  //       childTitle: ['1#排气阀', '2#排气阀'],
+  //       key: ['PD13_SG3', 'PD13_SG5'],
+  //     },
+  //   ],
+  //   items: [
+  //     {
+  //       title: '开启',
+  //       code: '_HMIOpen',
+  //     },
+  //     {
+  //       title: '关闭',
+  //       code: '_HMIClose',
+  //     },
+  //     {
+  //       title: '停止',
+  //       code: '_HMIStop',
+  //     },
+  //   ],
+  // },
 ];
 
 export const modelMonitor = [
@@ -275,28 +270,4 @@ export const modelMonitor = [
     title: '抽放管道甲烷负压侧1(%)',
     code: 'gas2',
   },
-  {
-    title: '1#瓦斯泵A相绕组温度(℃)',
-    code: 'CentrifugalPump1_MOT_PhaseATemp',
-  },
-  {
-    title: '2#瓦斯泵A相绕组温度(℃)',
-    code: 'CentrifugalPump2_MOT_PhaseATemp',
-  },
-  {
-    title: '1#瓦斯泵B相绕组温度(℃)',
-    code: 'CentrifugalPump1_MOT_PhaseBTemp',
-  },
-  {
-    title: '2#瓦斯泵B相绕组温度(℃)',
-    code: 'CentrifugalPump2_MOT_PhaseBTemp',
-  },
-  {
-    title: '1#瓦斯泵C相绕组温度(℃)',
-    code: 'CentrifugalPump1_MOT_PhaseCTemp',
-  },
-  {
-    title: '2#瓦斯泵C相绕组温度(℃)',
-    code: 'CentrifugalPump2_MOT_PhaseCTemp',
-  },
 ];

src/views/vent/monitorManager/gasPumpMonitor/gasPump.threejs.under.ts

@@ -1,6 +1,6 @@
 import * as THREE from 'three';
 import { CSS3DObject, CSS3DSprite } from 'three/examples/jsm/renderers/CSS3DRenderer.js';
-import { modelMonitorTags } from './gasPump.data';
+import { getModelMonitorTags } from './gasPump.data';
 import ArrowFlow from '../../comment/threejs/ArrowFlow';
 // import * as dat from 'dat.gui';
 // const gui = new dat.GUI();
@@ -10,6 +10,7 @@ class gasPumpUnder {
   model;
   modelName = 'gas-pump-underground';
   group: THREE.Object3D | null = null;
+  modelMonitorTags = getModelMonitorTags();
 
   /** 进气管道动画，指总进气连接左边泵的那条 */
   airInA: ArrowFlow | null = null;
@@ -74,8 +75,8 @@ class gasPumpUnder {
   addCssText = () => {
     if (!this.group) return;
     const parentElement = document.getElementById('gas3DCSS') as HTMLElement;
-    for (let i = 0; i < modelMonitorTags.length; i++) {
-      const tag = modelMonitorTags[i];
+    for (let i = 0; i < this.modelMonitorTags.length; i++) {
+      const tag = this.modelMonitorTags[i];
       if (!this.group.getObjectByName(tag.domId)) {
         const element = document.getElementById(tag.domId) as HTMLElement;
         if (element) {
@@ -92,6 +93,8 @@ class gasPumpUnder {
 
   /** 根据各个泵的状态控制动画 */
   handleAnimation(monitorData: any) {
+    if (!monitorData) return;
+
     this.airInA?.hideElement();
     this.airInB?.hideElement();
     this.airInR?.hideElement();
@@ -109,8 +112,8 @@ class gasPumpUnder {
     this.waterOutR?.hideElement();
     this.waterOutL?.hideElement();
     // 进气动画控制
-    const jqf1Open = modelMonitorTags.find((e) => e.domId === 'jqf1' && monitorData[e.code] == 1);
-    const jqf2Open = modelMonitorTags.find((e) => e.domId === 'jqf2' && monitorData[e.code] == 1);
+    const jqf1Open = this.modelMonitorTags.find((e) => e.domId === 'jqf1' && monitorData[e.code] > 0);
+    const jqf2Open = this.modelMonitorTags.find((e) => e.domId === 'jqf2' && monitorData[e.code] > 0);
 
     if (jqf1Open && jqf2Open) {
       this.airInB?.showElement();
@@ -125,8 +128,8 @@ class gasPumpUnder {
     }
 
     // 出气动画控制
-    const cqf1Open = modelMonitorTags.find((e) => e.domId === 'cqf1' && monitorData[e.code] == 1);
-    const cqf2Open = modelMonitorTags.find((e) => e.domId === 'cqf2' && monitorData[e.code] == 1);
+    const cqf1Open = this.modelMonitorTags.find((e) => e.domId === 'cqf1' && monitorData[e.code] > 0);
+    const cqf2Open = this.modelMonitorTags.find((e) => e.domId === 'cqf2' && monitorData[e.code] > 0);
 
     if (cqf1Open && cqf2Open) {
       this.airOutB?.showElement();
@@ -141,8 +144,8 @@ class gasPumpUnder {
     }
 
     // 进水动画控制
-    const jsf1Open = modelMonitorTags.find((e) => e.domId === 'jsf1' && monitorData[e.code] == 1);
-    const jsf2Open = modelMonitorTags.find((e) => e.domId === 'jsf2' && monitorData[e.code] == 1);
+    const jsf1Open = this.modelMonitorTags.find((e) => e.domId === 'jsf1' && monitorData[e.code] == 1);
+    const jsf2Open = this.modelMonitorTags.find((e) => e.domId === 'jsf2' && monitorData[e.code] == 1);
 
     if (jsf1Open && jsf2Open) {
       this.waterInB?.showElement();
@@ -157,8 +160,8 @@ class gasPumpUnder {
     }
 
     // 出水动画控制
-    const csf1Open = modelMonitorTags.find((e) => e.domId === 'csf1' && monitorData[e.code] == 1);
-    const csf2Open = modelMonitorTags.find((e) => e.domId === 'csf2' && monitorData[e.code] == 1);
+    const csf1Open = this.modelMonitorTags.find((e) => e.domId === 'csf1' && monitorData[e.code] == 1);
+    const csf2Open = this.modelMonitorTags.find((e) => e.domId === 'csf2' && monitorData[e.code] == 1);
 
     if (csf1Open && csf2Open) {
       this.waterOutB?.showElement();

src/views/vent/monitorManager/handlerMonitor/index.vue

@@ -31,7 +31,7 @@
     },
     list: {
       type: Function,
-      default: (params) => defHttp.get({ url: '/ventanaly-device/safety/ventanalyDevicesetLog/list', params }),
+      default: (params) => defHttp.get({ url: '/safety/ventanalyDevicesetLog/list', params }),
     },
   });
 

src/views/vent/monitorManager/mainFanMonitor/main.api.ts

@@ -11,7 +11,7 @@ enum Api {
   lineList = '/Vmodel/ventanalyModelFanChart/list',
   lineAdd = '/Vmodel/ventanalyModelFanChart/add',
   lineEdit = '/Vmodel/ventanalyModelFanChart/edit',
-  pointMonitor = '/ventanaly-device/monitor/onedevice',
+  pointMonitor = '/monitor/onedevice',
 }
 /**
  * 导出api

src/views/vent/monitorManager/nitrogen/components/nitrogenHomeBLT.vue

@@ -31,8 +31,8 @@
                 <span
                   :class="{
                     'signal-round': true,
-                    'signal-round-run': signal.isWaring && monitorData[signal.code.replace(prefix[0], `${prefix[0]}${groupNum}`)] == '1',
-                    'signal-round-warning': !signal.isWaring && monitorData[signal.code.replace(prefix[0], `${prefix[0]}${groupNum}`)] == '1',
+                    'signal-round-run': !signal.isWaring && monitorData[signal.code.replace(prefix[0], `${prefix[0]}${groupNum}`)] == '1',
+                    'signal-round-warning': signal.isWaring && monitorData[signal.code.replace(prefix[0], `${prefix[0]}${groupNum}`)] == '1',
                     'signal-round-gry': monitorData[signal.code.replace(prefix[0], `${prefix[0]}${groupNum}`)] != '1',
                   }"
                 ></span>

src/views/vent/monitorManager/nitrogen/nitrogen.data.1.ts

@@ -2,7 +2,7 @@ import { ref, defineAsyncComponent } from 'vue';
 import { useGlobSetting } from '/@/hooks/setting';
 export function getNitrogenHome() {
   const { sysOrgCode } = useGlobSetting();
-  // const sysOrgCode = 'yjmdhswmk';
+  // const sysOrgCode = 'sdmtjtbltmk';
   let nitrogenHome;
   switch (sysOrgCode) {
     case 'sdmtjtbltmk': //补连塔

src/views/vent/monitorManager/safetyMonitor/safety.api.ts

@@ -9,7 +9,7 @@ enum Api {
   safetyList = '/monitor/history/getAlarmHistoryData',
   export = '/safety/reportInfo/expComReport?tempName=aqjk',
   subStationList = '/safety/ventanalySubStation/alllist',
-  initSubStation = '/ventanaly-device/monitor/initKafkaDeviceInfo',
+  initSubStation = '/monitor/initKafkaDeviceInfo',
 }
 /**
  * 列表接口

src/views/vent/monitorManager/warningMonitor/warning.api.ts

@@ -4,9 +4,9 @@ enum Api {
   // list = '/safety/ventanalyAlarmLog/list',
   list = '/ventanaly-company/company/index/getEachMineWarnLogList',//获取公司端列表
   getEachMineWarnCountInfo = '/ventanaly-company/company/index/getEachMineWarnCountInfo',//获取公司端信息
-  getWarnCountInfo = '/ventanaly-device/monitor/groupCompany/getWarnCountInfo', // 获取矿端信息
-  getAlarmLogList = '/ventanaly-device/monitor/groupCompany/getAlarmLogList', //获取各矿预警统计信息
-  getManageAutoLogList = '/ventanaly-device/monitor/groupCompany/getManageAutoLogList', //获取各矿工作面智能管控预警信息
+  getWarnCountInfo = '/monitor/groupCompany/getWarnCountInfo', // 获取矿端信息
+  getAlarmLogList = '/monitor/groupCompany/getAlarmLogList', //获取各矿预警统计信息
+  getManageAutoLogList = '/monitor/groupCompany/getManageAutoLogList', //获取各矿工作面智能管控预警信息
 }
 /**
  * 列表接口