修改看板接口

hw-ui/src/views/board/production/firstFloor.vue

@@ -378,6 +378,9 @@ export default {
 }
 
 .scrollTableItem {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow:ellipsis;
   display: inline-block;
   width: calc(100% / 6);
   text-align: center;

hw-ui/src/views/board/warehouse/firstFloor.vue

@@ -185,39 +185,7 @@ export default {
         singleWidth: 0, // 单步运动停止的宽度(默认值0是无缝不停止的滚动) direction => 2/3
         waitTime: 0
       },
-      scrollTableData: [
-        {
-          'createBy': null,
-          'createTime': null,
-          'updateBy': null,
-          'updateTime': null,
-          'remark': null,
-          'objid': 463400,
-          'monitorId': 'E0004_3500',
-          'monitorName': '空压机',
-          'address': null,
-          'collectTime': '2024-12-04 12:56:33',
-          'recordTime': '2024-12-04T12:56:39.000+08:00',
-          'glys': 0.912,
-          'zxyg': 62.94,
-          'activePower': 0.00,
-          'reactivePower': 0.00,
-          'consumption': null,
-          'collectType': null,
-          'deptId': null,
-          'userId': null,
-          'monitorSubset': null,
-          'onlineState': null,
-          'startTime': null,
-          'endTime': null,
-          'vc': 229.90,
-          'vb': 230.10,
-          'va': 229.40,
-          'ia': 0.02,
-          'ib': 0.01,
-          'ic': 0.01
-        }
-      ],
+      scrollTableData: [],
       scrollTableData1: []
     }
   },
@@ -232,66 +200,7 @@ export default {
     getData() {
       energyFirstFloorData().then(e=>{
         console.log(e)
-      })
-      getEnergyHistoryData().then(e=>{
-        console.log(e)
-      })
-      let data = [
-        {
-          'is_ammeter': '否',
-          'expendPercentage': '7%',
-          'monitorId': 'E0004_3400',
-          'monitorName': '折弯1',
-          'expend': 2.83,
-          'meterValue': 11.24,
-          'timeRange': '2024-11-04 至 2024-12-04'
-        },
-        {
-          'is_ammeter': '否',
-          'expendPercentage': '0%',
-          'monitorId': 'E0004_3300',
-          'monitorName': '折弯2',
-          'expend': 0.00,
-          'meterValue': 2.80,
-          'timeRange': '2024-11-04 至 2024-12-04'
-        },
-        {
-          'is_ammeter': '否',
-          'expendPercentage': '27%',
-          'monitorId': 'E0004_0400',
-          'monitorName': '激光下料',
-          'expend': 10.44,
-          'meterValue': 36.81,
-          'timeRange': '2024-11-04 至 2024-12-04'
-        },
-        {
-          'is_ammeter': '否',
-          'expendPercentage': '0%',
-          'monitorId': 'E0004_0200',
-          'monitorName': '烘干机',
-          'expend': 0.20,
-          'meterValue': 1.19,
-          'timeRange': '2024-11-04 至 2024-12-04'
-        },
-        {
-          'is_ammeter': '否',
-          'expendPercentage': '41%',
-          'monitorId': 'E0004_3500',
-          'monitorName': '空压机',
-          'expend': 15.53,
-          'meterValue': 62.93,
-          'timeRange': '2024-11-04 至 2024-12-04'
-        },
-        {
-          'is_ammeter': '否',
-          'expendPercentage': '22%',
-          'monitorId': 'E0004_0300',
-          'monitorName': '除尘系统',
-          'expend': 8.30,
-          'meterValue': 33.09,
-          'timeRange': '2024-11-04 至 2024-12-04'
-        }
-      ]
+        let data = e.rows
         this.$refs.chart3.setData({
           tooltip: {
             trigger: 'axis',
@@ -373,6 +282,11 @@ export default {
             }
           ]
         })
+      })
+      getEnergyHistoryData().then(e=>{
+        console.log(e)
+        this.scrollTableData = e.rows
+      })
     }
   }
 }