diff --git a/src/pages/modules/home/index.vue b/src/pages/modules/home/index.vue index 812b552..0ce2b24 100644 --- a/src/pages/modules/home/index.vue +++ b/src/pages/modules/home/index.vue @@ -65,7 +65,7 @@
-
+
@@ -204,14 +204,14 @@
-

设备用电情况

+

设备用电/气情况

  • 设备名称
  • -
  • 当日用电量
  • -
  • 当月用电量
  • +
  • 当日用电/气量
  • +
  • 当月用电/气量
@@ -229,7 +229,7 @@
-
@@ -304,7 +304,7 @@ export default { historyList: [], // 历史分析 historymonthList: [], // 历史分析整月 devicekwhList: [], // 设备用电情况 - devicekqiList: [], // 设备用气情况 + // devicekqiList: [], // 设备用气情况 deviceRunStat: {}, // 设备运行统计 pressdayList: [], // 压制当日生产统计 unstackingdayList: [] // 分拣当日生产统计 @@ -449,14 +449,14 @@ export default { this.clearTime() this.mixingList = [...res.mixingList] this.productList = [...res.productList] - this.todayproductList = [...res.todayproductList] this.historyList = [...res.historyList] this.historymonthList = [...res.historymonthList] this.devicekwhList = [...res.devicekwhList] - this.devicekqiList = [...res.devicekqiList] + // this.devicekqiList = [...res.devicekqiList] this.SplitData(res.deviceRunStat) this.pressdayList = [...res.pressdayList] this.unstackingdayList = [...res.unstackingdayList] + this.todayproductList = [...res.todayproductList] // this.setEchart1() this.setEchart2() this.setEchart3() @@ -1707,4 +1707,8 @@ export default { width: 90%; } } +.content_wraper3 + .scroll_wrap + overflow hidden + height 250px