Преглед на файлове

Merge branch 'feature/newdemand' of duanxiaoduan/tmr-admin into release/v1.0.2

duanxiaoduan преди 1 година
родител
ревизия
a4401500ea
променени са 1 файла, в които са добавени 9 реда и са изтрити 11 реда
  1. 9 11
      src/views/statisticalAnalysis/errorAnalysis/pasture/index.vue

+ 9 - 11
src/views/statisticalAnalysis/errorAnalysis/pasture/index.vue

@@ -2,10 +2,7 @@
   <div class="app-container1">
     <el-tabs v-model="activeName" @tab-click="handleTabClick">
       <el-tab-pane label="汇总统计" name="first">
-        <!-- 君盛 -->
-      <!-- <div ref="scrollContainer" @scroll="handleScroll" :style="{ height: myHeight1+'px', overflowY: 'auto', overflowX: 'hidden' }"> -->
-      <!-- 其他牧场 -->
-      <div ref="scrollContainer">
+      <div ref="scrollContainer" @scroll="handleScroll" :style="{ height: myHeight1+'px', overflowY: 'auto', overflowX: 'hidden' }">
         <div class="search">
           <el-date-picker v-model="tab.table.getdataListParm.parammaps.inputDatetime" :clearable="false" class="inputDatetime filter-item" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" style="width: 250px;" :picker-options="pickerOptions" />
           <el-button class="el-icon-arrow-left elIconArrowLeft" :disabled="Beforedisabled" @click="handleBefore" />
@@ -585,7 +582,7 @@
                 <div v-if="tab.chart7.isChart" class="button">
                   <div class="chartButton">
                     <!-- 君盛-->
-                  <!-- <el-select v-model="tab.chart7.getdataListParm.parammaps.statisticsList" multiple  placeholder="请选择" collapse-tags @change="changeStatisticChart7">
+                    <!-- <el-select v-model="tab.chart7.getdataListParm.parammaps.statisticsList" multiple  placeholder="请选择" collapse-tags @change="changeStatisticChart7">
                       <el-option v-for="item in tab.chart7.statisticsList" :key="item.name" :label="item.name" :value="item.name" />
                     </el-select> -->
                     <!-- 其他牧场  -->
@@ -1862,12 +1859,13 @@ export default {
     this.getIsDisplay()
     this.getTabList()
     this.getTabList2()
-    this.getChart1()
-    this.getChart2()
-    this.getChart3()
-    this.getChart4()
-    this.getChart5()
-    this.getChart6()
+    // 暂时注释
+    // this.getChart1()
+    // this.getChart2()
+    // this.getChart3()
+    // this.getChart4()
+    // this.getChart5()
+    // this.getChart6()
   },
   mounted() {},
   methods: {