提交代码。

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

templates/repo/modelarts/trainjob/show.tmpl

@@ -821,7 +821,7 @@
                     $('#JobName').val(obj.DisplayJobName).addClass('model_disabled')
                     $('input[name="JobId"]').val(obj.JobID)
                     $('input[name="VersionName"]').val(obj.VersionName).addClass('model_disabled')
-                    if(obj.EngineID ==122 || obj.EngineID ==35){
+                    if(obj.EngineID ==122 || obj.EngineID ==35 || obj.EngineID ==-1){
                         $('input[name="Engine_name"]').val("MindSpore").addClass('model_disabled');
                         $('input[name="Engine"]').val(2);
                     }

templates/repo/modelmanage/convertshowinfo.tmpl

@@ -742,7 +742,7 @@ td, th {
         let scrollLeft = container.scrollLeft
         if(((parseInt(scrollTop)  + clientHeight == scrollHeight || parseInt(scrollTop)  + clientHeight +1 == scrollHeight || parseInt(scrollTop)  + clientHeight - 1 == scrollHeight)) && parseInt(scrollTop)!==0 && scrollLeft==0){
             let end_line = $(`#log_npu input[name=end_line]`).val()
-            $.get(`/api/v1/repos/${userName}/${repoPath}/modelmanage/${taskID}/modelartlog?version_name=V0001&base_line=${end_line}&lines=50&order=desc`, (data) => {
+            $.get(`/api/v1/repos/${userName}/${repoPath}/modelmanage/${jobID}/modelartlog?version_name=V0001&base_line=${end_line}&lines=50&order=desc`, (data) => {
                 if (data.Lines == 0){
                     $(`#log_npu_header`).text('您已翻阅至日志底部')
                     $(`#log_npu_message`).css('display', 'block')
@@ -765,7 +765,7 @@ td, th {
         }
         if([0,1,2,3,4,5,6,7,8,9,10].includes(scrollTop) && scrollLeft==0){
             let start_line = $(`#log_npu input[name=start_line]`).val()
-            $.get(`/api/v1/repos/${userName}/${repoPath}/modelmanage/${taskID}/modelartlog?version_name=V0001&base_line=${start_line}&lines=50&order=asc`, (data) => {
+            $.get(`/api/v1/repos/${userName}/${repoPath}/modelmanage/${jobID}/modelartlog?version_name=V0001&base_line=${start_line}&lines=50&order=asc`, (data) => {
                 if (data.Lines == 0){
                     $(`#log_npu_header`).text('您已翻阅至日志顶部')
                     $(`#log_npu_message`).css('display', 'block')
@@ -805,7 +805,7 @@ td, th {
         let logContentDom = document.querySelector(`#log_npu`)
         
         $(`#log_file_npu`).siblings('pre').remove()
-        $.get(`/api/v1/repos/${userName}/${repoPath}/modelmanage/${taskID}/modelartlog?version_name=V0001&base_line=&lines=50&order=asc`, (data) => {
+        $.get(`/api/v1/repos/${userName}/${repoPath}/modelmanage/${jobID}/modelartlog?version_name=V0001&base_line=&lines=50&order=asc`, (data) => {
             
             $(`#log_npu input[name=end_line]`).val(data.EndLine)   //如果变动就改变所对应的值
             $(`#log_npu input[name=start_line]`).val(data.StartLine)
@@ -823,12 +823,12 @@ td, th {
 
         let logContentDom = document.querySelector(`#log_npu`)
         $(`#log_file_npu`).siblings('pre').remove()
-        $.get(`/api/v1/repos/${userName}/${repoPath}/modelmanage/${taskID}/modelartlog?version_name=V0001&base_line=&lines=50&order=desc`, (data) => {
+        $.get(`/api/v1/repos/${userName}/${repoPath}/modelmanage/${jobID}/modelartlog?version_name=V0001&base_line=&lines=50&order=desc`, (data) => {
             
             $(`#log_npu input[name=end_line]`).val(data.EndLine)   //如果变动就改变所对应的值
             $(`#log_npu input[name=start_line]`).val(data.StartLine)
             $(`#log_npu`).append('<pre>' + data.Content)
-            $.get(`/api/v1/repos/${userName}/${repoPath}/modelmanage/${taskID}/modelartlog?version_name=V0001&base_line=${data.EndLine}&lines=50&order=desc`, (data) => {
+            $.get(`/api/v1/repos/${userName}/${repoPath}/modelmanage/${jobID}/modelartlog?version_name=V0001&base_line=${data.EndLine}&lines=50&order=desc`, (data) => {
                 if (data.Lines == 0){
                     $(`#log_npu_header`).text('您已翻阅至日志底部')
                     $(`#log_npu_message`).css('display', 'block')