diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index cc935f929..cb0e8bd4a 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -394,7 +394,7 @@ {{if and (.IsViewFile) (IpynbBool .TreePath)}}
-
{{end}} diff --git a/web_src/vuepages/pages/notebook/debug/index.vue b/web_src/vuepages/pages/notebook/debug/index.vue index ae1aa4813..a970025ba 100644 --- a/web_src/vuepages/pages/notebook/debug/index.vue +++ b/web_src/vuepages/pages/notebook/debug/index.vue @@ -7,7 +7,7 @@ :close-on-click-modal="false" @closed="handleClose" > -
+
{{$t('notebook.tips')}}
@@ -47,57 +47,58 @@
+
-
- G +
+ N
-
{{$t('notebook.gpuEnv')}}
+
{{$t('notebook.npuEnv')}}
- {{gpuSpec}} + {{npuSpec}}
- {{$t('image')}}:{{notebookInfo.imageGpuDescription}} + {{$t('image')}}:{{notebookInfo.imageNpuDescription}}
- - +
-
- N +
+ G
-
{{$t('notebook.npuEnv')}}
+
{{$t('notebook.gpuEnv')}}
- {{npuSpec}} + {{gpuSpec}}
- {{$t('image')}}:{{notebookInfo.imageNpuDescription}} + {{$t('image')}}:{{notebookInfo.imageGpuDescription}}
- + +
@@ -107,7 +108,7 @@
{{$t('notebook.noQuene')}} - {{$t('notebook.queneTips1')}} {{notebookInfo.waitCountGpu}}  {{$t('notebook.queneTips2')}} + {{$t('notebook.queneTips1')}} {{notebookInfo.waitCountGpu}} {{$t('notebook.queneTips2')}}
@@ -125,51 +126,51 @@
-
-
- - {{$t('notebook.noQuene')}} - {{$t('notebook.queneTips1')}} {{notebookInfo.waitCountGpu}}  {{$t('notebook.queneTips2')}} + +
+
+ + {{$t('notebook.noQuene')}} + {{$t('notebook.queneTips1')}} {{notebookInfo.waitCountNpu}} {{$t('notebook.queneTips2')}}
-
+
{{$t('notebook.watiResource')}}
-
+
- + {{$t('notebook.notebookRunning')}}
-
-
- - {{$t('notebook.noQuene')}} - {{$t('notebook.queneTips1')}} {{notebookInfo.waitCountNpu}}  {{$t('notebook.queneTips2')}} +
+
+ + {{$t('notebook.noQuene')}} + {{$t('notebook.queneTips1')}} {{notebookInfo.waitCountGpu}} {{$t('notebook.queneTips2')}}
-
+
{{$t('notebook.watiResource')}}
-
+
- + {{$t('notebook.notebookRunning')}}
-
@@ -215,6 +216,7 @@ export default { branch_name:'', owner_name:'', project_name:'', + sign_name:'' }, btnStatus:{0:0,1:0,2:0}, alertCb:false, @@ -222,7 +224,8 @@ export default { deubgUrlGpu:'', deubgUrlNpuStop:'', deubgUrlGpuStop:'', - loading:false + loading:false, + activeLoadFirst:true }; }, methods: { @@ -245,7 +248,10 @@ export default { this.alertCb = false }, getNotebookInfo(){ - this.loading = true + if(this.activeLoadFirst){ + this.loading = true + } + getFileNotebook().then((res)=>{ if(res.data.code==0){ @@ -254,9 +260,11 @@ export default { Message.error(res.data.message) } this.loading = false + this.activeLoadFirst = false }).catch((err)=>{ Message.error(err) this.loading = false + this.activeLoadFirst = false }) }, getCb1NotebookInfo(path,id,index){ @@ -264,8 +272,8 @@ export default { if(res.status===200){ if(res.data.JobStatus==="RUNNING"){ this.btnStatus[index]=2 - this.deubgUrlGpu = `${AppSubUrl}/${this.fileInfo.owner_name}/${this.notebookInfo.projectName}/cloudbrain/${id}/debug` - this.deubgUrlGpuStop = `${AppSubUrl}/${this.fileInfo.owner_name}/${this.notebookInfo.projectName}/cloudbrain/${id}/stop` + this.deubgUrlGpu = `${AppSubUrl}/${this.fileInfo.sign_name}/${this.notebookInfo.projectName}/cloudbrain/${id}/debug` + this.deubgUrlGpuStop = `${AppSubUrl}/${this.fileInfo.sign_name}/${this.notebookInfo.projectName}/cloudbrain/${id}/stop` clearInterval(timerCb1) } if(finalState.includes(res.data.JobStatus)){ @@ -280,8 +288,8 @@ export default { if(res.status===200){ if(res.data.JobStatus==="RUNNING"){ this.btnStatus[2]=2 - this.deubgUrlNpu = `${AppSubUrl}/${this.fileInfo.owner_name}/${this.notebookInfo.projectName}/modelarts/notebook/${id}/debug` - this.deubgUrlNpuStop = `${AppSubUrl}/${this.fileInfo.owner_name}/${this.notebookInfo.projectName}/modelarts/notebook/${id}/stop` + this.deubgUrlNpu = `${AppSubUrl}/${this.fileInfo.sign_name}/${this.notebookInfo.projectName}/modelarts/notebook/${id}/debug` + this.deubgUrlNpuStop = `${AppSubUrl}/${this.fileInfo.sign_name}/${this.notebookInfo.projectName}/modelarts/notebook/${id}/stop` clearInterval(timerCb2) } if(finalState.includes(res.data.JobStatus)){ @@ -369,6 +377,7 @@ export default { this.fileInfo.branch_name = selfData.getAttribute('data-branch') this.fileInfo.owner_name = selfData.getAttribute('data-owner') this.fileInfo.project_name = selfData.getAttribute('data-project') + this.fileInfo.sign_name = selfData.getAttribute('data-name') let that = this; document .querySelector("#notebook-debug")