看板修改

src/views/crm/component/customerStatistics.vue

@@ -31,77 +31,117 @@ import echarts from 'echarts'
         if (true) {
             let myChart =  echarts.init(document.getElementById("chart"))
             let option = {
-                legend: {                  
+                tooltip: {
+                    trigger: 'item'
+                },
+                legend: {
+                    top: '5%',
+                    left: 'center',
                     textStyle:{
-                        color:'#fff'
+                        color:'#fff',
+                        fontSize: 15,
+                        fontWeight: 'bold'
                     }
                 },
-                tooltip: {},
                 color:['#FF3366','#66FFFF','#66CC00'],
-                dataset: {
-                    dimensions: ['lei_bie_', 'qznum', 'ynnum', 'khnum'],
-                    source: this.data
-                },
-                xAxis: { 
-                    type: 'category',
-                    axisLabel:{//修改坐标系字体颜色
-                        show:true,
-                        textStyle:{
-                            color:"#fff"
-                        }
-                    },
-                    axisLine: {
-                        show: true,
-                        lineStyle: {
-                            color: "rgba(255,255,255,1)",
-                            type: "solid"
-                        }
-                    }
-                },
-                yAxis: {
-                    axisLabel:{//修改坐标系字体颜色
-                        show:true,
-                        textStyle:{
-                            color:"#fff"
-                        }
-                    },
-                    axisLine: {//y轴线的颜色以及宽度
-                        show: true,
-                        lineStyle: {
-                            color: "rgba(255,255,255,1)",
-                            type: "solid"
-                        },
-                    },
-                    splitLine: {
-                        show: false
-                    }
-                },
-                // Declare several bar series, each will be mapped
-                // to a column of dataset.source by default.
                 series: [
-                    { 
-                        name: '潜在客户数量',
-                        type: 'bar',
-                        label: {
-                            show: true,
-                            position: 'top'
-                        } 
-                    }, { 
-                        name: '意向客户数量',
-                        type: 'bar', 
-                        label: {
-                            show: true,
-                            position: 'top'
-                        } 
-                    }, {
-                        name: '已签约客户数量',
-                        type: 'bar',
+                    {
+                        type: 'pie',
+                        // radius: ['40%', '70%'],
+                        avoidLabelOverlap: false,
                         label: {
-                            show: true,
-                            position: 'top'
-                        } 
+                            // show: true,
+                            formatter: '{b}: {@2012} ({d}%)',
+                            position: 'inner',
+                            textStyle: {
+                                fontSize: 18,
+                                fontWeight: 'bold'
+                            }
+                        },
+                        emphasis: {
+                            label: {
+                                show: true,
+                                fontSize: 20,
+                                fontWeight: 'bold'
+                            }
+                        },
+                        labelLine: {
+                            show: false
+                        },
+                        data: this.data
                     }
                 ]
+                // legend: {                  
+                //     textStyle:{
+                //         color:'#fff'
+                //     }
+                // },
+                // tooltip: {},
+                // color:['#FF3366','#66FFFF','#66CC00'],
+                // dataset: {
+                //     dimensions: ['lei_bie_', 'qznum', 'ynnum', 'khnum'],
+                //     source: this.data
+                // },
+                // xAxis: { 
+                //     type: 'category',
+                //     axisLabel:{//修改坐标系字体颜色
+                //         show:true,
+                //         textStyle:{
+                //             color:"#fff"
+                //         }
+                //     },
+                //     axisLine: {
+                //         show: true,
+                //         lineStyle: {
+                //             color: "rgba(255,255,255,1)",
+                //             type: "solid"
+                //         }
+                //     }
+                // },
+                // yAxis: {
+                //     axisLabel:{//修改坐标系字体颜色
+                //         show:true,
+                //         textStyle:{
+                //             color:"#fff"
+                //         }
+                //     },
+                //     axisLine: {//y轴线的颜色以及宽度
+                //         show: true,
+                //         lineStyle: {
+                //             color: "rgba(255,255,255,1)",
+                //             type: "solid"
+                //         },
+                //     },
+                //     splitLine: {
+                //         show: false
+                //     }
+                // },
+                // // Declare several bar series, each will be mapped
+                // // to a column of dataset.source by default.
+                // series: [
+                //     { 
+                //         name: '潜在客户数量',
+                //         type: 'bar',
+                //         label: {
+                //             show: true,
+                //             position: 'top'
+                //         } 
+                //     }, { 
+                //         name: '意向客户数量',
+                //         type: 'bar', 
+                //         label: {
+                //             show: true,
+                //             position: 'top'
+                //         } 
+                //     }, {
+                //         name: '已签约客户数量',
+                //         type: 'bar',
+                //         label: {
+                //             show: true,
+                //             position: 'top'
+                //         } 
+                //     }
+                // ]
             };
             option && myChart.setOption(option);
         }

src/views/crm/tongji.vue

@@ -6,18 +6,21 @@
         <!-- 标题装饰组件 -->
           <header-decoration />
           <div class="pickDate">
-            <el-date-picker
-              v-model="allDate"
-              style="color: #000 !important;
-              width: 12%;
-              height:2.825rem;
-              line-height: 2.825rem;
-              text-align:center;"
-              type="month"
-              value-format="yyyy-MM"
-              @change="refreshAll(allDate)"
-              placeholder="选择月">
-            </el-date-picker>
+            <div style="width:100%;text-align:left;">
+              <span>月份:</span>
+              <el-date-picker
+                v-model="allDate"
+                style="color: #000 !important;
+                width: 12%;
+                height:2.825rem;
+                line-height: 2.825rem;
+                text-align:center;"
+                type="month"
+                value-format="yyyy-MM"
+                @change="refreshAll(allDate)"
+                placeholder="选择月">
+              </el-date-picker>
+            </div>
             <div 
               @click.prevent="goBack()" 
               style="width: 12%;
@@ -36,23 +39,36 @@
               <div class="nullDate" v-else>暂无数据</div>
             </div>
           </dv-border-box-7>
-          <dv-border-box-7  backgroundColor="rgba(6, 30, 93, 0.5)" >
+
+          <dv-border-box-7 style="width:49.5%;" 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"
+                :config="tableData"
+              />
+              <div class="nullDate" v-else>暂无数据</div>
+            </div>
+          </dv-border-box-7>
+          <!-- <dv-border-box-7  backgroundColor="rgba(6, 30, 93, 0.5)" >
             <div class="ttitle">
               <div v-if="msArr.length>0" class="middleFont">月度各渠道客户数量</div>
               <customer-statistics-m v-if="msArr.length>0" :data = 'msArr'></customer-statistics-m>
               <div class="nullDate" v-else>暂无数据</div>
             </div>
-          </dv-border-box-7>
+          </dv-border-box-7> -->
           
         </div>
-        <div class="customerD" v-if="authority">
-          <dv-border-box-7 style="width:49.5%;" backgroundColor="rgba(6, 30, 93, 0.5)">
-            <div class="middleFontC" v-if="tableData.data && tableData.data.length">月度客户销售量</div>
-            <dv-scroll-board style="height: 87%;"
-              v-if="tableData.data && tableData.data.length"
-              :config="tableData"
-            />
-            <div class="nullDate" v-else>暂无数据</div>
+        <!-- <div class="customerD" v-if="authority"> -->
+          <!-- <dv-border-box-7 style="width:49.5%;" backgroundColor="rgba(6, 30, 93, 0.5)">
+            <div class="ttitle">
+              <div class="middleFontC" v-if="tableData.data && tableData.data.length">月度客户销售量</div>
+              <dv-scroll-board style="height: 87%;"
+                v-if="tableData.data && tableData.data.length"
+                :config="tableData"
+              />
+              <div class="nullDate" v-else>暂无数据</div>
+            </div>
           </dv-border-box-7>
           <dv-border-box-7  backgroundColor="rgba(6, 30, 93, 0.5)" >
             <div class="ttitle">
@@ -60,7 +76,7 @@
               <individual-performance v-if="inArr.length>0" :data = 'inArr'></individual-performance>
               <div class="nullDate" v-else>暂无数据</div>
             </div>
-          </dv-border-box-7>
+          </dv-border-box-7> -->
 <!--           
           <dv-border-box-7  backgroundColor="rgba(6, 30, 93, 0.5)" >
             <div class="ttitle">
@@ -76,7 +92,7 @@
               <div class="nullDate" v-else>暂无数据</div>
             </div>
           </dv-border-box-7> -->
-        </div>
+        <!-- </div> -->
         <div class="customerG" v-else>
           <!-- <dv-border-box-7  backgroundColor="rgba(6, 30, 93, 0.5)" >
             <div class="ttitle">
@@ -128,7 +144,10 @@
         pmArr:[],
         peArr:[],
         tableData:{
-          header: ['公司名称', '付款方式', '价格（元）'],
+          header: ['<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'],
           data: [
             ['行1列1', '行1列2', '行1列3'],
             ['行2列1', '行2列2', '行2列3'],
@@ -158,7 +177,7 @@
     },
     mounted() {
       //权限
-      this.authorityJudgment()
+      // this.authorityJudgment()
       //初始化
       this.Date()
     },
@@ -177,8 +196,8 @@
         let dateNum = new Date(date.year, date.month, 0).getDate();
 
         this.getCustomerStatisticsYear(this.allDate)
-        this.getCustomerStatisticsMonth(this.allDate)
-        this.getIndividualPerformanceMonth(this.allDate)
+        // this.getCustomerStatisticsMonth(this.allDate)
+        // this.getIndividualPerformanceMonth(this.allDate)
         this.getIndividualPerformanceCustomerMonth(this.allDate)
         // this.getTeamPerformance(this.allDate)
         // this.getTeamPerformanceMonth(this.allDate)
@@ -191,8 +210,8 @@
       refreshAll(date){
         let dateNum = new Date(this.allDate.split('-')[0], Number(this.allDate.split('-')[1])+'', 0).getDate();
         this.getCustomerStatisticsYear(date)
-        this.getCustomerStatisticsMonth(date)
-        this.getIndividualPerformanceMonth(date)
+        // this.getCustomerStatisticsMonth(date)
+        // this.getIndividualPerformanceMonth(date)
         this.getIndividualPerformanceCustomerMonth(date)
         // this.getTeamPerformance(date)
         // this.getTeamPerformanceMonth(date)
@@ -201,14 +220,16 @@
       },
       getCustomerStatisticsYear(date){
         this.csArr.length = 0
-        let sql = "select * from (select a.lai_yuan_qu_dao_,SUM(IFNULL(a.qznum,0)) as qznum ,SUM(IFNULL(a.yxnum,0)) as ynnum,SUM(IFNULL(a.khnum,0)) as khnum,IFNULL(b.lei_bie_,'空') as lei_bie_ from (((select COUNT(lai_yuan_qu_dao_) as qznum, lai_yuan_qu_dao_, null as yxnum,null as khnum from t_qzkhb GROUP BY lai_yuan_qu_dao_) UNION (select null, lai_yuan_qu_dao_, COUNT(lai_yuan_qu_dao_) as yxnum,null from t_yxkh GROUP BY lai_yuan_qu_dao_) UNION (select null, ke_hu_lai_yuan_,null, COUNT(ke_hu_lai_yuan_) as khnum from t_khxx GROUP BY ke_hu_lai_yuan_)) 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_) GROUP BY b.lei_bie_ UNION select null,0,0,0,lei_bie_ from t_qdlbb) as c GROUP BY c.lei_bie_"
+        // let sql = "select * from (select a.lai_yuan_qu_dao_,SUM(IFNULL(a.qznum,0)) as qznum ,SUM(IFNULL(a.yxnum,0)) as ynnum,SUM(IFNULL(a.khnum,0)) as khnum,IFNULL(b.lei_bie_,'空') as lei_bie_ from (((select COUNT(lai_yuan_qu_dao_) as qznum, lai_yuan_qu_dao_, null as yxnum,null as khnum from t_qzkhb GROUP BY lai_yuan_qu_dao_) UNION (select null, lai_yuan_qu_dao_, COUNT(lai_yuan_qu_dao_) as yxnum,null from t_yxkh GROUP BY lai_yuan_qu_dao_) UNION (select null, ke_hu_lai_yuan_,null, COUNT(ke_hu_lai_yuan_) as khnum from t_khxx GROUP BY ke_hu_lai_yuan_)) 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_) GROUP BY b.lei_bie_ UNION select null,0,0,0,lei_bie_ from t_qdlbb) as c GROUP BY c.lei_bie_"
+        let sql = "select COUNT(id_) as value, '潜在客户' as name from t_qzkhb where dang_qian_zhuang_ != '已转意向客户' UNION select COUNT(id_) ,'意向客户' from t_yxkh UNION select COUNT(a.id_) ,'已签约客户' from (select * from t_bjd where shi_fou_guo_shen_ = '已完成' GROUP BY ke_hu_ming_cheng_) as a"
         curdPost('sql',sql).then(res=>{
-          let arr = res.variables.data
-          for (var i = 0; i < arr.length; i++) {
-            if (arr[i].lei_bie_ != "空") {//判断key为999的对象是否存在，
-              this.csArr.push(arr[i])
-            }
-          }
+          console.log(sql)
+          this.csArr = res.variables.data
+          // for (var i = 0; i < arr.length; i++) {
+          //   if (arr[i].lei_bie_ != "空") {//判断key为999的对象是否存在，
+          //     this.csArr.push(arr[i])
+          //   }
+          // }
         })
       },
       getCustomerStatisticsMonth(date){
@@ -241,7 +262,7 @@
         curdPost('sql',sql).then(res=>{
           let arr = res.variables.data
           for (var i = 0; i < arr.length; i++) {
-            let changeArr = [arr[i].zhuan_huan_ke_hu_,arr[i].fu_kuan_fang_shi_,arr[i].jiage]
+            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)
           }
           // }
@@ -325,6 +346,32 @@
             break;
           }
         }
+      },
+      moneyFormat (num, decimal = 2, split = ',') {
+        /*
+          parameter：
+          num：格式化目标数字
+          decimal：保留几位小数，默认2位
+          split：千分位分隔符，默认为,
+        */
+        if (isFinite(num)) { // num是数字
+          if (num === 0) { // 为0
+            return num.toFixed(decimal)
+          } else { // 非0
+            var res = ''
+            var dotIndex = String(num).indexOf('.')
+            if (dotIndex === -1) { // 整数
+              res = String(num).replace(/(\d)(?=(?:\d{3})+$)/g, `$1${split}`) + '.' + '0'.repeat(decimal)
+            } else { 
+              const numStr = String((Math.round(num * Math.pow(10, decimal)) / Math.pow(10, decimal)).toFixed(decimal)) // 四舍五入，然后固定保留2位小数
+              const decimals = numStr.slice(dotIndex, dotIndex + decimal + 1) // 截取小数位
+              res = String(numStr.slice(0, dotIndex)).replace(/(\d)(?=(?:\d{3})+$)/g, `$1${split}`) + decimals
+            }
+            return res
+          }
+        } else {
+          return '--'
+        }
       }
     }
   }
