提交代码。

Signed-off-by: zouap <zouap@pcl.ac.cn>

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 = "";