[dolphinscheduler] branch dev updated: fix this issue (#8272)

[kerwin]

This is an automated email from the ASF dual-hosted git repository.

kerwin pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git


The following commit(s) were added to refs/heads/dev by this push:
     new 83d08e0  fix this issue (#8272)
83d08e0 is described below

commit 83d08e013af78288a59be33f10397918b7b17d3d
Author: calvin <jianghuachina...@163.com>
AuthorDate: Mon Jan 31 17:39:18 2022 +0800

    fix this issue (#8272)
---
 .../home/pages/resource/pages/taskGroups/taskGroupQueue/index.vue  | 7 ++++---
 dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js             | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git 
a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/taskGroups/taskGroupQueue/index.vue
 
b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/taskGroups/taskGroupQueue/index.vue
index 3f2952f..57a9f1d 100644
--- 
a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/taskGroups/taskGroupQueue/index.vue
+++ 
b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/taskGroups/taskGroupQueue/index.vue
@@ -117,7 +117,6 @@
         this.searchParams.pageNo = 1
       },
       _ckQuery () {
-        console.log(this.groupId)
         this.searchParams.groupId = this.groupId
         this.searchParams.instanceName = this.instanceName
         this.searchParams.processName = this.processName
@@ -166,9 +165,11 @@
           this.taskGroupList = []
           this.taskGroupList = values.totalList
           if (this.taskGroupList) {
-            if (this.searchParams.id) {
-              this.groupId = _.parseInt(this.searchParams.id)
+            if (this.groupId) {
+              this.searchParams.groupId = _.parseInt(this.groupId)
+            } else {
               this.searchParams.groupId = _.parseInt(this.searchParams.id)
+              this.groupId = this.searchParams.groupId
             }
             this.getTaskListInTaskGroupQueueById(this.searchParams).then((res) 
=> {
               if (this.searchParams.pageNo > 1 && values.totalList.length === 
0) {
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js 
b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
index 251bc30..3c0afcc 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -827,6 +827,7 @@ export default {
   'Task group queue the status of queuing': 'Queuing',
   'Task group queue the status of releasing': 'Released',
   'Modify task group queue priority': 'Edit the priority of the task group 
queue',
+  'Force to start task': 'Force to start the task',
   'Priority not empty': 'The value of priority can not be empty',
   'Priority must be number': 'The value of priority should be number',
   'Please select task name': 'Please select a task name',