@@ -352,13 +399,13 @@
     // float: left;
     display: flex;
     justify-content: space-between;
-    margin: -3% 10% 0;
+    margin: -3% 11% 0;
   }
   .customerC{
     display: flex;
     justify-content: space-between;
     margin: 1% 1% 0;
-    height: 40% !important;
+    height: 85% !important;
     .dv-border-box-7{
       width: 49.5%;
     }
@@ -393,7 +440,6 @@
 		  align-items: center;
       justify-content: center;
     }
-    
   }
   .nullDate{
     height: 100%;
@@ -403,10 +449,8 @@
     font-size: 36px;
   }
   .middleFontC{
-      font-size: 120%;
-      font-weight: 600;
       text-align: center;
-      height: 13%;
+      height: 13% !important;
       display: flex;
 		  align-items: center;
       justify-content: center;

src/views/statistics/index.vue

@@ -76,123 +76,131 @@
         </div>
         <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 style="margin: 0 0.2%;">
-              <div class="gongshiXian">完成检测项目数量</div>
-              <div style="text-align:center;font-size:12px;padding-top: 6%;">有效检测任务总数</div>
+          <div style="width:16.4%">
+            <div class="gongshiAll">
+              <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>
+              <div>×100%</div>
             </div>
-            <div>×100%</div>
+            <div class="mubiaozhi">当前目标值：{{quality[0].val}}</div>
           </div>
-          <div class="gongshiAll" style="width:21.4%">
-            <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="width:21.4%">
+            <div class="gongshiAll">
+              <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>
+              <div>×100%</div>
             </div>
-            <div>×100%</div>
+            <div class="mubiaozhi">当前目标值：{{quality[1].val}}</div>
           </div>
-          <div class="gongshiAll" style="width:17.4%">
-            <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="width:17.4%">
+            <div class="gongshiAll">
+              <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>
+              <div>×100%</div>
             </div>
-            <div>×100%</div>
+            <div class="mubiaozhi">当前目标值：{{quality[2].val}}</div>
           </div>
-          <div class="gongshiAll" style="width:17.4%">
-            <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="width:17.4%">
+            <div class="gongshiAll">
+              <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>
+              <div>×100%</div>
             </div>
-            <div>×100%</div>
+            <div class="mubiaozhi">当前目标值：{{quality[3].val}}</div>
           </div>
-          <div class="gongshiAll" style="width:27.4%">
-            <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="width:27.4%">
+            <div class="gongshiAll">
+              <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>
+              <div>×100%</div>
             </div>
-            <div>×100%</div>
+            <div class="mubiaozhi">当前目标值：{{quality[4].val}}</div>
           </div>
         </div>
-        <div class="congxiebox7">
+        <div class="congxiebox7" v-if="pageOT">
           <div class="ttitle" style="text-align: center;">质量目标统计</div>
           <div class="componentsData" v-if="relOf">
-              <s1zhiLiangMuBiao :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+              <s1zhiLiangMuBiao :height="'290%'" :width="static=='row' ? '20%': '100%'" :colorw = "colorw" :mubiao = "quality[0].val"
               v-if="showAll || showComponents[1]" :data = "getS1renwu()"/>
-              <s1jianCe :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+              <s1jianCe :height="'290%'" :width="static=='row' ? '20%': '100%'" :colorw = "colorw" :mubiao = "quality[1].val"
               v-if="showAll || showComponents[5]" :data = "getS2jianCe()" />
-              <s2manYiDu :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+              <s2manYiDu :height="'290%'" :width="static=='row' ? '20%': '100%'" :colorw = "colorw" :mubiao = "quality[2].val"
               v-if="showAll || showComponents[7]"  :data = "getS2manYiDu()"/>
-              <s3tousu :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+              <s3tousu :height="'290%'" :width="static=='row' ? '20%': '100%'" :colorw = "colorw" :mubiao = "quality[3].val"
               v-if="showAll || showComponents[6]" :data = "getS3tousu()"/>
-              <s13shengWu :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+              <s13shengWu :height="'290%'" :width="static=='row' ? '20%': '100%'" :colorw = "colorw" :mubiao = "quality[4].val"
               v-if="showAll || showComponents[17]" :data = "getS3tousu()"/>
               <div class="clear"></div>
           </div>
         </div>
-        <div class="congxiebox7" style="display:inline-block;width:49%">
+        <div class="congxiebox7" style="display:inline-block;width:49%" v-if="pageOT">
           <div class="ttitle" style="margin:2% 0;text-align: center;">人员培训与管理</div>
           <div class="componentsData" v-if="relOf">
-              <s4renYuanPeiXun :width="static=='row' ? '50%': '100%'" :colorw = "colorw"
+              <s4renYuanPeiXun :height="'290%'" :width="static=='row' ? '50%': '100%'" :colorw = "colorw"
               v-if="showAll || showComponents[8]" :data = "getS4renYuanPeiXun()"/>
-              <s5renYuanJianDu :width="static=='row' ? '50%': '100%'" :colorw = "colorw"
+              <s5renYuanJianDu :height="'290%'" :width="static=='row' ? '50%': '100%'" :colorw = "colorw"
               v-if="showAll || showComponents[9]" :data = "getS5renYuanJianDu()"/>
               <!-- <div class="clear"></div> -->
 
           </div>
         </div>
-        <div class="congxiebox7" style="display:inline-block;width:49%;float:right;">
+        <div class="congxiebox7" style="display:inline-block;width:49%;float:right;" v-if="pageOT">
           <div class="ttitle" style="margin:2% 0;text-align: center;">设备维保</div>
           <div class="componentsData" v-if="relOf">
-              <s7sheBeiJiaoZhun :width="static=='row' ? '50%': '100%'" :colorw = "colorw"
+              <s7sheBeiJiaoZhun :height="'290%'" :width="static=='row' ? '50%': '100%'" :colorw = "colorw"
               v-if="showAll || showComponents[12]" :data = "getJiaoYanObjNum()"/>
-              <s8sheBeiHeCha :width="static=='row' ? '50%': '100%'" :colorw = "colorw"
+              <s8sheBeiHeCha :height="'290%'" :width="static=='row' ? '50%': '100%'" :colorw = "colorw"
               v-if="showAll || showComponents[11]" :data = "gethechaObjNum()"/>
               <!-- <div class="clear"></div> -->
 
           </div>
         </div>
-        <div class="congxiebox7" >
+        <div class="congxiebox7" v-if="!pageOT">
 
           <div class="ttitle" style="text-align: center;">标准物质</div>
           <div class="componentsData" v-if="relOf">
-              <s11biaoZhunWu :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
+              <s11biaoZhunWu :height="'290%'" :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
               v-if="showAll || showComponents[15]" :data = "getbiaozhunObjNum()"/>
-              <s16bzJunZhu :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
+              <s16bzJunZhu :height="'290%'" :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
               v-if="showAll || showComponents[20]" :data = "getbzJunZhujNum()"/>
-              <s17bzXiBao :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
+              <s17bzXiBao :height="'290%'" :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
               v-if="showAll || showComponents[21]" :data = "getbzXiBaoObjNum()"/>
               <div class="clear"></div>
           </div>
         </div>
-        <div class="congxiebox7" >
+        <div class="congxiebox7" v-if="!pageOT">
 
-        <div class="ttitle" style="text-align: center;">质量管理</div>
+          <div class="ttitle" style="text-align: center;">质量管理</div>
           <div class="componentsData" v-if="relOf">
-              <s9neiBuZhiLiang :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+              <s9neiBuZhiLiang :height="'290%'" :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
               v-if="showAll || showComponents[13]" :data = "getS9neiBuZhiLiang()"/>
-              <s10waiBuNengLi :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+              <s10waiBuNengLi :height="'290%'" :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
               v-if="showAll || showComponents[14]" :data = "getnengtliObjNum()"/>
-              <s14bufuhexiang :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+              <s14bufuhexiang :height="'290%'" :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
               v-if="showAll || showComponents[18]" :data = "getS14bufuhexiang()"/>
-              <s15tousu :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+              <s15tousu :height="'290%'" :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
               v-if="showAll || showComponents[19]" :data = "getS3tousu()"/>
-              <s12fengXian :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+              <s12fengXian :height="'290%'" :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
               v-if="showAll || showComponents[16]" :data = "getS12fengXian()"/>
               <div class="clear"></div>
 
           </div>
         </div>
-        <!-- <div class="ttitle">风险控制</div>
-        <div class="componentsData" v-if="relOf">
-            <s12fengXian :width="static=='row' ? '25%': '100%'"
-            v-if="showAll || showComponents[16]" :data = "getS12fengXian()"/>
-            <div class="clear"></div>
-
-        </div> -->
        
 
 
@@ -237,6 +245,7 @@
   import { DBData ,getConfig,getJiaoYanObj, gethechaObj, getnengliObj, getbiaozhunObj,getbiaozhunTObj,getbzJunZhuObj,getbzJunZhuTObj,getbzXiBaoObj,getbzXiBaoTObj} from './js/selectDB.js'
   import sendDatas from './sendDatas.js'
   import repostCurd from '@/business/platform/form/utils/custom/joinCURD.js'
+import * as forEach from 'lodash/forEach'
   export default {
     components:{
       headerDecoration,
@@ -288,6 +297,12 @@
         this.dataScope.push(this.endDate)
       }
       this.getConfigData() //获取统计的配置
+      this.getqualityData()
+
+      this.timer1 = setInterval(()=>{
+        this.pageOT = !this.pageOT
+        console.log(this.pageOT)
+      },300000)
     },
     data() {
       return {
@@ -309,14 +324,26 @@
         selectBeg: '',
         showAll:true,
         timer: '',
+        timer1: '',
         showComponents:{},//显示全部统计子组件 , 若有新增，往后累计。 供动态表单进行查阅使用。
         dataScope: [],
-        colorw: '#fff'
+        colorw: '#fff',
+        pageOT: true,
+        quality:[
+          {name: '任务及时完成率' ,val: ''},
+          {name: '检测报告差错率' ,val: ''},
+          {name: '客户满意度' ,val: ''},
+          {name: '投诉率' ,val: ''},
+          {name: '投诉处理及时率' ,val: ''}
+        ]
       }
     },
      beforeDestroy() {
-          clearInterval(this.timer);
-        },
+      if(screenfull.isFullscreen){
+        screenfull.toggle()
+      }
+      clearInterval(this.timer);
+    },
     methods: {
       /* 判断是否统计子组件中传递过来的，是否需要隐藏。若需要则进行隐藏的遍历  */
       isShowComponents(){
@@ -325,6 +352,20 @@
             this.showComponents[this.shows[i]] = true
           }
       },
