From 1682282e1925e7a2f112fa9dfdceeaffe3a80ce7 Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Wed, 9 Aug 2023 17:21:03 +0800
Subject: [PATCH] =?UTF-8?q?fixd:=E7=BB=9F=E8=AE=A1=E5=9B=BE=E6=A0=87y?=
 =?UTF-8?q?=E8=BD=B4=E6=9C=80=E5=B0=8F=E5=80=BC=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/supervisionNew/statisticsGroup.vue  | 68 +++++++++++++------
 1 file changed, 47 insertions(+), 21 deletions(-)

diff --git a/client/src/views/supervisionNew/statisticsGroup.vue b/client/src/views/supervisionNew/statisticsGroup.vue
index 2a9a7e5..6f2d222 100644
--- a/client/src/views/supervisionNew/statisticsGroup.vue
+++ b/client/src/views/supervisionNew/statisticsGroup.vue
@@ -38,13 +38,13 @@
                     <div id="main" style="width:100%;height:700px;margin-left: 10px;" ref="chart"></div>
                 </el-col>
                 <el-col  class="chartsWraps">
-                    <div id="main2" style="width:100%;height:500px;margin-left: 10px;" ref="chart2"></div>
+                    <div id="main2" style="width:100%;height:700px;margin-left: 10px;" ref="chart2"></div>
                 </el-col>
                 <el-col  class="chartsWraps">
-                    <div id="main3" style="width:100%;height:500px;margin-left: 10px;" ref="chart3"></div>
+                    <div id="main3" style="width:100%;height:700px;margin-left: 10px;" ref="chart3"></div>
                 </el-col>
                 <el-col  class="chartsWraps">
-                    <div id="main4" style="width:100%;height:500px;margin-left: 10px;" ref="chart4"></div>
+                    <div id="main4" style="width:100%;height:700px;margin-left: 10px;" ref="chart4"></div>
                 </el-col>
             </el-row>
         </div>
@@ -103,7 +103,7 @@
                     left: '2%',
                     right: '2%',
                     bottom: '25%',
-                    top: '10%',
+                    top: '12%',
                     containLabel: true
                 },
                 xAxis: [
@@ -230,7 +230,7 @@
                     },
                     scale:true,
                     min:85,
-                    max:105,
+                    max:100,
                 },
                 series: [
                     {
@@ -304,17 +304,17 @@
                         return b[property]-a[property];
                     }
                 }
