Merge remote-tracking branch 'origin/V20221228' into gcu

web_src/vuepages/langs/config/en-US.js

@@ -207,8 +207,8 @@ const en = {
     npuEnv: "NPU environment",
     newTask: "Create new task",
     noQuene: "The current resources are sufficient and no tasks are queued",
-    queneTips1: "There are currently",
-    queneTips2: "tasks queued",
+    queneTips1: "Your current queue position is",
+    queneTips2: "",
     watiResource: "Waiting for resources to be allocated, please be patient",
     debug: "Debug",
     stop: "Stop",

web_src/vuepages/langs/config/zh-CN.js

@@ -208,8 +208,8 @@ const zh = {
     npuEnv: "NPU 环境",
     newTask: "新建任务",
     noQuene: "当前资源充足，没有任务排队",
-    queneTips1: "当前有",
-    queneTips2: "个任务正在排队",
+    queneTips1: "您当前排队位置是第",
+    queneTips2: "位",
     watiResource: "正在等待分配资源，请耐心等待",
     debug: "调试",
     stop: "停止",

web_src/vuepages/pages/notebook/debug/index.vue

@@ -108,7 +108,7 @@
                 <div v-if="btnStatus[0]===0">
                     <button  class="ui green small button" @click="createTask(0)"></i>{{$t('notebook.newTask')}}</button>
                     <span v-if="notebookInfo.waitCountGpu==0" class="text">{{$t('notebook.noQuene')}}</span>
-                    <span v-else class="text">{{$t('notebook.queneTips1')}} <span style="color: red;">{{notebookInfo.waitCountGpu}}</span> {{$t('notebook.queneTips2')}}</span>
+                    <span v-else class="text">{{$t('notebook.queneTips1')}} <span style="color: red;">{{notebookInfo.waitCountGpu + 1}}</span> {{$t('notebook.queneTips2')}}</span>
                 </div>
                 <div v-else-if="btnStatus[0]===1">
                     <button class="ui disabled small button" style="background-color: #888;"><i class="loading spinner icon" style="color: #fff;"></i>{{$t('notebook.newTask')}}</button>
@@ -131,7 +131,7 @@
             <div v-if="btnStatus[2]===0">
                 <button  class="ui green small button" @click="createTask(2)"></i>{{$t('notebook.newTask')}}</button>
                 <span v-if="notebookInfo.waitCountNpu==0" class="text">{{$t('notebook.noQuene')}}</span>
-                <span v-else class="text">{{$t('notebook.queneTips1')}} <span style="color: red;">{{notebookInfo.waitCountNpu}}</span> {{$t('notebook.queneTips2')}}</span>
+                <span v-else class="text">{{$t('notebook.queneTips1')}} <span style="color: red;">{{notebookInfo.waitCountNpu + 1}}</span> {{$t('notebook.queneTips2')}}</span>
             </div>
             <div v-else-if="btnStatus[2]===1">
                 <button class="ui disabled small button" style="background-color: #888;"><i class="loading spinner icon" style="color: #fff;"></i>{{$t('notebook.newTask')}}</button>
@@ -153,7 +153,7 @@
             <div v-if="btnStatus[1]===0">
                 <button  class="ui green small button" @click="createTask(1)"></i>{{$t('notebook.newTask')}}</button>
                 <span v-if="notebookInfo.waitCountGpu==0" class="text">{{$t('notebook.noQuene')}}</span>
-                <span v-else class="text">{{$t('notebook.queneTips1')}} <span style="color: red;">{{notebookInfo.waitCountGpu}}</span> {{$t('notebook.queneTips2')}}</span>
+                <span v-else class="text">{{$t('notebook.queneTips1')}} <span style="color: red;">{{notebookInfo.waitCountGpu + 1}}</span> {{$t('notebook.queneTips2')}}</span>
             </div>
             <div v-else-if="btnStatus[1]===1">
                 <button class="ui disabled small button" style="background-color: #888;"><i class="loading spinner icon" style="color: #fff;"></i>{{$t('notebook.newTask')}}</button>