diff --git a/hw-ui/src/api/ems/base/baseCollectDeviceInfo.js b/hw-ui/src/api/ems/base/baseCollectDeviceInfo.js
new file mode 100644
index 00000000..160d29c5
--- /dev/null
+++ b/hw-ui/src/api/ems/base/baseCollectDeviceInfo.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询采集设备信息列表
+export function listBaseCollectDeviceInfo(query) {
+ return request({
+ url: '/ems/base/baseCollectDeviceInfo/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询采集设备信息详细
+export function getBaseCollectDeviceInfo(objId) {
+ return request({
+ url: '/ems/base/baseCollectDeviceInfo/' + objId,
+ method: 'get'
+ })
+}
+
+// 新增采集设备信息
+export function addBaseCollectDeviceInfo(data) {
+ return request({
+ url: '/ems/base/baseCollectDeviceInfo',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改采集设备信息
+export function updateBaseCollectDeviceInfo(data) {
+ return request({
+ url: '/ems/base/baseCollectDeviceInfo',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除采集设备信息
+export function delBaseCollectDeviceInfo(objId) {
+ return request({
+ url: '/ems/base/baseCollectDeviceInfo/' + objId,
+ method: 'delete'
+ })
+}
+
+// 查询采集设备信息列表
+export function getCollectDeviceInfo(query) {
+ return request({
+ url: '/ems/base/baseCollectDeviceInfo/getCollectDeviceInfo',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/hw-ui/src/api/ems/base/baseEnergyType.js b/hw-ui/src/api/ems/base/baseEnergyType.js
new file mode 100644
index 00000000..cef29cd6
--- /dev/null
+++ b/hw-ui/src/api/ems/base/baseEnergyType.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询能源类型信息列表
+export function listBaseEnergyType(query) {
+ return request({
+ url: '/ems/base/baseEnergyType/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询能源类型信息详细
+export function getBaseEnergyType(objId) {
+ return request({
+ url: '/ems/base/baseEnergyType/' + objId,
+ method: 'get'
+ })
+}
+
+// 新增能源类型信息
+export function addBaseEnergyType(data) {
+ return request({
+ url: '/ems/base/baseEnergyType',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改能源类型信息
+export function updateBaseEnergyType(data) {
+ return request({
+ url: '/ems/base/baseEnergyType',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除能源类型信息
+export function delBaseEnergyType(objId) {
+ return request({
+ url: '/ems/base/baseEnergyType/' + objId,
+ method: 'delete'
+ })
+}
+
+// 查询能源类型信息列表
+export function getBaseEnergyTypeList(query) {
+ return request({
+ url: '/ems/base/baseEnergyType/getBaseEnergyTypeList',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/hw-ui/src/api/ems/base/baseMonitorInfo.js b/hw-ui/src/api/ems/base/baseMonitorInfo.js
new file mode 100644
index 00000000..466f5a3d
--- /dev/null
+++ b/hw-ui/src/api/ems/base/baseMonitorInfo.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询计量设备信息列表
+export function listBaseMonitorInfo(query) {
+ return request({
+ url: '/ems/base/baseMonitorInfo/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询计量设备信息详细
+export function getBaseMonitorInfo(objId) {
+ return request({
+ url: '/ems/base/baseMonitorInfo/' + objId,
+ method: 'get'
+ })
+}
+
+// 新增计量设备信息
+export function addBaseMonitorInfo(data) {
+ return request({
+ url: '/ems/base/baseMonitorInfo',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改计量设备信息
+export function updateBaseMonitorInfo(data) {
+ return request({
+ url: '/ems/base/baseMonitorInfo',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除计量设备信息
+export function delBaseMonitorInfo(objId) {
+ return request({
+ url: '/ems/base/baseMonitorInfo/' + objId,
+ method: 'delete'
+ })
+}
+
+// 查询计量设备信息下拉树结构
+export function getMonitorInfoTree(data) {
+ return request({
+ url: '/ems/base/baseMonitorInfo/monitorInfoTree',
+ method: 'post',
+ data: data
+ })
+}
diff --git a/hw-ui/src/api/ems/record/recordIOTInstant.js b/hw-ui/src/api/ems/record/recordIOTInstant.js
new file mode 100644
index 00000000..264b0939
--- /dev/null
+++ b/hw-ui/src/api/ems/record/recordIOTInstant.js
@@ -0,0 +1,53 @@
+import request from '@/utils/request'
+
+// 查询物联网实时数据列表
+export function listRecordIOTInstant(query) {
+ return request({
+ url: '/ems/record/recordIOTInstant/list',
+ method: 'get',
+ params: query
+ })
+}
+
+// 查询物联网实时数据详细
+export function getRecordIOTInstant(objid) {
+ return request({
+ url: '/ems/record/recordIOTInstant/' + objid,
+ method: 'get'
+ })
+}
+
+// 新增物联网实时数据
+export function addRecordIOTInstant(data) {
+ return request({
+ url: '/ems/record/recordIOTInstant',
+ method: 'post',
+ data: data
+ })
+}
+
+// 修改物联网实时数据
+export function updateRecordIOTInstant(data) {
+ return request({
+ url: '/ems/record/recordIOTInstant',
+ method: 'put',
+ data: data
+ })
+}
+
+// 删除物联网实时数据
+export function delRecordIOTInstant(objid) {
+ return request({
+ url: '/ems/record/recordIOTInstant/' + objid,
+ method: 'delete'
+ })
+}
+
+// 查询电实时数据（曲线）
+export function iotInstantList(query) {
+ return request({
+ url: '/ems/record/recordIOTInstant/iotInstantList',
+ method: 'get',
+ params: query
+ })
+}
diff --git a/hw-ui/src/components/Charts/Chart.vue b/hw-ui/src/components/Charts/Chart.vue
new file mode 100644
index 00000000..6eb0e6e3
--- /dev/null
+++ b/hw-ui/src/components/Charts/Chart.vue
@@ -0,0 +1,51 @@
+
+
+
+
+
diff --git a/hw-ui/src/views/ems/base/baseCollectDeviceInfo/index.vue b/hw-ui/src/views/ems/base/baseCollectDeviceInfo/index.vue
new file mode 100644
index 00000000..8daff491
--- /dev/null
+++ b/hw-ui/src/views/ems/base/baseCollectDeviceInfo/index.vue
@@ -0,0 +1,403 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+
+ 修改
+
+
+
+ 删除
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.produceDate, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 修改
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+ 新增
+
+
+ 展开/折叠
+
+
+
+
+
+
+
+
+
+
+ {{ dict.type.monitor_type.find(e=>e.value == scope.row.monitorType).label}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}
+
+
+
+
+
+ {{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}
+
+
+
+
+
+
+ 修改
+ 新增
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/hw-ui/src/views/ems/record/recordIOTInstant/index.vue b/hw-ui/src/views/ems/record/recordIOTInstant/index.vue
new file mode 100644
index 00000000..9a99b973
--- /dev/null
+++ b/hw-ui/src/views/ems/record/recordIOTInstant/index.vue
@@ -0,0 +1,590 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 导出
+
+
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+
+
+
+ {{ parseTime(scope.row.recodeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 搜索
+ 重置
+
+
+
+
+
+
+
+
+
+