实验室管理看板修改

src/views/business/labManagement/components/barChart.vue

@@ -216,7 +216,7 @@ export default {
           }
         },
         grid: {
-          top: '15%',
+          top: '20%',
           left: '3%',
           right: '4%',
           bottom: '5%',

src/views/statistics/index.vue

@@ -1,12 +1,13 @@
 <template>
   <dv-full-screen-container>
-    <div class="screen" ref="scrollDiv">
+    <div
+      class="screen"
+      v-on:mouseenter="rollstop"
+      v-on:mouseleave="rollcontinue"
+      ref="scrollDiv"
+    >
       <!-- :style="{height:height}" -->
-      <div
-        class="statistics"
-        v-on:mouseenter="rollstop"
-        v-on:mouseleave="rollcontinue"
-      >
+      <div class="statistics">
         <div
           class="editDate"
           style="
@@ -88,38 +89,38 @@
                 v-model="NowTime1"
                 type="month"
                 @change="changeTime1"
-                format="yyyy-MM" 
+                format="yyyy-MM"
                 value-format="yyyy-MM"
                 placeholder="请选择时间">
               </el-date-picker> -->
           </div>
 
           <!-- <div class="block">
-              
+
             </div> -->
 
           <!-- <div class="goBackButton" @click.prevent="goBack()" >
               返回
             </div> -->
-          <!-- <div 
-              @click.prevent="rollstop()" 
+          <!-- <div
+              @click.prevent="rollstop()"
               style="width: 8%;
               height:2.825rem;
               line-height: 2.825rem;
               text-align:center;
               float: right;
-              margin: -3% 17.1% 0 0;" 
+              margin: -3% 17.1% 0 0;"
               v-if="rollup">
               <dv-border-box-8>暂停</dv-border-box-8>
             </div>
-            <div 
-              @click.prevent="rollcontinue()" 
+            <div
+              @click.prevent="rollcontinue()"
               style="width: 8%;
               height:2.825rem;
               line-height: 2.825rem;
               text-align:center;
               float: right;
-              margin: -3% 17.1% 0 0;" 
+              margin: -3% 17.1% 0 0;"
               v-else>
               <dv-border-box-8>继续</dv-border-box-8>
             </div> -->
@@ -137,9 +138,24 @@
           >
             <dv-border-box-8 class="shiyankanbanfanhui">返回</dv-border-box-8>
           </div>
+          <div class="pnButton">
+            <el-button
+              icon="el-icon-arrow-left"
+              class="preNextButton"
+              circle
+              @click.native="skipTo('pre')"
+            ></el-button>
+            <div class="textContent">{{ pageOT }}</div>
+            <el-button
+              icon="el-icon-arrow-right"
+              class="preNextButton"
+              circle
+              @click.native="skipTo('next')"
+            ></el-button>
+          </div>
           <div
             style="
-              width: 15%;
+              width: 8%;
               font-size: 100%;
               text-align: left;
               float: right;
@@ -148,7 +164,8 @@
             "
             :class="{ 'fade-in': fadeinout, 'fade-out': !fadeinout }"
           >
-            鼠标全部移出则滚动，鼠标在页面内则暂停滚动
+            <p>鼠标全部移出则滚动</p>
+            <p>鼠标在页面内则暂停滚动</p>
           </div>
         </div>
         <dv-border-box-1
@@ -168,7 +185,7 @@
                   />
                   <div class="nullDate" v-if="(showAll || showComponents[23])&&tableData1.data.length<=0">暂无数据</div>
                   <div class="clear"></div>
-  
+
               </div>
             </div> -->
 
@@ -181,7 +198,7 @@
                   />
                   <div class="nullDate" style="height:100%;" v-if="(showAll || showComponents[22])&&tableData.data.length<=0">暂无数据</div>
                   <div class="clear"></div>
-  
+
               </div>
             </div> -->
           <div
@@ -645,7 +662,7 @@
               margin-top: 2%;
               margin-right: 1%;
               margin-left: 1%;
-              height: 90%;
+              height: 43%;
             "
             v-if="pageOT == pageAll + 7"
           >
@@ -654,7 +671,7 @@
             </div>
             <div class="componentsData" style="height: 87%" v-if="relOf">
               <s4renYuanPeiXun
-                style="height: 50%"
+                style="height: 100%"
                 :width="displayType == 'row' ? '25%' : '100%'"
                 :colorw="colorw"
                 v-if="
@@ -663,7 +680,7 @@
                 :data="getS4renYuanPeiXun()"
               />
               <s4renYuanPeiXunCol
-                style="height: 50%"
+                style="height: 100%"
                 :width="displayType == 'row' ? '75%' : '100%'"
                 :colorw="colorw"
                 :direction="direction"
@@ -681,7 +698,7 @@
               >
                 暂无数据
               </div>
-              <s5renYuanJianDu
+              <!-- <s5renYuanJianDu
                 style="height: 50%"
                 :width="displayType == 'row' ? '25%' : '100%'"
                 :colorw="colorw"
@@ -706,15 +723,10 @@
                 "
               >
                 暂无数据
-              </div>
-              <!-- <s16bzJunZhu :height="'290%'" :width="displayType=='row' ? '33%': '100%'" :colorw = "colorw"
-                  v-if="showAll || showComponents[20]" :data = "getbzJunZhujNum()"/>
-                  <s17bzXiBao :height="'290%'" :width="displayType=='row' ? '33%': '100%'" :colorw = "colorw"
-                  v-if="showAll || showComponents[21]" :data = "getbzXiBaoObjNum()"/> -->
+              </div> -->
               <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==1"/> -->
           <div
             class="congxiebox7"
             style="
@@ -908,7 +920,7 @@
               <div class="clear"></div>
             </div>
           </div>
-          <div
+          <!-- <div
             class="congxiebox7"
             style="
               display: inline-block;
@@ -937,10 +949,9 @@
                 v-if="showAll || showComponents[47]"
                 :data="getshijiazhipinjihuaB()"
               />
-              <!-- <div class="nullDate1" style="height:50%;width:75%;" v-if="zaigangrenyuanfb.length<=0&&(showAll || showComponents[2])">暂无数据</div> -->
               <div class="clear"></div>
             </div>
-          </div>
+          </div> -->
           <div
             class="congxiebox7"
             style="
@@ -951,7 +962,7 @@
               margin-left: 1%;
               height: 90%;
             "
-            v-if="pageOT == pageAll + 12"
+            v-if="pageOT == pageAll + 11"
           >
             <div class="ttitle" style="text-align: center">五、质量管理</div>
             <div class="componentsData" style="height: 87%" v-if="relOf">
@@ -1009,7 +1020,7 @@
               margin-left: 1%;
               height: 90%;
             "
-            v-if="pageOT == pageAll + 13"
+            v-if="pageOT == pageAll + 12"
           >
             <div class="ttitle" style="text-align: center">五、质量管理</div>
             <div class="componentsData" style="height: 87%" v-if="relOf">
@@ -1074,7 +1085,7 @@
                   />
                   <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:90%;margin-top:1%" v-for="(item,i) in zhiliangmuNeirong"  :key="i" v-show="pageOT==i+1"> -->
@@ -1094,7 +1105,7 @@
                 {{ showFenZu.title || '' }}
               </div>
               <div class="componentsData" style="height: 100%" v-if="relOf">
-                <!-- 
+                <!--
                     <s1jianCe :height="'290%'" :width="displayType=='row' ? '19.5%': '100%'" :colorw = "colorw" :mubiao = "quality[1].val"
                     v-if="showAll || showComponents[5]" :data = "getS2jianCe()" />
                     <s3tousu :height="'290%'" :width="displayType=='row' ? '19.5%': '100%'" :colorw = "colorw" :mubiao = "quality[3].val"
@@ -1114,13 +1125,13 @@
           <!-- <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">
-                
+
               </div>
             </div>
             <div class="congxiebox7" style="display:inline-block;width:49%;float:right;" v-if="pageOT==2">
               <div class="ttitle" style="text-align: center;">管审计划</div>
               <div class="componentsData" v-if="relOf">
-                
+
               </div>
             </div>
             -->
@@ -1243,6 +1254,7 @@ import {
 } from './js/selectDB.js'
 import sendDatas from './sendDatas.js'
 import repostCurd from '@/business/platform/form/utils/custom/joinCURD.js'
+import { watch } from 'less'
 export default {
   components: {
     // container,
@@ -1338,7 +1350,6 @@ export default {
     if (!this.BeginDate && !this.endDate) {
       this.BeginDate = this.getDate(1) + ''
       this.endDate = this.getDate(0)
-      // console.log(this.endDate)
       this.dataScope.push(this.BeginDate)
       this.dataScope.push(this.endDate)
     }
@@ -1349,17 +1360,14 @@ export default {
     //获取统计的配置
 
     // if(this.buhegelvObj.length>0){
-    // console.log(this.pageAll,'76777index')
     // this.timer1 = setInterval(()=>{
     //   if(this.pageOT>=this.pageAll){
     //     this.pageOT=1
     //   }else{
     //     this.pageOT = this.pageOT + 1
     //   }
-    //   // console.log(this.pageOT)
     // },8000)
     // }
-    // console.log('jjjjjjjjjjjjjjjjjjjjjjjjjjjjjj')
     // this.drawLine()
   },
   // updated() {
@@ -1472,6 +1480,7 @@ export default {
       screenfull.toggle()
     }
     clearInterval(this.timer)
+    clearInterval(this.timer1)
   },
   methods: {
     /* 判断是否统计子组件中传递过来的，是否需要隐藏。若需要则进行隐藏的遍历  */
@@ -1532,9 +1541,64 @@ export default {
       let t2 = year2 + '-' + month2
       return t2
     },
+    skipTo(type) {
+      console.log(type, 'tttttttttttt')
+      if (type === 'pre') {
+        if (this.pageOT === 1) {
+          this.pageOT = this.pageAll + 12
+
+          this.showFenZu.title =
+            this.zhiliangmuNeirong[this.pageAll + 11] !== undefined
+              ? this.zhiliangmuNeirong[this.pageAll + 11].name_
+              : ''
+          this.showFenZu.data =
+            this.zhiliangmuNeirong[this.pageAll + 11] !== undefined
+              ? this.zhiliangmuNeirong[this.pageAll + 11].data
+              : []
+        } else {
+          this.pageOT = this.pageOT - 1
+          if (this.pageOT >= 7 && this.pageOT < this.pageAll + 7) {
+            this.showFenZu.title =
+              this.zhiliangmuNeirong[this.pageOT - 7] !== undefined
+                ? this.zhiliangmuNeirong[this.pageOT - 7].name_
+                : ''
+            this.showFenZu.data =
+              this.zhiliangmuNeirong[this.pageOT - 7] !== undefined
+                ? this.zhiliangmuNeirong[this.pageOT - 7].data
+                : []
+          }
+        }
+      } else if (type === 'next') {
+        if (this.pageOT >= this.pageAll + 12) {
+          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 >= 7 && this.pageOT < this.pageAll + 7) {
+            this.showFenZu.title =
+              this.zhiliangmuNeirong[this.pageOT - 7] !== undefined
+                ? this.zhiliangmuNeirong[this.pageOT - 7].name_
+                : ''
+            this.showFenZu.data =
+              this.zhiliangmuNeirong[this.pageOT - 7] !== undefined
+                ? this.zhiliangmuNeirong[this.pageOT - 7].data
+                : []
+          }
+        }
+      }
+    },
     /* 查询统计配置中的完成率*/
-    getConfigData(end, allDept, filterDept) {
+    getConfigData(delivery, allDept, filterDept) {
       let that = this
+      const end = structuredClone(delivery)
       end[2] = end[1]
       end[1] = this.getNextMonth(end[1])
       Promise.all([
@@ -1629,7 +1693,6 @@ export default {
           }
           let qqaa = response4.variables.data
           that.fenzuzlmb = this.sortArr(qqaa, 'bzbm')
-          // console.log(that.fenzuzlmb,'qqaaqqaaqqaa')
           that.zaigangrenyuan = response5.variables.data
           that.gangqianpeixun = response6.variables.data
           that.jiaoyanObj = response7.variables.data
@@ -1659,9 +1722,7 @@ export default {
       )
     },
 
-    async costPlannedAmountChange(record, value) {
-      // console.log(record,value,'34322222222222222222222222222222222222222222224')
-    },
+    async costPlannedAmountChange(record, value) {},
     /* 查询全部*/
     selectAll() {
       /* 上次查询时间不等于当次查询时间，    开始时间不能等于结束时间， 则开始查询。*/
@@ -1689,7 +1750,6 @@ export default {
       let m1 = nowDate.getMonth() + 1
       let month1 = m1 < 10 ? '0' + m1 : nowDate.getMonth() + 1
       month = month < 10 ? '0' + month : '' + month
-      // console.log([nowDate.getFullYear() - year + "-" + month1,date.getFullYear() + "-" + month])
       // return [nowDate.getFullYear() - year + "-" + month1,date.getFullYear() + "-" + month];
       return [
         nowDate.getFullYear() - year + '-01',
@@ -1722,7 +1782,6 @@ export default {
           _tmp = arr[i][str]
           _t = [arr[i]]
         }
-        // console.log( _tmp,_t,arr[i]);
       }
       // 将最后的内容推出新数组
       _arr.push({ id_: _tmp, data: _t })
@@ -1763,7 +1822,6 @@ export default {
     //   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
@@ -1772,7 +1830,6 @@ export default {
 
     //   }
 
-    //   // console.log(fenshuzu,,fenshuzu[1].hasOwnProperty('data'),'55353453535345')
     //   let title = ['name_']
     //   for (let zn = 0; zn < fenshuzu.length; zn++) {
     //           let zmIndex = 0
@@ -1782,7 +1839,6 @@ export default {
     //             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){
@@ -1790,7 +1846,6 @@ export default {
     //                                   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
@@ -1799,7 +1854,6 @@ export default {
     //                   }
     //                   continue
     //           }
-    //           // console.log(zlzbfz,'ghshhhsuihihuisoio878788787878778')
     //           if(zmIndex == 1){
     //             zongfz.push({'id':fenshuzu[zn].id_,'name':fenshuzu[zn].name_,'data':zlzbfz})
     //           }else{
@@ -1819,7 +1873,6 @@ export default {
     //   }
     //   this.zhiliangmuTitle = title
     //   this.zhiliangmuNeirong = zongfz
-    //   console.log(this.zhiliangmuNeirong.length,this.zhiliangmuNeirong,'fgdfgdafffffffffffff5426666')
     //   this.zhiliangxianzhi = zbval
     //   this.pageAll = this.zhiliangmuNeirong.length
     //   this.drawLine()
@@ -1827,7 +1880,6 @@ export default {
     //   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{
@@ -1841,7 +1893,7 @@ export default {
       //生成月份
       let that = this
       let d1 = this.endDate[0]
-      let d2 = this.endDate[2]
+      let d2 = this.endDate[1]
       let dateArry = new Array()
       let s1 = d1.split('-')
       let s2 = d2.split('-')
@@ -1876,7 +1928,6 @@ export default {
       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
@@ -1898,7 +1949,6 @@ export default {
         }
       })
 
-      // console.log(fenshuzu,that.fenzuzlmb,'55353453535345')
       let title = ['name_']
 
       fenshuzu.forEach((item, i) => {
@@ -1929,7 +1979,6 @@ export default {
           })
         }
       })
-      // console.log(fenshuzu,'2344334')
       fenshuzu.forEach((element, e) => {
         let F = 0
         if (element.hasOwnProperty('data')) {
@@ -1942,12 +1991,9 @@ export default {
           }
         }
       })
-      // console.log(zongfz,'3454568')
       this.zhiliangmuNeirong = zongfz
-      // console.log(this.zhiliangmuNeirong.length,this.zhiliangmuNeirong[1],'fgdfgdafffffffffffff5426666')
       // this.zhiliangxianzhi = zbval
       this.pageAll = this.zhiliangmuNeirong.length
-      // console.log(this.pageAll,'this.pageAll')
       // this.drawLine()
 
       this.showFenZu.title =
@@ -1959,12 +2005,11 @@ export default {
           ? this.zhiliangmuNeirong[0].data
           : []
 
-      // console.log(this.showFenZu,'678687678bjhjhjhk')
-
       clearInterval(this.timer1)
+      this.timer1 = null
       this.fadeinout = false
       this.timer1 = setInterval(() => {
-        if (this.pageOT >= this.pageAll + 13) {
+        if (this.pageOT >= this.pageAll + 12) {
           this.pageOT = 1
 
           this.showFenZu.title =
@@ -1988,13 +2033,11 @@ export default {
                 : []
           }
         }
-        // console.log(this.showFenZu,this.showFenZu)
       }, 4000)
       this.rollup = true
       // if(this.rollup == true){
       //   this.fadeinout = false
       //   this.timer1 = setInterval(()=>{
-      //     // console.log(Math.ceil(this.pageAll/2)+6,this.pageAll)
       //     if(this.pageOT>=this.pageAll+6){
       //       this.pageOT=1
 
@@ -2003,14 +2046,12 @@ export default {
       //     }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:[]
 
       //       }
       //     }
-      //     console.log(this.showFenZu,this.showFenZu)
       //   },4000)
       // }
     },
@@ -2180,11 +2221,13 @@ export default {
       this.$router.back(-1)
       this.fadeinout = true
       clearInterval(this.timer1)
+      this.time1 = null
     },
     rollcontinue() {
+      this.rollstop()
       this.fadeinout = false
       this.timer1 = setInterval(() => {
-        if (this.pageOT >= this.pageAll + 13) {
+        if (this.pageOT >= this.pageAll + 12) {
           this.pageOT = 1
 
           this.showFenZu.title =
@@ -2208,14 +2251,13 @@ export default {
                 : []
           }
         }
-        // console.log(this.showFenZu,this.showFenZu)
       }, 4000)
       this.rollup = true
     },
     rollstop() {
       this.fadeinout = true
       clearInterval(this.timer1)
-      // console.log('dfhjsdifjsojfjiofjoijdiffffjidffffff')
+      this.time1 = null
       this.rollup = false
     }
   }
@@ -2231,6 +2273,37 @@ export default {
     overflow: hidden;
     background-color: rgb(249, 255, 255);
     position: relative;
+    .pnButton {
+      width: 7%;
+      font-size: 100%;
+      text-align: left;
+      position: absolute;
+      right: 9%;
+      top: 62%;
+      .textContent {
+        display: inline-block;
+        width: 25%;
+        font-size: 115%;
+        text-align: center;
+        // margin: 0 11%;
+        color: rgb(63, 150, 165);
+      }
+      .preNextButton {
+        background: transparent;
+        border: 2px solid rgb(63, 150, 165);
+        padding: 5px;
+        .el-icon-arrow-left {
+          font-size: 18px;
+          font-weight: 900;
+          color: rgb(63, 150, 165);
+        }
+        .el-icon-arrow-right {
+          font-size: 18px;
+          font-weight: 900;
+          color: rgb(63, 150, 165);
+        }
+      }
+    }
   }
   .block {
     float: left;

src/views/statistics/item/s10waiBuNengLiCol.vue

@@ -219,7 +219,7 @@ export default {
           }
         },
         grid: {
-          top: '15%',
+          top: '20%',
           left: '3%',
           right: '4%',
           bottom: '5%',

src/views/statistics/item/s11biaoZhunWuCol2.vue

@@ -206,7 +206,7 @@ export default {
           top: '5%'
         },
         grid: {
-          top: '15%',
+          top: '20%',
           left: '3%',
           right: '4%',
           bottom: '5%',

src/views/statistics/item/s12fengXianCol.vue

@@ -222,7 +222,7 @@ export default {
           }
         },
         grid: {
-          top: '15%',
+          top: '20%',
           left: '3%',
           right: '4%',
           bottom: '5%',

src/views/statistics/item/s14bufuhexiangCol.vue

@@ -220,7 +220,7 @@ export default {
           }
         },
         grid: {
-          top: '15%',
+          top: '20%',
           left: '3%',
           right: '4%',
           bottom: '5%',

src/views/statistics/item/s15tousuCol.vue

@@ -222,7 +222,7 @@ export default {
           }
         },
         grid: {
-          top: '15%',
+          top: '20%',
           left: '3%',
           right: '4%',
           bottom: '5%',

src/views/statistics/item/s16bzJunZhuCol2.vue

@@ -217,7 +217,7 @@ export default {
           }
         },
         grid: {
-          top: '15%',
+          top: '20%',
           left: '3%',
           right: '4%',
           bottom: '5%',

src/views/statistics/item/s1zhiLiangMuBiaoCol.vue

@@ -219,7 +219,7 @@ export default {
           }
         },
         grid: {
-          top: '15%',
+          top: '20%',
           left: '3%',
           right: '4%',
           bottom: '5%',

src/views/statistics/item/s2manYiDuPro.vue

@@ -221,7 +221,7 @@ export default {
           }
         },
         grid: {
-          top: '15%',
+          top: '20%',
           left: '3%',
           right: '4%',
           bottom: '5%',

src/views/statistics/item/s4renYuanPeiXunCol.vue

@@ -218,7 +218,7 @@ export default {
           }
         },
         grid: {
-          top: '15%',
+          top: '20%',
           left: '3%',
           right: '4%',
           bottom: '5%',

src/views/statistics/item/s5renYuanJianDuCol.vue

@@ -220,7 +220,7 @@ export default {
           }
         },
         grid: {
-          top: '15%',
+          top: '20%',
           left: '3%',
           right: '4%',
           bottom: '5%',

src/views/statistics/item/s7sheBeiJiaoZhunCol.vue

@@ -220,7 +220,7 @@ export default {
           }
         },
         grid: {
-          top: '15%',
+          top: '20%',
           left: '3%',
           right: '4%',
           bottom: '5%',

src/views/statistics/item/s8sheBeiHeChaCol.vue

@@ -219,7 +219,7 @@ export default {
           }
         },
         grid: {
-          top: '15%',
+          top: '20%',
           left: '3%',
           right: '4%',
           bottom: '5%',

src/views/statistics/item/s9neiBuZhiLiangCol.vue

@@ -218,7 +218,7 @@ export default {
           }
         },
         grid: {
-          top: '15%',
+          top: '20%',
           left: '3%',
           right: '4%',
           bottom: '5%',

src/views/statistics/item/zlmbMidYearBar.vue

@@ -230,7 +230,7 @@ export default {
           }
         },
         grid: {
-          top: '15%',
+          top: '20%',
           left: '3%',
           right: '4%',
           bottom: '5%',

src/views/statistics/sendDatas.js

@@ -69,6 +69,9 @@ export default {
       let mid = JSON.parse(JSON.stringify(this.bfBuMen))
       for (let i = 0; i < this.jiaoyanMGObj.length; i++) {
         let midI = mid.findIndex((v) => v.NAME_ == this.jiaoyanMGObj[i].NAME_)
+        if (midI === -1) {
+          continue
+        }
         mid[midI].numA =
           this.jiaoyanMGObj[i].numA < 0 ? 0 : this.jiaoyanMGObj[i].numA
         mid[midI].num =
@@ -114,6 +117,9 @@ export default {
       let mid = JSON.parse(JSON.stringify(this.bfBuMen))
       for (let i = 0; i < this.hechaMGObj.length; i++) {
         let midI = mid.findIndex((v) => v.NAME_ == this.hechaMGObj[i].NAME_)
+        if (midI === -1) {
+          continue
+        }
         mid[midI].numA =
           this.hechaMGObj[i].numA < 0 ? 0 : this.hechaMGObj[i].numA
         mid[midI].num = this.hechaMGObj[i].num < 0 ? 0 : this.hechaMGObj[i].num
@@ -159,6 +165,9 @@ export default {
       let mid = JSON.parse(JSON.stringify(this.bfBuMen))
       for (let i = 0; i < this.waibuObjfb.length; i++) {
         let midI = mid.findIndex((v) => v.NAME_ == this.waibuObjfb[i].NAME_)
+        if (midI === -1) {
+          continue
+        }
         mid[midI].numA =
           this.waibuObjfb[i].numA < 0 ? 0 : this.waibuObjfb[i].numA
         mid[midI].num = this.waibuObjfb[i].num < 0 ? 0 : this.waibuObjfb[i].num
@@ -334,6 +343,9 @@ export default {
       let mid = JSON.parse(JSON.stringify(this.bfBuMen))
       for (let i = 0; i < this.gaijinxiangObj.length; i++) {
         let midI = mid.findIndex((v) => v.NAME_ == this.gaijinxiangObj[i].NAME_)
+        if (midI === -1) {
+          continue
+        }
         mid[midI].numA =
           this.gaijinxiangObj[i].numA < 0 ? 0 : this.gaijinxiangObj[i].numA
         mid[midI].num =
@@ -598,6 +610,9 @@ export default {
       let mid = JSON.parse(JSON.stringify(this.bfBuMen))
       for (let i = 0; i < this.neishenfbObj.length; i++) {
         let midI = mid.findIndex((v) => v.NAME_ == this.neishenfbObj[i].NAME_)
+        if (midI === -1) {
+          continue
+        }
         mid[midI].numA =
           this.neishenfbObj[i].numA < 0 ? 0 : this.neishenfbObj[i].numA
         mid[midI].num =
@@ -647,6 +662,9 @@ export default {
       let mid = JSON.parse(JSON.stringify(this.bfBuMen))
       for (let i = 0; i < this.yingjifbObj.length; i++) {
         let midI = mid.findIndex((v) => v.NAME_ == this.yingjifbObj[i].NAME_)
+        if (midI === -1) {
+          continue
+        }
         mid[midI].numA =
           this.yingjifbObj[i].numA < 0 ? 0 : this.yingjifbObj[i].numA
         mid[midI].num =
@@ -701,6 +719,9 @@ export default {
       let mid = JSON.parse(JSON.stringify(this.bfBuMen))
       for (let i = 0; i < this.yingjifbObj.length; i++) {
         let midI = mid.findIndex((v) => v.NAME_ == this.yingjifbObj[i].NAME_)
+        if (midI === -1) {
+          continue
+        }
         mid[midI].numA =
           this.yingjifbObj[i].numA < 0 ? 0 : this.yingjifbObj[i].numA
         mid[midI].num =
@@ -758,6 +779,9 @@ export default {
         let midI = mid.findIndex(
           (v) => v.NAME_ == this.zaigangrenyuanfb[i].NAME_
         )
+        if (midI === -1) {
+          continue
+        }
         mid[midI].numA =
           this.zaigangrenyuanfb[i].numA < 0 ? 0 : this.zaigangrenyuanfb[i].numA
         mid[midI].num =
@@ -813,6 +837,9 @@ export default {
         let midI = mid.findIndex(
           (v) => v.NAME_ == this.gangqianpeixunfb[i].NAME_
         )
+        if (midI === -1) {
+          continue
+        }
         mid[midI].numA =
           this.gangqianpeixunfb[i].numA < 0 ? 0 : this.gangqianpeixunfb[i].numA
         mid[midI].num =
@@ -977,6 +1004,9 @@ export default {
       let mid = JSON.parse(JSON.stringify(this.bfBuMen))
       for (let i = 0; i < this.neibuObjfb.length; i++) {
         let midI = mid.findIndex((v) => v.NAME_ == this.neibuObjfb[i].NAME_)
+        if (midI === -1) {
+          continue
+        }
         mid[midI].numA =
           this.neibuObjfb[i].numA < 0 ? 0 : this.neibuObjfb[i].numA
         mid[midI].num = this.neibuObjfb[i].num < 0 ? 0 : this.neibuObjfb[i].num
@@ -1021,6 +1051,9 @@ export default {
       let mid = JSON.parse(JSON.stringify(this.bfBuMen))
       for (let i = 0; i < this.fengxianfbObj.length; i++) {
         let midI = mid.findIndex((v) => v.NAME_ == this.fengxianfbObj[i].NAME_)
+        if (midI === -1) {
+          continue
+        }
         mid[midI].numA =
           this.fengxianfbObj[i].numA < 0 ? 0 : this.fengxianfbObj[i].numA
         mid[midI].num =
@@ -1046,6 +1079,9 @@ export default {
       let mid = JSON.parse(JSON.stringify(this.bfBuMen))
       for (let i = 0; i < this.bufuheObj.length; i++) {
         let midI = mid.findIndex((v) => v.NAME_ == this.bufuheObj[i].NAME_)
+        if (midI === -1) {
+          continue
+        }
         mid[midI].numA = this.bufuheObj[i].numA < 0 ? 0 : this.bufuheObj[i].numA
         mid[midI].num = this.bufuheObj[i].num < 0 ? 0 : this.bufuheObj[i].num
         mid[midI].wnum = mid[midI].numA - mid[midI].num