两个看板（除新增滚动表格）

src/views/statistics/index.vue

@@ -77,7 +77,7 @@
         <dv-border-box-7  backgroundColor="rgba(6, 30, 93, 0.5)" ><div class="ttitle">质量方针：公正、科学、准确、高效</div></dv-border-box-7>
         <div class="congxiebox7" style="display: flex;justify-content: space-between;padding: 1.5% 0.2%;">
           <div class="gongshiAll" style="width:16.4%">
-            <div class="touwidth">任务完成率=</div>
+            <div class="touwidth">检测任务完成率=</div>
             <div style="margin: 0 0.2%;">
               <div class="gongshiXian">完成检测项目数量</div>
               <div style="text-align:center;font-size:12px;padding-top: 6%;">有效检测任务总数</div>
@@ -104,15 +104,15 @@
             <div class="touwidth">投诉率=</div>
             <div style="margin: 0 0.2%;">
               <div class="gongshiXian">统计期内有效投诉项目数</div>
-              <div style="text-align:center;font-size:12px;padding-top: 6%;">统计期内检测项目总数</div>
+              <div style="text-align:center;font-size:12px;padding-top: 6%;">统计期内检测委托总数</div>
             </div>
             <div>×100%</div>
           </div>
           <div class="gongshiAll" style="width:27.4%">
             <div class="touwidth">投诉回复及时率=</div>
             <div style="margin: 0 0.2%;">
-              <div class="gongshiXian">统计期内被投诉后48h内达成一致解决方案次数</div>
-              <div style="text-align:center;font-size:12px;padding-top: 6%;">统计期内被有效投诉总次数</div>
+              <div class="gongshiXian">统计期内投诉处理完成次数</div>
+              <div style="text-align:center;font-size:12px;padding-top: 6%;">统计期内有效投诉总次数</div>
             </div>
             <div>×100%</div>
           </div>
@@ -576,6 +576,7 @@
     box-shadow: rgb(128 128 128 / 30%) 0px 0px 40px inset;
     border: 1px solid rgba(128, 128, 128, 0.3);
     margin: 1% 0 0 0 ;
+    font-size: 12px;
   }
   .gongshiAll{
     display: flex;

src/views/statistics/item/s10waiBuNengLi.vue

@@ -48,7 +48,7 @@
     },
     data () {
       return {
-        title:'能力验证计划完成情况',
+        title:'能力验证完成情况',
         dialogOff:false,
       }
     },
@@ -87,6 +87,7 @@
         //  let maxVal=max1>max2?max1:max2;
         //  console.log("max1:",max1,"max2:",max2);
         let e = 100 -this.data.Num.valna
+        console.log(e,'eeeeeeeeeeeeeeeeeeeeeeeeeeeeee')
 
        let option = {
           //v3
@@ -108,8 +109,8 @@
                 formatter: '{b}: {d}%'
               },
               data: [
-                { value: this.data.Num.valna, name: '能力验证计划完成率' },
-                { value: e, name: '能力验证计划未完成率' }
+                { value: this.data.Num.valna, name: '能力验证完成率' },
+                { value: e, name: '能力验证未完成率' }
               ],
               emphasis: {
                 itemStyle: {

src/views/statistics/item/s10waiBuNengLiCol2.vue

@@ -0,0 +1,163 @@
+<template>
+  <div @click="toDetailed()" class="statisticsPage" :style="{width:width}">
+    <div :id="id" :style="{height:height}"/>
+    <!-- 打开详情弹窗-->
+    <div v-if="dialogOff">
+      <dialogView
+        :dialogOff = "dialogOff"
+        @close = "close"
+        :title="title"
+        :data="data"
+      />
+    </div>
+  </div>
+</template>
+
+<script>
+  import echarts from 'echarts'
+  import dialogView from '../properties/s11biaoZhunWuPro.vue'
+  import {GetPercent,GetMax} from  '../js/config.js'
+  export default {
+    components:{
+      dialogView
+    },
+    props: {
+      data: {
+        type: Object,
+      },
+      width:{
+        type:String,
+        default:"20%"
+      },
+      height:{
+        type:String,
+        default: window.screen.height/2+"px"
+      },
+      id:{
+        type:String,
+        default:"s11biaoZhunWu"
+      },
+      click:{
+        type:String,
+        default:'true'
+      },
+      colorw:{
+        type:String,
+        default:'true'
+      }
+    },
+    data () {
+      return {
+        title:'能力验证计划完成情况',
+        dialogOff:false,
+      }
+    },
+    mounted(){
+      this.drawLine();
+    },
+    methods: {
+      close(){
+        this.dialogOff = false
+      },
+      /* 跳转统计页面*/
+      toDetailed(){
+        if(this.click == "true"){
+        this.dialogOff = true
+       }
+      },
+      drawLine(){
+        let s10biaoZhunWu = 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=[this.data.Num.valAll,this.data.Num.valnum]
+
+       let option = {
+           //v3
+         legend: {},
+            tooltip: {
+              trigger: 'axis',
+              axisPointer: {
+                type: 'shadow'
+              },
+              // formatter: function (params) {
+              //   return params[0].data[0] + '<br/>满意份数：' + params[0].data[1] + '<br/>调查总份数: ' + params[0].data[2];
+              // }
+            },
+            // dataset: {
+            //   source: barData
+            // },
+            xAxis: { 
+              type: 'category',
+              data:['能力验证计划数量', '能力验证完成数量']
+
+            },
+            yAxis: [
+              {
+                type: 'value',
+                scale: true,
+                name: '数量',
+                max: this.data.Num.valnum>this.data.Num.valAll?this.data.Num.valnum+1:this.data.Num.valAll+1,
+                min: 0,
+              },
+            ],
+            series: [
+              {
+                data: e,
+                type: 'bar',
+                barWidth: '20%',
+                itemStyle: {
+                  color: '#0099ff'
+                },
+                label: {
+                  show: true,
+                  position: 'top'
+                },
+              }
+            ],
+            grid: {
+              top: '20%',
+              left: '3%',
+              right: '4%',
+              bottom: '10%',
+              containLabel: true
+            },
+            title: {
+              text: this.title,
+              textStyle:{ fontSize:14,color: this.colorw }
+
+              // subtext: "        "+beingDate+"-"+endDate
+            },
+       };
+
+       option && s10biaoZhunWu.setOption(option);
+      }
+    }
+  }
+</script>
+<style scoped>
+  #s10waiBuNengLi:hover{
+    transition: all 0.5s;
+    transform:scale(1.03);
+  }
+  .statisticsPage{
+     box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+     float: left;
+  }
+</style>

src/views/statistics/item/s11biaoZhunWu.vue

@@ -48,7 +48,7 @@
     },
     data () {
       return {
-        title:'标准物质期间核查计划完成情况',
+        title:'标准物质期间核查完成情况',
         dialogOff:false,
       }
     },

