From bec69289ac7d2f141253842cb9d2350d04f66639 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=A5=A5=E7=91=9E?= <1131549607@qq.com>
Date: Wed, 17 Sep 2025 10:39:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?9.17=E5=BC=A0=E7=A5=A5=E7=91=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/devicecontrol/officedevice.ts         |  9 +++++++
 .../device-control/office/Personaldevices.vue | 27 ++++---------------
 2 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/src/api/devicecontrol/officedevice.ts b/src/api/devicecontrol/officedevice.ts
index a2ed01b..14d6c50 100644
--- a/src/api/devicecontrol/officedevice.ts
+++ b/src/api/devicecontrol/officedevice.ts
@@ -10,6 +10,15 @@ export function gethomelist(config : object) { // 获取房间信息
 	})
 }
 
+
+export function gethomelistforApp(config : object) { // 获取房间信息
+	return http({
+		url: '/RoomOperation/RoomOperation/gethomelistforApp',
+		method: 'GET',
+		data: config
+	})
+}
+
 export function testcontiont(config : object) { // 获取房间信息
 	return http({
 		url: mqtturl + '/mqttSubclient/mqttSubclient/testgetcontint',
diff --git a/src/pages-home/device-control/office/Personaldevices.vue b/src/pages-home/device-control/office/Personaldevices.vue
index 48b2747..520c629 100644
--- a/src/pages-home/device-control/office/Personaldevices.vue
+++ b/src/pages-home/device-control/office/Personaldevices.vue
@@ -13,30 +13,11 @@
 							<text class="info-value">{{ room.ssbmname }}</text>
 						</view>
 					</view>
+					<!-- 补位元素，确保网格始终保持两列布局 -->
+					<view v-if="floor.rooms.length % 2 !== 0" class="room-placeholder"></view>
 				</view>
 			</view>
 		</view>
-<!-- 		<view class="connection-section">
-			<button v-if="!connected" @click="connectWebSocket" class="connect-btn">
-				连接WebSocket
-			</button>
-
-			<button @click="disconnectWebSocket" class="disconnect-btn">
-				断开连接
-			</button>
-
-			<text :class="['status', connected ? 'connected' : 'disconnected']">
-				{{ connectionStatus }}
-			</text>
-		</view>
-		<view class="message-container">
-			<text class="subtitle">消息记录</text>
-			<scroll-view scroll-y="true" class="message-list">
-				<view v-for="(item, index) in messages" :key="index" :class="['message-item', item.type]">
-					<text class="message-content">{{ item.content }}</text>
-				</view>
-			</scroll-view>
-		</view> -->
 	</view>
 </template>
 
@@ -48,6 +29,7 @@
 	} from 'vue'
 	import {
 		gethomelist,
+		gethomelistforApp,
 		getMqttPushClient,
 		selectfjkzbmforfjid,
 		createdSwitch,
@@ -90,7 +72,8 @@
 
 	//获取房间信息
 	const getofficehomelist = async () => {
-		await gethomelist().then((res) => {
+		//20250811,张祥瑞,修改查询接口
+		await gethomelistforApp().then((res) => {
 			if (res.success) {
 				homelist.value = res.result.map((item, index) => ({
 					...item,

From 9dbae0a56e1f2a8088d6e3521db79e1383be06c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=A5=A5=E7=91=9E?= <1131549607@qq.com>
Date: Thu, 25 Sep 2025 10:19:03 +0800
Subject: [PATCH 2/2] =?UTF-8?q?9.25=E5=BC=A0=E7=A5=A5=E7=91=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 env/.env.development                               | 2 +-
 src/pages-home/device-control/office/ALLleader.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/env/.env.development b/env/.env.development
index 514145c..f2e675f 100644
--- a/env/.env.development
+++ b/env/.env.development
@@ -8,7 +8,7 @@ VITE_SHOW_SOURCEMAP = true
 #VITE_WEBAPP = 'D://opt//AppUpdateTest'
 VITE_WEBAPP = ''
 #VITE_SERVER_BASEURL = 'http://10.75.15.247:8080/jeecg-boot'
-VITE_SERVER_BASEURL = 'http://10.75.166.6:8080/jeecg-boot'
+VITE_SERVER_BASEURL = 'http://10.75.166.170:8080/jeecg-boot'
 #VITE_SERVER_BASEURL = 'http://10.75.173.194:8080/jeecg-boot'
 #VITE_SERVER_BASEURL = 'https://10.75.166.6/test'
 
diff --git a/src/pages-home/device-control/office/ALLleader.vue b/src/pages-home/device-control/office/ALLleader.vue
index c7da6a2..587579b 100644
--- a/src/pages-home/device-control/office/ALLleader.vue
+++ b/src/pages-home/device-control/office/ALLleader.vue
@@ -127,7 +127,7 @@
 			if (res.success) {
 				homelist.value = res.result.map((item, index) => ({
 					...item, // 保留原有字段
-					homezt: 0, // 添加homezt字段，默认为0
+					// homezt: 0, // 添加homezt字段，默认为0
 				}));
 				//添加楼层情况
 			}