优化实验室看板，更改crm看板

src/views/crm/tongji.vue

@@ -7,7 +7,7 @@
           <header-decoration />
           <div class="pickDate">
             <div style="width:100%;text-align:left;">
-              <span>月份:</span>
+              <span>年份:</span>
               <el-date-picker
                 v-model="allDate"
                 style="color: #000 !important;
@@ -15,10 +15,10 @@
                 height:2.825rem;
                 line-height: 2.825rem;
                 text-align:center;"
-                type="month"
-                value-format="yyyy-MM"
+                type="year"
+                value-format="yyyy"
                 @change="refreshAll(allDate)"
-                placeholder="选择月">
+                placeholder="选择年份">
               </el-date-picker>
             </div>
             <div 
@@ -32,19 +32,19 @@
           </div>
         </div>
         <div class="customerC" v-if="authority">
-          <dv-border-box-7  backgroundColor="rgba(6, 30, 93, 0.5)" >
+          <!-- <dv-border-box-7  backgroundColor="rgba(6, 30, 93, 0.5)" >
             <div class="ttitle">
               <div v-if="csArr.length>0" class="middleFont">各渠道客户数量</div>
               <customer-statistics v-if="csArr.length>0" :data = 'csArr'></customer-statistics>
               <div class="nullDate" v-else>暂无数据</div>
             </div>
-          </dv-border-box-7>
+          </dv-border-box-7> -->
 
-          <dv-border-box-7 style="width:49.5%;" backgroundColor="rgba(6, 30, 93, 0.5)">
+          <dv-border-box-7 style="width:100%;" backgroundColor="rgba(6, 30, 93, 0.5)">
             <div class="ttitle">
               <div class="middleFont" v-if="tableData.data && tableData.data.length">月度客户送检量</div>
               <dv-scroll-board style="height: 87%;"
-                v-if="tableData.data && tableData.data.length"
+                v-if="tableData.data.length>0"
                 :config="tableData"
               />
               <div class="nullDate" v-else>暂无数据</div>
