dyf/APP
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'main' into new-20250827

Browse Source
This commit is contained in:
liubiao
2026-04-07 11:29:02 +08:00
parent bb49564646 f67bad8895
commit e94dfd6fe5
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pages/100J/HBY100-J.vue
View File

@ -809,6 +809,14 @@
that.formData.strobeFrequency = that.normalizeStrobeFreq(that.formData.strobeFrequency);
that.deviceInfo = res.data;
that.$nextTick(() => that.sync100JBleUiFromHelper && that.sync100JBleUiFromHelper());
// 语音频闪报警：0=关闭，1=开启 ui7是播放的状态
const voiceBroadcast = res.data.voiceBroadcast;
if (voiceBroadcast === 1) {
console.log('wo shi shui ');
that.formData.sta_VoiceType = '7'
} else {
that.formData.sta_VoiceType = '-1'
}
const strobeEnable = res.data.strobeEnable ?? 0; // 0=关闭，1=开启
const strobeMode = res.data.strobeMode ?? 0; // 0=红闪、1=蓝闪、3=红色顺时针...
if (strobeEnable === 1) {
@ -1037,7 +1045,7 @@
openVolume(item, index) {
if (!item) {
item = this.dic.sta_VoiceType[index];
}
}
let val = item.key;
const prevVoiceType = this.formData.sta_VoiceType;
if (this.formData.sta_VoiceType === val) {
@ -1052,7 +1060,7 @@
const data = {
deviceIds: [this.deviceInfo.deviceId],
voiceStrobeAlarm: 1,
mode: this.formData.sta_VoiceType
mode: item.key
};
deviceForceAlarmActivation(data).then((res) => {
if (res.code === 200) {
@ -1071,7 +1079,7 @@
const data = {
deviceId: this.deviceInfo.deviceId,
voiceBroadcast: Number(this.formData.sta_VoiceType) === -1 ? 0 : 1,
mode: this.formData.sta_VoiceType,
mode: item.key,
voiceStrobeAlarm: this.deviceInfo.voiceStrobeAlarm
};
deviceVoiceBroadcast(data).then((res) => {