fix: 修复history模式下报错 & fix: 派工页面故障
This commit is contained in:
parent
cd5031f807
commit
eab54b9320
|
@ -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 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 }})
|
export const reqSelectEngiStatusByMap = (year, month, page, limit) => request({ url: `/WRD-admin/sys/workorder/pageSelect`, method: 'get', params: { year, month, page, limit }})
|
||||||
|
|
|
@ -1293,15 +1293,19 @@ export default {
|
||||||
}
|
}
|
||||||
this.engiArray = resultOfSelectEngisByDept.data.list
|
this.engiArray = resultOfSelectEngisByDept.data.list
|
||||||
this.total = resultOfSelectEngisByDept.data.total
|
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 =
|
const resOfSelectEngiStatusByMap =
|
||||||
await this.$API.select.reqSelectEngiStatusByDept(
|
await this.$API.select.reqSelectEngiStatusByDept(
|
||||||
year,
|
year,
|
||||||
month,
|
month,
|
||||||
departmentId,
|
departmentId,
|
||||||
page,
|
page,
|
||||||
limit
|
limit,
|
||||||
|
gids
|
||||||
)
|
)
|
||||||
console.log(this.engiArray, resOfSelectEngiStatusByMap)
|
console.log(this.engiArray, resOfSelectEngiStatusByMap)
|
||||||
if (resOfSelectEngiStatusByMap.code === 0) {
|
if (resOfSelectEngiStatusByMap.code === 0) {
|
||||||
|
|
|
@ -24,7 +24,7 @@ module.exports = {
|
||||||
* In most cases please use '/' !!!
|
* In most cases please use '/' !!!
|
||||||
* Detail: https://cli.vuejs.org/config/#publicpath
|
* Detail: https://cli.vuejs.org/config/#publicpath
|
||||||
*/
|
*/
|
||||||
publicPath: './',
|
publicPath: '/',
|
||||||
outputDir: 'dist',
|
outputDir: 'dist',
|
||||||
assetsDir: 'static',
|
assetsDir: 'static',
|
||||||
lintOnSave: process.env.NODE_ENV === 'development',
|
lintOnSave: process.env.NODE_ENV === 'development',
|
||||||
|
|
Loading…
Reference in New Issue