样品大屏实验室看板修改

src/views/statistics/headerDecoration.vue

@@ -0,0 +1,93 @@
+<!--
+ * @Author: cyy szjbdcyy@126.com
+ * @Date: 2023-03-09 15:33:26
+ * @LastEditors: cyy szjbdcyy@126.com
+ * @LastEditTime: 2023-03-09 15:36:54
+ * @FilePath: \lh_firm_former\src\views\statistics\headerDecoration.vue
+ * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
+-->
+<template>
+  <div id="top">
+    <dv-decoration-8 class="header-left-decoration" />
+    <dv-decoration-5 class="header-center-decoration" />
+   
+    <dv-decoration-8 class="header-right-decoration" :reverse="true" />
+    <div class="center-title">实验室管理看板</div>
+    <!-- <span class="showTime">当前时间为:{{sendTime}}</span> -->
+    
+  </div>
+</template>
+
+<script>
+
+export default {
+  // props:['titleName'],
+  data () {
+    return {
+      sendTime:''
+      
+	}
+  },
+  created(){
+    this.currentTime()
+  },
+  methods:{
+    currentTime() {
+      setInterval(this.getNowTime, 500);
+    },
+    getNowTime(){
+      const nowDate = new Date();
+      const date = {
+          year: nowDate.getFullYear(),
+          month: nowDate.getMonth() + 1,
+          day: nowDate.getDate(),
+          hour: nowDate.getHours(),
+          minute: nowDate.getMinutes(),
+          second: nowDate.getSeconds()
+      }
+      this.sendTime = date.year + '年' + date.month + '月' + date.day + '日' +date.hour + '时' + date.minute + '分' + date.second + '秒'
+
+
+      // var date  = new Date()
+      // var yy = date.getFullYear()
+      // var mm = date.getMonth() + 1
+      // var dd = date.getDate()
+      // var hh = date.getHours()
+      // var mm = date.getMinutes()
+      // var ss = date.getSeconds()
+      // document.querySelector(".showTime").innerHTML = "当前时间为" + yy + '年' + mm + '月' + dd + '日' + ss + '时' + mm + '分' + ss + '秒'
+
+
+    }
+  }
+}
+</script>
+
+<style lang="less">
+#top {
+  position: relative;
+  width: 100%;
+  height: 100px;
+  display: flex;
+  justify-content: space-between;
+  flex-shrink: 0;
+ 
+  .header-center-decoration {
+    width: 40%;
+    height: 60px;
+    margin-top: 30px;
+  }
+  .header-left-decoration, .header-right-decoration {
+    width: 25%;
+    height: 60px;
+  }
+  .center-title {
+    position: absolute;
+    font-size: 30px;
+    font-weight: bold;
+    left: 50%;
+    top: 15px;
+    transform: translateX(-50%);
+  }
+}
+</style>

src/views/statistics/index.vue

@@ -4,7 +4,9 @@
     <!-- :style="{height:height}" -->
       <div class="statistics">
         <div class="editDate">
-          <div class="stitle">实验室管理看板</div>
+           <!-- 标题装饰组件 -->
+          <header-decoration /> 
+          <!-- <div class="stitle">实验室管理看板</div> -->
           <div class="block" style="display:none">
             <span class="demonstration">开始:</span>
             <el-date-picker v-model="BeginDate" type="year" size="mini" value-format="yyyy" format="yyyy年"  style="width: 96px;"
@@ -12,118 +14,185 @@
             </el-date-picker>
           </div>
 
-          <div class="block">
-            <span class="demonstration">查询年度:</span>
+          <!-- <div class="block"> -->
+            <!-- <span class="demonstration">查询年度:</span> -->
             <!-- <el-date-picker v-model="endDate" type="year" size="mini" value-format="yyyy" format="yyyy年"  :clearable="false" style="width: 96px;"
               @change="checkYear(endDate,'end')" placeholder="选择日期"> -->
-                <el-date-picker
+                <!-- <el-date-picker
                   v-model="endDate"
                   type="year"
                   value-format="yyyy"
                   @change="checkYear(endDate,'end')"
                   placeholder="选择年">
-                </el-date-picker>
+                </el-date-picker> -->
             <!-- </el-date-picker> -->
+          <!-- </div> -->
+          <div 
+            style="width: 12%;
+            height:2.825rem;
+            line-height: 2.825rem;
+            text-align:center;
+            float: left;
+            margin: -3% 0 0 3%;
+            color: #000 !important;" >
+            <el-date-picker
+              v-model="endDate"
+              type="year"
+              value-format="yyyy"
+              @change="checkYear(endDate,'end')"
+              placeholder="选择年">
+            </el-date-picker>
+            <!-- <el-button type="primary" size="mini" plain @click="selectAll">
+              查询
+            </el-button> -->
+            <!-- <el-date-picker
+              class="chooseMonth"
+              v-model="NowTime1"
+              type="month"
+              @change="changeTime1"
+              format="yyyy-MM" 
+              value-format="yyyy-MM"
+              placeholder="请选择时间">
+            </el-date-picker> -->
           </div>
 
           <div class="block">
-            <el-button type="primary" size="mini" plain @click="selectAll">
-              查询
-            </el-button>
+            
           </div>
 
-          <div class="goBackButton" @click.prevent="goBack()" >
+          <!-- <div class="goBackButton" @click.prevent="goBack()" >
             返回
+          </div> -->
+          <div 
+            @click.prevent="goBack()" 
+            style="width: 12%;
+            height:2.825rem;
+            line-height: 2.825rem;
+            text-align:center;
+            float: right;
+            margin: -3% 3% 0 0;" >
+            <dv-border-box-8>返回</dv-border-box-8>
           </div>
-
         </div>
