1071 实验室看板小数点保留一位，颜色调整，质量指标质量目标展示方式调整

src/views/statistics/components/container.vue

@@ -0,0 +1,135 @@
+<template>
+    <div :class="$style.container">
+        <template v-for="(row, rowIndex) in rowData">
+            <dv-decoration-10 style="width:100%;margin-left:0;margin-right:0;" v-if="rowIndex === 1" :key="`lineOne${rowIndex}`" />
+            <div :key="`row${rowIndex}`" :class="$style.row" :style="`width: ${row.length / 4 * 100}%;`">
+                <template v-for="(item, index) in row">
+                    <div :key="`${rowIndex * 4 + index}`" :class="$style.column" :style="`width: ${1 / row.length * 100}%;`">
+                        <div :id="`card${rowIndex * 4 + index}`" />
+                    </div>
+                    <dv-decoration-2
+                        v-if="index !== row.length - 1"
+                        :key="`line${rowIndex * 4 + index}`"
+                        :reverse="true"
+                        :dur="4 + index * 2"
+                    />
+                </template>
+            </div>
+            <dv-decoration-10 style="width:100%;margin-left:0;margin-right:0;" v-if="rowIndex === 1" :key="`lineTwo${rowIndex}`" />
+        </template>
+    </div>
+</template>
+<script>
+import echarts from 'echarts'
+import { chartOption } from './option'
+export default {
+    name: 'chart',
+    components: {},
+    props: {
+        info: {
+            type: Array,
+            default: () => []
+        },
+        fontSize: {
+            type: Number,
+            default: 18
+        }
+    },
+    data () {
+        return {
+            fSize:this.fontSize
+        }
+    },
+    computed: {
+        rowData () {
+            const data = []
+            if(this.info!==undefined){
+                for (let i = 0; i < this.info.length; i += 4) {
+                    data.push(this.info.slice(i, i + 4))
+                }
+            }
+            
+            return data
+        }
+    },
+    watch: {
+        info: {
+            handler () {
+                this.init()
+                const d = new Date()
+                const m = parseInt(d.toJSON().split('-')[1])
+            },
+            deep: true
+        }
+    },
+    created () {},
+    mounted () {
+        this.init()
+    },
+    methods: {
+        init () {
+            const d = new Date()
+            const m = parseInt(d.toJSON().split('-')[1])
+            const w = window.innerWidth
+            this.fSize = w >= 1600 ? 20 : w > 1366 && w < 1600 ? 18 : 16
+            setTimeout(() => {
+                this.info.forEach((item, index) => {
+                    const chart = echarts.init(document.getElementById(`card${index}`))
+                    const option = JSON.parse(JSON.stringify(chartOption))
+                    const xData = item.data.map((i, index) => i.month)
+                    const yData = item.data.map(i => i.location || 0)
+                    const yMax = Math.max(...yData)
+                    const yMin = Math.min(...yData)
+                    const limit = item.data.map(i => i.limit).filter(i => i !== undefined)[0]
+                    const limitValue = item.data.map(i => i.zhi_biao_xian_zhi).filter(i => i)[0]
+                 
+                    option.title.text = item.zhi_liang_zhi_bia
+                    option.title.textStyle.fontSize = this.fSize
+                    option.title.subtext = `限值${limitValue}`
+                    option.xAxis.data = xData
+                    option.yAxis.max = yMax>limit?yMax:limit
+                    option.series[0].data = yData
+                    option.series[0].markLine.data[0].yAxis = limit
+                    option.series[0].markLine.data[0].label.formatter = limit
+                    chart.setOption(option)
+                })
+            }, 100)
+        }
+    }
+}
+</script>
+<style lang="scss" module>
+    .container {
+        width: 96%;
+        height: calc(100% - 40px);
+        padding: 20px 2%;
+        .row {
+            position: relative;
+            display: flex;
+            justify-content: space-between;
+            width: 100%;
+            height: calc((100% - 70px) / 3);
+            // margin: 15px 0 15px;
+            .column {
+                width: 24%;
+                height: 100%;
+                background-color: rgba(6, 30, 93, 0.5);
+                > div {
+                    width: 100%;
+                    height: 100%;
+                }
+            }
+        }
+        :global {
+            .dv-decoration-10 {
+                width: 96%;
+                height: 5px;
+                margin: 15px 2%;
+            }
+            .dv-decoration-2 {
+                width:5px;
+                height:100%;
+            }
+        }
+    }
+</style>

src/views/statistics/components/option.js

@@ -0,0 +1,116 @@
+import echarts from 'echarts'
+
+export const chartOption = {
+    title: {
+        show: true,
+        text: '',
+        subtext: '',
+        textStyle: {
+            color: '#fff',
+            fontSize: 18,
+            fontWeight: '600'
+        },
+        subtextStyle: {
+            color: '#fff',
+            fontSize: 14,
+            fontWeight: '400',
+            align: 'center'
+        },
+        textAlign: 'center',
+        left: '50%',
+        top: '5px'
+    },
+    grid: {
+        top: '80px',
+        bottom: '30px'
+    },
+    xAxis: {
+        type: 'category',
+        data: [],
+        axisTick: {
+            alignWithLabel: true
+        },
+        axisLabel: {
+            style: {
+                fill: '#fff'
+            }
+        },
+        axisLine: {
+            lineStyle: {
+                color: '#fff'
+            }
+        }
+    },
+    yAxis: {
+        type: 'value',
+        name: '',
+        nameTextStyle: {
+            color: '#fff',
+            fontSize: 14
+        },
+        splitLine: {
+            show: false
+        },
+        axisLine: {
+            lineStyle: {
+                color: '#fff'
+            }
+        }
+    },
+    series: [{
+        type: 'line',
+        name: '',
+        data: [],
+        markLine: {
+            data: [
+                {
+                    yAxis: '',
+                    tooltip: {
+                        formatter: ''
+                    },
+                    label: {
+                        show: true, position: 'inside',
+                        color: '#83bff6',
+                        formatter: ''
+                    },
+                    lineStyle: {
+                        color: '#ff4757',
+                        type: 'dashed'
+                    }
+                }
+            ]
+        },
+        itemStyle: {
+            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                { offset: 0, color: '#83bff6' },
+                { offset: 0.5, color: '#188df0' },
+                { offset: 1, color: '#188df0' }
+            ])
+        },
+        emphasis: {
+            itemStyle: {
+                color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+                    { offset: 0, color: '#2378f7' },
+                    { offset: 0.7, color: '#2378f7' },
+                    { offset: 1, color: '#83bff6' }
+                ])
+            }
+        },
+        label: {
+            show: true,
+            position: 'top',
+            textStyle: {
+                color: '#fff',
+                fontSize: 14
+            },
+            formatter (params) {
+                return params.value ? params.value : ''
+            }
+        }
+    }],
+    tooltip: {
+        show: true,
+        trigger: 'axis',
+        formatter: '任务情况<br/>{b}：{c}<br/>占比：{d}%'
+    }
+}

