微调
This commit is contained in:
@@ -292,7 +292,7 @@ const updateTableData = async () => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let resCheckResult: CheckData.ResCheckResult = {}
|
let resCheckResult: CheckData.ResCheckResult = {}
|
||||||
let resRawData: CheckData.RawDataItem = {}
|
let resRawData: CheckData.RawDataItem[] = []
|
||||||
|
|
||||||
if (keys1.length === 1) {
|
if (keys1.length === 1) {
|
||||||
resCheckResult = resTableData.resultData.get(keys1[0])
|
resCheckResult = resTableData.resultData.get(keys1[0])
|
||||||
@@ -300,40 +300,41 @@ const updateTableData = async () => {
|
|||||||
Object.assign(harmNumList, [])
|
Object.assign(harmNumList, [])
|
||||||
currentHarmNum.value = '-1'
|
currentHarmNum.value = '-1'
|
||||||
|
|
||||||
|
resRawData = (resRawData == null || resRawData == undefined ? [] : resRawData)
|
||||||
|
resCheckResult = (resCheckResult == null || resCheckResult == undefined ? {} : resCheckResult)
|
||||||
setCheckResultData(resCheckResult)
|
setCheckResultData(resCheckResult)
|
||||||
setRawData(resRawData)
|
setRawData(resRawData)
|
||||||
} else {
|
} else if (resTableData.resultData.get('电压幅值') || resTableData.resultData.get('持续时间')) {
|
||||||
if (resTableData.resultData.get('电压幅值') || resTableData.resultData.get('持续时间')) {
|
let tempCheckList = []
|
||||||
let tempCheckList = []
|
if (resTableData.resultData.get('电压幅值')) {
|
||||||
if (resTableData.resultData.get('电压幅值')) {
|
tempCheckList.push({value: 'Voltage', label: '电压幅值'})
|
||||||
tempCheckList.push({value: 'Voltage', label: '电压幅值'})
|
//resCheckResult = resTableData.resultData.get('电压幅值')
|
||||||
//resCheckResult = resTableData.resultData.get('电压幅值')
|
}
|
||||||
}
|
if (resTableData.resultData.get('持续时间')) {
|
||||||
if (resTableData.resultData.get('持续时间')) {
|
tempCheckList.push({value: 'Duration', label: '持续时间'})
|
||||||
tempCheckList.push({value: 'Duration', label: '持续时间'})
|
//resCheckResult = resTableData.resultData.get('持续时间')
|
||||||
//resCheckResult = resTableData.resultData.get('持续时间')
|
|
||||||
}
|
|
||||||
|
|
||||||
Object.assign(checkList, tempCheckList)
|
|
||||||
currentCheckItem.value = checkList[0].value
|
|
||||||
|
|
||||||
Object.assign(harmNumList, [])
|
|
||||||
currentHarmNum.value = '-1'
|
|
||||||
|
|
||||||
//setCheckResultData(resCheckResult)
|
|
||||||
} else if (keys1.length != 0) {
|
|
||||||
let tempHarmNumList: { value: string, label: string }[] = []
|
|
||||||
for (let [key, value] of resTableData.resultData) {
|
|
||||||
tempHarmNumList.push({value: key, label: key})
|
|
||||||
}
|
|
||||||
|
|
||||||
Object.assign(harmNumList, tempHarmNumList)
|
|
||||||
currentHarmNum.value = harmNumList.length > 0 ? harmNumList[0].value : '-1'
|
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// setCheckResultData(resCheckResult)
|
Object.assign(checkList, tempCheckList)
|
||||||
} else {
|
currentCheckItem.value = checkList[0].value
|
||||||
|
|
||||||
|
Object.assign(harmNumList, [])
|
||||||
|
currentHarmNum.value = '-1'
|
||||||
|
|
||||||
|
//setCheckResultData(resCheckResult)
|
||||||
|
} else if (keys1.length != 0) {
|
||||||
|
let tempHarmNumList: { value: string, label: string }[] = []
|
||||||
|
for (let [key, value] of resTableData.resultData) {
|
||||||
|
tempHarmNumList.push({value: key, label: key})
|
||||||
|
}
|
||||||
|
|
||||||
|
Object.assign(harmNumList, tempHarmNumList)
|
||||||
|
currentHarmNum.value = harmNumList.length > 0 ? harmNumList[0].value : '-1'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// setCheckResultData(resCheckResult)
|
||||||
|
else {
|
||||||
checkResultData.length = 0
|
checkResultData.length = 0
|
||||||
rawTableData.length = 0
|
rawTableData.length = 0
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user