-        <div class="ttitle">质量目标统计</div>
-        <div class="componentsData" v-if="relOf">
-            <s1zhiLiangMuBiao :width="static=='row' ? '20%': '100%'"
-            v-if="showAll || showComponents[1]" :data = "getS1renwu()"/>
-            <s1jianCe :width="static=='row' ? '20%': '100%'"
-            v-if="showAll || showComponents[5]" :data = "getS2jianCe()" />
-            <s2manYiDu :width="static=='row' ? '20%': '100%'"
-            v-if="showAll || showComponents[7]"  :data = "getS2manYiDu()"/>
-            <s3tousu :width="static=='row' ? '20%': '100%'"
-            v-if="showAll || showComponents[6]" :data = "getS3tousu()"/>
-            <s13shengWu :width="static=='row' ? '20%': '100%'"
-            v-if="showAll || showComponents[17]" :data = "getS3tousu()"/>
-            <!-- <s1zhiLiang1 :width="static=='row' ? '20%': '100%'"
-            v-if="showAll || showComponents[2]"    />
-            <s1zhiLiang2 :width="static=='row' ? '20%': '100%'"
-            v-if="showAll || showComponents[3]"   />
-            <s1zhiLiang3 :width="static=='row' ? '20%': '100%'"
-            v-if="showAll || showComponents[4]"  /> -->
-
-            
-            <!-- <s4renYuanPeiXun :width="static=='row' ? '20%': '100%'"
-            v-if="showAll || showComponents[8]" :data = "getS4renYuanPeiXun()"/> -->
+        <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%;">
+          <div class="gongshiAll">
+            <div class="touwidth">任务完成率=</div>
+            <div style="margin: 0 0.2%;">
+              <div class="gongshiXian">完成检测项目数量</div>
+              <div style="padding-top: 6%;">有效检测任务总数</div>
+            </div>
+            <div>×100%</div>
+          </div>
+          <div class="gongshiAll">
+            <div class="touwidth">检测报告差错率=</div>
+            <div style="margin: 0 0.2%;">
+              <div class="gongshiXian">统计期内检测数据的差错次数</div>
+              <div style="padding-top: 6%;">统计期内检测报告总数</div>
+            </div>
+            <div>×100%</div>
+          </div>
+          <div class="gongshiAll">
+            <div class="touwidth">客户满意度=</div>
+            <div style="margin: 0 0.2%;">
+              <div class="gongshiXian">评分得分*有效问卷数量</div>
+              <div style="padding-top: 6%;">有效问卷总分</div>
+            </div>
+            <div>×100%</div>
+          </div>
+          <div class="gongshiAll">
+            <div class="touwidth">投诉率=</div>
+            <div style="margin: 0 0.2%;">
+              <div class="gongshiXian">统计期内有效投诉项目数</div>
+              <div style="padding-top: 6%;">统计期内检测项目总数</div>
+            </div>
+            <div>×100%</div>
+          </div>
+          <div class="gongshiAll">
+            <div class="touwidth">投诉回复及时率=</div>
+            <div style="margin: 0 0.2%;">
+              <div class="gongshiXian">统计期内被投诉后48h内达成一致解决方案次数</div>
+              <div style="padding-top: 6%;">统计期内被有效投诉总次数</div>
+            </div>
+            <div>×100%</div>
+          </div>
+        </div>
+        <div class="congxiebox7">
+          <div class="ttitle" style="text-align: center;">质量目标统计</div>
+          <div class="componentsData" v-if="relOf">
+              <s1zhiLiangMuBiao :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+              v-if="showAll || showComponents[1]" :data = "getS1renwu()"/>
+              <s1jianCe :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+              v-if="showAll || showComponents[5]" :data = "getS2jianCe()" />
+              <s2manYiDu :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+              v-if="showAll || showComponents[7]"  :data = "getS2manYiDu()"/>
+              <s3tousu :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+              v-if="showAll || showComponents[6]" :data = "getS3tousu()"/>
+              <s13shengWu :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+              v-if="showAll || showComponents[17]" :data = "getS3tousu()"/>
+              <div class="clear"></div>
+          </div>
+        </div>
+        <div class="congxiebox7" style="display:inline-block;width:49%">
+          <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"
+              v-if="showAll || showComponents[8]" :data = "getS4renYuanPeiXun()"/>
+              <s5renYuanJianDu :width="static=='row' ? '50%': '100%'" :colorw = "colorw"
+              v-if="showAll || showComponents[9]" :data = "getS5renYuanJianDu()"/>
+              <!-- <div class="clear"></div> -->
 
-            <!-- <none :width="static=='row' ? '20%': '100%'"
-            /> -->
-            <!-- <s6sheBeiWeiHu :width="static=='row' ? '20%': '100%'"
-            v-if="showAll || showComponents[10]" :data = "getS6sheBeiWeiHu()"/> -->
-            <!-- <s7sheBeiJiaoZhun :width="'50%'"
-            v-if="showAll || showComponents[12]" :data = "getJiaoYanObjNum()"/>
-            <s8sheBeiHeCha :width="'50%'"
-            v-if="showAll || showComponents[11]" :data = "gethechaObjNum()"/> -->
-            <!-- <s10waiBuNengLi :width="'50%'"
-            v-if="showAll || showComponents[14]" :data = "getnengtliObjNum()"/> -->
-            <!-- <s11biaoZhunWu :width="'50%'"
-            v-if="showAll || showComponents[15]" :data = "getbiaozhunObjNum()"/> -->
-            <!-- <s5renYuanJianDu :width="static=='row' ? '20%': '100%'"
-            v-if="showAll || showComponents[9]" :data = "getS5renYuanJianDu()"/> -->
-            <!-- <s9neiBuZhiLiang :width="static=='row' ? '20%': '100%'"
-            v-if="showAll || showComponents[13]" :data = "getS9neiBuZhiLiang()"/> -->
-            <!-- <s12fengXian :width="static=='row' ? '20%': '100%'"
-            v-if="showAll || showComponents[13]" :data = "getS12fengXian()"/> -->
-            <div class="clear"></div>
+          </div>
         </div>
-        <div class="ttitle">人员培训与管理</div>
-        <div class="componentsData" v-if="relOf">
-            <s4renYuanPeiXun :width="static=='row' ? '25%': '100%'"
-            v-if="showAll || showComponents[8]" :data = "getS4renYuanPeiXun()"/>
-            <s5renYuanJianDu :width="static=='row' ? '25%': '100%'"
-            v-if="showAll || showComponents[9]" :data = "getS5renYuanJianDu()"/>
-            <div class="clear"></div>
+        <div class="congxiebox7" style="display:inline-block;width:49%;float:right;">
+          <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"
+              v-if="showAll || showComponents[12]" :data = "getJiaoYanObjNum()"/>
+              <s8sheBeiHeCha :width="static=='row' ? '50%': '100%'" :colorw = "colorw"
+              v-if="showAll || showComponents[11]" :data = "gethechaObjNum()"/>
+              <!-- <div class="clear"></div> -->
 
