From 6d8a04836482aa2f34db87897c42652f84cd4ac9 Mon Sep 17 00:00:00 2001
From: odjbin <1042039504@qq.com>
Date: Tue, 12 Mar 2024 22:05:53 +0800
Subject: [PATCH] =?UTF-8?q?feat=20:=20=E4=BC=A0=E6=84=9F=E5=99=A8=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E6=96=B0=E5=A2=9E=E6=98=BE=E7=A4=BA=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/content/airInfo/AirInfo.vue       |  7 ++++---
 .../content/airInfo/childComps/ItemInfo.vue      |  6 +++---
 src/components/content/badGasInfo/BadGasInfo.vue |  2 +-
 src/components/content/fanInfo/FanInfo.vue       | 16 ++++++++--------
 .../content/windPressure/WindPressureList.vue    |  2 +-
 .../windPressure/childComps/WindPressureItem.vue | 12 +++++-------
 6 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/components/content/airInfo/AirInfo.vue b/src/components/content/airInfo/AirInfo.vue
index 8672ade..74bce11 100644
--- a/src/components/content/airInfo/AirInfo.vue
+++ b/src/components/content/airInfo/AirInfo.vue
@@ -250,7 +250,7 @@ const changeData = (item) => {
     equipmentId: item.equipmentId,
     icon: changeIcon(item.equipmentType),
     name: item.equipmentName.slice(0, 2),
-    max: 120,
+    max: item.maxRange,
     value: item.value,
     point: item.valueThreshold,
     unit: item.unit
@@ -447,7 +447,7 @@ const initChart = (type, values,top) => {
 
       .input-fan {
         cursor: pointer;
-
+        padding-right: 20px;
         &:hover {
           //width: 230px;
           padding-left: 20px;
@@ -471,8 +471,9 @@ const initChart = (type, values,top) => {
 
       .input-fan {
         //margin: 0 26px;
+        padding-right: 20px;
         &:hover {
-          width: 230px;
+          //width: 230px;
           background: #2E5589;
           border-radius: 6px;
         }
diff --git a/src/components/content/airInfo/childComps/ItemInfo.vue b/src/components/content/airInfo/childComps/ItemInfo.vue
index 2eeea68..b0af8f3 100644
--- a/src/components/content/airInfo/childComps/ItemInfo.vue
+++ b/src/components/content/airInfo/childComps/ItemInfo.vue
@@ -110,8 +110,8 @@ const setValue = () => {
   }
 
   .container {
-    width: 422px;
-    height: 24px;
+    width: 468px;
+    height: 25px;
     border-radius: 12px;
     border: 1px solid #0f82af;
     position: relative;
@@ -138,7 +138,7 @@ const setValue = () => {
 
   .value-num {
     height: 37px;
-    width: 160px;
+    //width: 160px;
     font-size: 28px;
     font-family: MicrosoftYaHei;
     color: #d6f1fa;
diff --git a/src/components/content/badGasInfo/BadGasInfo.vue b/src/components/content/badGasInfo/BadGasInfo.vue
index aafd466..138ad92 100644
--- a/src/components/content/badGasInfo/BadGasInfo.vue
+++ b/src/components/content/badGasInfo/BadGasInfo.vue
@@ -201,7 +201,7 @@ const changeData = (item) => {
   return {
     equipmentId: item.equipmentId,
     name: item.equipmentName.slice(0, item.equipmentName.length - 2),
-    max: 120,
+    max: item.maxRange,
     value: item.value,
     point: item.valueThreshold,
     unit: item.unit,
diff --git a/src/components/content/fanInfo/FanInfo.vue b/src/components/content/fanInfo/FanInfo.vue
index 553aad9..ea7149e 100644
--- a/src/components/content/fanInfo/FanInfo.vue
+++ b/src/components/content/fanInfo/FanInfo.vue
@@ -418,7 +418,7 @@ const getTransData = (data) => {
   data?.map(item => {
     tranObj = {
       equipmentId: item.equipmentId,
-      max: 800,
+      max: 600,
       valueA: item.phaseCurrentA,
       pointA: item.phaseCurrentAThreshold,
       valueB: item.phaseCurrentB,
@@ -796,7 +796,7 @@ input[type="number"] {
 }
 
 :deep( .el-radio__label) {
-  font-size: 28px;
+  font-size: 30px;
   color: #38cafb;
   margin-top: -5px;
 }
@@ -928,7 +928,7 @@ input[type="number"] {
         .fan-name {
           width: 39px;
           height: 140px;
-          font-size: 26px;
+          font-size: 29px;
           color: #38cafb;
           line-height: 35px;
           text-align: center;
@@ -946,7 +946,7 @@ input[type="number"] {
             display: flex;
             flex-direction: column;
             justify-content: center;
-            font-size: 28px;
+            font-size: 29px;
             color: #38cafb;
             line-height: 35px;
             gap: 40px;
@@ -959,7 +959,7 @@ input[type="number"] {
               display: flex;
               align-items: center;
               height: 45px;
-              margin-right: 15px;
+              //margin-right: 15px;
               color: #fff;
               background-color: #3eab3f;
               padding-left: 10px;
@@ -1004,9 +1004,9 @@ input[type="number"] {
             flex-direction: column;
             justify-content: center;
             //padding: 0 20px;
-            font-size: 28px;
+            font-size: 29px;
             color: #38cafb;
-            line-height: 37px;
+            line-height: 43px;
             gap: 40px;
 
             .check-box {
@@ -1096,7 +1096,7 @@ input[type="number"] {
         margin-right: 20px;
         margin-left: 26px;
         //height: 37px;
-        font-size: 28px;
+        font-size: 29px;
         color: #FFFFFF;
         cursor: pointer;
 
diff --git a/src/components/content/windPressure/WindPressureList.vue b/src/components/content/windPressure/WindPressureList.vue
index 1d4cd11..fd8b4cb 100644
--- a/src/components/content/windPressure/WindPressureList.vue
+++ b/src/components/content/windPressure/WindPressureList.vue
@@ -210,7 +210,7 @@ const getScreenInfo = (now) => {
     windPressureObj = {
       equipmentId: item.equipmentId,
       equipmentName: item.equipmentName,
-      max: 120,
+      max: item.maxRange,
       value: item.value,
       point: item.valueThreshold,
       unit: item.unit
diff --git a/src/components/content/windPressure/childComps/WindPressureItem.vue b/src/components/content/windPressure/childComps/WindPressureItem.vue
index cf36787..15b7477 100644
--- a/src/components/content/windPressure/childComps/WindPressureItem.vue
+++ b/src/components/content/windPressure/childComps/WindPressureItem.vue
@@ -1,7 +1,7 @@
 <template>
   <div id="wind-pressure-item" :class="{ abnormal:isWaring }">
     <div class="label">
-      <img src="../../../../assets/images/windPressure/icon.png" alt=""/>
+      <img src="@/assets/images/windPressure/icon.png" alt=""/>
       <span>{{params.wp.equipmentName}}</span>
     </div>
     <div class="container" ref="length">
@@ -27,17 +27,15 @@ const params = defineProps({
 const length = ref(null);
 const value = ref(null);
 const point = ref(null);
-onMounted(handleOnMounted);
-
-function handleOnMounted() {
+onMounted(()=>{
   setValue();
-}
+});
 
 watch(() => params.wp.value, () => {
   setValue();
 });
 
-function setValue() {
+const setValue=()=> {
   let width = (params.wp.value * length.value.offsetWidth) / params.wp.max;
   value.value.style.width = `${width}px`;
   let flag = (params.wp.point * length.value.offsetWidth) / params.wp.max;
@@ -107,7 +105,7 @@ let isWaring = computed(() => {
 
   .container {
     width: 500px;
-    height: 24px;
+    height: 25px;
     border-radius: 12px;
     border: 1px solid #0f82af;
     position: relative;