批量报警，获取设备实时状态

pages/6170/allShare/index.vue

@@ -249,14 +249,10 @@
 		},
 		onLoad() {
 			this.onIntall()
-			// 绑定页面做了监听,新增成功,刷新页面
-			uni.$on('refreshDeviceList', () => {
-				this.onIntall()
-			});
 		},
 		beforeDestroy() {
 			// 组件销毁前移除监听器
-			uni.$off('refreshDeviceList');
+	
 		},
 	}
 </script>

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,20 +47,20 @@
 </template>
 
 <script>
-	import CustomPopup from '@/components/CustomPopup/CustomPopup.vue'
+import CustomPopup from '@/components/CustomPopup/CustomPopup.vue'
-	import {
+import {
 	generateShortId
-	} from '@/utils/function.js';
+} from '@/utils/function.js';
-	import {
+import {
 	deviceInfo,
-	} from '@/api/common/index.js'
+} from '@/api/common/index.js'
-	import {
+import {
 	deviceSendAlarmMessage
-	} from '@/api/6170/callPolice.js'
+} from '@/api/6170/callPolice.js'
-	import {
+import {
 	deviceRealTimeStatus //设备状态
-	} from '@/api/6170/deviceControl.js'
+} from '@/api/6170/deviceControl.js'
-	export default {
+export default {
 	components: {
 		CustomPopup
 	},
@@ -88,6 +89,44 @@
 			this.deviceList[index].checked = !this.deviceList[index].checked
 			this.$forceUpdate()
 		},
+		/**
+		 * 获取设备状态（带自动轮询）
+		 * @param {number} val - 功能模式
+		 * @param {string} batchId - 批次ID
+		 * @param {number} [interval=1000] - 轮询间隔（毫秒）
+		 */
+		async getdeviceSTatus(val, batchId, interval =500) {
+			const checkStatus = async () => {
+				try {
+					const data = {
+						functionMode: val,
+						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();
+		},
 		// 全选/取消全选
 		selectAll() {
 			console.log('123');
@@ -158,18 +197,31 @@
 			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) {
+				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'
@@ -179,11 +231,6 @@
 					setTimeout(() => {
 						uni.navigateBack()
 					}, 500)
-					} else {
-						uni.showToast({
-							title: registerRes.msg,
-							icon: 'none'
-						});
 				}
 			} catch (error) {
 				uni.showToast({
@@ -192,7 +239,6 @@
 				});
 			} finally {
 				uni.hideLoading();
-					this.isSending = false;
 			}
 		},
 		// 点击确认状态
@@ -211,40 +257,40 @@
 		// 如果需要向调用页面返回数据，可以触发 'ack' 事件
 		eventChannel.emit('ack', {})
 	},
-	}
+}
 </script>
 
 <style scoped>
-	.container {
+.container {
 	min-height: 100vh;
 	background-color: rgb(18, 18, 18);
 	box-sizing: border-box;
 	overflow-x: hidden;
 
-	}
+}
 
-	.allSelect {
+.allSelect {
 	color: rgba(255, 255, 255, 0.87);
 	float: right;
 	padding: 25rpx;
 	cursor: pointer;
-	}
+}
 
-	.device-list {
+.device-list {
 	flex: 1;
 	padding: 0rpx 20rpx;
 	clear: both;
-	}
+}
 
-	.device-card {
+.device-card {
 	position: relative;
 	display: flex;
 	align-items: center;
 	width: 95%;
 	margin-bottom: 20rpx;
-	}
+}
 
-	.checkbox {
+.checkbox {
 	width: 40rpx;
 	height: 40rpx;
 	border: 2rpx solid rgba(255, 255, 255, 0.5);
@@ -253,14 +299,14 @@
 	display: flex;
 	align-items: center;
 	justify-content: center;
-	}
+}
 
-	.checkbox.checked {
+.checkbox.checked {
 	background: rgba(224, 52, 52, 1);
 	border-color: rgba(224, 52, 52, 1);
-	}
+}
 
-	.device-content {
+.device-content {
 	background-color: rgb(26, 26, 26);
 	border-radius: 16rpx;
 	position: relative;
@@ -268,32 +314,32 @@
 	align-items: center;
 	padding: 20rpx;
 	width: 95%;
-	}
+}
 
-	.device-header {
+.device-header {
 	display: flex;
 	align-items: center;
 	margin-bottom: 15rpx;
-	}
+}
 
-	.device-name {
+.device-name {
 	font-size: 32rpx;
 	color: rgba(255, 255, 255, 0.87);
 	margin-left: 12rpx;
 	line-height: 50rpx;
 	width: 83%;
 	white-space: nowrap;
-	}
+}
 
-	.ID {
+.ID {
 	color: rgba(255, 255, 255, 0.6);
 	font-size: 26rpx;
 	display: flex;
 	justify-content: space-between;
 	position: relative;
-	}
+}
 
-	.device-status {
+.device-status {
 	width: 122rpx;
 	height: 52rpx;
 	font-size: 26rpx;
@@ -304,26 +350,26 @@
 	right: 0rpx;
 	text-align: center;
 	line-height: 52rpx;
-	}
+}
 
-	.online {
+.online {
 	color: rgb(187, 230, 0);
-	}
+}
 