+          </div>
         </div>
-        <div class="ttitle">设备维保</div>
-        <div class="componentsData" v-if="relOf">
-            <s7sheBeiJiaoZhun :width="static=='row' ? '33%': '100%'"
-            v-if="showAll || showComponents[12]" :data = "getJiaoYanObjNum()"/>
-            <s8sheBeiHeCha :width="static=='row' ? '33%': '100%'"
-            v-if="showAll || showComponents[11]" :data = "gethechaObjNum()"/>
-            <s11biaoZhunWu :width="static=='row' ? '33%': '100%'"
-            v-if="showAll || showComponents[15]" :data = "getbiaozhunObjNum()"/>
-            <s16bzJunZhu :width="static=='row' ? '33%': '100%'"
-            v-if="showAll || showComponents[20]" :data = "getbzJunZhujNum()"/>
-            <s17bzXiBao :width="static=='row' ? '33%': '100%'"
-            v-if="showAll || showComponents[21]" :data = "getbzXiBaoObjNum()"/>
-            <div class="clear"></div>
+        <div class="congxiebox7" >
 
+          <div class="ttitle" style="text-align: center;">标准物质</div>
+          <div class="componentsData" v-if="relOf">
+              <s11biaoZhunWu :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
+              v-if="showAll || showComponents[15]" :data = "getbiaozhunObjNum()"/>
+              <s16bzJunZhu :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
+              v-if="showAll || showComponents[20]" :data = "getbzJunZhujNum()"/>
+              <s17bzXiBao :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
+              v-if="showAll || showComponents[21]" :data = "getbzXiBaoObjNum()"/>
+              <div class="clear"></div>
+          </div>
         </div>
-        <div class="ttitle">质量控制</div>
-        <div class="componentsData" v-if="relOf">
-            <s9neiBuZhiLiang :width="static=='row' ? '25%': '100%'"
-            v-if="showAll || showComponents[13]" :data = "getS9neiBuZhiLiang()"/>
-            <s10waiBuNengLi :width="static=='row' ? '25%': '100%'"
-            v-if="showAll || showComponents[14]" :data = "getnengtliObjNum()"/>
-            <s14bufuhexiang :width="static=='row' ? '25%': '100%'"
-            v-if="showAll || showComponents[18]" :data = "getS14bufuhexiang()"/>
-            <s15tousu :width="static=='row' ? '25%': '100%'"
-            v-if="showAll || showComponents[19]" :data = "getS3tousu()"/>
-            <div class="clear"></div>
+        <div class="congxiebox7" >
+
+        <div class="ttitle" style="text-align: center;">质量管理</div>
+          <div class="componentsData" v-if="relOf">
+              <s9neiBuZhiLiang :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+              v-if="showAll || showComponents[13]" :data = "getS9neiBuZhiLiang()"/>
+              <s10waiBuNengLi :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+              v-if="showAll || showComponents[14]" :data = "getnengtliObjNum()"/>
+              <s14bufuhexiang :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+              v-if="showAll || showComponents[18]" :data = "getS14bufuhexiang()"/>
+              <s15tousu :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
+              v-if="showAll || showComponents[19]" :data = "getS3tousu()"/>
+              <s12fengXian :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="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>
+        </div> -->
        
 
 
@@ -137,7 +206,7 @@
   //全屏展示
   import screenfull from 'screenfull'
   //大屏标题组件
-  // import headerDecoration from './headerDecoration'
+  import headerDecoration from './headerDecoration'
 
   import s1zhiLiangMuBiao from './item/s1zhiLiangMuBiao.vue'
   import s1zhiLiang1 from './item/s1zhiLiang1.vue'
@@ -170,7 +239,7 @@
   import repostCurd from '@/business/platform/form/utils/custom/joinCURD.js'
   export default {
     components:{
-      // headerDecoration,
+      headerDecoration,
       none,
       s1zhiLiang1,
       s1zhiLiang2,
@@ -241,7 +310,8 @@
         showAll:true,
         timer: '',
         showComponents:{},//显示全部统计子组件 , 若有新增，往后累计。 供动态表单进行查阅使用。
-        dataScope: []
+        dataScope: [],
+        colorw: '#fff'
       }
     },
      beforeDestroy() {
@@ -354,7 +424,7 @@
           // this.selectEnd = this.endDate
           // this.selectBeg = this.BeginDate
           /* 延迟刷新*/
-
+          // console.log('111111fffff')
           this.relOf = true;
           this.timer = setTimeout(() => {
             this.relOf = false
@@ -404,8 +474,9 @@
             message: '年份不得大于当前年份',
             type: 'warning'
           });
-          this.selectAll()
+          
         }
+        this.selectAll()
         // else(
         //   this.endDate = Number(year)
         // )
@@ -442,7 +513,9 @@
 </script>
 <style lang="scss">
   .statistics {
+    color: #fff;
     .editDate{
+      display: contents;
       overflow: hidden;
       background-color:rgb(249, 255, 255);
       position: relative;
@@ -454,12 +527,12 @@
      }
   }
   #dv-full-screen-container {
-    // background-image: url('./img/stars.png');
-    // background-size: 100% 100%;
-    // box-shadow: 0 0 3px blue;bete
-    // display: flex;
-    // flex-direction: column;
-    background-color: #f9ffff;
+    background-image: url('./img/stars.png');
+    background-size: 100% 100%;
+    box-shadow: 0 0 3px blue;
+    display: flex;
+    flex-direction: column;
+    // background-color: #f9ffff;
     display: flex;
     flex-direction:column;
     align-items: stretch;
@@ -494,8 +567,29 @@
   }
   .screen{
     height: 100%;
+    
+    margin: 0 0.5%;
   }
   .clear{ clear: both; }
