From 35d6574754517270f1f8d2f5ba3a2fc5bc46aa42 Mon Sep 17 00:00:00 2001
From: fengerli <528575642@qq.com>
Date: Fri, 27 Mar 2026 13:40:13 +0800
Subject: [PATCH] 1
---
pages/100J/HBY100-J.vue | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/pages/100J/HBY100-J.vue b/pages/100J/HBY100-J.vue
index c59cb4d..d57d905 100644
--- a/pages/100J/HBY100-J.vue
+++ b/pages/100J/HBY100-J.vue
@@ -64,7 +64,7 @@
{{ deviceInfo && deviceInfo.longitude ? Number(deviceInfo.longitude).toFixed(4) : '' }}
{{ deviceInfo && deviceInfo.latitude ? Number(deviceInfo.latitude).toFixed(4) : '' }}
-
+
@@ -607,7 +607,8 @@
// 开启状
these.deviceInfo.voiceStrobeAlarm = 1;
these.formData.sta_VoiceType = mode_alarm + ''
- } else if (mode_alarm == 7) {
+ // 强制报警中,自定义语音,解除报警时,状态需要改变成未播放的状态的
+ } else if (mode_alarm == 7 && enable_alarm == 0) {
these.formData.sta_VoiceType !== 7
} else {
// 关闭状态：赋值-1，表示关闭
@@ -1079,7 +1080,10 @@
});
}
}).catch(() => {
- uni.showToast({ title: '下发失败，请检查蓝牙或网络', icon: 'none' });
+ uni.showToast({
+ title: '下发失败，请检查蓝牙或网络',
+ icon: 'none'
+ });
});
} else if (prevVoiceType === '7' && val !== '7' && val !== '-1') {
// 从「播放语音」切到其它内置音色：先关播报；报警未开启时不走 forceAlarm，仅 UI 预选音色
@@ -1090,7 +1094,10 @@
};
deviceVoiceBroadcast(data).then((res) => {
if (res.code == 200) {
- uni.showToast({ title: res.msg || '已切换', icon: 'none' });
+ uni.showToast({
+ title: res.msg || '已切换',
+ icon: 'none'
+ });
} else {
uni.showToast({
title: res.msg || '操作失败',