From fe5545b642fc7339fb91ace144addf5fdc4c3b12 Mon Sep 17 00:00:00 2001
From: fengerli <528575642@qq.com>
Date: Sat, 16 Aug 2025 13:59:17 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=98=E5=8C=96mqtt=E5=8D=8F=E8=AE=AE?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/index.js                    |    4 +-
 pages.json                         |    6 +-
 pages/6170/callPolice/index.vue    |   77 +-
 pages/6170/deviceControl/index.vue | 2780 ++++++++++++++--------------
 pages/common/send/index.vue        |   18 +-
 pages/common/user/index.vue        |    2 +-
 utils/request.js                   |    4 +-
 7 files changed, 1443 insertions(+), 1448 deletions(-)

diff --git a/config/index.js b/config/index.js
index a655ae5..e977462 100644
--- a/config/index.js
+++ b/config/index.js
@@ -6,7 +6,7 @@ const config = {
 		API_PREFIX: '',
 		// MQTT 配置
 		MQTT_HOST: '47.120.79.150',
-		MQTT_PORT: 8083,
+		MQTT_PORT: 9083,
 		MQTT_USERNAME: 'admin',
 		MQTT_PASSWORD: '#YtvpSfCNG'
 	},
@@ -16,7 +16,7 @@ const config = {
 		API_PREFIX: '',
 		// MQTT 配置
 		MQTT_HOST: '47.120.79.150',
-		MQTT_PORT: 8083,
+		MQTT_PORT: 9083,
 		MQTT_USERNAME: 'admin',
 		MQTT_PASSWORD: '#YtvpSfCNG'
 	}
