diff --git a/src/components/content/fanInfo/FanInfo.vue b/src/components/content/fanInfo/FanInfo.vue index fdbc239..2af414b 100644 --- a/src/components/content/fanInfo/FanInfo.vue +++ b/src/components/content/fanInfo/FanInfo.vue @@ -21,14 +21,14 @@
启动
停止 @@ -37,9 +37,13 @@
- - 自动 - 手动 + + + + + + 自动 + 手动
@@ -197,22 +201,22 @@ watch(() => props.fanData, (now) => { watch(() => props.list, (now) => { socketData.value?.forEach(item => { now.forEach(newItem => { - if (item.equipmentId === newItem.equipmentId) { - if (newItem.hasOwnProperty('frequencyFeedback')) { - item.frequencySetting = newItem.frequencySetting - item.frequencyFeedback = newItem.frequencyFeedback - } else if (newItem.hasOwnProperty('running')) { - item.running = newItem.running - item.breakdown = newItem.breakdown - item.autoMode = newItem.autoMode - } + if (item.equipmentId === newItem.equipmentId) { + if (newItem.hasOwnProperty('frequencyFeedback')) { + item.frequencySetting = newItem.frequencySetting + item.frequencyFeedback = newItem.frequencyFeedback + } else if (newItem.hasOwnProperty('running')) { + item.running = newItem.running + item.breakdown = newItem.breakdown + item.autoMode = newItem.autoMode + } } }) }) transducerData.value.forEach(item => { now.forEach(newItem => { if (item.equipmentId === newItem.equipmentId) { - if (newItem.hasOwnProperty('phaseCurrentA')) { + if (newItem.hasOwnProperty('phaseCurrentA')) { item.valueA = newItem.phaseCurrentA item.valueB = newItem.phaseCurrentB item.valueC = newItem.phaseCurrentC @@ -366,9 +370,7 @@ const editOperate = (item, flag, type) => { ElMessage.error(res.msg) } }) - }).catch(() => { - item.running = !item.running - }); + }) } const changeFrequency = (item) => { @@ -384,13 +386,11 @@ const changeFrequency = (item) => { ElMessage.warning(res.msg) } }) - }).catch(() => { - // item.running=!item.running - }); + }) } -const changeModel = (item) => { +const changeModel = (item,type) => { let flag - if (item.autoMode) { + if (type) { flag = '自动' } else { flag = '手动' @@ -405,9 +405,9 @@ const changeModel = (item) => { type: 'warning', closeOnClickModal: false }).then(() => { - const data = { + const data = { number: number, - state: item.autoMode?1:0, + state: type ? 1 : 0, tunnelId: props.tunnelId, } editFrequencyModelSwitch(data).then(res => { @@ -417,9 +417,7 @@ const changeModel = (item) => { ElMessage.warning(res.msg) } }) - }).catch(() => { - item.autoMode = !item.autoMode - }); + }) } const getFanInfo = (equipmentId, type = 'day', time = '', flag, startTime, endTime) => { showLoading.value = true