Merge branch 'master' of http://119.23.210.103:3000/wy/zdqy_firm_former

src/views/statistics/index.vue

@@ -120,28 +120,15 @@
             margin: -2.5% 17.1% 0 0;" >
             <dv-border-box-8 class="shiyankanbanfanhui">返回</dv-border-box-8>
           </div>
-          
+          <div style="width: 15%;
+            font-size: 100%;
+            text-align:left;
+            float: right;
+            font-size: 0.5%;
+            margin: -2% 0% 0 0;" :class="{ 'fade-in': fadeinout, 'fade-out': !fadeinout }">鼠标全部移出则滚动，鼠标在页面内则暂停滚动</div>
         </div>
         <dv-border-box-1 style="width: 100%; height: 89%;box-sizing: border-box; overflow: hidden">
-          <div style="height:43%;margin-top:1%" v-for="(item,i) in zhiliangmuNeirong" :key="i" v-show="pageOT==Math.ceil(i/2)">
-            <div class="congxiebox7" style="display:inline-block;margin:1% 1%; height:100%;width:98%;" >
-              <div class="ttitle" style="text-align: center;height:3%">{{item.name}}质量目标与质量指标</div>
-              <div class="componentsData" style="height:90%" v-if="relOf">
-                  <!-- 
-                  <s1jianCe :height="'290%'" :width="static=='row' ? '19.5%': '100%'" :colorw = "colorw" :mubiao = "quality[1].val"
-                  v-if="showAll || showComponents[5]" :data = "getS2jianCe()" />
-                  <s3tousu :height="'290%'" :width="static=='row' ? '19.5%': '100%'" :colorw = "colorw" :mubiao = "quality[3].val"
-                  v-if="showAll || showComponents[6]" :data = "getS3tousu()"/>
-                  <s13shengWu :height="'290%'" :width="static=='row' ? '19.5%': '100%'" :colorw = "colorw" :mubiao = "quality[4].val"
-                  v-if="showAll || showComponents[17]" :data = "getS3tousu()"/> -->
-                  <div :id="`card${i}`" style="width:100%;height:100%" ></div>
-                  <!-- <div class="nullDate" v-if="zhiliangmuNeirong[i].data.length<=0">暂无数据</div> -->
-                  <div class="clear"></div>
-              </div>
-              <dv-decoration-10 style="height:0.5%" v-if="i % 2 != 0 && i != zhiliangmuNeirong.length" />
-            </div>
-            
-          </div>
+          
           <!-- <div class="congxiebox7" style="display:inline-block;height:43%;width:98%;margin:1% 1%;text-align: center;overflow:hiddien" v-if="pageOT==Math.floor((zhiliangmuNeirong)/2)">
             <div class="ttitle" style="margin:2% 0;text-align: center;">质量目标与质量指标公式</div>
             <div class="componentsData" style="height:82%"  v-if="relOf">
@@ -154,17 +141,8 @@
 
             </div>
           </div> -->
-          <!-- <div class="congxiebox7" style="display:inline-block;width:79%;height:85%" v-if="pageOT==1&&bumen==''">
-            <div class="ttitle" style="text-align: center;">各部门质量目标与质量指标</div>
-            <div class="componentsData" v-if="relOf">
-                <s11biaoZhunWu style="height:100%" :width="static=='row' ? '100%': '100%'" :colorw = "colorw"
-                v-if=" buhegelvObj.length>0 && (showAll || showComponents[15])" :data = "getyangPinCaiJiObjNum()"/>
-                <div class="nullDate" v-if="buhegelvObj.length<=0&&( showAll || showComponents[15])">暂无数据</div>
-                <div class="clear"></div>
-
-            </div>
-          </div>
-          <div class="congxiebox7" style="display:inline-block;width:19%;float:right;height:85%;overflow:hiddien" v-if="pageOT==1&&bumen==''">
+          
+          <!-- <div class="congxiebox7" style="display:inline-block;width:19%;float:right;height:85%;overflow:hiddien" v-if="pageOT==1&&bumen==''">
             <div class="ttitle" style="margin:8% 0;text-align: center;">质量目标与质量指标总计</div>
             <div class="componentsData" v-if="relOf">
                 <dv-scroll-board style="height:100%;"
@@ -177,17 +155,19 @@
             </div>
           </div> -->
           
-          <div class="congxiebox7" style="display:inline-block;width:98%;margin-top:2%;margin-right:1%;margin-left:1%;height:43%;" v-if="pageOT==Math.ceil(pageAll/2)">
+          <div class="congxiebox7" style="display:inline-block;width:98%;margin-top:2%;margin-right:1%;margin-left:1%;height:90%;" v-if="pageOT==1">
             <div class="ttitle" style="text-align: center;">人员培训与管理</div>
             <div class="componentsData" style="height:87%" v-if="relOf">
-              <s4renYuanPeiXun style="height:100%"  :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
-                v-if="showAll || showComponents[1]" :data = "getS4renYuanPeiXun()"/>
-              <s4renYuanPeiXunCol style="height:100%"  :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
-                v-if="showAll || showComponents[2]" :data = "getS4renYuanPeiXunFB()"/>
-              <s5renYuanJianDu style="height:100%"  :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
+              <s4renYuanPeiXun style="height:50%"  :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
+                v-if="zaigangrenyuan.length>0&&(showAll || showComponents[1])" :data = "getS4renYuanPeiXun()"/>
+              <s4renYuanPeiXunCol style="height:50%"  :width="static=='row' ? '75%': '100%'" :colorw = "colorw"
+                v-if="zaigangrenyuanfb.length>0&&(showAll || showComponents[2])" :data = "getS4renYuanPeiXunFB()"/>
+              <div class="nullDate1" style="height:50%;width:75%;" v-if="zaigangrenyuanfb.length<=0&&(showAll || showComponents[2])">暂无数据</div>
+              <s5renYuanJianDu style="height:50%"  :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
                 v-if="showAll || showComponents[3]" :data = "getS5renYuanJianDu()"/>
-              <s5renYuanJianDuCol style="height:100%"  :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
-                v-if="showAll || showComponents[4]" :data = "getS5renYuanJianDuFB()"/>
+              <s5renYuanJianDuCol style="height:50%"  :width="static=='row' ? '75%': '100%'" :colorw = "colorw"
+                v-if="gangqianpeixunfb.length>0&&(showAll || showComponents[4])" :data = "getS5renYuanJianDuFB()"/>
+                <div class="nullDate1" style="height:50%;width:75%;" v-if="gangqianpeixunfb.length<=0&&(showAll || showComponents[4])">暂无数据</div>
                 <!-- <s16bzJunZhu :height="'290%'" :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
                 v-if="showAll || showComponents[20]" :data = "getbzJunZhujNum()"/>
                 <s17bzXiBao :height="'290%'" :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
@@ -195,68 +175,118 @@
                 <div class="clear"></div>
             </div>
           </div>
-          <dv-decoration-10 style="height:0.5%;width:98%;margin-top:1%;margin-right:1%;margin-left:1%;"  v-if="pageOT==Math.ceil(pageAll/2)"/>
-          <div class="congxiebox7" style="display:inline-block;width:98%;margin-top:1%;margin-right:1%;margin-left:1%;height:43%;" v-if="pageOT==Math.ceil(pageAll/2)">
+          <!-- <dv-decoration-10 style="height:0.5%;width:98%;margin-top:1%;margin-right:1%;margin-left:1%;"  v-if="pageOT==1"/> -->
+          <div class="congxiebox7" style="display:inline-block;width:98%;margin-top:2%;margin-right:1%;margin-left:1%;height:90%;" v-if="pageOT==2">
             <div class="ttitle" style="text-align: center;">设备维保</div>
             <div class="componentsData" style="height:87%" v-if="relOf">
-              <s7sheBeiJiaoZhun style="height:100%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
+              <s7sheBeiJiaoZhun style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
                 v-if="showAll || showComponents[5]" :data = "getJiaoYanObjNum()"/>
-                <s7sheBeiJiaoZhunCol style="height:100%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
-                v-if="showAll || showComponents[6]" :data = "getJiaoYanObjNumFB()"/>
-                <s8sheBeiHeCha style="height:100%"  :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
+                <s7sheBeiJiaoZhunCol style="height:50%" :width="static=='row' ? '75%': '100%'" :colorw = "colorw"
+                v-if="jiaoyanMGObj.length>0&&(showAll || showComponents[6])" :data = "getJiaoYanObjNumFB()"/>
+                <div class="nullDate1" style="height:50%;width:75%;" v-if="jiaoyanMGObj.length<=0&&(showAll || showComponents[6])">暂无数据</div>
+                <s8sheBeiHeCha style="height:50%"  :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
                 v-if="showAll || showComponents[7]" :data = "gethechaObjNum()"/>
-                <s8sheBeiHeChaCol style="height:100%"  :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
-                v-if="showAll || showComponents[8]" :data = "gethechaObjNumFB()"/>
+                <s8sheBeiHeChaCol style="height:50%"  :width="static=='row' ? '75%': '100%'" :colorw = "colorw"
+                v-if="hechaMGObj.length>0&&(showAll || showComponents[8])" :data = "gethechaObjNumFB()"/>
+                <div class="nullDate1" style="height:50%;width:75%;" v-if="hechaMGObj.length<=0&&(showAll || showComponents[8])">暂无数据</div>
                 <div class="clear"></div>
             </div>
           </div>
-          <div class="congxiebox7" style="display:inline-block;width:98%;margin-top:2%;margin-right:1%;margin-left:1%;height:90%;" v-if="pageOT==Math.ceil(pageAll/2)+1">
+          <div class="congxiebox7" style="display:inline-block;width:98%;margin-top:2%;margin-right:1%;margin-left:1%;height:90%;" v-if="pageOT==3">
 
             <div class="ttitle" style="text-align: center;">质量管理</div>
             <div class="componentsData" style="height:87%" v-if="relOf">
                 <s9neiBuZhiLiang style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
                 v-if="showAll || showComponents[9]" :data = "getS9neiBuZhiLiang()"/>
