From dd2864040176f82b6200ea56104a8608598f680f Mon Sep 17 00:00:00 2001
From: fengerli <528575642@qq.com>
Date: Mon, 2 Mar 2026 11:06:48 +0800
Subject: [PATCH] =?UTF-8?q?100J4G=E7=9B=B8=E5=85=B3bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/100J/HBY100-J.vue      | 3274 +++++++++++++++++-----------------
 pages/common/index/index.vue |   11 +-
 2 files changed, 1650 insertions(+), 1635 deletions(-)

diff --git a/pages/100J/HBY100-J.vue b/pages/100J/HBY100-J.vue
index 56fd3d0..721e2f3 100644
--- a/pages/100J/HBY100-J.vue
+++ b/pages/100J/HBY100-J.vue
@@ -212,42 +212,793 @@
 </template>
 
 <script>
-import gbk from '@/utils/gbk.js'
-import MqttClient from '@/utils/mqtt.js';
-import {
-	showLoading,
-	hideLoading,
-	updateLoading
-} from '@/utils/loading.js'
-import request, {
-	baseURL
-} from '@/utils/request.js';
-import {
-	deviceDetail,
-	deviceStrobeMode,
-	deviceForceAlarmActivation,
-	deviceStrobeFrequency,
-	deviceLightAdjustment,
-	deviceUpdateVolume,
-	deviceVoiceBroadcast
-} from '@/api/100J/HBY100-J.js'
-var these = null;
-import Common from '@/utils/Common.js'
-const pagePath = "/pages/100/HBY100";
-export default {
-	data() {
-		return {
-			mqttClient: null,
-			Status: {
-				isRightIconVisible: false,
-				navTitle: '',
-				apiType: '',
-				navBarHeight: 70 + uni.getSystemInfoSync().statusBarHeight,
-				curr: 0,
-				total: 0,
-				pageHide: false,
-				Pop: {
-					showPop: false, //是否显示弹窗
+	import gbk from '@/utils/gbk.js'
+	import MqttClient from '@/utils/mqtt.js';
+	import {
+		showLoading,
+		hideLoading,
+		updateLoading
+	} from '@/utils/loading.js'
+	import request, {
+		baseURL
+	} from '@/utils/request.js';
+	import {
+		deviceDetail,
+		deviceStrobeMode,
+		deviceForceAlarmActivation,
+		deviceStrobeFrequency,
+		deviceLightAdjustment,
+		deviceUpdateVolume,
+		deviceVoiceBroadcast
+	} from '@/api/100J/HBY100-J.js'
+	var these = null;
+	import Common from '@/utils/Common.js'
+	const pagePath = "/pages/100/HBY100";
+	export default {
+		data() {
+			return {
+				mqttClient: null,
+				Status: {
+					isRightIconVisible: false,
+					navTitle: '',
+					apiType: '',
+					navBarHeight: 70 + uni.getSystemInfoSync().statusBarHeight,
+					curr: 0,
+					total: 0,
+					pageHide: false,
+					Pop: {
+						showPop: false, //是否显示弹窗
+						popType: 'custom',
+						bgColor: '#383934bd',
+						borderColor: '#BBE600',
+						textColor: '#ffffffde',
+						buttonBgColor: '#BBE600',
+						buttonTextColor: '#232323DE',
+						iconUrl: '',
+						message: '您确定要这样做吗？',
+						buttonText: '确定',
+						clickEvt: '',
+						visiblePrompt: false,
+						promptTitle: '设备名称',
+						modelValue: '',
+						visibleClose: false,
+						okCallback: null,
+						buttonCancelText: '',
+						showCancel: false,
+					},
+					BottomMenu: {
+						show: false,
+						showHeader: true,
+						menuItems: [{
+							text: '强光',
+							icon: '/static/images/6155/DeviceDetail/qiang.png'
+						}],
+						activeIndex: -1,
+						bgColor: '#2a2a2a',
+						itemBgColor: '#3a3a3a',
+						textColor: '#ffffffde',
+						textAlign: 'flex-start',
+						title: '主灯模式',
+						showDivider: false,
+						dividerColor: '#00000000',
+						dividerThickness: '0rpx',
+						dividerMargin: '10rpx',
+						itemHeight: '80rpx',
+						type: '',
+						showBtn: true,
+						btnBgColor: "#bbe600",
+						btnText: "确定",
+						btnTextColor: "#232323de",
+						showMask: true,
+						maskBgColor: '#00000066',
+						showClose: false
+					},
+					usrToggle: false,
+				},
+				formData: {
+					img: '',
+					sta_battery: '',
+					xuhang: '',
+					blename: '',
+					deviceId: '',
+					deviceName: '',
+					RSSI: '',
+					statu: '',
+					macAddress: '',
+					bleStatu: false,
+					sta_address: '',
+					sta_VoiceType: '0',
+					volume: 10,
+					sta_LightType: '',
+					strobeFrequency: 0.5,
+					lightBrightness: 10,
+					sta_system: '',
+					warnTime: 0,
+				},
+				dic: {
+					sta_VoiceType: {
+						"1": {
+							key: "1",
+							name: '消防',
+							show: true
+						},
+						"0": {
+							key: "0",
+							name: '公安',
+							show: true
+						},
+						"3": {
+							key: "3",
+							name: '交警',
+							show: true
+						},
+						"4": {
+							key: "4",
+							name: '市政',
+							show: true
+						},
+						"2": {
+							key: "2",
+							name: '应急',
+							show: true
+						},
+						"6": {
+							key: "6",
+							name: '医疗',
+							show: true
+						},
+						"5": {
+							key: "5",
+							name: '铁道',
+							show: true
+						},
+						"7": {
+							key: "7",
+							name: 'app语音',
+							show: false
+						},
+						"-1": {
+							key: "-1",
+							name: '关闭',
+							show: false
+						}
+					},
+
+					sta_LightType: [{
+							key: "6",
+							name: '红蓝交替',
+							show: true
+						},
+						{
+							key: "0",
+							name: '红闪',
+							show: true
+						},
+						{
+							key: "2",
+							name: '黄闪',
+							show: true
+						},
+						{
+							key: "1",
+							name: '蓝闪',
+							show: true
+						},
+						{
+							key: "3",
+							name: '红色顺时针',
+							show: true
+						},
+						{
+							key: "4",
+							name: '黄色顺时针',
+							show: true
+						},
+						{
+							key: "5",
+							name: '红蓝顺时针',
+							show: true
+						},
+						{
+							key: "-1",
+							name: '关闭',
+							show: false
+						}
+					],
+
+
+					sta_system: {
+						"0": '关机',
+						"1": '仅充电',
+						"2": '开机未充电',
+						"3": '开机且充电',
+						"": ""
+					}
+
+				},
+				device: {
+					id: "",
+					deviceName: "",
+					deviceImei: "",
+					deviceMac: "",
+					communicationMode: 0,
+					devicePic: "",
+					typeName: "",
+					bluetoothName: null,
+					deviceStatus: null,
+					bindingTime: "",
+					onlineStatus: 0,
+					battery: "0",
+					latitude: null,
+					longitude: null,
+					alarmStatus: null,
+					detailPageUrl: "/pages/650/HBY650",
+					showConfirm: false
+				},
+				permissions: [],
+				audioData: {
+					packetCtn: 0,
+					hexs: []
+				},
+				deviceInfo: {},
+			}
+		},
+		onUnload() {},
+		onLoad: function() {
+			const eventChannel = this.getOpenerEventChannel();
+			var these = this;
+			eventChannel.on('detailData', function(data) {
+				var device = data.data;
+				these.device = device;
+				these.Status.navTitle = data.data.deviceName;
+				these.Status.apiType = data.apiType;
+				these.Status.isRightIconVisible = these.Status.apiType === 'listA';
+
+				if (data.apiType !== 'listA') {
+					Common.getdeviceShareId(data.data.id).then(res => {
+						if (res.code == 200) {
+							if (res.data.permission) {
+								these.permissions = res.data.permission.split(',');
+							}
+						}
+					});
+
+				}
+				this.mqttClient = new MqttClient();
+
+				this.mqttClient.connect(() => {
+					// 订阅来自设备的状态更新
+					const statusTopic = `status/894078/HBY100/${data.data.deviceImei}`;
+					this.mqttClient.subscribe(statusTopic, (payload) => {
+						try {
+							// 解析MQTT返回的payload
+							const payloadObj = typeof payload === 'string' ? JSON.parse(
+								payload) : payload;
+							console.log(payloadObj, '这是我的数据类型么');
+							const data = payloadObj.data ?? {};
+							const funcType = payloadObj.funcType ?? ''; // 从顶层获取funcType
+							const {
+								siren_alarm = {
+										enable: 0,
+										mode: 0
+									},
+									led_strobe = {
+										enable: 0,
+										mode: 0,
+										frequency: 0
+									},
+									volume = 0,
+									brightness = {
+										red: 0,
+										green: 0,
+										blue: 0
+									},
+
+							} = data;
+							// 3. 赋值对应的字段
+							// 续航时间相关
+							if (funcType == '4') {
+								these.deviceInfo.batteryPercentage = data.level //电量
+								these.deviceInfo.batteryRemainingTime = data
+									.battery_remaining_time //续航时间
+								// 设备按键, app同步
+							} else if (funcType == '14') {
+								// 调节相关字段
+								these.formData.strobeFrequency = led_strobe.frequency ||
+									0.5; //频率
+								these.formData.volume = volume || 10; //音量
+								these.formData.lightBrightness = brightness.red ||
+									10; //亮度值
+								// 警示灯
+								const enable1 = led_strobe.enable ?? 0; // 开关：1=开，0=关
+								const mode1 = led_strobe.mode ?? 0; // 模式：0/1/2/3/4/5/6
+								if (enable1 === 1) {
+									// 开启状
+									these.formData.sta_LightType = mode1 + '';
+								} else {
+									// 关闭状态：赋值-1，表示关闭
+									these.formData.sta_LightType = '-1';
+								}
+								//  报警模式，选中，首次上报值，或者切换设备按键上报值
+								const enable = siren_alarm.enable ?? 0; // 报警开关：1=开，0=关
+								const mode = siren_alarm.mode ?? 0; // 模式：0/1/2/3/4/5/6
+								if (these.formData.sta_VoiceType != 7) {
+									if (enable === 1) {
+										// 开启状态
+										these.formData.sta_VoiceType = mode + '';
+									} else {
+										// 关闭状态：赋值-1，表示关闭
+										these.formData.sta_VoiceType = mode + '';
+									}
+								} else {
+									// 播放语音,上报消息
+									const voiceStrobeAlarm = data.voice_broadcast ?? 0;
+									if (voiceStrobeAlarm === 1) {
+										these.formData.sta_VoiceType = '7'
+									} else {
+										these.formData.sta_VoiceType = '-1'
+									}
+								}
+							}
+							// 报警模式相关字段赋值，是语音播放根据这个字段
+							if (funcType === '6') {
+								console.log('我是谁', data.voice_broadcast);
+								// 语音频闪报警：0=关闭，1=开启 ui7是播放的状态
+								const voiceStrobeAlarm = data.voice_broadcast ?? 0;
+								if (voiceStrobeAlarm === 1) {
+									these.formData.sta_VoiceType = '7'
+								} else {
+									these.formData.sta_VoiceType = '-1'
+								}
+								// 强制报警按键解除报警状态,app同步
+							} else if (funcType === '12') {
+								const enable_alarm = data.voice_strobe_alarm ??
+									0; // 报警开关：1=开，0=关
+								const mode_alarm = data.mode ?? 0; // 模式：0/1/2/3/4/5/6
+								if (enable_alarm === 1) {
+									// 开启状
+									these.deviceInfo.voiceStrobeAlarm = 1;
+									these.formData.sta_VoiceType = mode_alarm + ''
+								} else {
+									// 关闭状态：赋值-1，表示关闭
+									these.deviceInfo.voiceStrobeAlarm = -1;
+									// 模式还是选中的,模式,解除也是
+									these.formData.sta_VoiceType = mode_alarm + ''
+								}
+							}
+							// 警示灯模式选中切换
+							if (funcType === '10') {
+								const enable = data.enable ?? 0; // 开关：1=开，0=关
+								const mode = data.mode ?? 0; // 模式：0/1/2/3/4/5/6
+								if (enable === 1) {
+									// 开启状
+									these.formData.sta_LightType = mode + '';
+								} else {
+									// 关闭状态：赋值-1，表示关闭
+									these.formData.sta_LightType = '-1';
+								}
+							}
+							// 报警模式相关字段
+							console.log('formData赋值完成：', these.formData);
+						} catch (e) {
+							// 捕获异常并打印，方便排查问题（不要空catch）
+							console.log('解析MQTT payload失败：', e);
+						}
+					})
+				})
+				console.log(data, 'datatatatat');
+				these.fetchDeviceDetail(data.data.id)
+			});
+			this.createThrottledFunctions();
+
+		},
+		onHide: function() {
+			this.Status.pageHide = true;
+		},
+		onShow() {
+			this.Status.pageHide = false;
+		},
+		computed: {
+
+		},
+
+		methods: {
+			createThrottledFunctions() {
+				// 创建节流函数
+				this.throttledBrightnessChange = this.throttle(this.handleBrightnessChange, 500);
+				this.throttledFreqChange = this.throttle(this.handleFreqChange, 500);
+				this.throttledVolumeChange = this.throttle(this.handleVolumeChange, 500);
+			},
+			// 获取设备详情（普通详情）
+			fetchDeviceDetail(id) {
+				let that = this
+				deviceDetail(id).then((res) => {
+					if (res.code == 200) {
+						const validData = Object.fromEntries(
+							Object.entries(res.data).filter(([key, value]) => {
+								// 过滤规则：值为 null/undefined/0 的字段都不参与合并
+								return value !== null && value !== undefined && value !== 0;
+							})
+						);
+						Object.assign(this.formData, validData);
+						that.deviceInfo = res.data;
+						const strobeEnable = res.data.strobeEnable ?? 0; // 0=关闭，1=开启
+						const strobeMode = res.data.strobeMode ?? 0; // 0=红闪、1=蓝闪、3=红色顺时针...
+						if (strobeEnable === 1) {
+							// 开启状态
+							that.formData.sta_LightType = strobeMode + '';
+						} else {
+							// 关闭状态
+							that.formData.sta_LightType = '-1';
+						}
+						if (this.formData_VoiceType == 7) {
+							this.formData.sta_VoiceType = res.data.voiceStrobeAlarm ?? 0;
+						} else {
+							this.formData.sta_VoiceType = res.data.alarmMode + ''
+						}
+					}
+				})
+			},
+			handleRightClick(item, s) {
+				if (item && item.callback) {
+					item.callback(item, s);
+				}
+			},
+			navigatorBack() {
+				uni.navigateBack();
+			},
+
+			gotoShare(item, s) {
+				uni.navigateTo({
+					url: '/pages/common/share/index',
+					events: {
+						ack: function(data) {}
+					},
+					success: (res) => {
+						let json = {
+							persissonType: '100J'
+						};
+						Object.assign(json, this.deviceInfo);
+						res.eventChannel.emit('share', {
+							data: json
+						});
+					}
+				})
+			},
+			// 语音管理
+			audioManager(item) {
+				if (this.Status.apiType !== 'listA') {}
+				uni.navigateTo({
+					url: '/pages/100J/audioManager/AudioList',
+					events: {},
+					success: (res) => {
+						// 页面跳转成功后的回调函数
+						res.eventChannel.emit('deviceData', {
+							data: item
+						});
+					},
+				});
+			},
+			//频率
+			onFreqChanging(e) {
+				this.formData.strobeFrequency = e.detail.value;
+				this.throttledFreqChange(e.detail.value);
+			},
+			//音量
+			onVolumeChanging(e) {
+				this.formData.volume = e.detail.value;
+				this.throttledVolumeChange(e.detail.value);
+			},
+
+			// 亮度调节
+			onBrightnessChanging(e) {
+				this.formData.lightBrightness = e.detail.value;
+				this.throttledBrightnessChange(e.detail.value);
+			},
+			// 亮度调节
+			handleBrightnessChange(brightnessValue) {
+				let data = {
+					deviceId: this.deviceInfo.deviceId,
+					brightness: brightnessValue
+				};
+				console.log('发送亮度调节请求:', data);
+				deviceLightAdjustment(data).then((res) => {
+					if (res.code === 200) {
+						console.log('亮度调节成功');
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 1000
+						});
+					} else {
+						uni.showToast({
+							title: res.msg || '调节失败',
+							icon: 'none',
+							duration: 1000
+						});
+					}
+				}).catch((err) => {
+
+				});
+			},
+			// 频率调节
+			handleFreqChange(freqValue) {
+				let data = {
+					deviceId: this.deviceInfo.deviceId,
+					frequency: freqValue
+				};
+
+				deviceStrobeFrequency(data).then((res) => {
+					if (res.code === 200) {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 1000
+						});
+					} else {
+						uni.showToast({
+							title: res.msg || '调节失败',
+							icon: 'none',
+							duration: 1000
+						});
+					}
+				}).catch((err) => {});
+			},
+			// 音量调节处理函数
+			handleVolumeChange(volumeValue) {
+				let data = {
+					deviceId: this.deviceInfo.deviceId,
+					volume: volumeValue
+				};
+				deviceUpdateVolume(data).then((res) => {
+					if (res.code === 200) {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 1000
+						});
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 1000
+						});
+					}
+				}).catch((err) => {});
+			},
+			// 节流函数
+			throttle(func, delay = 500) {
+				let timer = null;
+				let lastArgs = null;
+				let lastThis = null;
+				return function(...args) {
+					lastArgs = args;
+					lastThis = this;
+					if (!timer) {
+						timer = setTimeout(() => {
+							timer = null;
+							func.apply(lastThis, lastArgs);
+						}, delay);
+					}
+				};
+
+			},
+			// *******定位******
+			gpsPosition(item) {
+				// 添加调试日志
+				uni.navigateTo({
+					url: '/pages/common/map/index',
+					events: {
+						ack: function(data) {}
+					},
+					success: (res) => {
+						res.eventChannel.emit('Map', {
+							data: item
+						});
+					}
+				})
+			},
+			// 警示灯开关闭
+			lightTypeSet(item, index) {
+				console.log('走了么');
+				let val = item.key;
+				// 切换选中/取消选中逻辑
+				if (this.formData.sta_LightType === val) {
+					val = '-1';
+				}
+				this.formData.sta_LightType = val;
+				let data = {
+					deviceId: this.deviceInfo.deviceId,
+					// 开启/关闭：选中模式时传1，关闭时传0
+					enable: val === '-1' ? 0 : 1,
+					// 0 红色爆闪，1 蓝色爆闪，2 黄色爆闪，3，红色顺时针旋转爆闪，4黄色顺时针旋转爆闪，5，红蓝顺时针旋转爆闪，6 红蓝交替爆闪
+					mode: item.key
+				};
+				deviceStrobeMode(data).then((res) => {
+					if (res.code == 200) {
+						const tipText = data.enable === 1 ? '开启成功' : '关闭成功';
+						uni.showToast({
+							title: tipText,
+							icon: 'none',
+							duration: 1000
+						});
+					} else {
+						uni.showToast({
+							title: res.msg,
+							icon: 'none',
+							duration: 1000
+						});
+					}
+				})
+			},
+			// 报警模式
+			setUsrToggle() {
+				this.Status.usrToggle = !this.Status.usrToggle;
+			},
+			// 播放语音
+			openVolume(item, index) {
+				if (!item) {
+					item = this.dic.sta_VoiceType[index];
+				}
+				let val = item.key;
+				if (this.formData.sta_VoiceType === val) {
+					val = '-1';
+				}
+				this.formData.sta_VoiceType = val;
+				// 模式类型为7时才去判断
+				console.log(val, 'valllll');
+				const voiceStrobeAlarm = this.deviceInfo?.voiceStrobeAlarm ?? 0; // 兜底0，避免undefined
+				const isVoiceOperate = val === '7' || val === '-1'; // 标记是否是语音开启/关闭操作
+				if (voiceStrobeAlarm === 0 && isVoiceOperate) {
+					let data = {
+						deviceId: this.deviceInfo.deviceId,
+						voiceBroadcast: Number(this.formData.sta_VoiceType) === -1 ? 0 : 1
+					}
+					deviceVoiceBroadcast(data).then((res) => {
+						if (res.code == 200) {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none'
+							});
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none'
+							});
+						}
+					})
+				} else if (this.deviceInfo.voiceStrobeAlarm == 1) {
+					console.log('走到这里了没');
+					// 如果强制报警已经开启了，那么切换下面的模式需要时，需要触发报警指令
+					const data = {
+						deviceIds: [this.deviceInfo.deviceId],
+						// 声光报警开关开启传1
+						voiceStrobeAlarm: 1,
+						mode: this.formData.sta_VoiceType
+					};
+					deviceForceAlarmActivation(data).then((res) => {
+						if (res.code === 200) {
+							uni.showToast({
+								title: '强制报警已开启',
+								icon: 'none'
+							});
+						} else {
+							uni.showToast({
+								title: res.msg,
+								icon: 'none'
+							});
+						}
+					})
+				}
+
+			},
+			// 报警模式
+			sosSetting(item) {
+				console.log(this.deviceInfo, '44444');
+				console.log(item, 'tent');
+				const isClose = item === 0;
+				if (!this.Status) this.Status = {};
+				if (!this.Status.Pop) this.Status.Pop = {
+					showPop: false
+				};
+
+				// 弹窗配置
+				this.Status.Pop = {
+					...this.Status.Pop,
+					showPop: true,
+					message: isClose ? '确定解除声光报警模式?' : '确定开启强制报警?',
+					buttonText: isClose ? '解除' : '开启',
+					borderColor: "#e034344d",
+					buttonBgColor: "#E03434",
+					showCancel: true,
+					buttonCancelText: '取消',
+					okCallback: () => {
+						this.deviceInfo.voiceStrobeAlarm = isClose ? 0 : 1; //强制报警,报警中 0是强制报警,1是报警中
+						const data = {
+							deviceIds: [this.deviceInfo.deviceId],
+							// 声光报警开关：关闭传0，开启传1
+							voiceStrobeAlarm: isClose ? 0 : 1,
+							mode: this.formData.sta_VoiceType
+						};
+						deviceForceAlarmActivation(data).then((res) => {
+							if (res.code === 200) {
+								uni.showToast({
+									title: isClose ? '声光报警已解除' : '强制报警已开启',
+									icon: 'none'
+								});
+								if (isClose && this.formData.sta_VoiceType === '7') {
+									this.formData.sta_VoiceType = '-1';
+								}
+							} else {
+								uni.showToast({
+									title: res.msg,
+									icon: 'none'
+								});
+							}
+						}).catch((err) => {});
+					}
+				};
+			},
+
+			deviceRecovry(res) {},
+			deviceDispose(res) {},
+			bleStateBreak() {},
+			bleStateRecovry() {},
+			previewImg(img) {},
+			bleValueNotify: function(receive, device, path, recArr) { //订阅消息
+				if (receive.deviceId !== this.formData.deviceId) {
+					return;
+				}
+				if (this.deviceInfo.batteryPercentage <= 20) {
+					this.showMsg("设备电量低");
+				}
+			},
+			showBleUnConnect() {},
+
+			proParam: function() {
+				uni.navigateTo({
+					url: '/pages/common/productDes/index?id=' + this.device.id,
+					success(ev) {}
+				});
+			},
+			handRemark: function() {
+				uni.navigateTo({
+					url: '/pages/common/operatingInstruct/index?id=' + this.device.id,
+					success(ev) {
+
+					}
+				});
+			},
+			handVideo: function() {
+				uni.navigateTo({
+					url: '/pages/common/operationVideo/index?id=' + this.device.id,
+					success(ev) {
+
+					}
+				});
+			},
+
+			closePop: function() {
+				this.Status.Pop.showPop = false;
+
+				if (this.Status.Pop.cancelCallback) {
+					this.Status.Pop.cancelCallback();
+				}
+			},
+			HidePop: function() {
+				if (this.Status.Pop.clickEvt == 'SendUsr') {
+
+				}
+
+				this.Status.Pop.showPop = false;
+				if (this.Status.Pop.okCallback) {
+					this.Status.Pop.okCallback();
+				}
+			},
+			showPop: function(option) {
+				hideLoading(this);
+				let def = {
+					showPop: true, //是否显示弹窗
 					popType: 'custom',
 					bgColor: '#383934bd',
 					borderColor: '#BBE600',
@@ -255,1638 +1006,905 @@ export default {
 					buttonBgColor: '#BBE600',
 					buttonTextColor: '#232323DE',
 					iconUrl: '',
-					message: '您确定要这样做吗？',
+					message: '',
 					buttonText: '确定',
 					clickEvt: '',
 					visiblePrompt: false,
-					promptTitle: '设备名称',
+					promptTitle: '',
 					modelValue: '',
 					visibleClose: false,
 					okCallback: null,
+					showSlot: false,
 					buttonCancelText: '',
 					showCancel: false,
-				},
-				BottomMenu: {
-					show: false,
-					showHeader: true,
-					menuItems: [{
-						text: '强光',
-						icon: '/static/images/6155/DeviceDetail/qiang.png'
-					}],
-					activeIndex: -1,
-					bgColor: '#2a2a2a',
-					itemBgColor: '#3a3a3a',
-					textColor: '#ffffffde',
-					textAlign: 'flex-start',
-					title: '主灯模式',
-					showDivider: false,
-					dividerColor: '#00000000',
-					dividerThickness: '0rpx',
-					dividerMargin: '10rpx',
-					itemHeight: '80rpx',
-					type: '',
-					showBtn: true,
-					btnBgColor: "#bbe600",
-					btnText: "确定",
-					btnTextColor: "#232323de",
-					showMask: true,
-					maskBgColor: '#00000066',
-					showClose: false
-				},
-				usrToggle: false,
-			},
-			formData: {
-				img: '',
-				sta_battery: '',
-				xuhang: '',
-				blename: '',
-				deviceId: '',
-				deviceName: '',
-				RSSI: '',
-				statu: '',
-				macAddress: '',
-				bleStatu: false,
-				sta_address: '',
-				sta_VoiceType: '0',
-				volume: 10,
-				sta_LightType: '',
-				strobeFrequency: 0.5,
-				lightBrightness: 10,
-				sta_system: '',
-				warnTime: 0,
-			},
-			dic: {
-				sta_VoiceType: {
-					"1": {
-						key: "1",
-						name: '消防',
-						show: true
-					},
-					"0": {
-						key: "0",
-						name: '公安',
-						show: true
-					},
-					"3": {
-						key: "3",
-						name: '交警',
-						show: true
-					},
-					"4": {
-						key: "4",
-						name: '市政',
-						show: true
-					},
-					"2": {
-						key: "2",
-						name: '应急',
-						show: true
-					},
-					"6": {
-						key: "6",
-						name: '医疗',
-						show: true
-					},
-					"5": {
-						key: "5",
-						name: '铁道',
-						show: true
-					},
-					"7": {
-						key: "7",
-						name: 'app语音',
-						show: false
-					},
-					"-1": {
-						key: "-1",
-						name: '关闭',
-						show: false
-					}
-				},
-
-				sta_LightType: [{
-					key: "6",
-					name: '红蓝交替',
-					show: true
-				},
-				{
-					key: "0",
-					name: '红闪',
-					show: true
-				},
-				{
-					key: "2",
-					name: '黄闪',
-					show: true
-				},
-				{
-					key: "1",
-					name: '蓝闪',
-					show: true
-				},
-				{
-					key: "3",
-					name: '红色顺时针',
-					show: true
-				},
-				{
-					key: "4",
-					name: '黄色顺时针',
-					show: true
-				},
-				{
-					key: "5",
-					name: '红蓝顺时针',
-					show: true
-				},
-				{
-					key: "-1",
-					name: '关闭',
-					show: false
-				}
-				],
-
-
-				sta_system: {
-					"0": '关机',
-					"1": '仅充电',
-					"2": '开机未充电',
-					"3": '开机且充电',
-					"": ""
 				}
 
-			},
-			device: {
-				id: "",
-				deviceName: "",
-				deviceImei: "",
-				deviceMac: "",
-				communicationMode: 0,
-				devicePic: "",
-				typeName: "",
-				bluetoothName: null,
-				deviceStatus: null,
-				bindingTime: "",
-				onlineStatus: 0,
-				battery: "0",
-				latitude: null,
-				longitude: null,
-				alarmStatus: null,
-				detailPageUrl: "/pages/650/HBY650",
-				showConfirm: false
-			},
-			permissions: [],
-			audioData: {
-				packetCtn: 0,
-				hexs: []
-			},
-			deviceInfo: {},
-		}
-	},
-	onUnload() { },
-	onLoad: function () {
-		const eventChannel = this.getOpenerEventChannel();
-		var these = this;
-		eventChannel.on('detailData', function (data) {
-			var device = data.data;
-			these.device = device;
-			these.Status.navTitle = data.data.deviceName;
-			these.Status.apiType = data.apiType;
-			these.Status.isRightIconVisible = these.Status.apiType === 'listA';
+				let keys = Object.keys(def);
 
-			if (data.apiType !== 'listA') {
-				Common.getdeviceShareId(data.data.id).then(res => {
-					if (res.code == 200) {
-						if (res.data.permission) {
-							these.permissions = res.data.permission.split(',');
-						}
-					}
-				});
-
-			}
-			this.mqttClient = new MqttClient();
-
-			this.mqttClient.connect(() => {
-				// 订阅来自设备的状态更新
-				const statusTopic = `status/894078/HBY100/${data.data.deviceImei}`;
-				this.mqttClient.subscribe(statusTopic, (payload) => {
-					try {
-						// 解析MQTT返回的payload
-						const payloadObj = typeof payload === 'string' ? JSON.parse(
-							payload) : payload;
-						console.log(payloadObj, '这是我的数据类型么');
-						const data = payloadObj.data ?? {};
-						const funcType = payloadObj.funcType ?? ''; // 从顶层获取funcType
-						const {
-							siren_alarm = {
-								enable: 0,
-								mode: 0
-							},
-							led_strobe = {
-								enable: 0,
-								mode: 0,
-								frequency: 0
-							},
-							volume = 0,
-							brightness = {
-								red: 0,
-								green: 0,
-								blue: 0
-							},
-
-						} = data;
-						// 3. 赋值对应的字段
-						// 续航时间相关
-						if (funcType == '4') {
-							these.deviceInfo.batteryPercentage = data.level //电量
-							these.deviceInfo.batteryRemainingTime = data
-								.battery_remaining_time //续航时间
-						} else if (funcType == '14') {
-							// 调节相关字段
-							these.formData.strobeFrequency = led_strobe.frequency ||
-								0.5; //频率
-							these.formData.volume = volume || 10; //音量
-							these.formData.lightBrightness = brightness.red ||
-								10; //亮度值
-							//  报警模式，选中，首次上报值，或者切换设备按键上报值
-							const enable = siren_alarm.enable ?? 0; // 报警开关：1=开，0=关
-							const mode = siren_alarm.mode ?? 0; // 模式：0/1/2/3/4/5/6
-							if (these.formData.sta_VoiceType != 7) {
-								if (enable === 1) {
-									// 开启状
-									these.formData.sta_VoiceType = mode + '';
-								} else {
-									// 关闭状态：赋值-1，表示关闭
-									these.formData.sta_VoiceType = mode + '';
-								}
-							} else {
-								// 播放语音,上报消息
-								const voiceStrobeAlarm = data.voice_broadcast ?? 0;
-								if (voiceStrobeAlarm === 1) {
-									these.formData.sta_VoiceType = '7'
-								} else {
-									these.formData.sta_VoiceType = '-1'
-								}
-							}
-
-
-						}
-						// 报警模式相关字段赋值
-						// 是语音播放根据这个字段
-						if (funcType === '6') {
-							console.log('我是谁', data.voice_broadcast);
-							// 语音频闪报警：0=关闭，1=开启 ui7是播放的状态
-							const voiceStrobeAlarm = data.voice_broadcast ?? 0;
-							if (voiceStrobeAlarm === 1) {
-								these.formData.sta_VoiceType = '7'
-							} else {
-								these.formData.sta_VoiceType = '-1'
-							}
-
-						} else if (funcType === '12') {
-							// 报警模式：直接用alarmMode作为sta_VoiceType
-							const alarmMode = data.mode ?? 0;
-							these.formData.sta_VoiceType = alarmMode + ''; // 转字符串匹配key
-						}
-						// 警示灯模式选中切换
-						if (funcType === '10') {
-							const enable = data.enable ?? 0; // 开关：1=开，0=关
-							const mode = data.mode ?? 0; // 模式：0/1/2/3/4/5/6
-							if (enable === 1) {
-								// 开启状
-								these.formData.sta_LightType = mode + '';
-							} else {
-								// 关闭状态：赋值-1，表示关闭
-								these.formData.sta_LightType = '-1';
-							}
-						}
-						// 报警模式相关字段
-						console.log('formData赋值完成：', these.formData);
-					} catch (e) {
-						// 捕获异常并打印，方便排查问题（不要空catch）
-						console.log('解析MQTT payload失败：', e);
-					}
-				})
-			})
-			console.log(data, 'datatatatat');
-			these.fetchDeviceDetail(data.data.id)
-		});
-		this.createThrottledFunctions();
-
-	},
-	onHide: function () {
-		this.Status.pageHide = true;
-	},
-	onShow() {
-		this.Status.pageHide = false;
-	},
-	computed: {
-
-	},
-
-	methods: {
-		createThrottledFunctions() {
-			// 创建节流函数
-			this.throttledBrightnessChange = this.throttle(this.handleBrightnessChange, 500);
-			this.throttledFreqChange = this.throttle(this.handleFreqChange, 500);
-			this.throttledVolumeChange = this.throttle(this.handleVolumeChange, 500);
-		},
-		// 获取设备详情（普通详情）
-		fetchDeviceDetail(id) {
-			let that = this
-			deviceDetail(id).then((res) => {
-				if (res.code == 200) {
-					const validData = Object.fromEntries(
-						Object.entries(res.data).filter(([key, value]) => {
-							// 过滤规则：值为 null/undefined/0 的字段都不参与合并
-							return value !== null && value !== undefined && value !== 0;
-						})
-					);
-					Object.assign(this.formData, validData);
-					that.deviceInfo = res.data;
-					const strobeEnable = res.data.strobeEnable ?? 0; // 0=关闭，1=开启
-					const strobeMode = res.data.strobeMode ?? 0; // 0=红闪、1=蓝闪、3=红色顺时针...
-					if (strobeEnable === 1) {
-						// 开启状态
-						that.formData.sta_LightType = strobeMode + '';
-					} else {
-						// 关闭状态
-						that.formData.sta_LightType = '-1';
-					}
-					if (this.formData_VoiceType == 7) {
-						this.formData.sta_VoiceType = res.data.voiceStrobeAlarm ?? 0;
-					} else {
-						this.formData.sta_VoiceType = res.data.alarmMode + ''
-					}
-				}
-			})
-		},
-		handleRightClick(item, s) {
-			if (item && item.callback) {
-				item.callback(item, s);
-			}
-		},
-		navigatorBack() {
-			uni.navigateBack();
-		},
-
-		gotoShare(item, s) {
-			uni.navigateTo({
-				url: '/pages/common/share/index',
-				events: {
-					ack: function (data) { }
-				},
-				success: (res) => {
-					let json = {
-						persissonType: '100J'
-					};
-					Object.assign(json, this.deviceInfo);
-					res.eventChannel.emit('share', {
-						data: json
-					});
-				}
-			})
-		},
-		// 语音管理
-		audioManager(item) {
-			if (this.Status.apiType !== 'listA') { }
-			uni.navigateTo({
-				url: '/pages/100J/audioManager/AudioList',
-				events: {},
-				success: (res) => {
-					// 页面跳转成功后的回调函数
-					res.eventChannel.emit('deviceData', {
-						data: item
-					});
-				},
-			});
-		},
-		//频率
-		onFreqChanging(e) {
-			this.formData.strobeFrequency = e.detail.value;
-			this.throttledFreqChange(e.detail.value);
-		},
-		//音量
-		onVolumeChanging(e) {
-			this.formData.volume = e.detail.value;
-			this.throttledVolumeChange(e.detail.value);
-		},
-
-		// 亮度调节
-		onBrightnessChanging(e) {
-			this.formData.lightBrightness = e.detail.value;
-			this.throttledBrightnessChange(e.detail.value);
-		},
-		// 亮度调节
-		handleBrightnessChange(brightnessValue) {
-			let data = {
-				deviceId: this.deviceInfo.deviceId,
-				brightness: brightnessValue
-			};
-			console.log('发送亮度调节请求:', data);
-			deviceLightAdjustment(data).then((res) => {
-				if (res.code === 200) {
-					console.log('亮度调节成功');
-					uni.showToast({
-						title: res.msg,
-						icon: 'none',
-						duration: 1000
-					});
-				} else {
-					uni.showToast({
-						title: res.msg || '调节失败',
-						icon: 'none',
-						duration: 1000
-					});
-				}
-			}).catch((err) => {
-
-			});
-		},
-		// 频率调节
-		handleFreqChange(freqValue) {
-			let data = {
-				deviceId: this.deviceInfo.deviceId,
-				frequency: freqValue
-			};
-
-			deviceStrobeFrequency(data).then((res) => {
-				if (res.code === 200) {
-					uni.showToast({
-						title: res.msg,
-						icon: 'none',
-						duration: 1000
-					});
-				} else {
-					uni.showToast({
-						title: res.msg || '调节失败',
-						icon: 'none',
-						duration: 1000
-					});
-				}
-			}).catch((err) => { });
-		},
-		// 音量调节处理函数
-		handleVolumeChange(volumeValue) {
-			let data = {
-				deviceId: this.deviceInfo.deviceId,
-				volume: volumeValue
-			};
-			deviceUpdateVolume(data).then((res) => {
-				if (res.code === 200) {
-					uni.showToast({
-						title: res.msg,
-						icon: 'none',
-						duration: 1000
-					});
-				} else {
-					uni.showToast({
-						title: res.msg,
-						icon: 'none',
-						duration: 1000
-					});
-				}
-			}).catch((err) => { });
-		},
-		// 节流函数
-		throttle(func, delay = 500) {
-			let timer = null;
-			let lastArgs = null;
-			let lastThis = null;
-			return function (...args) {
-				lastArgs = args;
-				lastThis = this;
-				if (!timer) {
-					timer = setTimeout(() => {
-						timer = null;
-						func.apply(lastThis, lastArgs);
-					}, delay);
-				}
-			};
-
-		},
-		// *******定位******
-		gpsPosition(item) {
-			// 添加调试日志
-			uni.navigateTo({
-				url: '/pages/common/map/index',
-				events: {
-					ack: function (data) { }
-				},
-				success: (res) => {
-					res.eventChannel.emit('Map', {
-						data: item
-					});
-				}
-			})
-		},
-		// 警示灯开关闭
-		lightTypeSet(item, index) {
-			console.log('走了么');
-			let val = item.key;
-			// 切换选中/取消选中逻辑
-			if (this.formData.sta_LightType === val) {
-				val = '-1';
-			}
-			this.formData.sta_LightType = val;
-			let data = {
-				deviceId: this.deviceInfo.deviceId,
-				// 开启/关闭：选中模式时传1，关闭时传0
-				enable: val === '-1' ? 0 : 1,
-				// 0 红色爆闪，1 蓝色爆闪，2 黄色爆闪，3，红色顺时针旋转爆闪，4黄色顺时针旋转爆闪，5，红蓝顺时针旋转爆闪，6 红蓝交替爆闪
-				mode: item.key
-			};
-			deviceStrobeMode(data).then((res) => {
-				if (res.code == 200) {
-					const tipText = data.enable === 1 ? '开启成功' : '关闭成功';
-					uni.showToast({
-						title: tipText,
-						icon: 'none',
-						duration: 1000
-					});
-				} else {
-					uni.showToast({
-						title: res.msg,
-						icon: 'none',
-						duration: 1000
-					});
-				}
-			})
-		},
-		// 报警模式
-		setUsrToggle() {
-			this.Status.usrToggle = !this.Status.usrToggle;
-		},
-		// 播放语音
-		openVolume(item, index) {
-			if (!item) {
-				item = this.dic.sta_VoiceType[index];
-			}
-			let val = item.key;
-			if (this.formData.sta_VoiceType === val) {
-				val = '-1';
-			}
-			this.formData.sta_VoiceType = val;
-			// 模式类型为7时才去判断
-			console.log(val, 'valllll');
-			const voiceStrobeAlarm = this.deviceInfo?.voiceStrobeAlarm ?? 0; // 兜底0，避免undefined
-			const isVoiceOperate = val === '7' || val === '-1'; // 标记是否是语音开启/关闭操作
-			if (voiceStrobeAlarm === 0 && isVoiceOperate) {
-				let data = {
-					deviceId: this.deviceInfo.deviceId,
-					voiceBroadcast: Number(this.formData.sta_VoiceType) === -1 ? 0 : 1
-				}
-				deviceVoiceBroadcast(data).then((res) => {
-					if (res.code == 200) {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						});
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						});
-					}
-				})
-			} else if (this.deviceInfo.voiceStrobeAlarm == 1) {
-				console.log('走到这里了没');
-				// 如果强制报警已经开启了，那么切换下面的模式需要时，需要触发报警指令
-				const data = {
-					deviceIds: [this.deviceInfo.deviceId],
-					// 声光报警开关开启传1
-					voiceStrobeAlarm: 1,
-					mode: this.formData.sta_VoiceType
-				};
-				deviceForceAlarmActivation(data).then((res) => {
-					if (res.code === 200) {
-						uni.showToast({
-							title: '强制报警已开启',
-							icon: 'none'
-						});
-					} else {
-						uni.showToast({
-							title: res.msg,
-							icon: 'none'
-						});
-					}
-				})
-			}
-
-		},
-		// 报警模式
-		sosSetting(item) {
-			console.log(this.deviceInfo, '44444');
-			console.log(item, 'tent');
-			const isClose = item === 0;
-			if (!this.Status) this.Status = {};
-			if (!this.Status.Pop) this.Status.Pop = {
-				showPop: false
-			};
-
-			// 弹窗配置
-			this.Status.Pop = {
-				...this.Status.Pop,
-				showPop: true,
-				message: isClose ? '确定解除声光报警模式?' : '确定开启强制报警?',
-				buttonText: isClose ? '解除' : '开启',
-				borderColor: "#e034344d",
-				buttonBgColor: "#E03434",
-				showCancel: true,
-				buttonCancelText: '取消',
-				okCallback: () => {
-					this.deviceInfo.voiceStrobeAlarm = isClose ? 0 : 1; //强制报警,报警中 0是强制报警,1是报警中
-					const data = {
-						deviceIds: [this.deviceInfo.deviceId],
-						// 声光报警开关：关闭传0，开启传1
-						voiceStrobeAlarm: isClose ? 0 : 1,
-						mode: this.formData.sta_VoiceType
-					};
-					deviceForceAlarmActivation(data).then((res) => {
-						if (res.code === 200) {
-							uni.showToast({
-								title: isClose ? '声光报警已解除' : '强制报警已开启',
-								icon: 'none'
-							});
-							if (isClose && this.formData.sta_VoiceType === '7') {
-								this.formData.sta_VoiceType = '-1';
-							}
-						} else {
-							uni.showToast({
-								title: res.msg,
-								icon: 'none'
-							});
-						}
-					}).catch((err) => { });
-				}
-			};
-		},
-
-		deviceRecovry(res) { },
-		deviceDispose(res) { },
-		bleStateBreak() { },
-		bleStateRecovry() { },
-		previewImg(img) { },
-		bleValueNotify: function (receive, device, path, recArr) { //订阅消息
-			if (receive.deviceId !== this.formData.deviceId) {
-				return;
-			}
-			if (this.deviceInfo.batteryPercentage <= 20) {
-				this.showMsg("设备电量低");
-			}
-		},
-		showBleUnConnect() { },
-
-		proParam: function () {
-			uni.navigateTo({
-				url: '/pages/common/productDes/index?id=' + this.device.id,
-				success(ev) { }
-			});
-		},
-		handRemark: function () {
-			uni.navigateTo({
-				url: '/pages/common/operatingInstruct/index?id=' + this.device.id,
-				success(ev) {
-
-				}
-			});
-		},
-		handVideo: function () {
-			uni.navigateTo({
-				url: '/pages/common/operationVideo/index?id=' + this.device.id,
-				success(ev) {
-
-				}
-			});
-		},
-
-		closePop: function () {
-			this.Status.Pop.showPop = false;
-
-			if (this.Status.Pop.cancelCallback) {
-				this.Status.Pop.cancelCallback();
-			}
-		},
-		HidePop: function () {
-			if (this.Status.Pop.clickEvt == 'SendUsr') {
-
-			}
-
-			this.Status.Pop.showPop = false;
-			if (this.Status.Pop.okCallback) {
-				this.Status.Pop.okCallback();
-			}
-		},
-		showPop: function (option) {
-			hideLoading(this);
-			let def = {
-				showPop: true, //是否显示弹窗
-				popType: 'custom',
-				bgColor: '#383934bd',
-				borderColor: '#BBE600',
-				textColor: '#ffffffde',
-				buttonBgColor: '#BBE600',
-				buttonTextColor: '#232323DE',
-				iconUrl: '',
-				message: '',
-				buttonText: '确定',
-				clickEvt: '',
-				visiblePrompt: false,
-				promptTitle: '',
-				modelValue: '',
-				visibleClose: false,
-				okCallback: null,
-				showSlot: false,
-				buttonCancelText: '',
-				showCancel: false,
-			}
-
-			let keys = Object.keys(def);
-
-			for (let i = 0; i < keys.length; i++) {
-				let key = keys[i];
-				if (key in option) {
-					continue;
-				}
-				this.Status.Pop[key] = def[key];
-			}
-			if (option) {
-				keys = Object.keys(option);
 				for (let i = 0; i < keys.length; i++) {
 					let key = keys[i];
-
-					this.Status.Pop[key] = option[key];
+					if (key in option) {
+						continue;
+					}
+					this.Status.Pop[key] = def[key];
 				}
-			}
+				if (option) {
+					keys = Object.keys(option);
+					for (let i = 0; i < keys.length; i++) {
+						let key = keys[i];
 
-			if (!option.borderColor) {
-				option.borderColor = '#BBE600';
-				option.buttonBgColor = '#BBE600';
-			}
-			these.Status.Pop.showPop = true;
-		},
-		btnClick() {
+						this.Status.Pop[key] = option[key];
+					}
+				}
 
+				if (!option.borderColor) {
+					option.borderColor = '#BBE600';
+					option.buttonBgColor = '#BBE600';
+				}
+				these.Status.Pop.showPop = true;
+			},
+			btnClick() {
+
+			}
 		}
 	}