@@ -144,10 +144,10 @@
         pmArr:[],
         peArr:[],
         tableData:{
-          header: ['<span style="font-size:12px">送检公司</span>', '<span style="font-size:12px">付款方式</span>', '<span style="font-size:12px">价格</span>（元）</span>'],
+          header: ['<span style="font-size:12px">送检公司</span>', '<span style="font-size:12px">委托数量</span>','<span style="font-size:12px">样品数量</span>', '<span style="font-size:12px">价格</span>（元）</span>'],
           rowNum: 15,
-          columnWidth: [400, 150,400],
-          align: ['left','left','right'],
+          columnWidth: [500, 450, 450,500],
+          align: ['left','left','left','right'],
           data: [
             ['行1列1', '行1列2', '行1列3'],
             ['行2列1', '行2列2', '行2列3'],
@@ -220,10 +220,10 @@
 
         let dateNum = new Date(date.year, date.month, 0).getDate();
 
-        this.getCustomerStatisticsYear(this.allDate)
+        // this.getCustomerStatisticsYear(this.allDate)
         // this.getCustomerStatisticsMonth(this.allDate)
         // this.getIndividualPerformanceMonth(this.allDate)
-        this.getIndividualPerformanceCustomerMonth(this.allDate)
+        this.getIndividualPerformanceCustomerMonth(date.year)
         // this.getTeamPerformance(this.allDate)
         // this.getTeamPerformanceMonth(this.allDate)
         // this.getpersonPerformanceAll(this.allDate)
@@ -234,7 +234,7 @@
       },
       refreshAll(date){
         let dateNum = new Date(this.allDate.split('-')[0], Number(this.allDate.split('-')[1])+'', 0).getDate();
-        this.getCustomerStatisticsYear(date)
+        // this.getCustomerStatisticsYear(date)
         // this.getCustomerStatisticsMonth(date)
         // this.getIndividualPerformanceMonth(date)
         this.getIndividualPerformanceCustomerMonth(date)
@@ -282,16 +282,17 @@
         })
       },
       getIndividualPerformanceCustomerMonth(date){
-        this.tableData.data.length = 0
-        let sql = "select d.*,SUM(t_lhwtsqb.zong_jia_) as jiage from (select * from t_bjd LEFT JOIN (select a.id_ as leibieid,a.lai_yuan_qu_dao_ as laiyuan,b.id_ as qudaoid, b.lei_bie_ from ((select id_, lai_yuan_qu_dao_ from t_qzkhb GROUP BY id_) UNION (select id_, lai_yuan_qu_dao_ from t_yxkh GROUP BY id_) UNION (select ke_hu_ming_cheng_, ke_hu_lai_yuan_ as khnum from t_khxx GROUP BY ke_hu_ming_cheng_)) as a LEFT JOIN (select t_qdgl.id_,t_qdlbb.lei_bie_ from t_qdgl LEFT JOIN t_qdlbb on t_qdgl.qu_dao_lei_bie_ = t_qdlbb.id_) as b on a.lai_yuan_qu_dao_ = b.id_) as c on t_bjd.ke_hu_ming_cheng_ = c.leibieid where t_bjd.shi_xiao_shi_jian = '"+date+"%' or t_bjd.zhuang_tai_ ='生效中') as d left join t_lhwtsqb on t_lhwtsqb.he_tong_id_ = d.id_ WHERE t_lhwtsqb.shi_fou_guo_shen_ = '1' and t_lhwtsqb.create_time_ like '"+date+"%' GROUP BY d.zhuan_huan_ke_hu_"
+        this.tableData.data.splice(0)
+        let aa=[]
+        let sql = "select d.*,COUNT(e.yps) as yps,COUNT(e.wts) as wts,SUM(e.zong_jia_) as jiage from(select * from t_bjd LEFT JOIN (select a.id_ as leibieid,a.lai_yuan_qu_dao_ as laiyuan from ((select id_, lai_yuan_qu_dao_ from t_qzkhb GROUP BY id_) UNION (select id_, lai_yuan_qu_dao_ from t_yxkh GROUP BY id_) UNION (select ke_hu_ming_cheng_, ke_hu_lai_yuan_ as khnum from t_khxx GROUP BY ke_hu_ming_cheng_)) as a ) as c on t_bjd.ke_hu_ming_cheng_ = c.leibieid where t_bjd.shi_xiao_shi_jian like '"+date+"%' or t_bjd.zhuang_tai_ ='生效中') as d LEFT JOIN (select t_lhwtzsb.zhuang_tai_,t_lhwtsqb.create_time_,t_lhwtsqb.he_tong_id_,t_lhwtsqb.id_ as wts,t_lhwtsqb.zong_jia_,t_lhwtzsb.yang_pin_bian_hao as yps from t_lhwtsqb LEFT JOIN t_lhwtzsb on t_lhwtzsb.shen_qing_id_ = t_lhwtsqb.zhan_shi_biao_id_ where t_lhwtzsb.zhuang_tai_ = '已完成' or t_lhwtsqb.create_time_ like '"+date+"%') as e on e.he_tong_id_ = d.id_ GROUP BY d.he_tong_bian_hao_"
         curdPost('sql',sql).then(res=>{
           let arr = res.variables.data
           for (var i = 0; i < arr.length; i++) {
-            let changeArr = ['<span style="font-size:12px">' + arr[i].zhuan_huan_ke_hu_ + '</span>','<span style="font-size:12px">' + arr[i].fu_kuan_fang_shi_ + '</span>','<span style="font-size:12px">' + this.moneyFormat(arr[i].jiage) + '</span>']
-            this.tableData.data.push(changeArr)
+            let changeArr = ['<span style="font-size:12px">' + arr[i].zhuan_huan_ke_hu_ + '</span>','<span style="font-size:12px">' + arr[i].wts + '</span>','<span style="font-size:12px">' + arr[i].yps + '</span>','<span style="font-size:12px">' + this.moneyFormat(arr[i].jiage) + '</span>']
+            aa.push(changeArr)
           }
-          // }
-          // console.log(this.orArr,'oraaaaaaa')
+          this.$set(this.tableData, 'data', aa)
+          console.log(sql,arr,this.tableData.data)
         })
       },
       getTeamPerformance(date){
@@ -460,7 +461,7 @@
     div{height:100%;}
     .middleFont{
       text-align: center;
-      height: 13%;
+      height: 9%;
       display: flex;
 		  align-items: center;
       justify-content: center;

src/views/statistics/index.vue

@@ -1,8 +1,8 @@
 <template>
-  <dv-full-screen-container>
+  <dv-full-screen-container >
     <el-scrollbar class="screen" ref="scrollDiv" >
     <!-- :style="{height:height}" -->
-      <div class="statistics">
+      <div class="statistics" v-on:mouseenter="rollstop" v-on:mouseleave="rollcontinue">
         <div class="editDate">
            <!-- 标题装饰组件 -->
           <header-decoration /> 
@@ -68,7 +68,7 @@
           <!-- <div class="goBackButton" @click.prevent="goBack()" >
             返回
           </div> -->
-          <div 
+          <!-- <div 
             @click.prevent="rollstop()" 
             style="width: 8%;
             height:2.825rem;
@@ -89,7 +89,7 @@
             margin: -3% 17.1% 0 0;" 
             v-else>
             <dv-border-box-8>继续</dv-border-box-8>
-          </div>
+          </div> -->
           <div 
             @click.prevent="goBack()" 
             style="width: 8%;
@@ -97,7 +97,7 @@
             line-height: 2.825rem;
             text-align:center;
             float: right;
-            margin: -3% 8.1% 0 0;" >
+            margin: -3% 17.1% 0 0;" >
             <dv-border-box-8>返回</dv-border-box-8>
           </div>
           
@@ -330,7 +330,7 @@ import * as forEach from 'lodash/forEach'
       this.timer1 = setInterval(()=>{
         this.pageOT = !this.pageOT
         console.log(this.pageOT)
-      },5000)
+      },8000)
     },
     data() {
       return {
@@ -572,11 +572,14 @@ import * as forEach from 'lodash/forEach'
         this.timer1 = setInterval(()=>{
           this.pageOT = !this.pageOT
           console.log(this.pageOT)
-        },5000)
+        },8000)
+        console.log('111111111111111111122222222222222222222222222')
         this.rollup=true
       },
       rollstop(){
         clearInterval(this.timer1);
+        console.log('333333333333333333333333333333333333444444444444444444444444')
+
         this.rollup=false
       }
     },

