Просмотр исходного кода

补充人员看板中考试与培训过滤

cyy 1 год назад
Родитель
Сommit
da35897f9a
1 измененных файлов с 8 добавлено и 11 удалено
  1. 8 11
      src/views/peopleManages/taskStatistics/index.vue

+ 8 - 11
src/views/peopleManages/taskStatistics/index.vue

@@ -935,7 +935,6 @@ export default {
                 this.startDate = ''
                 this.endDate = ''
             }
-            // console.log(this.startDate, this.endDate)
             this.getTrainingStatisticsData()
             this.getExamStatisticsData()
         },
@@ -1112,7 +1111,6 @@ export default {
             // ee.id_ AS eeID,ee.name_ AS eeName,ee.positions_,ry.zui_gao_xue_li_x_,ry.zhi_cheng_deng_ji
             // FROM t_ryjbqk AS ry JOIN  ibps_party_employee AS ee ON ry.parent_id_= ee.id_
             // )gy LEFT JOIN   ibps_party_entity en ON FIND_IN_SET(en.id_,gy.positions_)  where ${positionsWhere} and en.id_!='1166373874003083264' and en.name_ not like '%综合%' GROUP BY enName) jh`
-            console.log(this.$store.getters.deptList, 'this.positionsthis.positionsthis.positions')
             const a = 'SELECT 1 AS n UNION ALL SELECT 2 UNION ALL SELECT 3 UNION ALL SELECT 4 UNION ALL SELECT 5 UNION ALL SELECT 6 UNION ALL SELECT 7'
             let sqlparty = `SELECT 1 AS n`
             this.$store.getters.deptList.forEach((it, i) => {
@@ -1233,7 +1231,6 @@ export default {
                         'fuGao',
                         'gaoJi'
                     ]
-                    console.log(data)
                     for (let t = 0; t < data.length; t++) {
                         this.PositionsDegreeOption.xAxis[0].data.push(
                             data[t].enName
@@ -1366,7 +1363,9 @@ export default {
         // 通过部门 id 获取部门人员
         getPositionPeopleIds (positionId) {
             const { userList } = this.$store.getters
-            return userList.filter(user => user.positionId.indexOf(positionId) > -1)
+            // return userList.filter(user => user.positionId.indexOf(positionId) > -1)
+
+            return userList.filter(user => user.positionId.indexOf(positionId) > -1 && user.userId !== '702117247933480960' && !user.userName.includes('系统') && !user.userName.includes('金通') && !user.userName.includes('管理'))
         },
         // 根据部门和时间获取考试统计数据
         async getExamStatisticsData () {
@@ -1381,7 +1380,6 @@ export default {
                         return new Date(item.startDate).getTime() >= new Date(this.startDate).getTime() && new Date(item.startDate).getTime() <= new Date(this.endDate).getTime()
                     })
                 }
-                // console.log('考试1', data)
                 const resultData = users.map(user => {
                     let count = 0
                     let passCount = 0
@@ -1403,7 +1401,6 @@ export default {
                 resultData.sort((a, b) => {
                     return a.userId - b.userId
                 })
-                // console.log('考试', resultData)
                 // 格式化统计图需要的数据
                 this.optionExamStatisticsConfig.xAxis.data = resultData.map(item => item.userName)
                 this.optionExamStatisticsConfig.series[0].data = resultData.map(item => item.count)
@@ -1425,12 +1422,12 @@ export default {
             data.sort((a, b) => {
                 return a.id_ - b.id_
             })
-            // console.log('培训', data)
+            const dArr = data.filter(d => !d.name_.includes('系统') && !d.name_.includes('金通') && !d.name_.includes('管理'))
             // 格式化统计图需要的数据
-            this.optionTrainingStatisticsConfig.xAxis.data = data.map(item => item.name_)
-            this.optionTrainingStatisticsConfig.series[0].data = data.map(item => item.planedjoin)
-            this.optionTrainingStatisticsConfig.series[1].data = data.map(item => item.truejoin)
-            this.optionTrainingStatisticsConfig.series[2].data = data.map(item => item.participationRate)
+            this.optionTrainingStatisticsConfig.xAxis.data = dArr.map(item => item.name_)
+            this.optionTrainingStatisticsConfig.series[0].data = dArr.map(item => item.planedjoin)
+            this.optionTrainingStatisticsConfig.series[1].data = dArr.map(item => item.truejoin)
+            this.optionTrainingStatisticsConfig.series[2].data = dArr.map(item => item.participationRate)
         },
         handleFunc (e) {
             this.depth3 = e.v[0]