cyy преди 9 месеца
родител
ревизия
a17e8e3e30
променени са 1 файла, в които са добавени 36 реда и са изтрити 9 реда
  1. 36 9
      src/views/peopleManages/taskStatistics/indexDaFang.vue

+ 36 - 9
src/views/peopleManages/taskStatistics/indexDaFang.vue

@@ -153,6 +153,7 @@ import CarouselTabl from '@/views/system/jbdHome/board/component/CarouselTabl'
 import SelectPositions from '@/views/component/selectPositions'
 import screenfull from 'screenfull'
 import { getUserStatisticList } from '@/api/platform/org/employee'
+import { personZSBDashBoardPie } from '@/api/platform/spectaculars/lab'
 import { getSetting } from '@/utils/query'
 export default {
   name: 'check-board1',
@@ -985,16 +986,21 @@ export default {
         this.positionsInfoData()
         this.degreeGradeInfoData()
         this.employeeInfoData()
-        this.zsInfoData()
-        this.zsInfoDataPos()
+        if(newVal!==''){
+          this.zsInfoData()
+          this.zsInfoDataPos()
+        }
+        
       },
       deep: true,
-      immediate: true
+      // immediate: true
     },
     optionZSB: {
       handler(newVal, oldVal) {
-        this.zsInfoData()
-        this.zsInfoDataPos()
+        if(this.depth3!==''){
+          this.zsInfoData()
+          this.zsInfoDataPos()
+        }
       },
       deep: true,
       immediate: true
@@ -1510,8 +1516,11 @@ export default {
                             AND ee.name_ NOT LIKE '%管理%'
                             AND ee.id_ != '702117247933480960')`
 
-      await curdPost('sql', sql).then((res) => {
-        data = res.variables.data
+      // await curdPost('sql', sql).then((res) => {
+      //   data = res.variables.data
+      // })
+      await personZSBDashBoardPie(this.getSearchFormData('pie')).then((res)=>{
+        data = res.data.dataResult
       })
       if (data.length > 0 && data[0]) {
         console.log(data[0])
@@ -1520,6 +1529,24 @@ export default {
         })
       }
     },
+    /**
+     * 获取格式化参数
+    */
+    getSearchFormData (type) {
+    const { first, second } = this.$store.getters.level || {}
+      const queryParams = {
+        'pageNo': 1,
+        'limit': 10,
+        'param': {
+          'org': first,
+          'id': this.depth3,
+          'parentId': this.depth3,
+          'path': this.depth3,
+          'type': type
+        }
+      }
+      return queryParams
+    },
     async zsInfoDataPos() {
       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'
@@ -1594,8 +1621,8 @@ export default {
                             AND ee.name_ NOT LIKE '%管理%'
                             AND ee.id_ != '702117247933480960')`
 
-      await curdPost('sql', sql).then((res) => {
-        const data = res.variables.data
+      await personZSBDashBoardPie(this.getSearchFormData('cyl')).then((res)=>{
+        const data = res.data.dataResult
         // 组装数据集,以学历职称为列,以部门为行:{" 大专":['1','2','3']}
         const degreeSeriesDatas = this.zsOption.series
         this.zsOption.xAxis[0].data = []