Merge branch 'main' of http://47.107.152.87:3000/dyf/APP

pages/100J/HBY100-J.vue

@@ -794,6 +794,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 @@
 					const data = {
 						deviceIds: [this.deviceInfo.deviceId],
 						voiceStrobeAlarm: 1,
-						mode: this.formData.sta_VoiceType
+						mode: item.key
 					};
 					deviceForceAlarmActivation(data).then((res) => {
 						if (res.code === 200) {
@@ -1056,7 +1064,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) => {