+  .congxiebox7{
+    background-color: rgba(6, 30, 93, 0.5);
+    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 ;
+  }
+  .gongshiAll{
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    // width: 20%;
+    .touwidth{
+      width: 35%;
+    }
+    .gongshiXian{
+      border-bottom: #fff solid 2px;
+      padding-bottom: 6%;
+    }
+  }
 </style>
 <style lang="scss">
 .el-year-table .today .cell {

src/views/statistics/indexold.vue

@@ -39,15 +39,15 @@
         </div>
         <!-- <div class="ttitle">质量目标统计</div> -->
         <div class="componentsData" v-if="relOf">
-            <s1zhiLiangMuBiao :width="static=='row' ? '20%': '100%'"
+            <s1zhiLiangMuBiao :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
             v-if="showAll || showComponents[1]" :data = "getS1renwu()"/>
-            <s1jianCe :width="static=='row' ? '20%': '100%'"
+            <s1jianCe :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
             v-if="showAll || showComponents[5]" :data = "getS2jianCe()" />
-            <s2manYiDu :width="static=='row' ? '20%': '100%'"
+            <s2manYiDu :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
             v-if="showAll || showComponents[7]"  :data = "getS2manYiDu()"/>
-            <s3tousu :width="static=='row' ? '20%': '100%'"
+            <s3tousu :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
             v-if="showAll || showComponents[6]" :data = "getS3tousu()"/>
-            <s13shengWu :width="static=='row' ? '20%': '100%'"
+            <s13shengWu :width="static=='row' ? '20%': '100%'" :colorw = "colorw"
             v-if="showAll || showComponents[17]" :data = "getS3tousu()"/>
             <!-- <s1zhiLiang1 :width="static=='row' ? '20%': '100%'"
             v-if="showAll || showComponents[2]"    />
@@ -82,42 +82,42 @@
         </div>
         <div class="ttitle">人员培训与管理</div>
         <div class="componentsData" v-if="relOf"> -->
-            <s4renYuanPeiXun :width="static=='row' ? '25%': '100%'"
+            <s4renYuanPeiXun :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
             v-if="showAll || showComponents[8]" :data = "getS4renYuanPeiXun()"/>
-            <s5renYuanJianDu :width="static=='row' ? '25%': '100%'"
+            <s5renYuanJianDu :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
             v-if="showAll || showComponents[9]" :data = "getS5renYuanJianDu()"/>
             <!-- <div class="clear"></div>
 
         </div>
         <div class="ttitle">设备维保</div>
         <div class="componentsData" v-if="relOf"> -->
-            <s7sheBeiJiaoZhun :width="static=='row' ? '33%': '100%'"
+            <s7sheBeiJiaoZhun :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
             v-if="showAll || showComponents[12]" :data = "getJiaoYanObjNum()"/>
-            <s8sheBeiHeCha :width="static=='row' ? '33%': '100%'"
+            <s8sheBeiHeCha :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
             v-if="showAll || showComponents[11]" :data = "gethechaObjNum()"/>
-            <s11biaoZhunWu :width="static=='row' ? '33%': '100%'"
+            <s11biaoZhunWu :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
             v-if="showAll || showComponents[15]" :data = "getbiaozhunObjNum()"/>
-            <s16bzJunZhu :width="static=='row' ? '33%': '100%'"
+            <s16bzJunZhu :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
             v-if="showAll || showComponents[20]" :data = "getbzJunZhujNum()"/>
-            <s17bzXiBao :width="static=='row' ? '33%': '100%'"
+            <s17bzXiBao :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
             v-if="showAll || showComponents[21]" :data = "getbzXiBaoObjNum()"/>
             <!-- <div class="clear"></div>
 
         </div>
         <div class="ttitle">质量控制</div>
         <div class="componentsData" v-if="relOf"> -->
-            <s9neiBuZhiLiang :width="static=='row' ? '25%': '100%'"
+            <s9neiBuZhiLiang :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
             v-if="showAll || showComponents[13]" :data = "getS9neiBuZhiLiang()"/>
-            <s10waiBuNengLi :width="static=='row' ? '25%': '100%'"
+            <s10waiBuNengLi :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
             v-if="showAll || showComponents[14]" :data = "getnengtliObjNum()"/>
-            <s14bufuhexiang :width="static=='row' ? '25%': '100%'"
+            <s14bufuhexiang :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
             v-if="showAll || showComponents[18]" :data = "getS14bufuhexiang()"/>
             <!-- <div class="clear"></div>
 
         </div>
         <div class="ttitle">风险控制</div>
         <div class="componentsData" v-if="relOf"> -->
-            <s12fengXian :width="static=='row' ? '25%': '100%'"
+            <s12fengXian :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
             v-if="showAll || showComponents[16]" :data = "getS12fengXian()"/>
             <div class="clear"></div>
 
@@ -239,7 +239,9 @@
         showAll:true,
         timer: '',
         showComponents:{},//显示全部统计子组件 , 若有新增，往后累计。 供动态表单进行查阅使用。
-        dataScope: []
+        dataScope: [],
+        colorw: '#000'
+
       }
     },
      beforeDestroy() {

src/views/statistics/item/s10waiBuNengLi.vue

@@ -41,6 +41,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -90,7 +94,7 @@
             text: this.title,
             // subtext: 'Fake Data',
             left: 'left',
-            textStyle:{ fontSize:14 }
+            textStyle:{ fontSize:14,color: this.colorw }
           },
           tooltip: {
             trigger: 'item'

src/views/statistics/item/s10waiBuNengLiCol.vue

@@ -41,6 +41,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -86,7 +90,7 @@
            //v3
           title: {
             text: this.title,
-            textStyle:{ fontSize:14 }
+            textStyle:{ fontSize:14,color: this.colorw }
 
             // subtext: this.data.Num.date+"年"
           },
@@ -122,21 +126,20 @@
                 interval: 0,
                 // rotate: '50', // 旋转50°
                 lineHeight: 18,
-                // formatter: function(params) {
-                //   //  console.log('formatter', params, params.length)
-                //   var newParamsName = ''// 最终拼接成的字符串
-                //   var paramsNameNumber = params.length// 实际标签的个数
-                //   var provideNumber = 3// 每行能显示的字的个数
-                //   // 判断标签的个数是否大于规定的个数， 如果大于，则进行换行处理 如果不大于，即等于或小于，就返回原标签
-                //   if (paramsNameNumber > provideNumber) {
-                //   // ********重点在这里********
-                //     newParamsName = params.substring(0, 3) + '..'// 最终拼成的字符串
-                //   } else { // 将旧标签的值赋给新标签
-                //     newParamsName = params
-                //   }
-                //   // 将最终的字符串返回
-                //   return newParamsName
-                // }
+                formatter: function(params) {
+                  //  console.log('formatter', params, params.length)
+                  var newParamsName = ''// 最终拼接成的字符串
+                  var paramsNameNumber = params.length// 实际标签的个数
+                  var provideNumber = 8// 每行能显示的字的个数
+                  // 判断标签的个数是否大于规定的个数， 如果大于，则进行换行处理 如果不大于，即等于或小于，就返回原标签
+                  if (paramsNameNumber > provideNumber) {
+                    newParamsName = params.substring(0, 8) + '..'// 最终拼成的字符串
+                  } else { // 将旧标签的值赋给新标签
+                    newParamsName = params
+                  }
+                  // 将最终的字符串返回
+                  return newParamsName
+                }
               },
           },
           series: [

src/views/statistics/item/s11biaoZhunWu.vue

@@ -41,6 +41,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -89,7 +93,7 @@
             text: this.title,
             // subtext: 'Fake Data',
             left: 'left',
-            textStyle:{ fontSize:14 }
+            textStyle:{ fontSize:14,color: this.colorw }
           },
           tooltip: {
             trigger: 'item'

src/views/statistics/item/s11biaoZhunWuCol.vue

@@ -41,6 +41,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -136,7 +140,7 @@
             },
             title: {
               text: this.title,
-              textStyle:{ fontSize:14 }
+              textStyle:{ fontSize:14,color: this.colorw }
 
               // subtext: "        "+beingDate+"-"+endDate
             },