+      getqualityData() {
+        let sql='select xiang_mu_ming_,mu_biao_zhi_ from t_zlmbz'
+        repostCurd('sql', sql).then(response => {
+          let a = response.variables.data //结果一定存在第0个，因为只有一条数据
+           this.quality.forEach((t,i)=>{
+            a.forEach(e => {
+              if (t.name === e.xiang_mu_ming_) {
+                t.val = e.mu_biao_zhi_
+              }
+            });
+          })
+          console.log(this.quality,'546546654gsdf')
+        })
+      },
       /* 查询统计配置中的完成率*/
       getConfigData() {
         repostCurd('sql', getConfig()).then(response => {
@@ -419,6 +460,8 @@
         // if ((this.selectEnd != this.endDate || this.selectBeg != this.BeginDate) && this.endDate != this.BeginDate && this.endDate > this.BeginDate) {
           // this.getData(this.BeginDate, this.endDate, false, this.dataScope)
           this.getConfigData()
+          this.getqualityData()
+
           // this.$forceUpdate();
 
           // this.selectEnd = this.endDate
@@ -494,6 +537,7 @@
       },
       goBack(){
         this.$router.back(-1)
+        clearInterval(this.timer1);
       }
     },
     created() {
@@ -503,11 +547,6 @@
       this.allView()
         
       }
-    },
-    beforeDestroy() {
-      if(screenfull.isFullscreen){
-        screenfull.toggle()
-        }
     }
   }
 </script>
