From c485a259ad77630d4fafd3557d4f54ec5febc5ee Mon Sep 17 00:00:00 2001
From: shijing <sj_mzw@163.com>
Date: Thu, 3 Aug 2023 15:45:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=96=87=E6=A1=88=E5=8F=8A?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/supervisionNew/statistics.vue   | 46 +++++++------------
 .../views/supervisionNew/statisticsGroup.vue  | 28 +++++------
 2 files changed, 32 insertions(+), 42 deletions(-)

diff --git a/client/src/views/supervisionNew/statistics.vue b/client/src/views/supervisionNew/statistics.vue
index 71da556..363fb72 100644
--- a/client/src/views/supervisionNew/statistics.vue
+++ b/client/src/views/supervisionNew/statistics.vue
@@ -6,6 +6,7 @@
                 v-model="listQuery.belong_dept"
                 placeholder="报送部门"
                 clearable
+                filterable
                 @change="belongDeptChange"
             >
                 <el-option
@@ -292,22 +293,6 @@
                 deptName:'',
                 fileName:'',
                 tableData1:[],
-                // tableDatas:[ 
-                //     {type:'重大质量事故',title:'重大质量事故'},
-                //     {type:'报告/证书合格率',title:'已发放报告/证书数量'},
-                //     {type:'报告/证书合格率',title:'不准确报告/证书数量'},
-                //     {type:'报告/证书合格率',title:'报告/证书合格率'},
-                //     {type:'报告/证书及时率',title:'应发报告/证书数量'},
-                //     {type:'报告/证书及时率',title:'实际按时完成报告/证书数量'},
-                //     {type:'报告/证书及时率',title:'报告/证书及时率'},
-                //     {type:'能力验证满意率',title:'全部获结果参数数量'},
-                //     {type:'能力验证满意率',title:'满意结果参数数量'},
-                //     {type:'能力验证满意率',title:'能力验证满意率'},
-                //     {type:'客户投诉处理满意率',title:'全部已处理投诉数量'},
-                //     {type:'客户投诉处理满意率',title:'获满意结果的投诉数量'},
-                //     {type:'客户投诉处理满意率',title:'客户投诉处理满意率'},
-                // ],
-                
                 tableDatas:[
                     [],[],[],[],[],[],[],[],[],[],[],[],[]
                 ],
@@ -824,7 +809,7 @@
                                 },
                             },
                             legend: {
-                                data:['完成值','基础值','设定值'],
+                                data:['单位完成值','单位目标值','集团目标值'],
                                 right:'1%',
                                 top:'3%',
                                 tooltip: {
@@ -846,13 +831,15 @@
                             yAxis:{
                                 type:'value',
                                 axisLabel:{
-                                    formatter:"{value}"
+                                    formatter:"{value}%"
                                 },
                                 scale:true,
+                                min:85,
+                                max:105,
                             },
                             series:[
                                 {
-                                    name: '完成值',
+                                    name: '单位完成值',
                                     type: 'bar',
                                     // label: labelOption,
                                     emphasis: {
@@ -862,7 +849,16 @@
                                     data:data1
                                 },
                                 {
-                                    name:"基础值",
+                                    name:"单位目标值",
+                                    type:"bar",
+                                    emphasis: {
+                                        focus: 'series'
+                                    },
+                                    barWidth:20,
+                                    data:data3
+                                },
+                                {
+                                    name:"集团目标值",
                                     type:"bar",
                                     emphasis: {
                                         focus: 'series'
@@ -870,15 +866,7 @@
                                     barWidth:20,
                                     data:data2
                                 },
-                                {
-                                    name:"设定值",
-                                    type:"bar",
-                                    emphasis: {
-                                        focus: 'series'
-                                    },
-                                    barWidth:20,
-                                    data:data3
-                                }
+                                
                             ]
                         }
                         that.barAnalyse.clear();
diff --git a/client/src/views/supervisionNew/statisticsGroup.vue b/client/src/views/supervisionNew/statisticsGroup.vue
index 44f0325..ec3dc8c 100644
--- a/client/src/views/supervisionNew/statisticsGroup.vue
+++ b/client/src/views/supervisionNew/statisticsGroup.vue
@@ -88,7 +88,7 @@
                     },
                 },
                 legend: {
-                    data:['完成值','设定值'],
+                    data:['单位完成值','单位目标值',{name:'集团目标值',itemStyle:{opacity:0}}],
                     right:'10%',
                     top:'3%'
                 },
@@ -107,7 +107,7 @@
                     type: 'category',
                     data: [],
                 },