src/views/statistics/item/s11biaoZhunWuCol2.vue

@@ -41,6 +41,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -86,7 +90,7 @@
            //v3
           title: {
             text: this.title,
-            textStyle:{ fontSize:14 }
+            textStyle:{ fontSize:14,color: this.colorw }
 
             // subtext: this.data.Num.date+"年"
           },

src/views/statistics/item/s12fengXian.vue

@@ -41,6 +41,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -81,11 +85,12 @@
             text: this.title,
             // subtext: 'Fake Data',
             left: 'left',
-            textStyle:{ fontSize:14 }
+            textStyle:{ fontSize:14,color: this.colorw }
           },
           tooltip: {
             trigger: 'item'
           },
+          color:['#99CCFF','#33FF33'],
           series: [
             {
               type: 'pie',

src/views/statistics/item/s12fengXianCol.vue

@@ -41,6 +41,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -138,7 +142,7 @@
             },
             title: {
               text: this.title,
-              textStyle:{ fontSize:14 }
+              textStyle:{ fontSize:14,color: this.colorw }
 
               // subtext: "        "+beingDate+"-"+endDate
             }

src/views/statistics/item/s13shengWu.vue

@@ -41,6 +41,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -81,11 +85,12 @@
             text: this.title,
             // subtext: 'Fake Data',
             left: 'left',
-            textStyle:{ fontSize:14 }
+            textStyle:{ fontSize:14,color: this.colorw }
           },
           tooltip: {
             trigger: 'item'
           },
+          color:['#9966CC','#FFFF33'],
           series: [
             {
               type: 'pie',

src/views/statistics/item/s13shengWuCol.vue

@@ -41,6 +41,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -148,7 +152,7 @@
             },
             title: {
               text: this.title,
-              textStyle:{ fontSize:14 }
+              textStyle:{ fontSize:14,color: this.colorw }
 
               // subtext: "        "+beingDate+"-"+endDate
             },

src/views/statistics/item/s14bufuhexiang.vue

@@ -41,6 +41,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -81,7 +85,7 @@
             text: this.title,
             // subtext: 'Fake Data',
             left: 'left',
-            textStyle:{ fontSize:14 }
+            textStyle:{ fontSize:14,color: this.colorw }
           },
           tooltip: {
             trigger: 'item'

src/views/statistics/item/s14bufuhexiangCol.vue

@@ -41,6 +41,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -138,7 +142,7 @@
             },
             title: {
               text: this.title,
-              textStyle:{ fontSize:14 }
+              textStyle:{ fontSize:14,color: this.colorw }
 
               // subtext: "        "+beingDate+"-"+endDate
             }

src/views/statistics/item/s15tousu.vue

@@ -41,6 +41,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -90,7 +94,7 @@
             text: this.title,
             // subtext: 'Fake Data',
             left: 'left',
-            textStyle:{ fontSize:14 }
+            textStyle:{ fontSize:14,color: this.colorw }
           },
           tooltip: {
             trigger: 'item'

src/views/statistics/item/s15tousuCol.vue

@@ -41,6 +41,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -153,7 +157,7 @@
             },
             title: {
               text: this.title,
-              textStyle:{ fontSize:14 }
+              textStyle:{ fontSize:14,color: this.colorw }
 
               // subtext: "        "+beingDate+"-"+endDate
             },

src/views/statistics/item/s16bzJunZhu.vue

@@ -41,6 +41,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -89,7 +93,7 @@
             text: this.title,
             // subtext: 'Fake Data',
             left: 'left',
-            textStyle:{ fontSize:14 }
+            textStyle:{ fontSize:14,color: this.colorw }
           },
           tooltip: {
             trigger: 'item'

src/views/statistics/item/s16bzJunZhuCol.vue

@@ -41,6 +41,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -136,7 +140,7 @@
             },
             title: {
               text: this.title,
-              textStyle:{ fontSize:14 }
+              textStyle:{ fontSize:14,color: this.colorw }
 
               // subtext: "        "+beingDate+"-"+endDate
             },

src/views/statistics/item/s16bzJunZhuCol2.vue

@@ -41,6 +41,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -86,7 +90,7 @@
            //v3
           title: {
             text: this.title,
-            textStyle:{ fontSize:14 }
+            textStyle:{ fontSize:14,color: this.colorw }
 
             // subtext: this.data.Num.date+"年"
           },

src/views/statistics/item/s17bzXiBao.vue

@@ -41,6 +41,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -89,7 +93,7 @@
             text: this.title,
             // subtext: 'Fake Data',
             left: 'left',
-            textStyle:{ fontSize:14 }
+            textStyle:{ fontSize:14,color: this.colorw }
           },
           tooltip: {
             trigger: 'item'

src/views/statistics/item/s17bzXiBaoCol.vue

@@ -41,6 +41,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -136,7 +140,7 @@
             },
             title: {
               text: this.title,
-              textStyle:{ fontSize:14 }
+              textStyle:{ fontSize:14,color: this.colorw }
 
               // subtext: "        "+beingDate+"-"+endDate
             },

src/views/statistics/item/s17bzXiBaoCol2.vue