-	.unline {
+.unline {
 	color: rgba(255, 255, 255, 0.4);
-	}
+}
 
-	.device-info {
+.device-info {
 	display: flex;
 	justify-content: space-evenly;
 	font-size: 26rpx;
 	color: rgba(255, 255, 255, 0.87);
 	padding-top: 10rpx;
 	position: relative;
-	}
+}
 
-	.deviceIMG {
+.deviceIMG {
 	width: 100rpx;
 	height: 100rpx;
 	border-radius: 16rpx;
@@ -331,19 +377,19 @@
 	background-color: rgba(42, 42, 42, 0.6);
 	display: flex;
 	align-items: center;
-	}
+}
 
-	.IMG {
+.IMG {
 	width: 68rpx;
 	height: 50rpx;
 	margin-left: 17%;
-	}
+}
 
-	.onlines {
+.onlines {
 	position: relative;
-	}
+}
 
-	.onlines::before {
+.onlines::before {
 	content: '';
 	position: absolute;
 	width: 15rpx;
@@ -352,13 +398,13 @@
 	border-radius: 50%;
 	top: 20rpx;
 	left: -20rpx
-	}
+}
 
-	.unlines {
+.unlines {
 	position: relative;
-	}
+}
 
-	.unlines::before {
+.unlines::before {
 	content: '';
 	position: absolute;
 	width: 15rpx;
@@ -367,9 +413,9 @@
 	border-radius: 50%;
 	top: 20rpx;
 	left: -20rpx
-	}
+}
 
-	.line {
+.line {
 	width: 2rpx;
 	height: 24rpx;
 	background: linear-gradient(90deg,
@@ -377,14 +423,14 @@
 			rgb(255, 255, 255) 50%,
 			rgba(255, 255, 255, 0) 100%);
 	margin-top: 12rpx;
-	}
+}
 
-	.ql-editor {
+.ql-editor {
 	color: rgba(255, 255, 255, 0.6);
 	font-size: 30rpx;
-	}
+}
 
-	.ql-input {
+.ql-input {
 	width: 95.9%;
 	height: 200rpx;
 	margin-top: 30rpx;
@@ -392,17 +438,17 @@
 	padding: 30rpx;
 	border-radius: 16rpx;
 	background: rgb(26, 26, 26);
-	}
+}
 
-	.textarea {
+.textarea {
 	color: rgba(255, 255, 255, 0.8);
 	background: rgba(42, 42, 42, 1);
 	border-radius: 16rpx;
 	padding: 10rpx;
 	height: 150rpx;
-	}
+}
 
-	.editInfmation {
+.editInfmation {
 	display: flex;
 	padding: 20rpx;
 	border-radius: 40rpx 40rpx 0px 0px;
@@ -411,9 +457,9 @@
 	bottom: 50rpx;
 	box-sizing: border-box;
 
-	}
+}
 
-	.login-btn {
+.login-btn {
 	margin-top: 30rpx;
 	color: rgb(35, 35, 35);
 	border-radius: 50rpx;
@@ -422,24 +468,27 @@
 	height: 88rpx;
 	font-size: 30rpx;
 	line-height: 88rpx;
-	}
+}
 
-	.qz {
+.qz {
 	background: rgba(224, 52, 52, 1);
-	}
+}
 
-	.jc {
+.jc {
 	border: 1px solid rgba(255, 255, 255, 0.87);
 	background: rgba(18, 18, 18, 1);
-	}
+}
-	.checkbox.disabled {
+
+.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; /* 阻止点击事件 */
+	pointer-events: none;
-	}
+	/* 阻止点击事件 */
-	/* 可选：离线设备的卡片整体置灰 */
+}
-	.device-card[data-offline="true"] {
+
+/* 可选：离线设备的卡片整体置灰 */
+.device-card[data-offline="true"] {
 	opacity: 0.6;
-	}
+}
 </style>

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];
+				const item = this.items[index];
-				if (selectedItem.text === '激光') {
+				// 激光模式特殊处理
+				if (item.text === '激光') {
 					this.lightModeC = true;
-				} else {
+					return;
-					// 更新选中状态
+				}
+				// 只更新临时选中状态
+				this.selectedItemIndex = index;
+				// UI高亮效果（不影响实际模式）
 				this.items = this.items.map((item, i) => ({
 					...item,
 					selected: i === index
 				}));
-					this.currentMainMode = selectedItem.text;
+				// 显示临时选中的模式名称（视觉反馈）
-					this.selectedItemIndex = index;
+				this.pendingMainMode = item.text; 
-					// 强制更新视图（如果需要）
-					this.$forceUpdate();
-				}
 			},
 			// 灯光模式的确认
 			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
+						if (this.apiType === 'listA') {
+							this.fetchDeviceDetail(this.computedDeviceId)
 						} else {
-						uni.showToast({
+							// 分享权限详情
-							title: registerRes.message,
+							this.fetchSharedDeviceDetail(this.itemInfo.id)
-							icon: 'none'
+						}
-						});
+
 					}
 				} 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.apiType === 'listA') {
+											this.fetchDeviceDetail(data.data.id)
+										} else {
+											// 分享权限详情
+											this.fetchSharedDeviceDetail(data.data.id)
+										}
 									}, 10000);
 									// 上报电量,在列表里面同步
 									uni.$emit('deviceStatusUpdate', {

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 = {