fix:人员看板检测任务统计视图调整

src/views/peopleManages/taskStatistics/index.vue

@@ -44,7 +44,7 @@
         <div class="bottomView">
           <div class="detectionTask">
             <!-- <div id="echart-line" :style="{ width: '100%', height: '100%', paddingRight: '10px' }"></div> -->
-            <BarChart v-if="this.option.yAxis.data[0]" :info="option" :config="{title:'检测任务统计',id:'textJob'}" />
+            <BarChart v-if="optionPersonShow" :info="option" :config="{title:'检测任务统计',id:'textJob'}" />
           </div>
           <dv-decoration-2 :reverse="true" style="width:2%;height: 100%;" />
           <div class="taskMatters">
@@ -82,6 +82,7 @@ import CarouselTabl from "@/views/system/jbdHome/board/component/CarouselTabl";
 import screenfull from "screenfull";
 import { sync } from "@/api/platform/mail/outMail";
 import data from "@/components/ibps-icon-select/data";
+import * as index from 'diagram-js-minimap';
 export default {
   name: "checkBoard1",
   components: {
@@ -459,8 +460,8 @@ export default {
   computed: {},
   methods: {
     allView() {
+      screenfull.request();   
       // 默认显示全屏
-      screenfull.request();
     },
     goBack() {
       this.$router.back(-1);
@@ -557,37 +558,37 @@ export default {
     /**
      * 处理按钮事件
      */
-    handleAction(command, position, selection, data) {
-      switch (command) {
-        case "search": // 查询
-          const params = this.$refs["crud"]
-            ? this.$refs["crud"].getSearcFormData()
-            : {};
-          this.formLoading();
-          break;
-        default:
-          break;
-      }
-    },
+    // handleAction(command, position, selection, data) {
+    //   switch (command) {
+    //     case "search": // 查询
+    //       const params = this.$refs["crud"]
+    //         ? this.$refs["crud"].getSearcFormData()
+    //         : {};
+    //       this.formLoading();
+    //       break;
+    //     default:
+    //       break;
+    //   }
+    // },
     /**
      * 处理分页事件
      */
-    handlePaginationChange(page) {
-      this.pagination = page;
-      this.paginationFunc(this.formData);
-    },
+    // handlePaginationChange(page) {
+    //   this.pagination = page;
+    //   this.paginationFunc(this.formData);
+    // },
     // 图表数据加载
     async chartLoading() {
       // 获取所有检测人员任务统计
       let this_ = this;
       const sql = `select  *FROM (SELECT ie.ID_ AS jcId,ie.NAME_ AS jcName,COUNT(tj.zhuang_tai_ = '待数据输入' OR NULL) AS jianCeWeiWanCheng,COUNT(tj.zhuang_tai_ = '待数据校验' OR tj.zhuang_tai_ = '已完成' OR NULL) AS jianCeYiWanCheng FROM 
                           t_lhjczb tj,ibps_party_employee ie 
-                          WHERE  ie.status_ = 'actived' and ie.positions_ like '%1040709034740547584%' and tj.jian_ce_yuan_ = ie.ID_ AND tj.update_time_ BETWEEN '${this.startDate}' AND '${this.endDate}' GROUP BY jian_ce_yuan_ 
+                          WHERE  ie.status_ = 'actived' and ie.group_id_ LIKE '%1040707841519779840%' and tj.jian_ce_yuan_ = ie.ID_ AND tj.update_time_ BETWEEN '${this.startDate}' AND '${this.endDate}' GROUP BY jian_ce_yuan_ 
                           ) jc  LEFT JOIN 
                           (
                           SELECT ie.ID_ AS fhId,ie.NAME_ AS fhName,COUNT(tj.zhuang_tai_ = '待数据校验' OR NULL) AS fuHeWeiWanCheng,COUNT(tj.zhuang_tai_ = '已完成' OR NULL) AS fuHeYiWanCheng FROM 
                           t_lhjczb tj,ibps_party_employee ie 
-                          WHERE ie.status_ = 'actived' and ie.positions_ like '%1040709034740547584%' and tj.fu_he_yuan_ = ie.ID_ AND tj.update_time_ BETWEEN  '${this.startDate}' AND '${this.endDate}' GROUP BY fu_he_yuan_ 
+                          WHERE ie.status_ = 'actived' and ie.group_id_ LIKE '%1040707841519779840%' and tj.fu_he_yuan_ = ie.ID_ AND tj.update_time_ BETWEEN  '${this.startDate}' AND '${this.endDate}' GROUP BY fu_he_yuan_ 
                           ) fh ON jc.jcName = fh.fhName
                           UNION (
                           SELECT  *FROM (SELECT ie.ID_ AS jcId, ie.NAME_ AS jcName,COUNT(tj.zhuang_tai_ = '待数据输入' OR NULL) AS jianCeWeiWanCheng,COUNT(tj.zhuang_tai_ = '待数据校验' OR tj.zhuang_tai_ = '已完成' OR NULL) AS jianCeYiWanCheng FROM 
@@ -597,20 +598,25 @@ export default {
                           (
                           SELECT ie.ID_ AS fhId,ie.NAME_ AS fhName,COUNT(tj.zhuang_tai_ = '待数据校验' OR NULL) AS fuHeWeiWanCheng,COUNT(tj.zhuang_tai_ = '已完成' OR NULL) AS fuHeYiWanCheng FROM 
                           t_lhjczb tj,ibps_party_employee ie 
-                          WHERE ie.status_ = 'actived' and ie.positions_ like '%1040709034740547584%' and tj.fu_he_yuan_ = ie.ID_ AND tj.update_time_ BETWEEN  '${this.startDate}' AND '${this.endDate}' GROUP BY fu_he_yuan_ 
+                          WHERE ie.status_ = 'actived' and ie.group_id_ LIKE '%1040707841519779840%' and tj.fu_he_yuan_ = ie.ID_ AND tj.update_time_ BETWEEN  '${this.startDate}' AND '${this.endDate}' GROUP BY fu_he_yuan_ 
                           ) fh ON jc.jcName = fh.fhName
                           )`;
-      // console.log(sql,"sql")
       this.option.yAxis.data = [];
       this.option.series[0].data = [];
       this.option.series[1].data = [];
       this.option.series[2].data = [];
       this.option.series[3].data = [];
+
       this.chartData = [];
+      let dataAll =[]
+      var dataAllName = ""; 
       await curdPost("sql", sql)
         .then((res) => {
           const data = res.variables.data;
+          dataAll = data;debugger
           for (let i of data) {
+            
+            dataAllName +=i.jcName +i.fhName;
             this_.option.yAxis.data.push(i.jcName ? i.jcName : i.fhName);
             // 检测未完成数
             this_.option.series[0].data.push(
@@ -634,114 +640,133 @@ export default {
         .catch((error) => {
           console.log(error);
         });
+        console.log(dataAllName,"12321")
+        let len = this_.option.yAxis.data.length;
+        let wuData = []
+        const sql1 =`select id_,name_ FROM ibps_party_employee WHERE  status_ = 'actived' AND group_id_ LIKE '%1040707841519779840%'`;
+        await curdPost("sql", sql1).then((res) =>{
+          wuData =res.variables.data;
+          if(wuData.length != len){
+            for(let item  of wuData){
+              
+                if(!dataAllName.includes(item.name_)){
+                  this_.option.yAxis.data.push(item.name_);
+                  this_.option.series[0].data.push(0);
+                  this_.option.series[1].data.push(0);
+                  this_.option.series[2].data.push(0);
+                  this_.option.series[3].data.push(0);
+                }
+            }
+          }
+        })
     },
-    formLoading() {
-      this.loading = true;
-      let formsql = `select zhuang_tai_,fu_jian_,yang_pin_bian_hao,yang_pin_ming_che,shi_fou_he_ge_,
-                     ji_lu_bian_hao_,wei_tuo_lei_xing_,jian_ce_yuan_,fu_he_yuan_,yang_pin_lei_xing FROM t_lhjczb
-                     where update_time_ BETWEEN '${this.startDate}' AND '${this.endDate}' and `;
-      let sql = "";
+    // formLoading() {
+    //   this.loading = true;
+    //   let formsql = `select zhuang_tai_,fu_jian_,yang_pin_bian_hao,yang_pin_ming_che,shi_fou_he_ge_,
+    //                  ji_lu_bian_hao_,wei_tuo_lei_xing_,jian_ce_yuan_,fu_he_yuan_,yang_pin_lei_xing FROM t_lhjczb
+    //                  where update_time_ BETWEEN '${this.startDate}' AND '${this.endDate}' and `;
+    //   let sql = "";
 
-      const params = this.$refs["crud"]
-        ? this.$refs["crud"].getSearcFormData()
-        : {};
-      // console.log("params:", params)
+    //   const params = this.$refs["crud"]
+    //     ? this.$refs["crud"].getSearcFormData()
+    //     : {};
+    //   // console.log("params:", params)
 
-      switch (this.setParams.seriesName) {
-        case "未完成检测项目情况":
-          sql =
-            formsql +
-            `zhuang_tai_ = '待数据输入' and jian_ce_yuan_='${
-              this.chartData[this.setParams.dataIndex].jcId
-            }'`;
-          break;
-        case "已完成检测项目情况":
-          sql =
-            formsql +
-            `(zhuang_tai_ = '待数据校验' or zhuang_tai_ = '已完成') and jian_ce_yuan_='${
-              this.chartData[this.setParams.dataIndex].jcId
-            }'`;
-          break;
-        case "未完成复核项目情况":
-          sql =
-            formsql +
-            `zhuang_tai_ = '待数据校验' and fu_he_yuan_='${
-              this.chartData[this.setParams.dataIndex].fhId
-            }'`;
-          break;
-        case "已完成复核项目情况":
-          sql =
-            formsql +
-            `zhuang_tai_ = '已完成' and fu_he_yuan_='${
-              this.chartData[this.setParams.dataIndex].fhId
-            }'`;
-          break;
-        default:
-          break;
-      }
-      sql =
-        sql +
-        `${
-          params.yang_pin_lei_xing
-            ? ` and yang_pin_lei_xing like '%${params.yang_pin_lei_xing}%'`
-            : ``
-        }`;
-      sql =
-        sql +
-        `${
-          params.shi_fou_he_ge_
-            ? ` and shi_fou_he_ge_ like '%${params.shi_fou_he_ge_}%'`
-            : ``
-        }`;
-      sql =
-        sql +
-        `${
-          params.yang_pin_bian_hao
-            ? ` and yang_pin_bian_hao like '%${params.yang_pin_bian_hao}%'`
-            : ``
-        }`;
-      sql =
-        sql +
-        `${
-          params.yang_pin_ming_che
-            ? ` and yang_pin_ming_che like '%${params.yang_pin_ming_che}%'`
-            : ``
-        }`;
+    //   switch (this.setParams.seriesName) {
+    //     case "未完成检测项目情况":
+    //       sql =
+    //         formsql +
+    //         `zhuang_tai_ = '待数据输入' and jian_ce_yuan_='${
+    //           this.chartData[this.setParams.dataIndex].jcId
+    //         }'`;
+    //       break;
+    //     case "已完成检测项目情况":
+    //       sql =
+    //         formsql +
+    //         `(zhuang_tai_ = '待数据校验' or zhuang_tai_ = '已完成') and jian_ce_yuan_='${
+    //           this.chartData[this.setParams.dataIndex].jcId
+    //         }'`;
+    //       break;
+    //     case "未完成复核项目情况":
+    //       sql =
+    //         formsql +
+    //         `zhuang_tai_ = '待数据校验' and fu_he_yuan_='${
+    //           this.chartData[this.setParams.dataIndex].fhId
+    //         }'`;
+    //       break;
+    //     case "已完成复核项目情况":
+    //       sql =
+    //         formsql +
+    //         `zhuang_tai_ = '已完成' and fu_he_yuan_='${
+    //           this.chartData[this.setParams.dataIndex].fhId
+    //         }'`;
+    //       break;
+    //     default:
+    //       break;
+    //   }
+    //   sql =
+    //     sql +
+    //     `${
+    //       params.yang_pin_lei_xing
+    //         ? ` and yang_pin_lei_xing like '%${params.yang_pin_lei_xing}%'`
+    //         : ``
+    //     }`;
+    //   sql =
+    //     sql +
+    //     `${
+    //       params.shi_fou_he_ge_
+    //         ? ` and shi_fou_he_ge_ like '%${params.shi_fou_he_ge_}%'`
+    //         : ``
+    //     }`;
+    //   sql =
+    //     sql +
+    //     `${
+    //       params.yang_pin_bian_hao
+    //         ? ` and yang_pin_bian_hao like '%${params.yang_pin_bian_hao}%'`
+    //         : ``
+    //     }`;
+    //   sql =
+    //     sql +
+    //     `${
+    //       params.yang_pin_ming_che
+    //         ? ` and yang_pin_ming_che like '%${params.yang_pin_ming_che}%'`
+    //         : ``
+    //     }`;
 
-      curdPost("sql", sql)
-        .then((res) => {
-          this.loading = false;
-          const data = res.variables.data;
-          this.formData = res.variables.data;
-          document.getElementsByClassName(
-            "el-pagination__rightwrapper"
-          )[0].style.display = "none";
-          this.paginationFunc(res.variables.data);
-        })
-        .catch((error) => {
-          console.log(error);
-          this.loading = false;
-        });
-    },
+    //   curdPost("sql", sql)
+    //     .then((res) => {
+    //       this.loading = false;
+    //       const data = res.variables.data;
+    //       this.formData = res.variables.data;
+    //       document.getElementsByClassName(
+    //         "el-pagination__rightwrapper"
+    //       )[0].style.display = "none";
+    //       this.paginationFunc(res.variables.data);
+    //     })
+    //     .catch((error) => {
+    //       console.log(error);
+    //       this.loading = false;
+    //     });
+    // },
     /**
      * 数据分页
      * par:[]
      * pagination: { limit: 20, page: 1 },
      */
-    paginationFunc(par) {
-      this.formDataFiiter = [];
-      for (
-        var i =
-          this.pagination.limit * this.pagination.page - this.pagination.limit;
-        i < this.pagination.limit * this.pagination.page;
-        i++
-      ) {
-        if (i < this.formData.length) {
-          this.formDataFiiter.push(this.formData[i]);
-        }
-      }
-    },
-    changeDate(value) {
+    // paginationFunc(par) {
+    //   this.formDataFiiter = [];
+    //   for (
+    //     var i =
+    //       this.pagination.limit * this.pagination.page - this.pagination.limit;
+    //     i < this.pagination.limit * this.pagination.page;
+    //     i++
+    //   ) {
+    //     if (i < this.formData.length) {
+    //       this.formDataFiiter.push(this.formData[i]);
+    //     }
+    //   }
+    // },
+    async changeDate(value) {
       let year = value[1].getFullYear();
       let month = value[1].getMonth() + 1;
       // 这里传入的是整数时间，返回的是下个月的第一天，因为月份是0-11
@@ -767,7 +792,7 @@ export default {
         (value[0].getDate() > 9
           ? value[0].getDate()
           : "0" + value[0].getDate());
-      this.chartLoading();
+      await this.chartLoading();
       this.getTtaskMattersData();
     },
     //员工基本信息 轮播表数据
@@ -777,7 +802,7 @@ export default {
       let data = [];
       let personInfo = [];
       // let ranksObj = {};
-      let sql = `select a.id_,a.parent_id_,b.name_,a.zui_gao_xue_li_x_,a.zhi_cheng_deng_ji,b.jian_ding_zi_ge_z,a.ru_zhi_shi_jian_ from  t_ryjbqk as a join  ibps_party_employee as b on a.parent_id_= b.id_ where a.id_ !='861622496187645952' AND b.status_ = 'actived' and  b.group_id_ != ""`;
+      let sql = `select a.id_,a.parent_id_,b.name_,a.zui_gao_xue_li_x_,a.zhi_cheng_deng_ji,b.jian_ding_zi_ge_z,a.ru_zhi_shi_jian_ from  t_ryjbqk as a join  ibps_party_employee as b on a.parent_id_= b.id_ where a.id_ !='861622496187645952' AND b.status_ = 'actived' and  b.GROUP_ID_ != ''`;
       await curdPost("sql", sql).then((res) => {
         data = res.variables.data;
       });
@@ -804,7 +829,7 @@ export default {
                 sum(a.zhi_cheng_deng_ji = '中级') as middleRank,
                 sum(a.zhi_cheng_deng_ji = '高级') as senior,
                 sum(a.zhi_cheng_deng_ji = ''||a.zhi_cheng_deng_ji is null) as other
-                from t_ryjbqk as a join  ibps_party_employee as b on a.parent_id_= b.id_ where b.id_ != '702117247933480960' AND b.status_ = 'actived' and b.group_id_ != ""`;
+                from t_ryjbqk as a join  ibps_party_employee as b on a.parent_id_= b.id_ where b.id_ != '702117247933480960' AND b.status_ = 'actived' and b.GROUP_ID_ != ''`;
       await curdPost("sql", sql).then((res) => {
         data = res.variables.data;
       });
@@ -843,7 +868,7 @@ export default {
       return dateString;
     },
   },
-  created() {
+  async created() {
     if (screenfull.isEnabled && !screenfull.isFullscreen) {
       this.allView();
     }
@@ -870,9 +895,9 @@ export default {
           initendDate.getDate()
       ),
     ];
-    this.chartLoading();
+    await this.chartLoading();
     this.employeeInfoData();
-    this.degreeGradeInfoData();
+    this.degreeGradeInfoData();//学位统计
     this.getTtaskMattersData();
   },
   beforeDestroy() {
@@ -880,9 +905,9 @@ export default {
       screenfull.toggle();
     }
   },
-  mounted() {
-    // this.initChart();
-  },
+  // mounted() {
+  //   // this.initChart();
+  // },
 };
 </script>
   <style lang="less" scoped>