diff --git a/src/views/dashboard/PanelGroup.vue b/src/views/dashboard/PanelGroup.vue index 3ff8993..5365dfa 100644 --- a/src/views/dashboard/PanelGroup.vue +++ b/src/views/dashboard/PanelGroup.vue @@ -7,7 +7,7 @@
- 计划订单数量 + 设备总数
@@ -20,7 +20,7 @@
- 在制订单数量 + 在线设备数
@@ -33,7 +33,7 @@
- 今日计划米数 + 标准能耗
@@ -46,7 +46,7 @@
- 今日完成米数 + 今日能耗
diff --git a/src/views/ems/report/comparativeAnalysisReport/index.vue b/src/views/ems/report/comparativeAnalysisReport/index.vue index 79efac8..8e628b1 100644 --- a/src/views/ems/report/comparativeAnalysisReport/index.vue +++ b/src/views/ems/report/comparativeAnalysisReport/index.vue @@ -129,8 +129,8 @@ export default { monitorCode: null, workUnitCode: null, monitorStatus: null, - monitorType: null, workUnitCodeList: null, + monitorType: 2, dateType: 10 }, // 表单参数 @@ -267,7 +267,6 @@ export default { }, /** 搜索按钮操作 */ handleQuery() { - this.queryParams.pageNum = 1 this.getList(true) }, /** 重置按钮操作 */