diff --git a/src/services/task/task.ts b/src/services/task/task.ts index b254282..5014a7f 100644 --- a/src/services/task/task.ts +++ b/src/services/task/task.ts @@ -12,6 +12,12 @@ export function stopTask(params: { taskId: String}) { return httpRequest>({ url: `/api/tasks/stop`, method: "POST", params }); } + +//结束实验 +export function getIngTask() { + return httpRequest>({ url: `/api/tasks/getIngTask`, method: "GET" }); +} + //批量加热 export function startHeat(params: { command: OperationCmd; params: [] }) { const commandId = addTxnRecord({ ...params, category: "task" }); diff --git a/src/views/graphite/index.vue b/src/views/graphite/index.vue index b70074c..d8d0622 100644 --- a/src/views/graphite/index.vue +++ b/src/views/graphite/index.vue @@ -36,7 +36,7 @@ >开门 - 开始实验 import { ref, reactive, onMounted, onUnmounted } from "vue"; //@ts-ignore -import { ElMessage } from "element-plus"; +import {ElMessage, ElMessageBox} from "element-plus"; import { createWebSocket, sharedWsUrl } from "@/services/socket"; import { HeatPosition, TakePickture, AddLiquid } from "./components"; import OverlayModal from "@/components/OverlayModal.vue"; import CraftList from "@/views/graphite/components/CraftList.vue"; import { graphiteMock } from "./components/mock"; import { useStatusStore } from "@/stores/status"; -import { saveTaskName, stopTask } from '@/services/task/task'; +import {getIngTask, saveTaskName, stopTask} from '@/services/task/task'; import { CmdDescMap, taskCmd, @@ -515,6 +515,32 @@ const onSave = ()=> { }) } +const startTask = async () => { + const res = await getIngTask(); + + if(res.data) { + ElMessageBox.confirm(`上一实验"${res.data.name}"未结束,是否结束并开始新的实验`, '提示', { + confirmButtonText: "确定", + cancelButtonText: "取消", + center: true, + }).then(() => { + stopTask({taskId: res.data.id}).then(res=> { + if(res.success){ + ElMessage.success('实验已停止') + taskNameVisible.value = true; + }else{ + ElMessage.error('实验停止失败') + } + }).catch(e=>{ + ElMessage.error(e) + }) + }).catch(() => {}) + }else { + taskNameVisible.value = true + } + +} + //结束实验 const onEndTask = () => { const params = {