人员看板调整

src/views/peopleManages/personComcont/RingChart.vue

@@ -56,7 +56,7 @@ export default {
           }
         },
         label: {
-          formatter: '{b}:{d}%'
+          formatter: '{b}{c}人，{d}%'
         },
         series: [
           {

src/views/peopleManages/taskStatistics/index.vue

@@ -12,7 +12,7 @@
         </div>
         <div class="contain">
           <!-- <div class="personNum">员工数量:{{ employeeNum }}</div> -->
-          <dv-decoration-11 class="personNum" style="margin-left:10%"><i class="el-icon-user" style="color:#4ea5d6;margin-right: 3px;"></i> 员工数量:{{ employeeNum   }}人</dv-decoration-11>
+          <dv-decoration-11 class="personNum" style="margin-left:10%"><i class="el-icon-user" style="color:#4ea5d6;margin-right: 3px;"></i> 员工数量:{{ employeeNum}}人</dv-decoration-11>
           <dv-border-box-8 class="date" style="margin-right:10%; display: flex; align-items: center;">
             <div style="width:25%;display: inline-block;margin-right: 3px;">统计时间:</div>
             <el-date-picker style="width:75%;" v-model="monthValues" type="monthrange" align="right" unlink-panels range-separator="至" start-placeholder="开始月份" end-placeholder="结束月份" :picker-options="pickerOptions" @change="changeDate">
@@ -29,7 +29,7 @@
         <!-- <dv-decoration-10 style="height:2%;width:100%;" /> -->
         <div class="middleView">
           <div class="viewLeft">
-            <pieView v-if="degreePieData.data[0].value" :info="degreePieData" />
+            <pieView v-if="degreePieData.data[0].value" :info="degreePieData" :views={ifture:true} />
           </div>
           <dv-decoration-2 :reverse="true" style="width:2%;height: 100%;" />
           <div class="viewCenter">
@@ -777,7 +777,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'`;
+      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_ != 'deleted'`;
       await curdPost("sql", sql).then((res) => {
         data = res.variables.data;
       });
@@ -804,7 +804,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'`;
+                from t_ryjbqk as a join  ibps_party_employee as b on a.parent_id_= b.id_ where b.id_ != '702117247933480960' AND b.status_ != 'deleted'`;
       await curdPost("sql", sql).then((res) => {
         data = res.variables.data;
       });

src/views/system/jbdHome/board/component/getPieView.vue

@@ -17,7 +17,14 @@ export default {
   props:{
     info:{
       type:Object,
-      default:{}
+    },
+    views:{
+      type:Object,
+      default: ()=> {
+        return {
+          ifture:false,
+        }
+      }
     }
   },
   mounted() {
@@ -54,14 +61,13 @@ export default {
           formatter: '{d}%'
         },
         label: {
-          formatter: '{b}\n({d}%)',
+          formatter: this.views.ifture == true?'{b}{c}人，{d}%':'{b}\n({d}%)',
           edgeDistance: "20%"
         },
         
         legend: {
           show: true,
           z: 3,
-          
           // orient: 'vertical', 标题横竖//
           left: 'right',
           textStyle:{
@@ -70,7 +76,7 @@ export default {
         },
         series: [{
           type: 'pie',
-          radius: '50%',
+          radius: '60%',
           center: ['50%', '50%'],
           data:this.info.data,
           emphasis: {