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

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/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 {