diff --git a/dolphinscheduler-ui/package.json b/dolphinscheduler-ui/package.json
index 014205ba16..3a8d532e01 100644
--- a/dolphinscheduler-ui/package.json
+++ b/dolphinscheduler-ui/package.json
@@ -23,7 +23,6 @@
"babel-plugin-syntax-jsx": "^6.18.0",
"babel-plugin-transform-class-properties": "^6.24.1",
"babel-plugin-transform-object-rest-spread": "^6.26.0",
- "babel-plugin-transform-remove-console": "^6.9.4",
"babel-plugin-transform-runtime": "^6.23.0",
"babel-plugin-transform-vue-jsx": "^3.5.0",
"babel-preset-env": "^1.6.1",
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
index 1dd6630c41..796c576b4f 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/timing.vue
@@ -253,7 +253,11 @@
let msg = ''
this.store.dispatch(api, searchParams).then(res => {
- this.previewTimes = res
+ if (res.length) {
+ this.previewTimes = res
+ } else {
+ this.$message.warning(`${i18n.$t('There is no data for this period of time')}`)
+ }
})
}
},
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue
index 818765dae1..83eaec2e09 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/index/_source/defineUserCount.vue
@@ -21,7 +21,8 @@
data () {
return {
isSpin: true,
- msg: ''
+ msg: '',
+ parameter: {projectId: 0}
}
},
props: {
@@ -54,7 +55,8 @@
},
created () {
this.isSpin = true
- this.getDefineUserCount(this.projectId).then(res => {
+ this.parameter.projectId = this.projectId;
+ this.getDefineUserCount(this.parameter).then(res => {
this.defineUserList = []
this._handleDefineUser(res)
this.isSpin = false
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
index 9efc9f721a..6cde92d2b8 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/instance/pages/list/_source/list.vue
@@ -12,31 +12,34 @@
{{$t('Process Name')}}
|
-
+ |
{{$t('Run Type')}}
|
-
+ |
+ {{$t('Scheduling Time')}}
+ |
+
{{$t('Start Time')}}
|
-
+ |
{{$t('End Time')}}
|
-
+ |
{{$t('Duration')}}s
|
-
+ |
{{$t('Run Times')}}
|
{{$t('host')}}
|
-
+ |
{{$t('fault-tolerant sign')}}
|
-
+ |
{{$t('State')}}
|
-
+ |
{{$t('Operation')}}
|
@@ -46,9 +49,13 @@
{{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}
- {{item.name}}
+ {{item.name}}
|
{{_rtRunningType(item.commandType)}} |
+
+
+ {{item.scheduleTime | formatDate}}
+ |
{{item.startTime | formatDate}} |
{{item.endTime | formatDate}}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
index c41828b39b..37e8563117 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue
@@ -12,7 +12,7 @@
|
{{$t('Process Instance')}}
|
-
+ |
{{$t('Node Type')}}
|
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 2c866762e0..13477fec34 100644
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -232,6 +232,7 @@ export default {
'Service-Worker': 'Service-Worker',
'Process Name': 'Process Name',
'Run Type': 'Run Type',
+ 'Scheduling Time': 'Scheduling Time',
'Run Times': 'Run Times',
'host': 'host',
'fault-tolerant sign': 'fault-tolerant sign',
@@ -487,5 +488,6 @@ export default {
'Http Check Condition':'Http Check Condition',
'Http Condition':'Http Condition',
'Please Enter Http Url': 'Please Enter Http Url(required)',
- 'Please Enter Http Condition': 'Please Enter Http Condition'
+ 'Please Enter Http Condition': 'Please Enter Http Condition',
+ 'There is no data for this period of time': 'There is no data for this period of time'
}
diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
index 1ccd9da08e..cd8f620f39 100644
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -232,6 +232,7 @@ export default {
'Service-Worker': '服务管理-Worker',
'Process Name': '工作流名称',
'Run Type': '运行类型',
+ 'Scheduling Time': '调度时间',
'Run Times': '运行次数',
'host': 'host',
'fault-tolerant sign': '容错标识',
@@ -493,5 +494,6 @@ export default {
'Http Check Condition':'校验条件',
'Http Condition':'校验内容',
'Please Enter Http Url': '请填写请求地址(必填)',
- 'Please Enter Http Condition': '请填写校验内容'
+ 'Please Enter Http Condition': '请填写校验内容',
+ 'There is no data for this period of time': '该时间段无数据'
}
|