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

src/router/routes/basic.ts

@@ -87,11 +87,22 @@ export const QIANKUN_ROUTE: AppRouteRecordRaw = {
       ver: '1',
     },
     {
+      path: '/micro-vent-3dModal/modelchannel/model3D/home',
+      name: 'model3D-home',
+      component: () => import('/@/views/vent/home/colliery/index.vue'),
+      meta: {
+        title: '通防综合管控',
+        hideBreadcrumb: true,
+        hideMenu: true,
+      },
+      ver: '1',
+    },
+    {
       path: '/micro-need-air/:path(.*)*',
       name: QIANKUN_ROUTE_NAME,
       component: QIANKUN_COMPONENT,
       meta: {
-        title: '子应用',
+        title: '需风量分析系统',
         hideBreadcrumb: true,
         hideMenu: true,
       },

src/utils/threejs/main.worker.ts

@@ -59,7 +59,7 @@ export function initModalWorker() {
     'fire/laneway-device_2024-03-19.glb',
     'fire/chamber_2023-06-02.glb',
     // 'fire/workFace_2023-06-29.glb',
-    'fire/tunFace_2025-01-03.glb',
+    'fire/tunFace_2025-01-04.glb',
     'fire/nitrogen_2023-06-02.glb',
     // 'fire/nitrogenUnderground_2023-09-15.glb',
     'fire/nitrogenUnderground_2024-04-09.glb',

src/views/vent/cad/GasGeoViewer.vue

@@ -33,9 +33,10 @@
     selected.value = treeData.value[0];
   }
 
-  function openFile({ id }: Record<string, string> = {}) {
-    if (!id) return;
-    processFile(id).then((path) => {
+  function openFile(data: Record<string, string> = {}) {
+    selected.value = data;
+    if (!data.id) return;
+    processFile(data.id).then((path) => {
       postMessage('MKY_Open_Mxweb', path);
     });
   }

src/views/vent/monitorManager/alarmMonitor/common/measurePoint.vue

@@ -41,7 +41,7 @@
         <div class="text-center">
           {{ item.label }}
         </div>
-        <PredictionCurve style="height: 300px; width: 480px; margin: 15px" :chart="item" :timeout="timeout" />
+        <PredictionCurve style="height: 300px; width: 474px; margin: 15px" :chart="item" :timeout="timeout" />
       </div>
     </div>
   </div>
@@ -259,6 +259,7 @@
         // border: 1px solid var(--vent-base-border);
         box-shadow: inset 0px 0px 10px 1px var(--vent-modal-box-shadow);
         padding: 10px 0;
+        margin: 0 5px 5px 5px;
       }
     }
   }

src/views/vent/monitorManager/dedustMonitor/components/DedustHome.vue

@@ -70,6 +70,13 @@
   // 将列表配置项转换为列表可用的prop
   function transConfigToProp(config, source) {
     return config.map((c) => {
+      if (c.type === 'default' && c.status) {
+        return {
+          ...c,
+          value: c.status.find((e) => _.get(source, c.prop) === e.value)?.label,
+          label: c.label,
+        };
+      }
       return {
         ...c,
         value: _.get(source, c.prop),

src/views/vent/monitorManager/dedustMonitor/dedust.data.ts

@@ -70,6 +70,10 @@ export const dedustStatusConfigA = [
   {
     prop: 'CBStatus',
     label: '运行状态',
+    status: [
+      { value: '1', label: '' },
+      { value: '0', label: '' },
+    ],
   },
   // {
   //   prop: 'EquipmentFault',
@@ -86,6 +90,10 @@ export const dedustStatusConfigA = [
   {
     prop: 'ContorlPSError',
     label: '控制电源故障',
+    status: [
+      { value: '1', label: '' },
+      { value: '0', label: '' },
+    ],
   },
   {
     prop: 'VFDFault',
@@ -124,26 +132,43 @@ export const dedustStatusConfigB = [
 /** 激活与否相关配置 */
 export const dedustStatusConfigC = [
   {
-    prop: 'WindPowerLock',
-    label: '风电闭锁',
-  },
-  {
-    prop: 'GasLock',
-    label: '瓦斯闭锁',
-  },
-  {
     prop: 'Contactorstatus',
     label: '进线接触器KM1',
+    status: [
+      // 0 闭合 1 断开
+      { value: '1', label: '断开' },
+      { value: '0', label: '闭合' },
+    ],
   },
   {
     prop: 'GasLock3_0',
     status: [
-      { value: '1', label: '闭锁' },
+      // 0 正常 1 闭锁
       { value: '0', label: '正常' },
+      { value: '1', label: '闭锁' },
     ],
     label: '瓦斯3.0',
   },
   {
+    type: 'default',
+    prop: 'WindPowerLock',
+    label: '风电闭锁',
+    status: [
+      { value: '1', label: '闭合' },
+      { value: '0', label: '断开' },
+    ],
+  },
+  {
+    type: 'default',
+    prop: 'GasLock',
+    label: '瓦斯闭锁',
+    status: [
+      { value: '1', label: '闭合' },
+      { value: '0', label: '断开' },
+    ],
+  },
+  {
+    type: 'default',
     prop: 'ManualAutoSelect',
     status: [
       { value: '1', label: '自动' },
@@ -152,6 +177,7 @@ export const dedustStatusConfigC = [
     label: '手动自动',
   },
   {
+    type: 'default',
     prop: 'RemLocselectstate',
     status: [
       { value: '1', label: '远控' },

src/views/vent/monitorManager/deviceMonitor/staticSheets/ventilateSheet.vue

@@ -42,11 +42,11 @@
           </tr>
           <tr height="30"> </tr>
           <tr height="30">
-            <td colspan="10" rowspan="2" class="et21"><img src="./images/formula0.png" /></td>
+            <td colspan="10" rowspan="2" class="et21">效率=输出功率/输入功率</td>
             <td colspan="4" rowspan="2" class="et22">输入功率</td>
-            <td colspan="14" rowspan="2" class="et22"><img src="./images/formula1.png" /></td>
+            <td colspan="14" rowspan="2" class="et22">N<sub>通入</sub>=(√3*UIcosψ/1000)η<sub>电</sub>η<sub>传</sub></td>
             <td colspan="4" rowspan="2" class="et22">输出功率</td>
-            <td colspan="10" rowspan="2" class="et21"><img src="./images/formula2.png" /></td>
+            <td colspan="10" rowspan="2" class="et21">N<sub>通出</sub>=H<sub>通</sub>Q*10<sup>-3</sup></td>
             <td colspan="10" rowspan="2" class="et22">效率分静压效率和全压效率</td>
           </tr>
           <tr height="30"> </tr>
@@ -109,7 +109,9 @@
             <td colspan="13" class="et21 bg1">通风巷道米数</td>
             <td colspan="14" class="et21 bg1">通风阻力测定数据</td>
             <td colspan="4" rowspan="2" class="et22">自然风压</td>
-            <td colspan="11" rowspan="2" class="et22"><img src="./images/formula3.png" /></td>
+            <td colspan="11" rowspan="2" class="et22">
+              N<sub>自</sub>=ρ<sub>1</sub>g<sub>1</sub>d<sub>1</sub>-ρ<sub>2</sub>g<sub>2</sub>d<sub>2</sub>
+            </td>
             <td colspan="10" rowspan="2" class="et22">井口两侧空气单位面积重力差</td>
           </tr>
           <tr height="30">
@@ -173,7 +175,7 @@
           <tr height="30">
             <td colspan="8" class="et22">42煤一盘区</td>
             <td colspan="5" class="et22">23833</td>
-            <td colspan="14" rowspan="2" class="et22"><img src="./images/formula4.png" /></td>
+            <td colspan="14" rowspan="2" class="et22">A=1.19*(Q/√H)=1.19/√R</td>
             <td colspan="8" class="et21">测量方法</td>
             <td colspan="8" class="et21">侧身法</td>
             <td colspan="9" class="et21">测定角度</td>
@@ -190,12 +192,14 @@
           </tr>
           <tr height="30">
             <td colspan="20" class="et3">
-              <img src="./images/formula5.png" />
+              P<sub>1</sub>+r<sub>m1</sub>gZ<sub>1</sub>+r<sub>m1</sub>V<sub>1</sub
+              ><sup>2</sup>/2=P<sub>2</sub>+r<sub>m2</sub>gZ<sub>2</sub>+r<sub>m2</sub>V<sub>2</sub><sup>2</sup>/2
             </td>
             <td colspan="32" class="et3">
               P<sub>1</sub>P<sub>2</sub>：井巷风流在1、2两断面上所具有的静压能，Pa；<br />
               ρ<sub>m1</sub>ρ<sub>m2</sub>：断面与基准面之间空气柱的平均密度，kg/m<sup>3</sup>；<br />
-              r<sub>ml</sub>V<sup>2</sup>/2： 井巷风流在1断面上所具有的动压能，Pa；
+              r<sub>m1</sub>V<sup>2</sup>/2： 井巷风流在1断面上所具有的动压能，Pa；<br />
+              r<sub>m2</sub>V<sup>2</sup>/2： 井巷风流在2断面上所具有的动压能，Pa；
             </td>
           </tr>
 
@@ -282,6 +286,7 @@
     border-spacing: 0;
     color: #fff;
     margin: 0 auto;
+    margin-bottom: 10px;
     text-align: center;
   }
   .bg0 {

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

@@ -16,7 +16,7 @@
     <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': tag.value != 1, 'signal-round-run': tag.value == 1 }"></div>
+        ><div class="signal-round" :class="{ 'signal-round-gry': selectData[tag.code] != 1, 'signal-round-run': selectData[tag.code] == 1 }"></div>
       </div>
     </div>
     <div v-if="selectData['netStatus'] == 0" class="device-state">网络断开</div>

src/views/vent/monitorManager/tunFaceMonitor/tunFace.threejs.base.ts

@@ -17,19 +17,17 @@ class WorkFace {
   }
 
   addLight() {
-    const directionalLight = new THREE.DirectionalLight(0xffffff, 1.2);
+    const directionalLight = new THREE.DirectionalLight(0xffffff, 1.3);
     directionalLight.position.set(6.3, 28, 20);
-    this.group?.add(directionalLight);
+    // this.group?.add(directionalLight);
     directionalLight.target = this.group as THREE.Object3D;
-
-    const pointLight = new THREE.PointLight(0xffffff, 1, 1000);
-    pointLight.position.set(45, 51, -4.1);
-    pointLight.shadow.bias = 0.05;
-    this.model.scene.add(pointLight);
-
-    // gui.add(directionalLight.position, 'x', -100, 100);
-    // gui.add(directionalLight.position, 'y', -100, 100);
-    // gui.add(directionalLight.position, 'z', -100, 100);
+    // const pointLight = new THREE.PointLight(0xffffff, 1, 1000);
+    // pointLight.position.set(45, 51, -4.1);
+    // pointLight.shadow.bias = 0.05;
+    // // this.model.scene.add(pointLight);
+    // // gui.add(directionalLight.position, 'x', -100, 100);
+    // // gui.add(directionalLight.position, 'y', -100, 100);
+    // // gui.add(directionalLight.position, 'z', -100, 100);
   }
 
   addChamberText(selectData) {