首页修改

src/views/dashboard/Analysis.vue

@@ -23,13 +23,13 @@
     <a-row :gutter="20" class="mt20 alarmandnotice">
       <a-col :span="14">
         <a-card class="box-card">
-          <div slot="header" class="u-flex-jab">
+          <div class="u-flex-jab">
             <div class="common-title u-flex">
               <span class="text">报警通知</span>
             </div>
-            <router-link to="/alarmManage/handleAlarm">
+            <!-- <router-link to="/alarmManage/handleAlarm">
               <a-button style="float: right; padding: 3px 0" type="text">处理/查看</a-button>
-            </router-link>
+            </router-link> -->
           </div>
           <a-table
             rowKey="id"
@@ -61,13 +61,13 @@
       </a-col>
       <a-col :span="10">
         <a-card class="box-card">
-          <div slot="header" class="u-flex-jab">
+          <div class="u-flex-jab">
             <div class="common-title u-flex">
               <span class="text">消息通知</span>
             </div>
-            <router-link to="/alarmManage/notice">
+            <!-- <router-link to="/alarmManage/notice">
               <a-button style="float: right; padding: 3px 0" type="text">处理/查看</a-button>
-            </router-link>
+            </router-link> -->
           </div>
           <a-table
             rowKey="id"
@@ -100,17 +100,17 @@
     </a-row>
     <a-row :gutter="20" class="mt20">
       <a-col :span="14">
-        <div class="trend-charts" ref="trendCharts"></div>
+        <div class="trend-charts" ref="elecCharts"></div>
       </a-col>
       <a-col :span="10">
-        <div class="trend-charts" ref="tempAndHumiCharts"></div>
+        <div class="trend-charts" ref="envirCharts"></div>
       </a-col>      
     </a-row>
   </div>
 </template>
 
 <script>
-import * as echarts from 'echarts';
+import * as echarts from 'echarts'
 // import { listAlarmdata } from "@/api/alarm/alarmdata.js";
 // import { listNotice } from "@/api/system/notice";
 // import { firstload } from "@/api/homepage.js";
@@ -225,7 +225,12 @@ export default {
     }
   },
   created() {
+  },
+  mounted() {
+    this.$nextTick(() => {
     this.getList();
+      // this.getDemandanalysis()
+    })
     // this.getAlarmList()
     // this.getNoticeList()
     var _this = this;
@@ -273,7 +278,9 @@ export default {
         this.alarmList = testdata.homedata.alarmData;
         this.noticeList = testdata.homedata.noticeData;
 
-        // this.initEcharts();
+        this.temperatureData = testdata.homedata.envirData;
+
+        this.initEcharts();
         this.initTempAndHumiEcharts();
     },
     getInfo() {
@@ -345,7 +352,7 @@ export default {
     },
     initEcharts(){
       var _this = this
-      var chartDom = this.$refs.trendCharts
+      var chartDom = this.$refs.elecCharts
       var myChart = echarts.init(chartDom);
       var option;
 
@@ -435,8 +442,10 @@ export default {
       }
 
       var _this = this
-      var chartDom = _this.$refs.tempAndHumiCharts
-      console.log("温湿度", chartDom)
+      var chartDom = this.$refs.envirCharts
+      console.log("温湿度", this.$refs)
+      console.log("温湿度1", this.$refs.envirCharts)
+      console.log("温湿度2", this.$refs.elecCharts)
       var myChart = echarts.init(chartDom);
       var option;
 
@@ -646,5 +655,8 @@ export default {
   .alarmandnotice{
     margin-top: 10px;
   }
+  .ant-table-wrapper {
+    margin-top: 10px;
+  }
 }
 </style>

src/views/module_ems/energyAnalyse/demandAnalysis/index.vue

@@ -112,6 +112,7 @@ export default {
     initEcharts() {
       var _this = this
       var chartDom = _this.$refs.echarts
+      console.log("需量", this.$refs)
       _this.myChart = echarts.init(chartDom)
       var option