-                <s9neiBuZhiLiangCol style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
-                v-if="showAll || showComponents[10]" :data = "getS9neiBuZhiLiangFB()"/>
+                <s9neiBuZhiLiangCol style="height:50%" :width="static=='row' ? '75%': '100%'" :colorw = "colorw"
+                v-if="neibuObjfb.length>0&&(showAll || showComponents[10])" :data = "getS9neiBuZhiLiangFB()"/>
+                <div class="nullDate1" style="height:50%;width:75%;" v-if="neibuObjfb.length<=0&&(showAll || showComponents[10])">暂无数据</div>
                 <s10waiBuNengLi style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
                 v-if="showAll || showComponents[11]" :data = "getnengtliObjNum()"/>
-                <s10waiBuNengLiCol style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
-                v-if="showAll || showComponents[12]" :data = "getnengtliObjNumFB()"/>
+                <s10waiBuNengLiCol style="height:50%" :width="static=='row' ? '75%': '100%'" :colorw = "colorw"
+                v-if="waibuObjfb.length>0&&(showAll || showComponents[12])" :data = "getnengtliObjNumFB()"/>
+                <div class="nullDate1" style="height:50%;width:75%;" v-if="waibuObjfb.length<=0&&(showAll || showComponents[12])">暂无数据</div>
                 
+                <div class="clear"></div>
+            </div>
+          </div> 
+          <div class="congxiebox7" style="display:inline-block;width:98%;margin-top:2%;margin-right:1%;margin-left:1%;height:90%;" v-if="pageOT==4">
+
+            <div class="ttitle" style="text-align: center;">质量管理</div>
+            <div class="componentsData" style="height:87%" v-if="relOf">
                 <s15tousu style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
                 v-if="showAll || showComponents[13]" :data = "getS3tousu()"/>
-                <s15tousuCol style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
-                v-if="showAll || showComponents[14]" :data = "getS3tousuFB()"/>
+                <s15tousuCol style="height:50%" :width="static=='row' ? '75%': '100%'" :colorw = "colorw"
+                v-if="yingjifbObj.length>0&&(showAll || showComponents[14])" :data = "getS3tousuFB()"/>
+                <div class="nullDate1" style="height:50%;width:75%;" v-if="yingjifbObj.length<=0&&(showAll || showComponents[14])">暂无数据</div>
                 <s12fengXian style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
                 v-if="showAll || showComponents[15]" :data = "getS12fengXian()"/>
-                <s12fengXianCol style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
-                v-if="showAll || showComponents[16]" :data = "getS12fengXianFB()"/>
+                <s12fengXianCol style="height:50%" :width="static=='row' ? '75%': '100%'" :colorw = "colorw"
+                v-if="fengxianfbObj.length>0&&(showAll || showComponents[16])" :data = "getS12fengXianFB()"/>
+                <div class="nullDate1" style="height:50%;width:75%;" v-if="fengxianfbObj.length<=0&&(showAll || showComponents[16])">暂无数据</div>
                 
                 <div class="clear"></div>
             </div>
           </div> 
-          <div class="congxiebox7" style="display:inline-block;width:98%;margin-top:2%;margin-right:1%;margin-left:1%;height:90%;" v-if="pageOT==Math.ceil(pageAll/2)+2">
+          <div class="congxiebox7" style="display:inline-block;width:98%;margin-top:2%;margin-right:1%;margin-left:1%;height:90%;" v-if="pageOT==5">
 
             <div class="ttitle" style="text-align: center;">质量管理</div>
             <div class="componentsData" style="height:87%" v-if="relOf">
-                <s2manYiDu style="height:50%" :width="static=='row' ? '33%': '100%'" :colorw = "colorw" 
+                <s2manYiDu style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw" 
                 v-if="showAll || showComponents[17]"  :data = "getS2manYiDu()"/>
-                <s2manYiDuCol style="height:50%" :width="static=='row' ? '33%': '100%'" :colorw = "colorw" 
-                v-if="showAll || showComponents[18]"  :data = "getS2manYiDuFB()"/>
-                <s14bufuhexiang style="height:50%" :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
+                <s2manYiDuCol style="height:50%" :width="static=='row' ? '75%': '100%'" :colorw = "colorw" 
+                v-if="neishenfbObj.length>0&&(showAll || showComponents[18])"  :data = "getS2manYiDuFB()"/>
+                <div class="nullDate1" style="height:50%;width:75%;" v-if="neishenfbObj.length<=0&&(showAll || showComponents[18])">暂无数据</div>
+                <s14bufuhexiang style="height:50%" :width="static=='row' ? '100%': '100%'" :colorw = "colorw"
                 v-if="bufuheObj.length>0&&(showAll || showComponents[19])" :data = "getS14bufuhexiang()"/>
-                <div class="nullDate1" v-if="bufuheObj.length<=0&&(showAll || showComponents[19])">暂无数据</div>
-                
-                <s1zhiLiangMuBiao style="height:50%" :width="static=='row' ? '33%': '100%'" :colorw = "colorw" 
+                <div class="nullDate1" style="height:50%;width:100%;" v-if="bufuheObj.length<=0&&(showAll || showComponents[19])">暂无数据</div>
+                <div class="clear"></div>
+            </div>
+          </div> 
+          <div class="congxiebox7" style="display:inline-block;width:98%;margin-top:2%;margin-right:1%;margin-left:1%;height:90%;" v-if="pageOT==6">
+
+            <div class="ttitle" style="text-align: center;">质量管理</div>
+            <div class="componentsData" style="height:87%" v-if="relOf">
+                <s1zhiLiangMuBiao style="height:50%" :width="static=='row' ? '25%': '100%'" :colorw = "colorw" 
                 v-if="showAll || showComponents[21]" :data = "getS1renwu()"/>
-                <s1zhiLiangMuBiaoCol style="height:50%" :width="static=='row' ? '33%': '100%'" :colorw = "colorw" 
-                v-if="showAll || showComponents[22]" :data = "getS1renwuFB()"/>
-                <s16bzJunZhu style="height:50%" :width="static=='row' ? '33%': '100%'" :colorw = "colorw"
+                <s1zhiLiangMuBiaoCol style="height:50%" :width="static=='row' ? '75%': '100%'" :colorw = "colorw" 
+                v-if="guanshenfbObj.length>0&&(showAll || showComponents[22])" :data = "getS1renwuFB()"/>
+                <div class="nullDate1" style="height:50%;width:75%;" v-if="guanshenfbObj.length<=0&&(showAll || showComponents[22])">暂无数据</div>
+                <s16bzJunZhu style="height:50%" :width="static=='row' ? '100%': '100%'" :colorw = "colorw"
                 v-if="gaijinxiangObj.length>0&&(showAll || showComponents[23])" :data = "getbzJunZhujNum()"/>
-                <div class="nullDate1" v-if="gaijinxiangObj.length<=0&&(showAll || showComponents[23])">暂无数据</div>
+                <div class="nullDate1" style="height:50%;width:100%;" v-if="gaijinxiangObj.length<=0&&(showAll || showComponents[23])">暂无数据</div>
                 <div class="clear"></div>
             </div>
           </div> 
+          <div class="congxiebox7" style="display:inline-block;width:98%;margin-top:2%;margin-right:1%;margin-left:1%;height:90%;" v-if="pageOT==7">
+            <div class="ttitle" style="text-align: center;">各部门质量目标</div>
+            <div class="componentsData" style="height:95%" v-if="relOf">
+                <s11biaoZhunWu style="height:100%" :width="static=='row' ? '100%': '100%'" :colorw = "colorw"
+                v-if=" buhegelvObj.length>0 && (showAll || showComponents[24])" :data = "getyangPinCaiJiObjNum()"/>
+                <div class="nullDate" v-if="buhegelvObj.length<=0&&( showAll || showComponents[24])">暂无数据</div>
+                <div class="clear"></div>
+
+            </div>
+          </div>
+          <div style="height:43%;margin-top:1%" v-for="(item,i) in zhiliangmuNeirong" :key="i" v-show="pageOT==Math.ceil((i/2)+7.5)">
+            <div class="congxiebox7" style="display:inline-block;margin:1% 1%; height:100%;width:98%;" >
+              <div class="ttitle" style="text-align: center;height:3%">{{item.name}}质量指标</div>
+              <div class="componentsData" style="height:90%" v-if="relOf">
+                  <!-- 
+                  <s1jianCe :height="'290%'" :width="static=='row' ? '19.5%': '100%'" :colorw = "colorw" :mubiao = "quality[1].val"
+                  v-if="showAll || showComponents[5]" :data = "getS2jianCe()" />
+                  <s3tousu :height="'290%'" :width="static=='row' ? '19.5%': '100%'" :colorw = "colorw" :mubiao = "quality[3].val"
+                  v-if="showAll || showComponents[6]" :data = "getS3tousu()"/>
+                  <s13shengWu :height="'290%'" :width="static=='row' ? '19.5%': '100%'" :colorw = "colorw" :mubiao = "quality[4].val"
+                  v-if="showAll || showComponents[17]" :data = "getS3tousu()"/> -->
+                  <div :id="`card${i}`" style="width:100%;height:100%" ></div>
+                  <!-- <div class="nullDate" v-if="zhiliangmuNeirong[i].data.length<=0">暂无数据</div> -->
+                  <div class="clear"></div>
+              </div>
+              <dv-decoration-10 style="height:0.5%" v-if="i % 2 != 0 && i != zhiliangmuNeirong.length" />
+            </div>
+            
+          </div>
           <!-- <div class="congxiebox7" style="display:inline-block;width:49%;" v-if="pageOT==2">
             <div class="ttitle" style="text-align: center;">内审计划</div>
             <div class="componentsData" v-if="relOf">