src/views/statistics/item/s10waiBuNengLi.vue

@@ -67,27 +67,8 @@
       },
       drawLine(){
         let s10waiBuNengLi = echarts.init(document.getElementById(this.id))
-         
-
-          
-        // let beginInof = GetPercent(Number(this.data.t_sbhcjlbBegin.number),Number(this.data.t_sbhcjhBegin.number))
-        // let endInof = GetPercent(Number(this.data.t_sbhcjlbEnd.number),Number(this.data.t_sbhcjhEnd.number))
-         
-        //  let data1 = [];
-        //  data1.push(this.data.t_sbhcjhBegin.number);
-        //  data1.push(this.data.t_sbhcjhEnd.number);
-        //  let data2 = [];
-        //  data2.push(this.data.t_sbhcjlbBegin.number);
-        //  data2.push(this.data.t_sbhcjlbEnd.number);
-        //  let data3 = [];
-        //  data3.push(this.data.t_sbhcjlbBegin.date);
-        //  data3.push(this.data.t_sbhcjlbEnd.date);
-        //  let max1=GetMax(data1)+1;
-        //  let max2=GetMax(data2)+1;
-        //  let maxVal=max1>max2?max1:max2;
-        //  console.log("max1:",max1,"max2:",max2);
-        let e = 100 -this.data.Num.valna
-        console.log(e,'eeeeeeeeeeeeeeeeeeeeeeeeeeeeee')
+      
+        let e = (100 -this.data.Num.valna).toFixed(2)*1
 
        let option = {
           //v3
@@ -106,11 +87,13 @@
               type: 'pie',
               radius: '50%',
               label: {
-                formatter: '{b}: {d}%'
+                formatter: function (arg) {
+                    return arg.data.name +'\n' + arg.data.value + "%"+'\n'+ arg.data.v2
+                }
               },
               data: [
-                { value: this.data.Num.valna, name: '完成率' },
-                { value: e, name: '未完成率' }
+                { value: this.data.Num.valna, name: '完成率' ,v2:this.data.Num.valnum},
+                { value: e, name: '未完成率',v2:this.data.Num.valAll-this.data.Num.valnum }
               ],
               emphasis: {
                 itemStyle: {

src/views/statistics/item/s11biaoZhunWu.vue

@@ -104,11 +104,13 @@
               type: 'pie',
               radius: '50%',
               label: {
-                formatter: '{b}: {d}%'
+                formatter: function (arg) {
+                    return arg.data.name +'\n' + arg.data.value + "%"+'\n'+ arg.data.v2
+                }
               },
               data: [
-                { value: this.data.Num.valna, name: '完成率' },
-                { value: e, name: '未完成率' }
+                { value: this.data.Num.valna, name: '完成率',v2:this.data.Num.valAll },
+                { value: e, name: '未完成率',v2:this.data.Num.valnum-this.data.Num.valAll }
               ],
               emphasis: {
                 itemStyle: {

src/views/statistics/item/s12fengXian.vue

@@ -96,11 +96,13 @@
               type: 'pie',
               radius: '50%',
               label: {
-                formatter: '{b}: {d}%'
+                formatter: function (arg) {
+                    return arg.data.name +'\n' + arg.data.value + "%"+'\n'+ arg.data.v2
+                }
               },
               data: [
-                { value: this.data.t_mjsyshdfxsbykzjhxbNum.res[0], name: '完成率' },
-                { value: e, name: '未完成率' }
+                { value: this.data.t_mjsyshdfxsbykzjhxbNum.res[0], name: '完成率' ,v2:this.data.t_mjsyshdfxsbykzjhxbNum.number[0]},
+                { value: e, name: '未完成率' ,v2:this.data.t_mjsyshdfxsbykzjhxbNum.numberAll[0]}
               ],
               emphasis: {
                 itemStyle: {

src/views/statistics/item/s13shengWu.vue

@@ -101,11 +101,13 @@
               type: 'pie',
               radius: '50%',
               label: {
-                formatter: '{b}: {d}%'
+                formatter: function (arg) {
+                    return arg.data.name +'\n' + arg.data.value + "%"+'\n'+ arg.data.v2
+                }
               },
               data: [
-                { value: this.data.t_complaintNum.res1[0], name: '及时率' },
-                { value: e, name: '不及时率' }
+                { value: this.data.t_complaintNum.res1[0], name: '及时率',v2: this.data.t_complaintNum.num48},
+                { value: e, name: '不及时率' ,v2: this.data.t_complaintNum.number-this.data.t_complaintNum.num48}
               ],
               emphasis: {
                 itemStyle: {

src/views/statistics/item/s14bufuhexiang.vue

@@ -78,8 +78,7 @@
         //v3
         // let e=[this.data.t_mjsyshdfxsbykzjhxbNum.number[0],this.data.t_mjsyshdfxsbykzjhxbNum.numberAll[0],this.data.t_mjsyshdfxsbykzjhxbNum.res[0]]
         let e = 100 -this.data.t_bfhxbgyjzcsjlbxNum.res[0]
-
-
+        console.log(this.data.t_bfhxbgyjzcsjlbxNum.number,'dfsdf')
         option = {
           title: {
             text: this.title,
@@ -96,11 +95,13 @@
               type: 'pie',
               radius: '50%',
               label: {
-                formatter: '{b}: {d}%'
+                formatter: function (arg) {
+                    return arg.data.name +'\n' + arg.data.value + "%"+'\n'+ arg.data.v2
+                }
               },
               data: [
-                { value: this.data.t_bfhxbgyjzcsjlbxNum.res[0], name: '完成率' },
-                { value: e, name: '未完成率' }
+                { value: this.data.t_bfhxbgyjzcsjlbxNum.res[0], name: '完成率',v2:this.data.t_bfhxbgyjzcsjlbxNum.number[0] },
+                { value: e, name: '未完成率',v2:this.data.t_bfhxbgyjzcsjlbxNum.numberAll[0]-this.data.t_bfhxbgyjzcsjlbxNum.number[0] }
               ],
               emphasis: {
                 itemStyle: {

src/views/statistics/item/s15tousu.vue

@@ -105,11 +105,13 @@
               type: 'pie',
               radius: '50%',
               label: {
-                formatter: '{b}: {d}%'
+                formatter: function (arg) {
+                    return arg.data.name +'\n' + arg.data.value + "%"+'\n'+ arg.data.v2
+                }
               },
               data: [
-                { value: this.data.t_complaintNum.res2[0], name: '完成率' },
-                { value: e, name: '未完成率' }
+                { value: this.data.t_complaintNum.res2[0], name: '完成率' ,v2:this.data.t_complaintNum.numtong},
+                { value: e, name: '未完成率',v2:this.data.t_complaintNum.number[0]-this.data.t_complaintNum.numtong[0] }
               ],
               emphasis: {
                 itemStyle: {

src/views/statistics/item/s16bzJunZhu.vue

@@ -104,11 +104,13 @@
               type: 'pie',
               radius: '50%',
               label: {
-                formatter: '{b}: {d}%'
+                formatter: function (arg) {
+                    return arg.data.name +'\n' + arg.data.value + "%"+'\n'+ arg.data.v2
+                }
               },
               data: [
-                { value: this.data.Num.valna, name: '完成率' },
-                { value: e, name: '未完成率' }
+                { value: this.data.Num.valna, name: '完成率',v2: this.data.Num.valAll},
+                { value: e, name: '未完成率',v2: this.data.Num.valnum-this.data.Num.valAll }
               ],
               emphasis: {
                 itemStyle: {

src/views/statistics/item/s17bzXiBao.vue

@@ -104,11 +104,13 @@
               type: 'pie',
               radius: '50%',
               label: {
-                formatter: '{b}: {d}%'
+                formatter: function (arg) {
+                    return arg.data.name +'\n' + arg.data.value + "%"+'\n'+ arg.data.v2
+                }
               },
               data: [
-                { value: this.data.Num.valna, name: '完成率' },
-                { value: e, name: '未完成率' }
+                { value: this.data.Num.valna, name: '完成率' ,v2:this.data.Num.valAll},
+                { value: e, name: '未完成率' ,v2:this.data.Num.valnum-this.data.Num.valAll}
               ],
               emphasis: {
                 itemStyle: {

src/views/statistics/item/s1jianCe.vue

@@ -109,11 +109,13 @@
               type: 'pie',
               radius: '50%',
               label: {
-                formatter: '{b}: {d}%'
+                formatter: function (arg) {
+                    return arg.data.name +'\n' + arg.data.value + "%"+'\n'+ arg.data.v2
+                }
               },
               data: [
-                { value: this.data.t_mjjcbgNum.res[0], name: '差错率' },
-                { value: e, name: '正确率' }
+                { value: this.data.t_mjjcbgNum.res[0], name: '差错率',v2:this.data.t_mjjcbgNum.number },
+                { value: e, name: '正确率' ,v2:this.data.t_mjjcbgNum.numberAll-this.data.t_mjjcbgNum.number  }
               ],
               emphasis: {
                 itemStyle: {

src/views/statistics/item/s1zhiLiangMuBiao.vue

@@ -89,6 +89,11 @@
         let e = 100 -this.data.t_jchzbNum.res[0]
         let n = 100 -this.data.t_jchzbNum.res[1]
         let d = 100 -this.data.t_jchzbNum.res[2]
+        let j = this.data.t_jchzbNum.number
+        let j1 = this.data.t_jchzbNum.number1
+        let j2 = this.data.t_jchzbNum.number2
+
+
         let option = {
           title: {
             text: this.title,
@@ -105,12 +110,14 @@
               type: 'pie',
               radius: '50%',
               label: {
-                formatter: '{b}: {d}%'
+                formatter: function (arg) {
+                    return arg.data.name +'\n' + arg.data.value + "%"+'\n'+ arg.data.v2
+                }
               },
               data: [
-                { value: this.data.t_jchzbNum.res[0], name: '及时完成率' },
-                { value: this.data.t_jchzbNum.res[1], name: '未及时完成率' },
-                { value: this.data.t_jchzbNum.res[2], name: '未完成率' },
+                { value: this.data.t_jchzbNum.res[0], name: '及时完成率' ,v2:j},
+                { value: this.data.t_jchzbNum.res[1], name: '未及时完成率',v2:j1 },
+                { value: this.data.t_jchzbNum.res[2], name: '未完成率',v2:j2 },
                 // { value: e, name: '未完成率' }
               ],
               emphasis: {

src/views/statistics/item/s2manYiDu.vue

@@ -97,7 +97,8 @@
         //   barData.push(e)
         // }
         // let e=[this.data.t_khmydtjbNum.number[0],this.data.t_khmydtjbNum.numberAll[0],this.data.t_khmydtjbNum.res[0]]
-        let e=100-this.data.t_khmydtjbNum.res[0]
+        let e=(100-this.data.t_khmydtjbNum.res[0]).toFixed(2)*1
+        console.log(this.data.t_khmydtjbNum.res[0],e)
 
         let beingDate=this.data.t_myddc2Begin.date
         let endDate=this.data.t_myddc2End.date
@@ -117,11 +118,14 @@
               type: 'pie',
               radius: '50%',
               label: {
-                formatter: '{b}: {d}%'
+                formatter: function (arg) {
+                  console.log(arg)
+                    return arg.data.name +'\n' + arg.data.value + "%"+'\n'+ arg.data.v2
+                }
               },
               data: [
-                { value: this.data.t_khmydtjbNum.res[0], name: '满意率' },
-                { value: e, name: '不满意率' }
+                { value: this.data.t_khmydtjbNum.res[0], name: '满意率', v2:this.data.t_khmydtjbNum.number},
+                { value: e, name: '不满意率',v2:this.data.t_khmydtjbNum.num-this.data.t_khmydtjbNum.number }
               ],
               emphasis: {
                 itemStyle: {

src/views/statistics/item/s3tousu.vue

@@ -110,11 +110,13 @@
               type: 'pie',
               radius: '50%',
               label: {
-                formatter: '{b}: {d}%'
+                formatter: function (arg) {
+                    return arg.data.name +'\n' + arg.data.value + "%"+'\n'+ arg.data.v2
+                }
               },
               data: [
-                { value: this.data.t_complaintNum.res[0], name: '投诉率' },
-                { value: e, name: '未投诉率' }
+                { value: this.data.t_complaintNum.res[0], name: '投诉率',v2: this.data.t_complaintNum.number},
+                { value: e, name: '未投诉率' ,v2: this.data.t_complaintNum.numberAll-this.data.t_complaintNum.number}
               ],
               emphasis: {
                 itemStyle: {

src/views/statistics/item/s4renYuanPeiXun.vue

@@ -71,7 +71,7 @@
 
         // let e=[this.data.t_ryywpxjlNum.number[0],this.data.t_ryywpxjlNum.numberAll[0],this.data.t_ryywpxjlNum.res[0]]
 
-        let e = 100 -this.data.t_ryywpxjlNum.res[0]
+        let e = (100 -this.data.t_ryywpxjlNum.res[0]).toFixed(2)*1
         var option;
         option = {
           //v3
@@ -90,11 +90,13 @@
               type: 'pie',
               radius: '50%',
               label: {
-                formatter: '{b}: {d}%'
+                formatter: function (arg) {
+                    return arg.data.name +'\n' + arg.data.value + "%"+'\n'+ arg.data.v2
+                }
               },
               data: [
-                { value: this.data.t_ryywpxjlNum.res[0], name: '完成率' },
-                { value: e, name: '未完成率' }
+                { value: this.data.t_ryywpxjlNum.res[0], name: '完成率' ,v2:this.data.t_ryywpxjlNum.number},
+                { value: e, name: '未完成率' ,v2:this.data.t_ryywpxjlNum.numberAll-this.data.t_ryywpxjlNum.number}
               ],
               emphasis: {
                 itemStyle: {

src/views/statistics/item/s5renYuanJianDu.vue

@@ -71,7 +71,7 @@
       
         //v3
         // let e=[this.data.t_zljdNum.number[0],this.data.t_zljdNum.numberAll[0],this.data.t_zljdNum.res[0]]
-        let e=100-this.data.t_zljdNum.res[0]
+        let e=(100-this.data.t_zljdNum.res[0]).toFixed(2)*1
 
         let option = {
           title: {
@@ -89,11 +89,13 @@
               type: 'pie',
               radius: '50%',
               label: {
-                formatter: '{b}: {d}%'
+                formatter: function (arg) {
+                    return arg.data.name +'\n' + arg.data.value + "%"+'\n'+ arg.data.v2
+                }
               },
               data: [
-                { value: this.data.t_zljdNum.res[0], name: '完成率' },
-                { value: e, name: '未完成率' }
+                { value: this.data.t_zljdNum.res[0], name: '完成率',v2:this.data.t_zljdNum.number },
+                { value: e, name: '未完成率',v2:this.data.t_zljdNum.numberAll-this.data.t_zljdNum.number }
               ],
               emphasis: {
                 itemStyle: {

src/views/statistics/item/s7sheBeiJiaoZhun.vue

@@ -111,11 +111,13 @@
               type: 'pie',
               radius: '50%',
               label: {
-                formatter: '{b}: {d}%'
+                formatter: function (arg) {
+                    return arg.data.name +'\n' + arg.data.value + "%"+'\n'+ arg.data.v2
+                }
               },
               data: [
-                { value: this.data.t_mjsbjdxzjhzbNum.valna, name: '完成率' },
-                { value: e, name: '未完成率' }
+                { value: this.data.t_mjsbjdxzjhzbNum.valna, name: '完成率',v2:this.data.t_mjsbjdxzjhzbNum.valnum },
+                { value: e, name: '未完成率',v2:this.data.t_mjsbjdxzjhzbNum.valAll-this.data.t_mjsbjdxzjhzbNum.valnum }
               ],
               emphasis: {
                 itemStyle: {

src/views/statistics/item/s8sheBeiHeCha.vue

@@ -104,11 +104,13 @@
               type: 'pie',
               radius: '50%',
               label: {
-                formatter: '{b}: {d}%'
+                formatter: function (arg) {
+                    return arg.data.name +'\n' + arg.data.value + "%"+'\n'+ arg.data.v2
+                }
               },
               data: [
-                { value: this.data.t_sbhcjlbNum.valna, name: '完成率' },
-                { value: e, name: '未完成率' }
+                { value: this.data.t_sbhcjlbNum.valna, name: '完成率',v2:this.data.t_sbhcjlbNum.valnum },
+                { value: e, name: '未完成率' ,v2:this.data.t_sbhcjlbNum.valAll-this.data.t_sbhcjlbNum.valnum}
               ],
               emphasis: {
                 itemStyle: {

src/views/statistics/item/s9neiBuZhiLiang.vue

@@ -95,11 +95,13 @@
               type: 'pie',
               radius: '50%',
               label: {
-                formatter: '{b}: {d}%'
+                formatter: function (arg) {
+                    return arg.data.name +'\n' + arg.data.value + "%"+'\n'+ arg.data.v2
+                }
               },
               data: [
-                { value: this.data.t_mjzlkzxbNum.valna, name: '完成率' },
-                { value: e, name: '未完成率' }
+                { value: this.data.t_mjzlkzxbNum.valna, name: '完成率' ,v2:this.data.t_mjzlkzxbNum.number[1]},
+                { value: e, name: '未完成率' ,v2:this.data.t_mjzlkzxbNum.number[2]-this.data.t_mjzlkzxbNum.number[1]}
               ],
               emphasis: {
                 itemStyle: {

src/views/statistics/js/selectDB.js

@@ -172,7 +172,7 @@ function s2jianCe(begin,end){
 /* 投诉 */
 function s3tousu(begin,end,scope){
   return "( SELECT COUNT( id_ ) AS t_complaint"+end+" FROM t_complaint WHERE you_wu_you_xiao_ = '有效投诉' and YEAR ( create_time_ ) = "+end+" ) s3tousu1  JOIN "+
-  "( SELECT COUNT( id_ ) AS t_complaintS"+end+" FROM t_complaint WHERE you_wu_you_xiao_ = '有效投诉' and chu_li_shi_jian_='<48h' and shi_fou_tong_yi_='同意' and YEAR ( create_time_ ) = "+end+" ) s3tousu2  JOIN "+
+  "( SELECT COUNT( id_ ) AS t_complaintS"+end+" FROM t_complaint WHERE you_wu_you_xiao_ = '有效投诉' and chu_li_shi_jian_='<48h' and YEAR ( create_time_ ) = "+end+" ) s3tousu2  JOIN "+
   "( SELECT COUNT( id_ ) AS t_complainS"+end+" FROM t_complaint WHERE you_wu_you_xiao_ = '有效投诉' and chu_li_jie_guo_sh='已通知' and YEAR ( create_time_ ) = "+end+" ) s3tousu3  JOIN "+
   "( SELECT COUNT( id_ ) AS t_mjwtsqb"+end+" FROM t_lhjczb WHERE  YEAR ( create_time_ ) = "+end+" ) s3weituo1"
  }

src/views/statistics/sendDatas.js

@@ -167,38 +167,7 @@ export default {
                         let c=0
 
                         console.log(that.nengliObj,'904380439034904343')
-                        // if(that.nengliObj.length === 0){
-                        //         val = [0]
-                        //         valAll = [0]
-                        //         e = [0]
-                        //         name = [0]
-                        // }else{
-                        //         for (let i = 0; i < that.nengliObj.length; i++) {
-                        //                 // let num=0
-                        //                 // if (that.hechaObj[i].t_sbhcjlb===0) {
-                        //                 //         num =0
-                        //                 // } else {
-                        //                 //         num =Math.floor(that.hechaObj[i].t_sbhcjlbS/that.hechaObj[i].t_sbhcjlb * 10000) / 100
-                        //                 // }
-                        //                 // valAll.push(that.hechaObj[i].t_sbhcjlb)
-                        //                 val.push(that.nengliObj[i].num)
-                        //                 valAll.push(that.nengliObj[i].numS)
-                        //                 // e.push(num)
-                        //                 let nameMid = that.nengliObj[i].enname.split("—")
-                        //                 if(nameMid.length===2){
-                        //                         name.push(nameMid[1])
-                        //                 }else{
-                        //                         name.push(nameMid[0])
-                        //                 }
-
-                        // }
-                        // }
-                        // val.forEach( function(item){
-                        //         a += item ;
-                        // });
-                        // valAll.forEach( function(item){
-                        //         b += item ;
-                        // });
+        
                         if(b===0){
                                 c=0
                         }else{