From 9cc59c17892a7e69de54e06b5931e78c9b05551c Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期二, 02 九月 2025 09:24:34 +0800
Subject: [PATCH] 添加mqtt登出

---
 packageA/pages/device/control.vue |   65 +++++++++++++++++++-------------
 1 files changed, 38 insertions(+), 27 deletions(-)

diff --git a/packageA/pages/device/control.vue b/packageA/pages/device/control.vue
index 94449b8..e4394da 100644
--- a/packageA/pages/device/control.vue
+++ b/packageA/pages/device/control.vue
@@ -3,7 +3,28 @@
 
 		<cu-custom bgColor="bg-gradual-blue" :isBack="true">
 			<block slot="content">{{option.name}}</block>
-		</cu-custom>
+		</cu-custom>
+	 
+		<view class="fault-box">
+		
+			<image style="width: 100%;border-radius: 20rpx; " src="../../../packageA/static/image/ganzaoji-x.png"
+				mode="aspectFit">
+			</image>
+		
+		
+			<view class="fault-inner">
+				<view class="fault-info" v-for="(item,index) in realFaults" :style="{
+				  position: 'absolute',
+				  top: item.position.top + 'rpx',
+				  left: item.position.left + 'rpx',
+				  fontSize: '24rpx'
+				}">
+					<view :class="['fault-animal', item.type === 1 ? 'fault-marker' : 'warn-marker']"></view>
+					<view :class="['fault-tag', item.type === 1 ? 'fault-text' : 'warn-text']">{{item.name}}</view>
+				</view>
+			</view>
+		</view>
+ 
 		<view class="uni-padding-wrap">
 			<!-- <view class="page-section swiper">
 				<view class="page-section-spacing">
@@ -19,25 +40,6 @@
 				</view>
 			</view> -->
 
-			<view class="fault-box">
-
-				<image style="width: 100%;border-radius: 20rpx; " src="../../../packageA/static/image/ganzaoji-x.png"
-					mode="aspectFit">
-				</image>
-
-
-				<view class="fault-inner">
-					<view class="fault-info" v-for="(item,index) in realFaults" :style="{
-					  position: 'absolute',
-					  top: item.position.top + 'rpx',
-					  left: item.position.left + 'rpx',
-					  fontSize: '24rpx'
-					}">
-						<view :class="['fault-animal', item.type === 1 ? 'fault-marker' : 'warn-marker']"></view>
-						<view :class="['fault-tag', item.type === 1 ? 'fault-text' : 'warn-text']">{{item.name}}</view>
-					</view>
-				</view>
-			</view>
 
 		</view>
 
@@ -83,7 +85,7 @@
 							</view>
 							<view class="h-tr h-tr-2">
 								<view class="h-td">{{model.wind ? '寮�' : '鍏�'}}</view>
-								<view class="h-td">{{$lget(model,'temp2')}}%</view>
+								<view class="h-td">{{$lget(model,'temp2')}}鈩�</view>
 								<view class="h-td">{{$lget(model,'watt')}}kW路h</view>
 								<view class="h-td">{{$lget(model,'steam')}}m鲁</view>
 							</view>
@@ -237,11 +239,20 @@
 					tenantid: null
 				},
 				bannerList: [{
-					imageUrl: '../../static/image/zcy_gzj1.png'
+					imageUrl: '../../static/image/ganzaoji-x.png'
 				}],
 				timer: null,
 				realFaults: [],
 				allFaults: [{
+						id: 0,
+						name: '鎬ュ仠鎶ヨ锛堟�伙級',
+						type: 1,
+						position: {
+							top: 40,
+							left: 230
+						},
+						show: false
+					},{
 						id: 1,
 						name: '璁惧鎬ュ仠锛堟�伙級',
 						type: 1,
@@ -621,7 +632,7 @@
 								break;
 								//topic 瀹炴椂鎶ヨ
 							case topics.realFaultTopic:
-							case topics.oneceFaultTopic:
+							case topics.oneceFaultTopic:
 								if (!this.model.connected) {
 									return false
 								}
@@ -658,8 +669,6 @@
 					};
 
 				}
-				console.error(this.model)
-
 
 			},
 			handleEquStatusUpdate(wdata) {
@@ -770,7 +779,7 @@
 				}
 
 				this.$mqttTool.publish(opts).then(res => {
-					console.error(res)
+					//console.error(res)
 				})
 
 			},
@@ -873,7 +882,9 @@
 	.fault-box {
 		width: 100%;
 		height: 460rpx;
-		position: relative;
+		position: relative;
+		overflow: hidden;
+	 
 
 
 		.fault-inner {

--
Gitblit v1.9.3