Browse Source

[Mod 0000]修改气压样式,解决个别浏览器样式问题

hongrunxia 1 day ago
parent
commit
fd65354d14

+ 3 - 2
src/layouts/default/header/components/weatherBroadcast.vue

@@ -5,7 +5,7 @@
     <a-badge :count="10">
       <a href="#" class="head-example"></a>
     </a-badge> -->
-      <div style="display: flex; flex-direction: row; justify-content: space-between" class="btn-header">
+      <div style="display: flex; flex-direction: row" class="btn-header">
         <img :src="parseWeatherData(weatherObj.text)" class="weather-icon" />
         <span class="unit">{{ weatherObj.pressure }} hPa</span>
         <FileSearchOutlined style="font-size: 18px; color: #fff; line-height: 50px" />
@@ -202,6 +202,7 @@
     font-size: 15px;
     line-height: 47px;
     color: #fff;
+    padding-right: 10px;
   }
   .btn {
     line-height: 30px;
@@ -209,8 +210,8 @@
     display: flex;
   }
   .btn-header {
-    width: 130px;
     height: 50px;
+    margin-right: 20px;
   }
   .weather-icon {
     width: 20px;

+ 16 - 15
src/views/vent/monitorManager/fanLocalMonitor/index.vue

@@ -267,12 +267,12 @@
         <div class="item-header">环境监测与评价分析</div>
         <div class="item-container">
           <div class="tab">
-            <div class="tab-item" :class="{ 'tab-item-active-r': warningMonitorRowIndex === 0 }" @click="selectDevice('warningMonitorRowIndex', 0)"
-              >主机</div
-            >
-            <div class="tab-item" :class="{ 'tab-item-active-r': warningMonitorRowIndex === 1 }" @click="selectDevice('warningMonitorRowIndex', 1)"
-              >备机</div
-            >
+            <div class="tab-item" :class="{ 'tab-item-active-r': warningMonitorRowIndex === 0 }" @click="selectDevice('warningMonitorRowIndex', 0)">{{
+              fanTitles[0]
+            }}</div>
+            <div class="tab-item" :class="{ 'tab-item-active-r': warningMonitorRowIndex === 1 }" @click="selectDevice('warningMonitorRowIndex', 1)">{{
+              fanTitles[1]
+            }}</div>
           </div>
           <div class="container-group container-group-l">
             <div class="warning-group" :style="computedStyle">
@@ -324,12 +324,12 @@
           <div class="item-header">设备故障诊断与预警</div>
           <div class="item-container">
             <div class="tab">
-              <div class="tab-item" :class="{ 'tab-item-active-r': dataMonitorRowIndex == 0 }" @click="selectDevice('dataMonitorRowIndex', 0)"
-                >主机</div
-              >
-              <div class="tab-item" :class="{ 'tab-item-active-r': dataMonitorRowIndex == 1 }" @click="selectDevice('dataMonitorRowIndex', 1)"
-                >备机</div
-              >
+              <div class="tab-item" :class="{ 'tab-item-active-r': dataMonitorRowIndex == 0 }" @click="selectDevice('dataMonitorRowIndex', 0)">{{
+                fanTitles[0]
+              }}</div>
+              <div class="tab-item" :class="{ 'tab-item-active-r': dataMonitorRowIndex == 1 }" @click="selectDevice('dataMonitorRowIndex', 1)">{{
+                fanTitles[1]
+              }}</div>
             </div>
             <div class="container-group container-group-l">
               <div class="warning-group" style="max-height: 200px; overflow-y: auto">
@@ -508,7 +508,7 @@
           <a-tab-pane key="6" tab="风机曲线" v-if="hasPermission('show:fanEcharts')">
             <div v-if="activeKey == '6'" class="tab-item" style="display: flex">
               <div style="width: calc(50% - 20px); height: 100%">
-                <div style="color: var(--vent-font-color); width: 100%; text-align: center; margin: 5px 0px">主机</div>
+                <div style="color: var(--vent-font-color); width: 100%; text-align: center; margin: 5px 0px">{{ fanTitles[0] }}</div>
                 <BarAndLine
                   class="echarts-line"
                   xAxisPropType="readTime"
@@ -796,6 +796,7 @@
     const hasMatchingPermission = hasPermission('fanLocal:pjfx');
     return hasMatchingPermission ? 'max-height: 200px' : '';
   });
+  const fanTitles = globSetting.sysOrgCode === 'zmhjhzmy' ? ['1#风机', '2#风机'] : ['主机', '备机'];
   const modalTypeArr = reactive({
     leftBtnArr: [
       {
@@ -1046,8 +1047,8 @@
         const dataIndex = itemColumn['dataIndex'] as string;
         dataIndexFan1 = dataIndex.startsWith('Fan') ? dataIndex.replace('Fan', 'Fan1') : dataIndex.replace('fan', 'fan1');
         dataIndexFan2 = dataIndex.startsWith('Fan') ? dataIndex.replace('Fan', 'Fan2') : dataIndex.replace('fan', 'fan2');
-        chartsColumnsFan1.push({ ...itemColumn, dataIndex: dataIndexFan1, legend: '主机' + itemColumn['legend'] });
-        chartsColumnsFan2.push({ ...itemColumn, dataIndex: dataIndexFan2, legend: '备机' + itemColumn['legend'] });
+        chartsColumnsFan1.push({ ...itemColumn, dataIndex: dataIndexFan1, legend: fanTitles[0] + itemColumn['legend'] });
+        chartsColumnsFan2.push({ ...itemColumn, dataIndex: dataIndexFan2, legend: fanTitles[1] + itemColumn['legend'] });
       }
     }
   }