src/views/statistics/index.vue

@@ -155,7 +155,7 @@
             </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==1">
+          <div class="congxiebox7" style="display:inline-block;width:98%;margin-top:2%;margin-right:1%;margin-left:1%;height:90%;" v-if="pageOT==pageAll+1">
             <div class="ttitle" style="text-align: center;">人员培训与管理</div>
             <div class="componentsData" style="height:87%" v-if="relOf">
               <s4renYuanPeiXun style="height:50%"  :width="static=='row' ? '25%': '100%'" :colorw = "colorw"
@@ -176,10 +176,10 @@
             </div>
           </div>
           <!-- <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="congxiebox7" style="display:inline-block;width:98%;margin-top:2%;margin-right:1%;margin-left:1%;height:90%;" v-if="pageOT==pageAll+2">
             <div class="ttitle" style="text-align: center;">设备维保</div>
             <div class="componentsData" style="height:87%" v-if="relOf">
-              <s7sheBeiJiaoZhun style="height:50%" :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:50%" :width="static=='row' ? '75%': '100%'" :colorw = "colorw" :direction="direction"
                 v-if="jiaoyanMGObj.length>0&&(showAll || showComponents[6])" :data = "getJiaoYanObjNumFB()"/>
@@ -192,7 +192,7 @@
                 <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==3">
+          <div class="congxiebox7" style="display:inline-block;width:98%;margin-top:2%;margin-right:1%;margin-left:1%;height:90%;" v-if="pageOT==pageAll+3">
 
             <div class="ttitle" style="text-align: center;">质量管理</div>
             <div class="componentsData" style="height:87%" v-if="relOf">
@@ -210,7 +210,7 @@
                 <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="congxiebox7" style="display:inline-block;width:98%;margin-top:2%;margin-right:1%;margin-left:1%;height:90%;" v-if="pageOT==pageAll+4">
 
             <div class="ttitle" style="text-align: center;">质量管理</div>
             <div class="componentsData" style="height:87%" v-if="relOf">
@@ -228,7 +228,7 @@
                 <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==5">
+          <div class="congxiebox7" style="display:inline-block;width:98%;margin-top:2%;margin-right:1%;margin-left:1%;height:90%;" v-if="pageOT==pageAll+5">
 
             <div class="ttitle" style="text-align: center;">质量管理</div>
             <div class="componentsData" style="height:87%" v-if="relOf">
@@ -243,7 +243,7 @@
                 <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="congxiebox7" style="display:inline-block;width:98%;margin-top:2%;margin-right:1%;margin-left:1%;height:90%;" v-if="pageOT==pageAll+6">
 
             <div class="ttitle" style="text-align: center;">质量管理</div>
             <div class="componentsData" style="height:87%" v-if="relOf">
@@ -258,20 +258,31 @@
                 <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="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"
+            <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 class="clear"></div> -->
+                 <!-- <dv-scroll-board style="height:100%;"
+                  v-if="(showAll || showComponents[24])&&tableData.data.length>0"
+                  :config="tableData"
+                />
+                <div class="nullDate" style="height:100%;" v-if="(showAll || showComponents[24])&&tableData.data.length<=0">暂无数据</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">
+          </div> -->
+          <!-- <div style="height:90%;margin-top:1%" v-for="(item,i) in zhiliangmuNeirong"  :key="i" v-show="pageOT==i+1"> -->
+          <!-- <div style="height:90%;margin-top:1%" v-show="pageOT<pageAll+1">
+            <div  style="display:inline-block;margin:1% 1%; height:100%;width:98%;" >
+              <div class="ttitle" style="text-align: center;height:3%">{{showFenZu.title}}质量指标</div>
+              <div class="componentsData" style="height:90%" v-if="relOf"> -->
+          <div style="height:90%;margin-top:1%"  v-show="pageOT<pageAll+1">
+            <div  style="display:inline-block; height:100%;width:100%;" >
+              <div class="ttitle" style="text-align: center;height:0.8%">{{showFenZu.title||''}}质量指标</div>
+              <div class="componentsData" style="height:100%" 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()" />
@@ -279,11 +290,14 @@
                   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 :id="`card${i}`" style="width:100%;height:100%" ></div> -->
                   <!-- <div class="nullDate" v-if="zhiliangmuNeirong[i].data.length<=0">暂无数据</div> -->
+
+                  <!-- <container :info="showFenZu" :font-size="fontSize" :pageI="i" /> -->
+                  <container :info="showFenZu.data" :font-size="fontSize" />
                   <div class="clear"></div>
               </div>
-              <dv-decoration-10 style="height:0.5%" v-if="i % 2 != 0 && i != zhiliangmuNeirong.length" />
+              <!-- <dv-decoration-10 style="height:0.5%" v-if="i % 2 != 0 && i != zhiliangmuNeirong.length" /> -->
             </div>
             
           </div>
@@ -349,7 +363,8 @@
   import s16bzJunZhu from './item/s16bzJunZhuCol2.vue'
   import s17bzXiBao from './item/s17bzXiBao.vue'
 
-
+  // import container from '@/views/system/jbdHome/qualityTarget/components/container.vue'
+  // import container from './components/container.vue'
   import none from './item/none.vue'
   import echarts from 'echarts'
   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'
