diff --git a/src/views/ems/base/baseMonitorInfo/index.vue b/src/views/ems/base/baseMonitorInfo/index.vue
index 41cf94a..a06ea3c 100644
--- a/src/views/ems/base/baseMonitorInfo/index.vue
+++ b/src/views/ems/base/baseMonitorInfo/index.vue
@@ -162,7 +162,14 @@
-
+
+
+
@@ -213,6 +220,8 @@
import { listBaseMonitorInfo, getBaseMonitorInfo, delBaseMonitorInfo, addBaseMonitorInfo, updateBaseMonitorInfo } from "@/api/ems/base/baseMonitorInfo";
import Treeselect from "@riophae/vue-treeselect";
import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { getBaseEnergyTypeList } from '@/api/ems/base/baseEnergyType'
+import { getCollectDeviceInfo } from '@/api/ems/base/baseCollectDeviceInfo'
export default {
name: "BaseMonitorInfo",
@@ -298,10 +307,15 @@ export default {
{key: 20, label: `更新时间`, visible: false},
{key: 21, label: `公摊表类型`, visible: false},
{key: 22, label: `表具层级`, visible: false},
- ]
+ ],
+ // 采集设备选项选项
+ collectDeviceList: []
};
},
created() {
+ getCollectDeviceInfo({}).then(response => {
+ this.collectDeviceList = response.data
+ })
this.getList();
},
methods: {
diff --git a/src/views/ems/record/recordDnbInstant/index.vue b/src/views/ems/record/recordDnbInstant/index.vue
index a79528e..620dfa2 100644
--- a/src/views/ems/record/recordDnbInstant/index.vue
+++ b/src/views/ems/record/recordDnbInstant/index.vue
@@ -15,7 +15,7 @@
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
+ label-width="100px"
+ >
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -66,87 +70,66 @@
/>
-
-
-
- -
-
-
-
-
-
搜索
重置
-
- 新增
-
-
-
- 修改
-
-
-
- 删除
-
-
-
- 导出
-
-
-
+
+ 新增
+
+
+
+ 修改
+
+
+
+ 删除
+
+
+
+ 导出
+
+
+
-
-
+
+
{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
@@ -158,45 +141,42 @@
-
-
- {{ parseTime(scope.row.recordTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-
-
-
+
-
+ {{ parseTime(scope.row.recordTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-
+
- 修改
-
- 删除
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
@@ -211,12 +191,11 @@
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
{
- this.baseMonitorInfoOptions = [];
- const data = { objId: 0, monitorName: '顶级节点', children: [] };
- data.children = this.handleTree(response.data, "objId", "parentId");
- this.baseMonitorInfoOptions.push(data);
- });
- },
- //因为重置后时间选择器视图不更新，所以强制更新
- changeDate() {
- this.$forceUpdate()
+ listBaseMonitorInfo({ monitorType: 2 }).then(response => {
+ this.baseMonitorInfoOptions = []
+ const data = { objId: 0, monitorName: '顶级节点', children: [] }
+ data.children = this.handleTree(response.data, 'objId', 'parentId')
+ this.baseMonitorInfoOptions.push(data)
+ })
},
/** 查询电实时数据列表 */
getList() {
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]
+ }
+ if (null != this.daterangeRecordTime && '' != this.daterangeRecordTime) {
+ this.queryParams.params['beginRecordTime'] = this.daterangeRecordTime[0]
+ this.queryParams.params['endRecordTime'] = this.daterangeRecordTime[1]
+ }
listRecordDnbInstant(this.queryParams).then(response => {
this.recordDnbInstantList = response.rows
this.total = response.total
@@ -446,8 +426,7 @@ export default {
reset() {
this.form = {
objId: null,
- monitorId: null,
- monitorType:2,
+ monitorCode: null,
collectTime: null,
va: null,
vb: null,
@@ -460,7 +439,7 @@ export default {
zxyg: null,
activePower: null,
reactivePower: null,
- collectType: null
+ collectType: 1
}
this.resetForm('form')
},
@@ -471,11 +450,7 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
- this.queryParams.beginCollectTime = this.nowBeginTime;
- this.queryParams.endCollectTime = this.nowEndTime;
- this.queryParams.beginRecordTime = this.nowBeginTime;
- this.queryParams.endRecordTime = this.nowEndTime;
- this.queryParams.monitorId = null
+ this.queryParams.monitorCode = null
this.resetForm('queryForm')
this.handleQuery()
},
@@ -541,8 +516,8 @@ export default {
/** 查询计量设备信息下拉树结构 */
getTreeselect() {
- getMonitorInfoTree(this.form).then(response => {
- this.monitorInfoOptions = response.data;
+ getMonitorInfoTree({ monitorType: 2 }).then(response => {
+ this.monitorInfoOptions = response.data
})
},
@@ -551,11 +526,12 @@ export default {
if (!value) return true
return data.label.indexOf(value) !== -1
},
+
// 节点单击事件
handleNodeClick(data) {
- this.queryParams.monitorId = data.id
+ this.queryParams.monitorCode = data.code
this.handleQuery()
- },
+ }
}
}
diff --git a/src/views/ems/record/recordWaterInstant/index.vue b/src/views/ems/record/recordWaterInstant/index.vue
index 8e2a198..51ae741 100644
--- a/src/views/ems/record/recordWaterInstant/index.vue
+++ b/src/views/ems/record/recordWaterInstant/index.vue
@@ -15,7 +15,7 @@
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
- 搜索
- 重置
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
-
-
- 新增
-
-
-
- 修改
-
-
-
- 删除
-
-
-
- 导出
-
-
-
-
+
+
+ 新增
+
+
+
+ 修改
+
+
+
+ 删除
+
+
+
+ 导出
+
+
+
+
-
-
-
-
-
-
-
- {{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-
-
-
-
-
-
- {{ parseTime(scope.row.recordTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
-
-
-
-
-
-
-
-
-
- 修改
-
- 删除
-
-
-
-
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+ {{ parseTime(scope.row.recordTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
+ placeholder="请选择采集时间"
+ >
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
+
{
- this.baseMonitorInfoOptions = [];
- const data = { objId: 0, monitorName: '顶级节点', children: [] };
- data.children = this.handleTree(response.data, "objId", "parentId");
- this.baseMonitorInfoOptions.push(data);
- });
+ listBaseMonitorInfo({ monitorType: 3 }).then(response => {
+ this.baseMonitorInfoOptions = []
+ const data = { objId: 0, monitorName: '顶级节点', children: [] }
+ data.children = this.handleTree(response.data, 'objId', 'parentId')
+ this.baseMonitorInfoOptions.push(data)
+ })
},
/** 查询水实时数据列表 */
getList() {
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]
+ }
+ if (null != this.daterangeRecordTime && '' != this.daterangeRecordTime) {
+ this.queryParams.params['beginRecordTime'] = this.daterangeRecordTime[0]
+ this.queryParams.params['endRecordTime'] = this.daterangeRecordTime[1]
+ }
listRecordWaterInstant(this.queryParams).then(response => {
this.recordWaterInstantList = response.rows
this.total = response.total
@@ -367,13 +359,12 @@ export default {
reset() {
this.form = {
objId: null,
- monitorId: null,
- monitorType: 3,
+ monitorName: null,
collectTime: null,
fluxFlow: null,
waterFlow: null,
recordTime: null,
- collectType: null
+ collectType: 1
}
this.resetForm('form')
},
@@ -384,11 +375,7 @@ export default {
},
/** 重置按钮操作 */
resetQuery() {
- this.queryParams.beginCollectTime = this.nowBeginTime
- this.queryParams.endCollectTime = this.nowEndTime
- this.queryParams.beginRecordTime = this.nowBeginTime
- this.queryParams.endRecordTime = this.nowEndTime
- this.queryParams.monitorId = null
+ this.queryParams.monitorCode = null
this.resetForm('queryForm')
this.handleQuery()
},
@@ -451,10 +438,11 @@ export default {
...this.queryParams
}, `recordWaterInstant_${new Date().getTime()}.xlsx`)
},
+
/** 查询计量设备信息下拉树结构 */
getTreeselect() {
- getMonitorInfoTree(this.form).then(response => {
- this.monitorInfoOptions = response.data;
+ getMonitorInfoTree({ monitorType: 3 }).then(response => {
+ this.monitorInfoOptions = response.data
})
},
@@ -464,7 +452,7 @@ export default {
delete node.children
}
return {
- id: node.objId,
+ id: node.monitorCode,
label: node.monitorName,
children: node.children
}
@@ -477,7 +465,7 @@ export default {
},
// 节点单击事件
handleNodeClick(data) {
- this.queryParams.monitorId = data.id
+ this.queryParams.monitorCode = data.code
this.handleQuery()
}
}