From a61aaa8481c858686da5d9d899fdd3d9652e3f35 Mon Sep 17 00:00:00 2001
From: 15133876896-BGG25 <2233720980@qq.com>
Date: Tue, 16 May 2023 18:01:49 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9pm=E5=9B=BE=E4=BE=8B=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E6=98=BE=E7=A4=BApm2.5=E9=97=AE=E9=A2=98=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=9C=BA=E6=A2=B0=E5=88=86=E5=8E=82=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?pm=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/locales/lang/en.ts                                    | 8 ++++----
 src/locales/lang/zh.ts                                    | 8 ++++----
 src/views/PaintShopView/components/pm.vue                 | 4 ++--
 .../generalEnvironmentjixiefenchang/content/right.vue     | 8 ++++----
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/locales/lang/en.ts b/src/locales/lang/en.ts
index 902387f..4f98da8 100644
--- a/src/locales/lang/en.ts
+++ b/src/locales/lang/en.ts
@@ -1,5 +1,5 @@
 /*
- * @FilePath: \wwwd:\code\screenFront\src\locales\lang\en.ts
+ * @FilePath: \gitscreenFront\src\locales\lang\en.ts
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-05-04 16:36:13
@@ -196,9 +196,9 @@ export default {
         'gasDetection':'Gas Test',
         'CH2ODetection':'Alcohol Test',
         'flameDetection':'Fire Test',
-        'EastPumpPressure_Mpa':'East Pump Room Air Pressure(Mpa)',
-        'WestPumpPressure_Mpa':'West Pump Room Air Pressure(Mpa)',
-        'PipelinePressure_Mpa':'Pipeline Pressure(Mpa)',
+        'EastPumpPressure_Mpa':'East Pump Room Air Pressure',
+        'WestPumpPressure_Mpa':'West Pump Room Air Pressure',
+        'PipelinePressure_Mpa':'Pipeline Pressure',
         'normal_Tip':'Normal',
         'abnormal_Tip':'Abnormal',
         'abnormal_Tip_yishang':'Above',
diff --git a/src/locales/lang/zh.ts b/src/locales/lang/zh.ts
index 18a23f5..9909ee6 100644
--- a/src/locales/lang/zh.ts
+++ b/src/locales/lang/zh.ts
@@ -1,5 +1,5 @@
 /*
- * @FilePath: \wwwd:\code\screenFront\src\locales\lang\zh.ts
+ * @FilePath: \gitscreenFront\src\locales\lang\zh.ts
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-05-04 16:36:13
@@ -196,9 +196,9 @@ export default {
         'gasDetection':'燃气检测',
         'CH2ODetection':'甲醛检测',
         'flameDetection':'明火检测',
-        'EastPumpPressure_Mpa':'东泵房气压Mpa',
-        'WestPumpPressure_Mpa':'西泵房气压Mpa',
-        'PipelinePressure_Mpa':'管道压力(Mpa)',
+        'EastPumpPressure_Mpa':'东泵房气压',
+        'WestPumpPressure_Mpa':'西泵房气压',
+        'PipelinePressure_Mpa':'管道压力',
         'normal_Tip':'正常',
         'abnormal_Tip':'异常',
         'abnormal_Tip_yishang':'以上',
diff --git a/src/views/PaintShopView/components/pm.vue b/src/views/PaintShopView/components/pm.vue
index 6474379..c9fb13d 100644
--- a/src/views/PaintShopView/components/pm.vue
+++ b/src/views/PaintShopView/components/pm.vue
@@ -1,5 +1,5 @@
 <!--
- * @FilePath: \screenFront\src\views\PaintShopView\components\pm.vue
+ * @FilePath: \gitscreenFront\src\views\PaintShopView\components\pm.vue
  * @Author: 王路平
  * @文件版本: V1.0.0
  * @Date: 2023-02-10 13:27:36
@@ -121,7 +121,7 @@ const setData = (value: any) => {
           color: "inherit",
         },
         title: {
-          show: false,
+          // show: false,
           offsetCenter: [0, "-20%"],
         },
         data: [
diff --git a/src/views/generalEnvironmentjixiefenchang/content/right.vue b/src/views/generalEnvironmentjixiefenchang/content/right.vue
index 6f5a7d1..7356d49 100644
--- a/src/views/generalEnvironmentjixiefenchang/content/right.vue
+++ b/src/views/generalEnvironmentjixiefenchang/content/right.vue
@@ -144,16 +144,16 @@ async function getPmData(){
   let data={welding:{two:null,ten:null},stuff:{two:null,ten:null},ornaments:{two:null,ten:null}}
   if(resulttwo.code==200){
     resulttwo.data.forEach(res=>{
-      if(data[res.name]){
-        data[res.name].two=res.value
+      if(data[res.enName]){
+        data[res.enName].two=res.value
       }
      
     })
   }
   if(resultten.code==200){
     resultten.data.forEach(res=>{
-      if(data[res.name]){
-      data[res.name].ten=res.value
+      if(data[res.enName]){
+      data[res.enName].ten=res.value
     }
     })
   }