diff --git a/src/api/log/index.js b/src/api/log/index.js index b86ad49..0939037 100644 --- a/src/api/log/index.js +++ b/src/api/log/index.js @@ -1,55 +1,67 @@ import request from "@/utils/request"; -const serverState=()=>{ - return request({ - url: "/logs/server_state", - method: "get" - }); -} -//获取用户操作状态通知 -const userOperationNotice=()=>{ - return request({ - url: "/logs/user_operation/notice", - method: "get" - }); -} - -const userRunning=()=>{ +const serverState = () => { return request({ - url:`/logs/user_operation/running`, - method:"get" - }) -} + url: "/logs/server_state", + method: "get", + }); +}; +//获取用户操作状态通知 +const userOperationNotice = () => { + return request({ + url: "/logs/user_operation/notice", + method: "get", + }); +}; + +const userRunning = () => { + return request({ + url: `/logs/user_operation/running`, + method: "get", + }); +}; //获取用户操作详情 -const userOperation=(operation_id)=>{ - return request({ - url: `/logs/user_operation/${operation_id}`, - method: "get" - }); -} +const userOperation = (operation_id) => { + return request({ + url: `/logs/user_operation/${operation_id}`, + method: "get", + }); +}; //获取编译部署日志 -const compileDeploy=(operation_id)=>{ - return request({ - url: `/logs/compile_deploy/${operation_id}`, - method: "get" - }); -} +const compileDeploy = (operation_id, LatestTime) => { + let url = `/logs/compile_deploy/${operation_id}`; + if (LatestTime) { + url += "?latestTime=" + LatestTime; + } + return request({ + url: url, + method: "get", + }); +}; //获取推理最新的模型推理日志 -const inferenceTaskLatest=(task_id,DeviceId)=>{ - return request({ - url: `/logs/inference/${task_id}/latest?DeviceId=${DeviceId}&LogCount=50`, - method: "get" - }); -} +const inferenceTask = (task_id, DeviceId, dt) => { + return request({ + url: `/logs/inference/${task_id}?deviceId=${DeviceId}&startTime=${dt}&page_num=1&page_size=100`, + method: "get", + }); +}; + +//获取推理最新的模型推理日志 +const inferenceTaskLatest = (task_id, DeviceId) => { + return request({ + url: `/logs/inference/${task_id}/latest?DeviceId=${DeviceId}&LogCount=50`, + method: "get", + }); +}; export default { - serverState, - userOperationNotice, + serverState, + userOperationNotice, userOperation, compileDeploy, userRunning, - inferenceTaskLatest - -} \ No newline at end of file + inferenceTaskLatest, + inferenceTask, +}; diff --git a/src/views/simulationEvaluation/addTask.vue b/src/views/simulationEvaluation/addTask.vue index 1b2bbd0..6afc63b 100644 --- a/src/views/simulationEvaluation/addTask.vue +++ b/src/views/simulationEvaluation/addTask.vue @@ -13,7 +13,7 @@ - + @@ -57,14 +57,15 @@ let modelInfo = reactive({}); let state = ref(0); let info = reactive({ - devices: [], + devices: {}, taskInfo: null, optIds: [], logs: [], datas: null, taskId: 0, inferenceId: 0, - parameters:'' + parameters:'', + latestTime:'', }) //开始推理 const doStart = () => { @@ -86,25 +87,19 @@ const doAddTask = () => { model_id: modelInfo.model_id, connection_id: modelInfo.connection_id, data_set_id: info.datas.dataset_id, - task_params: {}, - device_list: info.devices.map(it => { - return { - device_id: it.device_id, - tool_params_id: it.tool_params_id, - tool_id: it.tool_id - } - }) + task_params: info.parameters, + device_id:info.devices.device_id, + tool_params_id:info.devices.tool_params_id, + tool_id:info.devices.tool_id } taskApi.addTask(postData).then(d => { info.taskId = d.data?.data?.task_id || 0; - startInference() + startInference(d) }); }; //开始推理 -const startInference = () => { - //创建推理任务 - let postData = {} - inferenceApi.startInference(postData).then(d => { +const startInference = (d) => { + //创建推理任务 info.inferenceId = d.data?.data?.operation_id || 0; if (info.inferenceId > 0) { ElMessage.success("创建推理任务成功!"); @@ -112,13 +107,16 @@ const startInference = () => { router.push({ path: "/simulationEvaluation/execution" }); }, 1000); } - }); } +const step4Selection=row=>{ + info.devices=row; + state.value=3; +} const doCompile = (row) => { let tmp = row; if (tmp) { - info.devices = [tmp]; + info.devices = tmp; state.value = 1; step4.value.updateState(state.value); startComplie();//开始编译 @@ -129,16 +127,13 @@ const doCompile = (row) => { } //开始编译 const startComplie = () => { - let ajaxs = info.devices.map(d => { - return inferenceApi.doCompile({ - //model_id: modelInfo.model_id, - //modl_net_type: modelInfo.modl_net_type, - tool_params_id: d.tool_params_id, - tool_id: d.tool_id, - device_id: d.device_id, + let ajaxs =[ inferenceApi.doCompile({ + tool_params_id: info.devices.tool_params_id, + tool_id: info.devices.tool_id, + device_id: info.devices.device_id, connection_id: modelInfo.connection_id - }); - }) + }) + ]; addLogs({ msg: "开始编译....", type: "info" }) request.all(ajaxs).then(d => { info.optIds = d.map(it => { @@ -160,12 +155,13 @@ const doGetComplieLogs = () => { let ajaxs = []; info.optIds.filter(d => d.state == 0).forEach(o => { ajaxs.push(logsApi.userOperation(o.id)); - ajaxs.push(logsApi.compileDeploy(o.id)); + ajaxs.push(logsApi.compileDeploy(o.id,info.latestTime)); }) request.all(ajaxs).then(d => { + info.latestTime=+new Date();//'2023-03-01T12:00:00Z';//new Date().toLocaleString(); d.forEach((it, idx) => { - let msg = it.data.data; + let msg = it.data.data; if (msg.operation_result) { addLogs({ msg: msg.operation_result }); info.optIds[idx].state = msg.operation_finished ? 1 : 0; @@ -177,58 +173,13 @@ const doGetComplieLogs = () => { if (info.optIds.filter(d => d.state == 0).length > 0) { setTimeout(doGetComplieLogs, 2000); } else { - doDeploy(); - } - }); -} -const doDeploy = () => { - state.value = 2; - step4.value.updateState(state.value); - addLogs({ msg: "开始部署....", type: 'info' }) - let ajaxs = info.devices.map(d => { - return inferenceApi.doDeploy({ - model_id: modelInfo.model_id, - modl_net_type: modelInfo.modl_net_type, - device_id: d.device_id - }); - }); - request.all(ajaxs).then(d => { - info.optIds = d.map(it => { - return { - id: it.data.data.operation_id, //op_id - state: 0 //状态 1为完成 - } - }); - doGetDeployLogs();//获取编译日志 - }) -}; - -const doGetDeployLogs = () => { - let ajaxs = []; - info.optIds.filter(d => d.state == 0).forEach(o => { - ajaxs.push(logsApi.userOperation(o.id)); - ajaxs.push(logsApi.compileDeploy(o.id)); - }) - request.all(ajaxs).then(d => { - d.forEach((it, idx) => { - let msg = it.data.data; - if (msg.operation_result) { - addLogs({ msg: msg.operation_result }); - info.optIds[idx].state = msg.operation_finished ? 1 : 0; - } - if (msg.log_msg) { - addLogs({ msg: `[${msg.update_time}${msg.logs_level}]${msg.log_msg}` }) - } - }); - if (info.optIds.filter(d => d.state == 0).length > 0) { - setTimeout(doGetDeployLogs, 2000); - } else { - addLogs({ msg: "编译部署完成", type: 'success' }) + //doDeploy(); state.value = 3; step4.value.updateState(state.value); } }); -}; +} + const doPrev = () => { active.value--; diff --git a/src/views/simulationEvaluation/components/addStep4.vue b/src/views/simulationEvaluation/components/addStep4.vue index 4659b84..6d760ba 100644 --- a/src/views/simulationEvaluation/components/addStep4.vue +++ b/src/views/simulationEvaluation/components/addStep4.vue @@ -34,9 +34,10 @@ - + @@ -46,7 +47,7 @@ @@ -65,7 +66,7 @@ @@ -90,7 +91,8 @@