src/views/statistics/item/s11biaoZhunWuCol.vue

@@ -48,7 +48,7 @@
     },
     data () {
       return {
-        title:'标准物质期间核查计划数量',
+        title:'标准物质期间核查数量',
         dialogOff:false,
       }
     },

src/views/statistics/item/s11biaoZhunWuCol2.vue

@@ -48,7 +48,7 @@
     },
     data () {
       return {
-        title:'各个标准物质期间核查计划数量',
+        title:'各个标准物质期间核查数量',
         dialogOff:false,
       }
     },

src/views/statistics/item/s12fengXian.vue

@@ -48,7 +48,7 @@
     },
     data () {
       return {
-        title:'实验室活动风险识别与控制计划',
+        title:'实验室活动风险识别与控制',
         dialogOff:false,
         measured:[]
       }
@@ -99,8 +99,8 @@
                 formatter: '{b}: {d}%'
               },
               data: [
-                { value: this.data.t_mjsyshdfxsbykzjhxbNum.res[0], name: '实验室活动风险识别与控制计划完成率' },
-                { value: e, name: '实验室活动风险识别与控制计划未完成率' }
+                { value: this.data.t_mjsyshdfxsbykzjhxbNum.res[0], name: '风险控制已完成率' },
+                { value: e, name: '风险控制未完成率' }
               ],
               emphasis: {
                 itemStyle: {

src/views/statistics/item/s12fengXianCol.vue

@@ -48,7 +48,7 @@
     },
     data () {
       return {
-        title:'实验室活动风险识别与控制计划数量',
+        title:'实验室活动风险识别与控制数量',
         dialogOff:false,
         measured:[]
       }
@@ -95,7 +95,7 @@
             // },
             xAxis: { 
               type: 'category',
-              data:[ '实验室活动风险识别与控制计划总数','实验室活动风险识别与控制计划已完成数量']
+              data:[ '风险控制总数','风险控制已完成数量']
               // data:['已完成', '总数量', '完成率']
             },
             yAxis: [

src/views/statistics/item/s13shengWuCol.vue

@@ -104,7 +104,7 @@
             // dataset: {
             //   source: barData
             // },
-            xAxis: { type: 'category',data:['有效投诉总次数','投诉后48h内达成一致解决方案次数']},
+            xAxis: { type: 'category',data:['有效投诉总次数','投诉回复已完成数']},
             yAxis: [
               {
                 type: 'value',
@@ -138,10 +138,10 @@
                   color: '#cc6633'
                 },
                 label: {
-                show: true,
-                position: 'top'
+                  show: true,
+                  position: 'top'
+                },
               },
-              }
             ],
             grid: {
               top: '30%',

src/views/statistics/item/s14bufuhexiangCol.vue

@@ -95,7 +95,7 @@
             // },
             xAxis: { 
               type: 'category',
-              data:[ '不符合项总数','不符合项已完成数量']
+              data:[ '不符合项开立总数','不符合项整改完成数量']
               // data:['已完成', '总数量', '完成率']
             },
             yAxis: [

src/views/statistics/item/s15tousu.vue

@@ -108,8 +108,8 @@
                 formatter: '{b}: {d}%'
               },
               data: [
-                { value: this.data.t_complaintNum.res2[0], name: '客户投诉已通知率' },
-                { value: e, name: '客户投诉未通知率' }
+                { value: this.data.t_complaintNum.res2[0], name: '投诉已完成率' },
+                { value: e, name: '投诉未完成率' }
               ],
               emphasis: {
                 itemStyle: {

src/views/statistics/item/s16bzJunZhu.vue

@@ -48,7 +48,7 @@
     },
     data () {
       return {
-        title:'标准菌株期间核查计划完成情况',
+        title:'标准菌株期间核查完成情况',
         dialogOff:false,
       }
     },

src/views/statistics/item/s16bzJunZhuCol.vue

@@ -48,7 +48,7 @@
     },
     data () {
       return {
-        title:'标准菌株期间核查计划数量',
+        title:'标准菌株期间核查数量',
         dialogOff:false,
       }
     },
@@ -105,7 +105,7 @@
             // },
             xAxis: { 
               type: 'category',
-              data:['标准菌株期间核查总数', '标准菌株质期间核查已完成数量']
+              data:['标准菌株期间核查总数', '标准菌株质已完成期间核查数量']
 
             },
             yAxis: [

src/views/statistics/item/s16bzJunZhuCol2.vue

@@ -48,7 +48,7 @@
     },
     data () {
       return {
-        title:'各个标准菌株期间核查计划数量',
+        title:'各个标准菌株期间核查数量',
         dialogOff:false,
       }
     },

src/views/statistics/item/s17bzXiBao.vue

@@ -48,7 +48,7 @@
     },
     data () {
       return {
-        title:'标准细胞期间核查计划完成情况',
+        title:'标准细胞期间核查完成情况',
         dialogOff:false,
       }
     },

src/views/statistics/item/s17bzXiBaoCol.vue

@@ -48,7 +48,7 @@
     },
     data () {
       return {
-        title:'标准细胞期间核查计划数量',
+        title:'标准细胞期间核查数量',
         dialogOff:false,
       }
     },