@@ -322,7 +352,7 @@
 
   import none from './item/none.vue'
   import echarts from 'echarts'
-  import { DBData ,getConfig,getJiaoYanObj, gethechaObj,getgangqianpeixunFBObj,getguanshenObjFB, getneishenObjFB,getfengxianObjFB,getyingjiObjFB,getwaibuObjFB,getneibuObjFB,getJiaoYanObjFB,gethechaObjFB,getnengliObj,getkangningyangpinObj,getzaigangrenyuanFBObj,getgaijinxiangObj,getbufuheObj,getguanshenObj,getneishenObj,getfengxianObj,getyingjiObj,getneibuObj,getwaibuObj,gethechaMGObj,getJiaoYanMGObj,getgangqianpeixunObj,getzaigangrenyuanObj,getfenzuZLZBObj,getzongZLMBObj,getzhiliangzhibiaotitleObj, getyangPinCaiJiObj,getbiaozhunTObj,getbzJunZhuObj,getbzJunZhuTObj,getbzXiBaoObj,getbzXiBaoTObj} from './js/selectDB.js'
+  import { DBData ,getConfig,getJiaoYanObj, gethechaObj,getgangqianpeixunFBObj,getguanshenObjFB, getzhiliangmubiaotitleObj,getneishenObjFB,getfengxianObjFB,getyingjiObjFB,getwaibuObjFB,getneibuObjFB,getJiaoYanObjFB,gethechaObjFB,getnengliObj,getkangningyangpinObj,getzaigangrenyuanFBObj,getgaijinxiangObj,getbufuheObj,getguanshenObj,getneishenObj,getfengxianObj,getyingjiObj,getneibuObj,getwaibuObj,gethechaMGObj,getJiaoYanMGObj,getgangqianpeixunObj,getzaigangrenyuanObj,getfenzuZLZBObj,getzongZLMBObj,getzhiliangzhibiaotitleObj, getyangPinCaiJiObj,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'
@@ -427,7 +457,8 @@
         zhiliangmuNeirong: {
             handler () {
                 // this.drawLine()
-                this.pageAll = this.zhiliangmuNeirong.length + 1
+                this.pageAll = this.zhiliangmuNeirong.length
+                
             },
             deep: true
         }
@@ -490,6 +521,8 @@
         zhiliangxianzhi:[],
         tableNum:[],
         pageAll:0,
+        fadeinout:true,
+        allBuMen:[],
         tableData:{
           header: ['<span style="font-size:16px;height:53px">质量指标</span>', '<span style="font-size:16px;height:53px">百分比/数量</span>'],
           rowNum: 10,
@@ -548,7 +581,12 @@
           this.bumen = this.quality1.map(function(obj,index){
               return obj.id_;
           }).join(",");
-          console.log(this.quality,this.quality1,this.idsStr,this.bumen,'2434465565665656rterterte')
+          // console.log(this.quality1,'bumnebumen')
+          for (let i = 0; i < this.quality1.length; i++) {
+            let mid = {'NAME_':this.quality1[i].name_,'numA':0,'num':0,'chu':0}
+            this.allBuMen.push(mid)
+          }
+          console.log(this.allBuMen,'2434465565665656rterterte')
           // if(this.bumen != ''){
           //   this.getConfigData(this.endDate,this.bumen)
           // }else{
@@ -585,8 +623,9 @@
                      repostCurd('sql', getzaigangrenyuanFBObj(end,info)),repostCurd('sql', getgangqianpeixunFBObj(end,info)),
                      repostCurd('sql', getneibuObjFB(end,info)),repostCurd('sql', getwaibuObjFB(end,info)),
                      repostCurd('sql', getyingjiObjFB(end,info)),repostCurd('sql', getfengxianObjFB(end,info)),
-                     repostCurd('sql', getneishenObjFB(end,info)),repostCurd('sql', getguanshenObjFB(end,info))]).then(([response,response1, response2,response3,response4,response5,response6,response7,response8,response9,response10,response11,response12,response13,response14,response15,response16,response17,response18,
-                                                                                                             fb,fb1,fb2,fb3,fb4,fb5,fb6,fb7]) => {
+                     repostCurd('sql', getneishenObjFB(end,info)),repostCurd('sql', getguanshenObjFB(end,info)),
+                     repostCurd('sql', getzhiliangmubiaotitleObj(end,info1))]).then(([response,response1, response2,response3,response4,response5,response6,response7,response8,response9,response10,response11,response12,response13,response14,response15,response16,response17,response18,
+                                                                                                             fb,fb1,fb2,fb3,fb4,fb5,fb6,fb7,fb8]) => {
 
                       that.config = response.variables.data
                       that.buhegelvObj = response1.variables.data 
@@ -627,6 +666,7 @@
                       that.fengxianfbObj = fb5.variables.data
                       that.neishenfbObj = fb6.variables.data
                       that.guanshenfbObj = fb7.variables.data
+                      that.zhiliangmubiaotitle = fb8.variables.data
                       that.relOf = true
         })
       },
@@ -789,13 +829,16 @@
         }
         this.zhiliangmuTitle = title
         this.zhiliangmuNeirong = zongfz
