调整优先级
This commit is contained in:
@@ -206,8 +206,8 @@ watch(() => formContent.chnNum, async (newVal, oldVal) => {
|
|||||||
scriptType,
|
scriptType,
|
||||||
code: parseInt(checkStore.planCode)
|
code: parseInt(checkStore.planCode)
|
||||||
})
|
})
|
||||||
updateTreeFly(resTreeDataTemp, 2)
|
|
||||||
updateTreeFly(resTreeDataTemp, 4)
|
updateTreeFly(resTreeDataTemp, 4)
|
||||||
|
updateTreeFly(resTreeDataTemp, 2)
|
||||||
|
|
||||||
Object.assign(treeDataAll, resTreeDataTemp)
|
Object.assign(treeDataAll, resTreeDataTemp)
|
||||||
|
|
||||||
|
|||||||
@@ -247,12 +247,12 @@ const checkResultView: ComputedRef<CheckData.ScriptChnViewItem[]> = computed(()
|
|||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
let tempChnResult: CheckData.ChnCheckResultEnum = device.chnResult[0]
|
let tempChnResult: CheckData.ChnCheckResultEnum = device.chnResult[0]
|
||||||
if (device.chnResult.some(item => item == CheckData.ChnCheckResultEnum.FAIL)) {
|
|
||||||
tempChnResult = CheckData.ChnCheckResultEnum.FAIL
|
|
||||||
}
|
|
||||||
if (device.chnResult.some(item => item == CheckData.ChnCheckResultEnum.ERRORDATA)) {
|
if (device.chnResult.some(item => item == CheckData.ChnCheckResultEnum.ERRORDATA)) {
|
||||||
tempChnResult = CheckData.ChnCheckResultEnum.ERRORDATA
|
tempChnResult = CheckData.ChnCheckResultEnum.ERRORDATA
|
||||||
}
|
}
|
||||||
|
if (device.chnResult.some(item => item == CheckData.ChnCheckResultEnum.FAIL)) {
|
||||||
|
tempChnResult = CheckData.ChnCheckResultEnum.FAIL
|
||||||
|
}
|
||||||
if (device.chnResult.some(item => item == CheckData.ChnCheckResultEnum.TIMEOUT)) {
|
if (device.chnResult.some(item => item == CheckData.ChnCheckResultEnum.TIMEOUT)) {
|
||||||
tempChnResult = CheckData.ChnCheckResultEnum.TIMEOUT
|
tempChnResult = CheckData.ChnCheckResultEnum.TIMEOUT
|
||||||
}
|
}
|
||||||
@@ -832,6 +832,9 @@ const setErrorCheckItem = (scriptType: string, devices: CheckData.DeviceCheckRes
|
|||||||
tempChnResult.push(...devices[i].chnResult)
|
tempChnResult.push(...devices[i].chnResult)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.ERRORDATA)) {
|
||||||
|
type = CheckData.ChnCheckResultEnum.ERRORDATA
|
||||||
|
}
|
||||||
if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.FAIL)) {
|
if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.FAIL)) {
|
||||||
type = CheckData.ChnCheckResultEnum.FAIL
|
type = CheckData.ChnCheckResultEnum.FAIL
|
||||||
}
|
}
|
||||||
@@ -846,9 +849,6 @@ const setErrorCheckItem = (scriptType: string, devices: CheckData.DeviceCheckRes
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (tempChnResult.some(item => item === CheckData.ChnCheckResultEnum.ERRORDATA)) {
|
|
||||||
type = CheckData.ChnCheckResultEnum.ERRORDATA
|
|
||||||
}
|
|
||||||
|
|
||||||
errorCheckItem.push({scriptType, type: type})
|
errorCheckItem.push({scriptType, type: type})
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user