diff --git a/frontend/package.json b/frontend/package.json
index 292b815bfc..75addb3a7c 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -24,7 +24,7 @@
"element-ui": "2.13.0",
"file-save": "^0.2.0",
"file-saver": "^2.0.5",
- "fit2cloud-ui": "1.2.0",
+ "fit2cloud-ui": "1.5.0-beta.0",
"html2canvasde": "^v1.1.4-de",
"js-cookie": "2.2.0",
"jsencrypt": "^3.0.0-rc.1",
diff --git a/frontend/src/components/business/complex-table/index.vue b/frontend/src/components/business/complex-table/index.vue
index 6a172a9258..52fcb5e906 100644
--- a/frontend/src/components/business/complex-table/index.vue
+++ b/frontend/src/components/business/complex-table/index.vue
@@ -9,7 +9,7 @@
-
+
@@ -57,15 +57,25 @@ export default {
// eslint-disable-next-line vue/require-default-prop
searchConfig: Object,
// eslint-disable-next-line vue/require-default-prop
- paginationConfig: Object
+ paginationConfig: Object,
+ transCondition: {
+ type: Object,
+ default: null
+ }
},
data() {
return {
- condition: {}
+ condition: {},
+ }
+ },
+ mounted() {
+ if (this.transCondition !== null) {
+ this.$refs.search.setConditions(this.transCondition)
}
},
methods: {
search(condition, e) {
+ console.log(condition)
if (condition) {
this.condition = condition
}
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index a130d14633..ddc99fa3fd 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -873,6 +873,7 @@ export default {
sync_now: 'Update Now',
add_task: 'Add Task',
task_name: 'Task Name',
+ task_id: 'Task ID',
start_time: 'Start Time',
end_time: 'End Time',
status: 'State',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 071919506d..9edc105a1d 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -873,6 +873,7 @@ export default {
sync_now: '立即更新',
add_task: '添加任務',
task_name: '任務名稱',
+ task_id: '任務ID',
start_time: '開始時間',
end_time: '結束時間',
status: '狀態',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 31bdb99c43..4586fb8316 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -873,6 +873,7 @@ export default {
sync_now: '立即更新',
add_task: '添加任务',
task_name: '任务名称',
+ task_id: '任务ID',
start_time: '开始时间',
end_time: '结束时间',
status: '状态',
diff --git a/frontend/src/views/msg/unread.vue b/frontend/src/views/msg/unread.vue
index 18dc1743a7..60f0a30eee 100644
--- a/frontend/src/views/msg/unread.vue
+++ b/frontend/src/views/msg/unread.vue
@@ -153,7 +153,7 @@ export default {
}
const param = this.multipleSelection.map(item => item.msgId)
batchRead(param).then(res => {
- this.$success('webmsg.mark_success')
+ this.$success(this.$t('webmsg.mark_success'))
this.search()
})
},
diff --git a/frontend/src/views/system/task/DatasetTaskList.vue b/frontend/src/views/system/task/DatasetTaskList.vue
index bae9f32bd5..fcad1c51cd 100644
--- a/frontend/src/views/system/task/DatasetTaskList.vue
+++ b/frontend/src/views/system/task/DatasetTaskList.vue
@@ -1,7 +1,7 @@
-
+
{{ $t('dataset.task.create') }}
@@ -223,6 +223,10 @@ export default {
param: {
type: Object,
default: null
+ },
+ transCondition: {
+ type: Object,
+ default: null
}
},
data() {
@@ -259,8 +263,9 @@ export default {
useComplexSearch: true,
quickPlaceholder: this.$t('dataset.task.search_by_name'),
components: [
+ { field: 'dataset_table_task.name', label: this.$t('dataset.task_name'), component: 'DeComplexInput'},
+ { field: 'dataset_table_task.id', label: this.$t('dataset.task_id'), component: 'FuComplexInput' },
{ field: 'dataset_table.name', label: this.$t('dataset.name'), component: 'DeComplexInput' },
- { field: 'dataset_table_task.name', label: this.$t('dataset.task_name'), component: 'DeComplexInput' },
{ field: 'dataset_table_task.status', label: this.$t('dataset.task.task_status'), component: 'FuComplexSelect',
options: [{ label: this.$t('dataset.task.stopped'), value: 'Stopped' }, { label: this.$t('dataset.task.underway'), value: 'Underway' }, { label: this.$t('dataset.task.pending'), value: 'Pending' }, { label: this.$t('dataset.underway'), value: 'Exec' }], multiple: false },
{ field: 'dataset_table_task.last_exec_status', label: this.$t('dataset.task.last_exec_status'), component: 'FuComplexSelect', options: [{ label: this.$t('dataset.completed'), value: 'Completed' }, { label: this.$t('dataset.underway'), value: 'Underway' }, { label: this.$t('dataset.error'), value: 'Error' }], multiple: false }
@@ -343,19 +348,6 @@ export default {
}
},
created() {
- if (this.param == null) {
- this.last_condition = {}
- this.search()
- } else {
- this.last_condition = {
- 'dataset_table_task.name': {
- field: 'dataset_table_task.name',
- operator: 'eq',
- value: this.param.name
- }
- }
- this.search(this.last_condition)
- }
this.timer = setInterval(() => {
this.search(this.last_condition, false)
}, 5000)
diff --git a/frontend/src/views/system/task/TaskRecord.vue b/frontend/src/views/system/task/TaskRecord.vue
index d244e0e469..c8403036f7 100644
--- a/frontend/src/views/system/task/TaskRecord.vue
+++ b/frontend/src/views/system/task/TaskRecord.vue
@@ -1,7 +1,7 @@
-
+
@@ -64,6 +64,10 @@ export default {
param: {
type: Object,
default: null
+ },
+ transCondition: {
+ type: Object,
+ default: null
}
},
data() {
@@ -81,7 +85,8 @@ export default {
useComplexSearch: true,
quickPlaceholder: this.$t('dataset.task.search_by_name'),
components: [
- { field: 'dataset_table_task.name', label: this.$t('dataset.task_name'), component: 'DeComplexInput' },
+ { field: 'dataset_table_task.name', label: this.$t('dataset.task_name'), component: 'FuComplexInput' },
+ { field: 'dataset_table_task.id', label: this.$t('dataset.task_id'), component: 'FuComplexInput' },
{ field: 'dataset_table.name', label: this.$t('dataset.name'), component: 'DeComplexInput' },
{ field: 'dataset_table_task_log.status', label: this.$t('commons.status'), component: 'FuComplexSelect', options: [{ label: this.$t('dataset.completed'), value: 'Completed' }, { label: this.$t('dataset.underway'), value: 'Underway' }, { label: this.$t('dataset.error'), value: 'Error' }], multiple: false }
]
@@ -117,37 +122,16 @@ export default {
computed: {
},
created() {
- if (this.param == null) {
- this.last_condition = {}
- this.search()
- } else if (this.param.name) {
- this.last_condition = {
- 'dataset_table_task.name': {
- field: 'dataset_table_task.name',
- operator: 'eq',
- value: this.param.name
- }
- }
- this.search(this.last_condition)
- } else if (this.param.taskId) {
+ if (this.param !== null && this.param.taskId) {
this.matchLogId = this.param.logId || this.matchLogId
- this.last_condition = {
- 'dataset_table_task.id': {
- field: 'dataset_table_task.id',
- operator: 'eq',
- value: this.param.taskId
+ this.transCondition['dataset_table_task.id'] = {
+ operator: 'eq',
+ value: this.param.taskId
}
- }
- this.search(this.last_condition)
}
-
- // this.timer = setInterval(() => {
- // this.search(this.last_condition, false)
- // }, 5000)
this.createTimer()
},
beforeDestroy() {
- // clearInterval(this.timer)
this.destroyTimer()
},
methods: {
@@ -164,25 +148,6 @@ export default {
this.timer = null
}
},
- // msg2Current(routerParam) {
- // if (!routerParam || !routerParam.taskId) return
- // const taskId = routerParam.taskId
- // // console.log(taskId)
- // const current_condition = {
- // 'dataset_table_task.id': {
- // field: 'dataset_table_task.id',
- // operator: 'eq',
- // value: taskId
- // }
- // }
- // // 先把定时器干掉 否则会阻塞下面的search
- // this.destroyTimer()
-
- // this.search(current_condition)
-
- // // 查询完再开启定时器
- // this.createTimer()
- // },
sortChange({ column, prop, order }) {
this.orderConditions = []
if (!order) {
diff --git a/frontend/src/views/system/task/dataset.vue b/frontend/src/views/system/task/dataset.vue
index 592727f5ff..86912e63ed 100644
--- a/frontend/src/views/system/task/dataset.vue
+++ b/frontend/src/views/system/task/dataset.vue
@@ -4,10 +4,10 @@
-
+
-
+
@@ -27,8 +27,8 @@ export default {
components: { LayoutContent, DatasetTaskList, TaskRecord },
data() {
return {
- task: null,
- tabActive: 'DatasetTaskList'
+ tabActive: 'DatasetTaskList',
+ transCondition: {}
}
},
computed: {
@@ -50,15 +50,20 @@ export default {
},
methods: {
changeTab() {
- this.task = null
- console.log(this.tabActive)
+ this.transCondition = {}
},
jumpTaskRecord(task) {
- this.task = task
+ this.transCondition['dataset_table_task.id'] = {
+ operator: 'eq',
+ value: task.id
+ }
this.tabActive = 'TaskRecord'
},
- jumpTask(task) {
- this.task = task
+ jumpTask(taskRecord) {
+ this.transCondition['dataset_table_task.id'] = {
+ operator: 'eq',
+ value: taskRecord.taskId
+ }
this.tabActive = 'DatasetTaskList'
},
toMsgShare(routerParam) {