111

src/components/TableFooter.vue

@@ -6,6 +6,7 @@
                    layout="total, sizes, prev, pager, next, jumper"
                    @size-change="sizeChange"
                    @current-change="pageChange"
+                   :current-page.sync="pageNum"
                    :page-sizes="sizesArray"
                    :page-size="size"></el-pagination>
   </div>
@@ -38,6 +39,12 @@
           return 20;
         },
       },
+      pageNum: {
+        type: Number,
+        default() {
+          return 1;
+        },
+      }
     },
     methods: {
       sizeChange(value) {

src/utils/api.js

@@ -614,3 +614,12 @@ export function getEnvList(data) {
     params: data
   })
 }
+
+/** 7天环保数据 **/
+export function getSevenEnv(data) {
+  return axios({
+    url: 'env/environ/getLastSevenDayEnviron',
+    method: 'get',
+    params: data
+  })
+}

src/views/Alarm/EnvWarn.vue

@@ -27,6 +27,7 @@
       :size="pageSize"
       @sizeChange="sizeChange"
       @pageChange="pageChange"
+      :pageNum="pageNum"
     ></table-footer>
   </div>
 </template>

src/views/Alarm/SewageWarn.vue

@@ -4,7 +4,7 @@
     <x-form :formItems="selectItems" :day="day" @setDay="setDay" @onClickType="onClickType"></x-form>
     <new-table :height="600" :title="title" :listData="list" :tableItems="tableItems" :shows="tableShows">
       <template #right>
-        <el-button size="mini" type="primary">导出数据</el-button>
+<!--        <el-button size="mini" type="primary">导出数据</el-button>-->
       </template>
       <template #handler="scope">
         <el-button type="text" @click="open(scope.row)">未处理</el-button>

src/views/Zoology/Sewage.vue

@@ -10,7 +10,12 @@
     <div class="echarts-line">
       <div class="reply1" :style="{ color: color }">污水监测</div>
       <div class="echarts-box" v-for="item in lineList" :key="item.id">
-        <chart-sewage-line :line-config="item"></chart-sewage-line>
+        <template v-if= "item.data.length > 0">
+          <chart-sewage-line :line-config="item"></chart-sewage-line>
+        </template>
+       <template v-else>
+         <el-empty description="设备暂无数据"></el-empty>
+       </template>
       </div>
     </div>
   </div>
@@ -20,7 +25,7 @@
 import ChartSewageCorona from "@/views/Zoology/chart/ChartSewageCorona";
 import ChartSewageLine from "@/views/Zoology/chart/ChartSewageLine";
 import { mapState } from 'vuex'
-import { getEnvList } from "../../utils/api";
+import { getEnvList, getSevenEnv } from "../../utils/api";
 
 export default {
   name: "Sewage",
@@ -73,30 +78,30 @@ export default {
       lineList: [
         {
           id: 1,
-          unit: 'mg/L',
-          time: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月', '测试月'],
-          data: [120, 132, 101, 134, 90, 230, 210, 210, 245, 203, 124, 214, 210],
-          name: '总氮'
+          unit: '',
+          time: [],
+          data: [],
+          name: 'ph'
         },
         {
           id: 2,
           unit: 'mg/L',
-          time: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月', '测试月'],
-          data: [120, 132, 101, 134, 90, 230, 210, 210, 245, 203, 124, 214, 210],
-          name: '化学需氧量'
+          time: [],
+          data: [],
+          name: 'COD'
         },
         {
           id: 3,
-          unit: 'mg/L',
-          time: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月', '测试月'],
-          data: [120, 132, 101, 134, 90, 230, 210, 210, 245, 203, 124, 214, 210],
-          name: '总磷'
+          unit: 'T',
+          time: [],
+          data: [],
+          name: '流量'
         },
         {
           id: 4,
           unit: 'mg/L',
-          time: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月', '测试月'],
-          data: [120, 132, 101, 134, 90, 230, 210, 210, 245, 203, 124, 214, 210],
+          time: [],
+          data: [],
           name: '氨氮量'
         },
       ]
@@ -112,6 +117,17 @@ export default {
           this.echartList[4].data = res.data.wsPj;
         }
       })
+      getSevenEnv({days: 7}).then(res => {
+        if(res.code === 10000) {
+          this.lineList.forEach(item => {
+            item.time = res.data.date
+          })
+          this.lineList[0].data = res.data.ph;
+          this.lineList[1].data = res.data.cod;
+          this.lineList[2].data = res.data.ws;
+          this.lineList[3].data = res.data.ad
+        }
+      })
     }
   },
   mounted() {

src/views/Zoology/chart/ChartSewageLine.vue

@@ -15,8 +15,8 @@ export default {
       default: function () {
         return {
           id: 0,
-          time: ['1月', '2月', '3月', '4月', '5月', '6月', '7月', '8月', '9月', '10月', '11月', '12月', '测试月'],
-          data: [120, 132, 101, 134, 90, 230, 210, 210, 245, 203, 124, 214, 210],
+          time: [],
+          data: [],
           name: '默认',
           unit: '%'
         }
@@ -106,7 +106,7 @@ export default {
         yAxis: [
           {
             type: 'value',
-            name: '近一周统计',
+            name: '近7天统计',
             axisLabel: {
               formatter: `{value}${unit}`
             },
@@ -159,4 +159,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>