diff --git a/src/views/attendance/leavechart.vue b/src/views/attendance/leavechart.vue index 6203391..65b945a 100644 --- a/src/views/attendance/leavechart.vue +++ b/src/views/attendance/leavechart.vue @@ -184,7 +184,8 @@ this.my_department_id = store.state.department?store.state.department.id:'' this.dName = store.state.department?store.state.department.name:'全部科室' if(this.my_department_id){ - if(store.state.moduleRoles.oa.includes("考勤")){ + if(store.state.moduleRoles.oa.includes("考勤统计") + || this.my_department_id==2){ this.is_bgs = true }else{ this.is_bgs = false diff --git a/src/views/attendance/leavedetailchart.vue b/src/views/attendance/leavedetailchart.vue index 395e55e..17d9024 100644 --- a/src/views/attendance/leavedetailchart.vue +++ b/src/views/attendance/leavedetailchart.vue @@ -169,7 +169,7 @@ this.my_department_id = store.state.department?store.state.department.id:'' this.dName = store.state.department?store.state.department.name:'全部科室' if(this.my_department_id){ - if(store.state.moduleRoles.oa.includes("考勤")){ + if(store.state.moduleRoles.oa.includes("考勤统计")|| this.my_department_id==2){ this.is_bgs = true }else{ this.is_bgs = false diff --git a/src/views/attendance/otherovertimechart.vue b/src/views/attendance/otherovertimechart.vue index 3559c79..e266b4a 100644 --- a/src/views/attendance/otherovertimechart.vue +++ b/src/views/attendance/otherovertimechart.vue @@ -281,7 +281,7 @@ this.my_department_id = store.state.department ? store.state.department.id : '' this.dName = store.state.department ? store.state.department.name : '全部科室' if (this.my_department_id) { - if(store.state.moduleRoles.oa.includes("考勤")){ + if(store.state.moduleRoles.oa.includes("考勤统计")|| this.my_department_id==2){ this.is_bgs = true }else{ this.is_bgs = false diff --git a/src/views/attendance/overtimechart.vue b/src/views/attendance/overtimechart.vue index ad7a103..df384db 100644 --- a/src/views/attendance/overtimechart.vue +++ b/src/views/attendance/overtimechart.vue @@ -236,7 +236,7 @@ this.my_department_id = store.state.department?store.state.department.id:'' this.dName = store.state.department?store.state.department.name:'全部科室' if(this.my_department_id){ - if(store.state.moduleRoles.oa.includes("考勤")){ + if(store.state.moduleRoles.oa.includes("考勤统计")|| this.my_department_id==2){ this.is_bgs = true }else{ this.is_bgs = false diff --git a/src/views/attendance/statistics.vue b/src/views/attendance/statistics.vue index 8562b80..ed17793 100644 --- a/src/views/attendance/statistics.vue +++ b/src/views/attendance/statistics.vue @@ -246,7 +246,7 @@ export default { created() { this.my_department_id = store.state.department?store.state.department.id:'' if(this.my_department_id){ - if(store.state.moduleRoles.oa.includes("考勤")){ + if(store.state.moduleRoles.oa.includes("考勤统计")|| this.my_department_id==2){ this.is_bgs = true }else{ this.is_bgs = false diff --git a/vue.config.js b/vue.config.js index 0041812..f29af82 100644 --- a/vue.config.js +++ b/vue.config.js @@ -25,7 +25,7 @@ module.exports = { * Detail: https://cli.vuejs.org/config/#publicpath */ publicPath: `/${process.env.VUE_APP_MODULE_NAME}`, - outputDir: process.env.VUE_APP_OUTPUT_DIR || `/Users/mac/Documents/朗业/2025/c-常州环境监测中心内控/cz_hjjc/public/${process.env.VUE_APP_MODULE_NAME}`, + outputDir: `/Users/mac/Documents/朗业/2025/c-常州环境监测中心内控/cz_hjjc/public/${process.env.VUE_APP_MODULE_NAME}`, assetsDir: 'static', lintOnSave: process.env.NODE_ENV === 'development', productionSourceMap: false,