@@ -105,7 +105,7 @@
             // },
             xAxis: { 
               type: 'category',
-              data:['标准细胞期间核查总数', '标准细胞期间核查已完成数量']
+              data:['标准细胞期间核查总数', '标准细胞已完成期间核查数量']
 
             },
             yAxis: [

src/views/statistics/item/s17bzXiBaoCol2.vue

@@ -48,7 +48,7 @@
     },
     data () {
       return {
-        title:'各个标准细胞期间核查计划数量',
+        title:'各个标准细胞期间核查数量',
         dialogOff:false,
       }
     },

src/views/statistics/item/s7sheBeiJiaoZhunCol2.vue

@@ -157,6 +157,9 @@
                 show: true,
                 position: 'right'
               },
+              itemStyle: {
+                color: '#66CC00'
+              },
             },
             {
               type: 'bar',
@@ -165,6 +168,9 @@
                 show: true,
                 position: 'right'
               },
+              itemStyle: {
+                color: '#FFCC00'
+              },
             },
           ],dataZoom: [
         {

src/views/statistics/item/s8sheBeiHeChaCol2.vue

@@ -153,6 +153,9 @@
                 show: true,
                 position: 'right'
               },
+              itemStyle: {
+                color: '#66CC00'
+              },
             },
             {
               type: 'bar',
@@ -161,6 +164,9 @@
                 show: true,
                 position: 'right'
               },
+              itemStyle: {
+                color: '#FFCC00'
+              },
             },
           ],
                 dataZoom: [

src/views/statistics/item/s9neiBuZhiLiang.vue

@@ -48,7 +48,7 @@
     },
     data () {
       return {
-        title:'质量控制计划完成率',
+        title:'质量控制完成率',
         dialogOff:false,
         measured:[]
       }

src/views/statistics/item/s9neiBuZhiLiangCol.vue

@@ -48,7 +48,7 @@
     },
     data () {
       return {
-        title:'质量控制计划数量',
+        title:'质量控制数量',
         dialogOff:false,
         measured:[]
       }
@@ -74,7 +74,8 @@
         // let beingDate=this.data.t_complaintBegin.date
         // let endDate=this.data.t_complaintEnd.date
         var option;
-
+        let e = []
+        e.push(this.data.t_mjzlkzxbNum.val[0])
         //v3
         // let e=[this.data.t_complaintNum.number[0],this.data.t_complaintNum.numberAll[0],this.data.t_complaintNum.res[0]]
 
@@ -107,7 +108,7 @@
                 }
             },
             dataset: {
-                source: this.data.t_mjzlkzxbNum.val
+                source: e
             },
             xAxis: { type: 'category' },
             yAxis: {},
@@ -131,7 +132,8 @@
                 show: true,
                 position: 'top'
               },
-            }]
+            }
+            ]
         };
 
         option && s9neibu.setOption(option);

src/views/statistics/js/selectDB.js

