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

src/layouts/default/header/components/weatherBroadcast.vue

@@ -7,7 +7,7 @@
     </a-badge> -->
       <div style="display: flex; flex-direction: row; justify-content: space-between" class="btn-header">
         <img :src="parseWeatherData(weatherObj.text)" class="weather-icon" />
-        <span class="unit">{{ weatherObj.pressure }} Pa</span>
+        <span class="unit">{{ weatherObj.pressure }} hPa</span>
         <FileSearchOutlined style="font-size: 18px; color: #fff; line-height: 50px" />
       </div>
     </div>
@@ -89,9 +89,9 @@ export default defineComponent({
     const ChartsColumnsQY = [
       {
         legend: '气压',
-        seriesName: '(Pa)',
+        seriesName: '(hPa)',
         ymax: 0.8,
-        yname: 'Pa',
+        yname: 'hPa',
         linetype: 'line',
         yaxispos: 'left',
         color: '#00FFA8',

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

@@ -518,7 +518,7 @@
               />
             </div>
           </a-tab-pane>
-          <a-tab-pane key="4" tab="报警历史">
+          <a-tab-pane key="4" :tab="sysOrgCode === 'hnjtymhmk' ? '故障诊断分析' : '报警历史'">
             <div class="tab-item" v-if="activeKey === '4'">
               <AlarmHistoryTable columns-type="alarm" :device-type="deviceType" designScope="alarm-history" :scroll="scroll" />
             </div>
@@ -564,7 +564,7 @@
               />
             </div>
           </a-tab-pane>
-          <a-tab-pane v-if="sysOrgCode === 'hnjtymhmk'" key="8" tab="故障诊断分析">
+          <!-- <a-tab-pane v-if="sysOrgCode === 'hnjtymhmk'" key="8" tab="故障诊断分析">
             <div v-if="activeKey == '8'" class="tab-item">
               <a-table :dataSource="rightColumns" :columns="Warncolumns" :scroll="{ y: 150 }">
                 <template #faultType="{ record }">
@@ -572,7 +572,7 @@
                 </template>
               </a-table>
             </div>
-          </a-tab-pane>
+          </a-tab-pane> -->
         </a-tabs>
       </dv-border-box8>
     </div>