diff --git a/src/apis/crafts.ts b/src/apis/crafts.ts index 1dead16..cfc1354 100644 --- a/src/apis/crafts.ts +++ b/src/apis/crafts.ts @@ -29,6 +29,6 @@ export const craftstatus = (): Promise => http.get(`/mo export const craftstatusByHeatId = (heatId: string): Promise => http.get(`/monitor/crafts/status/${heatId}`) export const craftList = (): Promise => http.get(`/crafts/monitor/list`) -export const craftRestart = (monitorId: string): Promise => http.post(`/crafts/restart`, { monitorId }) +export const craftRestart = (params: any): Promise => http.post(`/crafts/restart`, params) export const craftRestore = (isRestore: boolean): Promise => http.get(`/crafts/restore/isRestore=${isRestore}`) export const craftRemove = (monitorId: string): Promise => http.delete(`/crafts/remove`, { params: { monitorId } }) diff --git a/src/components/craft/AddCraft/index.vue b/src/components/craft/AddCraft/index.vue index 165fdac..8c41ffd 100644 --- a/src/components/craft/AddCraft/index.vue +++ b/src/components/craft/AddCraft/index.vue @@ -54,14 +54,17 @@ const okHandle = async () => { if (step.params.minutes || step.params.seconds) { step.params.time = (step.params.minutes || 0) * 60 + (step.params.seconds || 0) || undefined } + else { + step.params.time = undefined + } if (step.params.temperature > 400 && step.method === 'anneal') { errorMsg.push(`步骤${index + 1}: 退火温度不能超过400度`) } if (step.params.temperature > 200 && step.method === 'heat') { - errorMsg.push(`步骤${index + 1}: 加热温度不能超过400度`) + errorMsg.push(`步骤${index + 1}: 加热温度不能超过200度`) } if (step.params.temperature > 200 && step.method === 'dry') { - errorMsg.push(`步骤${index + 1}: 烘干温度不能超过400度`) + errorMsg.push(`步骤${index + 1}: 烘干温度不能超过200度`) } } step.params.description = `${index + 1}.` @@ -70,10 +73,10 @@ const okHandle = async () => { step.params.description += `针头高度${step.params.height}mm, 加${step.params.volume}ml水清洗${step.params.cycle}次` break case 'addThin': - step.params.description += `添加稀硝酸-${step.params.volume}ml` + step.params.description += `添加稀硝酸 ${step.params.volume}ml` break case 'addThick': - step.params.description += `添加浓硝酸-${step.params.volume}ml` + step.params.description += `添加浓硝酸 ${step.params.volume}ml` break case 'reduceLiquid': step.params.description += `针头高度${step.params.height}mm抽取液体` diff --git a/src/components/home/CheckCraft/index.vue b/src/components/home/CheckCraft/index.vue index c334a3a..e12c4f6 100644 --- a/src/components/home/CheckCraft/index.vue +++ b/src/components/home/CheckCraft/index.vue @@ -1,61 +1,402 @@