@@ -41,6 +41,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -86,7 +90,7 @@
            //v3
           title: {
             text: this.title,
-            textStyle:{ fontSize:14 }
+            textStyle:{ fontSize:14,color: this.colorw }
 
             // subtext: this.data.Num.date+"年"
           },

src/views/statistics/item/s1jianCe.vue

@@ -42,6 +42,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -90,11 +94,12 @@
             text: this.title,
             // subtext: 'Fake Data',
             left: 'left',
-            textStyle:{ fontSize:14 }
+            textStyle:{ fontSize:14,color: this.colorw }
           },
           tooltip: {
             trigger: 'item'
           },
+          color:['#ffcc00','#33FFFF'],
           series: [
             {
               type: 'pie',

src/views/statistics/item/s1jianCeColumnar.vue

@@ -42,6 +42,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -151,7 +155,7 @@
             },
             title: {
               text: this.title,
-              textStyle:{ fontSize:14 }
+              textStyle:{ fontSize:14,color: this.colorw }
               // subtext: "        "+beingDate+"-"+endDate
             },
         //v1

src/views/statistics/item/s1zhiLiangMuBiao.vue

@@ -43,6 +43,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -83,7 +87,7 @@
             text: this.title,
             // subtext: 'Fake Data',
             left: 'left',
-            textStyle:{ fontSize:14 }
+            textStyle:{ fontSize:14,color: this.colorw }
           },
           tooltip: {
             trigger: 'item'

src/views/statistics/item/s1zhiLiangMuBiaoCol.vue

@@ -43,6 +43,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -257,7 +261,7 @@
             },
             title: {
               text: this.title,
-              textStyle:{ fontSize:14 }
+              textStyle:{ fontSize:14,color: this.colorw }
 
               // subtext: "        "+beingDate+"-"+endDate
             },

src/views/statistics/item/s2manYiDu.vue

@@ -43,6 +43,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -97,12 +101,12 @@
             text: this.title,
             // subtext: 'Fake Data',
             left: 'left',
-            textStyle:{ fontSize:14 }
+            textStyle:{ fontSize:14,color: this.colorw }
           },
           tooltip: {
             trigger: 'item'
           },
-          color:['#00ccff','#cc3333'],
+          color:['#009933','#99FF66'],
           series: [
             {
               type: 'pie',

src/views/statistics/item/s2manYiDuPro.vue

@@ -43,6 +43,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -190,7 +194,7 @@
             },
             title: {
               text: this.title,
-              textStyle:{ fontSize:14 }
+              textStyle:{ fontSize:14,color: this.colorw }
               // subtext: "        "+beingDate+"-"+endDate
             },
         //v1

src/views/statistics/item/s3tousu.vue

@@ -41,6 +41,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -90,7 +94,7 @@
             text: this.title,
             // subtext: 'Fake Data',
             left: 'left',
-            textStyle:{ fontSize:14 }
+            textStyle:{ fontSize:14,color: this.colorw }
           },
           tooltip: {
             trigger: 'item'

src/views/statistics/item/s3tousuCol.vue

@@ -41,6 +41,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -153,8 +157,7 @@
             },
             title: {
               text: this.title,
-              textStyle:{ fontSize:14 }
-
+              textStyle:{ fontSize:14,color: this.colorw }
               // subtext: "        "+beingDate+"-"+endDate
             },
           //v2

src/views/statistics/item/s4renYuanPeiXun.vue

@@ -42,6 +42,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -75,12 +79,12 @@
             text: this.title,
             // subtext: 'Fake Data',
             left: 'left',
-            textStyle:{ fontSize:14 }
+            textStyle:{ fontSize:14,color: this.colorw }
           },
           tooltip: {
             trigger: 'item'
           },
-          color:['#cccc00','#ff6633'],
+          color:['#CC9999','#CCFF66'],
           series: [
             {
               type: 'pie',

src/views/statistics/item/s4renYuanPeiXunCol.vue

@@ -42,6 +42,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -156,7 +160,7 @@
             },
             title: {
               text: this.title,
-              textStyle:{ fontSize:14 }
+              textStyle:{ fontSize:14,color: this.colorw }
 
               // subtext: "        "+beingDate+"-"+endDate
             },

src/views/statistics/item/s5renYuanJianDu.vue

@@ -42,6 +42,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -74,12 +78,12 @@
             text: this.title,
             // subtext: 'Fake Data',
             left: 'left',
-            textStyle:{ fontSize:14 }
+            textStyle:{ fontSize:14,color: this.colorw }
           },
           tooltip: {
             trigger: 'item'
           },
-          color:['#cccc00','#ff6633'],
+          color:['#cccc00','#FF33FF'],
           series: [
             {
               type: 'pie',

src/views/statistics/item/s5renYuanJianDuCol.vue

@@ -42,6 +42,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -240,7 +244,7 @@
             },
             title: {
               text: this.title,
-              textStyle:{ fontSize:14 }
+              textStyle:{ fontSize:14,color: this.colorw }
 
               // subtext: "        "+beingDate+"-"+endDate
             },

src/views/statistics/item/s7sheBeiJiaoZhun.vue

@@ -42,6 +42,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -96,7 +100,7 @@
             text: this.title,
             // subtext: 'Fake Data',
             left: 'left',
-            textStyle:{ fontSize:14 }
+            textStyle:{ fontSize:14,color: this.colorw }
           },
           tooltip: {
             trigger: 'item'

src/views/statistics/item/s7sheBeiJiaoZhunCol.vue

@@ -42,6 +42,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -140,7 +144,7 @@
             },
             title: {
               text: this.title,
-              textStyle:{ fontSize:14 }
+              textStyle:{ fontSize:14,color: this.colorw }
 
               // subtext: "        "+beingDate+"-"+endDate
             },

src/views/statistics/item/s7sheBeiJiaoZhunCol2.vue

@@ -42,6 +42,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -92,7 +96,7 @@
           //v3
           title: {
             text: this.title,
-            textStyle:{ fontSize:14 }
+            textStyle:{ fontSize:14,color: this.colorw }
 
             // subtext: this.data.t_mjsbjdxzjhzbNum.date+"年校准次数"
           },

src/views/statistics/item/s8sheBeiHeCha.vue

@@ -41,6 +41,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -89,7 +93,7 @@
             text: this.title,
             // subtext: 'Fake Data',
             left: 'left',
