优化100J问题

This commit is contained in:
微微一笑
2026-03-27 18:07:59 +08:00
parent 35d6574754
commit b6ce2dbe25
2 changed files with 22 additions and 5 deletions

View File

@ -1065,7 +1065,8 @@
const data = {
deviceId: this.deviceInfo.deviceId,
voiceBroadcast: Number(this.formData.sta_VoiceType) === -1 ? 0 : 1,
mode: this.formData.sta_VoiceType
mode: this.formData.sta_VoiceType,
voiceStrobeAlarm: this.deviceInfo.voiceStrobeAlarm
};
deviceVoiceBroadcast(data).then((res) => {
if (res.code == 200) {
@ -1090,7 +1091,8 @@
const data = {
deviceId: this.deviceInfo.deviceId,
voiceBroadcast: 0,
mode: val
mode: val,
voiceStrobeAlarm: this.deviceInfo.voiceStrobeAlarm
};
deviceVoiceBroadcast(data).then((res) => {
if (res.code == 200) {
@ -1118,6 +1120,15 @@
console.log(this.deviceInfo, '44444');
console.log(item, 'tent');
const isClose = item === 0;
// 与「已解除不再重复关报警」对称:已在报警中不再弹窗重复下发「开启」,未报警时不再重复「解除」
if (!isClose && this.deviceInfo.voiceStrobeAlarm === 1) {
uni.showToast({ title: '当前已在报警中', icon: 'none' });
return;
}
if (isClose && this.deviceInfo.voiceStrobeAlarm !== 1) {
uni.showToast({ title: '当前未在报警中', icon: 'none' });
return;
}
if (!this.Status) this.Status = {};
if (!this.Status.Pop) this.Status.Pop = {
showPop: false