@@ -13,9 +13,13 @@ export const gethechaObj = (end)=>{
   // return "select a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,b.t_mjsbjdxzjhzbS FROM (select she_bei_ming_chen as t_mjsbjdxzjhzbName, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb where YEAR(create_time_)='2022' GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1) as a left join  (select she_bei_ming_chen, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzbS from t_mjsbjdxzjhzb where YEAR(create_time_)= '2022' AND DATE(yi_jian_xiao_ri_q) >= DATE(ji_hua_ri_qi_) GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1 )as b on a.t_mjsbjdxzjhzbName=b.she_bei_ming_chen"
   return "select	a.t_sbhcjlbZhname,	a.t_sbhcjlbName,	a.t_sbhcjlb,	ifnull( b.t_sbhcjlbS, 0 ) AS t_sbhcjlbS FROM	(	SELECT	t_sbdj.she_bei_ming_cheng_ AS t_sbhcjlbZhname,	t_sbdj.she_bei_shi_bie_h AS t_sbhcjlbName,	COUNT( t_yqsbhcjh.yi_qi_she_bei_min ) AS t_sbhcjlb 	FROM	t_yqsbhcjh	LEFT JOIN t_sbdj ON t_yqsbhcjh.yi_qi_she_bei_min = t_sbdj.id_ 	WHERE	YEAR ( t_yqsbhcjh.he_cha_pin_lv_ )= "+end+"	GROUP BY	t_yqsbhcjh.yi_qi_she_bei_min 	HAVING	COUNT( t_yqsbhcjh.yi_qi_she_bei_min )>= 1 	) AS a	LEFT JOIN ( SELECT shi_bie_hao_, COUNT( shi_bie_hao_ ) AS t_sbhcjlbS FROM t_sbhcjlb WHERE YEAR ( he_cha_ri_qi_ )= "+end+" GROUP BY shi_bie_hao_ HAVING COUNT( shi_bie_hao_ )>= 1 ) AS b ON a.t_sbhcjlbName = b.shi_bie_hao_ UNION SELECT	t_sbdj.she_bei_ming_cheng_ AS t_sbhcjlbZhname,	t_sbhcjlb.shi_bie_hao_ AS t_sbhcjlbName,IF	( t_sbhcjlb.id_, 0, 1 ) AS t_sbhcjlb,IF	(	YEAR ( t_sbhcjlb.he_cha_ri_qi_ )= YEAR ( t_sbhcjlb.xia_ci_he_cha_ri_ ),	COUNT( t_sbhcjlb.shi_bie_hao_ )+ 1,	COUNT( t_sbhcjlb.shi_bie_hao_ )) AS t_sbhcjlbS FROM	t_sbhcjlb	LEFT JOIN t_sbdj ON t_sbhcjlb.shi_bie_hao_ = t_sbdj.she_bei_shi_bie_h WHERE	YEAR ( t_sbhcjlb.he_cha_ri_qi_ )= "+end+" GROUP BY	t_sbhcjlb.shi_bie_hao_ HAVING	COUNT( t_sbhcjlb.shi_bie_hao_ )>=1"
 }
