Merge branch 'master' of http://119.23.210.103:3000/wy/lh_firm_former

src/views/peopleManages/personComcont/RingChart.vue

@@ -68,7 +68,7 @@ export default {
               // fontSize: 20,
               position: "outside",
               fontWeight: "bold",
-              fontSize:16,
+              fontSize:12,
               padding:[0, 0, 0, 0]
               // color:'#fff'
             },

src/views/peopleManages/taskStatistics/index.vue

@@ -439,8 +439,12 @@ export default {
             name: "初级",
             value: 0,
           },
+          {
+            name: "其他",
+            value: 0,
+          }
         ],
-        color: ["#FFFF00", "#99CC00", "#6666FF"],
+        color: ["#FFFF00", "#99CC00", "#6666FF", "#FF6666"],
         config: { title: "职称显示", idSelector: "ranksid" },
       },
       personInfoData: {
@@ -770,7 +774,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_`;
+      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'`;
       await curdPost("sql", sql).then((res) => {
         data = res.variables.data;
       });
@@ -795,8 +799,9 @@ export default {
                 sum(a.zui_gao_xue_li_x_ = '本科') as undergraduate,
                 sum(a.zhi_cheng_deng_ji = '初级') as elementary,
                 sum(a.zhi_cheng_deng_ji = '中级') as middleRank,
-                sum(a.zhi_cheng_deng_ji = '高级') as senior
-                from t_ryjbqk as a join  ibps_party_employee as b on a.parent_id_= b.id_`;
+                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'`;
       await curdPost("sql", sql).then((res) => {
         data = res.variables.data;
       });
@@ -806,6 +811,7 @@ export default {
       this.ranksPieData.data[0].value = data[0].senior;
       this.ranksPieData.data[1].value = data[0].middleRank;
       this.ranksPieData.data[2].value = data[0].elementary;
+      this.ranksPieData.data[3].value = data[0].other;
     },
     preDate(dateParameter, num) {
       //往前推算日期

src/views/platform/bo/boDef/list.vue

@@ -246,9 +246,10 @@ export default {
     /**
      * 获取格式化参数
      */
-    getFormatParams(id = '') {
+    getFormatParams() {
       const params = this.$refs['crud'] ? this.$refs['crud'].getSearcFormData() : {}
-      params['Q^TYPE_ID_^S'] = id
+      params['Q^TYPE_ID_^S'] = this.typeId
+      console.log(params)
       return ActionUtils.formatParams(
         params,
         this.pagination,