(user.value.account)
const failMessage = ref(''); // 存储动态生成的错误信息
@@ -194,6 +198,21 @@ const generateErrorMessages = (data: CheckItem[]): string[] => {
.map(item => `错误:${item.typechinfo} 检测未通过,请检查设备状态。`);
};
+const untilDeviceReady = async () => {
+ showDeviceWaitingModal.value = true
+ const res = await getDeviceWorkState();
+ if (res.ecode === "SUC") {
+ if (res.data.pending) {
+ setTimeout(async () => await untilDeviceReady(), 250)
+ } else {
+ showDeviceWaitingModal.value = false;
+ deviceReadyCallback && deviceReadyCallback()
+ }
+ } else {
+ showDeviceWaitingModal.value = false;
+ }
+}
+
// 开始测试
const startTest = async () => {
const res = await getInitState()
@@ -204,7 +223,8 @@ const startTest = async () => {
try {
const res = await startWork();
if (res.success) {
- isTesting.value = true;
+ deviceReadyCallback = () => isTesting.value = true;
+ await untilDeviceReady()
}
} catch (error) {
console.error('开始测试失败:', error);
@@ -216,7 +236,8 @@ const startTest = async () => {
const pauseTest = async () => {
const res = await pauseWork();
if (res.success) {
- isPaused.value = true;
+ deviceReadyCallback = () => isPaused.value = true;
+ await untilDeviceReady()
}
// 在这里添加暂停测试的逻辑
};
@@ -226,14 +247,16 @@ const stopTest = async () => {
console.log('测试已停止');
const res = await stopWork();
if (res.success) {
- isTesting.value = false;
+ deviceReadyCallback = () => isTesting.value = false;
+ await untilDeviceReady()
}
};
//继续测试
const continueTest = async () => {
const res = await continueWork();
if (res.success) {
- isPaused.value = false;
+ deviceReadyCallback = () => isPaused.value = false;
+ await untilDeviceReady()
console.log('继续测试');
}
};
@@ -248,13 +271,13 @@ const startInit = async () => {
}
const pollingInitState = async () => {
- showLoadingModal.value = true; // 显示 LoadingModal
+ showDeviceResettingModal.value = true; // 显示 LoadingModal
const res = await getInitState();
if (res.ecode === "SUC") {
if (res.data.isBusy) {
setTimeout(async () => await pollingInitState(), 500)
} else {
- showLoadingModal.value = false;
+ showDeviceResettingModal.value = false;
if (res.data.passed) {
console.log("初始化成功")
sessionStorage.setItem('deviceResetFinished', "true");
diff --git a/src/pages/Index/components/Consumables/Warn/LoadingModal.vue b/src/pages/Index/components/Consumables/Warn/LoadingModal.vue
index b262fb2..dcf1ed9 100644
--- a/src/pages/Index/components/Consumables/Warn/LoadingModal.vue
+++ b/src/pages/Index/components/Consumables/Warn/LoadingModal.vue
@@ -14,7 +14,7 @@
-