From bb6aec92d77f07cda72dbf118e4324e6c504efc4 Mon Sep 17 00:00:00 2001
From: zhangqun <179111901@qq.com>
Date: Wed, 14 Dec 2022 13:44:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3app.vue=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=AF=AD=E6=B3=95,=E7=A9=BA=E8=B0=83=E7=9B=91=E6=8E=A7bim?=
 =?UTF-8?q?=E6=A0=87=E7=AD=BE=E4=BC=98=E5=8C=96=E5=92=8C=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                               |  3 +--
 src/components/monitoring/conditioner.vue | 10 +++++-----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 1f39e67..e024033 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -53,8 +53,7 @@
 		margin-right: 5px;
 	}
 
-	.el-menu--horizontal .el-menu .el-menu-item,
-		{
+	.el-menu--horizontal .el-menu .el-menu-item{
 		background-color: #20222A;
 	}
 
diff --git a/src/components/monitoring/conditioner.vue b/src/components/monitoring/conditioner.vue
index e1318cd..2a4f3a0 100644
--- a/src/components/monitoring/conditioner.vue
+++ b/src/components/monitoring/conditioner.vue
@@ -969,16 +969,16 @@ export default {
       let bgImg2 = require("../../../public/img/monitoring/electricity/condition2.png");
       let content = `<div class="lift-block" style="position:relative;width:133px">
 					<div style="background-image:url(${testObject.open == 1 ? bgImg1 : bgImg2
-        });width:133px;height:40px;background-size:100% 100%;color:white" id="temped-${testObject.code
+        });width:133px;height:40px;background-size:100% 100%;background-position:-5px 0;color:white" id="temped-${testObject.code
         }">
 						<div id="condition-${testObject.code
-        }" style="width:93px;position:absolute;height:40px;display:flex;left:40px;top:0;justify-content: space-between;align-items:center;cursor: pointer">
+        }" style="width:103px;position:absolute;height:40px;display:flex;left:30px;top:0;justify-content: space-between;align-items:center;cursor: pointer">
 							<span style="font-size:14px;display:${testObject.code == this.clickCode ? "none" : "inline-block"
         }" >
-								<span style="font-size:25px;font-family:fantasy;" id="temper-${testObject.code
+								<span style="font-size:16px;font-family:fantasy;" id="temper-${testObject.code
         }">${testObject.temSetting}</span>
 								<span id="tempec-${testObject.code
-        }">℃/</span><span style="font-size:25px;font-family:fantasy;" id="tempea-${testObject.code
+        }">℃/</span><span style="font-size:16px;font-family:fantasy;" id="tempea-${testObject.code
         }">${testObject.temCur}</span><span id="tempac-${testObject.code
         }"> ℃</span>
 							</span>
@@ -1025,7 +1025,7 @@ export default {
         };">	
 									<div style="padding: 5px 0;display: flex;align-items: center;justify-content: space-between;">
 										<span style="opacity: 0.5;font-size: 12px;">设备状态:</span>
-										<span style="font-size: 15px;">${objData.open == 1 ? "正常" : "离线"}</span>
+										<span style="font-size: 15px;">${objData.open == 1 ? "开" : "关"}</span>
 									</div>
 								</div>	
 							</div>