-}
 </script>
 
 <style>
-.content {
-	padding: 30rpx;
-	box-sizing: border-box;
-}
+	.content {
+		padding: 30rpx;
+		box-sizing: border-box;
+	}
 
-.eq {
-	width: 100%;
-	height: 250rpx;
-	border-radius: 8px;
-	background: rgba(26, 26, 26, 1);
-	box-sizing: border-box;
-	padding: 24rpx 28rpx;
-	display: flex;
-	flex-direction: row;
-	flex-wrap: nowrap;
-	align-content: center;
-	justify-content: center;
-	align-items: center;
-	margin-bottom: 24rpx;
-}
+	.eq {
+		width: 100%;
+		height: 250rpx;
+		border-radius: 8px;
+		background: rgba(26, 26, 26, 1);
+		box-sizing: border-box;
+		padding: 24rpx 28rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+		margin-bottom: 24rpx;
+	}
 
-.eq .leftImg {
-	box-sizing: border-box;
-	padding: 36rpx;
-	border-radius: 16rpx;
-	background: rgba(42, 42, 42, 0.5);
-}
+	.eq .leftImg {
+		box-sizing: border-box;
+		padding: 36rpx;
+		border-radius: 16rpx;
+		background: rgba(42, 42, 42, 0.5);
+	}
 