+// export const getnengliObj = (end)=>{
+//   // return "select a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,b.t_mjsbjdxzjhzbS FROM (select she_bei_ming_chen as t_mjsbjdxzjhzbName, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb where YEAR(create_time_)='2022' GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1) as a left join  (select she_bei_ming_chen, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzbS from t_mjsbjdxzjhzb where YEAR(create_time_)= '2022' AND DATE(yi_jian_xiao_ri_q) >= DATE(ji_hua_ri_qi_) GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1 )as b on a.t_mjsbjdxzjhzbName=b.she_bei_ming_chen"
+//   return "select a.enname,ifnull(a.num,0) as num,  ifnull(b.num,0) as numS from(select xiang_mu_ as enname, COUNT(jian_ce_biao_zhun) as num from t_ndnlyzsysjbdjhzb where YEAR(yu_ji_shi_jian_)="+end+" GROUP BY jian_ce_biao_zhun HAVING COUNT(jian_ce_biao_zhun)>=1) as a LEFT JOIN (select jian_ce_biao_zhun as enname, COUNT(jian_ce_biao_zhun) as num from t_ndnlyzsysjbdjhzb as c LEFT JOIN t_ndnlyzsysjbdjhb as d on c.parent_id_ = d.id_ where YEAR(c.create_time_)="+end+" and d.shi_fou_guo_shen_='1' GROUP BY jian_ce_biao_zhun HAVING COUNT(jian_ce_biao_zhun)>=1) as b on a.enname = b.enname"
+// }
 export const getnengliObj = (end)=>{
   // return "select a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,b.t_mjsbjdxzjhzbS FROM (select she_bei_ming_chen as t_mjsbjdxzjhzbName, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb where YEAR(create_time_)='2022' GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1) as a left join  (select she_bei_ming_chen, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzbS from t_mjsbjdxzjhzb where YEAR(create_time_)= '2022' AND DATE(yi_jian_xiao_ri_q) >= DATE(ji_hua_ri_qi_) GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1 )as b on a.t_mjsbjdxzjhzbName=b.she_bei_ming_chen"
-  return "select a.enname,ifnull(a.num,0) as num,  ifnull(b.num,0) as numS from(select jian_ce_biao_zhun as enname, COUNT(jian_ce_biao_zhun) as num from t_ndnlyzsysjbdjhzb where YEAR(yu_ji_shi_jian_)="+end+" GROUP BY jian_ce_biao_zhun HAVING COUNT(jian_ce_biao_zhun)>=1) as a LEFT JOIN (select jian_ce_biao_zhun as enname, COUNT(jian_ce_biao_zhun) as num from t_ndnlyzsysjbdjhzb as c LEFT JOIN t_ndnlyzsysjbdjhb as d on c.parent_id_ = d.id_ where YEAR(c.create_time_)="+end+" and d.shi_fou_guo_shen_='1' GROUP BY jian_ce_biao_zhun HAVING COUNT(jian_ce_biao_zhun)>=1) as b on a.enname = b.enname"
+  return "select COUNT(id_) as num from t_ndnlyzsysjbdjhb WHERE shi_fou_guo_shen_ = '1' and  YEAR(create_time_)= "+end+"  UNION all select COUNT(id_) as snum from t_ndnlyzsysjbdjhb where  YEAR(create_time_)= "+end
 }
 export const getbiaozhunObj = (end)=>{
   // return "select a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,b.t_mjsbjdxzjhzbS FROM (select she_bei_ming_chen as t_mjsbjdxzjhzbName, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb where YEAR(create_time_)='2022' GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1) as a left join  (select she_bei_ming_chen, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzbS from t_mjsbjdxzjhzb where YEAR(create_time_)= '2022' AND DATE(yi_jian_xiao_ri_q) >= DATE(ji_hua_ri_qi_) GROUP BY she_bei_ming_chen HAVING COUNT(she_bei_ming_chen)>=1 )as b on a.t_mjsbjdxzjhzbName=b.she_bei_ming_chen"

src/views/statistics/properties/s10waiBuNengLiPro.vue

@@ -2,7 +2,7 @@
     <el-dialog
       :visible.sync="visible"
       ref="dialog"
-      :title="title+'详情'"
+      :title="title+''"
       width="100%"
       lock-scroll
       append-to-body
@@ -36,17 +36,18 @@
         <!-- 参数页面列 -->
         <el-aside style="border:0px;width: 30%; height: 700px;overflow: auto;">
               <br>
+           <div class="dataCont" style="font-size: 14px;">
 
-          <div>{{data.Num.date}} 年度</div>
-          <div v-for="(item,i) in data.Num.name" :key="i">
-              <el-divider content-position="left">{{data.Num.name[i]}}</el-divider>
-              能力验证计划完成次数 ：<el-tag>{{data.Num.numberAll[i]}} 次</el-tag>
+          <el-divider content-position="left">{{data.Num.date}} 年度</el-divider>
+          <!-- <div v-for="(item,i) in data.Num.name" :key="i"> -->
+              <!-- <el-divider content-position="left">{{data.Num.name[i]}}</el-divider> -->
+              能力验证计划完成次数 ：<el-tag>{{data.Num.valnum}} 次</el-tag>
               <br>
-              能力验证计划次数 ：<el-tag>{{data.Num.number[i]}} 次</el-tag>
+              能力验证计划次数 ：<el-tag>{{data.Num.valAll}} 次</el-tag>
               <br>
               <!-- 年度核查 ：<el-tag>{{data.Num.numberAll[i]}} 次</el-tag>
               <br> -->
-            </div>
+            <!-- </div> -->
            <!-- <div class="dataCont" style="font-size: 14px;">
           <el-divider content-position="left">{{data.t_sbhcjhBegin.date}} 年度</el-divider>
             设备核查计划次数 ：<el-tag>{{data.t_sbhcjhBegin.number}} 次</el-tag>
@@ -59,7 +60,7 @@
           <el-divider content-position="left">{{data.t_sbhcjlbEnd.date}} 年度</el-divider>
             设备核查完成次数 ：<el-tag type="danger">{{data.t_sbhcjlbEnd.number}} 次</el-tag>
            </div> -->
-
+           </div>
         </el-aside>
         
       </el-container>
@@ -88,7 +89,7 @@
       beforeCreate: function () {
           // 官方文档给出的是require
            this.$options.components.s10s10waiBuNengLiItem = () => import('../item/s10waiBuNengLi.vue')
-           this.$options.components.s10s10waiBuNengLiCItem = () => import('../item/s10waiBuNengLiCol.vue')
+           this.$options.components.s10s10waiBuNengLiCItem = () => import('../item/s10waiBuNengLiCol2.vue')
           },
 
     watch:{

src/views/statistics/properties/s11biaoZhunWuPro.vue

@@ -2,7 +2,7 @@
     <el-dialog
       :visible.sync="visible"
       ref="dialog"
-      :title="title+'详情'"
+      :title="title+''"
       width="100%"
       lock-scroll
       append-to-body
@@ -32,26 +32,26 @@
             id="s11biaoZhunWuCPro"
             click="false"
           />
-          <s11biaoZhunWuC2Item
+          <!-- <s11biaoZhunWuC2Item
             :data="data"
             width="100%"
             :height="height"
             id="s11biaoZhunWuC2Pro"
             click="false"
-          />
+          /> -->
       </el-aside>
         <!-- 参数页面列 -->
         <el-aside style="border:0px;width: 30%; height: 700px;overflow: auto;">
               <br>
 
-          <div>{{data.Num.date}} 年度</div>
-          <div v-for="(item,i) in data.Num.name" :key="i">
-              <el-divider content-position="left">{{data.Num.name[i]}}</el-divider>
-              标准物质期间核查已完成次数：<el-tag>{{data.Num.numberAll[i]}} 次</el-tag>
+          <el-divider content-position="left"><div>{{data.Num.date}} 年度</div></el-divider>
+          <!-- <div v-for="(item,i) in data.Num.name" :key="i"> -->
+              <!-- <el-divider content-position="left">{{data.Num.name[i]}}</el-divider> -->
+              标准物质期间核查已完成次数：<el-tag>{{data.Num.valAll}} 次</el-tag>
               <br>
-              标准物质期间核查次数：<el-tag>{{data.Num.number[i]}} 次</el-tag>
+              标准物质期间核查次数：<el-tag>{{data.Num.valnum}} 次</el-tag>
               <br>
-            </div>
+            <!-- </div> -->
            <!-- <div class="dataCont" style="font-size: 14px;">
           <el-divider content-position="left">{{data.t_sbhcjhBegin.date}} 年度</el-divider>
             设备核查计划次数 ：<el-tag>{{data.t_sbhcjhBegin.number}} 次</el-tag>

src/views/statistics/properties/s12fengXianPro.vue

@@ -2,7 +2,7 @@
     <el-dialog
       :visible.sync="visible"
       ref="dialog"
-      :title="title+'详情'"
+      :title="title+''"
       width="100%"
       lock-scroll
       append-to-body

src/views/statistics/properties/s13shengWuPro.vue

@@ -2,7 +2,7 @@
     <el-dialog
       :visible.sync="visible"
       ref="dialog"
-      :title="title+'详情'"
+      :title="title+''"
       width="100%"
       lock-scroll
       append-to-body
@@ -37,7 +37,7 @@
         <el-aside style="border:0px;width: 30%;">
            <div class="dataCont" style="font-size: 14px;">
             <el-divider content-position="left">{{data.t_complaintNum.date}} 年度</el-divider>
-              投诉后48h内达成一致解决方案次数 ：<el-tag>{{data.t_complaintNum.number[0]}} 次</el-tag>
+              投诉回复已完成数 ：<el-tag>{{data.t_complaintNum.number[0]}} 次</el-tag>
               <br>
               有效投诉总次数 ：<el-tag>{{data.t_complaintNum.numberAll[0]}} 次</el-tag>
               <br>

src/views/statistics/properties/s14bufehexiangPro.vue

@@ -2,7 +2,7 @@
     <el-dialog
       :visible.sync="visible"
       ref="dialog"
-      :title="title+'详情'"
+      :title="title+''"
       width="100%"
       lock-scroll
       append-to-body

src/views/statistics/properties/s15tousuPro.vue

@@ -2,7 +2,7 @@
     <el-dialog
       :visible.sync="visible"
       ref="dialog"
-      :title="title+'详情'"
+      :title="title+''"
       width="100%"
       lock-scroll
       append-to-body

src/views/statistics/properties/s16bzJunZhuPro.vue

@@ -2,7 +2,7 @@
     <el-dialog
       :visible.sync="visible"
       ref="dialog"
-      :title="title+'详情'"
+      :title="title+''"
       width="100%"
       lock-scroll
       append-to-body
@@ -32,26 +32,26 @@
             id="s16bzJunZhuCPro"
             click="false"
           />
-          <s16bzJunZhuC2Item
+          <!-- <s16bzJunZhuC2Item
             :data="data"
             width="100%"
             :height="height"
             id="s16bzJunZhuC2Pro"
             click="false"
-          />
+          /> -->
       </el-aside>
         <!-- 参数页面列 -->
         <el-aside style="border:0px;width: 30%; height: 700px;overflow: auto;">
               <br>
 
-          <div>{{data.Num.date}} 年度</div>
-          <div v-for="(item,i) in data.Num.name" :key="i">
-              <el-divider content-position="left">{{data.Num.name[i]}}</el-divider>
-              标准菌株期间核查已完成次数：<el-tag>{{data.Num.numberAll[i]}} 次</el-tag>
+          <el-divider content-position="left"><div>{{data.Num.date}} 年度</div></el-divider>
+          <!-- <div v-for="(item,i) in data.Num.name" :key="i"> -->
+              <!-- <el-divider content-position="left">{{data.Num.name[i]}}</el-divider> -->
+              标准菌株期间核查已完成次数：<el-tag>{{data.Num.valAll}} 次</el-tag>
               <br>
-              标准菌株期间核查次数：<el-tag>{{data.Num.number[i]}} 次</el-tag>
+              标准菌株期间核查次数：<el-tag>{{data.Num.valnum}} 次</el-tag>
               <br>
-            </div>
+            <!-- </div> -->
            <!-- <div class="dataCont" style="font-size: 14px;">
           <el-divider content-position="left">{{data.t_sbhcjhBegin.date}} 年度</el-divider>
             设备核查计划次数 ：<el-tag>{{data.t_sbhcjhBegin.number}} 次</el-tag>

src/views/statistics/properties/s17bzXiBaoPro.vue

@@ -2,7 +2,7 @@
     <el-dialog
       :visible.sync="visible"
       ref="dialog"
-      :title="title+'详情'"
+      :title="title+''"
       width="100%"
       lock-scroll
       append-to-body
@@ -32,26 +32,26 @@
             id="s17bzXiBaoCPro"
             click="false"
           />
-          <s17bzXiBaoC2Item
+          <!-- <s17bzXiBaoC2Item
             :data="data"
             width="100%"
             :height="height"
             id="s17bzXiBaoC2Pro"
             click="false"
-          />
+          /> -->
       </el-aside>
         <!-- 参数页面列 -->
         <el-aside style="border:0px;width: 30%; height: 700px;overflow: auto;">
               <br>
 
-          <div>{{data.Num.date}} 年度</div>
-          <div v-for="(item,i) in data.Num.name" :key="i">
-              <el-divider content-position="left">{{data.Num.name[i]}}</el-divider>
-              标准细胞期间核查已完成次数：<el-tag>{{data.Num.numberAll[i]}} 次</el-tag>
+          <el-divider content-position="left"><div>{{data.Num.date}} 年度</div></el-divider>
+          <!-- <div v-for="(item,i) in data.Num.name" :key="i"> -->
+              <!-- <el-divider content-position="left">{{data.Num.name[i]}}</el-divider> -->
+              标准细胞期间核查已完成次数：<el-tag>{{data.Num.valAll}} 次</el-tag>
               <br>
-              标准细胞期间核查次数：<el-tag>{{data.Num.number[i]}} 次</el-tag>
+              标准细胞期间核查次数：<el-tag>{{data.Num.valnum}} 次</el-tag>
               <br>
-            </div>
+            <!-- </div> -->
            <!-- <div class="dataCont" style="font-size: 14px;">
           <el-divider content-position="left">{{data.t_sbhcjhBegin.date}} 年度</el-divider>
             设备核查计划次数 ：<el-tag>{{data.t_sbhcjhBegin.number}} 次</el-tag>

src/views/statistics/properties/s1jianCePro.vue

@@ -2,7 +2,7 @@
     <el-dialog
       :visible.sync="visible"
       ref="dialog"
-      :title="title+'详情'"
+      :title="title+''"
       width="100%"
       lock-scroll
       append-to-body

src/views/statistics/properties/s1zhiLiangMuBiaoPro.vue

@@ -2,7 +2,7 @@
     <el-dialog
       :visible.sync="visible"
       ref="dialog"
-      :title="title+'详情'"
+      :title="title+''"
       width="100%"
       lock-scroll
       append-to-body

src/views/statistics/properties/s2manYiDuPro.vue

@@ -2,7 +2,7 @@
     <el-dialog
       :visible.sync="visible"
       ref="dialog"
-      :title="title+'详情'"
+      :title="title+''"
       width="100%"
       lock-scroll
       append-to-body

src/views/statistics/properties/s3tousuPro.vue

@@ -2,7 +2,7 @@
     <el-dialog
       :visible.sync="visible"
       ref="dialog"
-      :title="title+'详情'"
+      :title="title+''"
       width="100%"
       lock-scroll
       append-to-body

src/views/statistics/properties/s4renYuanPeiXunPro.vue

@@ -2,7 +2,7 @@
     <el-dialog
       :visible.sync="visible"
       ref="dialog"
-      :title="title+'详情'"
+      :title="title+''"
       width="100%"
       lock-scroll
       append-to-body

src/views/statistics/properties/s5renYuanJianDuPro.vue

@@ -2,7 +2,7 @@
     <el-dialog
       :visible.sync="visible"
       ref="dialog"
-      :title="title+'详情'"
+      :title="title+''"
       width="100%"
       lock-scroll
       append-to-body

src/views/statistics/properties/s6sheBeiWeiHuPro.vue

@@ -2,7 +2,7 @@
     <el-dialog
       :visible.sync="visible"
       ref="dialog"
-      :title="title+'详情'"
+      :title="title+''"
       width="100%"
       lock-scroll
       append-to-body

src/views/statistics/properties/s7sheBeiJiaoZhunPro.vue

@@ -2,7 +2,7 @@
     <el-dialog
       :visible.sync="visible"
       ref="dialog"
-      :title="title+'详情'"
+      :title="title+''"
       width="100%"
       lock-scroll
       append-to-body

src/views/statistics/properties/s8sheBeiHeChaPro.vue

@@ -2,7 +2,7 @@
     <el-dialog
       :visible.sync="visible"
       ref="dialog"
-      :title="title+'详情'"
+      :title="title+''"
       width="100%"
       lock-scroll
       append-to-body

src/views/statistics/properties/s9neiBuZhiLiangPro.vue

@@ -37,19 +37,19 @@
         <el-aside style="border:0px;width: 30%;">
            <div class="dataCont" style="font-size: 14px;">
             <el-divider content-position="left">{{data.t_mjzlkzxbNum.date}} 年度</el-divider>
-              计划内质量控制计划完成数量 ：<el-tag>{{data.t_mjzlkzxbNum.number[1]}} 次</el-tag>
+              计划内质量控制完成数量 ：<el-tag>{{data.t_mjzlkzxbNum.number[1]}} 次</el-tag>
               <br>
-              计划内质量控制计划总数 ：<el-tag>{{data.t_mjzlkzxbNum.number[2]}} 次</el-tag>
-              <br>
-              计划内质量控制计划完成率 ：<el-tag>{{data.t_mjzlkzxbNum.number[1]==null||data.t_mjzlkzxbNum.number[1]==0?"0.00":(data.t_mjzlkzxbNum.number[2]/data.t_mjzlkzxbNum.number[1]*100).toFixed(2)}} %</el-tag>
+              计划内质量控制总数 ：<el-tag>{{data.t_mjzlkzxbNum.number[2]}} 次</el-tag>
               <br>
+              计划内质量控制完成率 ：<el-tag>{{data.t_mjzlkzxbNum.number[1]==null||data.t_mjzlkzxbNum.number[1]==0?"0.00":(data.t_mjzlkzxbNum.number[2]/data.t_mjzlkzxbNum.number[1]*100).toFixed(2)}} %</el-tag>
               <br>
+              <!-- <br>
               计划外质量控制计划完成数量 ：<el-tag>{{data.t_mjzlkzxbNum.numberAll[1]}} 次</el-tag>
               <br>
               计划外质量控制计划总数 ：<el-tag>{{data.t_mjzlkzxbNum.numberAll[2]}} 次</el-tag>
               <br>
               计划外质量控制计划完成率 ：<el-tag>{{data.t_mjzlkzxbNum.numberAll[1]==null||data.t_mjzlkzxbNum.numberAll[1]==0?"0.00":(data.t_mjzlkzxbNum.numberAll[2]/data.t_mjzlkzxbNum.numberAll[1]*100).toFixed(2)}} %</el-tag>
-              <br>
+              <br> -->
             <br>
               <!-- <div v-for="(item,i) in data.t_complaintNum.number" :key="i">
                   <el-divider content-position="left">{{data.t_complaintNum.date[i]}} 年度</el-divider>

src/views/statistics/sendDatas.js

@@ -158,41 +158,43 @@ export default {
                         let e = []
                         let that = this
                         
-                        let a=0
-                        let b=0
+                        let a=that.nengliObj[0].num
+                        let b=that.nengliObj[1].num
                         let c=0
-                        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 ;
-                        });
+                        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{

src/views/system/jbdHome/yangPinShuJu/AnnualStatus.vue

@@ -6,7 +6,7 @@
         <span class="annualStatus">年度检测情况统计</span>
         <el-date-picker
           class="chooseMonth"
-          v-model="NowTime"
+          v-model="NowTime1"
           type="year"
           @change="changeTime"
           format="yyyy" 
@@ -29,6 +29,12 @@ export default {
       NowTime:''
     }
   },
+  props:{
+    NowTime1:{
+      type:String,
+      default:""
+    }
+  },
   created(){
     this.getNowTime()
   },
@@ -230,6 +236,7 @@ export default {
       font-weight:600;
     }
     .chooseMonth{
+      display: none;
       width: 120px;
       line-height: 50px;
       margin-left: 10px;

src/views/system/jbdHome/yangPinShuJu/EntrustNumber.vue

@@ -3,7 +3,7 @@
   <!-- 委托样品情况 -->
       <dv-border-box-7  backgroundColor="rgba(6, 30, 93, 0.5)" >
         <div class="entrustNumber_title">
-          <span class="demonstration">委托样品情况</span>
+          <span class="demonstration">委托样品收样情况</span>
           <el-date-picker
             class="chooseMonth"
             v-model="NowTime"
@@ -269,7 +269,7 @@ export default {
           series: [
             {
               type:"bar",
-              name:'外部送检已收到样品',
+              name:'客户送检样品数',
               //显示数字的颜色
               label: {
                 show: true,
@@ -285,7 +285,7 @@ export default {
             },
             {
               type:"bar",
-              name:'内部委托已收到样品',
+              name:'内部送检样品数',
               //显示数字的颜色
               label: {
                 show: true,
@@ -305,12 +305,12 @@ export default {
               label: {
                 show: true,
                 position: 'top',
-                color:'#f5f12a'
+                color:'#f52aa0'
               },
               //柱子的颜色
               itemStyle:{
                 show:true,
-                color:'rgba(245, 241, 42, 0.4)',
+                color:'rgba(245, 41, 160,0.4)',
               },
               data:unqualifiedData 
             },
@@ -320,12 +320,12 @@ export default {
               label: {
                 show: true,
                 position: 'top',
-                color:'#f52aa0'
+                color:'#7FFF00'
               },
               //柱子的颜色
               itemStyle:{
                 show:true,
-                color:'rgba(245, 41, 160,0.4)',
+                color:'rgba(127,255,0,0.4)',
               },
               data:retentionData 
             },

src/views/system/jbdHome/yangPinShuJu/headerContent.vue

@@ -6,15 +6,16 @@
         <div class="number">{{EntrustedTotal}}个</div>
       </div>
       <div class="totalNumber">
-        <div>委托样品内部总数</div>
-        <div class="number">{{EntrustedTotalN}}个</div>
+        <div>客户委托样品总数</div>
+        <div class="number">{{EntrustedTotalW}}个</div>
       </div>
       <div class="totalNumber">
-        <div>委托样品外部总数</div>
-        <div class="number">{{EntrustedTotalW}}个</div>
+        <div>内部委托样品总数</div>
+        <div class="number">{{EntrustedTotalN}}个</div>
       </div>
+      
       <div class="notReceived">
-        <div>待收样数量(已委托未收样)</div>
+        <div>待收样数量</div>
         <div class="number">{{NotReceiveNumber}}个</div>
       </div>
       <div class="received">
@@ -22,7 +23,7 @@
         <div class="number">{{ReceiveNumber}}个</div>
       </div>
       <div class="staging">
-        <div>待检样品数量</div>
+        <div>待检样品总数</div>
         <div class="number">{{StagingNumber}}个</div>
       </div>
       <div class="unqualified">

src/views/system/jbdHome/yangPinShuJu/index.vue

@@ -13,7 +13,7 @@
             line-height: 2.825rem;
             text-align:center;
             position: absolute;
-            left: 20%;
+            left: 4%;
             top:3.8%;" >
             <el-date-picker
               class="chooseMonth"
@@ -40,7 +40,7 @@
             <dv-border-box-8>返回</dv-border-box-8>
           </div>
           <!-- 显示数据上一次更新的时间 -->
-          <div
+          <!-- <div
             class="changeTime"
             style="width: 18%;
             cursor: pointer;
@@ -52,7 +52,7 @@
             top:4%;
             color: #FFFFFF;">
               <dv-border-box-8 >上一次更新时间:{{this.sendTime}}</dv-border-box-8>
-          </div>
+          </div> -->
           <!-- 样品头部数据总览 -->
           <div class="overView">
             <headerContent  @getUpdateTime="getTime" :NowTime1="NowTime1+'-01'"></headerContent>
@@ -70,7 +70,7 @@
           </div>
           <div class="detection">
             <div class="monthlyS" ref="MonthlyStatus_refs"><monthlyStatus  :NowTime1="NowTime1"/></div>
-            <div class="annualS" ref="AnnualStatus_refs"><annualStatus/></div>
+            <div class="annualS" ref="AnnualStatus_refs"><annualStatus :NowTime1="NowTime1"/></div>
             <div class="monthlyN" ref="MonthlyNumber_refs"><monthlyNumber  :NowTime1="NowTime1"/></div>
           </div>
         </div>