diff --git a/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue b/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
index 5eef614..476daef 100644
--- a/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
+++ b/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
@@ -56,9 +56,14 @@
-
+
+
+
+ {{ getEnergyTypeName(scope.row.monitorType) }}
@@ -412,7 +417,13 @@ export default {
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => { });
- }
+ },
+
+ /** 获取能源类型名称 */
+ getEnergyTypeName(energyTypeId) {
+ const energyType = this.energyTypeList.find(item => item.energyTypeId === energyTypeId);
+ return energyType ? energyType.energyName : '';
+ },
}
};
diff --git a/src/views/ems/record/recordSteamInstant/index.vue b/src/views/ems/record/recordSteamInstant/index.vue
index 780c59e..b79114d 100644
--- a/src/views/ems/record/recordSteamInstant/index.vue
+++ b/src/views/ems/record/recordSteamInstant/index.vue
@@ -49,7 +49,7 @@
end-placeholder="结束时间"
>
-->
-
+
+
+
+
+
+
+
+
+
搜索
重置
@@ -290,6 +315,8 @@ export default {
daterangeCollectTime: [],
// 记录时间时间范围
daterangeRecordTime: [],
+ // 时间范围
+ timerangeRecordTime: [],
// 查询参数
queryParams: {
pageNum: 1,
@@ -336,6 +363,20 @@ export default {
/* const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
this.daterangeCollectTime[0] = nowDate + ' 00:00:00'
this.daterangeCollectTime[1] = nowDate + ' 23:59:59'*/
+
+ const today = new Date();
+ const yesterday = new Date(today);
+ yesterday.setDate(today.getDate() - 1);
+
+ //时间默认为8点
+ /* this.timerangeRecordTime = ['08:30:00', '08:30:00']; */
+ this.timerangeRecordTime[0] = '08:00:00';
+ this.timerangeRecordTime[1] = '08:00:00';
+
+ this.daterangeRecordTime[0] = parseTime(yesterday, '{y}-{m}-{d}') ;
+ this.daterangeRecordTime[1] = parseTime(today, '{y}-{m}-{d}') ;
+
+
this.getTreeselect()
this.getTreeMonitorInfo()
this.getList()
@@ -372,12 +413,12 @@ export default {
this.loading = true
this.queryParams.params = {}
if (null != this.daterangeCollectTime && '' != this.daterangeCollectTime) {
- this.queryParams.params['beginCollectTime'] = this.daterangeCollectTime[0]
- this.queryParams.params['endCollectTime'] = this.daterangeCollectTime[1]
+ this.queryParams.params['beginCollectTime'] =this.daterangeCollectTime[0] + ' ' + this.timerangeRecordTime[0];
+ this.queryParams.params['endCollectTime'] =this.daterangeCollectTime[1] + ' ' + this.timerangeRecordTime[1];
}
if (null != this.daterangeRecordTime && '' != this.daterangeRecordTime) {
- this.queryParams.params['beginRecordTime'] = this.daterangeRecordTime[0]
- this.queryParams.params['endRecordTime'] = this.daterangeRecordTime[1]
+ this.queryParams.params['beginRecordTime'] =this.daterangeRecordTime[0] + ' ' + this.timerangeRecordTime[0];
+ this.queryParams.params['endRecordTime'] = this.daterangeRecordTime[1] + 'T' + this.timerangeRecordTime[1];
}
listRecordSteamInstant(this.queryParams).then(response => {
this.recordSteamInstantList = response.rows
@@ -514,36 +555,6 @@ export default {
}
}
}
-/*
-
-function sortByPrefixOrder(data, order) {
- // 将数据按前缀分组
- const groupedData = {};
- data.forEach(item => {
- const prefix = item.code.split('_')[0];
- if (!groupedData[prefix]) {
- groupedData[prefix] = [];
- }
- groupedData[prefix].push(item);
- });
-
- // 按照特定顺序排序
- const sortedData = [];
- order.forEach(prefix => {
- if (groupedData[prefix]) {
- sortedData.push(...groupedData[prefix]);
- }
- });
- // 处理不在特定顺序中的数据
- data.forEach(item => {
- if (!sortedData.includes(item)) {
- sortedData.push(item);
- }
- });
-
- return sortedData;
-}
-*/