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] =?UTF-8?q?=E6=89=B9=E9=87=8F=E6=8A=A5=E8=AD=A6=EF=BC=8C?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AE=BE=E5=A4=87=E5=AE=9E=E6=97=B6=E7=8A=B6?=
 =?UTF-8?q?=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 = {