From 1c6c837e19170dd90f5de9b7a76097787786ac3d Mon Sep 17 00:00:00 2001 From: zouap Date: Fri, 11 Nov 2022 17:45:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- web_src/js/components/Model.vue | 6 ------ 1 file changed, 6 deletions(-) diff --git a/web_src/js/components/Model.vue b/web_src/js/components/Model.vue index 9f2c3a454..46632e88d 100644 --- a/web_src/js/components/Model.vue +++ b/web_src/js/components/Model.vue @@ -230,16 +230,10 @@ export default { let tableData; tableData = res.data; for (let i = 0; i < tableData.length; i++) { -<<<<<<< HEAD trainTaskInfo = JSON.parse(tableData[i].trainTaskInfo || '{}'); tableData[i].engineName = this.getEngineName(tableData[i]); tableData[i].computeResource = trainTaskInfo.ComputeResource; tableData[i].computeResource = tableData[i].type == '0' ? 'CPU/GPU' : 'NPU'; -======= - trainTaskInfo = JSON.parse(tableData[i].trainTaskInfo); - tableData[i].engineName = this.getEngineName(tableData[i]); - tableData[i].computeResource = trainTaskInfo.ComputeResource; ->>>>>>> origin/V20221116 tableData[i].cName = tableData[i].name; tableData[i].rowKey = tableData[i].id + Math.random(); tableData[i].name = "";