-.eq .leftImg,
-.eq .rightTxt {
-	width: 50%;
-	height: 100%;
-}
+	.eq .leftImg,
+	.eq .rightTxt {
+		width: 50%;
+		height: 100%;
+	}
 
-.eq .rightTxt {
-	display: flex;
-	flex-direction: column;
-	flex-wrap: nowrap;
-	align-content: flex-start;
-	justify-content: space-evenly;
-	align-items: flex-start;
-}
+	.eq .rightTxt {
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: flex-start;
+		justify-content: space-evenly;
+		align-items: flex-start;
+	}
 
-.eq .leftImg .img {
-	width: 100%;
-	height: 100%;
-}
+	.eq .leftImg .img {
+		width: 100%;
+		height: 100%;
+	}
 
-.eq .rightTxt .img {
-	width: 52rpx;
-	height: 52rpx;
-}
+	.eq .rightTxt .img {
+		width: 52rpx;
+		height: 52rpx;
+	}
 
-.eq .rightTxt .row {
-	width: 100%;
-	display: flex;
-	flex-direction: row;
-	flex-wrap: nowrap;
-	align-content: center;
-	justify-content: flex-start;
-	align-items: center;
-	box-sizing: border-box;
-	padding-left: 50rpx;
-}
+	.eq .rightTxt .row {
+		width: 100%;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: flex-start;
+		align-items: center;
+		box-sizing: border-box;
+		padding-left: 50rpx;
+	}
 
