语音播放,强制报警模式修改

This commit is contained in:
fengerli
2026-02-27 18:49:23 +08:00
parent 8fab54032b
commit e6e8e83796

View File

@ -649,7 +649,6 @@
}, },
// 语音管理 // 语音管理
audioManager(item) { audioManager(item) {
this.formData.sta_VoiceType = -1
if (this.Status.apiType !== 'listA') { } if (this.Status.apiType !== 'listA') { }
uni.navigateTo({ uni.navigateTo({
url: '/pages/100J/audioManager/AudioList', url: '/pages/100J/audioManager/AudioList',
@ -784,7 +783,6 @@
// 警示灯开关闭 // 警示灯开关闭
lightTypeSet(item, index) { lightTypeSet(item, index) {
console.log('走了么'); console.log('走了么');
let val = item.key; let val = item.key;
// 切换选中/取消选中逻辑 // 切换选中/取消选中逻辑
if (this.formData.sta_LightType === val) { if (this.formData.sta_LightType === val) {
@ -831,7 +829,9 @@
this.formData.sta_VoiceType = val; this.formData.sta_VoiceType = val;
// 模式类型为7时才去判断 // 模式类型为7时才去判断
console.log(val, 'valllll'); console.log(val, 'valllll');
if (val === '7' || val === '-1') { const voiceStrobeAlarm = this.deviceInfo?.voiceStrobeAlarm ?? 0; // 兜底0避免undefined
const isVoiceOperate = val === '7' || val === '-1'; // 标记是否是语音开启/关闭操作
if (voiceStrobeAlarm === 0 && isVoiceOperate) {
let data = { let data = {
deviceId: this.deviceInfo.deviceId, deviceId: this.deviceInfo.deviceId,
voiceBroadcast: Number(this.formData.sta_VoiceType) === -1 ? 0 : 1 voiceBroadcast: Number(this.formData.sta_VoiceType) === -1 ? 0 : 1
@ -908,6 +908,9 @@
title: isClose ? '声光报警已解除' : '强制报警已开启', title: isClose ? '声光报警已解除' : '强制报警已开启',
icon: 'none' icon: 'none'
}); });
if (isClose && this.formData.sta_VoiceType === '7') {
this.formData.sta_VoiceType = '-1';
}
} else { } else {
uni.showToast({ uni.showToast({
title: res.msg, title: res.msg,
@ -1421,8 +1424,6 @@
.proinfo .item .img { .proinfo .item .img {
width: 50rpx; width: 50rpx;
height: 50rpx; height: 50rpx;
} }
.proinfo .item .txt { .proinfo .item .txt {
@ -1435,14 +1436,10 @@
text-align: left; text-align: left;
} }
.slider-container { .slider-container {
padding: 0px; padding: 0px;
} }
.addIco { .addIco {
width: 100%; width: 100%;
height: 360rpx; height: 360rpx;