+               
                 taskAnalyse(that.listQuery).then(res=>{
                     console.log(res)
                     let data = res.data;
-                    let  xaxis1 = [],data1 = [],data12=[],
-                    xaxis2 = [],data2 = [],data22=[],
-                    xaxis3 = [],data3 = [],data32=[],
-                    xaxis4 = [],data4 = [],data42=[];
+                    let  xaxis1 = [''],data1 = [],data12=[],
+                    xaxis2 = [''],data2 = [],data22=[],
+                    xaxis3 = [''],data3 = [],data32=[],
+                    xaxis4 = [''],data4 = [],data42=[];
+                    let minNumber1=0,minNumber2=0,minNumber3=0,minNumber4=0;
                     let markLine1 = 0,markLine2=0,markLine3=0,markLine4=0;
                     let sortedArr1 = data.sort(compare("报告证书合格率"));
-                    debugger;
-                    console.log(data,sortedArr1)
                     sortedArr1.forEach(item1=>{
                         xaxis1.push(item1.单位) 
                         data1.push(item1.报告证书合格率)
@@ -341,6 +341,19 @@
                         data4.push(item4.客户投诉处理满意率)
                         data42.push(item4.客户投诉处理满意率设定值)
                     })
+                    minNumber1 =Math.min(...data1) 
+                    minNumber1 = Math.floor(minNumber1)
+                    minNumber2 =Math.min(...data2) 
+                    minNumber2 = Math.floor(minNumber2)
+                    minNumber3 =Math.min(...data3) 
+                    minNumber3 = Math.floor(minNumber3)
+                    minNumber4 =Math.min(...data4) 
+                    minNumber4 = Math.floor(minNumber4)
+                    debugger;
+                    console.log(minNumber1)
+                    console.log(minNumber2)
+                    console.log(minNumber3)
+                    console.log(minNumber4)
                     markLine4 = sortedArr4[0].客户投诉处理满意率基础值;
                     function tofixed1(item){
                         if(item!==null){
@@ -363,8 +376,9 @@
                             return ''
                         }
                     }
-                    let arr1 = [],arr2=[],arr3=[],arr4=[],arr12 = [],arr22=[],arr32=[],arr42=[],
-                    markarr1 = [],markarr2=[],markarr3=[],markarr4=[];
+                    let arr1 = [''],arr2=[''],arr3=[''],arr4=[''],
+                    arr12 = [''],arr22=[''],arr32=[''],arr42=[''],
+                    markarr1 = ['集团值'],markarr2=['集团值'],markarr3=['集团值'],markarr4=['集团值'];
                     for(let i=0;i<data1.length;i++){
                         markarr1.push(markLine1.toFixed(1))
                         markarr2.push(markLine2.toFixed(1))
@@ -383,10 +397,13 @@
                         let item2 = tofixed1(item)
                         arr1.push(item2)
                     })
+                    let xAxis12 = arr1;xAxis12[0]='目标值';
+                    let xAxis13 = arr12;xAxis13[0]='完成值';
+                    option1.yAxis.min = minNumber1;
                     option1.xAxis[0].data = xaxis1;
                     option1.xAxis[1].data =markarr1;//集团目标值
-                    option1.xAxis[2].data = arr1;//部门目标值
-                    option1.xAxis[3].data = arr12;//部门完成值
+                    option1.xAxis[2].data = xAxis12;//部门目标值
+                    option1.xAxis[3].data = xAxis13;//部门完成值
                     option1.series[0].data = arr12;//部门完成值
                     option1.series[1].data = arr1;//单位目标值
                     option1.title.text = '报告/证书合格率';
@@ -401,10 +418,13 @@
                         let item2 = tofixed1(item)
                         arr2.push(item2)
                     })
+                    let xAxis22 = arr2;xAxis22[0]='目标值';
+                    let xAxis23 = arr22;xAxis23[0]='完成值';
+                    option2.yAxis.min = minNumber2;
                     option2.xAxis[0].data = xaxis2;
                     option2.xAxis[1].data =markarr2;//集团目标值
-                    option2.xAxis[2].data = arr2;//部门目标值
-                    option2.xAxis[3].data = arr22;//部门完成值
+                    option2.xAxis[2].data = xAxis22;//部门目标值
+                    option2.xAxis[3].data = xAxis23;//部门完成值
                     option2.series[0].data = arr22;
                     option2.series[1].data = arr2;
                     option2.title.text = '报告/证书及时率';
@@ -419,10 +439,13 @@
                         let item2 = tofixed1(item)
                         arr3.push(item2)
                     })
+                    let xAxis32 = arr3;xAxis32[0]='目标值';
+                    let xAxis33 = arr32;xAxis33[0]='完成值';
+                    option3.yAxis.min = minNumber3;
                     option3.xAxis[0].data = xaxis3;
                     option3.xAxis[1].data =markarr3;//集团目标值
-                    option3.xAxis[2].data = arr3;//部门目标值
-                    option3.xAxis[3].data = arr32;//部门完成值
+                    option3.xAxis[2].data = xAxis32;//部门目标值
+                    option3.xAxis[3].data = xAxis33;//部门完成值
                     option3.series[0].data = arr32;
                     option3.series[1].data = arr3;
                     option3.title.text = '能力验证满意率';
@@ -437,10 +460,13 @@
                         let item2 = tofixed1(item)
                         arr4.push(item2)
                     })
+                    let xAxis42 = arr4;xAxis42[0]='目标值';
+                    let xAxis43 = arr42;xAxis43[0]='完成值';
+                    option4.yAxis.min = minNumber4;
                     option4.xAxis[0].data = xaxis4;
                     option4.xAxis[1].data =markarr4;//集团目标值
-                    option4.xAxis[2].data = arr4;//部门目标值
-                    option4.xAxis[3].data = arr42;//部门完成值
+                    option4.xAxis[2].data = xAxis42;//部门目标值
+                    option4.xAxis[3].data = xAxis43;//部门完成值
                     option4.series[0].data = arr42;
                     option4.series[1].data = arr4;
                     option4.title.text = '客户投诉处理满意率';