diff --git a/api/6170/deviceControl.js b/api/6170/deviceControl.js
index e257231..c53c1bb 100644
--- a/api/6170/deviceControl.js
+++ b/api/6170/deviceControl.js
@@ -61,4 +61,13 @@ export function mapReverseGeocoding(data) {
     method: 'post',
 	data: data
   })
-}
\ No newline at end of file
+}
+
+// 或者设备状态
+export function deviceRealTimeStatus(params) {
+  return request({
+    url: `/app/device/realTimeStatus`,
+    method: 'get',
+	data:params
+  })
+}
diff --git a/package.json b/package.json
index 0ded30f..73c0a2f 100644
--- a/package.json
+++ b/package.json
@@ -3,6 +3,7 @@
     "axios": "^1.9.0",
     "cordova-sqlite-storage": "^7.0.0",
     "iconv-lite": "^0.6.3",
+    "mescroll-uni": "^1.3.7",
     "paho-mqtt": "^1.1.0",
     "text-encoding": "^0.7.0",
     "vk-uview-ui": "^1.5.2"
diff --git a/pages.json b/pages.json
index dae6342..afe1ed9 100644
--- a/pages.json
+++ b/pages.json
@@ -8,13 +8,11 @@
 			}
 		},
 
-
-
-
 		{
 			"path": "pages/common/index/index",
 			"style": {
-				"navigationStyle": "custom"
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
 			}
 		},
 		{
@@ -184,8 +182,14 @@
 			"style": {
 				"navigationBarTitleText": "历史记录"
 			}
+		},
+		{
+			"path": "pages/210/call/index",
+			"style": {
+				"navigationBarTitleText": "呼叫"
+			}
 		}
