fix : 修复bug

This commit is contained in:
2024-03-14 17:49:16 +08:00
parent e020ae5b66
commit 3062cf263d
3 changed files with 75 additions and 50 deletions

View File

@@ -22,17 +22,16 @@
<div
id="auto"
:class="{ active: item.running }"
@click="item.running = true;editOperate(item,true,'启动')"
>
启动
</div>
<div
id="stop"
:class="{ active: !item.running }"
@click="item.running = false;editOperate(item,false,'停止')"
>
停止
</div>
<!-- @click="item.running = false;editOperate(item,false,'停止')"-->
</div>
</div>
<div class="power">
@@ -197,21 +196,22 @@ watch(() => props.fanData, (now) => {
watch(() => props.list, (now) => {
socketData.value?.forEach(item => {
now.forEach(newItem => {
if (item.equipmentId === newItem.equipmentId) {
if (newItem.frequencyFeedback) {
item.frequencySetting = newItem.frequencySetting
item.frequencyFeedback = newItem.frequencyFeedback
}
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.frequencyFeedback) {
item.frequencySetting = newItem.frequencySetting
item.frequencyFeedback = newItem.frequencyFeedback
} else if (newItem.phaseCurrentA) {
if (newItem.hasOwnProperty('phaseCurrentA')) {
item.valueA = newItem.phaseCurrentA
item.valueB = newItem.phaseCurrentB
item.valueC = newItem.phaseCurrentC
@@ -353,21 +353,21 @@ const packageData = (item, type, flag) => {
}
//启动/停止
const editOperate = (item, flag, type) => {
ElMessageBox.confirm(`确认${type}${changeNum(item)}号风机吗?`, '系统提示', {
type: 'warning',
closeOnClickModal: false
}).then(() => {
const data = packageData(item, flag)
editFrequencyOperationSwitch(data).then(res => {
if (res.code === 1000) {
ElMessage.success(res.msg)
} else {
ElMessage.error(res.msg)
}
})
}).catch(() => {
item.running = !item.running
});
// ElMessageBox.confirm(`确认${type}${changeNum(item)}号风机吗?`, '系统提示', {
// type: 'warning',
// closeOnClickModal: false
// }).then(() => {
// const data = packageData(item, flag)
// editFrequencyOperationSwitch(data).then(res => {
// if (res.code === 1000) {
// ElMessage.success(res.msg)
// } else {
// ElMessage.error(res.msg)
// }
// })
// }).catch(() => {
// item.running = !item.running
// });
}
const changeFrequency = (item) => {
@@ -394,11 +394,21 @@ const changeModel = (item) => {
} else {
flag = '手动'
}
let number = 0
if (item.equipmentType === "frequency1") {
number = 1
} else if (item.equipmentType === "frequency2") {
number = 2
}
ElMessageBox.confirm(`确认修改${changeNum(item)}号风机的模式为${flag}模式吗?`, '系统提示', {
type: 'warning',
closeOnClickModal: false
}).then(() => {
const data = packageData(item, item.autoMode)
const data = {
number: number,
state: item.autoMode?1:0,
tunnelId: props.tunnelId,
}
editFrequencyModelSwitch(data).then(res => {
if (res.code === 1000) {
ElMessage.success(res.msg)
@@ -1040,7 +1050,7 @@ input[type="number"] {
& > div {
flex: 1;
text-align: center;
cursor: pointer;
//cursor: pointer;
}
}
}