111

src/utils/api.js

@@ -605,3 +605,12 @@ export function getListClientHome(data) {
     params: data
   })
 }
+
+/** 环保  **/
+export function getEnvList(data) {
+  return axios({
+    url: 'env/environ/getLastEnviron',
+    method: 'get',
+    params: data
+  })
+}

src/views/Zoology/Sewage.vue

@@ -20,6 +20,8 @@
 import ChartSewageCorona from "@/views/Zoology/chart/ChartSewageCorona";
 import ChartSewageLine from "@/views/Zoology/chart/ChartSewageLine";
 import { mapState } from 'vuex'
+import { getEnvList } from "../../utils/api";
+
 export default {
   name: "Sewage",
   components: {
@@ -34,38 +36,38 @@ export default {
       echartList: [
         {
           id: 1,
-          data: 52.1,
-          unit: 'mg/L',
-          max: 200,
-          name: '总氮'
+          data: 0,
+          unit: '',
+          max: 14,
+          name: 'ph'
         },
         {
           id: 2,
-          data: 52.1,
+          data: 0,
           unit: 'mg/L',
-          max: 200,
-          name: '化学需氧量'
+          max: 500,
+          name: 'COD'
         },
         {
           id: 3,
-          data: 52.1,
+          data: 0,
           unit: 'mg/L',
           max: 200,
           name: '总磷'
         },
         {
           id: 4,
-          data: 52.1,
+          data: 0,
           unit: 'mg/L',
-          max: 200,
+          max: 2,
           name: '氨氮量'
         },
         {
           id: 5,
-          data: 1124,
-          unit: 'T/HT',
-          max: 2000,
-          name: '累计流量'
+          data: 0,
+          unit: 'T',
+          max: 240,
+          name: '流量'
         },
       ],
       lineList: [
@@ -99,6 +101,21 @@ export default {
         },
       ]
     }
+  },
+  methods: {
+    init() {
+      getEnvList({}).then(res => {
+        if(res.code === 10000) {
+          this.echartList[0].data = res.data.phPj;
+          this.echartList[1].data = res.data.hxxylPj;
+          this.echartList[3].data = res.data.adPj;
+          this.echartList[4].data = res.data.wsPj;
+        }
+      })
+    }
+  },
+  mounted() {
+    this.init()
   }
 }
 </script>

src/views/Zoology/chart/ChartSewageCorona.vue

@@ -29,6 +29,15 @@ export default {
         this.myChart.clear();
         this.init()
       }
+    },
+    configObj: {
+      handler(newVal) {
+        if(newVal) {
+          this.myChart.clear();
+          this.init();
+        }
+      },
+      deep: true
     }
   },
   data() {
@@ -47,7 +56,7 @@ export default {
         },
         angleAxis: {
           show: false,
-          max: (100 * 360) / 270,
+          max:  max,
           type: 'value',
           startAngle: 225,
           splitLine: {
@@ -70,7 +79,7 @@ export default {
             type: 'bar',
             data: [
               {
-                value: this.configObj.data,
+                value: this.configObj.data * 0.75,
                 itemStyle: {
                   // color: 'rgba(35, 176, 176, 1)',
                   // shadowColor: 'rgba(35, 176, 176, 0.5)',
@@ -91,7 +100,7 @@ export default {
             type: 'bar',
             data: [
               {
-                value: 100,
+                value: max,
                 itemStyle: {
                   color: '#EBEDF5',
                 },
@@ -169,8 +178,7 @@ export default {
                 width: 0,
                 shadowBlur: 0,
                 color: [
-                  [0.2, '#23AFAF'],
-                  [0.4, '#2270DA'],
+                  [0.3, '#23AFAF'],
                   [0.6, '#E99D02'],
                   [1, '#F45656'],
                 ],
@@ -208,7 +216,7 @@ export default {
             radius: 20,
             data: [
               {
-                value: 5,
+                value: max,
                 itemStyle: {
                   color: '#EAEBF1',
                 },
@@ -224,7 +232,7 @@ export default {
             radius: 5,
             data: [
               {
-                value: 100,
+                value: max,
                 itemStyle: {
                   color: '#fff',
                 },
@@ -245,4 +253,4 @@ export default {
 
 <style scoped>
 
-</style>
+</style>

src/views/dashboard/dashboard.vue

@@ -150,7 +150,8 @@
           </div>
         </div>
         <div style="width: 85%; height: 400px">
-          <chart-pig :data="salesChartData"></chart-pig>
+          <chart-pig v-if="salesChartData.quantityList.length > 0" :data="salesChartData"></chart-pig>
+          <el-empty v-else description="暂无数据" style="width: 100%;"></el-empty>
         </div>
       </div>
     </div>
@@ -313,7 +314,11 @@ export default {
       weekSalesChange: 0,
       weekSalesVolume: 0,
       weekSalesVolumeChange: 0,
-      salesChartData: {},
+      salesChartData: {
+        quantityList: [],
+        timeList: [],
+        moneyList: []
+      },
     }
   },
   computed: {
@@ -420,7 +425,6 @@ export default {
         }
         if(res2.code === 10000) {
           that.TempAndHumList = res2.data;
-          console.log(that.TempAndHumList)
         }
         if(res3.code === 10000) {
           that.waterList = res3.data.data;