center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

Merge branch 'v1.8' into dev

Browse Source
This commit is contained in:
taojinlong 2022-03-01 16:50:41 +08:00
commit b06dfd09bc
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskLogController.java
View File

@ -39,12 +39,6 @@ public class DataSetTableTaskLogController {
return dataSetTableTaskLogService.save(datasetTableTaskLog);
}
// @ApiOperation("删除")
// @PostMapping("delete/{id}")
// public void delete(@PathVariable String id) {
// dataSetTableTaskLogService.delete(id);
// }
@RequiresPermissions("task:read")
@ApiOperation("分页查询")
@PostMapping("list/{type}/{goPage}/{pageSize}")
@ -53,4 +47,12 @@ public class DataSetTableTaskLogController {
return PageUtils.setPageInfo(page, dataSetTableTaskLogService.listTaskLog(request, type));
}
@RequiresPermissions("data:read")
@ApiOperation("分页查询")
@PostMapping("listForDataset/{type}/{goPage}/{pageSize}")
public Pager<List<DataSetTaskLogDTO>> listForDataset(@RequestBody BaseGridRequest request, @PathVariable String type, @PathVariable int goPage, @PathVariable int pageSize) {
Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
return PageUtils.setPageInfo(page, dataSetTableTaskLogService.listTaskLog(request, type));
}
}

2
frontend/src/views/dataset/data/UpdateInfo.vue
View File

@ -683,7 +683,7 @@ export default {
},
listTaskLog(loading = true) {
const params = { 'conditions': [{ 'field': 'dataset_table_task_log.table_id', 'operator': 'eq', 'value': this.table.id }], 'orders': [] }
post('/dataset/taskLog/list/' + this.table.type + '/' + this.page.currentPage + '/' + this.page.pageSize, params, loading).then(response => {
post('/dataset/taskLog/listForDataset/' + this.table.type + '/' + this.page.currentPage + '/' + this.page.pageSize, params, loading).then(response => {
this.taskLogData = response.data.listObject
this.page.total = response.data.itemCount
this.taskLogLastRequestComplete = true