@@ -358,6 +373,8 @@
   import * as forEach from 'lodash/forEach'
   export default {
     components:{
+      // container,
+      container: () => import('./components/container.vue'),
       headerDecoration,
       none,
       s1zhiLiang1,
@@ -446,13 +463,13 @@
       
       
     },
-    updated() {
-        //this.drawLine();
-        this.allEcharts.forEach((i) => {
-          i.resize();
-        });
+    // updated() {
+    //     //this.drawLine();
+    //     this.allEcharts.forEach((i) => {
+    //       i.resize();
+    //     });
 
-    },
+    // },
     watch: {
         zhiliangmuNeirong: {
             handler () {
@@ -465,6 +482,7 @@
     },
     data() {
       return {
+        fontSize: 18,
         direction:'y',
         height:(window.screen.height-200)+"px",
         BeginDate: '',
@@ -524,6 +542,7 @@
         pageAll:0,
         fadeinout:true,
         allBuMen:[],
+        showFenZu:[],
         tableData:{
           header: ['<span style="font-size:16px;height:53px">质量指标</span>', '<span style="font-size:16px;height:53px">百分比/数量</span>'],
           rowNum: 10,
@@ -739,6 +758,116 @@
         _arr.push( {'id_':_tmp,'data':_t});
         return _arr;
       },
+      // getzzzbNum(){
+      //   //生成月份
+      //   let that = this
+      //   let d1 = this.endDate[0];
+      //   let d2 = this.endDate[2];
+      //   let dateArry = new Array();
+      //   let s1 = d1.split("-");
+      //   let s2 = d2.split("-");
+      //   let mCount = 0;
+      //   if (parseInt(s1[0]) < parseInt(s2[0])) {
+      //       mCount = (parseInt(s2[0]) - parseInt(s1[0])) * 12 + parseInt(s2[1]) - parseInt(s1[1])+1;
+      //   } else {
+      //       mCount = parseInt(s2[1]) - parseInt(s1[1])+1;
+      //   }
+      //   if (mCount > 0) {
+      //       let startM = parseInt(s1[1]);
+      //       let startY = parseInt(s1[0]);
+      //       for (let i = 0; i < mCount; i++) {
+      //         if (startM < 12) {
+      //           dateArry[i] = startY + "-" + (startM>9 ? startM : "0" + startM);
+      //           startM += 1;
+      //         } else {
+      //           dateArry[i] = startY + "-" + (startM > 9 ? startM : "0" + startM);
+      //           startM = 1;
+      //           startY += 1;
+      //         }
+      //       }
+      //   }
+      //   //处理数据
+      //   let zjarr = []
+      //   let fenshuzu = []
+      //   let zongfz = []
+      //   fenshuzu = that.quality
+      //   for (let m = 0; m < that.quality.length; m++) {
+      //           for (let n = 0; n < that.fenzuzlmb.length; n++) {
+      //                   //console.log(that.quality.id_ == that.fenzuzlmb.id_,that.quality,that.fenzuzlmb)
+      //                   if (that.quality[m].id_ == that.fenzuzlmb[n].id_) {
+      //                           fenshuzu[m].data=that.fenzuzlmb[n].data?that.fenzuzlmb[n].data:''
+      //                           continue
+      //                   }
+      //           }
+                
+      //   }
+        
+      //   // console.log(fenshuzu,,fenshuzu[1].hasOwnProperty('data'),'55353453535345')
+      //   let title = ['name_']
+      //   for (let zn = 0; zn < fenshuzu.length; zn++) {
+      //           let zmIndex = 0 
+      //           let zlzbfz = []
+      //           //zlzbfz = zjarr
+      //           for (let j = 0; j < dateArry.length; j++) {
+      //             let rq = {}
+      //             rq.name_ = dateArry[j]
+      //             zlzbfz.push(rq)
+      //             // console.log(zlzbfz,dateArry[j],'erw232222222222222222222222222224586')
+      //           }
+      //           for (let i = 0; i < zlzbfz.length; i++) {
+      //                   if(fenshuzu[zn].data&&fenshuzu[zn].data.length>0){
+      //                           for (let j = 0; j < fenshuzu[zn].data.length; j++) {
+      //                                   if(zlzbfz[i].name_ == fenshuzu[zn].data[j].bzsj){
+      //                                           let prop = fenshuzu[zn].data[j].zhi_liang_zhi_bia;
+      //                                           zlzbfz[i][prop] = fenshuzu[zn].data[j].location
+      //                                           // console.log(zlzbfz,'zlzbfzzlzbfz')
+      //                                           zmIndex=1
+      //                                   }
+      //                                   continue
+      //                           }
+                                
+      //                   }
+      //                   continue
+      //           }
+      //           // console.log(zlzbfz,'ghshhhsuihihuisoio878788787878778')
+      //           if(zmIndex == 1){
+      //             zongfz.push({'id':fenshuzu[zn].id_,'name':fenshuzu[zn].name_,'data':zlzbfz})
+      //           }else{
+      //             //zongfz.push({'id':fenshuzu[zn].id_,'name':fenshuzu[zn].name_,'data':[]})
+
+      //           }
+                                
+      //   }
+      //   for (let t = 0; t < this.zhiliangzhibiaotitle.length; t++) {
+      //           title.push(this.zhiliangzhibiaotitle[t].zhi_liang_zhi_bia)
+                                
+      //   }
+      //   let zbval = []
+      //   for (let t = 0; t < this.zhiliangzhibiaotitle.length; t++) {
+      //           zbval.push(parseFloat(this.zhiliangzhibiaotitle[t].zhi_biao_xian_zhi.match(/(\d+(\.\d+)?)/)))
+                                
+      //   }
+      //   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(()=>{
+      //       // 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
+      //       }
+      //     },4000)
+      //   }
+        
+        
+      // },
       getzzzbNum(){
         //生成月份
         let that = this
@@ -782,205 +911,261 @@
                 }
                 
         }
+        fenshuzu.forEach((item,i)=>{
+          if(item.hasOwnProperty('data')){
+            item.data = this.dateFenZu(item.data,'zhi_liang_zhi_bia')
+          }
+        })
+        fenshuzu.forEach((item,i)=>{
+          if(item.hasOwnProperty('data')){
+            item.data.forEach((it,t)=>{
+              it.data = this.dateFenZu(it.data,'bzsj')
+            })
+          }
+        })
         
-        // console.log(fenshuzu,,fenshuzu[1].hasOwnProperty('data'),'55353453535345')
+        
+        
+        // console.log(fenshuzu,that.fenzuzlmb,'55353453535345')
         let title = ['name_']
-        for (let zn = 0; zn < fenshuzu.length; zn++) {
-                let zmIndex = 0 
-                let zlzbfz = []
-                //zlzbfz = zjarr
-                for (let j = 0; j < dateArry.length; j++) {
-                  let rq = {}
-                  rq.name_ = dateArry[j]
-                  zlzbfz.push(rq)
-                  // console.log(zlzbfz,dateArry[j],'erw232222222222222222222222222224586')
-                }
-                for (let i = 0; i < zlzbfz.length; i++) {
-                        if(fenshuzu[zn].data&&fenshuzu[zn].data.length>0){
-                                for (let j = 0; j < fenshuzu[zn].data.length; j++) {
-                                        if(zlzbfz[i].name_ == fenshuzu[zn].data[j].bzsj){
-                                                let prop = fenshuzu[zn].data[j].zhi_liang_zhi_bia;
-                                                zlzbfz[i][prop] = fenshuzu[zn].data[j].location
-                                                // console.log(zlzbfz,'zlzbfzzlzbfz')
-                                                zmIndex=1
-                                        }
-                                        continue
-                                }
-                                
-                        }
-                        continue
-                }
-                // console.log(zlzbfz,'ghshhhsuihihuisoio878788787878778')
-                if(zmIndex == 1){
-                  zongfz.push({'id':fenshuzu[zn].id_,'name':fenshuzu[zn].name_,'data':zlzbfz})
-                }else{
-                  //zongfz.push({'id':fenshuzu[zn].id_,'name':fenshuzu[zn].name_,'data':[]})
-
-                }
-                                
-        }
-        for (let t = 0; t < this.zhiliangzhibiaotitle.length; t++) {
-                title.push(this.zhiliangzhibiaotitle[t].zhi_liang_zhi_bia)
-                                
-        }
-        let zbval = []
-        for (let t = 0; t < this.zhiliangzhibiaotitle.length; t++) {
-                zbval.push(parseFloat(this.zhiliangzhibiaotitle[t].zhi_biao_xian_zhi.match(/(\d+(\.\d+)?)/)))
-                                
-        }
-        this.zhiliangmuTitle = title
+      
+        fenshuzu.forEach((item,i)=>{
+          let zmIndex = 0 
+          let zlzbfz = []
+          //zlzbfz = zjarr
+          for (let j = 0; j < dateArry.length; j++) {
+            let rq = {}
+            rq.bzsj = dateArry[j]
+            rq.month = new Date(dateArry[j]).getMonth()+1
+            zlzbfz.push(rq)
+          }       
+          if(item.hasOwnProperty('data')){
+            item.data.forEach((it,t)=>{
+              it.data.forEach((element,e) => {
+                let rqMid = [...zlzbfz]
+                rqMid.forEach((el,l) => {
+                  if(element.bzsj==rqMid[l].bzsj){
+                    element.data[0].limit = parseFloat(element.data[0].zhi_biao_xian_zhi.match(/(\d+(\.\d+)?)/))
+                    element.data[0].month = new Date(element.bzsj).getMonth()+1
+                    rqMid[l]  = {...element.data[0]}
+                  }
+                });
+                it.data = rqMid
+              });
+            })
+          }
+        })
+        // console.log(fenshuzu,'2344334')
+        fenshuzu.forEach((element,e) => {
+          let F = 0;
+          if(element.hasOwnProperty('data')){
+            for (F = 0;F < element.data.length;) {
+              zongfz.push({'id_':element.id_,'name_':element.name_,'data':element.data.slice(F,F += 12)})
+            }
+          }
+        });
+        // console.log(zongfz,'3454568')
         this.zhiliangmuNeirong = zongfz
-        // console.log(this.zhiliangmuNeirong.length,this.zhiliangmuNeirong,'fgdfgdafffffffffffff5426666')
-        this.zhiliangxianzhi = zbval
+        // console.log(this.zhiliangmuNeirong.length,this.zhiliangmuNeirong[1],'fgdfgdafffffffffffff5426666')
+        // this.zhiliangxianzhi = zbval
         this.pageAll = this.zhiliangmuNeirong.length 
-        this.drawLine()
+        // console.log(this.pageAll,'this.pageAll')
+        // this.drawLine()
+
+        this.showFenZu.title = this.zhiliangmuNeirong[0] !== undefined?this.zhiliangmuNeirong[0].name_:""
+        this.showFenZu.data = this.zhiliangmuNeirong[0] !== undefined?this.zhiliangmuNeirong[0].data:[]
+
+        // console.log(this.showFenZu,'678687678bjhjhjhk')
+
         clearInterval(this.timer1);
         if(this.rollup == true){
           this.fadeinout = false
           this.timer1 = setInterval(()=>{
             // console.log(Math.ceil(this.pageAll/2)+6,this.pageAll)
-            if(this.pageOT>=Math.ceil(this.pageAll/2)+7){
+            if(this.pageOT>=this.pageAll+6){
               this.pageOT=1
+
+              this.showFenZu.title = this.zhiliangmuNeirong[0] !== undefined?this.zhiliangmuNeirong[0].name_:""
+              this.showFenZu.data = this.zhiliangmuNeirong[0] !== undefined?this.zhiliangmuNeirong[0].data:[]
             }else{
               this.pageOT = this.pageOT + 1
+              if(this.pageOT<this.pageAll){
+                // console.log(this.pageOT,this.pageOT-1,'uiououoiu')
+
+                this.showFenZu.title = this.zhiliangmuNeirong[this.pageOT-1] !== undefined?this.zhiliangmuNeirong[this.pageOT-1].name_:""
+                this.showFenZu.data = this.zhiliangmuNeirong[this.pageOT-1] !== undefined?this.zhiliangmuNeirong[this.pageOT-1].data:[]
+                
+              }
             }
           },4000)
         }
         
         
       },
-      drawLine(){
-        setTimeout(() => {
-          this.zhiliangmuNeirong.forEach((item, index) => {
-            let xunhuanzzzb = echarts.init(document.getElementById(`card${index}`))
-            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({
-                type: 'bar',
-                itemStyle: {color: barColor[i]},
-                label:{
-                  normal:{
-                    show:true,
-                    position:'top',
-                            
-                    textStyle:{
-                      fontSize:12,
-                      color:'#B0CEFC'
-                    }
-                  }
-                },
-                markLine: {
-                  symbol: ['none', 'none'], // 去掉箭头
-                  // label: {
-                  //   show: false,
-                  //   position: 'start',
-                  //   formatter: '{b}'
-                  // },
-                  data: [
-                    {
-                      name: '阈值',
-                      yAxis: this.zhiliangxianzhi[i]*1
-                    }
-                  ],
-                  lineStyle: {
-                    color: barColor[i]
+      dateFenZu ( arr,field ){
+          let originalArr = arr
+          let tempArr = []
+          let resultData = []
+          for ( let i = 0; i < originalArr.length; i++ )
+          {
+              if ( tempArr.indexOf( originalArr[ i ][ field ] ) === -1 )
+              {
+                  resultData.push( {
+                      [ field ]: originalArr[ i ][ field ],
+                      data: [ originalArr[ i ] ]
+                  } )
+                  tempArr.push( originalArr[ i ][ field ] )
+              } else
+              {
+                  for ( let j = 0; j < resultData.length; j++ )
+                  {
+                      if ( resultData[ j ][ field ] == originalArr[ i ][ field ] )
+                      {
+                          resultData[ j ].data.push( originalArr[ i ] )
+                          break
+                      }
                   }
-                } 
+              }
+          }
+          return resultData // 最终输出
+      },
+      // SplitArray(N,Q){
+      //     let R = [],F;
+      //     for (F = 0;F < Q.length;) R.push(Q.slice(F,F += N))
+      //     return R
+      // }
+      // drawLine(){
+      //   setTimeout(() => {
+      //     this.zhiliangmuNeirong.forEach((item, index) => {
+      //       let xunhuanzzzb = echarts.init(document.getElementById(`card${index}`))
+      //       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({
+      //           type: 'bar',
+      //           itemStyle: {color: barColor[i]},
+      //           label:{
+      //             normal:{
+      //               show:true,
+      //               position:'top',
+                            
+      //               textStyle:{
+      //                 fontSize:12,
+      //                 color:'#B0CEFC'
+      //               }
+      //             }
+      //           },
+      //           markLine: {
+      //             symbol: ['none', 'none'], // 去掉箭头
+      //             // label: {
+      //             //   show: false,
+      //             //   position: 'start',
+      //             //   formatter: '{b}'
+      //             // },
+      //             data: [
+      //               {
+      //                 name: '阈值',
+      //                 yAxis: this.zhiliangxianzhi[i]*1
+      //               }
+      //             ],
+      //             lineStyle: {
+      //               color: barColor[i]
+      //             }
+      //           } 
     
-              })
+      //         })
               
-            } 
-            let option = {
-              //v3
-              title: {
-                textStyle:{ fontSize:12,color: this.colorw }
-              },
-              legend: {
-                textStyle: {
-                  fontSize: 8,
-                  color: '#B0CEFC'  // 图例文字颜色
-                }
+      //       } 
+      //       let option = {
+      //         //v3
+      //         title: {
+      //           textStyle:{ fontSize:12,color: this.colorw }
+      //         },
+      //         legend: {
+      //           textStyle: {
+      //             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%',
-                    right: '4%',
-                    bottom: '5%',
-                    containLabel: true
-              },
-              xAxis: { 
-                splitLine:{show: false},
-                type: 'category',
-                axisLabel: {
-                  show: true,
-                  textStyle: {
-                    color: '#fff'   //这里用参数代替了
-                  }
-                },
-                axisLine:{
-                  lineStyle:{
-                    color:'#fff',
-                    width:1, //x轴线的宽度
-                  }
-                }
-              },
-              yAxis: {
-                splitLine:{show: false},
-                axisLabel: {
-                  show: true,
-                  textStyle: {
-                    color: '#fff'    //这里用参数代替了
-                  }
-                },
-                axisLine:{
-                  lineStyle:{
-                    color:'#fff',
-                    width:1, //x轴线的宽度
-                  }
-                }
-              },
-              dataset: {
-                dimensions: this.zhiliangmuTitle,
-                source: this.zhiliangmuNeirong[index].data
-              },
-              series: barNum,
-              dataZoom: [
-                {
-                    id: 'dataZoomY',
-                    type: 'inside',
-                    yAxisIndex: [0],
-                    filterMode: 'empty'
-                }
-              ],
+      //         },
+      //         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%',
+      //               right: '4%',
+      //               bottom: '5%',
+      //               containLabel: true
+      //         },
+      //         xAxis: { 
+      //           splitLine:{show: false},
+      //           type: 'category',
+      //           axisLabel: {
+      //             show: true,
+      //             textStyle: {
+      //               color: '#fff'   //这里用参数代替了
+      //             }
+      //           },
+      //           axisLine:{
+      //             lineStyle:{
+      //               color:'#fff',
+      //               width:1, //x轴线的宽度
+      //             }
+      //           }
+      //         },
+      //         yAxis: {
+      //           splitLine:{show: false},
+      //           axisLabel: {
+      //             show: true,
+      //             textStyle: {
+      //               color: '#fff'    //这里用参数代替了
+      //             }
+      //           },
+      //           axisLine:{
+      //             lineStyle:{
+      //               color:'#fff',
+      //               width:1, //x轴线的宽度
+      //             }
+      //           }
+      //         },
+      //         dataset: {
+      //           dimensions: this.zhiliangmuTitle,
+      //           source: this.zhiliangmuNeirong[index].data
+      //         },
+      //         series: barNum,
+      //         dataZoom: [
+      //           {
+      //               id: 'dataZoomY',
+      //               type: 'inside',
+      //               yAxisIndex: [0],
+      //               filterMode: 'empty'
+      //           }
+      //         ],
           
-            };
+      //       };
             
-            this.allEcharts.push(xunhuanzzzb)
-            option && xunhuanzzzb.setOption(option);
-          })
-        }, 0)
-      },
+      //       this.allEcharts.push(xunhuanzzzb)
+      //       option && xunhuanzzzb.setOption(option);
+      //     })
+      //   }, 0)
+      // },
       allView(){
         screenfull.request() //默认显示全屏
       },
@@ -992,10 +1177,16 @@
       rollcontinue(){
         this.fadeinout = false
         this.timer1 = setInterval(()=>{
-          if(this.pageOT>=Math.ceil(this.pageAll/2)+7){
+          if(this.pageOT>=this.pageAll+6){
             this.pageOT=1
+
+            this.showFenZu.title = this.zhiliangmuNeirong[0] !== undefined?this.zhiliangmuNeirong[0].name_:""
+            this.showFenZu.data = this.zhiliangmuNeirong[0] !== undefined?this.zhiliangmuNeirong[0].data:[]
           }else{
             this.pageOT = this.pageOT + 1
+
+            this.showFenZu.title = this.zhiliangmuNeirong[this.pageOT-1] !== undefined?this.zhiliangmuNeirong[this.pageOT-1].name_:""
+            this.showFenZu.data = this.zhiliangmuNeirong[this.pageOT-1] !== undefined?this.zhiliangmuNeirong[this.pageOT-1].data:[]
           }
         },4000)
         this.rollup=true

src/views/statistics/item/s10waiBuNengLi.vue

@@ -101,7 +101,8 @@
           tooltip: {
             trigger: 'item'
           },
-          color:['#6600ff','#cc33cc'],
+          color:['#66CC00','#CC0000'],
+          // color:['#6600ff','#cc33cc'],
           series: [
             {
               type: 'pie',

src/views/statistics/item/s10waiBuNengLiCol.vue

@@ -74,7 +74,7 @@
         let s10waiBuNengLicol = echarts.init(document.getElementById(this.id))
         let option;
         let that = this
-        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 barColor = ['#00CCFF','#33FF00','#FF0000','#FFBF00','#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-3){

src/views/statistics/item/s12fengXian.vue

@@ -91,7 +91,8 @@
           tooltip: {
             trigger: 'item'
           },
-          color:['#99CCFF','#33FF33'],
+          color:['#66CC00','#CC0000'],
+          // color:['#99CCFF','#33FF33'],
           series: [
             {
               type: 'pie',

src/views/statistics/item/s12fengXianCol.vue

@@ -78,7 +78,7 @@
         let s12fengXiancol = echarts.init(document.getElementById(this.id))
         let option;
         let that = this
-        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 barColor = ['#00CCFF','#33FF00','#FF0000','#FFBF00','#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-3){

src/views/statistics/item/s14bufuhexiangCol.vue

@@ -78,7 +78,7 @@
         let s14bufuhexiang = echarts.init(document.getElementById(this.id))
         let option;
         let that = this
-        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 barColor = ['#00CCFF','#33FF00','#FF0000','#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-3){

src/views/statistics/item/s15tousu.vue

@@ -100,7 +100,8 @@
           tooltip: {
             trigger: 'item'
           },
-          color:['#00ccff','#cc3333'],
+          color:['#66CC00','#CC0000'],
+          // color:['#00ccff','#cc3333'],
           series: [
             {
               type: 'pie',

src/views/statistics/item/s15tousuCol.vue

@@ -78,7 +78,7 @@
         let s15tousucol = echarts.init(document.getElementById(this.id))
         let option;
         let that = this
-        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 barColor = ['#00CCFF','#33FF00','#FF0000','#FFBF00','#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-3){

src/views/statistics/item/s16bzJunZhuCol2.vue

@@ -74,7 +74,7 @@
         let s16bzJunZhu = echarts.init(document.getElementById(this.id))
         let option;
         let that = this
-        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 barColor = ['#00CCFF','#33FF00','#FF0000','#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-3){

src/views/statistics/item/s1zhiLiangMuBiao.vue

@@ -100,7 +100,8 @@
           tooltip: {
             trigger: 'item'
           },
-          color:['#ffcc00','#66cc66','#999999'],
+          color:['#66CC00','#CC0000'],
+          // color:['#ffcc00','#66cc66','#999999'],
           series: [
             {
               type: 'pie',

src/views/statistics/item/s1zhiLiangMuBiaoCol.vue

@@ -76,7 +76,7 @@
         let s5zhiLiangMuBiaocol = echarts.init(document.getElementById(this.id))
         let option;
         let that = this
-        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 barColor = ['#00CCFF','#33FF00','#FF0000','#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-3){

src/views/statistics/item/s2manYiDu.vue

@@ -112,7 +112,8 @@
           tooltip: {
             trigger: 'item'
           },
-          color:['#009933','#99FF66'],
+          color:['#66CC00','#CC0000'],
+          // color:['#009933','#99FF66'],
           series: [
             {
               type: 'pie',

src/views/statistics/item/s2manYiDuPro.vue

@@ -76,7 +76,7 @@
         let s2manYiDucol = echarts.init(document.getElementById(this.id))
         let that = this
         let option;
-        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 barColor = ['#00CCFF','#33FF00','#FF0000','#FFBF00','#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-3){

src/views/statistics/item/s4renYuanPeiXun.vue

@@ -85,7 +85,8 @@
           tooltip: {
             trigger: 'item'
           },
-          color:['#CC9999','#CCFF66'],
+          color:['#66CC00','#CC0000'],
+          // color:['#CC9999','#CCFF66'],
           series: [
             {
               type: 'pie',

src/views/statistics/item/s4renYuanPeiXunCol.vue

@@ -75,7 +75,7 @@
         let s4renYuanPeiXunfb = echarts.init(document.getElementById(this.id))
         let that = this
         let option;
-        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 barColor = ['#00CCFF','#33FF00','#FF0000','#FFBF00','#097969','#FF66CC','#EC5800','#AAFF00','#880808','#B87333','#FF4433','	#9F2B68','#C9A9A6','#C3B1E1','#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-3){

src/views/statistics/item/s5renYuanJianDu.vue

@@ -84,7 +84,8 @@
           tooltip: {
             trigger: 'item'
           },
-          color:['#cccc00','#FF33FF'],
+          color:['#66CC00','#CC0000'],
+          // color:['#cccc00','#FF33FF'],
           series: [
             {
               type: 'pie',

src/views/statistics/item/s5renYuanJianDuCol.vue

@@ -75,7 +75,7 @@
         let s5renYuanJianDucol = echarts.init(document.getElementById(this.id))
         let that = this
         let option;
-        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 barColor = ['#00CCFF','#33FF00','#FF0000','#FFBF00','#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-3){

src/views/statistics/item/s7sheBeiJiaoZhun.vue

@@ -106,7 +106,8 @@
           tooltip: {
             trigger: 'item'
           },
-          color:['#9999ff','#cccc00'],
+          color:['#66CC00','#CC0000'],
+          // color:['#9999ff','#cccc00'],
           series: [
             {
               type: 'pie',

src/views/statistics/item/s7sheBeiJiaoZhunCol.vue

@@ -75,7 +75,7 @@
         let s7sheBeiJiaoZhuncol = echarts.init(document.getElementById(this.id))
         let that = this
         let option;
-        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 barColor = ['#00CCFF','#33FF00','#FF0000','#FFBF00','#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-3){

src/views/statistics/item/s8sheBeiHeCha.vue

@@ -99,7 +99,8 @@
           tooltip: {
             trigger: 'item'
           },
-          color:['#33cc33','#cc33cc'],
+          color:['#66CC00','#CC0000'],
+          // color:['#33cc33','#cc33cc'],
           series: [
             {
               type: 'pie',

src/views/statistics/item/s8sheBeiHeChaCol.vue

@@ -74,7 +74,7 @@
         let s8sheBeiHeChacol = echarts.init(document.getElementById(this.id))
         let option;
         let that = this
-        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 barColor = ['#00CCFF','#33FF00','#FF0000','#FFBF00','#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-3){

src/views/statistics/item/s9neiBuZhiLiang.vue

@@ -90,7 +90,8 @@
           tooltip: {
             trigger: 'item'
           },
-          color:['#0099ff','#ffcccc'],
+          color:['#66CC00','#CC0000'],
+          // color:['#0099ff','#ffcccc'],
           series: [
             {
               type: 'pie',

src/views/statistics/item/s9neiBuZhiLiangCol.vue

@@ -78,7 +78,7 @@
         let s9neibucol = echarts.init(document.getElementById(this.id))
         let option;
         let that = this
-        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 barColor = ['#00CCFF','#33FF00','#FF0000','#FFBF00','#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-3){

src/views/statistics/sendDatas.js

@@ -45,7 +45,7 @@ export default {
                         if (ryywpxjNum[0].num===0) {
                                 e =0
                          } else {
-                                e =Math.floor(ryywpxjNum[1].num/ryywpxjNum[0].num * 10000) / 100
+                                e =Math.floor(ryywpxjNum[1].num/ryywpxjNum[0].num * 1000) / 10
                         }
                         barData.push(e)
                         return {
@@ -67,7 +67,7 @@ export default {
                                 mid[midI].numA = this.jiaoyanMGObj[i].numA
                                 mid[midI].num = this.jiaoyanMGObj[i].num
                                 mid[midI].wnum = this.jiaoyanMGObj[i].numA-this.jiaoyanMGObj[i].num
-                                mid[midI].chu = this.jiaoyanMGObj[i].chu
+                                mid[midI].chu = Math.floor(this.jiaoyanMGObj[i].chu*10)/10
                         }
                         return {
                                 "num" :{"date": this.endDate,"number": mid,"title":title},
@@ -81,7 +81,7 @@ export default {
                         if (ryywpxjNum[0].num===0) {
                                 e =0
                          } else {
-                                e =Math.floor(ryywpxjNum[1].num/ryywpxjNum[0].num * 10000) / 100
+                                e =Math.floor(ryywpxjNum[1].num/ryywpxjNum[0].num * 1000) / 10
                         }
                         barData.push(e)
                         return {
@@ -103,7 +103,7 @@ export default {
                                 mid[midI].numA = this.hechaMGObj[i].numA
                                 mid[midI].num = this.hechaMGObj[i].num
                                 mid[midI].wnum = this.hechaMGObj[i].numA-this.hechaMGObj[i].num
-                                mid[midI].chu = this.hechaMGObj[i].chu
+                                mid[midI].chu = Math.floor(this.hechaMGObj[i].chu*10)/10
                         }
                         return {
                                 "num" :{"date": this.endDate,"number": mid,"title":title},
@@ -117,7 +117,7 @@ export default {
                         if (ryywpxjNum[0].num===0) {
                                 e =0
                          } else {
-                                e =Math.floor(ryywpxjNum[1].num/ryywpxjNum[0].num * 10000) / 100
+                                e =Math.floor(ryywpxjNum[1].num/ryywpxjNum[0].num * 1000) / 10
                         }
                         barData.push(e)
                         return {
@@ -139,7 +139,7 @@ export default {
                                 mid[midI].numA = this.waibuObjfb[i].numA
                                 mid[midI].num = this.waibuObjfb[i].num
                                 mid[midI].wnum = this.waibuObjfb[i].numA-this.waibuObjfb[i].num
-                                mid[midI].chu = this.waibuObjfb[i].chu
+                                mid[midI].chu = Math.floor(this.waibuObjfb[i].chu*10)/10
                         }
                         return {
                                 "num" :{"date": this.endDate,"number": mid,"title":title},
@@ -285,7 +285,7 @@ export default {
                                 mid[midI].numA = this.gaijinxiangObj[i].numA
                                 mid[midI].num = this.gaijinxiangObj[i].num
                                 mid[midI].wnum = this.gaijinxiangObj[i].numA-this.gaijinxiangObj[i].num
-                                mid[midI].chu = this.gaijinxiangObj[i].chu
+                                mid[midI].chu = Math.floor(this.gaijinxiangObj[i].chu*10)/10
                         }
                         return {
                                 "num" :{"date": this.endDate,"number": mid,"title":title},
@@ -339,7 +339,7 @@ export default {
                         if(b===0){
                                 c=0
                         }else{
-                                c= Math.floor(b/a * 10000) / 100
+                                c= Math.floor(b/a * 1000) / 10
                         }
                         return {
                                 "Num" :{"date": this.endDate,"number": val, "name": name, "numberAll": valAll,"valnum":a,"valAll":b,"valna":c},
@@ -362,7 +362,7 @@ export default {
                         if (ryywpxjNum[0].num===0) {
                                 e =0
                          } else {
-                                e =Math.floor(ryywpxjNum[1].num/ryywpxjNum[0].num * 10000) / 100
+                                e =Math.floor(ryywpxjNum[1].num/ryywpxjNum[0].num * 1000) / 10
                         }
                         barData.push(e)
                         return {
@@ -384,7 +384,7 @@ export default {
                                 mid[midI].numA = this.guanshenfbObj[i].numA
                                 mid[midI].num = this.guanshenfbObj[i].num
                                 mid[midI].wnum = this.guanshenfbObj[i].numA-this.guanshenfbObj[i].num
-                                mid[midI].chu = this.guanshenfbObj[i].chu
+                                mid[midI].chu = Math.floor(this.guanshenfbObj[i].chu*10)/10
                         }
                         return {
                                 "num" :{"date": this.endDate,"number": mid,"title":title},
@@ -418,7 +418,7 @@ export default {
                                 if (mjjcbgSNum[0]===0) {
                                         e =0
                                 } else {
-                                        e =Math.floor(mjjcbgNum[0]/mjjcbgSNum[0] * 10000) / 100
+                                        e =Math.floor(mjjcbgNum[0]/mjjcbgSNum[0] * 1000) / 10
                                 }
                                 barData.push(e)
                         // }
@@ -436,7 +436,7 @@ export default {
                         if (ryywpxjNum[0].num===0) {
                                 e =0
                          } else {
-                                e =Math.floor(ryywpxjNum[1].num/ryywpxjNum[0].num * 10000) / 100
+                                e =Math.floor(ryywpxjNum[1].num/ryywpxjNum[0].num * 1000) / 10
                         }
                         barData.push(e)
                         return {
@@ -472,7 +472,7 @@ export default {
                                 mid[midI].numA = this.neishenfbObj[i].numA
                                 mid[midI].num = this.neishenfbObj[i].num
                                 mid[midI].wnum = this.neishenfbObj[i].numA-this.neishenfbObj[i].num
-                                mid[midI].chu = this.neishenfbObj[i].chu
+                                mid[midI].chu = Math.floor(this.neishenfbObj[i].chu*10)/10
                         }
                         return {
                                 "num" :{"date": this.endDate,"number": mid,"title":title},
@@ -486,7 +486,7 @@ export default {
                         if (ryywpxjNum[0].num===0) {
                                 e =0
                          } else {
-                                e =Math.floor(ryywpxjNum[1].num/ryywpxjNum[0].num * 10000) / 100
+                                e =Math.floor(ryywpxjNum[1].num/ryywpxjNum[0].num * 1000) / 10
                         }
                         barData.push(e)
                         
@@ -510,7 +510,7 @@ export default {
                                 mid[midI].numA = this.yingjifbObj[i].numA
                                 mid[midI].num = this.yingjifbObj[i].num
                                 mid[midI].wnum = this.yingjifbObj[i].numA-this.yingjifbObj[i].num
-                                mid[midI].chu = this.yingjifbObj[i].chu
+                                mid[midI].chu = Math.floor(this.yingjifbObj[i].chu*10)/10
                         }
                         return {
                                 "num" :{"date": this.endDate,"number": mid,"title":title},
@@ -524,7 +524,7 @@ export default {
                         if (ryywpxjNum[0].num===0) {
                                 e =0
                          } else {
-                                e =Math.floor(ryywpxjNum[1].num/ryywpxjNum[0].num * 10000) / 100
+                                e =Math.floor(ryywpxjNum[1].num/ryywpxjNum[0].num * 1000) / 10
                         }
                         barData.push(e)
                         
@@ -551,7 +551,7 @@ export default {
                                 mid[midI].numA = this.zaigangrenyuanfb[i].numA
                                 mid[midI].num = this.zaigangrenyuanfb[i].num
                                 mid[midI].wnum = this.zaigangrenyuanfb[i].numA-this.zaigangrenyuanfb[i].num
-                                mid[midI].chu = this.zaigangrenyuanfb[i].chu
+                                mid[midI].chu = Math.floor(this.zaigangrenyuanfb[i].chu*10)/10
                         }
                         return {
                                 "num" :{"date": this.endDate,"number": mid,"title":title},
@@ -567,7 +567,7 @@ export default {
                                 if (zljdNum[0].num===0) {
                                         e =0
                                 } else {
-                                        e =Math.floor(zljdNum[1].num/zljdNum[0].num * 10000) / 100
+                                        e =Math.floor(zljdNum[1].num/zljdNum[0].num * 1000) / 10
                                 }
                                 barData.push(e)
                         // }
@@ -595,7 +595,7 @@ export default {
                                 mid[midI].numA = this.gangqianpeixunfb[i].numA
                                 mid[midI].num = this.gangqianpeixunfb[i].num
                                 mid[midI].wnum = this.gangqianpeixunfb[i].numA-this.gangqianpeixunfb[i].num
-                                mid[midI].chu = this.gangqianpeixunfb[i].chu
+                                mid[midI].chu = Math.floor(this.gangqianpeixunfb[i].chu*10)/10
                         }
                         return {
                                 "num" :{"date": this.endDate,"number": mid,"title":title},
@@ -652,7 +652,7 @@ export default {
                         if (ryywpxjNum[0].num===0) {
                                 e =0
                          } else {
-                                e =Math.floor(ryywpxjNum[1].num/ryywpxjNum[0].num * 10000) / 100
+                                e =Math.floor(ryywpxjNum[1].num/ryywpxjNum[0].num * 1000) / 10
                         }
                         barData.push(e)
                         return {
@@ -674,7 +674,7 @@ export default {
                                 mid[midI].numA = this.neibuObjfb[i].numA
                                 mid[midI].num = this.neibuObjfb[i].num
                                 mid[midI].wnum = this.neibuObjfb[i].numA-this.neibuObjfb[i].num
-                                mid[midI].chu = this.neibuObjfb[i].chu
+                                mid[midI].chu = Math.floor(this.neibuObjfb[i].chu*10)/10
                         }
                         return {
                                 "num" :{"date": this.endDate,"number": mid,"title":title},
@@ -688,7 +688,7 @@ export default {
                         if (ryywpxjNum[0].num===0) {
                                 e =0
                          } else {
-                                e =Math.floor(ryywpxjNum[1].num/ryywpxjNum[0].num * 10000) / 100
+                                e =Math.floor(ryywpxjNum[1].num/ryywpxjNum[0].num * 1000) / 10
                         }
                         return {
                                 "t_mjsyshdfxsbykzjhxbNum" :{"date": this.endDate,"number": ryywpxjNum[1].num, "numberAll": ryywpxjNum[0].num, "res": barData,"val": e},
@@ -709,7 +709,7 @@ export default {
                                 mid[midI].numA = this.fengxianfbObj[i].numA
                                 mid[midI].num = this.fengxianfbObj[i].num
                                 mid[midI].wnum = this.fengxianfbObj[i].numA-this.fengxianfbObj[i].num
-                                mid[midI].chu = this.fengxianfbObj[i].chu
+                                mid[midI].chu = Math.floor(this.fengxianfbObj[i].chu*10)/10
                         }
                         return {
                                 "num" :{"date": this.endDate,"number": mid,"title":title},
@@ -730,7 +730,7 @@ export default {
                                 mid[midI].numA = this.bufuheObj[i].numA
                                 mid[midI].num = this.bufuheObj[i].num
                                 mid[midI].wnum = this.bufuheObj[i].numA-this.bufuheObj[i].num
-                                mid[midI].chu = this.bufuheObj[i].chu
+                                mid[midI].chu = Math.floor(this.bufuheObj[i].chu*10)/10
                         }
                         return {
                                 "num" :{"date": this.endDate,"number": mid,"title":title},