-.eq .rightTxt .row .txt {
-	padding-left: 20rpx;
-}
+	.eq .rightTxt .row .txt {
+		padding-left: 20rpx;
+	}
 
-.eq .bigTxt {
-	color: rgba(255, 255, 255, 0.87);
-	font-family: PingFang SC;
-	font-size: 28rpx;
-	font-weight: 400;
-}
+	.eq .bigTxt {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+	}
 
-.eq .smallTxt {
-	color: rgba(255, 255, 255, 0.6);
-	font-family: PingFang SC;
-	font-size: 24rpx;
-	font-weight: 400;
-}
+	.eq .smallTxt {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+	}
 
 
-.eqinfo {
-	border-radius: 16rpx;
-	background: rgba(26, 26, 26, 1);
-	box-sizing: border-box;
-	padding: 15rpx 30rpx;
-}
+	.eqinfo {
+		border-radius: 16rpx;
+		background: rgba(26, 26, 26, 1);
+		box-sizing: border-box;
+		padding: 15rpx 30rpx;
+	}
 
-.eqinfo .item {
-	width: 100%;
-	height: 60rpx;
-	line-height: 60rpx;
-	/* padding: 0rpx 28rpx; */
-	box-sizing: border-box;
-	display: flex;
-	flex-direction: row;
-	flex-wrap: nowrap;
-	align-content: center;
-	justify-content: space-between;
-	align-items: center;
-}
+	.eqinfo .item {
+		width: 100%;
+		height: 60rpx;
+		line-height: 60rpx;
+		/* padding: 0rpx 28rpx; */
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+	}
 
