From 8304eac2a45a32b00563c03a2f3fd303ecd5872a Mon Sep 17 00:00:00 2001
From: zhuguifei <zhuguifei@zhuguifeideiMac.local>
Date: 星期五, 22 八月 2025 13:54:36 +0800
Subject: [PATCH] 1.解决微信小程序真机MQTT无法连接问题

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

diff --git a/packageA/pages/device/control.vue b/packageA/pages/device/control.vue
index 94449b8..818c962 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,7 +239,7 @@
 					tenantid: null
 				},
 				bannerList: [{
-					imageUrl: '../../static/image/zcy_gzj1.png'
+					imageUrl: '../../static/image/ganzaoji-x.png'
 				}],
 				timer: null,
 				realFaults: [],
@@ -658,8 +660,6 @@
 					};
 
 				}
-				console.error(this.model)
-
 
 			},
 			handleEquStatusUpdate(wdata) {
@@ -873,7 +873,9 @@
 	.fault-box {
 		width: 100%;
 		height: 460rpx;
-		position: relative;
+		position: relative;
+		overflow: hidden;
+	 
 
 
 		.fault-inner {

--
Gitblit v1.9.3