-            textStyle:{ fontSize:14 }
+            textStyle:{ fontSize:14,color: this.colorw }
           },
           tooltip: {
             trigger: 'item'

src/views/statistics/item/s8sheBeiHeChaCol.vue

@@ -41,6 +41,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -135,7 +139,7 @@
             },
             title: {
               text: this.title,
-              textStyle:{ fontSize:14 }
+              textStyle:{ fontSize:14,color: this.colorw }
 
               // subtext: "        "+beingDate+"-"+endDate
             },

src/views/statistics/item/s8sheBeiHeChaCol2.vue

@@ -41,6 +41,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -87,7 +91,7 @@
            //v3
           title: {
             text: this.title,
-            textStyle:{ fontSize:14 }
+            textStyle:{ fontSize:14,color: this.colorw }
 
             // subtext: this.data.t_sbhcjlbNum.date+"年核查次数"
           },

src/views/statistics/item/s9neiBuZhiLiang.vue

@@ -41,6 +41,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -80,7 +84,7 @@
             text: this.title,
             // subtext: 'Fake Data',
             left: 'left',
-            textStyle:{ fontSize:14 }
+            textStyle:{ fontSize:14,color: this.colorw }
           },
           tooltip: {
             trigger: 'item'

src/views/statistics/item/s9neiBuZhiLiangCol.vue

@@ -41,6 +41,10 @@
         type:String,
         default:'true'
       },
+      colorw:{
+        type:String,
+        default:'true'
+      }
     },
     data () {
       return {
@@ -84,7 +88,7 @@
             },
             title: {
               text: this.title,
-              textStyle:{ fontSize:14 }
+              textStyle:{ fontSize:14,color: this.colorw }
 
               // subtext: "        "+beingDate+"-"+endDate
             },

src/views/statistics/js/selectDB.js

@@ -7,7 +7,7 @@ export const getConfig = (begin,end)=>{
 }
 export const getJiaoYanObj = (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_mjsbjdxzjhzbZhName, a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,ifnull(b.t_mjsbjdxzjhzbS,0) as t_mjsbjdxzjhzbS FROM (select she_bei_bian_hao_ as t_mjsbjdxzjhzbZhName, she_bei_ming_chen as t_mjsbjdxzjhzbName, COUNT(she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb where YEAR(create_time_)="+end+" 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_)= "+end+" 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_mjsbjdxzjhzbZhName, a.t_mjsbjdxzjhzbName,a.t_mjsbjdxzjhzb,ifnull(b.t_mjsbjdxzjhzbS,0) as t_mjsbjdxzjhzbS FROM (select t_sbdj.she_bei_shi_bie_h as t_mjsbjdxzjhzbZhName, t_mjsbjdxzjhzb.she_bei_ming_chen as t_mjsbjdxzjhzbName, COUNT(t_mjsbjdxzjhzb.she_bei_ming_chen) as t_mjsbjdxzjhzb from t_mjsbjdxzjhzb LEFT JOIN t_sbdj on t_mjsbjdxzjhzb.she_bei_bian_hao_ = t_sbdj.id_ where YEAR(t_mjsbjdxzjhzb.create_time_)="+end+" GROUP BY t_mjsbjdxzjhzb.she_bei_ming_chen HAVING COUNT(t_mjsbjdxzjhzb.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_)= "+end+" 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"
 }
 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"

src/views/statistics/properties/s12fengXianPro.vue

@@ -22,14 +22,14 @@
             :data="data"
             width="50%"
             :height="height"
-            id="s5renYuanJianDuPro"
+            id="s12fengXianPro"
             click="false"
           />
           <s12fengXianCItem
             :data="data"
             width="50%"
             :height="height"
-            id="s5renYuanJianDuCPro"
+            id="s12fengXianCPro"
             click="false"
           />
       </el-aside>

src/views/statistics/sendDatas.js

@@ -180,9 +180,9 @@ export default {
                                         // e.push(num)
                                         let nameMid = that.nengliObj[i].enname.split("—")
                                         if(nameMid.length===2){
-                                                name.push(nameMid[1]+that.nengliObj[i].zhname)
+                                                name.push(nameMid[1])
                                         }else{
-                                                name.push(nameMid[0]+that.nengliObj[i].zhname)
+                                                name.push(nameMid[0])
                                         }
 
                         }

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

@@ -127,27 +127,32 @@ export default {
       // console.log('返回的全部数据 传日期到sql查询',this.NowTime,dayNum)
       //SELECT shou_yang_ri_qi_ FROM t_mjypdjb WHERE yan_shou_zhuang_t = '残缺'  AND shou_yang_ri_qi_ LIKE '2022-11%'   //不合格
       //SELECT liu_yang_ri_qi_,liu_yang_shu_lian FROM (SELECT * FROM t_mjypdjb WHERE  liu_yang_ri_qi_ ='' ) a WHERE   a.shi_fou_liu_yang_ != '否' AND shou_yang_ri_qi_ LIKE '2022-11%'  //留样
-      let sql1 = "select shou_yang_ri_qi_,yang_pin_shu_lian FROM t_lhypdjb WHERE YEAR(shou_yang_ri_qi_)='"+this.yearA+"' and MONTH(shou_yang_ri_qi_) = '"+this.monthA+"'"
+
+      let sql1 = "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 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+'%'+"'"
       Promise.all([
         curdPost('sql', sql1),
+        curdPost('sql', sql12),
         curdPost('sql', sql2),
         curdPost('sql', sql3),
-      ]).then(([ res1, res2, res3]) => {
+      ]).then(([ res1, res12, res2, res3]) => {
         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)
         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   -------',receivedData)
+        console.log('xxxxxxxxx方法返回的数据1   -------',receivedData2,sql1)
         // console.log('xxxxxxxxx方法返回的数据2   -------',unqualifiedData)
         // console.log('xxxxxxxxx方法返回的数据3   -------',retentionData)
         //三组数据处理完毕之后，传给图表进行渲染  （月份天数数组，已收样，不合格，留样）
-        this.entrustNumberInit(this.days,receivedData,unqualifiedData,retentionData)
+        this.entrustNumberInit(this.days,receivedData,receivedData2,unqualifiedData,retentionData)
       })
     },
     //处理sql查询出来的数据
@@ -171,6 +176,7 @@ export default {
         this.filledNum.splice(key - 1,1,value)
       })
       //返回处理好的数量数组
+      console.log(this.filledNum,'90900990',data)
       return this.filledNum;
     },
     //处理留样数据
