Merge branch 'qr_branch'

# Conflicts:
#	frontend/src/views/home/components/preTest.vue
#	frontend/src/views/home/components/test.vue
#	frontend/src/views/machine/device/components/devicePopup.vue
#	frontend/src/views/machine/testScript/components/testScriptFlickerTab.vue
This commit is contained in:
caozehui
2025-12-26 13:27:26 +08:00
4 changed files with 54 additions and 19 deletions

View File

@@ -322,6 +322,12 @@ watch(webMsgSend, function (newValue, oldValue) {
type: 'error',
})
TableInit();
} else if (newValue.code == -1) { //todo 10552之后还会发送消息吗
ElMessageBox.alert('源未知异常', '检测失败', {
confirmButtonText: '确定',
type: 'error',
})
TableInit();
} else {
// ==================== 特定业务消息处理 ====================