-		
+
 
 	],
 	"tabBar": {
diff --git a/pages/210/call/index.vue b/pages/210/call/index.vue
new file mode 100644
index 0000000..dc6c0ac
--- /dev/null
+++ b/pages/210/call/index.vue
@@ -0,0 +1,311 @@
+<template>
+	<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="checkbox" :class="{ checked: item.checked }">
+					<uni-icons v-if="item.checked" type="checkmarkempty" size="18" color="rgb(0, 0, 0)"></uni-icons>
+				</view>
+				<!-- 设备信息 -->
+				<view class="device-content">
+					<view class="device-header">
+						<view class="deviceIMG">
+							<image :src="item.devicePic" class="IMG" mode="aspectFit"></image>
+						</view>
+						<view class="device-name">
+							<view>设备:{{item.deviceName}}</view>
+							<view class="ID">
+								<view class="ID">ID:{{item.deviceImei}}</view>
+								<view class="onlines" v-if="item.onlineStatus==1">在线</view>
+								<!-- 离线状态 -->
+								<view class="unlines" v-if="item.onlineStatus==0">离线</view>
+								<view>电量：{{item.battery || '0'}}%</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="editInfmation">
+				<button class="login-btn" @click="callMessage">呼叫设备</button>
+			</view>
+		</scroll-view>
+		<!-- 成功提示弹框 -->
+		<CustomPopup :show="showPopupFlag" :title="popupTitle" :message="popupMessage"
+			icon="/static/images/common/bj_1.png" :confirm-text="popupConfirmText" :show-cancel="false"
+			@confirm="onPopupConfirm" />
+	</view>
+</template>
+
+<script>
+	import CustomPopup from '@/components/CustomPopup/CustomPopup.vue'
+	import {
+		deviceInfo,
+	} from '@/api/common/index.js'
+	import {
+		deviceSendMessage
+	} from '@/api/6170/deviceControl.js'
+	export default {
+		components: {
+			CustomPopup
+		},
+		data() {
+			return {
+				deviceList: [],
+				showPopupFlag: false,
+				popupTitle: '',
+				popupMessage: '确定要呼叫所选设备！',
+				popupConfirmText: '确认'
+			}
+		},
+		methods: {
+			toggleSelect(index) {
+				this.deviceList[index].checked = !this.deviceList[index].checked
+				this.$forceUpdate()
+			},
+			// 获取设备列表
+			getData(deviceType) {
+				this.loading = true;
+				let data = {
+					pageNum: 1,
+					pageSize: 20,
+					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;
+				});
+			},
+			//确认呼叫设备
+			callMessage() {
+				const selectedDevices = this.deviceList.filter(item => item.checked)
+				if (selectedDevices.length === 0) {
+					uni.showToast({
+						title: '请选择一个设备',
+						icon: 'none'
+					});
+					return;
+				}
+				this.showPopupFlag = true
+			},
+			//弹框确认
+			onPopupConfirm() {
+				const selectedDevices = this.deviceList.filter(item => item.checked)
+				const deviceIds = selectedDevices.map(item => item.id);
+				let data = {
+					deviceIds: deviceIds
+				}
+				deviceSendMessage(data).then((res) => {
+					if (res.code == 200) {
+						this.showPopupFlag = false
+						uni.navigateBack()
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none'
+						});
+					}
+				})
+			},
+		},
+		onLoad(options) {
+			const eventChannel = this.getOpenerEventChannel();
+			// 监听 'deviceSend' 事件，获取传过来的数据
+			eventChannel.on('deviceCall', (data) => {
+				console.log('Received detail data:', data);
+				this.getData(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;
+
+	}
+
+	.device-list {
+		flex: 1;
+		padding: 0 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.checked {
+		background-color: rgb(187, 230, 0);
+		border-color: rgb(187, 230, 0);
+	}
+
+	.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-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;
+	}
+
+	.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);
+	}
+
+	.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;
+	}
+
+	.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%;
+	}
+
+	.onlines {
+		position: relative;
+	}
+
+	.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::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;
+	}
+
+	.ql-editor {
+		color: rgba(255, 255, 255, 0.6);
+		font-size: 30rpx;
+	}
+
+	.editInfmation {
+		padding: 20rpx;
+		position: fixed;
+		bottom: 50rpx;
+		box-sizing: border-box;
+		width: 100%;
+	}
+
+	.login-btn {
+		margin-top: 30rpx;
+		background-color: rgb(187, 230, 0);
+		color: rgb(35, 35, 35);
+		border-radius: 50rpx;
+		width: 90%;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/210/deviceControl/index.vue b/pages/210/deviceControl/index.vue
index 4c9088f..7c64e04 100644
--- a/pages/210/deviceControl/index.vue
+++ b/pages/210/deviceControl/index.vue
@@ -128,9 +128,9 @@
 				</view> -->
 				<view class="mode-section">
 					<view class="mode-buttons">
-						<view v-for="(item, index) in modeItems" :key="index" class="mode-v1" :class="{ 'active-mode': selectedIndex === index }">
-							<view class="mode-v2" 
-								@click="handleModeClick(index)">
+						<view v-for="(item, index) in modeItems" :key="index" class="mode-v1"
+							:class="{ 'active-mode': selectedIndex === index }">
+							<view class="mode-v2" @click="handleModeClick(index)">
 								<image :src="item.image" class="setIMG" mode="aspectFit"></image>
 								<view>
 									<view class="battery-v2">{{ item.title }}</view>
@@ -249,23 +249,31 @@
 <script>
 	// 弹框配置中心
 	const POPUP_CONFIGS = {
+		// 人员信息发送
 		person: {
 			config: {
 				icon: '/static/images/common/sendSucc.png',
 				message: '信息发送成功',
 				showCancel: false
 			},
+			confirm() {
+				return true; // 直接关闭
+			}
 
 		},
-		// 开机log
+		// 上传开机log
 		logo: {
 			config: {
 				icon: '/static/images/common/upload.png',
 				message: '上传成功',
 				showCancel: false
 			},
+			confirm() {
+				return true; // 直接关闭
+			}
 
 		},
+		// 电量低于20%.提示框
 		bettery: {
 			config: {
 				title: '设备电量低于20%',
@@ -276,24 +284,24 @@
 				confirmBtnBg: 'rgba(224, 52, 52, 1)',
 				showCancel: true
 			},
-			onConfirm() {
-				console.log('确认按钮');
+			confirm() {
 				return true; // 直接关闭
 			}
 		},
-
+		// 解除报警关闭的那个提示
 		cancel: {
 			config: {
 				titleColor: 'rgba(224, 52, 52, 1)',
-				icon: '/static/images/common/svg.png',
+				icon: '/static/images/6170/svg.png',
 				popupBorder: '1rpx solid rgba(224, 52, 52, 0.3)',
 				confirmBtnBg: 'rgba(224, 52, 52, 1)',
 				showCancel: true //取消按钮
 			},
-			onConfirm() {
+			confirm() {
 				console.log('解除报警确认');
 			}
 		},
+		// 手动报警弹框
 		del: {
 			config: {
 				message: '确定开启报警?',
@@ -302,8 +310,26 @@
 				confirmBtnBg: 'rgba(255, 200, 78, 1)',
 				showCancel: true
 			},
-			onConfirm() {
-				console.log('删除确认');
+			confirm() {
+				return 'alarmCountdown'; //点击确认,再次弹框,解除报警,再次报警的类型
+			}
+		},
+		// 手动报警再次弹框 再次报警，解除报警指令
+		alarmCountdown: {
+			config: {
+				title: '报警倒计时',
+				icon: '/static/images/6170/svg.png',
+				message: '59秒',
+				popupBorder: '1rpx solid rgba(224, 52, 52, 1)',
+				confirmBtnBg: 'rgba(224, 52, 52, 1)',
+				cancelBtnColor:"rgba(224, 52, 52, 1)",
+				confirmBtnColor:"rgba(255, 255, 255, 0.87)",
+				confirmText: '解除报警',
+				cancelText:"再次报警",
+				showCancel: true //取消按钮
+			},
+			confirm() {
+				console.log('解除报警确认');
 			}
 		},
 		// 自动报警
@@ -320,9 +346,8 @@
 				confirmBtnColor: "rgba(255, 255, 255, 0.87)",
 				showCancel: false,
 			},
-			onConfirm() {
-				console.log('自动报警确认');
-				// 这里可以添加自动报警的逻辑
+			confirm() {
+				console.log('自动报警解除报警的弹框');
 			}
 		}
 
@@ -437,12 +462,19 @@
 				this.currentPopup = {
 					show: true,
 					config: POPUP_CONFIGS[type].config,
-					callback: POPUP_CONFIGS[type].onConfirm
+					callback: POPUP_CONFIGS[type].confirm
 				}
 			},
 			handleConfirm() {
-				this.currentPopup.show = false;
-				console.log('这是点击了确认');
+				if (this.currentPopup.callback) {
+				  const nextPopupType = this.currentPopup.callback(); // 执行回调并获取下一个弹框类型
+				    this.currentPopup.show = false; // 关闭当前弹框
+				    if (nextPopupType) {
+				      this.showPopup(nextPopupType); // 打开下一个弹框
+				    }
+				} else {
+					this.currentPopup.show = false; // 默认关闭
+				}
 			},
 			// 统一处理取消
 			handleCancel() {
@@ -888,7 +920,8 @@
 	.mode-v1.active-mode .battery-v2 {
 		color: #BBE600 !important;
 	}
-	.mode-v1.active-mode .mode-v3{
+
+	.mode-v1.active-mode .mode-v3 {
 		color: #BBE600 !important;
 	}
 
diff --git a/pages/210/onlineDevice/index.vue b/pages/210/onlineDevice/index.vue
index 6de0039..213f95c 100644
--- a/pages/210/onlineDevice/index.vue
+++ b/pages/210/onlineDevice/index.vue
@@ -2,7 +2,7 @@
 	<view>
 		<view class="device-page">
 			<view class="sendFlex">
-				<view class="Sendmessage" @click="location">呼叫</view>
+				<view class="Sendmessage" @click="call">呼叫</view>
 				<view class="Sendmessage" @click="handleSend">发送信息</view>
 			</view>
 			<scroll-view class="device-list" scroll-y @scrolltolower="onScrollToLower" :lower-threshold="100"
@@ -79,6 +79,20 @@
 					}
 				})
 			},
+			// 呼叫功能
+			call(){
+				uni.navigateTo({
+					url: '/pages/210/call/index',
+					events: {
+						ack: function(data) {}
+					},
+					success: (res) => {
+						res.eventChannel.emit('deviceCall', {
+				           data:this.deviceType
+						});
+					}
+				})
+			}
 		},
 		onShow() {
 			this.getData()
diff --git a/pages/6170/callPolice/index.vue b/pages/6170/callPolice/index.vue
index 1b34bd6..9f99630 100644
--- a/pages/6170/callPolice/index.vue
+++ b/pages/6170/callPolice/index.vue
@@ -15,13 +15,13 @@
 							<image :src="item.devicePic" class="IMG" mode="aspectFit"></image>
 						</view>
 						<view class="device-name">
-							<view>设备:{{item.deviceName}}</view>
+							<view>设备:{{ item.deviceName }}</view>
 							<view class="ID">
-								<view class="ID">ID:{{item.deviceImei}}</view>
-								<view class="onlines" v-if="item.onlineStatus==1">在线</view>
+								<view class="ID">ID:{{ item.deviceImei }}</view>
+								<view class="onlines" v-if="item.onlineStatus == 1">在线</view>
 								<!-- 离线状态 -->
-								<view class="unlines" v-if="item.onlineStatus==0">离线</view>
-								<view>电量：{{item.battery || '0'}}%</view>
+								<view class="unlines" v-if="item.onlineStatus == 0">离线</view>
+								<view>电量：{{ item.battery || '0' }}%</view>
 							</view>
 						</view>
 					</view>
@@ -47,12 +47,18 @@
 
 <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
@@ -66,7 +72,8 @@
 				popupMessage: '确认要对所选设备开启强制报警?',
 				popupConfirmText: '确认',
 				popupType: 'force', // 'force' or 'cancel'
-				pendingAlarmAction: ''
+				pendingAlarmAction: '',
+				sendInfo: ''
 			}
 		},
 		computed: {
@@ -75,6 +82,49 @@
 			}
 		},
 		methods: {
+			/**
+			 * 获取设备状态（带自动轮询）
+			 * @param {number} val - 功能模式
+			 * @param {string} batchId - 批次ID
+			 * @param {number} [maxRetries=30] - 最大重试次数（约30秒）
+			 * @param {number} [interval=1000] - 轮询间隔（毫秒）
+			 */
+			async getdeviceSTatus(val, batchId, maxRetries = 30, interval =2000) {
+				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':
+								if (++retries >= maxRetries) {
+									throw new Error('操作超时');
+								}
+								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
 			},
@@ -97,7 +147,7 @@
 				this.loading = true;
 				let data = {
 					pageNum: 1,
-					pageSize: 20,
+					pageSize: 30,
 					deviceType: deviceType
 				}
 				deviceInfo(data).then((res) => {
@@ -146,18 +196,40 @@
 				this.showPopupFlag = true;
 				this.pendingAlarmAction = 0
 			},
-			sendAlarmCommand(type) {
+			async sendAlarmCommand(type) {
 				const selectedDevices = this.deviceList.filter(item => item.checked);
 				const deviceIds = selectedDevices.map(item => item.id);
-
-				let data = {
-					deviceIds: deviceIds,
-					instructValue: this.pendingAlarmAction, // '强制或者解除'
-				}
-				deviceSendAlarmMessage(data).then((res) => {
-					if (res.code == 200) {
-						uni.showToast({ 
-							title: res.msg,
+				const deviceImeiList = selectedDevices.map(item => item.deviceImei);
+				let loadingShown = false;
+				try {
+					uni.showLoading({
+						title: '报警中...',
+						mask: true
+					});
+					loadingShown = true;
+					// 2. 准备请求数据
+					const batchId = generateShortId();
+					const data = {
+						sendMsg: this.messageToSend,
+						deviceIds: deviceIds,
+						batchId: batchId,
+						typeName: this.sendInfo.typeName,
+						deviceImeiList: deviceImeiList
+					};
+					// 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') {
+						uni.showToast({
+							title: statusRes.msg,
 							icon: 'none'
 						});
 						this.showPopupFlag = false
@@ -165,18 +237,20 @@
 						setTimeout(() => {
 							uni.navigateBack()
 						}, 500)
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						});
 					}
-				});
+				} catch (error) {
+					uni.showToast({
+						title: error.message,
+						icon: 'none'
+					});
+				} finally {
+					uni.hideLoading();
+					this.isSending = false;
+				}
 			},
 			// 点击确认状态
 			onPopupConfirm() {
 				this.sendAlarmCommand(this.popupType);
-
 				// 处理确认逻辑
 			},
 		},
@@ -184,7 +258,8 @@
 			const eventChannel = this.getOpenerEventChannel();
 			// 监听 'deviceSend' 事件，获取传过来的数据
 			eventChannel.on('devicePolice', (data) => {
-				this.getData(data.data)
+				this.getData(data.data.id)
+				this.sendInfo = data.data
 			});
 			// 如果需要向调用页面返回数据，可以触发 'ack' 事件
 			eventChannel.emit('ack', {})
diff --git a/pages/6170/deviceControl/index.vue b/pages/6170/deviceControl/index.vue
index 664f710..5701f81 100644
--- a/pages/6170/deviceControl/index.vue
+++ b/pages/6170/deviceControl/index.vue
@@ -19,19 +19,19 @@
 							<image src="/static/images/common/dl.png" class="dlIMG"></image>
 							<view>
 								<view class="battery-v2"
-									:style="{color: deviceInfo.batteryPercentage < 20 ? '#FF0000' : ''}">
-									{{deviceInfo.batteryPercentage}}%
+									:style="{ color: deviceInfo.batteryPercentage < 20 ? '#FF0000' : '' }">
+									{{ deviceInfo.batteryPercentage }}%
 								</view>
 								<view class="battery-v3">电量</view>
 							</view>
-							<view v-if="deviceInfo.chargeState==1">
+							<view v-if="deviceInfo.chargeState == 1">
 								<image src="/static/images/common/chargeState.png" class="chargeStateIMG"></image>
 							</view>
 						</view>
 						<view class="battery-v1">
 							<image src="/static/images/common/nz.png" class="dlIMG" mode="aspectFit"></image>
 							<view>
-								<view class="battery-v2">{{deviceInfo.batteryRemainingTime || '0'}}分钟</view>
+								<view class="battery-v2">{{ deviceInfo.batteryRemainingTime || '0' }}分钟</view>
 								<view class="battery-v3">续航时间</view>
 							</view>
 						</view>
@@ -44,11 +44,11 @@
 				<view class="info-card">
 					<view class="info-row">
 						<text class="info-label">IMEI号</text>
-						<text class="info-value status-running">{{deviceInfo.deviceImei}}</text>
+						<text class="info-value status-running">{{ deviceInfo.deviceImei }}</text>
 					</view>
 					<view class="info-row">
 						<text class="info-label">设备状态</text>
-						<text class="info-value status-running">{{deviceInfo.onlineStatus===0?'离线':'在线'}}</text>
+						<text class="info-value status-running">{{ deviceInfo.onlineStatus === 0 ? '离线' : '在线' }}</text>
 					</view>
 					<view class="info-row">
 						<text class="info-label" style="display: flex; align-items: center;">定位信息</text>
@@ -60,14 +60,14 @@
 							<view class="info-value status-running locationGPS">
 								<uni-icons @click="toggleForm" type="location" size="17"
 									color="rgba(255, 255, 255, 0.8)" style="vertical-align: bottom;" />
-								{{deviceInfo.address}}
+								{{ deviceInfo.address }}
 							</view>
 						</view>
 
 					</view>
 
 				</view>
-				<view class="callpolice" v-if="deviceInfo.onlineStatus==0">
+				<view class="callpolice" v-if="deviceInfo.onlineStatus == 0 && deviceInfo.alarmStatus == 1">
 					<view class="">设备强制报警中</view>
 					<view>
 						<uni-icons type="closeempty" size="15" color="rgba(255, 255, 255, 0.9)"
@@ -107,7 +107,7 @@
 								<image src="/static/images/6170/jg.png" class="setIMG" mode="aspectFit"></image>
 								<view>
 									<view class="battery-v2">激光模式</view>
-									<view class="mode-v3">{{currentlaserMode}}</view>
+									<view class="mode-v3">{{ currentlaserMode }}</view>
 								</view>
 							</view>
 						</view>
@@ -133,7 +133,7 @@
 						</view>
 					</view>
 					<view class="form-content" v-if="isFormExpanded">
-						<button class="send-btn1" @click="sendPersonnelInfo">发送</button>
+						<button class="send-btn1" @click.stop="sendPersonnelInfo">发送</button>
 						<view class="form-row">
 							<text class="form-label">单位：</text>
 							<input class="form-input" placeholder="请输入单位" v-model="personnelInfo.unitName"
@@ -160,7 +160,7 @@
 				<view class="form-section" v-if="hasPermission('5')">
 					<view class="mode-buttons">
 						<view class="section-title">发送信息</view>
-						<button class="send-btn" @click="sendTextMessage">发送</button>
+						<button class="send-btn" @click.stop="sendTextMessage">发送</button>
 					</view>
 
 					<view class="form-row">
@@ -195,9 +195,9 @@
 					<view class="popup-title"> {{ popupTitle }}</view>
 					<view class="popup-content">
 						<view v-for="(item, index) in items" :key="index">
-							<view class="item" :class="{'selected': item.selected}" @click="onItemClick(index)">
+							<view class="item" :class="{ 'selected': item.selected }" @click="onItemClick(index)">
 								<image :src="item.image" class="setIMG"></image>
-								{{item.text}}
+								{{ item.text }}
 							</view>
 						</view>
 					</view>
@@ -270,27 +270,14 @@
 				icon="/static/images/6170/svg.png" :confirm-text="popupConfirmText" :show-cancel="false"
 				@confirm="onPopupConfirmPolice" confirmBtnBg="rgba(224, 52, 52, 1)" confirmBtnColor="#fff" />
 		</view>
-		<!-- ===============进度条============== -->
-		<view 
-		  v-if="Progress.show" 
-		  @click="closeProgress" 
-		  :style="{
-		    position: 'fixed',
-		    top: 0,
-		    left: 0,
-		    right: 0,
-		    bottom: 0,
-		    backgroundColor: Progress.maskBgColor,
-		    zIndex: 999
-		  }"
-		>
-		  <Progress :config="Progress" @click.stop />
-		</view>
 	</view>
 </template>
 
 <script>
 	import MqttClient from '@/utils/mqtt.js';
+	import {
+		generateShortId
+	} from '@/utils/function.js';
 	import {
 		deviceDetail,
 		registerPersonInfo,
@@ -299,6 +286,7 @@
 		lightModeSettings, //灯光模式设置
 		laserModeSettings, //激光模式设置
 		lightBrightnessSettings, //灯光亮度设置
+		deviceRealTimeStatus //设备状态
 	} from '@/api/6170/deviceControl.js'
 	import {
 		baseURL,
@@ -352,23 +340,9 @@
 				selectedItemIndex: 0,
 				popupType: 'person', //弹框类型
 				isLaserOn: false,
-				// 进度条
-				Progress: {
-					show: false, //是否显示
-					height: '40rpx',
-					showMask: true, //是否显示mask
-					maskBgColor: 'rgba(0, 0, 0, 0.5)', // 半透明黑色遮罩
-					contentBgColor: 'rgba(18, 18, 18, 0.8)', // 主背景带透明度
-					showText: true, //是否显示当前进度的文字
-					txtColor: '#ffffffde', //文字的颜色
-					curr: 20, //当前进度
-					total: 100, //总进度
-					proBgColor: '#2a2a2a', //进度条底色,
-					proBorder: '', //进度条border
-					currBgColor: '#bbe600', //当前进度底色
-					currBorder: '', //当前进度border
-					borderRadius: '10rpx'
-				}
+				isSending: false,
+				isGettingStatus: false,
+				isProcessing: false
 			}
 		},
 		computed: {
@@ -377,6 +351,50 @@
 			}
 		},
 		methods: {
+			/**
+			 * 获取设备状态（带自动轮询）
+			 * @param {number} val - 功能模式
+			 * @param {string} batchId - 批次ID
+			 * @param {number} [maxRetries=30] - 最大重试次数（约30秒）
+			 * @param {number} [interval=1000] - 轮询间隔（毫秒）
+			 */
+			async getdeviceSTatus(val, batchId, maxRetries = 30, interval = 2000) {
+				let retries = 0;
+				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':
+								if (++retries >= maxRetries) {
+									throw new Error('操作超时');
+								}
+								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();
+			},
 			filterChinese(e) {
 				const value = e.detail.value;
 				// 允许中文和常见中文标点
@@ -391,10 +409,9 @@
 				this.lightModeA = false;
 				this.lightModeB = false;
 				this.lightModeC = false;
+				this.selectedImage = '';
+				this.file = null;
 			},
-			 closeProgress() {
-			    this.Progress.show = false; // 直接关闭进度条
-			  },
 			// *******定位******
 			gpsPosition(item) {
 				// 添加调试日志
@@ -471,21 +488,18 @@
 					value = 10;
 				}
 				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.deviceID,
 						instructValue: this.sliderValue + '.00',
-						deviceImei:this.itemInfo.deviceImei
+						deviceImei: this.itemInfo.deviceImei,
 					}
 					lightBrightnessSettings(data).then((res) => {
 						if (res.code !== 200) {
@@ -500,11 +514,10 @@
 					value = 10;
 				}
 				this.sliderValue = value;
-
 				let data = {
 					deviceId: this.apiType === 'listA' ? this.deviceID : this.itemInfo.deviceId,
 					instructValue: this.sliderValue + '.00',
-					deviceImei:this.itemInfo.deviceImei
+					deviceImei: this.itemInfo.deviceImei,
 				}
 				lightBrightnessSettings(data).then((res) => {
 					if (res.code == 200) {
@@ -512,7 +525,7 @@
 					} else {
 						uni.showToast({
 							icon: 'none',
-							title: res.msg || '亮度调节失败'
+							title: res.msg
 						})
 					}
 				})
@@ -575,61 +588,109 @@
 				}
 			},
 			// 灯光模式的确认
