diff --git a/eng_management_version6.zip b/eng_management_version6.zip deleted file mode 100644 index f800b7b..0000000 Binary files a/eng_management_version6.zip and /dev/null differ 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/permission.js b/src/permission.js index a268bd2..6edb396 100644 --- a/src/permission.js +++ b/src/permission.js @@ -20,6 +20,20 @@ router.beforeEach(async(to, from, next) => { // determine whether the user has logged in const hasToken = getToken() + // 检查当前环境 + const isDevelopment = process.env.NODE_ENV === 'development' + const isProduction = process.env.NODE_ENV === 'production' + + // 根据环境启用或禁用某些代码 + // 开发环境不启用ONEID + if (isDevelopment) { + console.log('开发环境,启用某些代码') + // 启用某些代码 + } else if (isProduction) { + console.log('生产环境,禁用某些代码') + // 禁用某些代码 + } + if (hasToken) { if (to.path === '/login' || to.path === '/callback') { // if is logged in, redirect to the home page @@ -39,9 +53,12 @@ router.beforeEach(async(to, from, next) => { // remove token and go to login page to re-login await store.dispatch('user/resetToken') Message.error(error || 'Has Error') - // next(`/login?redirect=${to.path}`) - // NProgress.done() - window.location.href = '' + if (isDevelopment) { + next(`/login?redirect=${to.path}`) + NProgress.done() + } else { + window.location.href = '' + } } } } @@ -52,9 +69,12 @@ router.beforeEach(async(to, from, next) => { next() } else { // other pages that do not have permission to access are redirected to the login page. - // next(`/login?redirect=${to.path}`) - window.location.href = 'https://api.oneid.siemens.com.cn/api/bff/v1.2/developer/ciam/oauth/authorize?client_id=1b867769c8cb221fb7fdb0f8beba6138TwXkI4mX8um&response_type=code&redirect_uri=http://csdc.siemens.com.cn:8001/callback&scope=openid%20phone' - // window.location.href = 'https://api.oneid.siemens.com.cn/api/bff/v1.2/developer/ciam/oauth/authorize?client_id=1b867769c8cb221fb7fdb0f8beba6138TwXkI4mX8um&response_type=code&redirect_uri=http://localhost:9528/callback&scope=openid%20phone' + if (isDevelopment) { + next(`/login?redirect=${to.path}`) + } else { + window.location.href = 'https://api.oneid.siemens.com.cn/api/bff/v1.2/developer/ciam/oauth/authorize?client_id=1b867769c8cb221fb7fdb0f8beba6138TwXkI4mX8um&response_type=code&redirect_uri=http://csdc.siemens.com.cn:8001/callback&scope=openid%20phone' + // window.location.href = 'https://api.oneid.siemens.com.cn/api/bff/v1.2/developer/ciam/oauth/authorize?client_id=1b867769c8cb221fb7fdb0f8beba6138TwXkI4mX8um&response_type=code&redirect_uri=http://localhost:9528/callback&scope=openid%20phone' + } NProgress.done() } } 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',