+        // console.log(this.zhiliangmuNeirong.length,this.zhiliangmuNeirong,'fgdfgdafffffffffffff5426666')
         this.zhiliangxianzhi = zbval
         this.pageAll = this.zhiliangmuNeirong.length 
         this.drawLine()
         clearInterval(this.timer1);
         if(this.rollup == true){
+          this.fadeinout = false
           this.timer1 = setInterval(()=>{
-            if(this.pageOT>=Math.ceil(this.pageAll/2)+2){
+            // console.log(Math.ceil(this.pageAll/2)+6,this.pageAll)
+            if(this.pageOT>=Math.ceil(this.pageAll/2)+7){
               this.pageOT=1
             }else{
               this.pageOT = this.pageOT + 1
@@ -809,7 +852,10 @@
         setTimeout(() => {
           this.zhiliangmuNeirong.forEach((item, index) => {
             let xunhuanzzzb = echarts.init(document.getElementById(`card${index}`))
-            let barColor = ['#66FFCC','#FFCCCC','#33FF00','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
+            let barColor = ['#FF4433','#C9A9A6','#097969','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333',
+                            '#66FFCC','#A52A2A','#FFCCCC','#33FF00',,'#880808','#89CFF0','#5D3FD3','#9F2B68',
+                            '#FBCEB1','#E49B0F','#D27D2D','#FFBF00','#A0522D','#FF00FF','#D8BFD8',
+                            '#FFB6C1','#5D3FD3','#C3B1E1','#770737','#ECFFDC','#DA70D6','#F89880']
             let barNum = []
             for (let i = 0; i < this.zhiliangxianzhi.length-1; i++) {
               barNum.push({
@@ -850,14 +896,31 @@
             let option = {
               //v3
               title: {
-                textStyle:{ fontSize:14,color: this.colorw }
+                textStyle:{ fontSize:12,color: this.colorw }
               },
               legend: {
                 textStyle: {
-                    color: '#B0CEFC'  // 图例文字颜色
+                  fontSize: 8,
+                  color: '#B0CEFC'  // 图例文字颜色
                 }
 
               },
+              tooltip: {
+                // 当trigger : axis 鼠标移入标线不会有悬浮框出现 params的值为一个数组，只会悬浮series
+                // 当trigger : item 鼠标移入标线有悬浮框出现 params的值为一个对象，会区别鼠标移入的是series还是markLine
+                // 使用axis 注释掉formatter 自己写也行 ；使用item放开formatter
+                show: true,
+                trigger: "item",//axis item
+                axisPointer: {
+                    type: "cross",
+                    label: {
+                        backgroundColor: "#6a7985",
+                    },
+                },
+                formatter: (params) => {
+                  return this.zhiliangzhibiaotitle[params.seriesIndex].allt
+                }
+              },
               grid: {
                     top: '20%',
                     left: '3%',
@@ -922,11 +985,13 @@
       },
       goBack(){
         this.$router.back(-1)
+        this.fadeinout = true
         clearInterval(this.timer1);
       },
       rollcontinue(){
+        this.fadeinout = false
         this.timer1 = setInterval(()=>{
-          if(this.pageOT>=Math.ceil(this.pageAll/2)+2){
+          if(this.pageOT>=Math.ceil(this.pageAll/2)+7){
             this.pageOT=1
           }else{
             this.pageOT = this.pageOT + 1
@@ -935,6 +1000,7 @@
         this.rollup=true
       },
       rollstop(){
+        this.fadeinout = true
         clearInterval(this.timer1);
         console.log('dfhjsdifjsojfjiofjoijdiffffjidffffff')
         this.rollup=false
@@ -1075,4 +1141,26 @@
   background-color: rgba(0,0,0,0);
   color: #fff;
 }
+.fade-in {
+  animation: fadeIn 1s linear forwards;
+}
+@keyframes fadeIn {
+  from {
+    opacity: 0;
+  }
+  to {
+    opacity: 1;
+  }
+}
+.fade-out {
+  animation: fadeOut 1s linear forwards;
+}
+@keyframes fadeOut {
+  from {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
+}
 </style>

src/views/statistics/item/s10waiBuNengLiCol.vue

@@ -69,7 +69,7 @@
       drawLine(){
         let s10waiBuNengLicol = echarts.init(document.getElementById(this.id))
         let option;
-        let barColor = ['#66FFCC','#FFCCCC','#33FF00','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
+        let barColor = ['#FFBF00','#33FF00','#097969','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
         let barNum = []
         for (let i = 0; i < this.data.num.title.length-1; i++) {
           if(i==this.data.num.title.length-2){
@@ -84,7 +84,7 @@
 					      },
                 position: 'top',
                 textStyle:{
-                    fontSize:16,
+                    fontSize:8,
                     color:'#B0CEFC'
                   }
               }
@@ -99,7 +99,7 @@
                   position:'top',
                           
                   textStyle:{
-                    fontSize:16,
+                    fontSize:8,
                     color:'#B0CEFC'
                   }
                 }
@@ -114,6 +114,23 @@
             text: this.title,
             textStyle:{ fontSize:14,color: this.colorw }
           },
+          legend: {
+                textStyle: {
+                  fontSize: 8,
+                  color: '#B0CEFC'  // 图例文字颜色
+                },
+                formatter: function (name) {
+                  if(name === 'chu'){
+                    return '完成率（%）';
+                  }else if(name === 'num'){
+                    return '已完成数量';
+                  }else if(name === 'numA'){
+                    return '未完成数量';
+                  }
+                    
+                }
+
+          },
           grid: {
                 top: '20%',
                 left: '3%',
@@ -128,7 +145,8 @@
               show: true,
               textStyle: {
                 color: this.colorw   //这里用参数代替了
-              }
+              },
+              fontSize: 8
             },
             axisLine:{
               lineStyle:{
@@ -143,7 +161,8 @@
               show: true,
               textStyle: {
                 color: this.colorw   //这里用参数代替了
-              }
+              },
+              fontSize: 8
             },
             axisLine:{
               lineStyle:{

src/views/statistics/item/s11biaoZhunWuCol2.vue

@@ -67,6 +67,7 @@
        }
       },
       drawLine(){
+        let that = this
         let s11biaoZhunWu = echarts.init(document.getElementById(this.id))
         let barColor = ['#66FFCC','#FFCCCC','#33FF00','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
         let barNum = []
@@ -80,37 +81,61 @@
                 position:'top',
                         
                 textStyle:{
-                  fontSize:16,
+                  fontSize:12,
                   color:'#B0CEFC'
                 }
               }
-            }
+            },
+            markLine: {
+                  symbol: ['none', 'none'], // 去掉箭头
+                  // label:{
+                  //   show: true,
+                  //   position: 'right',
+                  //   color: barColor[i],
+                  //   formatter: function (params) {
+                  //     return that.data.Num.titleall[i].zhi_liang_mu_biao
+                  //   },
+                  // },
+                  data: [
+                    {
+                      name: '阈值',
+                      yAxis: this.data.Num.xianzhi[i]*1
+                    }
+                  ],
+                  lineStyle: {
+                    color: barColor[i]
+                  }
+                } 
           })
           
         }  
-        console.log(this.data.Num.title,this.data.Num.number,'bnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnnn')
-        let that = this
+        // let that = this
         let option = {
            //v3
           title: {
             // text: this.title,
             textStyle:{ fontSize:14,color: this.colorw }
           },
-          // tooltip: {
-          //               trigger: 'axis',
-          //               axisPointer: {
-          //                 type: 'shadow'
-          //               },
-          //               formatter: function (datas) {
-          //                 // console.log(datas)
-          //                   var res=datas[0].name+"<BR>"+'期间核查次数:'+datas[0].data+"<BR>期间核查完成次数"+datas[1].data
-          //                   // res+='百分比:'+(datas[1].value==null||datas[1].value==0?"0.00":(datas[0].value/datas[1].value*100).toFixed(2))+"%"
-          //                   return res
-          //               }
-          // },
+          tooltip: {
+                // 当trigger : axis 鼠标移入标线不会有悬浮框出现 params的值为一个数组，只会悬浮series
+                // 当trigger : item 鼠标移入标线有悬浮框出现 params的值为一个对象，会区别鼠标移入的是series还是markLine
+                // 使用axis 注释掉formatter 自己写也行 ；使用item放开formatter
+                show: true,
+                trigger: "item",//axis item
+                axisPointer: {
+                    type: "cross",
+                    label: {
+                        backgroundColor: "#6a7985",
+                    },
+                },
+                formatter: (params) => {
+                  return that.data.Num.titleall[params.seriesIndex].zhi_liang_mu_biao
+                }
+            },
           legend: {
             textStyle: {
-                color: '#B0CEFC'  // 图例文字颜色
+              fontSize: 8,
+              color: '#B0CEFC'  // 图例文字颜色
             }
 
           },
@@ -168,11 +193,6 @@
        
        };
         
-        // s11biaoZhunWu.on('click', function (params) {
-        //   console.log(params,'433333333333333333333333333333333333333333335')
-        //   that.$emit('change', params.data.id_)
-        //   // that.userInfo[1] = params.data.NAME_
-        // })
        option && s11biaoZhunWu.setOption(option);
       }
     }

src/views/statistics/item/s14bufuhexiangCol.vue

@@ -73,7 +73,7 @@
         // let endInof = Number(this.data.t_complaintEnd.number)
         let s14bufuhexiang = echarts.init(document.getElementById(this.id))
         let option;
-        let barColor = ['#66FFCC','#FFCCCC','#33FF00','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
+        let barColor = ['#FFBF00','#33FF00','#097969','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
         let barNum = []
         for (let i = 0; i < this.data.num.title.length-1; i++) {
           if(i==this.data.num.title.length-2){
@@ -88,7 +88,7 @@
 					      },
                 position: 'top',
                 textStyle:{
-                    fontSize:16,
+                    fontSize:8,
                     color:'#B0CEFC'
                   }
               }
@@ -103,7 +103,7 @@
                   position:'top',
                           
                   textStyle:{
-                    fontSize:16,
+                    fontSize:8,
                     color:'#B0CEFC'
                   }
                 }
@@ -118,6 +118,23 @@
             text: this.title,
             textStyle:{ fontSize:14,color: this.colorw }
           },
+          legend: {
+                textStyle: {
+                  fontSize: 8,
+                  color: '#B0CEFC'  // 图例文字颜色
+                },
+                formatter: function (name) {
+                  if(name === 'chu'){
+                    return '完成率（%）';
+                  }else if(name === 'num'){
+                    return '已完成数量';
+                  }else if(name === 'numA'){
+                    return '未完成数量';
+                  }
+                    
+                }
+
+          },
           grid: {
                 top: '20%',
                 left: '3%',
@@ -132,7 +149,8 @@
               show: true,
               textStyle: {
                 color: this.colorw   //这里用参数代替了
-              }
+              },
+              fontSize: 8
             },
             axisLine:{
               lineStyle:{
@@ -147,7 +165,8 @@
               show: true,
               textStyle: {
                 color: this.colorw    //这里用参数代替了
-              }
+              },
+              fontSize: 8
             },
             axisLine:{
               lineStyle:{

src/views/statistics/item/s15tousuCol.vue

@@ -73,7 +73,7 @@
         // let endInof = Number(this.data.t_complaintEnd.number)
         let s15tousucol = echarts.init(document.getElementById(this.id))
         let option;
-        let barColor = ['#66FFCC','#FFCCCC','#33FF00','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
+        let barColor = ['#FFBF00','#33FF00','#097969','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
         let barNum = []
         for (let i = 0; i < this.data.num.title.length-1; i++) {
           if(i==this.data.num.title.length-2){
@@ -88,7 +88,7 @@
 					      },
                 position: 'top',
                 textStyle:{
-                    fontSize:16,
+                    fontSize:8,
                     color:'#B0CEFC'
                   }
               }
@@ -103,7 +103,7 @@
                   position:'top',
                           
                   textStyle:{
-                    fontSize:16,
+                    fontSize:8,
                     color:'#B0CEFC'
                   }
                 }
@@ -118,6 +118,23 @@
             text: this.title,
             textStyle:{ fontSize:14,color: this.colorw }
           },
+          legend: {
+                textStyle: {
+                  fontSize: 8,
+                  color: '#B0CEFC'  // 图例文字颜色
+                },
+                formatter: function (name) {
+                  if(name === 'chu'){
+                    return '完成率（%）';
+                  }else if(name === 'num'){
+                    return '已完成数量';
+                  }else if(name === 'numA'){
+                    return '未完成数量';
+                  }
+                    
+                }
+
+          },
           grid: {
                 top: '10%',
                 left: '3%',
@@ -132,7 +149,8 @@
               show: true,
               textStyle: {
                 color: this.colorw   //这里用参数代替了
-              }
+              },
+              fontSize: 8
             },
             axisLine:{
               lineStyle:{
@@ -147,7 +165,8 @@
               show: true,
               textStyle: {
                 color: this.colorw    //这里用参数代替了
-              }
+              },
+              fontSize: 8
             },
             axisLine:{
               lineStyle:{

src/views/statistics/item/s16bzJunZhuCol2.vue

@@ -69,7 +69,7 @@
       drawLine(){
         let s16bzJunZhu = echarts.init(document.getElementById(this.id))
         let option;
-        let barColor = ['#66FFCC','#FFCCCC','#33FF00','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
+        let barColor = ['#FFBF00','#33FF00','#097969','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
         let barNum = []
         for (let i = 0; i < this.data.num.title.length-1; i++) {
           if(i==this.data.num.title.length-2){
@@ -84,7 +84,7 @@
 					      },
                 position: 'top',
                 textStyle:{
-                    fontSize:16,
+                    fontSize:8,
                     color:'#B0CEFC'
                   }
               }
@@ -99,7 +99,7 @@
                   position:'top',
                           
                   textStyle:{
-                    fontSize:16,
+                    fontSize:8,
                     color:'#B0CEFC'
                   }
                 }
@@ -114,6 +114,23 @@
             text: this.title,
             textStyle:{ fontSize:14,color: this.colorw }
           },
+          legend: {
+                textStyle: {
+                  fontSize: 8,
+                  color: '#B0CEFC'  // 图例文字颜色
+                },
+                formatter: function (name) {
+                  if(name === 'chu'){
+                    return '完成率（%）';
+                  }else if(name === 'num'){
+                    return '已完成数量';
+                  }else if(name === 'numA'){
+                    return '未完成数量';
+                  }
+                    
+                }
+
+          },
           grid: {
                 top: '20%',
                 left: '3%',
@@ -128,7 +145,8 @@
               show: true,
               textStyle: {
                 color: this.colorw   //这里用参数代替了
-              }
+              },
+              fontSize: 8
             },
             axisLine:{
               lineStyle:{
@@ -143,7 +161,8 @@
               show: true,
               textStyle: {
                 color: this.colorw    //这里用参数代替了
-              }
+              },
+              fontSize: 8
             },
             axisLine:{
               lineStyle:{

src/views/statistics/item/s1zhiLiangMuBiaoCol.vue

@@ -71,7 +71,7 @@
       drawLine(){
         let s5zhiLiangMuBiaocol = echarts.init(document.getElementById(this.id))
         let option;
-        let barColor = ['#66FFCC','#FFCCCC','#33FF00','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
+        let barColor = ['#FFBF00','#33FF00','#097969','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
         let barNum = []
         for (let i = 0; i < this.data.num.title.length-1; i++) {
           if(i==this.data.num.title.length-2){
@@ -86,7 +86,7 @@
 					      },
                 position: 'top',
                 textStyle:{
-                    fontSize:16,
+                    fontSize:8,
                     color:'#B0CEFC'
                   }
               }
@@ -101,7 +101,7 @@
                   position:'top',
                           
                   textStyle:{
-                    fontSize:16,
+                    fontSize:8,
                     color:'#B0CEFC'
                   }
                 }
@@ -116,6 +116,23 @@
             text: this.title,
             textStyle:{ fontSize:14,color: this.colorw }
           },
+          legend: {
+                textStyle: {
+                  fontSize: 8,
+                  color: '#B0CEFC'  // 图例文字颜色
+                },
+                formatter: function (name) {
+                  if(name === 'chu'){
+                    return '完成率（%）';
+                  }else if(name === 'num'){
+                    return '已完成数量';
+                  }else if(name === 'numA'){
+                    return '未完成数量';
+                  }
+                    
+                }
+
+          },
           grid: {
                 top: '20%',
                 left: '3%',
@@ -130,7 +147,8 @@
               show: true,
               textStyle: {
                 color: this.colorw  //这里用参数代替了
-              }
+              },
+              fontSize: 8
             },
             axisLine:{
               lineStyle:{
@@ -145,7 +163,8 @@
               show: true,
               textStyle: {
                 color: this.colorw    //这里用参数代替了
-              }
+              },
+              fontSize: 8
             },
             axisLine:{
               lineStyle:{

src/views/statistics/item/s2manYiDuPro.vue

@@ -72,7 +72,7 @@
         let s2manYiDucol = echarts.init(document.getElementById(this.id))
 
         let option;
-        let barColor = ['#66FFCC','#FFCCCC','#33FF00','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
+        let barColor = ['#FFBF00','#33FF00','#097969','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
         let barNum = []
         for (let i = 0; i < this.data.num.title.length-1; i++) {
           if(i==this.data.num.title.length-2){
@@ -87,7 +87,7 @@
 					      },
                 position: 'top',
                 textStyle:{
-                    fontSize:16,
+                    fontSize:8,
                     color:'#B0CEFC'
                   }
               }
@@ -102,7 +102,7 @@
                   position:'top',
                           
                   textStyle:{
-                    fontSize:16,
+                    fontSize:8,
                     color:'#B0CEFC'
                   }
                 }
@@ -117,6 +117,23 @@
             text: this.title,
             textStyle:{ fontSize:14,color: this.colorw }
           },
+          legend: {
+                textStyle: {
+                  fontSize: 8,
+                  color: '#B0CEFC'  // 图例文字颜色
+                },
+                formatter: function (name) {
+                  if(name === 'chu'){
+                    return '完成率（%）';
+                  }else if(name === 'num'){
+                    return '已完成数量';
+                  }else if(name === 'numA'){
+                    return '未完成数量';
+                  }
+                    
+                }
+
+          },
           grid: {
                 top: '20%',
                 left: '3%',
@@ -131,7 +148,8 @@
               show: true,
               textStyle: {
                 color: this.colorw   //这里用参数代替了
-              }
+              },
+              fontSize: 8
             },
             axisLine:{
               lineStyle:{
@@ -146,7 +164,8 @@
               show: true,
               textStyle: {
                 color: this.colorw    //这里用参数代替了
-              }
+              },
+              fontSize: 8
             },
             axisLine:{
               lineStyle:{

src/views/statistics/item/s4renYuanPeiXunCol.vue

@@ -71,7 +71,7 @@
         let s4renYuanPeiXunfb = echarts.init(document.getElementById(this.id))
 
         let option;
-        let barColor = ['#66FFCC','#FFCCCC','#33FF00','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
+        let barColor = ['#FFBF00','#33FF00','#097969','#FF66CC','#EC5800','#AAFF00','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
         let barNum = []
         for (let i = 0; i < this.data.num.title.length-1; i++) {
           if(i==this.data.num.title.length-2){
@@ -81,12 +81,11 @@
               label:{
                 show: true,
 				        formatter:function(params){ //标签内容
-                console.log(params.value[params.seriesName],'paramsparamsparamsparamsparams')
 					        return  params.value[params.seriesName]+'%'
 					      },
                 position: 'top',
                 textStyle:{
-                    fontSize:16,
+                    fontSize:8,
                     color:'#B0CEFC'
                   }
               }
@@ -101,7 +100,7 @@
                   position:'top',
                           
                   textStyle:{
-                    fontSize:16,
+                    fontSize:8,
                     color:'#B0CEFC'
                   }
                 }
@@ -112,10 +111,27 @@
         }  
 
         option = {
-            title: {
+          title: {
             text: this.title,
             textStyle:{ fontSize:14,color: this.colorw }
           },
+          legend: {
+                textStyle: {
+                  fontSize: 8,
+                  color: '#B0CEFC'  // 图例文字颜色
+                },
+                formatter: function (name) {
+                  if(name === 'chu'){
+                    return '完成率（%）';
+                  }else if(name === 'num'){
+                    return '已完成数量';
+                  }else if(name === 'numA'){
+                    return '未完成数量';
+                  }
+                    
+                }
+
+          },
           grid: {
                 top: '20%',
                 left: '3%',
@@ -130,7 +146,8 @@
               show: true,
               textStyle: {
                 color: this.colorw   //这里用参数代替了
-              }
+              },
+              fontSize: 8
             },
             axisLine:{
               lineStyle:{
@@ -145,7 +162,8 @@
               show: true,
               textStyle: {
                 color: this.colorw    //这里用参数代替了
-              }
+              },
+              fontSize: 8
             },
             axisLine:{
               lineStyle:{

src/views/statistics/item/s5renYuanJianDuCol.vue

@@ -70,7 +70,7 @@
       drawLine(){
         let s5renYuanJianDucol = echarts.init(document.getElementById(this.id))
         let option;
-        let barColor = ['#66FFCC','#FFCCCC','#33FF00','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
+        let barColor = ['#FFBF00','#33FF00','#097969','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
         let barNum = []
         for (let i = 0; i < this.data.num.title.length-1; i++) {
           if(i==this.data.num.title.length-2){
@@ -80,12 +80,11 @@
               label:{
                 show: true,
 				        formatter:function(params){ //标签内容
-                console.log(params.value[params.seriesName],'paramsparamsparamsparamsparams')
 					        return  params.value[params.seriesName]+'%'
 					      },
                 position: 'top',
                 textStyle:{
-                    fontSize:16,
+                    fontSize:8,
                     color:'#B0CEFC'
                   }
               }
@@ -100,7 +99,7 @@
                   position:'top',
                           
                   textStyle:{
-                    fontSize:16,
+                    fontSize:8,
                     color:'#B0CEFC'
                   }
                 }
@@ -115,6 +114,23 @@
             text: this.title,
             textStyle:{ fontSize:14,color: this.colorw }
           },
+          legend: {
+                textStyle: {
+                  fontSize: 8,
+                  color: '#B0CEFC'  // 图例文字颜色
+                },
+                formatter: function (name) {
+                  if(name === 'chu'){
+                    return '完成率（%）';
+                  }else if(name === 'num'){
+                    return '已完成数量';
+                  }else if(name === 'numA'){
+                    return '未完成数量';
+                  }
+                    
+                }
+
+          },
           grid: {
                 top: '20%',
                 left: '3%',
@@ -129,7 +145,8 @@
               show: true,
               textStyle: {
                 color: this.colorw   //这里用参数代替了
-              }
+              },
+              fontSize: 8
             },
             axisLine:{
               lineStyle:{
@@ -144,7 +161,8 @@
               show: true,
               textStyle: {
                 color: this.colorw    //这里用参数代替了
-              }
+              },
+              fontSize: 8
             },
             axisLine:{
               lineStyle:{

src/views/statistics/item/s7sheBeiJiaoZhunCol.vue

@@ -71,7 +71,7 @@
         let s7sheBeiJiaoZhuncol = echarts.init(document.getElementById(this.id))
 
         let option;
-        let barColor = ['#66FFCC','#FFCCCC','#33FF00','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
+        let barColor = ['#FFBF00','#33FF00','#097969','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
         let barNum = []
         for (let i = 0; i < this.data.num.title.length-1; i++) {
           if(i==this.data.num.title.length-2){
@@ -85,7 +85,7 @@
 					      },
                 position: 'top',
                 textStyle:{
-                    fontSize:16,
+                    fontSize:8,
                     color:'#B0CEFC'
                   }
               }
@@ -100,7 +100,7 @@
                   position:'top',
                           
                   textStyle:{
-                    fontSize:16,
+                    fontSize:8,
                     color:'#B0CEFC'
                   }
                 }
@@ -115,6 +115,23 @@
             text: this.title,
             textStyle:{ fontSize:14,color: this.colorw }
           },
+          legend: {
+                textStyle: {
+                  fontSize: 8,
+                  color: '#B0CEFC'  // 图例文字颜色
+                },
+                formatter: function (name) {
+                  if(name === 'chu'){
+                    return '完成率（%）';
+                  }else if(name === 'num'){
+                    return '已完成数量';
+                  }else if(name === 'numA'){
+                    return '未完成数量';
+                  }
+                    
+                }
+
+          },
           grid: {
                 top: '20%',
                 left: '3%',
@@ -129,7 +146,8 @@
               show: true,
               textStyle: {
                 color: this.colorw  //这里用参数代替了
-              }
+              },
+              fontSize: 8
             },
             axisLine:{
               lineStyle:{
@@ -144,7 +162,8 @@
               show: true,
               textStyle: {
                 color: this.colorw   //这里用参数代替了
-              }
+              },
+              fontSize: 8
             },
             axisLine:{
               lineStyle:{

src/views/statistics/item/s8sheBeiHeChaCol.vue

@@ -69,7 +69,7 @@
       drawLine(){
         let s8sheBeiHeChacol = echarts.init(document.getElementById(this.id))
         let option;
-        let barColor = ['#66FFCC','#FFCCCC','#33FF00','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
+        let barColor = ['#FFBF00','#33FF00','#097969','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
         let barNum = []
         for (let i = 0; i < this.data.num.title.length-1; i++) {
           if(i==this.data.num.title.length-2){
@@ -79,12 +79,11 @@
               label:{
                 show: true,
 				        formatter:function(params){ //标签内容
-                console.log(params.value[params.seriesName],'paramsparamsparamsparamsparams')
 					        return  params.value[params.seriesName]+'%'
 					      },
                 position: 'top',
                 textStyle:{
-                    fontSize:16,
+                    fontSize:8,
                     color:'#B0CEFC'
                   }
               }
@@ -99,7 +98,7 @@
                   position:'top',
                           
                   textStyle:{
-                    fontSize:16,
+                    fontSize:8,
                     color:'#B0CEFC'
                   }
                 }
@@ -114,6 +113,23 @@
             text: this.title,
             textStyle:{ fontSize:14,color: this.colorw }
           },
+          legend: {
+                textStyle: {
+                  fontSize: 8,
+                  color: '#B0CEFC'  // 图例文字颜色
+                },
+                formatter: function (name) {
+                  if(name === 'chu'){
+                    return '完成率（%）';
+                  }else if(name === 'num'){
+                    return '已完成数量';
+                  }else if(name === 'numA'){
+                    return '未完成数量';
+                  }
+                    
+                }
+
+          },
           grid: {
                 top: '20%',
                 left: '3%',
@@ -128,7 +144,8 @@
               show: true,
               textStyle: {
                 color: this.colorw  //这里用参数代替了
-              }
+              },
+              fontSize: 8
             },
             axisLine:{
               lineStyle:{
@@ -143,7 +160,8 @@
               show: true,
               textStyle: {
                 color: this.colorw   //这里用参数代替了
-              }
+              },
+              fontSize: 8
             },
             axisLine:{
               lineStyle:{

src/views/statistics/item/s9neiBuZhiLiangCol.vue

@@ -73,7 +73,7 @@
         // let endInof = Number(this.data.t_complaintEnd.number)
         let s9neibucol = echarts.init(document.getElementById(this.id))
         let option;
-        let barColor = ['#66FFCC','#FFCCCC','#33FF00','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
+        let barColor = ['#FFBF00','#33FF00','#097969','#FF66CC','#EC5800','#AAFF00','#F8DE7E','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#880808','#097969','#89CFF0','#5D3FD3','	#FBCEB1','#E49B0F','#ECFFDC','#A52A2A','#D27D2D','#FFBF00','#A0522D','#FF00FF','#FFB6C1','#F89880','#D8BFD8','#5D3FD3','#770737','#DA70D6']
         let barNum = []
         for (let i = 0; i < this.data.num.title.length-1; i++) {
           if(i==this.data.num.title.length-2){
@@ -88,7 +88,7 @@
 					      },
                 position: 'top',
                 textStyle:{
-                    fontSize:16,
+                    fontSize:8,
                     color:'#B0CEFC'
                   }
               }
@@ -103,7 +103,7 @@
                   position:'top',
                           
                   textStyle:{
-                    fontSize:16,
+                    fontSize:8,
                     color:'#B0CEFC'
                   }
                 }
@@ -118,6 +118,23 @@
             text: this.title,
             textStyle:{ fontSize:14,color: this.colorw }
           },
+          legend: {
+                textStyle: {
+                  fontSize: 8,
+                  color: '#B0CEFC'  // 图例文字颜色
+                },
+                formatter: function (name) {
+                  if(name === 'chu'){
+                    return '完成率（%）';
+                  }else if(name === 'num'){
+                    return '已完成数量';
+                  }else if(name === 'numA'){
+                    return '未完成数量';
+                  }
+                    
+                }
+
+          },
           grid: {
                 top: '20%',
                 left: '3%',
@@ -132,7 +149,8 @@
               show: true,
               textStyle: {
                 color: this.colorw   //这里用参数代替了
-              }
+              },
+              fontSize: 8
             },
             axisLine:{
               lineStyle:{
@@ -147,7 +165,8 @@
               show: true,
               textStyle: {
                 color: this.colorw   //这里用参数代替了
-              }
+              },
+              fontSize: 8
             },
             axisLine:{
               lineStyle:{

src/views/statistics/js/selectDB.js

@@ -27,16 +27,19 @@ export const gethechaMGObj = (end,info)=>{
 //   return "select COUNT(t_ndnlyzsysjbdjhzb.id_) as num from t_ndnlyzsysjbdjhzb LEFT JOIN t_nlyzsysjbdhdsyxhcb on t_ndnlyzsysjbdjhzb.id_=t_nlyzsysjbdhdsyxhcb.xiang_mu_ming_che WHERE t_nlyzsysjbdhdsyxhcb.shi_fou_guo_shen_ = '1' and  YEAR(t_ndnlyzsysjbdjhzb.create_time_)= "+end+" UNION all select COUNT(id_) as snum from t_ndnlyzsysjbdjhzb where  YEAR(create_time_)="+end
 // }
 export const getyangPinCaiJiObj = (end,info)=>{
-  return "select t_zlzbpjzb.*,IF(FIND_IN_SET('项', t_zlzbpjzb.zhi_biao_xian_zhi) > 0 AND FIND_IN_SET('次', t_zlzbpjzb.zhi_biao_xian_zhi) > 0,  SUM(t_zlzbpjzb.shi_ji_shu_zhi_),AVG(t_zlzbpjzb.shi_ji_shu_zhi_)) AS location,t_zlzbpjb.bian_zhi_bu_men_ as bzbm,DATE_FORMAT(t_zlzbpjb.bian_zhi_shi_jian, '%Y-%m')as bzsj from t_zlzbpjzb LEFT JOIN t_zlzbpjb on t_zlzbpjzb.parent_id_ = t_zlzbpjb.id_ where FIND_IN_SET(t_zlzbpjb.bian_zhi_bu_men_,'"+info+"') and t_zlzbpjb.shi_fou_guo_shen_ = '已完成' and t_zlzbpjb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_zlzbpjb.bian_zhi_bu_men_,t_zlzbpjzb.zhi_liang_mu_biao ORDER BY t_zlzbpjzb.zhi_liang_zhi_bia"
+  return "select	t_zlzbpjzb.*,ROUND(IF(FIND_IN_SET( '项', t_zlzbpjzb.zhi_biao_xian_zhi ) > 0 	AND FIND_IN_SET( '次', t_zlzbpjzb.zhi_biao_xian_zhi ) > 0,SUM( t_zlzbpjzb.shi_ji_shu_zhi_ ),AVG( t_zlzbpjzb.shi_ji_shu_zhi_ )),2) AS location,t_zlzbpjb.bian_zhi_bu_men_ AS bzbm,DATE_FORMAT( t_zlzbpjb.bian_zhi_shi_jian, '%Y-%m' ) AS bzsj FROM	t_zlzbpjzb	LEFT JOIN t_zlzbpjb ON t_zlzbpjzb.parent_id_ = t_zlzbpjb.id_ WHERE	FIND_IN_SET( t_zlzbpjb.bian_zhi_bu_men_, '"+info+"' ) 	AND t_zlzbpjb.shi_fou_guo_shen_ = '已完成' 	AND t_zlzbpjb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' 	AND '"+end[1]+"' GROUP BY	t_zlzbpjb.bian_zhi_bu_men_,	t_zlzbpjzb.zhi_liang_mu_biao ORDER BY	t_zlzbpjb.bian_zhi_bu_men_,	t_zlzbpjzb.zhi_liang_mu_biao"
 }
 export const getzongZLMBObj = (end,info)=>{
   return "select t_zlzbpjzb.*,IF(FIND_IN_SET('项', t_zlzbpjzb.zhi_biao_xian_zhi) > 0 AND FIND_IN_SET('次', t_zlzbpjzb.zhi_biao_xian_zhi) > 0,  SUM(t_zlzbpjzb.shi_ji_shu_zhi_),AVG(t_zlzbpjzb.shi_ji_shu_zhi_)) AS location,t_zlzbpjb.bian_zhi_bu_men_ as bzbm,DATE_FORMAT(t_zlzbpjb.bian_zhi_shi_jian, '%Y-%m')as bzsj from t_zlzbpjzb LEFT JOIN t_zlzbpjb on t_zlzbpjzb.parent_id_ = t_zlzbpjb.id_ where FIND_IN_SET(t_zlzbpjb.bian_zhi_bu_men_,'"+info+"') and t_zlzbpjb.shi_fou_guo_shen_ = '已完成' and t_zlzbpjb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_zlzbpjzb.zhi_liang_mu_biao"
 }
+export const getzhiliangmubiaotitleObj = (end,info)=>{
+  return "select distinct t_zlzbpjzb.zhi_liang_mu_biao,t_zlzbpjzb.zhi_biao_xian_zhi from t_zlzbpjzb LEFT JOIN t_zlzbpjb on t_zlzbpjzb.parent_id_ = t_zlzbpjb.id_ where FIND_IN_SET(t_zlzbpjb.bian_zhi_bu_men_,'"+info+"') and t_zlzbpjb.shi_fou_guo_shen_ = '已完成' and t_zlzbpjb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_zlzbpjb.bian_zhi_bu_men_,t_zlzbpjzb.zhi_liang_mu_biao ORDER BY t_zlzbpjzb.zhi_liang_mu_biao"
+}
 export const getzhiliangzhibiaotitleObj = (end,info)=>{
-  return "select distinct t_zlzbpjzb.zhi_liang_zhi_bia,t_zlzbpjzb.zhi_biao_xian_zhi from t_zlzbpjzb LEFT JOIN t_zlzbpjb on t_zlzbpjzb.parent_id_ = t_zlzbpjb.id_ where FIND_IN_SET(t_zlzbpjb.bian_zhi_bu_men_,'"+info+"') and t_zlzbpjb.shi_fou_guo_shen_ = '已完成' and t_zlzbpjb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_zlzbpjb.bian_zhi_bu_men_,t_zlzbpjzb.zhi_liang_zhi_bia ORDER BY t_zlzbpjzb.zhi_liang_zhi_bia"
+  return "select distinct t_zlzbpjzb.zhi_liang_zhi_bia,t_zlzbpjzb.zhi_biao_xian_zhi,CONCAT(t_zlzbpjzb.zhi_liang_zhi_bia,t_zlzbpjzb.zhi_biao_xian_zhi,'') as allt from t_zlzbpjzb LEFT JOIN t_zlzbpjb on t_zlzbpjzb.parent_id_ = t_zlzbpjb.id_ where FIND_IN_SET(t_zlzbpjb.bian_zhi_bu_men_,'"+info+"') and t_zlzbpjb.shi_fou_guo_shen_ = '已完成' and t_zlzbpjb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY t_zlzbpjb.bian_zhi_bu_men_,t_zlzbpjzb.zhi_liang_zhi_bia ORDER BY t_zlzbpjzb.zhi_liang_zhi_bia"
 }
 export const getfenzuZLZBObj = (end,info)=>{
-  return "select t_zlzbpjzb.*,ROUND(IF(FIND_IN_SET('项', t_zlzbpjzb.zhi_biao_xian_zhi) > 0 AND FIND_IN_SET('次', t_zlzbpjzb.zhi_biao_xian_zhi) > 0,  SUM(t_zlzbpjzb.shi_ji_shu_zhi_),AVG(t_zlzbpjzb.shi_ji_shu_zhi_))) AS location,t_zlzbpjb.bian_zhi_bu_men_ as bzbm,DATE_FORMAT(t_zlzbpjb.bian_zhi_shi_jian, '%Y-%m')as bzsj from t_zlzbpjzb LEFT JOIN t_zlzbpjb on t_zlzbpjzb.parent_id_ = t_zlzbpjb.id_ where FIND_IN_SET(t_zlzbpjb.bian_zhi_bu_men_,'"+info+"') and t_zlzbpjb.shi_fou_guo_shen_ = '已完成' and t_zlzbpjb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY bzsj,bzbm, t_zlzbpjzb.zhi_liang_zhi_bia ORDER BY t_zlzbpjzb.zhi_liang_zhi_bia"
+  return "select t_zlzbpjzb.*,ROUND(IF(FIND_IN_SET('项', t_zlzbpjzb.zhi_biao_xian_zhi) > 0 AND FIND_IN_SET('次', t_zlzbpjzb.zhi_biao_xian_zhi) > 0,  SUM(t_zlzbpjzb.shi_ji_shu_zhi_),AVG(t_zlzbpjzb.shi_ji_shu_zhi_)),2) AS location,t_zlzbpjb.bian_zhi_bu_men_ as bzbm,DATE_FORMAT(t_zlzbpjb.bian_zhi_shi_jian, '%Y-%m')as bzsj from t_zlzbpjzb LEFT JOIN t_zlzbpjb on t_zlzbpjzb.parent_id_ = t_zlzbpjb.id_ where FIND_IN_SET(t_zlzbpjb.bian_zhi_bu_men_,'"+info+"') and t_zlzbpjb.shi_fou_guo_shen_ = '已完成' and t_zlzbpjb.bian_zhi_shi_jian BETWEEN '"+end[0]+"' and '"+end[1]+"' GROUP BY bzsj,bzbm, t_zlzbpjzb.zhi_liang_zhi_bia ORDER BY t_zlzbpjzb.zhi_liang_zhi_bia"
 }
 
 

src/views/statistics/sendDatas.js

@@ -61,13 +61,15 @@ export default {
                         
                         let title = ['NAME_','numA','num','chu']
 
-                        // for (let t = 0; t < this.bufuheObj.length; t++) {
-                        //         title.push(this.bufuheObj[t].bao_gao_lei_xing_)
-                                
-                        // }
-                        // }
+                        let mid = JSON.parse(JSON.stringify(this.allBuMen))
+                        for (let i = 0; i < this.jiaoyanMGObj.length; i++) {
+                                let midI = mid.findIndex(v => v.NAME_ == this.jiaoyanMGObj[i].NAME_ )
+                                mid[midI].numA = this.jiaoyanMGObj[i].numA
+                                mid[midI].num = this.jiaoyanMGObj[i].num
+                                mid[midI].chu = this.jiaoyanMGObj[i].chu
+                        }
                         return {
-                                "num" :{"date": this.endDate,"number": this.jiaoyanMGObj,"title":title},
+                                "num" :{"date": this.endDate,"number": mid,"title":title},
                                 "config":this.getMyConfig("内部质量") //返回需要的对应参数
                         }
                 },
@@ -94,13 +96,15 @@ export default {
                         
                         let title = ['NAME_','numA','num','chu']
 
-                        // for (let t = 0; t < this.bufuheObj.length; t++) {
-                        //         title.push(this.bufuheObj[t].bao_gao_lei_xing_)
-                                
-                        // }
-                        // }
+                        let mid = JSON.parse(JSON.stringify(this.allBuMen))
+                        for (let i = 0; i < this.hechaMGObj.length; i++) {
+                                let midI = mid.findIndex(v => v.NAME_ == this.hechaMGObj[i].NAME_ )
+                                mid[midI].numA = this.hechaMGObj[i].numA
+                                mid[midI].num = this.hechaMGObj[i].num
+                                mid[midI].chu = this.hechaMGObj[i].chu
+                        }
                         return {
-                                "num" :{"date": this.endDate,"number": this.hechaMGObj,"title":title},
+                                "num" :{"date": this.endDate,"number": mid,"title":title},
                                 "config":this.getMyConfig("内部质量") //返回需要的对应参数
                         }
                 },
@@ -127,13 +131,15 @@ export default {
                         
                         let title = ['NAME_','numA','num','chu']
 
-                        // for (let t = 0; t < this.bufuheObj.length; t++) {
-                        //         title.push(this.bufuheObj[t].bao_gao_lei_xing_)
-                                
-                        // }
-                        // }
+                        let mid = JSON.parse(JSON.stringify(this.allBuMen))
+                        for (let i = 0; i < this.waibuObjfb.length; i++) {
+                                let midI = mid.findIndex(v => v.NAME_ == this.waibuObjfb[i].NAME_ )
+                                mid[midI].numA = this.waibuObjfb[i].numA
+                                mid[midI].num = this.waibuObjfb[i].num
+                                mid[midI].chu = this.waibuObjfb[i].chu
+                        }
                         return {
-                                "num" :{"date": this.endDate,"number": this.waibuObjfb,"title":title},
+                                "num" :{"date": this.endDate,"number": mid,"title":title},
                                 "config":this.getMyConfig("内部质量") //返回需要的对应参数
                         }
                 },
@@ -159,7 +165,16 @@ export default {
                                 title.push(this.zhiliangzhibiaotitle[t].zhi_liang_zhi_bia)
                                 
                         }
-                        
+                        let zbval = []
+                        for (let t = 0; t < this.zhiliangmubiaotitle.length; t++) {
+                                if(this.zhiliangmubiaotitle[t].zhi_liang_mu_biao.match(/(\d+(\.\d+)?)/)=== null){
+                                        zbval.push(parseFloat(this.zhiliangmubiaotitle[t].zhi_biao_xian_zhi.match(/(\d+(\.\d+)?)/)))
+                                }else{
+                                        zbval.push(parseFloat(this.zhiliangmubiaotitle[t].zhi_liang_mu_biao.match(/(\d+(\.\d+)?)/)))
+                                }
+                                
+                                                
+                        }
                         // let arr  = this.tableNum
                         // let aa =[]
                         // for (let j = 0; j < arr.length; j++) {
@@ -172,7 +187,7 @@ export default {
                         // console.log(arr,this.tableData.data,'djlkddddddddddddddddddddddddddddddddd')
 
                         return {
-                                "Num" :{"date": this.endDate,"number": zlzbfz,"title":title},
+                                "Num" :{"date": this.endDate,"number": zlzbfz,"title":title,"xianzhi":zbval,"titleall":this.zhiliangmubiaotitle},
                                 "config":this.getMyConfig("检测") //返回需要的对应参数
                         }
                 },
@@ -261,8 +276,15 @@ export default {
                 },
                 getbzJunZhujNum(){
                         let title = ['NAME_','numA','num','chu']
+                        let mid = JSON.parse(JSON.stringify(this.allBuMen))
+                        for (let i = 0; i < this.gaijinxiangObj.length; i++) {
+                                let midI = mid.findIndex(v => v.NAME_ == this.gaijinxiangObj[i].NAME_ )
+                                mid[midI].numA = this.gaijinxiangObj[i].numA
+                                mid[midI].num = this.gaijinxiangObj[i].num
+                                mid[midI].chu = this.gaijinxiangObj[i].chu
+                        }
                         return {
-                                "num" :{"date": this.endDate,"number": this.gaijinxiangObj,"title":title},
+                                "num" :{"date": this.endDate,"number": mid,"title":title},
                                 "config":this.getMyConfig("检测") //返回需要的对应参数
                         }
                 },
@@ -352,13 +374,15 @@ export default {
                         
                         let title = ['NAME_','numA','num','chu']
 
-                        // for (let t = 0; t < this.bufuheObj.length; t++) {
-                        //         title.push(this.bufuheObj[t].bao_gao_lei_xing_)
-                                
-                        // }
-                        // }
+                        let mid = JSON.parse(JSON.stringify(this.allBuMen))
+                        for (let i = 0; i < this.guanshenfbObj.length; i++) {
+                                let midI = mid.findIndex(v => v.NAME_ == this.guanshenfbObj[i].NAME_ )
+                                mid[midI].numA = this.guanshenfbObj[i].numA
+                                mid[midI].num = this.guanshenfbObj[i].num
+                                mid[midI].chu = this.guanshenfbObj[i].chu
+                        }
                         return {
-                                "num" :{"date": this.endDate,"number": this.guanshenfbObj,"title":title},
+                                "num" :{"date": this.endDate,"number": mid,"title":title},
                                 "config":this.getMyConfig("内部质量") //返回需要的对应参数
                         }
                 },
@@ -437,13 +461,15 @@ export default {
                         
                         let title = ['NAME_','numA','num','chu']
 
-                        // for (let t = 0; t < this.bufuheObj.length; t++) {
-                        //         title.push(this.bufuheObj[t].bao_gao_lei_xing_)
-                                
-                        // }
-                        // }
+                        let mid = JSON.parse(JSON.stringify(this.allBuMen))
+                        for (let i = 0; i < this.neishenfbObj.length; i++) {
+                                let midI = mid.findIndex(v => v.NAME_ == this.neishenfbObj[i].NAME_ )
+                                mid[midI].numA = this.neishenfbObj[i].numA
+                                mid[midI].num = this.neishenfbObj[i].num
+                                mid[midI].chu = this.neishenfbObj[i].chu
+                        }
                         return {
-                                "num" :{"date": this.endDate,"number": this.neishenfbObj,"title":title},
+                                "num" :{"date": this.endDate,"number": mid,"title":title},
                                 "config":this.getMyConfig("内部质量") //返回需要的对应参数
                         }
                 },
@@ -472,13 +498,15 @@ export default {
                         
                         let title = ['NAME_','numA','num','chu']
 
-                        // for (let t = 0; t < this.bufuheObj.length; t++) {
-                        //         title.push(this.bufuheObj[t].bao_gao_lei_xing_)
-                                
-                        // }
-                        // }
+                        let mid = JSON.parse(JSON.stringify(this.allBuMen))
+                        for (let i = 0; i < this.yingjifbObj.length; i++) {
+                                let midI = mid.findIndex(v => v.NAME_ == this.yingjifbObj[i].NAME_ )
+                                mid[midI].numA = this.yingjifbObj[i].numA
+                                mid[midI].num = this.yingjifbObj[i].num
+                                mid[midI].chu = this.yingjifbObj[i].chu
+                        }
                         return {
-                                "num" :{"date": this.endDate,"number": this.yingjifbObj,"title":title},
+                                "num" :{"date": this.endDate,"number": mid,"title":title},
                                 "config":this.getMyConfig("内部质量") //返回需要的对应参数
                         }
                 },
@@ -510,14 +538,15 @@ export default {
                         
                         let title = ['NAME_','numA','num','chu']
 
-                        // for (let t = 0; t < this.bufuheObj.length; t++) {
-                        //         title.push(this.bufuheObj[t].bao_gao_lei_xing_)
-                                
-                        // }
-                        // }
-                        console.log(this.zaigangrenyuanfb,'43664564646767fghhfghg')
+                        let mid = JSON.parse(JSON.stringify(this.allBuMen))
+                        for (let i = 0; i < this.zaigangrenyuanfb.length; i++) {
+                                let midI = mid.findIndex(v => v.NAME_ == this.zaigangrenyuanfb[i].NAME_ )
+                                mid[midI].numA = this.zaigangrenyuanfb[i].numA
+                                mid[midI].num = this.zaigangrenyuanfb[i].num
+                                mid[midI].chu = this.zaigangrenyuanfb[i].chu
+                        }
                         return {
-                                "num" :{"date": this.endDate,"number": this.zaigangrenyuanfb,"title":title},
+                                "num" :{"date": this.endDate,"number": mid,"title":title},
                                 "config":this.getMyConfig("内部质量") //返回需要的对应参数
                         }
                 },
@@ -552,13 +581,15 @@ export default {
                         
                         let title = ['NAME_','numA','num','chu']
 
-                        // for (let t = 0; t < this.bufuheObj.length; t++) {
-                        //         title.push(this.bufuheObj[t].bao_gao_lei_xing_)
-                                
-                        // }
-                        // }
+                        let mid = JSON.parse(JSON.stringify(this.allBuMen))
+                        for (let i = 0; i < this.gangqianpeixunfb.length; i++) {
+                                let midI = mid.findIndex(v => v.NAME_ == this.gangqianpeixunfb[i].NAME_ )
+                                mid[midI].numA = this.gangqianpeixunfb[i].numA
+                                mid[midI].num = this.gangqianpeixunfb[i].num
+                                mid[midI].chu = this.gangqianpeixunfb[i].chu
+                        }
                         return {
-                                "num" :{"date": this.endDate,"number": this.gangqianpeixunfb,"title":title},
+                                "num" :{"date": this.endDate,"number": mid,"title":title},
                                 "config":this.getMyConfig("内部质量") //返回需要的对应参数
                         }
                 },
@@ -628,13 +659,15 @@ export default {
                         
                         let title = ['NAME_','numA','num','chu']
 
-                        // for (let t = 0; t < this.bufuheObj.length; t++) {
-                        //         title.push(this.bufuheObj[t].bao_gao_lei_xing_)
-                                
-                        // }
-                        // }
+                        let mid = JSON.parse(JSON.stringify(this.allBuMen))
+                        for (let i = 0; i < this.neibuObjfb.length; i++) {
+                                let midI = mid.findIndex(v => v.NAME_ == this.neibuObjfb[i].NAME_ )
+                                mid[midI].numA = this.neibuObjfb[i].numA
+                                mid[midI].num = this.neibuObjfb[i].num
+                                mid[midI].chu = this.neibuObjfb[i].chu
+                        }
                         return {
-                                "num" :{"date": this.endDate,"number": this.neibuObjfb,"title":title},
+                                "num" :{"date": this.endDate,"number": mid,"title":title},
                                 "config":this.getMyConfig("内部质量") //返回需要的对应参数
                         }
                 },
@@ -660,13 +693,15 @@ export default {
                         
                         let title = ['NAME_','numA','num','chu']
 
-                        // for (let t = 0; t < this.bufuheObj.length; t++) {
-                        //         title.push(this.bufuheObj[t].bao_gao_lei_xing_)
-                                
-                        // }
-                        // }
+                        let mid = JSON.parse(JSON.stringify(this.allBuMen))
+                        for (let i = 0; i < this.fengxianfbObj.length; i++) {
+                                let midI = mid.findIndex(v => v.NAME_ == this.fengxianfbObj[i].NAME_ )
+                                mid[midI].numA = this.fengxianfbObj[i].numA
+                                mid[midI].num = this.fengxianfbObj[i].num
+                                mid[midI].chu = this.fengxianfbObj[i].chu
+                        }
                         return {
-                                "num" :{"date": this.endDate,"number": this.fengxianfbObj,"title":title},
+                                "num" :{"date": this.endDate,"number": mid,"title":title},
                                 "config":this.getMyConfig("内部质量") //返回需要的对应参数
                         }
                 },
@@ -678,13 +713,15 @@ export default {
                         
                         let title = ['NAME_','numA','num','chu']
 
-                        // for (let t = 0; t < this.bufuheObj.length; t++) {
-                        //         title.push(this.bufuheObj[t].bao_gao_lei_xing_)
-                                
-                        // }
-                        // }
+                        let mid = JSON.parse(JSON.stringify(this.allBuMen))
+                        for (let i = 0; i < this.bufuheObj.length; i++) {
+                                let midI = mid.findIndex(v => v.NAME_ == this.bufuheObj[i].NAME_ )
+                                mid[midI].numA = this.bufuheObj[i].numA
+                                mid[midI].num = this.bufuheObj[i].num
+                                mid[midI].chu = this.bufuheObj[i].chu
+                        }
                         return {
-                                "num" :{"date": this.endDate,"number": this.bufuheObj,"title":title},
+                                "num" :{"date": this.endDate,"number": mid,"title":title},
                                 "config":this.getMyConfig("内部质量") //返回需要的对应参数
                         }
                 },