diff --git a/src/api/select.js b/src/api/select.js index b091bf4..4a7ca1b 100644 --- a/src/api/select.js +++ b/src/api/select.js @@ -10,7 +10,8 @@ export const reqGetRegionAndCity = () => request({ url: `/WRD-admin/sys/user/Rei // export const reqSelectEngiStatus = (year, month, page, limit) => request({ url: `/WRD-admin/sys/workorder/page`, method: 'get', params: { year, month, page, limit } }); // 带部门 -export const reqSelectEngiStatusByDept = (year, month, deptId, page, limit) => request({ url: `/WRD-admin/sys/workorder/pageSelect`, method: 'get', params: { year, month, deptId, page, limit }}) +// export const reqSelectEngiStatusByDept = (year, month, deptId, page, limit) => request({ url: `/WRD-admin/sys/workorder/pageSelect`, method: 'get', params: { year, month, deptId, page, limit }}) +export const reqSelectEngiStatusByDept = (year, month, deptId, page, limit, gids) => request({ url: `/WRD-admin/sys/workorder/pageSelectV2`, method: 'get', params: { year, month, deptId, page, limit, gids }}) // 工程师状态查询 export const reqSelectEngiStatusByMap = (year, month, page, limit) => request({ url: `/WRD-admin/sys/workorder/pageSelect`, method: 'get', params: { year, month, page, limit }}) diff --git a/src/views/record/index.vue b/src/views/record/index.vue index 2569d64..b983474 100644 --- a/src/views/record/index.vue +++ b/src/views/record/index.vue @@ -1293,15 +1293,19 @@ export default { } this.engiArray = resultOfSelectEngisByDept.data.list this.total = resultOfSelectEngisByDept.data.total + console.log(this.engiArray.map(item => item.gid)) } + const gids = this.engiArray.map(item => item.gid).join(',') + console.log(gids) const resOfSelectEngiStatusByMap = await this.$API.select.reqSelectEngiStatusByDept( year, month, departmentId, page, - limit + limit, + gids ) console.log(this.engiArray, resOfSelectEngiStatusByMap) if (resOfSelectEngiStatusByMap.code === 0) { diff --git a/vue.config.js b/vue.config.js index d6ff8a2..4f19d21 100644 --- a/vue.config.js +++ b/vue.config.js @@ -24,7 +24,7 @@ module.exports = { * In most cases please use '/' !!! * Detail: https://cli.vuejs.org/config/#publicpath */ - publicPath: './', + publicPath: '/', outputDir: 'dist', assetsDir: 'static', lintOnSave: process.env.NODE_ENV === 'development',