diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsRescueTeamWorkerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsRescueTeamWorkerController.java index 6404fb2..2c7f6f8 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsRescueTeamWorkerController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/ehs/EhsRescueTeamWorkerController.java @@ -87,10 +87,10 @@ public class EhsRescueTeamWorkerController extends BaseController { /** * 根据队伍id获取人员信息(分页) */ - @GetMapping("/listWorker/{rescueTeamId}") - public TableDataInfo listWorker(@PathVariable("rescueTeamId") Long rescueTeamId) { + @GetMapping("/listWorker") + public TableDataInfo listWorker(EhsRescueTeamWorker ehsRescueTeamWorker) { startPage(); - List list = ehsRescueTeamWorkerService.listWorker(rescueTeamId); + List list = ehsRescueTeamWorkerService.selectEhsRescueTeamWorkerList(ehsRescueTeamWorker); return getDataTable(list); } diff --git a/ruoyi-ui/src/api/ehs/realdata.js b/ruoyi-ui/src/api/ehs/realdata.js index e570824..a13ca43 100644 --- a/ruoyi-ui/src/api/ehs/realdata.js +++ b/ruoyi-ui/src/api/ehs/realdata.js @@ -10,9 +10,10 @@ export const getXq = (id) => { // 获取人员信息 -export const getWorkerInfo = (rescueTeamId) => { +export const getWorkerInfo = (query) => { return request({ - url: '/ehs/ehsRescueTeamWorker/listWorker/' + rescueTeamId, + url: '/ehs/ehsRescueTeamWorker/listWorker', method: 'get', + params: query }) } diff --git a/ruoyi-ui/src/views/ehs/ehsRescueTeam/tabs_first.vue b/ruoyi-ui/src/views/ehs/ehsRescueTeam/tabs_first.vue index d9bdcbd..d2a6a29 100644 --- a/ruoyi-ui/src/views/ehs/ehsRescueTeam/tabs_first.vue +++ b/ruoyi-ui/src/views/ehs/ehsRescueTeam/tabs_first.vue @@ -145,7 +145,7 @@ export default { methods:{ async getList() { this.loading = true; - await getWorkerInfo(this.readParams.rescueTeamId).then(res => { + await getWorkerInfo({"pageNum" : this.pageNum, "pageSize" : this.pageSize, "rescueTeamId" : this.readParams.rescueTeamId}).then(res => { this.total = res.total; this.workerList = res.rows; this.loading = false;