-			handleSumbit() {
-				if (this.selectedItemIndex === null) return;
-				const selectedItem = this.items[this.selectedItemIndex];
-				console.log(selectedItem, 'selectedItemselectedItem');
-				// 修正这里的赋值错误，应该保存索引而不是文本
-				this.selectedItemIndex = this.selectedItemIndex;
-				let data = {
-					deviceId: this.apiType === 'listA' ? this.deviceID : this.itemInfo.deviceId,
-					instructValue: selectedItem.instructValue,
-					deviceImei:this.itemInfo.deviceImei
-				}
-				lightModeSettings(data).then((res) => {
-					if (res.code == 200) {
+			async handleSumbit() {
+				// 防重复提交
+				if (this.isProcessing) return;
+				let loadingShown = false;
+				try {
+					uni.showLoading({
+						title: '处理中...',
+						mask: true
+					});
+					loadingShown = true;
+					this.isProcessing = true
+					if (this.selectedItemIndex === null) return;
+					const selectedItem = this.items[this.selectedItemIndex];
+					// 准备请求数据
+					let data = {
+						deviceId: this.apiType === 'listA' ? this.deviceID : this.itemInfo.deviceId,
+						instructValue: selectedItem.instructValue,
+						deviceImei: this.itemInfo.deviceImei,
+						typeName: this.itemInfo.typeName,
+					};
+					// 第一个请求：设置灯光模式
+					const res = await lightModeSettings(data);
+					if (res.code !== 200) {
 						uni.showToast({
-							icon: 'none',
-							title: res.msg
-						})
-						this.lightModeA = false;
-					} else {
-						uni.showToast({
-							icon: 'none',
-							title: res.msg
+							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.lightModeA = false;
+					}
+				} catch (error) {
+					uni.showToast({
+						title: error.message,
+						icon: 'none'
+					});
+				} finally {
+					uni.hideLoading();
+					this.isProcessing = false
+				}
 			},
 			// 激光模式
 			lasermode() {
 				this.lightModeC = true
 			},
 			// 激光确认框提交
-			handleBtn() {
-				const instructValue = this.isLaserOn ? 0 : 1;
-				let data = {
-					deviceId: this.apiType === 'listA' ? this.deviceID : this.itemInfo.deviceId,
-					instructValue: instructValue,
-					deviceImei:this.itemInfo.deviceImei
-				}
-				laserModeSettings(data).then((res) => {
-					if (res.code == 200) {
+			async handleBtn() {
+				// 防重复提交
+				if (this.isProcessing) return;
+				let loadingShown = false;
+				try {
+					uni.showLoading({
+						title: '处理中...',
+						mask: true
+					});
+					loadingShown = true;
+					this.isProcessing = true
+					const instructValue = this.isLaserOn ? 0 : 1;
+					let data = {
+						deviceId: this.apiType === 'listA' ? this.deviceID : this.itemInfo.deviceId,
+						instructValue: instructValue,
+						deviceImei: this.itemInfo.deviceImei,
+						typeName: this.itemInfo.typeName,
+					};
+					// 第一个请求
+					const res = await laserModeSettings(data);
+					if (res.code !== 200) {
 						uni.showToast({
-							icon: 'none',
-							title: res.msg
-						})
-						this.isLaserOn = !this.isLaserOn;
-						this.currentlaserMode = this.isLaserOn ? "开启" : "关闭"; // 更新显示文本
-						this.lightModeC = false
-					} else {
-						uni.showToast({
-							icon: 'none',
-							title: res.msg
+							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() {
@@ -660,10 +721,8 @@
 						}
 						this.selectedImage = res.tempFilePaths[0];
 						console.log('选择的图片:', res);
-						//this.file = res.tempFiles[0].file
 					},
 					fail: (err) => {
-						console.error('选择图片失败:', err);
 						uni.showToast({
 							title: '选择图片失败',
 							icon: 'none'
@@ -673,6 +732,7 @@
 			},
 			// 上传开机画面确认按键
 			handleupload() {
+				let loadingShown = false;
 				if (!this.selectedImage) {
 					uni.showToast({
 						title: '请上传一张图片',
@@ -680,34 +740,48 @@
 					});
 					return;
 				}
-				// 显示进度条
-				this.Progress = {
-					...this.Progress,
-					show: true,
-					curr: 0,
-					showText: true
-				};
-
+				// 显示上传加载状态
+				uni.showLoading({
+					title: '图片上传中...',
+					mask: true
+				});
+				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
+						deviceImei: this.itemInfo.deviceImei,
+						typeName: this.itemInfo.typeName,
 					},
 					header: {
 						'Authorization': 'Bearer ' + getToken(),
 						'clientid': clientid(),
 					},
-					complete: (res) => {
-						console.log(res, 'resss');
+					complete: async (res) => {
 						try {
 							const responseData = JSON.parse(res.data);
 							if (responseData.code === 200) {
-								this.selectedImage = '';
-								this.file = null;
-								this.lightModeB = false
+								try {
+									// 获取设备状态
+									const statusRes = await this.getdeviceSTatus(1);
+									if (statusRes.data.functionAccess === 'OK') {
+										// 两个操作都成功，重置状态并显示成功提示
+										this.selectedImage = '';
+										this.file = null;
+										this.lightModeB = false;
+										uni.showToast({
+											title: responseData.msg,
+											icon: 'success',
+										});
+									}
+								} catch (error) {
+									uni.showToast({
+										title: error.message,
+										icon: 'none'
+									});
+								}
 							} else {
 								uni.showToast({
 									title: responseData.msg,
@@ -716,10 +790,10 @@
 							}
 						} catch (e) {
 							uni.showToast({
-								title: '上传失败',
+								title: error.message,
 								icon: 'none'
 							});
-							this.Progress.show = false; // 上传失败隐藏进度条
+
 						} finally {
 							uni.hideLoading();
 						}
@@ -741,87 +815,86 @@
 				})
 			},
 
-			// 操作说明
-			operatingInst() {
-				let id = this.apiType === 'listA' ? this.deviceID : this.itemInfo.deviceId
-				uni.navigateTo({
-					url: `/pages/common/operatingInstruct/index?id=${id}`
-				})
-			},
-			// 产品参数
-			productparams() {
-				let id = this.apiType === 'listA' ? this.deviceID : this.itemInfo.deviceId
-				uni.navigateTo({
-					url: `/pages/common/productDes/index?id=${id}`
-				})
-			},
-			// 操作视频
-			operatingVideo() {
-				let id = this.apiType === 'listA' ? this.deviceID : this.itemInfo.deviceId
-				uni.navigateTo({
-					url: `/pages/common/operationVideo/index?id=${id}`
-				})
-
-			},
 
 			// 发送人员信息
-			sendPersonnelInfo() {
-				if (!this.personnelInfo.unitName) {
-					uni.showToast({
-						title: '单位名称不能为空',
-						icon: 'none'
-					});
-					return;
-				}
-				if (!this.personnelInfo.name) {
-					uni.showToast({
-						title: '姓名不能为空',
-						icon: 'none'
-					});
-					return;
-				}
-				if (!this.personnelInfo.position) {
-					uni.showToast({
-						title: '职位不能为空',
-						icon: 'none'
-					});
-					return;
-				}
-				if (!this.personnelInfo.code) {
-					uni.showToast({
-						title: 'ID不能为空',
-						icon: 'none'
-					});
-					return;
-				}
-				uni.showLoading({
-					title: '发送中...',
-					mask: true
-				})
-				let data = {
-					code: this.personnelInfo.code,
-					name: this.personnelInfo.name,
-					position: this.personnelInfo.position,
-					unitName: this.personnelInfo.unitName,
-					deviceId: this.apiType === 'listA' ? this.deviceID : this.itemInfo.deviceId,
-				}
-				registerPersonInfo(data).then((res) => {
-					if (res.code == 200) {
-						uni.hideLoading()
-						this.popupType = 'person';
-						this.showPopupFlag = true
-						this.popupMessage = '人员信息发送成功'
-					} else {
+			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: res.msg,
+							title: message,
 							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.apiType === 'listA' ? this.deviceID : this.itemInfo.deviceId,
+						deviceImei: this.itemInfo.deviceImei
+					};
+					// 3. 注册人员信息
+					const registerRes = await registerPersonInfo(data);
+					if (registerRes.code !== 200) {
+						uni.showToast({
+							title: registerRes.msg,
+							icon: 'none'
+						});
+						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
-				console.log('用户点击了确定')
 			},
 			// 解除报警
 			onPopupConfirmPolice() {
@@ -850,7 +923,9 @@
 				});
 			},
 			// 发送文本消息
-			sendTextMessage() {
+			async sendTextMessage() {
+				// 防重复提交
+				if (this.isSending) return;
 				if (!this.messageToSend) {
 					uni.showToast({
 						title: '请输入要发送的文字',
@@ -858,42 +933,55 @@
 					});
 					return;
 				}
-				uni.showLoading({
-					title: '发送中...',
-					mask: true
-				})
-				let data = {
-					sendMsg: this.messageToSend,
-					//deviceIds: [this.deviceID],
-					deviceIds: this.apiType === 'listA' ? [this.deviceID] : [this.itemInfo.deviceId],
-
-				}
-				deviceSendMessage(data).then((res) => {
-					if (res.code == 200) {
-						uni.hideLoading()
-						this.popupType = 'person';
-						this.showPopupFlag = true
-						this.popupMessage = '发送信息成功'
-					} else {
+				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.apiType === 'listA' ? [this.deviceID] : [this.itemInfo.deviceId],
+						typeName: this.itemInfo.typeName,
+						batchId: batchId,
+						deviceImeiList: [this.itemInfo.deviceImei]
+					};
+					// 3.人员信息
+					const registerRes = await deviceSendMessage(data);
+					if (registerRes.code !== 200) {
 						uni.showToast({
-							title: res.msg,
+							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) {
 				if (res.code == 200) {
 					// 最后关闭加载状态
 					this.pageLoading = false
-					this.$nextTick(() => {
-						uni.createSelectorQuery().in(this).select('.control-card').boundingClientRect(data => {
-							if (data) {
-								this.cardRect = data;
-							}
-						}).exec();
-					})
 					this.deviceInfo = res.data
 					this.personnelInfo = {
 						unitName: res.data.personnelInfo?.unitName || '',
@@ -947,12 +1035,27 @@
 					})
 				}
 			},
-			handleMqttLost() {
-				this.Progress = {
-					...this.Progress,
-					show: false, // 隐藏进度条
-				};
-			}
+			// 操作说明
+			operatingInst() {
+				let id = this.apiType === 'listA' ? this.deviceID : this.itemInfo.deviceId
+				uni.navigateTo({
+					url: `/pages/common/operatingInstruct/index?id=${id}`
+				})
+			},
+			// 产品参数
+			productparams() {
+				let id = this.apiType === 'listA' ? this.deviceID : this.itemInfo.deviceId
+				uni.navigateTo({
+					url: `/pages/common/productDes/index?id=${id}`
+				})
+			},
+			// 操作视频
+			operatingVideo() {
+				let id = this.apiType === 'listA' ? this.deviceID : this.itemInfo.deviceId
+				uni.navigateTo({
+					url: `/pages/common/operationVideo/index?id=${id}`
+				})
+			},
 
 		},
 		onLoad(options) {
@@ -962,6 +1065,7 @@
 				title: '加载中...'
 			})
 			eventChannel.on('deviceControl', (data) => {
+				console.log(data, 'data');
 				this.itemInfo = data.data;
 				this.deviceID = data.data.id;
 				this.navTitle = data.data.deviceName;
@@ -971,22 +1075,18 @@
 				// 初始化并连接MQTT
 				this.mqttClient = new MqttClient();
 				this.mqttClient.connect(() => {
-					console.log('MQTT 连接成功，开始订阅主题');
 					// 订阅来自设备的状态更新
 					const statusTopic = `A/${this.itemInfo.deviceImei}`;
 					this.mqttClient.subscribe(statusTopic, (payload) => {
 						try {
 							console.log(`收到来自 ${statusTopic} 的消息:`, payload);
 							//收到电量上报。延迟20s请求接口数据
-							const parsedMessage = typeof payload === 'string' ? JSON.parse(payload) :
+							const parsedMessage = typeof payload === 'string' ? JSON.parse(
+									payload) :
 								payload;
 							const deviceState = parsedMessage.state; // 直接取 state 数组
-							// ✅ 发送全局事件通知主页面更新
-							uni.$emit('deviceStatusUpdate', {
-								message: parsedMessage, // 消息内容
-								timestamp: new Date().getTime() // 时间戳
-							});
 							if (deviceState[0] === 12) {
+								// 这里延迟20s解决,经纬度,逆解析问题    
 								setTimeout(() => {
 									this.fetchDeviceDetail(data.data.id);
 								}, 20000);
@@ -996,32 +1096,17 @@
 									this.popupMessage = '请及时充电';
 									this.showPopupFlag = true;
 								}
-							}
-							// 处理上传照片进度消息
-							if (deviceState[0] === 3) {
-								const progress = deviceState[1];
-								// 更新进度条
-								this.Progress = {
-									...this.Progress,
-									curr: progress * 2,
-									show: progress < 50 // 进度达到100时自动隐藏
-								};
-								// 当进度为100时显示成功弹框
-								if (progress === 50) {
-									this.popupType = 'logo';
-									this.popupMessage = '上传成功';
-									this.showPopupFlag = true;
-									this.lightModeB = false; // 关闭上传弹窗
-									this.selectedImage = ''; // 清空已选图片
-								}
+								// ✅ 发送全局事件通知主页面更新
+								uni.$emit('deviceStatusUpdate', {
+									message: parsedMessage, // 消息内容
+									timestamp: new Date().getTime() // 时间戳
+								});
 							}
 						} catch (error) {
-							console.error('解析MQTT消息失败:', error, '原始消息:', payload);
+							console.log('解析MQTT消息失败:', error, '原始消息:', payload);
 						}
 					});
 				})
-				// 设置连接丢失回调
-				uni.$on('mqttConnectionLost', this.handleMqttLost);
 				if (this.apiType === 'listA') {
 					this.fetchDeviceDetail(data.data.id)
 				} else {
@@ -1041,7 +1126,6 @@
 			if (this.mqttClient) {
 				this.mqttClient.disconnect();
 			}
-			uni.$off('mqttConnectionLost', this.handleMqttLost);
 			if (this.mqttClient) {
 				this.mqttClient.disconnect();
 			}
diff --git a/pages/6170/shareManagement/index.vue b/pages/6170/shareManagement/index.vue
index 5466a96..3a73f42 100644
--- a/pages/6170/shareManagement/index.vue
+++ b/pages/6170/shareManagement/index.vue
@@ -1,23 +1,34 @@
 <template>
 	<view class="share">
-		<view class="device-title">已分享用户</view>
-		<view class="device-info" v-for="(item, index) in deviceList" :key="index">
-			<view class="device-header" @click.stop="handleFile(item)">
-				<view class="deviceIMG">
-					<image src="@/static/images/common/user.png" mode="aspectFit" class="IMG"></image>
-				</view>
-				<view class="device-name">
-					<view>用户名：{{item.deviceName}}</view>
-					<view class="ID">
-						<view class="ID">{{item.phonenumber}}
+		<!-- 下拉刷新区域 -->
+		<mescroll-uni ref="mescrollRef" @init="mescrollInit" @down="downCallback" @up="upCallback" :up="upOption" :down="downOption">
+			<view class="device-title">已分享用户</view>
+			<view class="" v-if="deviceList.length>0">
+				<view class="device-info" v-for="(item, index) in deviceList" :key="index">
+					<view class="device-header" @click.stop="handleFile(item)">
+						<view class="deviceIMG">
+							<image src="@/static/images/common/user.png" mode="aspectFit" class="IMG"></image>
+						</view>
+						<view class="device-name">
+							<view>用户名：{{item.deviceName}}</view>
+							<view class="ID">
+								<view class="ID">{{item.phonenumber}}
+								</view>
+							</view>
+						</view>
+						<view class="device-delete">
+							<text class="delete" @click.stop="handleDelete(item)">移除</text>
 						</view>
 					</view>
 				</view>
-				<view class="device-delete">
-					<text class="delete" @click.stop="handleDelete(item)">移除</text>
-				</view>
 			</view>
-		</view>
+			<view v-else class="noDATA">
+				<view> <uni-icons type="image-filled" size="120" color="rgba(255, 255, 255, 0.9)"></uni-icons>
+				</view>
+				暂无数据
+			</view>
+		</mescroll-uni>
+		
 		<!-- 删除弹框 -->
 		<view class="agreement-mask" v-if="deleteShow" @click="closePopup('delete')">
 			<view class="agreement-popup" @click.stop>
@@ -42,16 +53,62 @@
 		deviceShareList,
 		deviceShareDelete
 	} from '@/api/6170/share.js'
+	import MescrollUni from 'mescroll-uni/mescroll-uni.vue'
+	
 	export default {
+		components: {
+			MescrollUni
+		},
 		data() {
 			return {
 				deviceList: [],
 				deleteShow: false,
 				delelteItemInfo: '',
-				itemInfo: ''
+				itemInfo: '',
+				mescroll: null, // mescroll实例对象
+				downOption: {
+					auto: false // 不自动加载
+				},
+				upOption: {
+					auto: false, // 不自动加载
+					noMoreSize: 5, // 如果列表已无数据,可设置列表的总数量要大于等于5条才显示无更多数据
+					empty: {
+						tip: '暂无相关数据'
+					}
+				},
+				page: 1, // 当前页码
+				size: 10, // 每页条数
+				total: 0 // 总数据量
 			}
 		},
 		methods: {
+			// mescroll组件初始化的回调,可获取到mescroll对象
+			mescrollInit(mescroll) {
+				this.mescroll = mescroll;
+			},
+			// 下拉刷新的回调
+			downCallback() {
+				// 重置分页参数
+				this.page = 1;
+				this.getData(this.itemInfo.id).then(res => {
+					// 数据请求成功后,隐藏下拉刷新的状态
+					this.mescroll.endSuccess();
+				}).catch(() => {
+					// 请求失败,隐藏下拉刷新的状态
+					this.mescroll.endErr();
+				})
+			},
+			// 上拉加载的回调
+			upCallback() {
+				this.getData(this.itemInfo.id).then(res => {
+					// 根据是否有数据来决定是否显示无更多数据的提示
+					const hasNext = this.deviceList.length < this.total;
+					this.mescroll.endSuccess(this.deviceList.length, hasNext);
+				}).catch(() => {
+					// 请求失败,隐藏上拉加载的状态
+					this.mescroll.endErr();
+				})
+			},
 			// 点击弹框外的区域关闭
 			closePopup(type) {
 				if (type === 'delete') {
@@ -73,25 +130,43 @@
 							icon: 'none'
 						})
 						this.deleteShow = false
-						this.getData()
+						// 删除后刷新列表
+						this.page = 1;
+						this.getData(this.itemInfo.id).then(() => {
+							this.mescroll.resetUpScroll();
+						})
 					} else {
 						uni.showToast({
 							title: res.msg,
 							icon: 'none'
 						})
 					}
-
 				})
-				//
 			},
 			getData(val) {
-				let data = {
-					deviceId: val
-				}
-				deviceShareList(data).then((res) => {
-					if (res.code == 200) {
-						this.deviceList = res.rows
+				return new Promise((resolve, reject) => {
+					let data = {
+						deviceId: val,
+						pageNum: this.page,
+						pageSize: this.size,
 					}
+					deviceShareList(data).then((res) => {
+						if (res.code == 200) {
+							this.total = res.total;
+							if (this.page === 1) {
+								// 如果是第一页，直接替换数据
+								this.deviceList = res.rows;
+							} else {
+								// 如果不是第一页，追加数据
+								this.deviceList = this.deviceList.concat(res.rows);
+							}
+							resolve(res);
+						} else {
+							reject(res);
+						}
+					}).catch(err => {
+						reject(err);
+					})
 				})
 			},
 			// 跳转分享详情
@@ -107,7 +182,6 @@
 					}
 				})
 			}
-
 		},
 		onLoad() {
 			const eventChannel = this.getOpenerEventChannel();
@@ -115,7 +189,14 @@
 			eventChannel.on('shareManagement', (data) => {
 				console.log(data, 'data1t111');
 				this.itemInfo = data.data;
-				this.getData(this.itemInfo.id)
+				// 初始化加载数据
+				this.page = 1;
+				this.getData(this.itemInfo.id).then(() => {
+					// 数据加载完成后，如果需要可以手动触发下拉刷新结束
+					if (this.mescroll) {
+						this.mescroll.endSuccess();
+					}
+				})
 			})
 		}
 	}
@@ -130,7 +211,7 @@
 
 	.device-title {
 		color: rgba(255, 255, 255, 0.87);
-		padding: 30rpx 0;
+		padding: 30rpx;
 	}
 
 	.device-info {
@@ -162,7 +243,7 @@
 
 	.deviceIMG {
 		/* 	width: 100rpx; */
-/* 		height: 100rpx; */
+		/* 		height: 100rpx; */
 		position: relative;
 		display: flex;
 		align-items: center;
@@ -173,6 +254,12 @@
 		width: 50%;
 	}
 
+	.noDATA {
+		text-align: center;
+		color: rgba(255, 255, 255, 0.87);
+		transform: translate(-0%, 100%);
+	}
+
 	.delete {
 		border-radius: 32px;
 		background: rgba(255, 200, 78, 0.06);
diff --git a/pages/common/index/index.vue b/pages/common/index/index.vue
index a898dee..99a5e48 100644
--- a/pages/common/index/index.vue
+++ b/pages/common/index/index.vue
@@ -31,7 +31,7 @@
 						<block v-for="(item, index) in deviceList" :key="index" :ref="'swipeItem_' + index">
 							<uni-swipe-action-item :right-options="Options"
 								@click="handleSwipeClick($event, item, index)" class="device-card"
-								:style="{ border: item.communicationMode==0 && item.onlineStatus==0 ? '1px solid rgba(224, 52, 52, 1)' : 'none' }">
+								:style="{ border: item.communicationMode==0 && item.onlineStatus==0 && item.alarmStatus==1 ? '1px solid rgba(224, 52, 52, 1)' : 'none' }">
 								<view @click.stop="handleFile(item)">
 									<view class="device-header">
 										<view class="deviceIMG">
@@ -54,7 +54,8 @@
 										</view>
 									</view>
 									<view class="device-callpolice"
-										v-if="item.communicationMode==0 && item.onlineStatus==0">报警中</view>
+										v-if="item.communicationMode==0 && item.onlineStatus==0 && item.alarmStatus==1">
+										报警中</view>
 									<view v-if="item.communicationMode==1">
 										<view class="device-status online">已连接</view>
 										<view class="device-status unline">未连接</view>
@@ -144,6 +145,10 @@
 		deviceReName
 	} from '@/api/common/index.js'
 	export default {
+		onPullDownRefresh() {
+			// 执行下拉刷新时的操作，比如重新获取数据
+			this.onIntall();
+		},
 		data() {
 			return {
 				navBarHeight: 70 + uni.getSystemInfoSync().statusBarHeight,
@@ -313,16 +318,18 @@
 				this.showTooltip = false; // 关闭弹窗
 				switch (item.action) {
 					case 'scan':
-						// uni.navigateTo({
-						// 	url: '/pages/common/scan/scan'
-						// });
 						// 扫一扫
 						uni.scanCode({
 							success: (res) => {
-								console.log('条码内容：' + res.result);
+								console.log('条码内容：', res);
+								// 清除之前的数据
+								this.previousScanResult = null;
+								// 处理新的扫码结果
+								const cleanedResult = res.result.trim();
+								console.log('扫码结果：', cleanedResult);
 								// 跳转并传递扫描结果
 								uni.navigateTo({
-									url: `/pages/common/qrcode/qrcode?deviceId=${encodeURIComponent(res.result)}`
+									url: `/pages/common/qrcode/qrcode?deviceId=${encodeURIComponent(cleanedResult)}`
 								});
 							},
 							fail: (err) => {
@@ -438,7 +445,7 @@
 					},
 					success: (res) => {
 						res.eventChannel.emit('devicePolice', {
-							data: deviceType
+							data: currentTab
 						});
 					}
 				})
@@ -455,7 +462,8 @@
 					},
 					success: (res) => {
 						res.eventChannel.emit('deviceSend', {
-							data: deviceType
+							//data: deviceType,
+							data: currentTab
 						});
 					}
 				})
@@ -526,7 +534,12 @@
 			onIntall() {
 				this.page = 1;
 				this.finished = false;
-				this.getData(this.deviceType); // 重新加载第一页数据
+				const deviceType = this.activeTabInfo?.id === '' ? undefined : this.activeTabInfo?.id;
+				this.getData(deviceType); // 重新加载第一页数据
+				setTimeout(() => {
+					// 停止下拉刷新动画
+					uni.stopPullDownRefresh();
+				}, 800);
 			},
 			updateDeviceStatus(data) {
 				this.deviceList = this.deviceList
diff --git a/pages/common/login/index.vue b/pages/common/login/index.vue
index 3dd79b6..21b7084 100644
--- a/pages/common/login/index.vue
+++ b/pages/common/login/index.vue
@@ -145,11 +145,9 @@
 					return false
 				}
 				try {
-
 					uni.showLoading({
 						title: '登录中...'
 					})
-					console.log('44444');
 					// 调用登录接口
 					const res = await login({
 						phonenumber: this.phone,
@@ -157,7 +155,6 @@
 						tenantId: '894078' //租户ID
 					})
 					if (res.code == 200) {
-						console.log(res, 'ressss');
 						uni.hideLoading()
 						uni.setStorageSync('token', res.data.access_token) // 缓存token
 						uni.setStorageSync('clientID', res.data.client_id) // 缓存token
@@ -170,19 +167,18 @@
 						})
 					} else {
 						uni.showToast({
-							title: res.msg,
+							title: res.msg || '服务器异常，请稍后重试',
 							icon: 'none'
 						})
 					}
-
 				} catch (error) {
-					uni.hideLoading()
+					console.log('捕获错误:', error);
 					uni.showToast({
-						title: error.msg,
+						title: error.msg || '登录失败',
 						icon: 'none'
 					});
+					uni.hideLoading()
 				}
-
 			},
 			// 跳转到协议页面
 			goToPage(type) {
diff --git a/pages/common/qrcode/qrcode.vue b/pages/common/qrcode/qrcode.vue
index 14f5249..fd8689a 100644
--- a/pages/common/qrcode/qrcode.vue
+++ b/pages/common/qrcode/qrcode.vue
@@ -5,17 +5,13 @@
 			<image src="/static/images/common/svg.png" class="svg"></image>
 			<view class="scanT">ID: {{ deviceId }}</view>
 		</view>
-
 		<!-- 连接中状态 -->
 		<view class="connecting-container" v-else>
 			<view class="device-info">
 				<view class="">
 					<image src="/static/images/common/svg.png" class="svg"></image>
 				</view>
-				<!-- 			<view>
-					<image src="/static/images/bip.6.png" class="bip"></image>
-				</view> -->
-				
+
 				<text class="device-name">设备名：{{deviceId}}</text>
 				<text class="device-model1">ID:{{deviceId}}</text>
 			</view>
@@ -71,6 +67,7 @@
 						})
 						console.log(this.deviceId, 'deerer ere');
 						if (res.code == 200) {
+							
 							this.isConnectNo = false
 							this.isSuccess = true
 							uni.hideLoading()
diff --git a/pages/common/send/index.vue b/pages/common/send/index.vue
index 34806e3..9d96e68 100644
--- a/pages/common/send/index.vue
+++ b/pages/common/send/index.vue
@@ -14,15 +14,13 @@
 							<image :src="item.devicePic" class="IMG" mode="aspectFit"></image>
 						</view>
 						<view class="device-name">
-							<view>设备:{{item.deviceName}}</view>
+							<view>设备:{{ item.deviceName }}</view>
 							<view class="ID">
-								<view class="ID">ID:{{item.deviceImei}}</view>
-								<view class="onlines"
-									v-if="item.onlineStatus==1">在线</view>
+								<view class="ID">ID:{{ item.deviceImei }}</view>
+								<view class="onlines" v-if="item.onlineStatus == 1">在线</view>
 								<!-- 离线状态 -->
-								<view class="unlines"
-									v-if="item.onlineStatus==0">离线</view>
-								<view>电量：{{item.battery || '0'}}%</view>
+								<view class="unlines" v-if="item.onlineStatus == 0">离线</view>
+								<view>电量：{{ item.battery || '0' }}%</view>
 							</view>
 						</view>
 					</view>
@@ -32,14 +30,15 @@
 				<view class="ql-editor">编辑信息</view>
 				<view class="ql-input">
 					<textarea placeholder-style="color:rgba(255, 255, 255, 0.4)" placeholder="请输入内容" class="textarea"
-						v-model="messageToSend"  :maxlength="20"/>
+						v-model="messageToSend" :maxlength="20" />
 				</view>
-				<button class="login-btn" @click="sendTextMessage">发送</button>
+				<button class="login-btn" @click.stop="sendTextMessage">发送</button>
 			</view>
 		</scroll-view>
 		<!-- 成功提示弹框 -->
-		<CustomPopup :show="showPopupFlag" :title="popupTitle" :message="popupMessage"  icon="/static/images/common/sendSucc.png"
-			:confirm-text="popupConfirmText" :show-cancel="false" @confirm="onPopupConfirm" />
+		<CustomPopup :show="showPopupFlag" :title="popupTitle" :message="popupMessage"
+			icon="/static/images/common/sendSucc.png" :confirm-text="popupConfirmText" :show-cancel="false"
+			@confirm="onPopupConfirm" />
 	</view>
 </template>
 
@@ -49,12 +48,16 @@
 		deviceInfo,
 	} from '@/api/common/index.js'
 	import {
-		deviceSendMessage
+		deviceSendMessage,
+		deviceRealTimeStatus //设备状态
 	} from '@/api/6170/deviceControl.js'
+	import {
+		generateShortId
+	} from '@/utils/function.js';
 	export default {
-		  components: {
-		    CustomPopup
-		  },
+		components: {
+			CustomPopup
+		},
 		data() {
 			return {
 				deviceList: [],
@@ -62,10 +65,56 @@
 				showPopupFlag: false,
 				popupTitle: '',
 				popupMessage: '信息发送成功！',
-				popupConfirmText: '确认'
+				popupConfirmText: '确认',
+				isSending: false,
+				sendInfo: {}
 			}
 		},
 		methods: {
+			/**
+			 * 获取设备状态（带自动轮询）
+			 * @param {number} val - 功能模式
+			 * @param {string} batchId - 批次ID
+			 * @param {number} [maxRetries=30] - 最大重试次数（约30秒）
+			 * @param {number} [interval=1000] - 轮询间隔（毫秒）
+			 */
+			async getdeviceSTatus(val, batchId, maxRetries = 30, interval = 2000) {
+				let retries = 0;
+				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':
+								if (++retries >= maxRetries) {
+									throw new Error('操作超时');
+								}
+								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();
+			},
+
 			toggleSelect(index) {
 				this.deviceList[index].checked = !this.deviceList[index].checked
 				this.$forceUpdate()
@@ -75,7 +124,7 @@
 				this.loading = true;
 				let data = {
 					pageNum: 1,
-					pageSize: 20,
+					pageSize: 50,
 					deviceType: deviceType
 				}
 				deviceInfo(data).then((res) => {
@@ -93,9 +142,12 @@
 				});
 			},
 			// 发送文本消息
-			sendTextMessage() {
+			async sendTextMessage() {
+				// 防重复提交
+				if (this.isSending) return;
 				const selectedDevices = this.deviceList.filter(item => item.checked)
 				const deviceIds = selectedDevices.map(item => item.id);
+				const deviceImeiList = selectedDevices.map(item => item.deviceImei);
 				if (selectedDevices.length === 0) {
 					uni.showToast({
 						title: '请选择一个设备',
@@ -105,25 +157,53 @@
 				}
 				if (!this.messageToSend) {
 					uni.showToast({
-						title: '请输入要发送的内容',
+						title: '请输入要发送的文字',
 						icon: 'none'
 					});
 					return;
 				}
-				let data = {
-					sendMsg: this.messageToSend,
-					deviceIds: deviceIds
-				}
-				deviceSendMessage(data).then((res) => {
-					if (res.code == 200) {
-						this.showPopupFlag = true
-					} else {
+				this.isSending = true;
+				let loadingShown = false;
+				try {
+					uni.showLoading({
+						title: '发送中...',
+						mask: true
+					});
+					loadingShown = true;
+					// 2. 准备请求数据
+					const batchId = generateShortId();
+					const data = {
+						sendMsg: this.messageToSend,
+						deviceIds: deviceIds,
+						batchId: batchId,
+						typeName: this.sendInfo.typeName,
+						batchId: batchId,
+						deviceImeiList: deviceImeiList
+					};
+					// 3.人员信息
+					const registerRes = await deviceSendMessage(data);
+					if (registerRes.code !== 200) {
 						uni.showToast({
-							title: res.msg,
+							title: registerRes.msg,
 							icon: 'none'
-						});
+						})
+						return
 					}
-				})
+					// 4. 获取设备状态
+					const statusRes = await this.getdeviceSTatus(2, batchId);
+					if (statusRes.data.functionAccess === 'OK') {
+						// 5. 显示成功弹窗
+						this.showPopupFlag = true
+					}
+				} catch (error) {
+					uni.showToast({
+						title: error.message,
+						icon: 'none'
+					});
+				} finally {
+					uni.hideLoading();
+					this.isSending = false;
+				}
 			},
 			onPopupConfirm() {
 				this.showPopupFlag = false
@@ -137,7 +217,8 @@
 			// 监听 'deviceSend' 事件，获取传过来的数据
 			eventChannel.on('deviceSend', (data) => {
 				console.log('Received detail data:', data);
-				this.getData(data.data)
+				this.getData(data.data.id)
+				this.sendInfo = data.data
 			});
 			// 如果需要向调用页面返回数据，可以触发 'ack' 事件
 			eventChannel.emit('ack', {})
diff --git a/static/images/common/bj_1.png b/static/images/common/bj_1.png
new file mode 100644
index 0000000..9078adb
Binary files /dev/null and b/static/images/common/bj_1.png differ
diff --git a/utils/function.js b/utils/function.js
new file mode 100644
index 0000000..1080018
--- /dev/null
+++ b/utils/function.js
@@ -0,0 +1,16 @@
+/**
+ * 生成短ID (16位字符)
+ */
+export const generateShortId = () => {
+  const crypto = window.crypto || window.msCrypto;
+  
+  if (crypto?.getRandomValues) {
+    return Array.from(crypto.getRandomValues(new Uint32Array(3)))
+      .map(n => n.toString(36))
+      .join('')
+      .slice(0, 16);
+  }
+  
+  return Date.now().toString(36) + Math.random().toString(36).substr(2, 8);
+};
+export default generateShortId;
\ No newline at end of file