修改表格数据显示

src/views/board/index.vue

@@ -108,27 +108,32 @@
 
       <div class="table1">
         <div class="h1">
-          <div class="scrollTable" style="font-weight: bold;width: calc(100% / 6);">
+          <div class="scrollTable" style="font-weight: bold;width: calc(100% / 7);">
+            设备名称
           </div>
-          <div class="scrollTable" style="font-weight: bold;width: calc(100% / 6);">
+          <div class="scrollTable" style="font-weight: bold;width: calc(100% / 7);">
-            A区
+            A相电流
           </div>
-          <div class="scrollTable" style="font-weight: bold;width: calc(100% / 6);">
+          <div class="scrollTable" style="font-weight: bold;width: calc(100% / 7);">
-            A区
+            B相电流
           </div>
-          <div class="scrollTable" style="font-weight: bold;width: calc(100% / 6);">
+          <div class="scrollTable" style="font-weight: bold;width: calc(100% / 7);">
-            A区
+            C相电流
           </div>
-          <div class="scrollTable" style="font-weight: bold;width: calc(100% / 6);">
+          <div class="scrollTable" style="font-weight: bold;width: calc(100% / 7);">
-            A区
+            A相电压
           </div>
-          <div class="scrollTable" style="font-weight: bold;width: calc(100% / 6);">
+          <div class="scrollTable" style="font-weight: bold;width: calc(100% / 7);">
-            合计
+            B相电压
+          </div>
+          <div class="scrollTable" style="font-weight: bold;width: calc(100% / 7);">
+            C相电压
           </div>
         </div>
         <vue-seamless-scroll
-            :class-option="{...chart1TableOption,limitMoveNum:10}"
+            :class-option="{...chart1TableOption,limitMoveNum:4}"
             :data="table1Data"
+            :key="scrollKey1"
             class="case-item"
             style="height: 84%;overflow: hidden;"
         >
@@ -137,23 +142,26 @@
               :key="index"
           >
             <div class="T1">
-              <div class="scrollTable" style="width: calc(100% / 6);">
+              <div class="scrollTable" style="width: calc(100% / 7);">
-                {{ item.no }}
+                {{ item.monitorName || '' }}
               </div>
-              <div class="scrollTable" style="width: calc(100% / 6);">
+              <div class="scrollTable" style="width: calc(100% / 7);">
-                {{ item.no }}
+                {{ item.iA || 0 }}
               </div>
-              <div class="scrollTable" style="width: calc(100% / 6);">
+              <div class="scrollTable" style="width: calc(100% / 7);">
-                {{ item.no }}
+                {{ item.iB || 0 }}
               </div>
-              <div class="scrollTable" style="width: calc(100% / 6);">
+              <div class="scrollTable" style="width: calc(100% / 7);">
-                {{ item.no }}
+                {{ item.iC || 0 }}
               </div>
-              <div class="scrollTable" style="width: calc(100% / 6);">
+              <div class="scrollTable" style="width: calc(100% / 7);">
-                {{ item.no }}
+                {{ item.vA || 0 }}
               </div>
-              <div class="scrollTable" style="width: calc(100% / 6);">
+              <div class="scrollTable" style="width: calc(100% / 7);">
-                {{ item.no }}
+                {{ item.vB || 0 }}
+              </div>
+              <div class="scrollTable" style="width: calc(100% / 7);">
+                {{ item.vC || 0 }}
               </div>
             </div>
           </div>
@@ -244,6 +252,7 @@ import {
   fiveConsumptionStatistics,
   monthConsumptionRanking,
   peaksValleysConsumption, realTimeAlarm,
+  realTimeData
 } from "@/api/board";
 export default {
   name: 'Board',
@@ -265,17 +274,8 @@ export default {
         singleHeight: 0, // 单步运动停止的高度(默认值0是无缝不停止的滚动) direction => 0/1
         singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
         waitTime: 0,
-        autoPlay: false,
-        navigation: false
       },
-      table1Data: [
+      table1Data: [],
-        {
-          no: 1
-        },
-        {
-          no: 1
-        },
-      ],
       scrollKey1: '',
       scrollKey2: '',
       deviceOverviewData: {},
@@ -613,7 +613,7 @@ export default {
           },
           series: [
             {
-              name: '红',
+              name: '能耗',
               type: 'bar',
               label: {
                 show: false,
@@ -631,6 +631,9 @@ export default {
               }
             },
             {
+              tooltip: {
+                show: false
+              },
               type: 'line',
               label: {
                 show: false,
@@ -655,6 +658,14 @@ export default {
         this.realTimeAlarmData = JSON.parse(JSON.stringify(res.data.alarmDataList))
         this.scrollKey2 = new Date().getTime()
       })
+
+      realTimeData({
+        monitorType: this.typeData
+      }).then(res => {
+        console.log(res)
+        this.table1Data = res.data
+        this.scrollKey1 = new Date().getTime()
+      })
     },
     selectChange(data) {
       this.selectData = data