@@ -197,9 +203,9 @@ export default {
     },
   
     //委托样品图表
-    entrustNumberInit(dayArray,receivedData,unqualifiedData,retentionData){
+    entrustNumberInit(dayArray,receivedData,receivedData2,unqualifiedData,retentionData){
       // console.log('拿到日期数组',dayArray)
-      console.log(receivedData,unqualifiedData,retentionData,'we12e12312312312')
+      console.log(receivedData,receivedData2,unqualifiedData,retentionData,'we12e12312312312')
       this.entrustNumber = echarts.init(this.$refs.Number_refs);
       var entrustNumberOption = {
           xAxis:{
@@ -263,7 +269,7 @@ export default {
           series: [
             {
               type:"bar",
-              name:'已收到样品',
+              name:'外部送检已收到样品',
               //显示数字的颜色
               label: {
                 show: true,
@@ -277,6 +283,22 @@ export default {
               },
               data:receivedData 
             },
+            {
+              type:"bar",
+              name:'内部委托已收到样品',
+              //显示数字的颜色
+              label: {
+                show: true,
+                position: 'top',
+                color:'#fff'
+              },
+              //柱子的颜色
+              itemStyle:{
+                show:true,
+                color:'rgba(255, 255, 51, 0.4)',
+              },
+              data:receivedData2
+            },
             {
               type: 'line',
               name:'不合格样品',

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

@@ -5,6 +5,14 @@
         <div>委托样品总数</div>
         <div class="number">{{EntrustedTotal}}个</div>
       </div>
+      <div class="totalNumber">
+        <div>委托样品内部总数</div>
+        <div class="number">{{EntrustedTotalN}}个</div>
+      </div>
+      <div class="totalNumber">
+        <div>委托样品外部总数</div>
+        <div class="number">{{EntrustedTotalW}}个</div>
+      </div>
       <div class="notReceived">
         <div>待收样数量(已委托未收样)</div>
         <div class="number">{{NotReceiveNumber}}个</div>
@@ -49,6 +57,8 @@ export default {
       timer:null,
       sendTime:'',
       EntrustedTotal:0,
+      EntrustedTotalN:0,
+      EntrustedTotalW:0,
       NotReceiveNumber:0,
       ReceiveNumber:0,
       StagingNumber:0,
@@ -60,6 +70,8 @@ export default {
   created(){
     //数据获取
     this.getEntrustedTotalData()
+    this.getEntrustedTotalDataN()
+    this.getEntrustedTotalDataW()
     this.getNotReceivedData()
     this.getReceivedData()
     this.getUnqualifiedData()
@@ -74,6 +86,8 @@ export default {
     this.timer = null
     this.timer = setInterval(() =>{
       this.getEntrustedTotalData()
+      this.getEntrustedTotalDataN()
+      this.getEntrustedTotalDataW()
       this.getNotReceivedData()
       this.getReceivedData()
       this.getUnqualifiedData()
@@ -120,6 +134,34 @@ export default {
         // this.EntrustedTotal = data[0].sum
       })
       
+    },
+    //委托样品总数:样品表内部
+    getEntrustedTotalDataN(){
+      let sql1 = "select SUM(a.yang_pin_zong_shu) as sum from (select t_lhypb.* from t_lhypb LEFT JOIN t_lhwtsqb on t_lhypb.wei_tuo_dan_hao_ = t_lhwtsqb.wei_tuo_bian_hao_ where t_lhwtsqb.wei_tuo_lei_xing_ != '客户委托') as a where YEAR(create_time_) = YEAR('"+this.NowTime1+"')" 
+      curdPost('sql',sql1).then(response => { 
+        let data = response.variables.data
+        if(data[0]===null){
+          this.EntrustedTotalN = 0
+        }else(
+          this.EntrustedTotalN = data[0].sum
+        )
+        // this.EntrustedTotal = data[0].sum
+      })
+      
+    },
+    //委托样品总数:样品表外部
+    getEntrustedTotalDataW(){
+      let sql1 = "select SUM(a.yang_pin_zong_shu) as sum from (select t_lhypb.* from t_lhypb LEFT JOIN t_lhwtsqb on t_lhypb.wei_tuo_dan_hao_ = t_lhwtsqb.wei_tuo_bian_hao_ where t_lhwtsqb.wei_tuo_lei_xing_ = '客户委托') as a where YEAR(create_time_) = YEAR('"+this.NowTime1+"')" 
+      curdPost('sql',sql1).then(response => { 
+        let data = response.variables.data
+        if(data[0]===null){
+          this.EntrustedTotalW = 0
+        }else(
+          this.EntrustedTotalW = data[0].sum
+        )
+        // this.EntrustedTotal = data[0].sum
+      })
+      
     },
     //待收样数量:已委托，未收到
     getNotReceivedData(){
@@ -132,7 +174,6 @@ export default {
           this.NotReceiveNumber = data[0].sum
         )
         // this.NotReceiveNumber = data[0].sum
-        console.log(data,this.NowTime1,'dssadsdaad1221')
 
       })
   },
@@ -193,7 +234,7 @@ export default {
      },
      //样品完成检测数量
      getSuccessData(){
-      let sql6= "select SUM(t_lhypdjb.yang_pin_shu_lian) as num from t_lhypdjb LEFT JOIN t_lhjcbgb on t_lhypdjb.yang_ben_bian_hao = t_lhjcbgb.yang_pin_bian_hao where t_lhjcbgb.zhuang_tai_ = '待发放' and YEAR(t_lhypdjb.create_time_) = YEAR('"+this.NowTime1+"')" 
+      let sql6= "select SUM(t_lhypdjb.yang_pin_shu_lian) as num from t_lhypdjb LEFT JOIN t_lhjcbgb on t_lhypdjb.yang_ben_bian_hao = t_lhjcbgb.yang_pin_bian_hao where t_lhjcbgb.zhuang_tai_ = '待发放' or  t_lhjcbgb.zhuang_tai_ = '已完成' and YEAR(t_lhypdjb.create_time_) = YEAR('"+this.NowTime1+"')" 
       curdPost('sql',sql6).then(response => { 
         let data = response.variables.data
         if(data[0]===null){