src/views/energy/analysis/yoyAnalysis/components/lineChart.vue

@@ -1,8 +1,5 @@
 <template>
-  <div 
-    id="analysischartLine"
-    style="width: 100%;height: 100%;"
-  ></div>
+  <div id="analysischartLine" style="width: 100%;height: 100%;"></div>
 </template>
 <script>
 import * as echarts from 'echarts'
@@ -60,7 +57,6 @@ export default {
             let obj = {
               name: '',
               type: 'line',
-              stack: 'Total',
               data: []
             }
             obj.name = keys[k]

src/views/energy/monitoring/energyOverlimitLog/index.vue

@@ -2,40 +2,22 @@
   <div class="app-container energyOverlimitLog">
 
     <!-- 搜索工作栏 -->
-    <search-bar
-      :formConfigs="formConfig"
-      ref="searchBarForm"
-      @headBtnClick="buttonClick"
-    />
+    <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
     <el-tabs v-model="activeName" @tab-click="toggleTab">
       <el-tab-pane label="自动抄表" name="auto"></el-tab-pane>
       <el-tab-pane label="手动抄表" name="manual"></el-tab-pane>
     </el-tabs>
     <!-- 列表 -->
     <div v-if="activeName === 'auto'">
-      <base-table
-        :page="queryParams.pageNo"
-        :limit="queryParams.pageSize"
-        :table-props="tableProps"
-        :table-data="list"
-        :max-height="tableH"
-      />
+      <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps" :table-data="list"
+        :max-height="tableH" />
     </div>
     <div v-if="activeName === 'manual'">
-      <base-table
-        :page="queryParams.pageNo"
-        :limit="queryParams.pageSize"
-        :table-props="tableProps2"
-        :table-data="list2"
-        :max-height="tableH"
-      />
+      <base-table :page="queryParams.pageNo" :limit="queryParams.pageSize" :table-props="tableProps2"
+        :table-data="list2" :max-height="tableH" />
     </div>
-    <pagination
-      :page.sync="queryParams.pageNo"
-      :limit.sync="queryParams.pageSize"
-      :total="total"
-      @pagination="getList"
-    />
+    <pagination :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize" :total="total"
+      @pagination="getList" />
   </div>
 </template>
 
@@ -199,7 +181,13 @@ export default {
             item.limitValue = ''
           }
         })
+        if (this.queryParams.method === '1') {
           this.list = arr
+          this.list2 = []
+        } else {
+          this.list2 = arr
+          this.list1 = []
+        }
         this.total = response.data.total;
       });
     },
@@ -232,21 +220,27 @@ export default {
     height: 2px;
     background-color: #e4e7ed;
   }
+
   .el-tabs__nav-wrap::after {
     width: 0;
   }
+
   .el-tabs__item {
     padding: 0 10px;
   }
+
   .el-tabs__item:hover {
     color: rgba(0, 0, 0, 0.85);
   }
+
   .el-tabs__item.is-active {
     color: rgba(0, 0, 0, 0.85);
   }
+
   .el-tabs__item {
     color: rgba(0, 0, 0, 0.45);
   }
+
   .searchBarBox {
     margin-bottom: 0;
   }