放开数据异常按钮弹窗
This commit is contained in:
@@ -418,17 +418,17 @@ watch(webMsgSend, function (newValue, oldValue) {
|
|||||||
emit('update:testStatus', 'paused')
|
emit('update:testStatus', 'paused')
|
||||||
handlePauseTest()
|
handlePauseTest()
|
||||||
break;
|
break;
|
||||||
// case 'Pause_Fail':
|
// case 'Pause_Fail':
|
||||||
// ElMessage.error('暂停失败')
|
// ElMessage.error('暂停失败')
|
||||||
// break;
|
// break;
|
||||||
case 'Resume_Success':
|
case 'Resume_Success':
|
||||||
ElMessage.success('开始继续检测')
|
ElMessage.success('开始继续检测')
|
||||||
emit('update:testStatus', 'process')
|
emit('update:testStatus', 'process')
|
||||||
handleResumeTest()
|
handleResumeTest()
|
||||||
break;
|
break;
|
||||||
// case 'Resume_Fail':
|
// case 'Resume_Fail':
|
||||||
// ElMessage.error('无法继续检测')
|
// ElMessage.error('无法继续检测')
|
||||||
// break;
|
// break;
|
||||||
case 'FREQ_Start':
|
case 'FREQ_Start':
|
||||||
activeIndex = getActiveIndex('FREQ')
|
activeIndex = getActiveIndex('FREQ')
|
||||||
updateCheckResultView("FREQ", true)
|
updateCheckResultView("FREQ", true)
|
||||||
@@ -701,8 +701,8 @@ const updateCheckResult = (data: CheckData.ScriptChnItem) => {
|
|||||||
checkResult.forEach(item => {
|
checkResult.forEach(item => {
|
||||||
if (item.scriptType == scriptType) {
|
if (item.scriptType == scriptType) {
|
||||||
item.devices.forEach((device, index) => {
|
item.devices.forEach((device, index) => {
|
||||||
let targetDevice = data.devices.find(dev=>dev.deviceId === device.deviceId)
|
let targetDevice = data.devices.find(dev => dev.deviceId === device.deviceId)
|
||||||
if(targetDevice!== undefined){
|
if (targetDevice !== undefined) {
|
||||||
device.chnResult = [...targetDevice.chnResult]
|
device.chnResult = [...targetDevice.chnResult]
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
@@ -858,21 +858,21 @@ function getErrorCheckItem(scriptType: string) {
|
|||||||
const updateCheckResultView = (scriptCode: string, isStart: boolean, devices: CheckData.DeviceCheckResult[] = []) => {
|
const updateCheckResultView = (scriptCode: string, isStart: boolean, devices: CheckData.DeviceCheckResult[] = []) => {
|
||||||
let scriptType = scriptData.filter(item => item.code === scriptCode)[0]?.id
|
let scriptType = scriptData.filter(item => item.code === scriptCode)[0]?.id
|
||||||
// devices = [
|
// devices = [
|
||||||
// {
|
// {
|
||||||
// chnResult: [3, 4],
|
// chnResult: [3, 4],
|
||||||
// deviceId: "80b4b4f52a4c4064a18319525f8ac13c",
|
// deviceId: "80b4b4f52a4c4064a18319525f8ac13c",
|
||||||
// deviceName: "240002"
|
// deviceName: "240002"
|
||||||
// },
|
// },
|
||||||
// {
|
// {
|
||||||
// chnResult: [1, 4, 4, 4],
|
// chnResult: [1, 4, 4, 4],
|
||||||
// deviceId: "df23a4178d194467a432ddf45e835e48",
|
// deviceId: "df23a4178d194467a432ddf45e835e48",
|
||||||
// deviceName: "240003"
|
// deviceName: "240003"
|
||||||
// },
|
// },
|
||||||
// {
|
// {
|
||||||
// chnResult: [1, 1, 1, 1],
|
// chnResult: [1, 1, 1, 1],
|
||||||
// deviceId: "ae5a7628260349c0a5e7c86c81fbd417",
|
// deviceId: "ae5a7628260349c0a5e7c86c81fbd417",
|
||||||
// deviceName: "240004"
|
// deviceName: "240004"
|
||||||
// }]
|
// }]
|
||||||
let temp = null
|
let temp = null
|
||||||
if (isStart) {
|
if (isStart) {
|
||||||
temp = getLoadingResult(scriptType)
|
temp = getLoadingResult(scriptType)
|
||||||
@@ -1005,13 +1005,13 @@ const handleClick = (item: any, chnNum: number, scriptType: string) => {
|
|||||||
type: 'warning',
|
type: 'warning',
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
if (flag === 1) {
|
// if (flag === 1) {
|
||||||
ElMessageBox.alert('该测试项数据异常', '数据异常', {
|
// ElMessageBox.alert('该测试项数据异常', '数据异常', {
|
||||||
confirmButtonText: '确定',
|
// confirmButtonText: '确定',
|
||||||
type: 'warning',
|
// type: 'warning',
|
||||||
})
|
// })
|
||||||
}
|
// }
|
||||||
if (flag === -1) {
|
if (flag === -1 || flag === 1) {
|
||||||
dataCheckSingleChannelSingleTestPopupRef.value?.open(item.deviceId, chnNum + '', scriptType);
|
dataCheckSingleChannelSingleTestPopupRef.value?.open(item.deviceId, chnNum + '', scriptType);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user