- + @@ -482,11 +482,14 @@ const startTest = async () => { if (res && res.success) { await untilDeviceReady() } else { - ElMessage({ - message: res.data.info, - type: 'error', - duration: 2000, - }) + res && + res.data && + res.data.info && + ElMessage({ + message: res.data.info, + type: 'error', + duration: 2000, + }) } } catch (error) { console.error('开始测试失败:', error) @@ -501,11 +504,14 @@ const pauseTest = async () => { if (res && res.success) { await untilDeviceReady() } else { - ElMessage({ - message: res.data.info, - type: 'error', - duration: 2000, - }) + res && + res.data && + res.data.info && + ElMessage({ + message: res.data.info, + type: 'error', + duration: 2000, + }) } } @@ -517,11 +523,14 @@ const stopTest = async () => { if (res && res.success) { await untilDeviceReady() } else { - ElMessage({ - message: res.data.info, - type: 'error', - duration: 2000, - }) + res && + res.data && + res.data.info && + ElMessage({ + message: res.data.info, + type: 'error', + duration: 2000, + }) } } //继续测试 @@ -532,11 +541,14 @@ const continueTest = async () => { if (res && res.success) { await untilDeviceReady() } else { - ElMessage({ - message: res.data.info, - type: 'error', - duration: 2000, - }) + res && + res.data && + res.data.info && + ElMessage({ + message: res.data.info, + type: 'error', + duration: 2000, + }) } } const handleConfirm = async () => { diff --git a/src/pages/Index/Regular/Consumables.vue b/src/pages/Index/Regular/Consumables.vue index 9142154..a39f292 100644 --- a/src/pages/Index/Regular/Consumables.vue +++ b/src/pages/Index/Regular/Consumables.vue @@ -91,7 +91,7 @@ :columns="5" gridWidth="240px" gridHeight="240px" - :activeColor="item.color" + :activeColor="consumableStore.projIdColorMap[item.projId!]" :inUse="item.isInstall" /> diff --git a/src/pages/Index/Regular/Running.vue b/src/pages/Index/Regular/Running.vue index be2f57d..59cf1a9 100644 --- a/src/pages/Index/Regular/Running.vue +++ b/src/pages/Index/Regular/Running.vue @@ -43,7 +43,7 @@ diff --git a/src/pages/Index/components/Running/PlateDisplay.vue b/src/pages/Index/components/Running/PlateDisplay.vue index d13ac73..22918e4 100644 --- a/src/pages/Index/components/Running/PlateDisplay.vue +++ b/src/pages/Index/components/Running/PlateDisplay.vue @@ -2,7 +2,7 @@
@@ -18,7 +18,9 @@