-.eqinfo .lbl {
-	color: rgba(255, 255, 255, 0.87);
-	font-family: PingFang SC;
-	font-size: 28rpx;
-	font-weight: 400;
+	.eqinfo .lbl {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
 
-	letter-spacing: 0.07px;
-	text-align: left;
-}
+		letter-spacing: 0.07px;
+		text-align: left;
+	}
 
-.eqinfo .value {
-	color: rgba(255, 255, 255, 0.6);
-	font-family: PingFang SC;
-	font-size: 28rpx;
-	font-weight: 400;
-	letter-spacing: 0.07px;
-	text-align: left;
-}
+	.eqinfo .value {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+		letter-spacing: 0.07px;
+		text-align: left;
+	}
 
-.eqinfo .info-value {
-	/* margin-top: 30rpx; */
-}
+	.eqinfo .info-value {
+		/* margin-top: 30rpx; */
+	}
 
-/* .eqinfo .status-running {
+	/* .eqinfo .status-running {
 		color: rgba(174, 214, 0, 1);
 	} */
 
-.lamp {
-	margin-top: 24rpx;
-}
-
-.lamp .title {
-	width: 100%;
-	height: 60rpx;
-	line-height: 60rpx;
-	padding: 0rpx 28rpx;
-	box-sizing: border-box;
-	display: flex;
-	flex-direction: row;
-	flex-wrap: nowrap;
-	align-content: center;
-	justify-content: space-between;
-	align-items: center;
-	font-size: 28rpx;
-}
-
-.lamp.noPadding .title,
-.lamp.noPadding .smlltitle {
-	padding: 0rpx 0rpx !important;
-}
-
-.lamp .smlltitle {
-	width: 100%;
-
-	line-height: 15rpx;
-	padding: 0rpx 28rpx;
-	box-sizing: border-box;
-	display: flex;
-	flex-direction: row;
-	flex-wrap: nowrap;
-	align-content: center;
-	justify-content: space-between;
-	align-items: center;
-	font-size: 26rpx;
-	color: rgba(255, 255, 255, 0.6);
-}
-
-
-.lamp .title .img {
-	width: 32rpx;
-	height: 32rpx;
-	margin-top: 20rpx;
-}
-
-.lampMode {
-
-	width: 100%;
-	box-sizing: border-box;
-
-}
-
-.lampMode .mode {
-	width: calc(calc(100% - 34rpx) / 2);
-	border-radius: 8px;
-	margin-top: 20rpx;
-	background: rgba(26, 26, 26, 1);
-	display: flex;
-	flex-direction: row;
-	flex-wrap: nowrap;
-	align-content: center;
-	align-items: center;
-	justify-content: flex-start;
-	padding: 30rpx;
-	box-sizing: border-box;
-	border-width: 1px;
-	border-style: solid;
-	border-color: #00000000;
-}
-
-.lampMode .mode.active {
-
-	border-color: #aed600 !important;
-}
-
-.lampMode .mode.active .bigTxt {
-
-	color: #aed600 !important;
-}
-
-.mode.marginLeft {
-	margin-left: 34rpx !important;
-}
-
-.mode .leftImg {
-	width: 70rpx;
-	height: 70rpx;
-	border-radius: 4px;
-	background: rgba(255, 255, 255, 0.06);
-	display: flex;
-	flex-direction: row;
-	flex-wrap: nowrap;
-	align-content: center;
-	justify-content: center;
-	align-items: center;
-}
-
-.mode.active .leftImg {
-	background: rgba(255, 255, 255, 0.06);
-}
-
-.mode .leftImg .img {
-	width: 40rpx;
-	height: 40rpx;
-}
-
-.mode .rightTxt {
-	display: flex;
-	flex-direction: column;
-	flex-wrap: nowrap;
-	align-content: flex-start;
-	justify-content: center;
-	align-items: flex-start;
-	padding-left: 20rpx;
-}
-
-.mode .bigTxt {
-	color: rgba(255, 255, 255, 0.87);
-	font-family: PingFang SC;
-	font-size: 28rpx;
-	font-weight: 400;
-
-	letter-spacing: 0.07px;
-
-}
-
-.mode .smallTxt {
-	color: rgba(255, 255, 255, 0.6);
-	font-family: PingFang SC;
-	font-size: 24rpx;
-	font-weight: 400;
-
-	letter-spacing: 0.07px;
-
-}
-
-.usrinfo {
-	border-radius: 8px;
-	width: 100%;
-	box-sizing: border-box;
-	padding: 24rpx 28rpx;
-	background: rgba(26, 26, 26, 1);
-}
-
-.usrtitle {
-	color: rgba(255, 255, 255, 0.87);
-	font-family: PingFang SC;
-	font-size: 28rpx;
-	font-weight: 400;
-	height: 40rpx;
-	line-height: 40rpx;
-	letter-spacing: 0.07px;
-
-}
-
-.usrinfo .btnSend {
-	line-height: 65rpx;
-	border-radius: 8px;
-	width: 120rpx;
-	height: 65rpx;
-	color: rgba(35, 35, 35, 0.87);
-	font-family: PingFang SC;
-	font-size: 24rpx;
-	font-weight: 400;
-	letter-spacing: 0.15rpx;
-	text-align: center;
-	background-color: #BBE600;
-}
-
-.usrinfo .item {
-	border-radius: 8px;
-	width: 100%;
-	box-sizing: border-box;
-	line-height: 90rpx;
-	height: 90rpx;
-	background: rgba(42, 42, 42, 1);
-	margin-top: 24rpx;
-	display: flex;
-	flex-direction: row;
-	flex-wrap: nowrap;
-	align-content: center;
-	justify-content: flex-start;
-	align-items: center;
-}
-
-.usrinfo .lbl {
-	width: 120rpx;
-	height: 100%;
-	padding-left: 24rpx;
-	box-sizing: border-box;
-
-	text-align: right;
-
-	color: rgba(255, 255, 255, 0.87);
-	font-family: PingFang SC;
-	font-size: 28rpx;
-	font-weight: 400;
-
-	letter-spacing: 0.07px;
-
-}
-
-.usrinfo .value {
-	width: calc(100% - 120rpx);
-	height: 100%;
-
-	font-size: 28rpx;
-	font-weight: 400;
-
-	letter-spacing: 0.07px;
-	text-align: left;
-
-}
-
-.usrinfo .value .uni-input-input {
-	color: rgba(255, 255, 255, 0.87);
-	font-family: PingFang SC;
-
-}
-
-
-.usrplace {
-	color: rgba(255, 255, 255, 0.4);
-	font-family: PingFang SC;
-	font-size: 28rpx;
-	font-weight: 400;
-	letter-spacing: 0.07px;
-	text-align: left;
-}
-
-.proinfo .itemcontent {
-	display: flex;
-	display: flex;
-	flex-direction: row;
-	flex-wrap: nowrap;
-	align-content: center;
-	justify-content: space-evenly;
-}
-
-.proinfo .item {
-	width: 180rpx;
-	height: 180rpx;
-	box-sizing: border-box;
-	padding: 40rpx;
-	border-radius: 16rpx;
-	background: rgba(26, 26, 26, 1);
-	display: flex;
-	flex-direction: column;
-	flex-wrap: nowrap;
-	align-content: center;
-	justify-content: center;
-	align-items: center;
-}
-
-.proinfo .item .img {
-	width: 50rpx;
-	height: 50rpx;
-}
-
-.proinfo .item .txt {
-	color: rgba(255, 255, 255, 0.6);
-	font-family: PingFang SC;
-	font-size: 24rpx;
-	font-weight: 400;
-	margin-top: 20rpx;
-	letter-spacing: 0.07px;
-	text-align: left;
-}
-
-.slider-container {
-	padding: 0px;
-}
-
-.addIco {
-	width: 100%;
-	height: 360rpx;
-	display: flex;
-	flex-direction: row;
-	flex-wrap: nowrap;
-	align-content: center;
-	justify-content: center;
-	align-items: center;
-}
-
-.icoContent {
-	width: 240rpx;
-	height: 240rpx;
-	border-radius: 8rpx;
-
-
-	background: rgba(58, 58, 58, 1);
-}
-
-.icoContent .img {
-	width: 70rpx;
-	height: 70rpx;
-}
-
-.arrowContent {
-	border-radius: 16rpx;
-	background: rgba(26, 26, 26, 1);
-	width: 100%;
-	padding: 30rpx 0rpx;
-}
-
-.modeSetting {
-	display: flex;
-	flex-direction: row;
-	flex-wrap: wrap;
-	align-content: center;
-	align-items: center;
-	justify-content: flex-start;
-
-}
-
-.modeSetting .arrow {
-	display: flex;
-	flex-direction: column;
-	flex-wrap: nowrap;
-	align-content: center;
-	justify-content: center;
-	align-items: center;
-	width: calc(100% / 3);
-	margin-bottom: 25rpx;
-}
-
-.modeSetting .arrow .text {
-
-	color: rgba(255, 255, 255, 0.6);
-	font-family: PingFang SC;
-	font-size: 24rpx;
-	font-weight: 400;
-
-	letter-spacing: 0.14rpx;
-
-}
-
-.modeSetting .arrow.active .text {
-	color: rgba(35, 35, 35, 0.87);
-
-}
-
-.modeSetting .arrow .outCircle {
-	width: 130rpx;
-	height: 130rpx;
-	box-sizing: border-box;
-	display: flex;
-	flex-direction: row;
-	flex-wrap: nowrap;
-	align-content: center;
-	justify-content: center;
-	align-items: center;
-	border: 4rpx solid #00000000;
-	border-radius: 50%;
-	background: rgba(42, 42, 42, 1);
-}
-
-.modeSetting .arrow .item {
-	width: 100%;
-	height: 100%;
-
-	border-radius: 50%;
-
-
-	box-sizing: border-box;
-	display: flex;
-	flex-direction: row;
-	flex-wrap: nowrap;
-	align-content: center;
-	justify-content: center;
-	align-items: center;
-}
-
-.modeSetting .arrow.active .outCircle {
-	border: 4rpx solid rgba(174, 214, 0, 1);
-	padding: 4rpx;
-}
-
-.modeSetting .item.active .p100 {
-	background: rgba(174, 214, 0, 1);
-	border-radius: 50%;
-
-}
-
-.modeSetting .item .img {
-	width: 52rpx;
-	height: 56rpx;
-}
-
-.modeSetting .item .img.translate {
-	transform: rotate(180deg);
-}
-
-.modeSetting .arrow .activity {
-	display: none;
-}
-
-.modeSetting .arrow.active .nomal {
-	display: none;
-}
-
-.modeSetting .arrow.active .item {
-	background: rgba(174, 214, 0, 1);
-}
-
-.modeSetting .arrow.active .activity {
-	display: block !important;
-}
-
-.usrinfo .image {
-	width: 30rpx;
-	height: 40rpx;
-}
-
-.usrinfo .img {
-	width: 30rpx;
-	height: 40rpx;
-}
-
-.content {
-
-	box-sizing: border-box;
-	width: 100%;
-	min-height: 100vh;
-	height: auto;
-}
-
-.contentBg {
-	background-color: #121212;
-	color: #ffffffde;
-}
-
-.fleft {
-	float: left;
-}
-
-.fright {
-	float: right;
-}
-
-.clear {
-	clear: both;
-}
-
-.displayNone {
-	display: none !important;
-}
-
-.p100 {
-	width: 100%;
-	height: 100%;
-}
-
-.center {
-	display: flex;
-	flex-direction: row;
-	flex-wrap: nowrap;
-	align-content: center;
-	justify-content: center;
-	align-items: center;
-}
-
-.centerLeft {
-	display: flex;
-	flex-direction: row;
-	flex-wrap: nowrap;
-	align-content: center;
-	justify-content: flex-start;
-	align-items: center;
-}
-
-.warnnig {
-	border-radius: 16rpx;
-	width: 100%;
-	height: 70rpx;
-	line-height: 70rpx;
-	background: rgba(224, 52, 52, 1);
-	box-sizing: border-box;
-	padding: 0rpx 30rpx;
-	margin-top: 20rpx;
-	color: rgba(255, 255, 255, 0.87);
-	font-family: 'PingFang SC';
-	font-size: 28rpx;
-	font-weight: 400;
-	display: flex;
-	flex-direction: row;
-	flex-wrap: nowrap;
-	align-content: center;
-	justify-content: space-between;
-	align-items: center;
-}
-
-.netContent {
-	display: flex;
-	flex-direction: row;
-	flex-wrap: nowrap;
-	align-content: flex-end;
-	justify-content: space-around;
-	align-items: flex-end;
-	width: 50rpx;
-}
-
-
-.marginTop10 {
-	margin-top: 20rpx;
-}
-
-.warnnig {
-	border-radius: 16rpx;
-	width: 100%;
-	height: 70rpx;
-	line-height: 70rpx;
-	background: rgba(224, 52, 52, 1);
-	box-sizing: border-box;
-	padding: 0rpx 30rpx;
-	margin-top: 20rpx;
-	color: rgba(255, 255, 255, 0.87);
-	font-family: 'PingFang SC';
-	font-size: 28rpx;
-	font-weight: 400;
-	display: flex;
-	flex-direction: row;
-	flex-wrap: nowrap;
-	align-content: center;
-	justify-content: space-between;
-	align-items: center;
-}
-
-.sosContent {
-	width: 100%;
-	height: 110rpx;
-	display: flex;
-	flex-direction: row;
-	flex-wrap: nowrap;
-	align-content: center;
-	align-items: center;
-	justify-content: space-between;
-	box-sizing: border-box;
-	padding-top: 24rpx;
-}
-
-.btnSos {
-	border-radius: 92rpx;
-	height: 100%;
-	color: rgba(255, 255, 255, 0.87);
-	font-family: PingFang SC;
-	font-size: 28rpx;
-	font-weight: 400;
-	line-height: 110rpx;
-	letter-spacing: 0.014rpx;
-	text-align: center;
-
-}
-
-.openSos {
-	width: 62%;
-	background: #1a1a1a;
-	color: #e03434;
-	box-sizing: border-box;
-	border: 1rpx solid #e03434;
-}
-
-.openSos.active {
-	background: #e03434 !important;
-	color: rgba(255, 255, 255, 0.87) !important;
-}
-
-
-.closeSos {
-	width: 32%;
-	background: #1a1a1a;
-}
-
-.warn {
-	border-radius: 16rpx;
-	background: #1a1a1a;
-	width: 100%;
-	box-sizing: border-box;
-	margin-top: 25rpx;
-}
-
-.warn .header {
-	width: 100%;
-	box-sizing: border-box;
-	padding: 20rpx 25rpx;
-	display: flex;
-	flex-direction: row;
-	flex-wrap: nowrap;
-	align-content: center;
-	align-items: center;
-	justify-content: space-between;
-
-}
-
-.paddingTop0 {
-	padding: 0rpx 25rpx !important;
-}
-
-.line {
-	width: calc(100% - 50rpx);
-	height: 0rpx;
-	border-bottom: 1rpx solid rgba(255, 255, 255, 0.06);
-	margin: 30rpx 25rpx
-}
-
-.sliderTxt {
-	color: rgba(255, 255, 255, 0.6);
-
-	font-family: PingFang SC;
-	font-size: 24rpx;
-	font-weight: 400;
-
-	letter-spacing: 0.07px;
-
-}
-
-.sliderVal {
-	color: rgba(174, 214, 0, 1);
-
-	font-family: PingFang SC;
-	font-size: 24rpx;
-	font-weight: 400;
-
-	letter-spacing: 0.07px;
-
-}
-
-
-.navbarRight {
-	width: 40px;
-	height: 100%;
-
-}
-
-.navbarRight .imgContent {
-	width: 36rpx;
-	height: 36rpx;
-	position: relative;
-}
-
-.navbarRight .imgContent:first-child {
-
-	width: 38rpx !important;
-	height: 38rpx !important;
-	margin-top: -2rpx;
-}
-
-.navbarRight .imgContent .baber {
-	position: absolute;
-	z-index: 100;
-	width: 30rpx;
-	height: 30rpx;
-	line-height: 30rpx;
-	right: -15rpx;
-	top: -15rpx;
-	border-radius: 50%;
-	background: #f12828;
-	color: #ffffff;
-	font-family: 'PingFang SC';
-	font-style: Regular;
-	font-size: 20rpx;
-	font-weight: 400;
-
-	text-align: center;
-	overflow: hidden;
-	white-space: nowrap;
-
-}
-
-.navbarRight .imgContent .img {
-	width: 100%;
-	height: 100%;
-
-	box-sizing: border-box;
-	position: relative;
-}
-
-.navbarRight .imgContent .img:last-child {
-	padding: 1rpx;
-}
-
-.nvbar {
-	top: 0px;
-}
-
-/deep/ .uni-navbar--fixed {
-	top: 0px;
-}
-
-.uninavebartext {
-	width: 100%;
-	font-size: 32rpx;
-}
-
-.info-row {
-	display: flex;
-	justify-content: space-between;
-}
-
-.info-label {
-	font-size: 28rpx;
-	color: rgba(255, 255, 255, 0.87);
-	white-space: nowrap;
-}
-
-.info-value {
-	font-size: 28rpx;
-	color: rgba(255, 255, 255, 0.6);
-}
-
-.status-running {
-	/* color: rgba(255, 255, 255, 0.6); */
-	text-align: end;
-}
-
-.locationGPS {
-	width: 88%;
-	text-align: end;
-	float: right;
-	line-height: 45rpx;
-	font-size: 28rpx;
-}
+	.lamp {
+		margin-top: 24rpx;
+	}
+
+	.lamp .title {
+		width: 100%;
+		height: 60rpx;
+		line-height: 60rpx;
+		padding: 0rpx 28rpx;
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+		font-size: 28rpx;
+	}
+
+	.lamp.noPadding .title,
+	.lamp.noPadding .smlltitle {
+		padding: 0rpx 0rpx !important;
+	}
+
+	.lamp .smlltitle {
+		width: 100%;
+
+		line-height: 15rpx;
+		padding: 0rpx 28rpx;
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+		font-size: 26rpx;
+		color: rgba(255, 255, 255, 0.6);
+	}
+
+
+	.lamp .title .img {
+		width: 32rpx;
+		height: 32rpx;
+		margin-top: 20rpx;
+	}
+
+	.lampMode {
+
+		width: 100%;
+		box-sizing: border-box;
+
+	}
+
+	.lampMode .mode {
+		width: calc(calc(100% - 34rpx) / 2);
+		border-radius: 8px;
+		margin-top: 20rpx;
+		background: rgba(26, 26, 26, 1);
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		align-items: center;
+		justify-content: flex-start;
+		padding: 30rpx;
+		box-sizing: border-box;
+		border-width: 1px;
+		border-style: solid;
+		border-color: #00000000;
+	}
+
+	.lampMode .mode.active {
+
+		border-color: #aed600 !important;
+	}
+
+	.lampMode .mode.active .bigTxt {
+
+		color: #aed600 !important;
+	}
+
+	.mode.marginLeft {
+		margin-left: 34rpx !important;
+	}
+
+	.mode .leftImg {
+		width: 70rpx;
+		height: 70rpx;
+		border-radius: 4px;
+		background: rgba(255, 255, 255, 0.06);
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.mode.active .leftImg {
+		background: rgba(255, 255, 255, 0.06);
+	}
+
+	.mode .leftImg .img {
+		width: 40rpx;
+		height: 40rpx;
+	}
+
+	.mode .rightTxt {
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: flex-start;
+		justify-content: center;
+		align-items: flex-start;
+		padding-left: 20rpx;
+	}
+
+	.mode .bigTxt {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+
+	}
+
+	.mode .smallTxt {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+
+	}
+
+	.usrinfo {
+		border-radius: 8px;
+		width: 100%;
+		box-sizing: border-box;
+		padding: 24rpx 28rpx;
+		background: rgba(26, 26, 26, 1);
+	}
+
+	.usrtitle {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+		height: 40rpx;
+		line-height: 40rpx;
+		letter-spacing: 0.07px;
+
+	}
+
+	.usrinfo .btnSend {
+		line-height: 65rpx;
+		border-radius: 8px;
+		width: 120rpx;
+		height: 65rpx;
+		color: rgba(35, 35, 35, 0.87);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+		letter-spacing: 0.15rpx;
+		text-align: center;
+		background-color: #BBE600;
+	}
+
+	.usrinfo .item {
+		border-radius: 8px;
+		width: 100%;
+		box-sizing: border-box;
+		line-height: 90rpx;
+		height: 90rpx;
+		background: rgba(42, 42, 42, 1);
+		margin-top: 24rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: flex-start;
+		align-items: center;
+	}
+
+	.usrinfo .lbl {
+		width: 120rpx;
+		height: 100%;
+		padding-left: 24rpx;
+		box-sizing: border-box;
+
+		text-align: right;
+
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+
+	}
+
+	.usrinfo .value {
+		width: calc(100% - 120rpx);
+		height: 100%;
+
+		font-size: 28rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+		text-align: left;
+
+	}
+
+	.usrinfo .value .uni-input-input {
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+
+	}
+
+
+	.usrplace {
+		color: rgba(255, 255, 255, 0.4);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+		letter-spacing: 0.07px;
+		text-align: left;
+	}
+
+	.proinfo .itemcontent {
+		display: flex;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-evenly;
+	}
+
+	.proinfo .item {
+		width: 180rpx;
+		height: 180rpx;
+		box-sizing: border-box;
+		padding: 40rpx;
+		border-radius: 16rpx;
+		background: rgba(26, 26, 26, 1);
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.proinfo .item .img {
+		width: 50rpx;
+		height: 50rpx;
+	}
+
+	.proinfo .item .txt {
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+		margin-top: 20rpx;
+		letter-spacing: 0.07px;
+		text-align: left;
+	}
+
+	.slider-container {
+		padding: 0px;
+	}
+
+	.addIco {
+		width: 100%;
+		height: 360rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.icoContent {
+		width: 240rpx;
+		height: 240rpx;
+		border-radius: 8rpx;
+
+
+		background: rgba(58, 58, 58, 1);
+	}
+
+	.icoContent .img {
+		width: 70rpx;
+		height: 70rpx;
+	}
+
+	.arrowContent {
+		border-radius: 16rpx;
+		background: rgba(26, 26, 26, 1);
+		width: 100%;
+		padding: 30rpx 0rpx;
+	}
+
+	.modeSetting {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: wrap;
+		align-content: center;
+		align-items: center;
+		justify-content: flex-start;
+
+	}
+
+	.modeSetting .arrow {
+		display: flex;
+		flex-direction: column;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+		width: calc(100% / 3);
+		margin-bottom: 25rpx;
+	}
+
+	.modeSetting .arrow .text {
+
+		color: rgba(255, 255, 255, 0.6);
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.14rpx;
+
+	}
+
+	.modeSetting .arrow.active .text {
+		color: rgba(35, 35, 35, 0.87);
+
+	}
+
+	.modeSetting .arrow .outCircle {
+		width: 130rpx;
+		height: 130rpx;
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+		border: 4rpx solid #00000000;
+		border-radius: 50%;
+		background: rgba(42, 42, 42, 1);
+	}
+
+	.modeSetting .arrow .item {
+		width: 100%;
+		height: 100%;
+
+		border-radius: 50%;
+
+
+		box-sizing: border-box;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.modeSetting .arrow.active .outCircle {
+		border: 4rpx solid rgba(174, 214, 0, 1);
+		padding: 4rpx;
+	}
+
+	.modeSetting .item.active .p100 {
+		background: rgba(174, 214, 0, 1);
+		border-radius: 50%;
+
+	}
+
+	.modeSetting .item .img {
+		width: 52rpx;
+		height: 56rpx;
+	}
+
+	.modeSetting .item .img.translate {
+		transform: rotate(180deg);
+	}
+
+	.modeSetting .arrow .activity {
+		display: none;
+	}
+
+	.modeSetting .arrow.active .nomal {
+		display: none;
+	}
+
+	.modeSetting .arrow.active .item {
+		background: rgba(174, 214, 0, 1);
+	}
+
+	.modeSetting .arrow.active .activity {
+		display: block !important;
+	}
+
+	.usrinfo .image {
+		width: 30rpx;
+		height: 40rpx;
+	}
+
+	.usrinfo .img {
+		width: 30rpx;
+		height: 40rpx;
+	}
+
+	.content {
+
+		box-sizing: border-box;
+		width: 100%;
+		min-height: 100vh;
+		height: auto;
+	}
+
+	.contentBg {
+		background-color: #121212;
+		color: #ffffffde;
+	}
+
+	.fleft {
+		float: left;
+	}
+
+	.fright {
+		float: right;
+	}
+
+	.clear {
+		clear: both;
+	}
+
+	.displayNone {
+		display: none !important;
+	}
+
+	.p100 {
+		width: 100%;
+		height: 100%;
+	}
+
+	.center {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.centerLeft {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: flex-start;
+		align-items: center;
+	}
+
+	.warnnig {
+		border-radius: 16rpx;
+		width: 100%;
+		height: 70rpx;
+		line-height: 70rpx;
+		background: rgba(224, 52, 52, 1);
+		box-sizing: border-box;
+		padding: 0rpx 30rpx;
+		margin-top: 20rpx;
+		color: rgba(255, 255, 255, 0.87);
+		font-family: 'PingFang SC';
+		font-size: 28rpx;
+		font-weight: 400;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.netContent {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: flex-end;
+		justify-content: space-around;
+		align-items: flex-end;
+		width: 50rpx;
+	}
+
+
+	.marginTop10 {
+		margin-top: 20rpx;
+	}
+
+	.warnnig {
+		border-radius: 16rpx;
+		width: 100%;
+		height: 70rpx;
+		line-height: 70rpx;
+		background: rgba(224, 52, 52, 1);
+		box-sizing: border-box;
+		padding: 0rpx 30rpx;
+		margin-top: 20rpx;
+		color: rgba(255, 255, 255, 0.87);
+		font-family: 'PingFang SC';
+		font-size: 28rpx;
+		font-weight: 400;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		justify-content: space-between;
+		align-items: center;
+	}
+
+	.sosContent {
+		width: 100%;
+		height: 110rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		align-items: center;
+		justify-content: space-between;
+		box-sizing: border-box;
+		padding-top: 24rpx;
+	}
+
+	.btnSos {
+		border-radius: 92rpx;
+		height: 100%;
+		color: rgba(255, 255, 255, 0.87);
+		font-family: PingFang SC;
+		font-size: 28rpx;
+		font-weight: 400;
+		line-height: 110rpx;
+		letter-spacing: 0.014rpx;
+		text-align: center;
+
+	}
+
+	.openSos {
+		width: 62%;
+		background: #1a1a1a;
+		color: #e03434;
+		box-sizing: border-box;
+		border: 1rpx solid #e03434;
+	}
+
+	.openSos.active {
+		background: #e03434 !important;
+		color: rgba(255, 255, 255, 0.87) !important;
+	}
+
+
+	.closeSos {
+		width: 32%;
+		background: #1a1a1a;
+	}
+
+	.warn {
+		border-radius: 16rpx;
+		background: #1a1a1a;
+		width: 100%;
+		box-sizing: border-box;
+		margin-top: 25rpx;
+	}
+
+	.warn .header {
+		width: 100%;
+		box-sizing: border-box;
+		padding: 20rpx 25rpx;
+		display: flex;
+		flex-direction: row;
+		flex-wrap: nowrap;
+		align-content: center;
+		align-items: center;
+		justify-content: space-between;
+
+	}
+
+	.paddingTop0 {
+		padding: 0rpx 25rpx !important;
+	}
+
+	.line {
+		width: calc(100% - 50rpx);
+		height: 0rpx;
+		border-bottom: 1rpx solid rgba(255, 255, 255, 0.06);
+		margin: 30rpx 25rpx
+	}
+
+	.sliderTxt {
+		color: rgba(255, 255, 255, 0.6);
+
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+
+	}
+
+	.sliderVal {
+		color: rgba(174, 214, 0, 1);
+
+		font-family: PingFang SC;
+		font-size: 24rpx;
+		font-weight: 400;
+
+		letter-spacing: 0.07px;
+
+	}
+
+
+	.navbarRight {
+		width: 40px;
+		height: 100%;
+
+	}
+
+	.navbarRight .imgContent {
+		width: 36rpx;
+		height: 36rpx;
+		position: relative;
+	}
+
+	.navbarRight .imgContent:first-child {
+
+		width: 38rpx !important;
+		height: 38rpx !important;
+		margin-top: -2rpx;
+	}
+
+	.navbarRight .imgContent .baber {
+		position: absolute;
+		z-index: 100;
+		width: 30rpx;
+		height: 30rpx;
+		line-height: 30rpx;
+		right: -15rpx;
+		top: -15rpx;
+		border-radius: 50%;
+		background: #f12828;
+		color: #ffffff;
+		font-family: 'PingFang SC';
+		font-style: Regular;
+		font-size: 20rpx;
+		font-weight: 400;
+
+		text-align: center;
+		overflow: hidden;
+		white-space: nowrap;
+
+	}
+
+	.navbarRight .imgContent .img {
+		width: 100%;
+		height: 100%;
+
+		box-sizing: border-box;
+		position: relative;
+	}
+
+	.navbarRight .imgContent .img:last-child {
+		padding: 1rpx;
+	}
+
+	.nvbar {
+		top: 0px;
+	}
+
+	/deep/ .uni-navbar--fixed {
+		top: 0px;
+	}
+
+	.uninavebartext {
+		width: 100%;
+		font-size: 32rpx;
+	}
+
+	.info-row {
+		display: flex;
+		justify-content: space-between;
+	}
+
+	.info-label {
+		font-size: 28rpx;
+		color: rgba(255, 255, 255, 0.87);
+		white-space: nowrap;
+	}
+
+	.info-value {
+		font-size: 28rpx;
+		color: rgba(255, 255, 255, 0.6);
+	}
+
+	.status-running {
+		/* color: rgba(255, 255, 255, 0.6); */
+		text-align: end;
+	}
+
+	.locationGPS {
+		width: 88%;
+		text-align: end;
+		float: right;
+		line-height: 45rpx;
+		font-size: 28rpx;
+	}
 </style>
\ No newline at end of file
diff --git a/pages/common/index/index.vue b/pages/common/index/index.vue
index 7c19474..e706aba 100644
--- a/pages/common/index/index.vue
+++ b/pages/common/index/index.vue
@@ -40,15 +40,15 @@
 										<view class="device-name">
 											<view>设备:{{item.deviceName}}</view>
 											<view class="ID">
-												<view class="ID" v-if="item.communicationMode==0">ID:{{item.deviceImei}}
+												<view class="ID" v-if="item.communicationMode==0 || item.communicationMode==2">ID:{{item.deviceImei}}
 												</view>
 												<view class="ID" v-else>ID:{{item.deviceMac}}</view>
 												<!-- 在线状态 -->
 												<view class="onlines"
-													v-if="item.communicationMode==0 && item.onlineStatus==1">在线</view>
+													v-if="item.onlineStatus==1">在线</view>
 												<!-- 离线状态 -->
 												<view class="offlines"
-													v-if="item.communicationMode==0 && item.onlineStatus==0">离线</view>
+													v-if="item.onlineStatus==0">离线</view>
 												<view>电量：{{item.battery || '0'}}%</view>
 											</view>
 										</view>
@@ -386,7 +386,7 @@ import BleReceive from '@/utils/BleReceive';
 					if (res.code == 200) {
 						//console.log("deviceTypeList=" + JSON.stringify(res.data));
 						this.tabs = [{
-								id: '',
+								id: '',         
 								name: '全部设备',
 								typeName: '全部设备'
 							},
@@ -405,9 +405,6 @@ import BleReceive from '@/utils/BleReceive';
 				this.deviceList = [];
 				this.activeTab = index;
 				this.activeTabInfo = tab
-
-
-
 				this.downCallback();
 			},
 			// 获取设备列表