-                color:['#438af4','#91cc75'],
+                color:['#438af4','#91cc75','#ff0000'],
                 yAxis: {
                     type: 'value',
                     axisLabel:{
@@ -119,7 +119,7 @@
                 },
                 series: [
                     {
-                        name: '完成值',
+                        name: '单位完成值',
                         type: 'bar',
                         barGap: 0,
                         barWidth:10,
@@ -134,12 +134,12 @@
                                 silent:false,             //鼠标悬停事件  true没有，false有
                                 lineStyle:{               //警戒线的样式  ，虚实  颜色
                                     type:"solid",
-                                    color:"#ffb4b4",
+                                    color:"#ff0000",
                                 },
                                 label:{
                                     position:'end',
                                     formatter:'{c}',
-                                    color:"#ffb4b4",
+                                    color:"#ff0000",
                                     fontSize:'8'
                                 },
                                 name:'',
@@ -149,10 +149,15 @@
                         }
                     },
                     {
-                        name: '设定值',
+                        name: '单位目标值',
                         type: 'bar',
                         barWidth:10,
                         data: []
+                    },
+                    {
+                        name: '集团目标值',
+                        type: 'line',
+                        data: []
                     }
                 ],
             };
@@ -179,22 +184,19 @@
                 taskAnalyse(that.listQuery).then(res=>{
                     console.log(res)
                     let data = res.data;
-                    // let list = data.filter(item=>{
-                    // })
-                    // 按照属性num给data排序
                     let  xaxis1 = [],data1 = [],data12=[],
                     xaxis2 = [],data2 = [],data22=[],
                     xaxis3 = [],data3 = [],data32=[],
                     xaxis4 = [],data4 = [],data42=[];
                     let markLine1 = 0,markLine2=0,markLine3=0,markLine4=0;
-                    let sortedArr1 = data.sort(compare("报告证书合格率"));
+                    let sortedArr1 = data.sort(compare("报告/证书合格率"));
                     sortedArr1.forEach(item1=>{
                         xaxis1.push(item1.单位) 
                         data1.push(item1.报告证书合格率)
                         data12.push(item1.报告证书合格率设定值)
                     })
                     markLine1 = sortedArr1[0].报告证书合格率基础值;
-                    let sortedArr2 = data.sort(compare("报告证书及时率"));
+                    let sortedArr2 = data.sort(compare("报告/证书及时率"));
                     sortedArr2.forEach(item2=>{
                         xaxis2.push(item2.单位) 
                         data2.push(item2.报告证书及时率)
@@ -223,7 +225,7 @@
                     option1.xAxis.data = xaxis1;
                     option1.series[0].data = data1;
                     option1.series[1].data = data12;
-                    option1.title.text = '报告证书合格率';
+                    option1.title.text = '报告/证书合格率';
                     option1.series[0].markLine.data[0].yAxis = markLine1;
                     that.barChart1.clear();
                     that.barChart1.setOption(option1);
@@ -231,7 +233,7 @@
                     option2.xAxis.data = xaxis2;
                     option2.series[0].data = data2;
                     option2.series[1].data = data22;
-                    option2.title.text = '报告证书及时率';
+                    option2.title.text = '报告/证书及时率';
                     option2.series[0].markLine.data[0].yAxis = markLine2;
                     that.barChart2.clear();
                     that.barChart2.setOption(option2);