@@ -545,6 +584,9 @@
 
   //  }
   }
+  .el-scrollbar__wrap{
+    overflow-x: hidden;
+  }
   .goBackButton{
     width: 2%;
     position: absolute;
@@ -594,6 +636,10 @@
       font-size: 12px;
     }
   }
+  .mubiaozhi{
+    text-align: center;
+    margin-top: 3%;
+  }
 </style>
 <style lang="scss">
 .el-year-table .today .cell {

src/views/statistics/item/s13shengWu.vue

@@ -8,6 +8,7 @@
         @close = "close"
         :title="title"
         :data="data"
+        :mubiao="mubiao"
       />
     </div>
   </div>
@@ -44,6 +45,10 @@
       colorw:{
         type:String,
         default:'true'
+      },
+      mubiao:{
+        type:String,
+        default:''
       }
     },
     data () {

src/views/statistics/item/s1jianCe.vue

@@ -8,6 +8,7 @@
         @close = "close"
         :title="title"
         :data="data"
+        :mubiao="mubiao"
       />
     </div>
   </div>
@@ -45,6 +46,10 @@
       colorw:{
         type:String,
         default:'true'
+      },
+      mubiao:{
+        type:String,
+        default:''
       }
     },
     data () {
@@ -69,7 +74,6 @@
       drawLine(){
         var echarts = require('echarts');
         let s1jianCe = echarts.init(document.getElementById(this.id))
-
         //  let data = [];
 
         //  data.push(Number(this.data.t_gdyrqcwt5Begin.number<0?0-this.data.t_gdyrqcwt5Begin.number:this.data.t_gdyrqcwt5Begin.number)*100)

src/views/statistics/item/s1zhiLiangMuBiao.vue

@@ -9,6 +9,7 @@
         @close = "close"
         :title="title"
         :data="data"
+        :mubiao="mubiao"
       />
     </div>
   </div>
@@ -46,6 +47,10 @@
       colorw:{
         type:String,
         default:'true'
+      },
+      mubiao:{
+        type:String,
+        default:''
       }
     },
     data () {

src/views/statistics/item/s2manYiDu.vue

@@ -8,6 +8,7 @@
         @close = "close"
         :title="title"
         :data="data"
+        :mubiao="mubiao"
       />
     </div>
   </div>
@@ -46,6 +47,10 @@
       colorw:{
         type:String,
         default:'true'
+      },
+      mubiao:{
+        type:String,
+        default:''
       }
     },
     data () {

src/views/statistics/item/s3tousu.vue

@@ -8,6 +8,7 @@
         @close = "close"
         :title="title"
         :data="data"
+        :mubiao="mubiao"
       />
     </div>
   </div>
@@ -44,6 +45,10 @@
       colorw:{
         type:String,
         default:'true'
+      },
+      mubiao:{
+        type:String,
+        default:''
       }
     },
     data () {

src/views/statistics/properties/s13shengWuPro.vue

@@ -42,6 +42,9 @@
               有效投诉总次数 ：<el-tag>{{data.t_complaintNum.numberAll[0]}} 次</el-tag>
               <br>
               投诉回复及时率 ：<el-tag>{{data.t_complaintNum.res[0]}} %</el-tag>
+              <br>
+              当前目标值 ：<el-tag>{{mubiao}}</el-tag>
+              <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>
@@ -76,6 +79,10 @@
         height:{
           type:String,
           default:window.screen.height * 0.5 +'px'
+        },
+        mubiao:{
+          type:String,
+          default:''
         }
       },
       beforeCreate: function () {

src/views/statistics/properties/s1jianCePro.vue

@@ -44,6 +44,8 @@
             <br>
             检测报告差错率 ：<el-tag>{{data.t_mjjcbgNum.res[0]}} 次</el-tag>
             <br>
+            当前目标值 ：<el-tag>{{mubiao}}</el-tag>
+            <br>
           <!-- <el-divider content-position="left">{{data.t_gdyrqcwtBegin.date}} 年度</el-divider>
             委托检测数 ：<el-tag>{{data.t_gdyrqcwtBegin.number}} 次</el-tag>
             <br>
@@ -105,6 +107,10 @@
         height:{
           type:String,
           default:window.screen.height * 0.50 +'px'
+        },
+        mubiao:{
+          type:String,
+          default:''
         }
         
       },

src/views/statistics/properties/s1zhiLiangMuBiaoPro.vue

@@ -42,6 +42,8 @@
                 <br>
                 任务完成率 ：<el-tag>{{data.t_jchzbNum.res[0]}} %</el-tag>
                 <br>
+                当前目标值 ：<el-tag>{{mubiao}}</el-tag>
+                <br>
               </div>
               <!-- <div class="dataCont" style="font-size: 14px;">
               <el-divider content-position="left">2021 年度</el-divider>
@@ -90,6 +92,10 @@
         height:{
           type:String,
           default:window.screen.height * 0.5 +'px'
+        },
+        mubiao:{
+          type:String,
+          default:''
         }
       },
       beforeCreate: function () {

src/views/statistics/properties/s2manYiDuPro.vue

@@ -44,6 +44,8 @@
               <br>
               客户满意度 ：<el-tag>{{data.t_khmydtjbNum.res[0]}} %</el-tag>
               <br>
+              当前目标值 ：<el-tag>{{mubiao}}</el-tag>
+              <br>
            </div>
            <!-- <div v-for="(item,i) in data.t_khmydtjbNum.date" :key="i">
               <el-divider content-position="left">{{data.t_khmydtjbNum.date[i]}} 年度</el-divider>
@@ -78,6 +80,10 @@
         height:{
           type:String,
           default:window.screen.height * 0.5 +'px'
+        },
+        mubiao:{
+          type:String,
+          default:''
         }
       },
       beforeCreate: function () {

src/views/statistics/properties/s3tousuPro.vue

@@ -42,6 +42,9 @@
               委托总数次数 ：<el-tag>{{data.t_complaintNum.numberAll[0]}} 次</el-tag>
               <br>
               客户投诉率 ：<el-tag>{{data.t_complaintNum.res[0]}} %</el-tag>
+              <br>
+              当前目标值 ：<el-tag>{{mubiao}}</el-tag>
+              <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>
@@ -76,6 +79,10 @@
         height:{
           type:String,
           default:window.screen.height * 0.5 +'px'
+        },
+        mubiao:{
+          type:String,
+          default:''
         }
       },
       beforeCreate: function () {

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

@@ -132,29 +132,59 @@ export default {
       let sql12 = "select a.shou_yang_ri_qi_, a.yang_pin_shu_lian FROM (select t_lhypdjb.* from t_lhypdjb LEFT JOIN t_lhwtsqb on t_lhypdjb.wei_tuo_dan_hao_ = t_lhwtsqb.wei_tuo_bian_hao_ where t_lhwtsqb.wei_tuo_lei_xing_ != '客户委托') as a WHERE YEAR(a.shou_yang_ri_qi_)='"+this.yearA+"' and MONTH(a.shou_yang_ri_qi_) = '"+this.monthA+"'"
       let sql2 ="select shou_yang_ri_qi_,yang_pin_shu_lian FROM t_lhypdjb WHERE yan_shou_jie_guo_ = '残缺'  AND shou_yang_ri_qi_ LIKE '"+this.NowTime+'%'+"'"
       let sql3 = "select liu_yang_ri_qi_,liu_yang_shu_lian FROM (SELECT * FROM t_lhypdjb ) a WHERE   a.shi_fou_liu_yang_ != '否' AND shou_yang_ri_qi_ LIKE '"+this.NowTime+'%'+"'"
+      let sql4 = "select yang_pin_bian_hao,DATE_FORMAT(create_time_,'%Y-%m-%d') AS detectionTime FROM t_lhjcbgb WHERE yang_pin_bian_hao != ''  AND create_time_ LIKE '"+this.NowTime+'%'+"' GROUP BY yang_pin_bian_hao"
+      let sql5="select yang_pin_bian_hao,DATE_FORMAT(MIN(create_time_),'%Y-%m-%d') AS detectionTime FROM t_jchzb WHERE jian_ce_zhuang_ta != '已完成' AND yang_pin_bian_hao !=''  AND create_time_ LIKE '"+this.NowTime+'%'+"' GROUP BY yang_pin_bian_hao"
       Promise.all([
         curdPost('sql', sql1),
         curdPost('sql', sql12),
         curdPost('sql', sql2),
         curdPost('sql', sql3),
-      ]).then(([ res1, res12, res2, res3]) => {
+        curdPost('sql', sql4),
+        curdPost('sql', sql5),
+      ]).then(([ res1, res12, res2, res3, res4, res5]) => {
         let data1 = res1.variables.data
         let data12 = res12.variables.data
         let data2 = res2.variables.data
         let data3 = res3.variables.data
-        // console.log('返回的全部数据',data1,data2)
-        console.log('返回的全部数据',data1,data2,data3)
+        let data4 = res4.variables.data
+        let data5 = res5.variables.data
+
+        
+
         const receivedData = this.dealingData(data1,dayNum)
         const receivedData2 = this.dealingData(data12,dayNum)
         const unqualifiedData = this.dealingData(data2,dayNum)
         const retentionData = this.dealingRetentionData(data3,dayNum)
-        console.log('xxxxxxxxx方法返回的数据1   -------',receivedData2,sql1)
+        const untestedSample = this.dealingData1(data4,dayNum)
+        const completedSample = this.dealingData1(data5,dayNum)
+        console.log('xxxxxxxxx方法返回的数据1   -------',untestedSample,completedSample,data3,sql3)
         // console.log('xxxxxxxxx方法返回的数据2   -------',unqualifiedData)
         // console.log('xxxxxxxxx方法返回的数据3   -------',retentionData)
         //三组数据处理完毕之后，传给图表进行渲染  （月份天数数组，已收样，不合格，留样）
-        this.entrustNumberInit(this.days,receivedData,receivedData2,unqualifiedData,retentionData)
+        this.entrustNumberInit(this.days,receivedData,receivedData2,unqualifiedData,retentionData,untestedSample,completedSample)
       })
     },
+    //处理数据
+    dealingData1(data,dayNum){
+      let result = data.reduce((obj, item) => {
+          let find = obj.find(i => i.detectionTime === item.detectionTime);
+          let  CheckedArray= {
+            detectionTime:item.detectionTime,
+            count: 1
+          };
+          find ? find.count++ : obj.push(CheckedArray);
+          return obj;
+        }, []);
+         console.log('12345678',result);
+        this.filledNum = Array(dayNum).fill(0)
+        //遍历拿到的数组，截取出月份对应的 // 2022-11-01
+        result.forEach(item =>{
+          let key = item.detectionTime.slice(8,10) < 10 ?item.detectionTime.slice(9,10) :item.detectionTime.slice(8,10)
+          let value =parseInt(item.count)
+          this.filledNum.splice(key - 1,1,value)
+        })
+        return this.filledNum;
+    },
     //处理sql查询出来的数据
     dealingData(data,dayNum){
       console.log(data,'data1')
@@ -176,11 +206,29 @@ export default {
         this.filledNum.splice(key - 1,1,value)
       })
       //返回处理好的数量数组
-      console.log(this.filledNum,'90900990',data)
+      // console.log(this.filledNum,'90900990',data)
       return this.filledNum;
     },
     //处理留样数据
     dealingRetentionData(data,dayNum){
+      for (let ii in data) {
+          let num3 = data[ii].liu_yang_shu_lian.match(/×+\d+(\.\d+)?/g)
+          // console.log(num3,'768u76mudg')
+          if(num3 == null){
+            data[ii].liu_yang_shu_lian = 0
+          }else{
+            if(num3.length===1){
+              data[ii].liu_yang_shu_lian = Number(num3[0].replace(/[^\d]/g, ""))
+              // console.log(Number(num3[0].replace(/[^\d]/g, "")),num3[0])
+            }else{
+              data[ii].liu_yang_shu_lian=num3.reduce((a, b) => {
+                let aa=Number(a.replace(/[^\d]/g, ""))
+                let bb=Number(b.replace(/[^\d]/g, ""))
+                return aa + bb
+              })
+            }
+          }
+        }
       let newArray = data.reduce((total, cur, index) => {
           let hasValue = total.findIndex(current => {
             return current.liu_yang_ri_qi_ === cur.liu_yang_ri_qi_;
@@ -189,21 +237,23 @@ export default {
           hasValue !== -1 && (total[hasValue].liu_yang_shu_lian = Number(total[hasValue].liu_yang_shu_lian) + Number(cur.liu_yang_shu_lian));
           return total;
       }, []);
-        //console.log('日期相同数量相加 处理结果',newArray);
+        console.log('日期相同数量相加 处理结果',newArray);
         //创建一个长度为当前月份天数的数组
         this.filledNum = Array(dayNum).fill(0)
         //遍历拿到的数组，截取出月份对应的 // 2022-11-01
         newArray.forEach(item =>{
           let key = item.liu_yang_ri_qi_.slice(8,10) < 10 ?item.liu_yang_ri_qi_.slice(9,10) :item.liu_yang_ri_qi_.slice(8,10)
           let value =Number(item.liu_yang_shu_lian)
+          console.log(key,value,this.filledNum)
           this.filledNum.splice(key - 1,1,value)
         })
         //返回处理好的数量数组
+        console.log(this.filledNum,'89o9009jkikjkj')
         return this.filledNum;
     },
   
     //委托样品图表
-    entrustNumberInit(dayArray,receivedData,receivedData2,unqualifiedData,retentionData){
+    entrustNumberInit(dayArray,receivedData,receivedData2,unqualifiedData,retentionData,untestedSample,completedSample){
       // console.log('拿到日期数组',dayArray)
       console.log(receivedData,receivedData2,unqualifiedData,retentionData,'we12e12312312312')
       this.entrustNumber = echarts.init(this.$refs.Number_refs);
@@ -274,7 +324,10 @@ export default {
               label: {
                 show: true,
                 position: 'top',
-                color:'#fff'
+                color:'#fff',
+                formatter: function(params) {
+                  if (params.value > 0) {return params.value;}else if(params.value == 0){return ''}
+                }
               },
               //柱子的颜色
               itemStyle:{
@@ -290,7 +343,10 @@ export default {
               label: {
                 show: true,
                 position: 'top',
-                color:'#fff'
+                color:'#fff',
+                formatter: function(params) {
+                  if (params.value > 0) {return params.value;}else if(params.value == 0){return ''}
+                }
               },
               //柱子的颜色
               itemStyle:{
@@ -305,7 +361,10 @@ export default {
               label: {
                 show: true,
                 position: 'top',
-                color:'#f52aa0'
+                color:'#f52aa0',
+                formatter: function(params) {
+                  if (params.value > 0) {return params.value;}else if(params.value == 0){return ''}
+                }
               },
               //柱子的颜色
               itemStyle:{
@@ -320,7 +379,10 @@ export default {
               label: {
                 show: true,
                 position: 'top',
-                color:'#7FFF00'
+                color:'#7FFF00',
+                formatter: function(params) {
+                  if (params.value > 0) {return params.value;}else if(params.value == 0){return ''}
+                }
               },
               //柱子的颜色
               itemStyle:{
@@ -329,6 +391,42 @@ export default {
               },
               data:retentionData 
             },
+            {
+              type: 'line',
+              name:'已检测样品',
+              label: {
+                show: true,
+                position: 'top',
+                color:'#2E8B57',
+                formatter: function(params) {
+                  if (params.value > 0) {return params.value;}else if(params.value == 0){return ''}
+                }
+              },
+              //柱子的颜色
+              itemStyle:{
+                show:true,
+                color:'rgba(46,139,87,0.4)',
+              },
+              data:untestedSample 
+            },
+            {
+              type: 'line',
+              name:'未检测样品',
+              label: {
+                show: true,
+                position: 'top',
+                color:'#FF33FF',
+                formatter: function(params) {
+                  if (params.value > 0) {return params.value;}else if(params.value == 0){return ''}
+                }
+              },
+              //柱子的颜色
+              itemStyle:{
+                show:true,
+                color:'rgba(255,51,255,0.4)',
+              },
+              data:completedSample 
+            }
           ],
       }
       this.entrustNumber.setOption(entrustNumberOption)

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

@@ -13,7 +13,7 @@
             line-height: 2.825rem;
             text-align:center;
             position: absolute;
-            left: 4%;
+            left: 11%;
             top:3.8%;" >
             <el-date-picker
               class="chooseMonth"
@@ -35,7 +35,7 @@
             line-height: 2.825rem;
             text-align:center;
             position: absolute;
-            right: 3%;
+            right: 11%;
             top:4%;" >
             <dv-border-box-8>返回</dv-border-box-8>
           </div>
@@ -73,7 +73,7 @@
             <div class="monthlyS" ref="MonthlyStatus_refs"><sampleReceived  :NowTime1="NowTime1"/></div>
             <!-- <div class="annualS" ref="AnnualStatus_refs"><annualStatus :NowTime1="NowTime1"/></div> -->
             <div class="annualS" ref="AnnualStatus_refs"><waitingInspection :NowTime1="NowTime1"/></div>
-            <div class="monthlyN" ref="MonthlyNumber_refs"><monthlyNumber  :NowTime1="NowTime1"/></div>
+            <!-- <div class="monthlyN" ref="MonthlyNumber_refs"><monthlyNumber  :NowTime1="NowTime1"/></div> -->
           </div>
         </div>
         
@@ -251,7 +251,7 @@ export default {
           justify-content:space-between;
           // border: 1px solid rgb(142, 190, 30);
           .monthlyS{
-            width: 31%;
+            width: 49.5%;
             height: 100%;
             // background-color: rgb(12, 103, 131);
           }
@@ -263,7 +263,7 @@ export default {
             // background-color: rgb(171, 163, 204);
           }
           .annualS{
-            width: 31%;
+            width: 49.5%;
             height: 100%;
             margin-left: 10px;
             // background-color: rgb(12, 103, 131);

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

@@ -33,7 +33,7 @@ import curdPost from '@/business/platform/form/utils/custom/joinCURD.js'
                     let arr = res.variables.data
                     for (var i = 0; i < arr.length; i++) {
                         let changeArr = [arr[i].yang_pin_bian_hao,arr[i].yang_pin_ming_che,arr[i].wei_tuo_dan_hao_,arr[i].wei_tuo_dan_wei_,arr[i].wei_tuo_ri_qi_]
-                        console.log(changeArr,this.tableData.data,'arrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr')
+                        // console.log(changeArr,this.tableData.data,'arrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr')
                         this.tableData.data.push(changeArr)
                     }
                 })

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

@@ -33,7 +33,7 @@ import curdPost from '@/business/platform/form/utils/custom/joinCURD.js'
                     let arr = res.variables.data
                     for (var i = 0; i < arr.length; i++) {
                         let changeArr = [arr[i].yang_ben_bian_hao,arr[i].yang_ben_ming_che,arr[i].wei_tuo_dan_hao_,arr[i].wei_tuo_dan_wei_,arr[i].wei_tuo_ri_qi_]
-                        console.log(changeArr,this.tableData.data,'arrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr')
+                        // console.log(changeArr,this.tableData.data,'arrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrrr')
                         this.tableData.data.push(changeArr)
                     }
                 })