diff --git a/pages.json b/pages.json
index afe1ed9..ff2076b 100644
--- a/pages.json
+++ b/pages.json
@@ -36,7 +36,8 @@
 		{
 			"path": "pages/common/send/index",
 			"style": {
-				"navigationBarTitleText": "发送信息"
+				"navigationBarTitleText": "发送信息",
+				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -66,7 +67,8 @@
 		{
 			"path": "pages/6170/callPolice/index",
 			"style": {
-				"navigationBarTitleText": "报警"
+				"navigationBarTitleText": "报警",
+				"enablePullDownRefresh": true
 			}
 		},
 
diff --git a/pages/6170/callPolice/index.vue b/pages/6170/callPolice/index.vue
index d496b60..2fda5e2 100644
--- a/pages/6170/callPolice/index.vue
+++ b/pages/6170/callPolice/index.vue
@@ -3,9 +3,9 @@
 		<!-- 设备列表 -->
 		<view class="allSelect" @click="selectAll"> 全选</view>
 		<scroll-view class="device-list" scroll-y>
-			<view class="device-card" v-for="(item, index) in deviceList" :key="index" @click="toggleSelect(index)">
+			<view class="device-card" v-for="(item, index) in deviceList" :key="index"  @click="item.onlineStatus === 1 ? toggleSelect(index) : null">
 				<!-- 复选框 -->
-				<view class="checkbox" :class="{ checked: item.checked }">
+				<view class="checkbox" :class="{ checked: item.checked,disabled: item.onlineStatus !== 1  }">
 					<uni-icons v-if="item.checked" type="checkmarkempty" size="18" color="rgb(0, 0, 0)"></uni-icons>
 				</view>
 				<!-- 设备信息 -->
@@ -81,45 +81,6 @@
 			}
 		},
 		methods: {
-			/**
-			 * 获取设备状态（带自动轮询）
-			 * @param {number} val - 功能模式
-			 * @param {string} batchId - 批次ID
-			 * @param {number} [interval=1000] - 轮询间隔（毫秒）
-			 */
-			async getdeviceSTatus(val, batchId, interval = 800) {
-				let retries = 0;
-				const checkStatus = async () => {
-					try {
-						const data = {
-							functionMode: val, //批量的传2
-							batchId: batchId,
-							typeName: this.sendInfo.typeName,
-							deviceImei: this.sendInfo.deviceImei
-						};
-						const res = await deviceRealTimeStatus(data);
-						if (res.code !== 200) {
-							throw new Error(res.msg || '请求失败');
-						}
-						switch (res.data.functionAccess) {
-							case 'OK':
-								return res; // 成功完成
-							case 'ACTIVE':
-								await new Promise(r => setTimeout(r, interval));
-								return checkStatus(); // 继续轮询
-							case 'FAILED':
-								throw new Error('设备操作失败');
-							case 'TIMEOUT':
-								throw new Error('设备响应超时');
-							default:
-								throw new Error('未知状态');
-						}
-					} catch (error) {
-						throw error;
-					}
-				};
-				return checkStatus();
-			},
 			onclosePopup() {
 				this.showPopupFlag = false
 			},
@@ -142,7 +103,7 @@
 				this.loading = true;
 				let data = {
 					pageNum: 1,
-					pageSize: 30,
+					pageSize: 50,
 					deviceType: deviceType
 				}
 				deviceInfo(data).then((res) => {
@@ -195,33 +156,20 @@
 				const selectedDevices = this.deviceList.filter(item => item.checked);
 				const deviceIds = selectedDevices.map(item => item.id);
 				const deviceImeiList = selectedDevices.map(item => item.deviceImei);
-				 const isAlarming = this.pendingAlarmAction == 1;
+				const isAlarming = this.pendingAlarmAction == 1;
 				try {
 					uni.showLoading({
 						title: isAlarming ? '设备报警中...' : '解除报警中...',
 						mask: true
 					});
-					// 2. 准备请求数据
-					const batchId = generateShortId();
 					const data = {
 						deviceIds: deviceIds,
-						batchId: batchId,
 						typeName: this.sendInfo.typeName,
 						deviceImeiList: deviceImeiList,
 						instructValue: this.pendingAlarmAction == 1 ? '1' : '0'
 					};
-					// 3.人员信息
 					const registerRes = await deviceSendAlarmMessage(data);
-					if (registerRes.code !== 200) {
-						uni.showToast({
-							title: registerRes.msg,
-							icon: 'none'
-						})
-						return
-					}
-					// 4. 获取设备状态
-					const statusRes = await this.getdeviceSTatus(2, batchId);
-					if (statusRes.data.functionAccess === 'OK') {
+					if (registerRes.code == 200) {
 						uni.showToast({
 							title: statusRes.msg,
 							icon: 'none'
@@ -231,6 +179,11 @@
 						setTimeout(() => {
 							uni.navigateBack()
 						}, 500)
+					} else {
+						uni.showToast({
+							title: registerRes.msg,
+							icon: 'none'
+						});
 					}
 				} catch (error) {
 					uni.showToast({
@@ -479,4 +432,14 @@
 		border: 1px solid rgba(255, 255, 255, 0.87);
 		background: rgba(18, 18, 18, 1);
 	}
+	.checkbox.disabled {
+	  opacity: 0.5;
+	  background-color: rgba(255, 255, 255, 0.1) !important;
+	  border-color: rgba(255, 255, 255, 0.2) !important;
+	  pointer-events: none; /* 阻止点击事件 */
+	}
+	/* 可选：离线设备的卡片整体置灰 */
+	.device-card[data-offline="true"] {
+	  opacity: 0.6;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/6170/deviceControl/index.vue b/pages/6170/deviceControl/index.vue
index 6fe0ff0..176f31c 100644
--- a/pages/6170/deviceControl/index.vue
+++ b/pages/6170/deviceControl/index.vue
@@ -269,311 +269,318 @@
 </template>
 
 <script>
-import MqttClient from '@/utils/mqtt.js';
-import {
-	generateShortId
-} from '@/utils/function.js';
-import {
-	deviceDetail,
-	registerPersonInfo,
-	deviceSendMessage,
-	deviceShareId,
-	lightModeSettings, //灯光模式设置
-	laserModeSettings, //激光模式设置
-	lightBrightnessSettings, //灯光亮度设置
-	deviceRealTimeStatus //设备状态
-} from '@/api/6170/deviceControl.js'
-import {
-	baseURL,
-	getToken,
-	clientid
-} from '@/utils/request'
-import {
-	deviceSendAlarmMessage
-} from '@/api/6170/callPolice.js'
-export default {
-	data() {
-		return {
-			lastBrightnessTime: 0,
-			isCardSliding: false,
-			cardRect: null,
-			touchStartX: 0,
-			touchStartY: 0,
-			pageLoading: true,
-			navBarHeight: 70 + uni.getSystemInfoSync().statusBarHeight,
-			navTitle: "",
-			sliderValue: 25,
-			lightModeA: false,
-			currentMainMode: '强光',
-			currentlaserMode: "关闭",
-			lightModeB: false,
-			lightModeC: false, //激光提示框
-			items: [],
-			isFormExpanded: true, // 默认展开
-			deviceID: '',
-			itemInfo: {},
-			mqttClient: null,
-			messageToSend: '',
-			personnelInfo: {
-				unitName: '',
-				name: '',
-				position: '',
-				code: '',
-			},
-			deviceInfo: {},
-			activePermissions: [], // 存储当前设备的权限数组
-			isSharedDevice: false, // 标记是否来自分享
-			isRightIconVisible: false,
-			showPopupFlag: false, //是否显示弹框
-			popupMessage: '！',
-			popupConfirmText: '确认',
-			showUploadPopup: false,
-			selectedImage: null, // 添加这个变量来存储选择的图片
-			selectedItemIndex: 0,
-			popupType: 'person', //弹框类型
-			isLaserOn: false,
-			isSending: false,
-			isProcessing: false
-		}
-	},
-	computed: {
-		computedDeviceId() {
-			return this.apiType === 'listA' ? this.deviceID : this.itemInfo.deviceId;
-		},
-		popupTitle() {
-			return this.modeType === 'main' ? '灯光模式' : '激光模式';
-		}
-	},
-	methods: {
-		/**
-		 * 获取设备状态（带自动轮询）
-		 * @param {number} val - 功能模式
-		 * @param {string} batchId - 批次ID
-		 * @param {number} [interval=800] - 轮询间隔（毫秒）
-		 * @param {number} [maxRetries=10] - 最大重试次数
-		 */
-		async getdeviceSTatus(val, batchId, interval = 800) {
-			//let retries = 0;
-			const checkStatus = async () => {
-				// if (retries >= maxRetries) {
-				// 	throw new Error('超过最大重试次数');
-				// }
-				// retries++;
-
-				try {
-					const data = {
-						functionMode: val,
-						batchId: batchId,
-						typeName: this.itemInfo.typeName,
-						deviceImei: this.itemInfo.deviceImei
-					};
-					const res = await deviceRealTimeStatus(data);
-					if (res.code !== 200) {
-						throw new Error(res.msg || '请求失败');
-					}
-					switch (res.data.functionAccess) {
-						case 'OK':
-							return res; // 成功完成
-						case 'ACTIVE':
-							await new Promise(r => setTimeout(r, interval));
-							return checkStatus(); // 继续轮询
-						case 'FAILED':
-							throw new Error('设备操作失败');
-						case 'TIMEOUT':
-							throw new Error('设备响应超时');
-						default:
-							throw new Error('未知状态');
-					}
-				} catch (error) {
-					throw error;
-				}
-			};
-			return checkStatus();
-		},
-		// 点击弹框外的区域关闭
-		closePopup() {
-			this.lightModeA = false;
-			this.lightModeB = false;
-			this.lightModeC = false;
-			this.selectedImage = '';
-			this.file = null;
-		},
-		// *******定位******
-		gpsPosition(item) {
-			// 添加调试日志
-			uni.navigateTo({
-				url: '/pages/common/map/index',
-				events: {
-					ack: function (data) { }
+	import MqttClient from '@/utils/mqtt.js';
+	import {
+		generateShortId
+	} from '@/utils/function.js';
+	import {
+		deviceDetail,
+		registerPersonInfo,
+		deviceSendMessage,
+		deviceShareId,
+		lightModeSettings, //灯光模式设置
+		laserModeSettings, //激光模式设置
+		lightBrightnessSettings, //灯光亮度设置
+		deviceRealTimeStatus //设备状态
+	} from '@/api/6170/deviceControl.js'
+	import {
+		baseURL,
+		getToken,
+		clientid
+	} from '@/utils/request'
+	import {
+		deviceSendAlarmMessage
+	} from '@/api/6170/callPolice.js'
+	export default {
+		data() {
+			return {
+				lastBrightnessTime: 0,
+				isCardSliding: false,
+				cardRect: null,
+				touchStartX: 0,
+				touchStartY: 0,
+				pageLoading: true,
+				navBarHeight: 70 + uni.getSystemInfoSync().statusBarHeight,
+				navTitle: "",
+				sliderValue: 25,
+				lightModeA: false,
+				currentMainMode: '强光',
+				currentlaserMode: "关闭",
+				lightModeB: false,
+				lightModeC: false, //激光提示框
+				items: [],
+				isFormExpanded: true, // 默认展开
+				deviceID: '',
+				itemInfo: {},
+				mqttClient: null,
+				messageToSend: '',
+				personnelInfo: {
+					unitName: '',
+					name: '',
+					position: '',
+					code: '',
 				},
-				success: (res) => {
-					res.eventChannel.emit('Map', {
-						data: item
-					});
-				}
-			})
-		},
-
-		// ***********进度条***********
-		cardTouchStart(e) {
-			if (!this.cardRect) return;
-			this.touchStartX = e.touches[0].clientX;
-			this.touchStartY = e.touches[0].clientY;
-		},
-
-		cardTouchMove(e) {
-			if (!this.cardRect || e.touches.length === 0) return;
-			const deltaX = e.touches[0].clientX - this.touchStartX;
-			const deltaY = e.touches[0].clientY - this.touchStartY;
-
-			// 只有当水平滑动距离大于垂直距离时，才判断为有效滑动
-			if (Math.abs(deltaX) > Math.abs(deltaY)) {
-				this.isCardSliding = true;
-				this.updateSliderFromTouch(e);
+				deviceInfo: {},
+				activePermissions: [], // 存储当前设备的权限数组
+				isSharedDevice: false, // 标记是否来自分享
+				isRightIconVisible: false,
+				showPopupFlag: false, //是否显示弹框
+				popupMessage: '！',
+				popupConfirmText: '确认',
+				showUploadPopup: false,
+				selectedImage: null, // 添加这个变量来存储选择的图片
+				selectedItemIndex: 0,
+				popupType: 'person', //弹框类型
+				isLaserOn: false,
+				isSending: false,
+				isProcessing: false
 			}
 		},
-		cardTouchEnd(e) {
-			if (this.isCardSliding) {
-				// 触摸结束时，调用滑动结束的处理函数来发送最终值
-				this.onSliderChangeEnd({
+		computed: {
+			computedDeviceId() {
+				return this.apiType === 'listA' ? this.deviceID : this.itemInfo.deviceId;
+			},
+			popupTitle() {
+				return this.modeType === 'main' ? '灯光模式' : '激光模式';
+			}
+		},
+		methods: {
+			/**
+			 * 获取设备状态（带自动轮询）
+			 * @param {number} val - 功能模式
+			 * @param {string} batchId - 批次ID
+			 * @param {number} [interval=800] - 轮询间隔（毫秒）
+			 */
+			async getdeviceSTatus(val, batchId, interval = 800) {
+				const checkStatus = async () => {
+					try {
+						const data = {
+							functionMode: val,
+							batchId: batchId,
+							typeName: this.itemInfo.typeName,
+							deviceImei: this.itemInfo.deviceImei
+						};
+						const res = await deviceRealTimeStatus(data);
+						if (res.code !== 200) {
+							throw new Error(res.msg || '请求失败');
+						}
+						switch (res.data.functionAccess) {
+							case 'OK':
+								return res; // 成功完成
+							case 'ACTIVE':
+								await new Promise(r => setTimeout(r, interval));
+								return checkStatus(); // 继续轮询
+							case 'FAILED':
+								throw new Error('设备操作失败');
+							case 'TIMEOUT':
+								throw new Error('设备响应超时');
+							default:
+								throw new Error('未知状态');
+						}
+					} catch (error) {
+						throw error;
+					}
+				};
+				return checkStatus();
+			},
+			// 点击弹框外的区域关闭
+			closePopup() {
+				this.lightModeA = false;
+				this.lightModeB = false;
+				this.lightModeC = false;
+				this.selectedImage = '';
+				this.file = null;
+			},
+			// *******定位******
+			gpsPosition(item) {
+				// 添加调试日志
+				uni.navigateTo({
+					url: '/pages/common/map/index',
+					events: {
+						ack: function(data) {}
+					},
+					success: (res) => {
+						res.eventChannel.emit('Map', {
+							data: item
+						});
+					}
+				})
+			},
+
+			// ***********进度条***********
+			cardTouchStart(e) {
+				if (!this.cardRect) return;
+				this.touchStartX = e.touches[0].clientX;
+				this.touchStartY = e.touches[0].clientY;
+			},
+
+			cardTouchMove(e) {
+				if (!this.cardRect || e.touches.length === 0) return;
+				const deltaX = e.touches[0].clientX - this.touchStartX;
+				const deltaY = e.touches[0].clientY - this.touchStartY;
+
+				// 只有当水平滑动距离大于垂直距离时，才判断为有效滑动
+				if (Math.abs(deltaX) > Math.abs(deltaY)) {
+					this.isCardSliding = true;
+					this.updateSliderFromTouch(e);
+				}
+			},
+			cardTouchEnd(e) {
+				if (this.isCardSliding) {
+					// 触摸结束时，调用滑动结束的处理函数来发送最终值
+					this.onSliderChangeEnd({
+						detail: {
+							value: this.sliderValue
+						}
+					});
+					this.isCardSliding = false;
+				}
+				this.touchStartX = 0;
+				this.touchStartY = 0;
+			},
+
+			updateSliderFromTouch(e) {
+				const touchX = e.touches[0].clientX;
+				const cardLeft = this.cardRect.left;
+				const cardWidth = this.cardRect.width;
+				let relativeX = touchX - cardLeft;
+				// 边界处理
+				if (relativeX < 0) relativeX = 0;
+				if (relativeX > cardWidth) relativeX = cardWidth;
+				const newValue = Math.round((relativeX / cardWidth) * 100);
+				// 调用已有的节流函数来更新值和发送命令
+				this.onSliderChanging({
 					detail: {
-						value: this.sliderValue
+						value: newValue
 					}
 				});
-				this.isCardSliding = false;
-			}
-			this.touchStartX = 0;
-			this.touchStartY = 0;
-		},
-
-		updateSliderFromTouch(e) {
-			const touchX = e.touches[0].clientX;
-			const cardLeft = this.cardRect.left;
-			const cardWidth = this.cardRect.width;
-			let relativeX = touchX - cardLeft;
-			// 边界处理
-			if (relativeX < 0) relativeX = 0;
-			if (relativeX > cardWidth) relativeX = cardWidth;
-			const newValue = Math.round((relativeX / cardWidth) * 100);
-			// 调用已有的节流函数来更新值和发送命令
-			this.onSliderChanging({
-				detail: {
-					value: newValue
+			},
+			onSliderChanging(e) {
+				if (!this.cardRect) return;
+				let value = e.detail.value;
+				if (value < 10) {
+					value = 10;
 				}
-			});
-		},
-		onSliderChanging(e) {
-			if (!this.cardRect) return;
-			let value = e.detail.value;
-			if (value < 10) {
-				value = 10;
-			}
-			this.sliderValue = value; // 实时更新UI
-			const now = Date.now();
-			// 使用节流防止指令发送过于频繁
-			if (now - this.lastBrightnessTime > 200) { // 200毫秒节流
-				this.lastBrightnessTime = now;
-				// 增加轻微的震动反馈，提升手感
-				uni.vibrateShort({
-					type: 'light'
-				});
+				this.sliderValue = value; // 实时更新UI
+				const now = Date.now();
+				// 使用节流防止指令发送过于频繁
+				if (now - this.lastBrightnessTime > 200) { // 200毫秒节流
+					this.lastBrightnessTime = now;
+					// 增加轻微的震动反馈，提升手感
+					uni.vibrateShort({
+						type: 'light'
+					});
+
+					let data = {
+						deviceId: this.computedDeviceId,
+						instructValue: this.sliderValue + '.00',
+						deviceImei: this.itemInfo.deviceImei,
+					}
+					lightBrightnessSettings(data).then((res) => {
+						if (res.code !== 200) {
+							// 可以在这里处理错误，但滑动中不建议用toast
+						}
+					})
+				}
+			},
+			onSliderChangeEnd(e) {
+				if (this.deviceInfo.onlineStatus !== 1) {
+					uni.showToast({
+						title: '设备已离线',
+						icon: 'none'
+					});
+					return;
+				}
+				let value = e.detail.value;
+				if (value < 10) {
+					value = 10;
+				}
+				this.sliderValue = value;
 				let data = {
 					deviceId: this.computedDeviceId,
 					instructValue: this.sliderValue + '.00',
 					deviceImei: this.itemInfo.deviceImei,
 				}
 				lightBrightnessSettings(data).then((res) => {
-					if (res.code !== 200) {
-						// 可以在这里处理错误，但滑动中不建议用toast
+					if (res.code == 200) {
+						// 可以在此处理成功反馈
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: res.msg
+						})
 					}
 				})
-			}
-		},
-		onSliderChangeEnd(e) {
-			let value = e.detail.value;
-			if (value < 10) {
-				value = 10;
-			}
-			this.sliderValue = value;
-			let data = {
-				deviceId: this.computedDeviceId,
-				instructValue: this.sliderValue + '.00',
-				deviceImei: this.itemInfo.deviceImei,
-			}
-			lightBrightnessSettings(data).then((res) => {
-				if (res.code == 200) {
-					// 可以在此处理成功反馈
-				} else {
-					uni.showToast({
-						icon: 'none',
-						title: res.msg
-					})
+			},
+			selectMode(type) {
+				this.modeType = type;
+				this.lightModeA = true;
+				if (type === 'main') {
+					this.items = [{
+							text: '强光',
+							selected: this.currentMainMode === '强光', // 修正匹配条件
+							image: '/static/images/6170/sett.png',
+							instructValue: '1'
+						},
+						{
+							text: '弱光',
+							selected: this.currentMainMode === '弱光',
+							image: '/static/images/6170/rg.png',
+							instructValue: '2'
+						},
+						{
+							text: '爆闪',
+							selected: this.currentMainMode === '爆闪',
+							image: '/static/images/6170/bs.png',
+							instructValue: '3'
+						},
+						{
+							text: '泛光',
+							selected: this.currentMainMode === '泛光',
+							image: '/static/images/6170/settt.png',
+							instructValue: '4'
+						},
+						{
+							text: '关闭',
+							selected: this.currentMainMode === '关闭',
+							image: '/static/images/6170/close.png',
+							instructValue: '0'
+						},
+					];
 				}
-			})
-		},
-		selectMode(type) {
-			this.modeType = type;
-			this.lightModeA = true;
-			if (type === 'main') {
-				this.items = [{
-					text: '强光',
-					selected: this.currentMainMode === '强光', // 修正匹配条件
-					image: '/static/images/6170/sett.png',
-					instructValue: '1'
-				},
-				{
-					text: '弱光',
-					selected: this.currentMainMode === '弱光',
-					image: '/static/images/6170/rg.png',
-					instructValue: '2'
-				},
-				{
-					text: '爆闪',
-					selected: this.currentMainMode === '爆闪',
-					image: '/static/images/6170/bs.png',
-					instructValue: '3'
-				},
-				{
-					text: '泛光',
-					selected: this.currentMainMode === '泛光',
-					image: '/static/images/6170/settt.png',
-					instructValue: '4'
-				},
-				{
-					text: '关闭',
-					selected: this.currentMainMode === '关闭',
-					image: '/static/images/6170/close.png',
-					instructValue: '0'
-				},
-				];
-			}
-		},
-		// 人员信息登录
-		toggleForm() {
-			this.isFormExpanded = !this.isFormExpanded;
-		},
-		onItemClick(index) {
-			const selectedItem = this.items[index];
-			if (selectedItem.text === '激光') {
-				this.lightModeC = true;
-			} else {
-				// 更新选中状态
-				this.items = this.items.map((item, i) => ({
-					...item,
-					selected: i === index
-				}));
-				this.currentMainMode = selectedItem.text;
-				this.selectedItemIndex = index;
-				// 强制更新视图（如果需要）
-				this.$forceUpdate();
-			}
-		},
-		// 灯光模式的确认
-		async handleSumbit() {
-			// 防重复提交
-			if (this.isProcessing) return;
-			let loadingShown = false;
-			try {
+			},
+			// 人员信息登录
+			toggleForm() {
+				this.isFormExpanded = !this.isFormExpanded;
+			},
+			onItemClick(index) {
+				const selectedItem = this.items[index];
+				if (selectedItem.text === '激光') {
+					this.lightModeC = true;
+				} else {
+					// 更新选中状态
+					this.items = this.items.map((item, i) => ({
+						...item,
+						selected: i === index
+					}));
+					this.currentMainMode = selectedItem.text;
+					this.selectedItemIndex = index;
+					// 强制更新视图（如果需要）
+					this.$forceUpdate();
+				}
+			},
+			// 灯光模式的确认
+			handleSumbit() {
+				if (this.deviceInfo.onlineStatus !== 1) {
+					uni.showToast({
+						title: '设备已离线',
+						icon: 'none'
+					});
+					return;
+				}
+				// 防重复提交
+				if (this.isProcessing) return;
+				let loadingShown = false;
 				uni.showLoading({
 					title: '处理中...',
 					mask: true
@@ -589,45 +596,43 @@ export default {
 					deviceImei: this.itemInfo.deviceImei,
 					typeName: this.itemInfo.typeName,
 				};
-				// 第一个请求：设置灯光模式
-				const res = await lightModeSettings(data);
-				if (res.code !== 200) {
+				lightModeSettings(data).then((res) => {
+					if (res.code == 200) {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						uni.hideLoading();
+						this.lightModeA = false;
+						this.isProcessing = false
+						loadingShown = false
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						})
+						this.isProcessing = false
+						loadingShown = false
+						uni.hideLoading();
+					}
+				})
+			},
+			// 激光模式
+			lasermode() {
+				this.lightModeC = true
+			},
+			// 激光确认框提交
+			handleBtn() {
+				if (this.deviceInfo.onlineStatus !== 1) {
 					uni.showToast({
-						title: res.msg,
+						title: '设备已离线',
 						icon: 'none'
-					})
-					return
-				}
-				// 第二个请求：获取设备状态
-				const statusRes = await this.getdeviceSTatus(1);
-				if (statusRes.data.functionAccess === 'OK') {
-					uni.showToast({
-						icon: 'none',
-						title: statusRes.msg
 					});
-					// 关闭弹窗
-					this.lightModeA = false;
+					return;
 				}
-			} catch (error) {
-				uni.showToast({
-					title: error.message,
-					icon: 'none'
-				});
-			} finally {
-				uni.hideLoading();
-				this.isProcessing = false
-			}
-		},
-		// 激光模式
-		lasermode() {
-			this.lightModeC = true
-		},
-		// 激光确认框提交
-		async handleBtn() {
-			// 防重复提交
-			if (this.isProcessing) return;
-			let loadingShown = false;
-			try {
+				// 防重复提交
+				if (this.isProcessing) return;
+				let loadingShown = false;
 				uni.showLoading({
 					title: '处理中...',
 					mask: true
@@ -641,1118 +646,1129 @@ export default {
 					deviceImei: this.itemInfo.deviceImei,
 					typeName: this.itemInfo.typeName,
 				};
-				// 第一个请求
-				const res = await laserModeSettings(data);
-				if (res.code !== 200) {
-					uni.showToast({
-						title: res.msg,
-						icon: 'none'
-					})
-					return
-				}
-				// 第二个请求
-				const statusRes = await this.getdeviceSTatus(1);
-				if (statusRes.data.functionAccess === 'OK') {
-					uni.showToast({
-						icon: 'none',
-						title: statusRes.msg // 添加默认提示
-					});
-					// 更新状态
-					this.isLaserOn = !this.isLaserOn;
-					this.currentlaserMode = this.isLaserOn ? "开启" : "关闭";
-					this.lightModeC = false;
-				}
-
-			} catch (error) {
-				uni.showToast({
-					title: error.message,
-					icon: 'none'
-				});
-			} finally {
-				uni.hideLoading();
-				this.isProcessing = false;
-			}
-		},
-		//激光取消
-		handleDisagree() {
-			this.lightModeC = false
-		},
-		// 上传开机画面
-		uploadStartup() {
-			this.lightModeB = true
-		},
-		// 上传开机画面
-		checkImgUpload() {
-			uni.chooseImage({
-				count: 1,
-				sizeType: ['original', 'compressed'],
-				sourceType: ['album', 'camera'],
-				success: (res) => {
-					// 将选择的图片赋值给selectedImage
-					const file = res.tempFiles[0];
-					const fileSize = file.size || 0;
-					if (fileSize > 2 * 1024 * 1024) {
-						console.log(`文件过大: ${fileSize} 字节`); // 调试日志
+				laserModeSettings(data).then((res) => {
+					if (res.code == 200) {
 						uni.showToast({
-							title: '图片大小不能超过2MB',
 							icon: 'none',
-							duration: 3000
+							title: res.msg
 						});
-						return;
+						// 更新状态
+						this.isLaserOn = !this.isLaserOn;
+						this.currentlaserMode = this.isLaserOn ? "开启" : "关闭";
+						this.lightModeC = false;
+						this.isProcessing = false
+						loadingShown = false
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						});
+						this.isProcessing = false
+						loadingShown = false
 					}
-					this.selectedImage = res.tempFilePaths[0];
-					console.log('选择的图片:', res);
-				},
-				fail: (err) => {
+				})
+			},
+			//激光取消
+			handleDisagree() {
+				this.lightModeC = false
+			},
+			// 上传开机画面
+			uploadStartup() {
+				this.lightModeB = true
+			},
+			// 上传开机画面
+			checkImgUpload() {
+				uni.chooseImage({
+					count: 1,
+					sizeType: ['original', 'compressed'],
+					sourceType: ['album', 'camera'],
+					success: (res) => {
+						// 将选择的图片赋值给selectedImage
+						const file = res.tempFiles[0];
+						const fileSize = file.size || 0;
+						if (fileSize > 2 * 1024 * 1024) {
+							console.log(`文件过大: ${fileSize} 字节`); // 调试日志
+							uni.showToast({
+								title: '图片大小不能超过2MB',
+								icon: 'none',
+								duration: 3000
+							});
+							return;
+						}
+						this.selectedImage = res.tempFilePaths[0];
+						console.log('选择的图片:', res);
+					},
+					fail: (err) => {
+						uni.showToast({
+							title: '选择图片失败',
+							icon: 'none'
+						});
+					}
+				});
+			},
+			// 上传开机画面确认按键
+			handleupload() {
+				let loadingShown = false;
+				if (!this.selectedImage) {
 					uni.showToast({
-						title: '选择图片失败',
+						title: '请上传一张图片',
 						icon: 'none'
 					});
+					return;
 				}
-			});
-		},
-		// 上传开机画面确认按键
-		handleupload() {
-			let loadingShown = false;
-			if (!this.selectedImage) {
-				uni.showToast({
-					title: '请上传一张图片',
-					icon: 'none'
+				if (this.deviceInfo.onlineStatus !== 1) {
+					uni.showToast({
+						title: '设备已离线',
+						icon: 'none'
+					});
+					return;
+				}
+				// 显示上传加载状态
+				uni.showLoading({
+					title: '图片上传中...',
+					mask: true
 				});
-				return;
-			}
-			// 显示上传加载状态
-			uni.showLoading({
-				title: '图片上传中...',
-				mask: true
-			});
-			loadingShown = true
-			uni.uploadFile({
-				url: baseURL + '/app/bjq/device/uploadLogo',
-				filePath: this.selectedImage,
-				name: 'file',
-				formData: {
-					deviceId: this.computedDeviceId,
-					deviceImei: this.itemInfo.deviceImei,
-					typeName: this.itemInfo.typeName,
-				},
-				header: {
-					'Authorization': 'Bearer ' + getToken(),
-					'clientid': clientid(),
-				},
-				complete: (res) => { // 使用 complete 确保 hideLoading 总能被调用
-					try {
-						const responseData = JSON.parse(res.data);
-						if (responseData.code === 200) {
-							// 异步操作链
-							this.getdeviceSTatus(1)
-								.then(statusRes => {
+				loadingShown = true;
+				uni.uploadFile({
+					url: baseURL + '/app/bjq/device/uploadLogo',
+					filePath: this.selectedImage,
+					name: 'file',
+					formData: {
+						deviceId: this.apiType === 'listA' ? this.deviceID : this.itemInfo.deviceId,
+						deviceImei: this.itemInfo.deviceImei,
+						typeName: this.itemInfo.typeName,
+					},
+					header: {
+						'Authorization': 'Bearer ' + getToken(),
+						'clientid': clientid(),
+					},
+					complete: async (res) => {
+						try {
+							uni.hideLoading(); // 首先关闭“
+							const responseData = JSON.parse(res.data);
+							if (responseData.code === 200) {
+								uni.showLoading({
+									title: '等待设备响应...',
+									mask: true
+								});
+								try {
+									// 获取设备状态
+									const statusRes = await this.getdeviceSTatus(1);
 									if (statusRes.data.functionAccess === 'OK') {
+										uni.hideLoading();
 										this.selectedImage = '';
+										this.file = null;
 										this.popupType = 'logo';
 										this.showPopupFlag = true;
 										this.popupMessage = '上传成功';
 										this.lightModeB = false;
 									}
-								})
-								.catch(error => {
+								} catch (error) {
+									uni.hideLoading();
 									uni.showToast({
 										title: error.message,
 										icon: 'none'
 									});
-								})
-								.finally(() => {
-									uni.hideLoading(); // 在所有异步操作完成后关闭loading
+								}
+							} else {
+								uni.hideLoading();
+								uni.showToast({
+									title: responseData.msg,
+									icon: 'none'
 								});
-						} else {
+							}
+						} catch (e) {
+							uni.hideLoading();
 							uni.showToast({
-								title: responseData.msg || '上传失败',
+								title: e.message,
 								icon: 'none'
 							});
-							uni.hideLoading();
 						}
-					} catch (e) {
+					}
+				});
+			},
+			// 分享
+			shareUp() {
+				uni.navigateTo({
+					url: '/pages/6170/share/index',
+					events: {
+						ack: function(data) {}
+					},
+					success: (res) => {
+						res.eventChannel.emit('share', {
+							data: this.itemInfo,
+						});
+					}
+				})
+			},
+			// 发送人员信息
+			async sendPersonnelInfo() {
+				if (this.isSending) return;
+				const requiredFields = [{
+						field: 'unitName',
+						message: '单位名称不能为空'
+					},
+					{
+						field: 'name',
+						message: '姓名不能为空'
+					},
+					{
+						field: 'position',
+						message: '职位不能为空'
+					},
+					{
+						field: 'code',
+						message: 'ID不能为空'
+					}
+				];
+				for (const {
+						field,
+						message
+					}
+					of requiredFields) {
+					if (!this.personnelInfo[field]) {
 						uni.showToast({
-							title: '解析响应失败',
+							title: message,
 							icon: 'none'
 						});
-						uni.hideLoading();
+						return;
 					}
 				}
-			});
-		},
-		// 分享
-		shareUp() {
-			uni.navigateTo({
-				url: '/pages/6170/share/index',
-				events: {
-					ack: function (data) { }
-				},
-				success: (res) => {
-					res.eventChannel.emit('share', {
-						data: this.itemInfo,
-					});
-				}
-			})
-		},
-
-
-		// 发送人员信息
-		async sendPersonnelInfo() {
-			if (this.isSending) return;
-			const requiredFields = [{
-				field: 'unitName',
-				message: '单位名称不能为空'
-			},
-			{
-				field: 'name',
-				message: '姓名不能为空'
-			},
-			{
-				field: 'position',
-				message: '职位不能为空'
-			},
-			{
-				field: 'code',
-				message: 'ID不能为空'
-			}
-			];
-			for (const {
-				field,
-				message
-			}
-				of requiredFields) {
-				if (!this.personnelInfo[field]) {
+				if (this.deviceInfo.onlineStatus !== 1) {
 					uni.showToast({
-						title: message,
+						title: '设备已离线',
 						icon: 'none'
 					});
 					return;
 				}
-			}
-			this.isSending = true;
-			let loadingShown = false;
-			try {
-				uni.showLoading({
-					title: '发送中...',
-					mask: true
-				});
-				loadingShown = true;
-				// 2. 准备请求数据
-				const data = {
-					code: this.personnelInfo.code,
-					name: this.personnelInfo.name,
-					position: this.personnelInfo.position,
-					unitName: this.personnelInfo.unitName,
-					deviceId: this.computedDeviceId,
-					deviceImei: this.itemInfo.deviceImei
-				};
-				// 3. 注册人员信息
-				const registerRes = await registerPersonInfo(data);
-				if (registerRes.code !== 200) {
-					uni.showToast({
-						title: registerRes.msg,
-						icon: 'none'
+				this.isSending = true;
+				let loadingShown = false;
+				try {
+					uni.showLoading({
+						title: '发送中...',
+						mask: true
 					});
-					return;
-				}
-				// 4. 获取设备状态
-				const statusRes = await this.getdeviceSTatus(1);
-				// 只有当状态为'OK'时才显示成功弹窗
-				if (statusRes.data.functionAccess === 'OK') {
-					this.popupType = 'person';
-					this.showPopupFlag = true;
-					this.popupMessage = '人员信息发送成功';
-				}
-			} catch (error) {
-				uni.showToast({
-					title: error.message,
-					icon: 'none'
-				});
-			} finally {
-				uni.hideLoading();
-				this.isSending = false;
-			}
-		},
-		// 所有弹框，确定关闭按钮
-		onPopupConfirm() {
-			this.showPopupFlag = false
-		},
-		// 强制报警（）
-		handlePolice() {
-			this.popupType = 'cancel';
-			this.popupMessage = '确认要解除所选设备的报警状态';
-			this.showPopupFlag = true;
-		},
-		// 解除报警逻辑
-		async onPopupConfirmPolice() {
-			try {
-				uni.showLoading({
-					title: '解除告警中...',
-					mask: true
-				});
-				// 2. 准备请求数据
-				const batchId = generateShortId();
-				const data = {
-					deviceIds: [this.computedDeviceId],
-					batchId: batchId,
-					typeName: this.itemInfo.typeName,
-					deviceImeiList: [this.itemInfo.deviceImei],
-					instructValue: 0, // '解除报警'
-				};
-				// 3.人员信息
-				const registerRes = await deviceSendAlarmMessage(data);
-				if (registerRes.code !== 200) {
-					uni.showToast({
-						title: registerRes.msg,
-						icon: 'none'
-					})
-					return
-				}
-				// 4. 获取设备状态 ，批量的报警，解除报警，发送信息，都传2，单次的都传1
-				const statusRes = await this.getdeviceSTatus(2, batchId);
-				if (statusRes.data.functionAccess === 'OK') {
-					uni.showToast({
-						title: statusRes.msg,
-						icon: 'none'
-					});
-					//  刷新详情接口
-					this.fetchDeviceDetail(this.computedDeviceId, true);
-					uni.$emit('deviceStatusUpdate', {});
-					this.showPopupFlag = false
-				}
-			} catch (error) {
-				uni.showToast({
-					title: error.message,
-					icon: 'none'
-				});
-			} finally {
-				uni.hideLoading();
-			}
-		},
-		// 发送文本消息
-		async sendTextMessage() {
-			// 防重复提交
-			if (this.isSending) return;
-			if (!this.messageToSend) {
-				uni.showToast({
-					title: '请输入要发送的文字',
-					icon: 'none'
-				});
-				return;
-			}
-			this.isSending = true;
-			let loadingShown = false;
-			try {
-				uni.showLoading({
-					title: '正在发送...',
-					mask: true
-				});
-				loadingShown = true;
-				// 2. 准备请求数据
-				const batchId = generateShortId();
-				const data = {
-					sendMsg: this.messageToSend,
-					deviceIds: [this.computedDeviceId],
-					typeName: this.itemInfo.typeName,
-					batchId: batchId,
-					deviceImeiList: [this.itemInfo.deviceImei]
-				};
-				// 3.人员信息
-				const registerRes = await deviceSendMessage(data);
-				if (registerRes.code !== 200) {
-					uni.showToast({
-						title: registerRes.msg,
-						icon: 'none'
-					})
-					return
-				}
-				// 轮询获取状态（重要：这里必须await）
-				const statusRes = await this.getdeviceSTatus(2, batchId);
-				// 只有当状态为'OK'时才显示成功弹窗
-				if (statusRes.data.functionAccess === 'OK') {
-					this.popupType = 'person';
-					this.showPopupFlag = true;
-					this.popupMessage = '信息发送成功';
-				}
-			} catch (error) {
-				uni.showToast({
-					title: error.message,
-					icon: 'none'
-				});
-			} finally {
-				uni.hideLoading();
-				this.isSending = false;
-			}
-		},
-		// 统一处理返回方法
-		handleDeviceData(res, isFromShared = false, isUpdate = false) {
-			if (res.code == 200) {
-				// 最后关闭加载状态
-				this.pageLoading = false
-				this.deviceInfo = res.data
-
-				if (!isUpdate) {
-					this.personnelInfo = {
-						unitName: res.data.personnelInfo.unitName || '',
-						name: res.data.personnelInfo.name || '',
-						code: res.data.personnelInfo.code || '',
-						position: res.data.personnelInfo.position || '',
+					loadingShown = true;
+					// 2. 准备请求数据
+					const data = {
+						code: this.personnelInfo.code,
+						name: this.personnelInfo.name,
+						position: this.personnelInfo.position,
+						unitName: this.personnelInfo.unitName,
+						deviceId: this.computedDeviceId,
+						deviceImei: this.itemInfo.deviceImei
 					};
-					this.messageToSend = res.data.sendMsg || '';
-					this.sliderValue = res.data.lightBrightness || '25'
-					let mainLightMode = parseInt(res.data.mainLightMode);
-					switch (mainLightMode) {
-						case 0:
-							this.currentMainMode = '关闭';
-							break;
-						case 1:
-							this.currentMainMode = '强光';
-							break;
-						case 2:
-							this.currentMainMode = '弱光';
-							break;
-						case 3:
-							this.currentMainMode = '爆闪';
-							break;
-						case 4:
-							this.currentMainMode = '泛光';
-							break;
-						default:
-							console.log('未知的灯光模式:', mainLightMode);
+					const registerRes = await registerPersonInfo(data);
+					if (registerRes.code == 200) {
+						this.popupType = 'person';
+						this.showPopupFlag = true;
+						this.popupMessage = '人员信息发送成功';
+					} else {
+						uni.showToast({
+							title: registerRes.msg,
+							icon: 'none'
+						});
 					}
-					const laserMode = res.data.LaserLightMode;
-					this.isLaserOn = laserMode === 1;
-					this.currentlaserMode = this.isLaserOn ? "开启" : "关闭";
+				} catch (error) {
+					uni.showToast({
+						title: error.msg,
+						icon: 'none'
+					});
+				} finally {
+					uni.hideLoading();
+					this.isSending = false;
 				}
-				// 将权限字符串转换为数组 ["1", "2"]
-				if (isFromShared) {
-					this.isSharedDevice = true;
-					this.activePermissions = res.data.permission ? res.data.permission.split(',') : [];
+			},
+			// 所有弹框，确定关闭按钮
+			onPopupConfirm() {
+				this.showPopupFlag = false
+			},
+			// 强制报警（）
+			handlePolice() {
+				this.popupType = 'cancel';
+				this.popupMessage = '确认要解除所选设备的报警状态';
+				this.showPopupFlag = true;
+			},
+			// 解除报警逻辑
+			async onPopupConfirmPolice() {
+				if (this.deviceInfo.onlineStatus !== 1) {
+					uni.showToast({
+						title: '设备已离线',
+						icon: 'none'
+					});
+					return;
+				}
+				try {
+					uni.showLoading({
+						title: '解除告警中...',
+						mask: true
+					});
+					// 2. 准备请求数据
+					const batchId = generateShortId();
+					const data = {
+						deviceIds: [this.computedDeviceId],
+						batchId: batchId,
+						typeName: this.itemInfo.typeName,
+						deviceImeiList: [this.itemInfo.deviceImei],
+						instructValue: 0, // '解除报警'
+					};
+					// 3.解除告警状态
+					const registerRes = await deviceSendAlarmMessage(data);
+					if (registerRes.code == 200) {
+						uni.showToast({
+							title: statusRes.msg,
+							icon: 'none'
+						});
+						//  刷新详情接口
+						this.fetchDeviceDetail(this.computedDeviceId, true);
+						uni.$emit('deviceStatusUpdate', {});
+						this.showPopupFlag = false
+					} else {
+						uni.showToast({
+							title: registerRes.message,
+							icon: 'none'
+						});
+					}
+				} catch (error) {
+					uni.showToast({
+						title: error.message,
+						icon: 'none'
+					});
+				} finally {
+					uni.hideLoading();
+				}
+			},
+			// 发送文本消息
+			async sendTextMessage() {
+				if (this.deviceInfo.onlineStatus !== 1) {
+					uni.showToast({
+						title: '设备已离线',
+						icon: 'none'
+					});
+					return;
+				}
+				// 防重复提交
+				if (this.isSending) return;
+				if (!this.messageToSend) {
+					uni.showToast({
+						title: '请输入要发送的文字',
+						icon: 'none'
+					});
+					return;
+				}
+				this.isSending = true;
+				let loadingShown = false;
+				try {
+					uni.showLoading({
+						title: '正在发送...',
+						mask: true
+					});
+					loadingShown = true;
+					// 2. 准备请求数据
+					const batchId = generateShortId();
+					const data = {
+						sendMsg: this.messageToSend,
+						deviceIds: [this.computedDeviceId],
+						typeName: this.itemInfo.typeName,
+						batchId: batchId,
+						deviceImeiList: [this.itemInfo.deviceImei]
+					};
+					// 3.人员信息
+					const registerRes = await deviceSendMessage(data);
+					if (registerRes.code !== 200) {
+						uni.showToast({
+							title: registerRes.msg,
+							icon: 'none'
+						})
+						return
+					}
+					// 轮询获取状态（重要：这里必须await）
+					const statusRes = await this.getdeviceSTatus(2, batchId);
+					// 只有当状态为'OK'时才显示成功弹窗
+					if (statusRes.data.functionAccess === 'OK') {
+						this.popupType = 'person';
+						this.showPopupFlag = true;
+						this.popupMessage = '信息发送成功';
+					}
+				} catch (error) {
+					uni.showToast({
+						title: error.message,
+						icon: 'none'
+					});
+				} finally {
+					console.log('失败还是成功了');
+					uni.hideLoading();
+					this.isSending = false;
+				}
+			},
+			// 统一处理返回方法
+			handleDeviceData(res, isFromShared = false, isUpdate = false) {
+				if (res.code == 200) {
+					// 最后关闭加载状态
+					this.pageLoading = false
+					this.deviceInfo = res.data
+
+					if (!isUpdate) {
+						this.personnelInfo = {
+							unitName: res.data.personnelInfo.unitName || '',
+							name: res.data.personnelInfo.name || '',
+							code: res.data.personnelInfo.code || '',
+							position: res.data.personnelInfo.position || '',
+						};
+						this.messageToSend = res.data.sendMsg || '';
+						this.sliderValue = res.data.lightBrightness || '25'
+						let mainLightMode = parseInt(res.data.mainLightMode);
+						// 取主灯光模式初始值
+						this.currentMainMode = this.getMainLightModeLabel(mainLightMode)
+						console.log(this.currentMainMode, 'this.currentMainMode');
+						const laserMode = res.data.LaserLightMode;
+						this.isLaserOn = laserMode === 1;
+						this.currentlaserMode = this.isLaserOn ? "开启" : "关闭";
+					}
+					// 将权限字符串转换为数组 ["1", "2"]
+					if (isFromShared) {
+						this.isSharedDevice = true;
+						this.activePermissions = res.data.permission ? res.data.permission.split(',') : [];
+					} else {
+						this.isSharedDevice = false;
+						this.activePermissions = []; // 非分享设备清空权限
+					}
+
+					// 关闭加载中
+					uni.hideLoading()
+				}
+			},
+			// 检查权限的方法
+			hasPermission(permissionCode) {
+				// 如果还在加载中，直接返回false
+				if (this.pageLoading) return false
+				// 如果不是分享设备，默认有全部权限
+				if (!this.isSharedDevice) return true
+				return this.activePermissions.includes(permissionCode)
+			},
+			// 获取设备详情（普通详情）
+			async fetchDeviceDetail(id, isUpdate = false) {
+				try {
+					const res = await deviceDetail(id)
+					if(res.code==200){
+						this.handleDeviceData(res, false, isUpdate)
+					}else{
+						uni.showToast({
+							title: error.msg,
+							icon: 'none'
+						})
+						uni.hideLoading()
+					}
+					
+				} catch (error) {
+					uni.hideLoading()
+					// uni.showToast({
+					// 	title: error.msg,
+					// 	icon: 'none'
+					// })
+				}
+			},
+			// 获取分享设备详情
+			async fetchSharedDeviceDetail(id) {
+				try {
+					const res = await deviceShareId(id)
+					if(res.code==200){
+						this.handleDeviceData(res, true)
+					}else{
+						uni.showToast({
+							title: error.msg,
+							icon: 'none'
+						})
+					}
+					
+				} catch (error) {
+					uni.showToast({
+						title: error.msg,
+						icon: 'none'
+					})
+				}
+			},
+			// 操作说明
+			operatingInst() {
+				let id = this.computedDeviceId
+				uni.navigateTo({
+					url: `/pages/common/operatingInstruct/index?id=${id}`
+				})
+			},
+			// 产品参数
+			productparams() {
+				let id = this.computedDeviceId
+				uni.navigateTo({
+					url: `/pages/common/productDes/index?id=${id}`
+				})
+			},
+			// 操作视频
+			operatingVideo() {
+				let id = this.computedDeviceId
+				uni.navigateTo({
+					url: `/pages/common/operationVideo/index?id=${id}`
+				})
+			},
+			// 发送mqtt查询设备信息
+			queryDeviceStatus() {
+				if (this.mqttClient && this.mqttClient.isConnected()) {
+					const topic = `B/${this.itemInfo.deviceImei}`;
+					const message = '{"instruct":[12,0,0,0,0]}';
+					this.mqttClient.publish(topic, message, {
+						qos: 1
+					});
 				} else {
-					this.isSharedDevice = false;
-					this.activePermissions = []; // 非分享设备清空权限
+					console.log('MQTT not connected, cannot query status.');
 				}
+			},
+			// 灯光模式共用封装共其他地方使用
+			getMainLightModeLabel(mode) {
+				const modeMap = {
+					0: '关闭',
+					1: '强光',
+					2: '弱光',
+					3: '爆闪',
+					4: '泛光'
+				}
+				return modeMap[mode] || (console.log('未知的灯光模式:', mode), '未知');
+			}
 
-				// 关闭加载中
-				uni.hideLoading()
-			}
 		},
-		// 检查权限的方法
-		hasPermission(permissionCode) {
-			// 如果还在加载中，直接返回false
-			if (this.pageLoading) return false
-			// 如果不是分享设备，默认有全部权限
-			if (!this.isSharedDevice) return true
-			return this.activePermissions.includes(permissionCode)
-		},
-		// 获取设备详情（普通详情）
-		async fetchDeviceDetail(id, isUpdate = false) {
-			try {
-				const res = await deviceDetail(id)
-				this.handleDeviceData(res, false, isUpdate)
-			} catch (error) {
-				uni.showToast({
-					title: '获取详情失败',
-					icon: 'none'
-				})
-			}
-		},
-		// 获取分享设备详情
-		async fetchSharedDeviceDetail(id) {
-			try {
-				const res = await deviceShareId(id)
-				this.handleDeviceData(res, true)
-			} catch (error) {
-				uni.showToast({
-					title: '获取分享详情失败',
-					icon: 'none'
-				})
-			}
-		},
-		// 操作说明
-		operatingInst() {
-			let id = this.computedDeviceId
-			uni.navigateTo({
-				url: `/pages/common/operatingInstruct/index?id=${id}`
+		onLoad(options) {
+			const eventChannel = this.getOpenerEventChannel();
+			// 监听 'detailData' 事件，获取传过来的数据
+			uni.showLoading({
+				title: '加载中...'
 			})
-		},
-		// 产品参数
-		productparams() {
-			let id = this.computedDeviceId
-			uni.navigateTo({
-				url: `/pages/common/productDes/index?id=${id}`
-			})
-		},
-		// 操作视频
-		operatingVideo() {
-			let id = this.computedDeviceId
-			uni.navigateTo({
-				url: `/pages/common/operationVideo/index?id=${id}`
-			})
-		},
-		// 发送mqtt查询设备信息
-		queryDeviceStatus() {
-			if (this.mqttClient && this.mqttClient.isConnected()) {
-				const topic = `B/${this.itemInfo.deviceImei}`;
-				const message = '{"instruct":[12,0,0,0,0]}';
-				this.mqttClient.publish(topic, message, {
-					qos: 1
-				});
-			} else {
-				console.log('MQTT not connected, cannot query status.');
-			}
-		},
-
-	},
-	onLoad(options) {
-		const eventChannel = this.getOpenerEventChannel();
-		// 监听 'detailData' 事件，获取传过来的数据
-		uni.showLoading({
-			title: '加载中...'
-		})
-		eventChannel.on('detailData', (data) => {
-			console.log(data, 'data');
-			this.itemInfo = data.data;
-			this.deviceID = data.data.id;
-			this.navTitle = data.data.deviceName;
-			this.apiType = data.apiType
-			// 根据 apiType 设置右图标的显示状态
-			this.isRightIconVisible = this.apiType === 'listA';
-			// 初始化并连接MQTT
-			this.mqttClient = new MqttClient();
-			this.mqttClient.connect(() => {
-				// 订阅来自设备的状态更新
-				const statusTopic = `A/${this.itemInfo.deviceImei}`;
-				this.mqttClient.subscribe(statusTopic, (payload) => {
-					try {
-						console.log(`收到来自 ${statusTopic} 的消息:`, payload);
-						//收到电量上报。
-						const parsedMessage = typeof payload === 'string' ? JSON.parse(
-							payload) :
-							payload;
-						const deviceState = parsedMessage.state; // 直接取 state 数组
-						if (deviceState && deviceState[0] === 12) {
-							// 根据协议直接更新设备状态，提供即时反馈
-							const mainLightMode = deviceState[1];
-							switch (mainLightMode) {
-								case 0:
-									this.currentMainMode = '关闭';
-									break;
+			eventChannel.on('detailData', (data) => {
+				console.log(data, 'data');
+				this.itemInfo = data.data;
+				this.deviceID = data.data.id;
+				this.navTitle = data.data.deviceName;
+				this.apiType = data.apiType
+				// 根据 apiType 设置右图标的显示状态
+				this.isRightIconVisible = this.apiType === 'listA';
+				// 初始化并连接MQTT
+				this.mqttClient = new MqttClient();
+				this.mqttClient.connect(() => {
+					// 订阅来自设备的状态更新
+					const statusTopic = `A/${this.itemInfo.deviceImei}`;
+					this.mqttClient.subscribe(statusTopic, (payload) => {
+						try {
+							console.log(`收到来自 ${statusTopic} 的消息:`, payload);
+							const parsedMessage = typeof payload === 'string' ? JSON.parse(
+									payload) :
+								payload;
+							const deviceState = parsedMessage.state; // 直接取 state 数组
+							// 切换主灯光模式,亮度值设备同步
+							if (!deviceState) return;
+							// 1设备切换灯光实时返回
+							switch (deviceState[0]) {
 								case 1:
-									this.currentMainMode = '强光';
+									this.currentMainMode = this.getMainLightModeLabel(deviceState[
+										1]);
+									this.sliderValue = deviceState[2];
+									this.deviceInfo.batteryRemainingTime = deviceState[3];
 									break;
-								case 2:
-									this.currentMainMode = '弱光';
-									break;
-								case 3:
-									this.currentMainMode = '爆闪';
-									break;
-								case 4:
-									this.currentMainMode = '泛光';
+									// 12为设备实时上报
+								case 12:
+									this.currentMainMode = this.getMainLightModeLabel(deviceState[
+										1]);
+									this.isLaserOn = deviceState[2] === 1;
+									this.currentlaserMode = this.isLaserOn ? "开启" : "关闭";
+									if (this.deviceInfo) {
+										this.deviceInfo.batteryPercentage = deviceState[3];
+										this.deviceInfo.chargeState = deviceState[4];
+										this.deviceInfo.batteryRemainingTime = deviceState[5];
+									}
+									setTimeout(() => {
+										this.fetchDeviceDetail(data.data.id, true).then(
+											() => {
+												if (this.deviceInfo.batteryPercentage <
+													20) {
+													this.popupType = 'bettery';
+													this.popupMessage = '请及时充电';
+													this.showPopupFlag = true;
+												}
+											});
+									}, 10000);
+									// 上报电量,在列表里面同步
+									uni.$emit('deviceStatusUpdate', {
+										message: parsedMessage,
+										timestamp: new Date().getTime()
+									});
 									break;
 								default:
-									console.log('未知的灯光模式:', mainLightMode);
+									console.log('未知的 deviceState 类型:', deviceState[0]);
 							}
-							const laserMode = deviceState[2];
-							this.isLaserOn = laserMode === 1;
-							this.currentlaserMode = this.isLaserOn ? "开启" : "关闭";
-
-							if (this.deviceInfo) {
-								this.deviceInfo.batteryPercentage = deviceState[3];
-								this.deviceInfo.chargeState = deviceState[4];
-								this.deviceInfo.batteryRemainingTime = deviceState[5];
-							}
-							// 这里的10秒延迟是为了解决一个特定的后端问题：
-							// GPS坐标上报后，逆地址解析（将坐标转换为地址）需要一些时间。
-							// 如果立即请求设备详情，地址字段可能尚未更新。
-							// 这是一个临时解决方案，理想情况下应由后端通过消息通知或其他机制来确保数据一致性。
-							setTimeout(() => {
-								this.fetchDeviceDetail(data.data.id, true).then(() => {
-									// 在获取到最新信息后，再判断电量
-									if (this.deviceInfo.batteryPercentage < 20) {
-										this.popupType = 'bettery';
-										this.popupMessage = '请及时充电';
-										this.showPopupFlag = true;
-									}
-								});
-							}, 10000);
-
-							// ✅ 发送全局事件通知主页面更新
-							uni.$emit('deviceStatusUpdate', {
-								message: parsedMessage, // 消息内容
-								timestamp: new Date().getTime() // 时间戳
-							});
+						} catch (error) {
+							console.log('解析MQTT消息失败:', error, '原始消息:', payload);
 						}
-					} catch (error) {
-						console.log('解析MQTT消息失败:', error, '原始消息:', payload);
-					}
-				});
-				// 连接成功后，立即查询一次设备状态
-				this.queryDeviceStatus();
+					});
+					// mqtt连接成功后，上报一次设备状态
+					this.queryDeviceStatus();
+				})
+				if (this.apiType === 'listA') {
+					this.fetchDeviceDetail(data.data.id)
+				} else {
+					// 查分享权限详情
+					this.fetchSharedDeviceDetail(data.data.id)
+				}
+
+			});
+			eventChannel.emit('ack', {
+
 			})
-			if (this.apiType === 'listA') {
-				this.fetchDeviceDetail(data.data.id)
-			} else {
-				// 查分享权限详情
-				this.fetchSharedDeviceDetail(data.data.id)
+
+		},
+		onUnload() {
+			// 页面卸载时断开MQTT连接
+			if (this.mqttClient) {
+				this.mqttClient.disconnect();
 			}
+		},
 
-		});
-		// 如果需要向调用页面返回数据，可以触发 'ack' 事件
-		eventChannel.emit('ack', {
-
-		})
-
-	},
-	onUnload() {
-		// 页面卸载时断开MQTT连接
-		if (this.mqttClient) {
-			this.mqttClient.disconnect();
-		}
-	},
-
-}
+	}
 </script>
 
 <style scoped>
-.page-loading-mask {
-	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	background-color: #121212;
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	z-index: 9999;
-}
-
-/* 优化权限控制区域的显示 */
-.mode-section,
-.form-section {
-	transition: opacity 0.3s ease;
-}
-
-.device-detail-container {
-	padding: 30rpx;
-	background: #121212;
-	min-height: 100vh;
-}
-
-.status-bar {
-	display: flex;
-	justify-content: space-between;
-	margin-bottom: 40rpx;
-}
-
-.time {
-	font-size: 36rpx;
-	font-weight: bold;
-}
-
-.battery {
-	font-size: 36rpx;
-}
-
-.battery-section {
-	background-color: rgb(26, 26, 26);
-	border-radius: 16rpx;
-	padding: 30rpx;
-	display: flex;
-	justify-content: space-between;
-	margin-bottom: 20rpx;
-	align-items: center;
-}
-
-.battery-info,
-.duration {
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-}
-
-.bipImg {
-	width: 204rpx;
-	height: 144rpx;
-	margin-top: 30rpx;
-}
-
-.dlIMG {
-	width: 52rpx;
-	height: 52rpx;
-}
-
-.chargeStateIMG {
-	width: 27rpx;
-	height: 37rpx;
-	margin-left: 10rpx;
-}
-
-.cpIMG {
-	width: 66rpx;
-	height: 66rpx;
-}
-
-.battery-sectionLeft {
-	width: 308rpx;
-	height: 220rpx;
-	background: rgba(42, 42, 42, 0.5);
-	border-radius: 16rpx;
-	text-align: center;
-	align-items: center;
-	line-height: 220rpx;
-}
-
-.percentage {
-	font-size: 48rpx;
-	font-weight: bold;
-	color: #007AFF;
-}
-
-.label {
-	font-size: 28rpx;
-	color: #666;
-	margin-top: 10rpx;
-}
-
-.battery-v1 {
-	display: flex;
-	align-items: center;
-	margin-bottom: 10rpx;
-}
-
-
-.battery-v2 {
-	color: rgba(255, 255, 255, 0.87);
-	margin-left: 18rpx;
-	font-size: 32rpx;
-}
-
-.battery-v3 {
-	color: rgba(255, 255, 255, 0.6);
-	margin-left: 25rpx;
-	font-size: 26rpx;
-}
-
-.mode-v3 {
-	color: rgba(255, 255, 255, 0.6);
-	font-size: 26rpx;
-	padding-top: 10rpx;
-}
-
-.info-card {
-	background-color: rgb(26, 26, 26);
-	border-radius: 16rpx;
-	padding: 10rpx 20rpx 5rpx 20rpx;
-	margin-bottom: 20rpx;
-
-}
-
-.info-row {
-	display: flex;
-	justify-content: space-between;
-	margin-bottom: 20rpx;
-}
-
-.info-label {
-	font-size: 28rpx;
-	color: rgba(255, 255, 255, 0.87);
-	white-space: nowrap;
-}
-
-.info-value {
-	font-size: 28rpx;
-	color: rgba(255, 255, 255, 0.87);
-}
-
-.status-running {
-	color: rgba(255, 255, 255, 0.6);
-	text-align: end;
-}
-
-.locationGPS {
-	width: 88%;
-	text-align: end;
-	float: right;
-	line-height: 50rpx;
-}
-
-.control-card {
-	background-color: rgb(26, 26, 26);
-	border-radius: 16rpx;
-	margin-bottom: 20rpx;
-	position: relative;
-}
-
-.light {
-	position: absolute;
-	/* top:10rpx; */
-	color: rgba(74, 74, 74, 0.87);
-	top: 58rpx;
-	left: 108rpx
-}
-
-.section-title {
-	font-size: 32rpx;
-	margin-bottom: 20rpx;
-	display: block;
-	color: rgba(255, 255, 255, 0.87);
-}
-
-.slider-container {
-	display: flex;
-	align-items: center;
-}
-
-.slider {
-	flex: 1;
-	margin: 0 20rpx;
-}
-
-.mode-buttons {
-	display: flex;
-	justify-content: space-between;
-	flex-wrap: wrap;
-}
-
-.mode_1 {
-	width: 180rpx;
-	height: 180rpx;
-	border-radius: 16rpx;
-	background: rgb(26, 26, 26);
-	align-items: center;
-	text-align: center;
-	color: rgba(255, 255, 255, 0.6);
-	padding-top: 37rpx;
-}
-
-.mode-v1 {
-	background: #1A1A1A;
-	border-radius: 18rpx;
-	height: 150rpx;
-	margin-bottom: 20rpx;
-	width: 47%;
-	display: flex;
-	text-align: center;
-}
-
-.mode-v2 {
-	display: flex;
-	align-items: center;
-	text-align: center;
-	margin-left: 40rpx;
-
-}
-
-.callpolice {
-	display: flex;
-	justify-content: space-between;
-	border-radius: 16rpx;
-	background: rgba(224, 52, 52, 1);
-	padding: 15rpx;
-	margin-bottom: 15rpx;
-	color: #fff;
-	line-height: 35rpx;
-	font-size: 26rpx;
-}
-
-.example-body {
-	position: absolute;
-	left: 50%;
-	top: 65%;
-	width: 100%;
-	transform: translate(-20%, -100%);
-}
-
-.icoContent {
-	width: 320rpx;
-	height: 160rpx;
-	border-radius: 8rpx;
-	background: rgba(58, 58, 58, 1);
-	text-align: center;
-	line-height: 200rpx;
-}
-
-.img {
-	width: 62rpx;
-	height: 62rpx;
-}
-
-.example_title {
-	color: rgba(255, 255, 255, 0.87);
-}
-
-.mode-btn {
-	width: 48%;
-	height: 80rpx;
-	line-height: 80rpx;
-	background-color: #f5f5f5;
-	color: #333;
-	border-radius: 8rpx;
-	font-size: 28rpx;
-	border: none;
-}
-
-.mode-btn.active {
-	background-color: #007AFF;
-	color: #fff;
-}
-
-.form-section {
-	background-color: rgb(26, 26, 26);
-	border-radius: 16rpx;
-	padding: 30rpx;
-	margin-bottom: 30rpx;
-
-}
-
-.form-row {
-	display: flex;
-	align-items: center;
-	margin-bottom: 20rpx;
-	background: rgba(42, 42, 42, 1);
-	border-radius: 16rpx;
-	padding-left: 20rpx;
-}
-
-.form-label {
-	font-size: 32rpx;
-	color: rgba(255, 255, 255, 0.87);
-	white-space: nowrap;
-}
-
-.form-input {
-	height: 80rpx;
-	border: 1rpx solid transparent;
-	font-size: 32rpx;
-	color: rgba(255, 255, 255, 0.87);
-	width: 100%;
-}
-
-.form-input1 {
-	height: 80rpx;
-	border: 1rpx solid transparent;
-	font-size: 32rpx;
-	color: rgba(255, 255, 255, 0.87);
-	width: 98%;
-}
-
-.product-section {
-	background-color: #fff;
-	border-radius: 16rpx;
-	padding: 30rpx;
-	margin-bottom: 30rpx;
-	box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.05);
-}
-
-.product-tabs {
-	display: flex;
-	margin-top: 20rpx;
-}
-
-.tab {
-	padding: 15rpx 30rpx;
-	font-size: 28rpx;
-	color: #666;
-	border-bottom: 4rpx solid transparent;
-}
-
-.tab.active {
-	color: #007AFF;
-	border-bottom-color: #007AFF;
-}
-
-.action-buttons {
-	padding: 30rpx 0;
-}
-
-.send-btn {
-	background-color: rgb(187, 230, 0);
-	color: rgba(35, 35, 35, 0.87);
-	height: 50rpx;
-	line-height: 50rpx;
-	border-radius: 16rpx;
-	font-size: 26rpx;
-	width: 112rpx;
-	white-space: nowrap;
-	text-align: center;
-	position: absolute;
-	right: 70rpx;
-
-}
-
-.send-btn1 {
-	background-color: rgb(187, 230, 0);
-	color: rgba(35, 35, 35, 0.87);
-	height: 50rpx;
-	line-height: 50rpx;
-	border-radius: 16rpx;
-	font-size: 26rpx;
-	width: 112rpx;
-	white-space: nowrap;
-	text-align: center;
-	position: absolute;
-	right: 0rpx;
-	top: -70rpx
-}
-
-
-/* 遮罩层 */
-.agreement-mask {
-	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	background-color: rgba(0, 0, 0, 0.5);
-	display: flex;
-	justify-content: center;
-	align-items: center;
-	z-index: 9999;
-}
-
-/* 弹窗主体 */
-.agreement-popup {
-	width: 100%;
-	height: 50%;
-	background-color: rgb(42, 42, 42);
-	border-radius: 60rpx 60rpx 0rpx 0rpx;
-	padding: 40rpx;
-	box-sizing: border-box;
-	position: absolute;
-	bottom: 0rpx;
-}
-
-.agreement-popupB {
-	width: 100%;
-	height: 32%;
-	background-color: rgb(42, 42, 42);
-	border-radius: 60rpx 60rpx 0rpx 0rpx;
-	padding: 40rpx;
-	box-sizing: border-box;
-	position: absolute;
-	bottom: 0rpx;
-}
-
-.agreement-popupC {
-	width: 80%;
-	background-color: rgb(42, 42, 42);
-	border-radius: 40rpx;
-	padding: 40rpx;
-	box-sizing: border-box;
-	border: 1px solid rgba(255, 200, 78, 1);
-}
-
-.popup-Title {
-	color: rgba(255, 200, 78, 1);
-}
-
-/* 标题 */
-.popup-title {
-	font-size: 36rpx;
-	text-align: center;
-	margin-bottom: 30rpx;
-	color: rgba(255, 255, 255, 0.87);
-}
-
-/* 内容文本 */
-.popup-content {
-	font-size: 30rpx;
-	line-height: 1.6;
-	color: rgba(255, 255, 255, 0.87);
-	margin-bottom: 50rpx;
-}
-
-.item {
-	padding: 10px;
-	margin: 5px 0;
-	display: flex;
-	align-items: center;
-	cursor: pointer;
-	transition: background-color 0.3s;
-}
-
-.setIMG {
-	width: 24px;
-	height: 24px;
-	margin-right: 10px;
-}
-
-.item.selected {
-	background-color: rgb(58, 58, 58);
-	color: rgba(255, 255, 255, 0.87);
-	border-radius: 8rpx;
-}
-
-/* 按钮容器 */
-.popup-buttons {
-	display: flex;
-	justify-content: space-between;
-}
-
-/*确定按钮 */
-.agree {
-	background-color: rgb(187, 230, 0);
-	color: #232323;
-	border: none;
-	font-size: 24rpx;
-	height: 88rpx;
-	line-height: 88rpx;
-	font-size: 32rpx;
-	width: 100%;
-	position: absolute;
-	bottom: 0rpx;
-	left: 0rpx
-}
-
-/* 通用按钮样式 */
-.btn {
-	flex: 1;
-	height: 80rpx;
-	line-height: 80rpx;
-	border-radius: 40rpx;
-	font-size: 32rpx;
-	margin: 0 20rpx;
-}
-
-/* 不同意按钮 */
-.disagree {
-	background-color: transparent;
-	color: rgba(255, 255, 255, 0.87);
-	border: 1px solid rgba(255, 200, 78, 0.7);
-	font-size: 24rpx;
-	color: rgba(255, 200, 78, 1);
-}
-
-/* 同意按钮 */
-.agreeBtn {
-	background-color: rgba(255, 200, 78, 1);
-	color: #232323;
-	border: none;
-	font-size: 24rpx;
-}
-
-.right-icons {
-	/* display: flex; */
-	align-items: center;
-}
-
-.toggle-icon {
-	cursor: pointer;
-	font-size: 16px;
-	margin-top: -40rpx;
-}
-
-.icon {
-	font-size: 14px;
-	color: #fff;
-}
-
-.form-content {
-	transition: all 0.3s ease;
-	margin-top: 60rpx;
-	position: relative;
-}
+	.page-loading-mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: #121212;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		z-index: 9999;
+	}
+
+	/* 优化权限控制区域的显示 */
+	.mode-section,
+	.form-section {
+		transition: opacity 0.3s ease;
+	}
+
+	.device-detail-container {
+		padding: 30rpx;
+		background: #121212;
+		min-height: 100vh;
+	}
+
+	.status-bar {
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 40rpx;
+	}
+
+	.time {
+		font-size: 36rpx;
+		font-weight: bold;
+	}
+
+	.battery {
+		font-size: 36rpx;
+	}
+
+	.battery-section {
+		background-color: rgb(26, 26, 26);
+		border-radius: 16rpx;
+		padding: 30rpx;
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 20rpx;
+		align-items: center;
+	}
+
+	.battery-info,
+	.duration {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+	}
+
+	.bipImg {
+		width: 204rpx;
+		height: 144rpx;
+		margin-top: 30rpx;
+	}
+
+	.dlIMG {
+		width: 52rpx;
+		height: 52rpx;
+	}
+
+	.chargeStateIMG {
+		width: 27rpx;
+		height: 37rpx;
+		margin-left: 10rpx;
+	}
+
+	.cpIMG {
+		width: 66rpx;
+		height: 66rpx;
+	}
+
+	.battery-sectionLeft {
+		width: 308rpx;
+		height: 220rpx;
+		background: rgba(42, 42, 42, 0.5);
+		border-radius: 16rpx;
+		text-align: center;
+		align-items: center;
+		line-height: 220rpx;
+	}
+
+	.percentage {
+		font-size: 48rpx;
+		font-weight: bold;
+		color: #007AFF;
+	}
+
+	.label {
+		font-size: 28rpx;
+		color: #666;
+		margin-top: 10rpx;
+	}
+
+	.battery-v1 {
+		display: flex;
+		align-items: center;
+		margin-bottom: 10rpx;
+	}
+
+
+	.battery-v2 {
+		color: rgba(255, 255, 255, 0.87);
+		margin-left: 18rpx;
+		font-size: 32rpx;
+	}
+
+	.battery-v3 {
+		color: rgba(255, 255, 255, 0.6);
+		margin-left: 25rpx;
+		font-size: 26rpx;
+	}
+
+	.mode-v3 {
+		color: rgba(255, 255, 255, 0.6);
+		font-size: 26rpx;
+		padding-top: 10rpx;
+	}
+
+	.info-card {
+		background-color: rgb(26, 26, 26);
+		border-radius: 16rpx;
+		padding: 10rpx 20rpx 5rpx 20rpx;
+		margin-bottom: 20rpx;
+
+	}
+
+	.info-row {
+		display: flex;
+		justify-content: space-between;
+		margin-bottom: 20rpx;
+	}
+
+	.info-label {
+		font-size: 28rpx;
+		color: rgba(255, 255, 255, 0.87);
+		white-space: nowrap;
+	}
+
+	.info-value {
+		font-size: 28rpx;
+		color: rgba(255, 255, 255, 0.87);
+	}
+
+	.status-running {
+		color: rgba(255, 255, 255, 0.6);
+		text-align: end;
+	}
+
+	.locationGPS {
+		width: 88%;
+		text-align: end;
+		float: right;
+		line-height: 50rpx;
+	}
+
+	.control-card {
+		background-color: rgb(26, 26, 26);
+		border-radius: 16rpx;
+		margin-bottom: 20rpx;
+		position: relative;
+	}
+
+	.light {
+		position: absolute;
+		/* top:10rpx; */
+		color: rgba(74, 74, 74, 0.87);
+		top: 58rpx;
+		left: 108rpx
+	}
+
+	.section-title {
+		font-size: 32rpx;
+		margin-bottom: 20rpx;
+		display: block;
+		color: rgba(255, 255, 255, 0.87);
+	}
+
+	.slider-container {
+		display: flex;
+		align-items: center;
+	}
+
+	.slider {
+		flex: 1;
+		margin: 0 20rpx;
+	}
+
+	.mode-buttons {
+		display: flex;
+		justify-content: space-between;
+		flex-wrap: wrap;
+	}
+
+	.mode_1 {
+		width: 180rpx;
+		height: 180rpx;
+		border-radius: 16rpx;
+		background: rgb(26, 26, 26);
+		align-items: center;
+		text-align: center;
+		color: rgba(255, 255, 255, 0.6);
+		padding-top: 37rpx;
+	}
+
+	.mode-v1 {
+		background: #1A1A1A;
+		border-radius: 18rpx;
+		height: 150rpx;
+		margin-bottom: 20rpx;
+		width: 47%;
+		display: flex;
+		text-align: center;
+	}
+
+	.mode-v2 {
+		display: flex;
+		align-items: center;
+		text-align: center;
+		margin-left: 40rpx;
+
+	}
+
+	.callpolice {
+		display: flex;
+		justify-content: space-between;
+		border-radius: 16rpx;
+		background: rgba(224, 52, 52, 1);
+		padding: 15rpx;
+		margin-bottom: 15rpx;
+		color: #fff;
+		line-height: 35rpx;
+		font-size: 26rpx;
+	}
+
+	.example-body {
+		position: absolute;
+		left: 50%;
+		top: 65%;
+		width: 100%;
+		transform: translate(-20%, -100%);
+	}
+
+	.icoContent {
+		width: 320rpx;
+		height: 160rpx;
+		border-radius: 8rpx;
+		background: rgba(58, 58, 58, 1);
+		text-align: center;
+		line-height: 200rpx;
+	}
+
+	.img {
+		width: 62rpx;
+		height: 62rpx;
+	}
+
+	.example_title {
+		color: rgba(255, 255, 255, 0.87);
+	}
+
+	.mode-btn {
+		width: 48%;
+		height: 80rpx;
+		line-height: 80rpx;
+		background-color: #f5f5f5;
+		color: #333;
+		border-radius: 8rpx;
+		font-size: 28rpx;
+		border: none;
+	}
+
+	.mode-btn.active {
+		background-color: #007AFF;
+		color: #fff;
+	}
+
+	.form-section {
+		background-color: rgb(26, 26, 26);
+		border-radius: 16rpx;
+		padding: 30rpx;
+		margin-bottom: 30rpx;
+
+	}
+
+	.form-row {
+		display: flex;
+		align-items: center;
+		margin-bottom: 20rpx;
+		background: rgba(42, 42, 42, 1);
+		border-radius: 16rpx;
+		padding-left: 20rpx;
+	}
+
+	.form-label {
+		font-size: 32rpx;
+		color: rgba(255, 255, 255, 0.87);
+		white-space: nowrap;
+	}
+
+	.form-input {
+		height: 80rpx;
+		border: 1rpx solid transparent;
+		font-size: 32rpx;
+		color: rgba(255, 255, 255, 0.87);
+		width: 100%;
+	}
+
+	.form-input1 {
+		height: 80rpx;
+		border: 1rpx solid transparent;
+		font-size: 32rpx;
+		color: rgba(255, 255, 255, 0.87);
+		width: 98%;
+	}
+
+	.product-section {
+		background-color: #fff;
+		border-radius: 16rpx;
+		padding: 30rpx;
+		margin-bottom: 30rpx;
+		box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, 0.05);
+	}
+
+	.product-tabs {
+		display: flex;
+		margin-top: 20rpx;
+	}
+
+	.tab {
+		padding: 15rpx 30rpx;
+		font-size: 28rpx;
+		color: #666;
+		border-bottom: 4rpx solid transparent;
+	}
+
+	.tab.active {
+		color: #007AFF;
+		border-bottom-color: #007AFF;
+	}
+
+	.action-buttons {
+		padding: 30rpx 0;
+	}
+
+	.send-btn {
+		background-color: rgb(187, 230, 0);
+		color: rgba(35, 35, 35, 0.87);
+		height: 50rpx;
+		line-height: 50rpx;
+		border-radius: 16rpx;
+		font-size: 26rpx;
+		width: 112rpx;
+		white-space: nowrap;
+		text-align: center;
+		position: absolute;
+		right: 70rpx;
+
+	}
+
+	.send-btn1 {
+		background-color: rgb(187, 230, 0);
+		color: rgba(35, 35, 35, 0.87);
+		height: 50rpx;
+		line-height: 50rpx;
+		border-radius: 16rpx;
+		font-size: 26rpx;
+		width: 112rpx;
+		white-space: nowrap;
+		text-align: center;
+		position: absolute;
+		right: 0rpx;
+		top: -70rpx
+	}
+
+
+	/* 遮罩层 */
+	.agreement-mask {
+		position: fixed;
+		top: 0;
+		left: 0;
+		right: 0;
+		bottom: 0;
+		background-color: rgba(0, 0, 0, 0.5);
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		z-index: 9999;
+	}
+
+	/* 弹窗主体 */
+	.agreement-popup {
+		width: 100%;
+		height: 50%;
+		background-color: rgb(42, 42, 42);
+		border-radius: 60rpx 60rpx 0rpx 0rpx;
+		padding: 40rpx;
+		box-sizing: border-box;
+		position: absolute;
+		bottom: 0rpx;
+	}
+
+	.agreement-popupB {
+		width: 100%;
+		height: 32%;
+		background-color: rgb(42, 42, 42);
+		border-radius: 60rpx 60rpx 0rpx 0rpx;
+		padding: 40rpx;
+		box-sizing: border-box;
+		position: absolute;
+		bottom: 0rpx;
+	}
+
+	.agreement-popupC {
+		width: 80%;
+		background-color: rgb(42, 42, 42);
+		border-radius: 40rpx;
+		padding: 40rpx;
+		box-sizing: border-box;
+		border: 1px solid rgba(255, 200, 78, 1);
+	}
+
+	.popup-Title {
+		color: rgba(255, 200, 78, 1);
+	}
+
+	/* 标题 */
+	.popup-title {
+		font-size: 36rpx;
+		text-align: center;
+		margin-bottom: 30rpx;
+		color: rgba(255, 255, 255, 0.87);
+	}
+
+	/* 内容文本 */
+	.popup-content {
+		font-size: 30rpx;
+		line-height: 1.6;
+		color: rgba(255, 255, 255, 0.87);
+		margin-bottom: 50rpx;
+	}
+
+	.item {
+		padding: 10px;
+		margin: 5px 0;
+		display: flex;
+		align-items: center;
+		cursor: pointer;
+		transition: background-color 0.3s;
+	}
+
+	.setIMG {
+		width: 24px;
+		height: 24px;
+		margin-right: 10px;
+	}
+
+	.item.selected {
+		background-color: rgb(58, 58, 58);
+		color: rgba(255, 255, 255, 0.87);
+		border-radius: 8rpx;
+	}
+
+	/* 按钮容器 */
+	.popup-buttons {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	/*确定按钮 */
+	.agree {
+		background-color: rgb(187, 230, 0);
+		color: #232323;
+		border: none;
+		font-size: 24rpx;
+		height: 88rpx;
+		line-height: 88rpx;
+		font-size: 32rpx;
+		width: 100%;
+		position: absolute;
+		bottom: 0rpx;
+		left: 0rpx
+	}
+
+	/* 通用按钮样式 */
+	.btn {
+		flex: 1;
+		height: 80rpx;
+		line-height: 80rpx;
+		border-radius: 40rpx;
+		font-size: 32rpx;
+		margin: 0 20rpx;
+	}
+
+	/* 不同意按钮 */
+	.disagree {
+		background-color: transparent;
+		color: rgba(255, 255, 255, 0.87);
+		border: 1px solid rgba(255, 200, 78, 0.7);
+		font-size: 24rpx;
+		color: rgba(255, 200, 78, 1);
+	}
+
+	/* 同意按钮 */
+	.agreeBtn {
+		background-color: rgba(255, 200, 78, 1);
+		color: #232323;
+		border: none;
+		font-size: 24rpx;
+	}
+
+	.right-icons {
+		/* display: flex; */
+		align-items: center;
+	}
+
+	.toggle-icon {
+		cursor: pointer;
+		font-size: 16px;
+		margin-top: -40rpx;
+	}
+
+	.icon {
+		font-size: 14px;
+		color: #fff;
+	}
+
+	.form-content {
+		transition: all 0.3s ease;
+		margin-top: 60rpx;
+		position: relative;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/common/send/index.vue b/pages/common/send/index.vue
index 370cf1c..7861a5c 100644
--- a/pages/common/send/index.vue
+++ b/pages/common/send/index.vue
@@ -2,9 +2,9 @@
 	<view class="container">
 		<!-- 设备列表 -->
 		<scroll-view class="device-list" scroll-y>
-			<view class="device-card" v-for="(item, index) in deviceList" :key="index" @click="toggleSelect(index)">
+			<view class="device-card" v-for="(item, index) in deviceList" :key="index" @click="item.onlineStatus === 1 ? toggleSelect(index) : null">
 				<!-- 复选框 -->
-				<view class="checkbox" :class="{ checked: item.checked }">
+				<view class="checkbox" :class="{ checked: item.checked,disabled: item.onlineStatus !== 1  }">
 					<uni-icons v-if="item.checked" type="checkmarkempty" size="18" color="rgb(0, 0, 0)"></uni-icons>
 				</view>
 				<!-- 设备信息 -->
@@ -71,6 +71,10 @@
 			}
 		},
 		methods: {
+			onPullDownRefresh() {
+				// 执行下拉刷新时的操作，比如重新获取数据
+				this.getData();
+			},
 			/**
 			 * 获取设备状态（带自动轮询）
 			 * @param {number} val - 功能模式
@@ -419,4 +423,14 @@
 		border-radius: 50rpx;
 		width: 90%;
 	}
+	.checkbox.disabled {
+	  opacity: 0.5;
+	  background-color: rgba(255, 255, 255, 0.1) !important;
+	  border-color: rgba(255, 255, 255, 0.2) !important;
+	  pointer-events: none; /* 阻止点击事件 */
+	}
+	/* 可选：离线设备的卡片整体置灰 */
+	.device-card[data-offline="true"] {
+	  opacity: 0.6;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/common/user/index.vue b/pages/common/user/index.vue
index d3dfa59..1ff2974 100644
--- a/pages/common/user/index.vue
+++ b/pages/common/user/index.vue
@@ -6,7 +6,7 @@
 				<image src="/static/images/common/logo.png" class="logo"></image>
 			</view>
 			<view class="user-right">
-				<view class="user-title">富源晟科技</view>
+				<view class="user-title">武汉研创</view>
 				<view class="ID">ID:123456</view>
 			</view>
 		</view>
diff --git a/utils/request.js b/utils/request.js
index a5f55e2..b113555 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,5 +1,5 @@
 import config from '../config/index.js';
-const env = 'development'; //production development  //开发of线上 改这里就行
+const env = 'production'; //production development  //开发of线上 改这里就行
 const BASE = config[env];
 const request = (options) => {
 	console.log("options"+JSON.stringify(options),BASE.BASE_URL)
@@ -20,7 +20,7 @@ const request = (options) => {
       method: options.method || 'GET',
       data: options.method !== 'GET' ? options.data : {},
       header: options.header || {},
-      timeout: 10000,
+      timeout: 30000,
       success: (res) => {
         resolve(res.data);
       },

From 64529bf573ee9b436084770c535fec1074185158 Mon Sep 17 00:00:00 2001
From: fengerli <528575642@qq.com>
Date: Sat, 16 Aug 2025 14:28:21 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AFbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/6170/deviceControl/index.vue | 31 +++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/pages/6170/deviceControl/index.vue b/pages/6170/deviceControl/index.vue
index 176f31c..bc2ce87 100644
--- a/pages/6170/deviceControl/index.vue
+++ b/pages/6170/deviceControl/index.vue
@@ -1033,9 +1033,10 @@
 						this.isSharedDevice = false;
 						this.activePermissions = []; // 非分享设备清空权限
 					}
-
-					// 关闭加载中
-					uni.hideLoading()
+					if (!isUpdate) {
+						// 关闭加载中
+						uni.hideLoading()
+					}
 				}
 			},
 			// 检查权限的方法
@@ -1050,18 +1051,22 @@
 			async fetchDeviceDetail(id, isUpdate = false) {
 				try {
 					const res = await deviceDetail(id)
-					if(res.code==200){
+					if (res.code == 200) {
 						this.handleDeviceData(res, false, isUpdate)
-					}else{
+					} else {
 						uni.showToast({
-							title: error.msg,
+							title: res.msg,
 							icon: 'none'
 						})
+						if (!isUpdate) {
+							uni.hideLoading()
+						}
+					}
+
+				} catch (error) {
+					if (!isUpdate) {
 						uni.hideLoading()
 					}
-					
-				} catch (error) {
-					uni.hideLoading()
 					// uni.showToast({
 					// 	title: error.msg,
 					// 	icon: 'none'
@@ -1072,15 +1077,15 @@
 			async fetchSharedDeviceDetail(id) {
 				try {
 					const res = await deviceShareId(id)
-					if(res.code==200){
+					if (res.code == 200) {
 						this.handleDeviceData(res, true)
-					}else{
+					} else {
 						uni.showToast({
-							title: error.msg,
+							title: res.msg,
 							icon: 'none'
 						})
 					}
-					
+
 				} catch (error) {
 					uni.showToast({
 						title: error.msg,

From 823c54aed77fd5e3413c9663451a2801846d6a29 Mon Sep 17 00:00:00 2001
From: fengerli <528575642@qq.com>
Date: Sat, 16 Aug 2025 17:37:24 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=8A=A5=E8=AD=A6?=
 =?UTF-8?q?=EF=BC=8C=E8=8E=B7=E5=8F=96=E8=AE=BE=E5=A4=87=E5=AE=9E=E6=97=B6?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/6170/allShare/index.vue      |   6 +-
 pages/6170/callPolice/index.vue    | 753 +++++++++++++++--------------
 pages/6170/deviceControl/index.vue |  93 ++--
 pages/common/send/index.vue        |   1 -
 4 files changed, 465 insertions(+), 388 deletions(-)

diff --git a/pages/6170/allShare/index.vue b/pages/6170/allShare/index.vue
index bb6a4ef..cc0307e 100644
--- a/pages/6170/allShare/index.vue
+++ b/pages/6170/allShare/index.vue
@@ -249,14 +249,10 @@
 		},
 		onLoad() {
 			this.onIntall()
-			// 绑定页面做了监听,新增成功,刷新页面
-			uni.$on('refreshDeviceList', () => {
-				this.onIntall()
-			});
 		},
 		beforeDestroy() {
 			// 组件销毁前移除监听器
-			uni.$off('refreshDeviceList');
+	
 		},
 	}
 </script>
diff --git a/pages/6170/callPolice/index.vue b/pages/6170/callPolice/index.vue
index 2fda5e2..99f4a2e 100644
--- a/pages/6170/callPolice/index.vue
+++ b/pages/6170/callPolice/index.vue
@@ -3,9 +3,10 @@
 		<!-- 设备列表 -->
 		<view class="allSelect" @click="selectAll"> 全选</view>
 		<scroll-view class="device-list" scroll-y>
-			<view class="device-card" v-for="(item, index) in deviceList" :key="index"  @click="item.onlineStatus === 1 ? toggleSelect(index) : null">
+			<view class="device-card" v-for="(item, index) in deviceList" :key="index"
+				@click="item.onlineStatus === 1 ? toggleSelect(index) : null">
 				<!-- 复选框 -->
-				<view class="checkbox" :class="{ checked: item.checked,disabled: item.onlineStatus !== 1  }">
+				<view class="checkbox" :class="{ checked: item.checked, disabled: item.onlineStatus !== 1 }">
 					<uni-icons v-if="item.checked" type="checkmarkempty" size="18" color="rgb(0, 0, 0)"></uni-icons>
 				</view>
 				<!-- 设备信息 -->
@@ -46,400 +47,448 @@
 </template>
 
 <script>
-	import CustomPopup from '@/components/CustomPopup/CustomPopup.vue'
-	import {
-		generateShortId
-	} from '@/utils/function.js';
-	import {
-		deviceInfo,
-	} from '@/api/common/index.js'
-	import {
-		deviceSendAlarmMessage
-	} from '@/api/6170/callPolice.js'
-	import {
-		deviceRealTimeStatus //设备状态
-	} from '@/api/6170/deviceControl.js'
-	export default {
-		components: {
-			CustomPopup
+import CustomPopup from '@/components/CustomPopup/CustomPopup.vue'
+import {
+	generateShortId
+} from '@/utils/function.js';
+import {
+	deviceInfo,
+} from '@/api/common/index.js'
+import {
+	deviceSendAlarmMessage
+} from '@/api/6170/callPolice.js'
+import {
+	deviceRealTimeStatus //设备状态
+} from '@/api/6170/deviceControl.js'
+export default {
+	components: {
+		CustomPopup
+	},
+	data() {
+		return {
+			deviceList: [],
+			showPopupFlag: false,
+			popupTitle: '',
+			popupMessage: '确认要对所选设备开启强制报警?',
+			popupConfirmText: '确认',
+			popupType: 'force', // 'force' or 'cancel'
+			pendingAlarmAction: '',
+			sendInfo: ''
+		}
+	},
+	computed: {
+		selectedDeviceIds() {
+			return this.deviceList.filter(item => item.checked).map(item => item.id);
+		}
+	},
+	methods: {
+		onclosePopup() {
+			this.showPopupFlag = false
 		},
-		data() {
-			return {
-				deviceList: [],
-				showPopupFlag: false,
-				popupTitle: '',
-				popupMessage: '确认要对所选设备开启强制报警?',
-				popupConfirmText: '确认',
-				popupType: 'force', // 'force' or 'cancel'
-				pendingAlarmAction: '',
-				sendInfo: ''
-			}
+		toggleSelect(index) {
+			this.deviceList[index].checked = !this.deviceList[index].checked
+			this.$forceUpdate()
 		},
-		computed: {
-			selectedDeviceIds() {
-				return this.deviceList.filter(item => item.checked).map(item => item.id);
-			}
-		},
-		methods: {
-			onclosePopup() {
-				this.showPopupFlag = false
-			},
-			toggleSelect(index) {
-				this.deviceList[index].checked = !this.deviceList[index].checked
-				this.$forceUpdate()
-			},
-			// 全选/取消全选
-			selectAll() {
-				console.log('123');
-				const allSelected = this.deviceList.every(item => item.checked);
-				this.deviceList.forEach(item => {
-					item.checked = !allSelected;
-				});
-
-				this.$forceUpdate();
-			},
-			// 获取设备列表
-			getData(deviceType) {
-				this.loading = true;
-				let data = {
-					pageNum: 1,
-					pageSize: 50,
-					deviceType: deviceType
-				}
-				deviceInfo(data).then((res) => {
-					if (res.code == 200) {
-						const newDevices = res.rows.map(device => ({
-							...device,
-							showConfirm: false,
-							checked: false
-						}));
-						this.total = res.total;
-						this.deviceList = newDevices
-					}
-				}).finally(() => {
-					this.loading = false;
-				});
-			},
-			// 强制报警
-			forceAlarm() {
-				const selectedDevices = this.deviceList.filter(item => item.checked)
-				if (selectedDevices.length === 0) {
-					uni.showToast({
-						title: '请选择一个设备',
-						icon: 'none'
-					});
-					return;
-				}
-				this.popupType = 'force';
-				this.popupMessage = '确认要对所选设备开启强制报警?';
-				this.showPopupFlag = true;
-				this.pendingAlarmAction = 1
-
-			},
-			// 解除报警
-			cancelAlarm() {
-				const selectedDevices = this.deviceList.filter(item => item.checked);
-				if (selectedDevices.length === 0) {
-					uni.showToast({
-						title: '请选择一个设备',
-						icon: 'none'
-					});
-					return;
-				}
-				this.popupType = 'cancel';
-				this.popupMessage = '确认要解除所选设备的报警状态?';
-				this.showPopupFlag = true;
-				this.pendingAlarmAction = 0
-			},
-			// 确认
-			async sendAlarmCommand() {
-				const selectedDevices = this.deviceList.filter(item => item.checked);
-				const deviceIds = selectedDevices.map(item => item.id);
-				const deviceImeiList = selectedDevices.map(item => item.deviceImei);
-				const isAlarming = this.pendingAlarmAction == 1;
+		/**
+		 * 获取设备状态（带自动轮询）
+		 * @param {number} val - 功能模式
+		 * @param {string} batchId - 批次ID
+		 * @param {number} [interval=1000] - 轮询间隔（毫秒）
+		 */
+		async getdeviceSTatus(val, batchId, interval =500) {
+			const checkStatus = async () => {
 				try {
-					uni.showLoading({
-						title: isAlarming ? '设备报警中...' : '解除报警中...',
-						mask: true
-					});
 					const data = {
-						deviceIds: deviceIds,
+						functionMode: val,
+						batchId: batchId,
 						typeName: this.sendInfo.typeName,
-						deviceImeiList: deviceImeiList,
-						instructValue: this.pendingAlarmAction == 1 ? '1' : '0'
+						deviceImei: this.sendInfo.deviceImei
 					};
-					const registerRes = await deviceSendAlarmMessage(data);
-					if (registerRes.code == 200) {
-						uni.showToast({
-							title: statusRes.msg,
-							icon: 'none'
-						});
-						this.showPopupFlag = false
-						uni.$emit('deviceStatusUpdate', {});
-						setTimeout(() => {
-							uni.navigateBack()
-						}, 500)
-					} else {
-						uni.showToast({
-							title: registerRes.msg,
-							icon: 'none'
-						});
+					const res = await deviceRealTimeStatus(data);
+					if (res.code !== 200) {
+						throw new Error(res.msg || '请求失败');
+					}
+					switch (res.data.functionAccess) {
+						case 'OK':
+							return res; // 成功完成
+						case 'ACTIVE':
+							await new Promise(r => setTimeout(r, interval));
+							return checkStatus(); // 继续轮询
+						case 'FAILED':
+							throw new Error('设备操作失败');
+						case 'TIMEOUT':
+							throw new Error('设备响应超时');
+						default:
+							throw new Error('未知状态');
 					}
 				} catch (error) {
+					throw error;
+				}
+			};
+			return checkStatus();
+		},
+		// 全选/取消全选
+		selectAll() {
+			console.log('123');
+			const allSelected = this.deviceList.every(item => item.checked);
+			this.deviceList.forEach(item => {
+				item.checked = !allSelected;
+			});
+
+			this.$forceUpdate();
+		},
+		// 获取设备列表
+		getData(deviceType) {
+			this.loading = true;
+			let data = {
+				pageNum: 1,
+				pageSize: 50,
+				deviceType: deviceType
+			}
+			deviceInfo(data).then((res) => {
+				if (res.code == 200) {
+					const newDevices = res.rows.map(device => ({
+						...device,
+						showConfirm: false,
+						checked: false
+					}));
+					this.total = res.total;
+					this.deviceList = newDevices
+				}
+			}).finally(() => {
+				this.loading = false;
+			});
+		},
+		// 强制报警
+		forceAlarm() {
+			const selectedDevices = this.deviceList.filter(item => item.checked)
+			if (selectedDevices.length === 0) {
+				uni.showToast({
+					title: '请选择一个设备',
+					icon: 'none'
+				});
+				return;
+			}
+			this.popupType = 'force';
+			this.popupMessage = '确认要对所选设备开启强制报警?';
+			this.showPopupFlag = true;
+			this.pendingAlarmAction = 1
+
+		},
+		// 解除报警
+		cancelAlarm() {
+			const selectedDevices = this.deviceList.filter(item => item.checked);
+			if (selectedDevices.length === 0) {
+				uni.showToast({
+					title: '请选择一个设备',
+					icon: 'none'
+				});
+				return;
+			}
+			this.popupType = 'cancel';
+			this.popupMessage = '确认要解除所选设备的报警状态?';
+			this.showPopupFlag = true;
+			this.pendingAlarmAction = 0
+		},
+		// 确认
+		async sendAlarmCommand() {
+			const selectedDevices = this.deviceList.filter(item => item.checked);
+			const deviceIds = selectedDevices.map(item => item.id);
+			const deviceImeiList = selectedDevices.map(item => item.deviceImei);
+			const isAlarming = this.pendingAlarmAction == 1;
+			try {
+
+				uni.showLoading({
+					title: isAlarming ? '设备报警中...' : '解除报警中...',
+					mask: true
+				});
+				// 2. 准备请求数据
+				const batchId = generateShortId();
+				const data = {
+					deviceIds: deviceIds,
+					typeName: this.sendInfo.typeName,
+					deviceImeiList: deviceImeiList,
+					batchId: batchId,
+					instructValue: this.pendingAlarmAction == 1 ? '1' : '0'
+				};
+				const registerRes = await deviceSendAlarmMessage(data);
+				if (registerRes.code !== 200) {
 					uni.showToast({
-						title: error.message,
+						title: registerRes.msg,
+						icon: 'none'
+					})
+					return
+				}
+				// 4. 获取设备状态
+				const statusRes = await this.getdeviceSTatus(2, batchId);
+				if (statusRes.data.functionAccess === 'OK') {
+					uni.showToast({
+						title: statusRes.msg,
 						icon: 'none'
 					});
-				} finally {
-					uni.hideLoading();
-					this.isSending = false;
+					this.showPopupFlag = false
+					uni.$emit('deviceStatusUpdate', {});
+					setTimeout(() => {
+						uni.navigateBack()
+					}, 500)
 				}
-			},
-			// 点击确认状态
-			onPopupConfirm() {
-				this.sendAlarmCommand(this.popupType);
-				// 处理确认逻辑
-			},
+			} catch (error) {
+				uni.showToast({
+					title: error.message,
+					icon: 'none'
+				});
+			} finally {
+				uni.hideLoading();
+			}
 		},
-		onLoad(options) {
-			const eventChannel = this.getOpenerEventChannel();
-			// 监听 'deviceSend' 事件，获取传过来的数据
-			eventChannel.on('devicePolice', (data) => {
-				this.getData(data.data.id)
-				this.sendInfo = data.data
-			});
-			// 如果需要向调用页面返回数据，可以触发 'ack' 事件
-			eventChannel.emit('ack', {})
+		// 点击确认状态
+		onPopupConfirm() {
+			this.sendAlarmCommand(this.popupType);
+			// 处理确认逻辑
 		},
-	}
+	},
+	onLoad(options) {
+		const eventChannel = this.getOpenerEventChannel();
+		// 监听 'deviceSend' 事件，获取传过来的数据
+		eventChannel.on('devicePolice', (data) => {
+			this.getData(data.data.id)
+			this.sendInfo = data.data
+		});
+		// 如果需要向调用页面返回数据，可以触发 'ack' 事件
+		eventChannel.emit('ack', {})
+	},
+}
 </script>
 
 <style scoped>
-	.container {
-		min-height: 100vh;
-		background-color: rgb(18, 18, 18);
-		box-sizing: border-box;
-		overflow-x: hidden;
+.container {
+	min-height: 100vh;
+	background-color: rgb(18, 18, 18);
+	box-sizing: border-box;
+	overflow-x: hidden;
 
-	}
+}
 
-	.allSelect {
-		color: rgba(255, 255, 255, 0.87);
-		float: right;
-		padding: 25rpx;
-		cursor: pointer;
-	}
+.allSelect {
+	color: rgba(255, 255, 255, 0.87);
+	float: right;
+	padding: 25rpx;
+	cursor: pointer;
+}
 
-	.device-list {
-		flex: 1;
-		padding: 0rpx 20rpx;
-		clear: both;
-	}
+.device-list {
+	flex: 1;
+	padding: 0rpx 20rpx;
+	clear: both;
+}
 
-	.device-card {
-		position: relative;
-		display: flex;
-		align-items: center;
-		width: 95%;
-		margin-bottom: 20rpx;
-	}
+.device-card {
+	position: relative;
+	display: flex;
+	align-items: center;
+	width: 95%;
+	margin-bottom: 20rpx;
+}
 
-	.checkbox {
-		width: 40rpx;
-		height: 40rpx;
-		border: 2rpx solid rgba(255, 255, 255, 0.5);
-		margin-right: 20rpx;
-		border-radius: 4rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-	}
+.checkbox {
+	width: 40rpx;
+	height: 40rpx;
+	border: 2rpx solid rgba(255, 255, 255, 0.5);
+	margin-right: 20rpx;
+	border-radius: 4rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
 
-	.checkbox.checked {
-		background: rgba(224, 52, 52, 1);
-		border-color: rgba(224, 52, 52, 1);
-	}
+.checkbox.checked {
+	background: rgba(224, 52, 52, 1);
+	border-color: rgba(224, 52, 52, 1);
+}
 
-	.device-content {
-		background-color: rgb(26, 26, 26);
-		border-radius: 16rpx;
-		position: relative;
-		/* display: flex; */
-		align-items: center;
-		padding: 20rpx;
-		width: 95%;
-	}
+.device-content {
+	background-color: rgb(26, 26, 26);
+	border-radius: 16rpx;
+	position: relative;
+	/* display: flex; */
+	align-items: center;
+	padding: 20rpx;
+	width: 95%;
+}
 
-	.device-header {
-		display: flex;
-		align-items: center;
-		margin-bottom: 15rpx;
-	}
+.device-header {
+	display: flex;
+	align-items: center;
+	margin-bottom: 15rpx;
+}
 
-	.device-name {
-		font-size: 32rpx;
-		color: rgba(255, 255, 255, 0.87);
-		margin-left: 12rpx;
-		line-height: 50rpx;
-		width: 83%;
-		white-space: nowrap;
-	}
+.device-name {
+	font-size: 32rpx;
+	color: rgba(255, 255, 255, 0.87);
+	margin-left: 12rpx;
+	line-height: 50rpx;
+	width: 83%;
+	white-space: nowrap;
+}
 
-	.ID {
-		color: rgba(255, 255, 255, 0.6);
-		font-size: 26rpx;
-		display: flex;
-		justify-content: space-between;
-		position: relative;
-	}
+.ID {
+	color: rgba(255, 255, 255, 0.6);
+	font-size: 26rpx;
+	display: flex;
+	justify-content: space-between;
+	position: relative;
+}
 
-	.device-status {
-		width: 122rpx;
-		height: 52rpx;
-		font-size: 26rpx;
-		border-radius: 0px 8px 0px 8px;
-		background-color: rgb(42, 42, 42);
-		position: absolute;
-		top: 0rpx;
-		right: 0rpx;
-		text-align: center;
-		line-height: 52rpx;
-	}
+.device-status {
+	width: 122rpx;
+	height: 52rpx;
+	font-size: 26rpx;
+	border-radius: 0px 8px 0px 8px;
+	background-color: rgb(42, 42, 42);
+	position: absolute;
+	top: 0rpx;
+	right: 0rpx;
+	text-align: center;
+	line-height: 52rpx;
+}
 
-	.online {
-		color: rgb(187, 230, 0);
-	}
+.online {
+	color: rgb(187, 230, 0);
+}
 
-	.unline {
-		color: rgba(255, 255, 255, 0.4);
-	}
+.unline {
+	color: rgba(255, 255, 255, 0.4);
+}
 
-	.device-info {
-		display: flex;
-		justify-content: space-evenly;
-		font-size: 26rpx;
-		color: rgba(255, 255, 255, 0.87);
-		padding-top: 10rpx;
-		position: relative;
-	}
+.device-info {
+	display: flex;
+	justify-content: space-evenly;
+	font-size: 26rpx;
+	color: rgba(255, 255, 255, 0.87);
+	padding-top: 10rpx;
+	position: relative;
+}
 
-	.deviceIMG {
-		width: 100rpx;
-		height: 100rpx;
-		border-radius: 16rpx;
-		position: relative;
-		background-color: rgba(42, 42, 42, 0.6);
-		display: flex;
-		align-items: center;
-	}
+.deviceIMG {
+	width: 100rpx;
+	height: 100rpx;
+	border-radius: 16rpx;
+	position: relative;
+	background-color: rgba(42, 42, 42, 0.6);
+	display: flex;
+	align-items: center;
+}
 
-	.IMG {
-		width: 68rpx;
-		height: 50rpx;
-		margin-left: 17%;
-	}
+.IMG {
+	width: 68rpx;
+	height: 50rpx;
+	margin-left: 17%;
+}
 
-	.onlines {
-		position: relative;
-	}
+.onlines {
+	position: relative;
+}
 
-	.onlines::before {
-		content: '';
-		position: absolute;
-		width: 15rpx;
-		height: 15rpx;
-		background: rgb(0, 171, 103);
-		border-radius: 50%;
-		top: 20rpx;
-		left: -20rpx
-	}
+.onlines::before {
+	content: '';
+	position: absolute;
+	width: 15rpx;
+	height: 15rpx;
+	background: rgb(0, 171, 103);
+	border-radius: 50%;
+	top: 20rpx;
+	left: -20rpx
+}
 
-	.unlines {
-		position: relative;
-	}
+.unlines {
+	position: relative;
+}
 
-	.unlines::before {
-		content: '';
-		position: absolute;
-		width: 15rpx;
-		height: 15rpx;
-		background: rgba(255, 255, 255, 0.4);
-		border-radius: 50%;
-		top: 20rpx;
-		left: -20rpx
-	}
+.unlines::before {
+	content: '';
+	position: absolute;
+	width: 15rpx;
+	height: 15rpx;
+	background: rgba(255, 255, 255, 0.4);
+	border-radius: 50%;
+	top: 20rpx;
+	left: -20rpx
+}
 
-	.line {
-		width: 2rpx;
-		height: 24rpx;
-		background: linear-gradient(90deg,
-				rgba(0, 0, 0, 0) 0%,
-				rgb(255, 255, 255) 50%,
-				rgba(255, 255, 255, 0) 100%);
-		margin-top: 12rpx;
-	}
+.line {
+	width: 2rpx;
+	height: 24rpx;
+	background: linear-gradient(90deg,
+			rgba(0, 0, 0, 0) 0%,
+			rgb(255, 255, 255) 50%,
+			rgba(255, 255, 255, 0) 100%);
+	margin-top: 12rpx;
+}
 
-	.ql-editor {
-		color: rgba(255, 255, 255, 0.6);
-		font-size: 30rpx;
-	}
+.ql-editor {
+	color: rgba(255, 255, 255, 0.6);
+	font-size: 30rpx;
+}
 
-	.ql-input {
-		width: 95.9%;
-		height: 200rpx;
-		margin-top: 30rpx;
-		box-sizing: border-box;
-		padding: 30rpx;
-		border-radius: 16rpx;
-		background: rgb(26, 26, 26);
-	}
+.ql-input {
+	width: 95.9%;
+	height: 200rpx;
+	margin-top: 30rpx;
+	box-sizing: border-box;
+	padding: 30rpx;
+	border-radius: 16rpx;
+	background: rgb(26, 26, 26);
+}
 
-	.textarea {
-		color: rgba(255, 255, 255, 0.8);
-		background: rgba(42, 42, 42, 1);
-		border-radius: 16rpx;
-		padding: 10rpx;
-		height: 150rpx;
-	}
+.textarea {
+	color: rgba(255, 255, 255, 0.8);
+	background: rgba(42, 42, 42, 1);
+	border-radius: 16rpx;
+	padding: 10rpx;
+	height: 150rpx;
+}
 
-	.editInfmation {
-		display: flex;
-		padding: 20rpx;
-		border-radius: 40rpx 40rpx 0px 0px;
-		width: 96%;
-		position: fixed;
-		bottom: 50rpx;
-		box-sizing: border-box;
+.editInfmation {
+	display: flex;
+	padding: 20rpx;
+	border-radius: 40rpx 40rpx 0px 0px;
+	width: 96%;
+	position: fixed;
+	bottom: 50rpx;
+	box-sizing: border-box;
 
-	}
+}
 
-	.login-btn {
-		margin-top: 30rpx;
-		color: rgb(35, 35, 35);
-		border-radius: 50rpx;
-		width: 40%;
-		color: #fff;
-		height: 88rpx;
-		font-size: 30rpx;
-		line-height: 88rpx;
-	}
+.login-btn {
+	margin-top: 30rpx;
+	color: rgb(35, 35, 35);
+	border-radius: 50rpx;
+	width: 40%;
+	color: #fff;
+	height: 88rpx;
+	font-size: 30rpx;
+	line-height: 88rpx;
+}
 
-	.qz {
-		background: rgba(224, 52, 52, 1);
-	}
+.qz {
+	background: rgba(224, 52, 52, 1);
+}
 
-	.jc {
-		border: 1px solid rgba(255, 255, 255, 0.87);
-		background: rgba(18, 18, 18, 1);
-	}
-	.checkbox.disabled {
-	  opacity: 0.5;
-	  background-color: rgba(255, 255, 255, 0.1) !important;
-	  border-color: rgba(255, 255, 255, 0.2) !important;
-	  pointer-events: none; /* 阻止点击事件 */
-	}
-	/* 可选：离线设备的卡片整体置灰 */
-	.device-card[data-offline="true"] {
-	  opacity: 0.6;
-	}
+.jc {
+	border: 1px solid rgba(255, 255, 255, 0.87);
+	background: rgba(18, 18, 18, 1);
+}
+
+.checkbox.disabled {
+	opacity: 0.5;
+	background-color: rgba(255, 255, 255, 0.1) !important;
+	border-color: rgba(255, 255, 255, 0.2) !important;
+	pointer-events: none;
+	/* 阻止点击事件 */
+}
+
+/* 可选：离线设备的卡片整体置灰 */
+.device-card[data-offline="true"] {
+	opacity: 0.6;
+}
 </style>
\ No newline at end of file
diff --git a/pages/6170/deviceControl/index.vue b/pages/6170/deviceControl/index.vue
index bc2ce87..8ed74fe 100644
--- a/pages/6170/deviceControl/index.vue
+++ b/pages/6170/deviceControl/index.vue
@@ -309,6 +309,7 @@
 				lightModeB: false,
 				lightModeC: false, //激光提示框
 				items: [],
+				pendingMainMode: null, // 选中的索引
 				isFormExpanded: true, // 默认展开
 				deviceID: '',
 				itemInfo: {},
@@ -553,21 +554,38 @@
 			toggleForm() {
 				this.isFormExpanded = !this.isFormExpanded;
 			},
+			// onItemClick(index) {
+			// 	const selectedItem = this.items[index];
+			// 	if (selectedItem.text === '激光') {
+			// 		this.lightModeC = true;
+			// 	} else {
+			// 		// 更新选中状态
+			// 		this.items = this.items.map((item, i) => ({
+			// 			...item,
+			// 			selected: i === index
+			// 		}));
+			// 		this.currentMainMode = selectedItem.text;
+			// 		this.selectedItemIndex = index;
+			// 		// 强制更新视图（如果需要）
+			// 		this.$forceUpdate();
+			// 	}
+			// },
 			onItemClick(index) {
-				const selectedItem = this.items[index];
-				if (selectedItem.text === '激光') {
+				const item = this.items[index];
+				// 激光模式特殊处理
+				if (item.text === '激光') {
 					this.lightModeC = true;
-				} else {
-					// 更新选中状态
-					this.items = this.items.map((item, i) => ({
-						...item,
-						selected: i === index
-					}));
-					this.currentMainMode = selectedItem.text;
-					this.selectedItemIndex = index;
-					// 强制更新视图（如果需要）
-					this.$forceUpdate();
+					return;
 				}
+				// 只更新临时选中状态
+				this.selectedItemIndex = index;
+				// UI高亮效果（不影响实际模式）
+				this.items = this.items.map((item, i) => ({
+					...item,
+					selected: i === index
+				}));
+				// 显示临时选中的模式名称（视觉反馈）
+				this.pendingMainMode = item.text; 
 			},
 			// 灯光模式的确认
 			handleSumbit() {
@@ -589,7 +607,6 @@
 				this.isProcessing = true
 				if (this.selectedItemIndex === null) return;
 				const selectedItem = this.items[this.selectedItemIndex];
-				// 准备请求数据
 				let data = {
 					deviceId: this.computedDeviceId,
 					instructValue: selectedItem.instructValue,
@@ -598,6 +615,9 @@
 				};
 				lightModeSettings(data).then((res) => {
 					if (res.code == 200) {
+						// 只有确认成功才更新实际模式,选中模式
+						this.currentMainMode = this.pendingMainMode;
+						this.selectedItemIndex = selectedItem;
 						uni.showToast({
 							title: res.msg,
 							icon: 'none'
@@ -914,20 +934,29 @@
 					};
 					// 3.解除告警状态
 					const registerRes = await deviceSendAlarmMessage(data);
-					if (registerRes.code == 200) {
+					if (registerRes.code !== 200) {
+						uni.showToast({
+							title: registerRes.msg,
+							icon: 'none'
+						})
+						return
+					}
+					// 4. 获取设备状态
+					const statusRes = await this.getdeviceSTatus(2, batchId);
+					if (statusRes.data.functionAccess === 'OK') {
 						uni.showToast({
 							title: statusRes.msg,
 							icon: 'none'
 						});
-						//  刷新详情接口
-						this.fetchDeviceDetail(this.computedDeviceId, true);
 						uni.$emit('deviceStatusUpdate', {});
 						this.showPopupFlag = false
-					} else {
-						uni.showToast({
-							title: registerRes.message,
-							icon: 'none'
-						});
+						if (this.apiType === 'listA') {
+							this.fetchDeviceDetail(this.computedDeviceId)
+						} else {
+							// 分享权限详情
+							this.fetchSharedDeviceDetail(this.itemInfo.id)
+						}
+
 					}
 				} catch (error) {
 					uni.showToast({
@@ -1091,6 +1120,7 @@
 						title: error.msg,
 						icon: 'none'
 					})
+					uni.hideLoading()
 				}
 			},
 			// 操作说明
@@ -1187,15 +1217,18 @@
 										this.deviceInfo.batteryRemainingTime = deviceState[5];
 									}
 									setTimeout(() => {
-										this.fetchDeviceDetail(data.data.id, true).then(
-											() => {
-												if (this.deviceInfo.batteryPercentage <
-													20) {
-													this.popupType = 'bettery';
-													this.popupMessage = '请及时充电';
-													this.showPopupFlag = true;
-												}
-											});
+										if (this.deviceInfo.batteryPercentage <
+											20) {
+											this.popupType = 'bettery';
+											this.popupMessage = '请及时充电';
+											this.showPopupFlag = true;
+										}
+										if (this.apiType === 'listA') {
+											this.fetchDeviceDetail(data.data.id)
+										} else {
+											// 分享权限详情
+											this.fetchSharedDeviceDetail(data.data.id)
+										}
 									}, 10000);
 									// 上报电量,在列表里面同步
 									uni.$emit('deviceStatusUpdate', {
diff --git a/pages/common/send/index.vue b/pages/common/send/index.vue
index 7861a5c..5d35263 100644
--- a/pages/common/send/index.vue
+++ b/pages/common/send/index.vue
@@ -82,7 +82,6 @@
 			 * @param {number} [interval=1000] - 轮询间隔（毫秒）
 			 */
 			async getdeviceSTatus(val, batchId, interval = 800) {
-				let retries = 0;
 				const checkStatus = async () => {
 					try {
 						const data = {