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

@@ -1,5 +1,8 @@
 <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'
@@ -53,10 +56,11 @@ export default {
       let yData = []
       for (let j = 0; j < arr.length; j++) {
         for (let k = 0; k < keys.length; k++) {
-          if (keys[k].indexOf(arr[j] + '_上年同期') > -1 || keys[k].indexOf(arr[j] + '_能源消耗') > -1) {
+          if (keys[k].indexOf(arr[j]+'_上年同期') > -1 || keys[k].indexOf(arr[j]+'_能源消耗') > -1) {
             let obj = {
               name: '',
               type: 'line',
+              stack: 'Total',
               data: []
             }
             obj.name = keys[k]
@@ -67,14 +71,14 @@ export default {
       for (let i = 0; i < this.chartData.length; i++) {
         xData.push(this.chartData[i].time)
         for (let p = 0; p < yData.length; p++) {
-          yData[p].data.push(this.chartData[i][yData[p].name])
+          yData[p].data.push(this.chartData[i][ yData[p].name])
         }
       }
       var option = {
-        color: ['#FFDC94', '#8EF0AB', '#63BDFF', '#288AFF', '#7164FF', '#FF6860', '#FF9747', '#B0EB42', '#D680FF', '#0043D2'],
+        color:['#FFDC94','#8EF0AB','#63BDFF','#288AFF','#7164FF','#FF6860','#FF9747','#B0EB42','#D680FF','#0043D2'],
         legend: {
           data: keys,
-          right: '1%'
+          right:'1%'
         },
         tooltip: {
           trigger: 'axis'

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

@@ -2,22 +2,40 @@
   <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"
+      <base-table
-        :max-height="tableH" />
+        :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"
+      <base-table
-        :table-data="list2" :max-height="tableH" />
+        :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
-      @pagination="getList" />
+      :page.sync="queryParams.pageNo"
+      :limit.sync="queryParams.pageSize"
+      :total="total"
+      @pagination="getList"
+    />
   </div>
 </template>
 
@@ -142,8 +160,8 @@ export default {
         method: '1'
       },
       typeList: [
-        { id: 1, name: '合并' },
+        {id: 1, name: '合并'},
-        { id: 2, name: '详细' }
+        {id: 2, name: '详细'}
       ]
     };
   },
@@ -165,7 +183,7 @@ export default {
     getList() {
       getEnergyOverlimitLogPage(this.queryParams).then(response => {
         let arr = response.data.list || [];
-        arr && arr.map((item) => {
+        arr&&arr.map((item) => {
           this.typeList.map((i) => {
             if (item.type === i.id) {
               item.type = i.name
@@ -173,21 +191,15 @@ export default {
           })
           if (item.minValue && item.maxValue) {
             item.limitValue = item.minValue + '-' + item.maxValue
-          } else if (item.minValue) {
+          } else if(item.minValue){
             item.limitValue = '最小值' + item.minValue
-          } else if (item.maxValue) {
+          }else if(item.maxValue){
             item.limitValue = '最大值' + item.maxValue
           } else {
             item.limitValue = ''
           }
         })
-        if (this.queryParams.method === '1') {
         this.list = arr
-          this.list2 = []
-        } else {
-          this.list2 = arr
-          this.list1 = []
-        }
         this.total = response.data.total;
       });
     },
@@ -200,7 +212,7 @@ export default {
     toggleTab() {
       if (this.activeName === 'auto') {
         this.queryParams.method = '1'
-      } else {
+      }else{
         this.queryParams.method = '2'
       }
       this.queryParams.pageNo = 1
@@ -220,27 +232,21 @@ 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;
   }