Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -548,7 +548,7 @@ watch(
|
||||
|
||||
// 设置闪变项目为LOADING状态
|
||||
const flickerResultItem = checkResult.find(item => item.code === 'F')
|
||||
console.log('flickerResultItem', flickerResultItem)
|
||||
|
||||
if (flickerResultItem) {
|
||||
flickerResultItem.devices.forEach(device => {
|
||||
device.chnResult.fill(CheckData.ChnCheckResultEnum.LOADING)
|
||||
@@ -563,8 +563,7 @@ watch(
|
||||
scriptName: item.scriptName,
|
||||
devices: []
|
||||
}
|
||||
console.log('item', item)
|
||||
console.log('newValue.code', newValue.code)
|
||||
|
||||
// 特殊处理录波项目 - 如果是25005消息且当前项目是录波项目,则使用已设置的状态
|
||||
if ((newValue.code == 25005 || newValue.code == 25006) && item.code === 'wave_data') {
|
||||
|
||||
@@ -574,15 +573,15 @@ watch(
|
||||
}
|
||||
} // 特殊处理闪变项目 - 如果是25007消息且当前项目是闪变项目,则使用已设置的状态
|
||||
else if (newValue.code == 25007 && item.code === 'F') {
|
||||
console.log('flicker',checkResult)
|
||||
|
||||
const existingFlickerItem = checkResult.find(checkItem => checkItem.scriptName === '闪变')
|
||||
console.log('existingFlickerItem', existingFlickerItem)
|
||||
|
||||
if (existingFlickerItem) {
|
||||
temp.devices = [...existingFlickerItem.devices] // 保留已设置的devices
|
||||
}
|
||||
}
|
||||
else {
|
||||
console.log('else')
|
||||
|
||||
// 找到message中所有scriptName与当前item.code匹配的项
|
||||
const matchedDevices = message
|
||||
.filter((msg: any) => msg.scriptName === item.code)
|
||||
@@ -756,7 +755,7 @@ const initScriptData = async () => {
|
||||
// 保存脚本数据并设置总数
|
||||
scriptData.push(...temp)
|
||||
checkTotal = scriptData.length
|
||||
console.log('shul',checkTotal)
|
||||
|
||||
}
|
||||
// 初始化设备列表
|
||||
const initDeviceList = () => {
|
||||
|
||||
Reference in New Issue
Block a user