forked from github/dataease
perf: 优化任务日志的请求超时
This commit is contained in:
parent
ab28111e18
commit
e012c76ef0
@ -409,7 +409,9 @@ export default {
|
|||||||
sql: '',
|
sql: '',
|
||||||
incrementalConfig: {},
|
incrementalConfig: {},
|
||||||
cronEdit: false,
|
cronEdit: false,
|
||||||
lang: this.$store.getters.language === 'en_US' ? 'en' : 'cn'
|
lang: this.$store.getters.language === 'en_US' ? 'en' : 'cn',
|
||||||
|
taskLastRequestComplete: true,
|
||||||
|
taskLogLastRequestComplete: true
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
computed: {
|
computed: {
|
||||||
@ -430,16 +432,27 @@ export default {
|
|||||||
this.calHeight()
|
this.calHeight()
|
||||||
},
|
},
|
||||||
created() {
|
created() {
|
||||||
this.timer = setInterval(() => {
|
this.taskLogTimer = setInterval(() => {
|
||||||
|
if (!this.taskLogLastRequestComplete) {
|
||||||
|
return
|
||||||
|
} else {
|
||||||
|
this.taskLogLastRequestComplete = false
|
||||||
|
}
|
||||||
this.listTaskLog(false)
|
this.listTaskLog(false)
|
||||||
}, 5000)
|
}, 10000)
|
||||||
|
|
||||||
this.taskTimer = setInterval(() => {
|
this.taskTimer = setInterval(() => {
|
||||||
|
if (!this.taskLastRequestComplete) {
|
||||||
|
return
|
||||||
|
} else {
|
||||||
|
this.taskLastRequestComplete = false
|
||||||
|
}
|
||||||
this.listTask(false)
|
this.listTask(false)
|
||||||
}, 5000)
|
}, 10000)
|
||||||
},
|
},
|
||||||
beforeDestroy() {
|
beforeDestroy() {
|
||||||
clearInterval(this.timer)
|
|
||||||
clearInterval(this.taskTimer)
|
clearInterval(this.taskTimer)
|
||||||
|
clearInterval(this.taskLogTimer)
|
||||||
},
|
},
|
||||||
methods: {
|
methods: {
|
||||||
calHeight() {
|
calHeight() {
|
||||||
@ -516,6 +529,9 @@ export default {
|
|||||||
listTask(loading = true) {
|
listTask(loading = true) {
|
||||||
post('/dataset/task/list', { tableId: this.table.id }, loading).then(response => {
|
post('/dataset/task/list', { tableId: this.table.id }, loading).then(response => {
|
||||||
this.taskData = response.data
|
this.taskData = response.data
|
||||||
|
this.taskLastRequestComplete = true
|
||||||
|
}).catch(() => {
|
||||||
|
this.taskLastRequestComplete = true
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
getIncrementalConfig() {
|
getIncrementalConfig() {
|
||||||
@ -658,6 +674,9 @@ export default {
|
|||||||
post('/dataset/taskLog/list/' + this.table.type + '/' + this.page.currentPage + '/' + this.page.pageSize, params, loading).then(response => {
|
post('/dataset/taskLog/list/' + this.table.type + '/' + this.page.currentPage + '/' + this.page.pageSize, params, loading).then(response => {
|
||||||
this.taskLogData = response.data.listObject
|
this.taskLogData = response.data.listObject
|
||||||
this.page.total = response.data.itemCount
|
this.page.total = response.data.itemCount
|
||||||
|
this.taskLogLastRequestComplete = true
|
||||||
|
}).catch(() => {
|
||||||
|
this.taskLogLastRequestComplete = true
|
||||||
})
|
})
|
||||||
},
|
},
|
||||||
handleSizeChange(val) {
|
handleSizeChange(val) {
|
||||||
|
@ -57,7 +57,7 @@
|
|||||||
<union-view :param="param" :table="table" />
|
<union-view :param="param" :table="table" />
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
<el-tab-pane v-if="table.mode === 1 && (table.type === 'excel' || table.type === 'db' || table.type === 'sql')" :label="$t('dataset.update_info')" name="updateInfo">
|
<el-tab-pane v-if="table.mode === 1 && (table.type === 'excel' || table.type === 'db' || table.type === 'sql')" :label="$t('dataset.update_info')" name="updateInfo">
|
||||||
<update-info :param="param" :table="table" />
|
<update-info v-if="tabActive=='updateInfo'" :param="param" :table="table" />
|
||||||
</el-tab-pane>
|
</el-tab-pane>
|
||||||
</el-tabs>
|
</el-tabs>
|
||||||
</el-row>
|
</el-row>
|
||||||
|
Loading…
Reference in New Issue
Block a user