Merge branch 'dev' of gitlab.suntrayoa.com:geqilin/energyai_vue into dev

src/pages/components/chart.vue

@@ -7,8 +7,12 @@ div(:id="id", :style="{ width: '100%', height: '90%' }")
 export default {
   props: ['id', 'data', 'title', 'color', 'yAxisName'],
   watch: {
-    data() {
-      this.initChart()
+    data: {
+      immediate: true,
+      deep: true,
+      handler(newValue, oldValue) {
+        this.initChart()
+      }
     }
   },
   mounted() {

src/pages/home/page.vue

@@ -166,7 +166,7 @@
                 <!-- <energy-total-charts></energy-total-charts> -->
                 <chart
                   id="home"
-                  :data="dataList.energyList"
+                  :data="data"
                   title="能耗统计"
                   color="#21ACFC"
                   ref="chart"
@@ -209,7 +209,7 @@ export default {
       cardListLeftTitle: '能耗统计',
       cardListRightTitle: '旅客满意度调查',
       activeIndex: 0,
-      dataList: this.$store.state.d2admin.paramsList.list.syBean || [],
+      dataList: [] || this.$store.state.d2admin.paramsList.list.syBean,
       dateList: [
         {
           value: 0,
@@ -233,6 +233,8 @@ export default {
         if (data && data.code === 0) {
           console.log('首页：', data)
           this.dataList = data.bean
+
+          this.data = data.bean.energyList //默认
         }
       })
     },