From 83e370533cf7c5d7c82bb5b24ffd9c46db1e5963 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E9=9B=AA=E4=BC=9F?= <maxw@mesnac.com>
Date: Tue, 22 Oct 2024 13:39:10 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=83=BD=E6=BA=90=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=A8=A1=E5=9D=97=E7=9A=84=E5=AE=9E=E6=97=B6=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E5=89=8D=E7=AB=AF=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/ems/base/baseCollectDeviceInfo.js |  53 ++
 hw-ui/src/api/ems/base/baseEnergyType.js      |  53 ++
 hw-ui/src/api/ems/base/baseMonitorInfo.js     |  53 ++
 hw-ui/src/api/ems/record/recordIOTInstant.js  |  53 ++
 hw-ui/src/components/Charts/Chart.vue         |  51 ++
 .../ems/base/baseCollectDeviceInfo/index.vue  | 403 ++++++++++++
 .../views/ems/base/baseEnergyType/index.vue   | 294 +++++++++
 .../base/baseMonitorInfoIOTDevice/index.vue   | 418 +++++++++++++
 .../ems/record/recordIOTInstant/index.vue     | 590 ++++++++++++++++++
 .../ems/report/currentIOTCurve/index.vue      | 511 +++++++++++++++
 10 files changed, 2479 insertions(+)
 create mode 100644 hw-ui/src/api/ems/base/baseCollectDeviceInfo.js
 create mode 100644 hw-ui/src/api/ems/base/baseEnergyType.js
 create mode 100644 hw-ui/src/api/ems/base/baseMonitorInfo.js
 create mode 100644 hw-ui/src/api/ems/record/recordIOTInstant.js
 create mode 100644 hw-ui/src/components/Charts/Chart.vue
 create mode 100644 hw-ui/src/views/ems/base/baseCollectDeviceInfo/index.vue
 create mode 100644 hw-ui/src/views/ems/base/baseEnergyType/index.vue
 create mode 100644 hw-ui/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
 create mode 100644 hw-ui/src/views/ems/record/recordIOTInstant/index.vue
 create mode 100644 hw-ui/src/views/ems/report/currentIOTCurve/index.vue

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 @@
+<template>
+  <div />
+</template>
+
+<script>
+import * as echarts from 'echarts';
+import 'echarts-liquidfill'
+import Logo from "@/layout/components/Sidebar/Logo";
+
+export default {
+  watch:{
+    chartOption: {
+      handler(newVal, oldVal) {
+        if(newVal){
+          this.initChart(newVal)
+        }
+      },
+      deep: true, // 是否深度监听
+    }
+  },
+  props:['chartOption'],
+  expose: ['setData'],
+  data() {
+    return {
+      chart: null,
+    }
+  },
+  mounted() {
+    if(this.chartOption){
+      this.initChart(this.chartOption)
+    }
+  },
+  beforeDestroy() {
+    if (!this.chart) {
+      return
+    }
+    this.chart.dispose()
+    this.chart = null
+  },
+  methods: {
+    setData(option) {
+      this.initChart(option)
+    },
+    initChart(option) {
+      this.chart = echarts.init(this.$el, 'macarons')
+
+      this.chart.setOption(option)
+    }
+  }
+}
+</script>
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 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <!--      <el-form-item label="采集设备编号" prop="collectDeviceId">-->
+      <!--        <el-input-->
+      <!--          v-model="queryParams.collectDeviceId"-->
+      <!--          placeholder="请输入采集设备编号"-->
+      <!--          clearable-->
+      <!--          @keyup.enter.native="handleQuery"-->
+      <!--        />-->
+      <!--      </el-form-item>-->
+      <el-form-item label="采集设备名称" prop="collectDeviceName">
+        <el-input
+          v-model="queryParams.collectDeviceName"
+          placeholder="请输入采集设备名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="能源类型" prop="energyTypeId">
+        <el-select v-model="queryParams.energyTypeId" placeholder="请选择能源类型">
+          <el-option
+            v-for="item in energyTypeList"
+            :key="item.energyTypeId"
+            :label="item.energyName"
+            :value="item.energyTypeId"
+          ></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="启用标识" prop="isFlag">
+        <el-select v-model="queryParams.isFlag" placeholder="请选择启用标识" clearable>
+          <el-option
+            v-for="dict in dict.type.is_flag"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['ems/base:baseCollectDeviceInfo:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['ems/base:baseCollectDeviceInfo:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['ems/base:baseCollectDeviceInfo:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['ems/base:baseCollectDeviceInfo:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="baseCollectDeviceInfoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="自增标识" align="center" prop="objId" v-if="columns[0].visible"/>
+      <el-table-column label="采集设备编号" align="center" prop="collectDeviceId" v-if="columns[1].visible"/>
+      <el-table-column label="采集设备名称" align="center" prop="collectDeviceName" v-if="columns[2].visible"/>
+      <el-table-column label="能源类型" align="center" prop="energyTypeName" v-if="columns[3].visible"/>
+      <el-table-column label="型号" align="center" prop="model" v-if="columns[4].visible"/>
+      <el-table-column label="生产厂家" align="center" prop="manufacturer" v-if="columns[5].visible"/>
+      <el-table-column label="通讯地址" align="center" prop="ipAddress" v-if="columns[6].visible"/>
+      <el-table-column label="生产日期" align="center" prop="produceDate" width="180" v-if="columns[7].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.produceDate, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="安装地址" align="center" prop="settingAddress" v-if="columns[8].visible"/>
+      <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[9].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" v-if="columns[10].visible"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['ems/base:baseCollectDeviceInfo:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['ems/base:baseCollectDeviceInfo:remove']"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改采集设备信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="采集设备编号" prop="collectDeviceId">
+          <el-input v-model="form.collectDeviceId" placeholder="请输入采集设备编号"/>
+        </el-form-item>
+        <el-form-item label="采集设备名称" prop="collectDeviceName">
+          <el-input v-model="form.collectDeviceName" placeholder="请输入采集设备名称"/>
+        </el-form-item>
+        <el-form-item label="能源类型" prop="energyTypeId">
+          <el-select v-model="form.energyTypeId" placeholder="请选择能源类型编号">
+            <el-option
+              v-for="item in energyTypeList"
+              :key="item.energyTypeId"
+              :label="item.energyName"
+              :value="item.energyTypeId"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="型号" prop="model">
+          <el-input v-model="form.model" placeholder="请输入型号"/>
+        </el-form-item>
+        <el-form-item label="生产厂家" prop="manufacturer">
+          <el-input v-model="form.manufacturer" placeholder="请输入生产厂家"/>
+        </el-form-item>
+        <el-form-item label="通讯地址" prop="ipAddress">
+          <el-input v-model="form.ipAddress" placeholder="请输入通讯地址"/>
+        </el-form-item>
+        <el-form-item label="生产日期" prop="produceDate">
+          <el-date-picker clearable
+                          v-model="form.produceDate"
+                          type="date"
+                          value-format="yyyy-MM-dd"
+                          placeholder="请选择生产日期"
+          >
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="安装地址" prop="settingAddress">
+          <el-input v-model="form.settingAddress" placeholder="请输入安装地址"/>
+        </el-form-item>
+        <el-form-item label="启用标识" prop="isFlag">
+          <el-radio-group v-model="form.isFlag">
+            <el-radio
+              v-for="dict in dict.type.is_flag"
+              :key="dict.value"
+              :label="dict.value"
+            >{{ dict.label }}
+            </el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listBaseCollectDeviceInfo,
+  getBaseCollectDeviceInfo,
+  delBaseCollectDeviceInfo,
+  addBaseCollectDeviceInfo,
+  updateBaseCollectDeviceInfo
+} from '@/api/ems/base/baseCollectDeviceInfo'
+import { getBaseEnergyTypeList } from '@/api/ems/base/baseEnergyType'
+
+export default {
+  name: 'BaseCollectDeviceInfo',
+  dicts: ['is_flag'],
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 采集设备信息表格数据
+      baseCollectDeviceInfoList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        collectDeviceId: null,
+        collectDeviceName: null,
+        energyTypeId: null,
+        model: null,
+        manufacturer: null,
+        ipAddress: null,
+        produceDate: null,
+        settingAddress: null,
+        isFlag: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        objId: [
+          { required: true, message: '自增标识不能为空', trigger: 'blur' }
+        ],
+        collectDeviceId: [
+          { required: true, message: '采集设备编号不能为空', trigger: 'blur' }
+        ],
+        collectDeviceName: [
+          { required: true, message: '采集设备名称不能为空', trigger: 'blur' }
+        ],
+        energyTypeId: [
+          { required: true, message: '能源类型不能为空', trigger: 'blur' }
+        ]
+      },
+      columns: [
+        { key: 0, label: `自增标识`, visible: false },
+        { key: 1, label: `采集设备编号`, visible: true },
+        { key: 2, label: `采集设备名称`, visible: true },
+        { key: 3, label: `能源类型`, visible: true },
+        { key: 4, label: `型号`, visible: true },
+        { key: 5, label: `生产厂家`, visible: true },
+        { key: 6, label: `通讯地址`, visible: true },
+        { key: 7, label: `生产日期`, visible: true },
+        { key: 8, label: `安装地址`, visible: true },
+        { key: 9, label: `启用标识`, visible: true },
+        { key: 10, label: `备注`, visible: true }
+      ],
+      // 能源类型选项
+      energyTypeList: []
+    }
+  },
+  created() {
+    getBaseEnergyTypeList({}).then(response => {
+      this.energyTypeList = response.data
+    })
+    this.getList()
+  },
+  methods: {
+    /** 查询采集设备信息列表 */
+    getList() {
+      this.loading = true
+      listBaseCollectDeviceInfo(this.queryParams).then(response => {
+        this.baseCollectDeviceInfoList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        collectDeviceId: null,
+        collectDeviceName: null,
+        energyTypeId: null,
+        model: null,
+        manufacturer: null,
+        ipAddress: null,
+        produceDate: null,
+        settingAddress: null,
+        isFlag: '0',
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.objId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加采集设备信息'
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const objId = row.objId || this.ids
+      getBaseCollectDeviceInfo(objId).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = '修改采集设备信息'
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.objId != null) {
+            updateBaseCollectDeviceInfo(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addBaseCollectDeviceInfo(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const objIds = row.objId || this.ids
+      this.$modal.confirm('是否确认删除采集设备信息编号为"' + objIds + '"的数据项？').then(function() {
+        return delBaseCollectDeviceInfo(objIds)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ems/base/baseCollectDeviceInfo/export', {
+        ...this.queryParams
+      }, `baseCollectDeviceInfo_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>
diff --git a/hw-ui/src/views/ems/base/baseEnergyType/index.vue b/hw-ui/src/views/ems/base/baseEnergyType/index.vue
new file mode 100644
index 00000000..42567ebd
--- /dev/null
+++ b/hw-ui/src/views/ems/base/baseEnergyType/index.vue
@@ -0,0 +1,294 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="能源类型名称" prop="energyName">
+        <el-input
+          v-model="queryParams.energyName"
+          placeholder="请输入能源类型名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="primary"-->
+<!--          plain-->
+<!--          icon="el-icon-plus"-->
+<!--          size="mini"-->
+<!--          @click="handleAdd"-->
+<!--          v-hasPermi="['ems/base:baseEnergyType:add']"-->
+<!--        >新增-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="success"-->
+<!--          plain-->
+<!--          icon="el-icon-edit"-->
+<!--          size="mini"-->
+<!--          :disabled="single"-->
+<!--          @click="handleUpdate"-->
+<!--          v-hasPermi="['ems/base:baseEnergyType:edit']"-->
+<!--        >修改-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          type="danger"-->
+<!--          plain-->
+<!--          icon="el-icon-delete"-->
+<!--          size="mini"-->
+<!--          :disabled="multiple"-->
+<!--          @click="handleDelete"-->
+<!--          v-hasPermi="['ems/base:baseEnergyType:remove']"-->
+<!--        >删除-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['ems/base:baseEnergyType:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="baseEnergyTypeList" @selection-change="handleSelectionChange">
+<!--      <el-table-column type="selection" width="55" align="center"/>-->
+      <el-table-column label="自增标识" align="center" prop="objId" v-if="columns[0].visible"/>
+      <el-table-column label="能源类型编号" align="center" prop="energyTypeId" v-if="columns[1].visible"/>
+      <el-table-column label="能源类型名称" align="center" prop="energyName" v-if="columns[2].visible"/>
+      <el-table-column label="单位" align="center" prop="measureUnit" v-if="columns[3].visible"/>
+      <el-table-column label="单价" align="center" prop="price" v-if="columns[4].visible"/>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['ems/base:baseEnergyType:edit']"
+          >修改
+          </el-button>
+<!--          <el-button-->
+<!--            size="mini"-->
+<!--            type="text"-->
+<!--            icon="el-icon-delete"-->
+<!--            @click="handleDelete(scope.row)"-->
+<!--            v-hasPermi="['ems/base:baseEnergyType:remove']"-->
+<!--          >删除-->
+<!--          </el-button>-->
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改能源类型信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+        <el-form-item label="能源类型编号" prop="energyTypeId">
+          <el-input v-model="form.energyTypeId" placeholder="请输入能源类型编号" disabled/>
+        </el-form-item>
+        <el-form-item label="能源类型名称" prop="energyName">
+          <el-input v-model="form.energyName" placeholder="请输入能源类型名称" disabled/>
+        </el-form-item>
+        <el-form-item label="单位" prop="measureUnit">
+          <el-input v-model="form.measureUnit" placeholder="请输入单位" disabled/>
+        </el-form-item>
+        <el-form-item label="单价" prop="price">
+          <el-input v-model="form.price" placeholder="请输入单价"/>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  listBaseEnergyType,
+  getBaseEnergyType,
+  delBaseEnergyType,
+  addBaseEnergyType,
+  updateBaseEnergyType
+} from '@/api/ems/base/baseEnergyType'
+
+export default {
+  name: 'BaseEnergyType',
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 能源类型信息表格数据
+      baseEnergyTypeList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        energyTypeId: null,
+        energyName: null,
+        measureUnit: null,
+        price: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        objId: [
+          { required: true, message: '自增标识不能为空', trigger: 'blur' }
+        ]
+      },
+      columns: [
+        { key: 0, label: `自增标识`, visible: false },
+        { key: 1, label: `能源类型编号`, visible: false },
+        { key: 2, label: `能源类型名称`, visible: true },
+        { key: 3, label: `单位`, visible: true },
+        { key: 4, label: `单价`, visible: true },
+        // { key: 5, label: `创建人`, visible: true },
+        // { key: 6, label: `创建时间`, visible: true },
+        // { key: 7, label: `更新人`, visible: true },
+        // { key: 8, label: `更新时间`, visible: true }
+      ]
+    }
+  },
+  created() {
+    this.getList()
+  },
+  methods: {
+    /** 查询能源类型信息列表 */
+    getList() {
+      this.loading = true
+      listBaseEnergyType(this.queryParams).then(response => {
+        this.baseEnergyTypeList = response.rows
+        this.total = response.total
+        this.loading = false
+      })
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        energyTypeId: null,
+        energyName: null,
+        measureUnit: null,
+        price: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null
+      }
+      this.resetForm('form')
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1
+      this.getList()
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.objId)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset()
+      this.open = true
+      this.title = '添加能源类型信息'
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset()
+      const objId = row.objId || this.ids
+      getBaseEnergyType(objId).then(response => {
+        this.form = response.data
+        this.open = true
+        this.title = '修改能源类型信息'
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs['form'].validate(valid => {
+        if (valid) {
+          if (this.form.objId != null) {
+            updateBaseEnergyType(this.form).then(response => {
+              this.$modal.msgSuccess('修改成功')
+              this.open = false
+              this.getList()
+            })
+          } else {
+            addBaseEnergyType(this.form).then(response => {
+              this.$modal.msgSuccess('新增成功')
+              this.open = false
+              this.getList()
+            })
+          }
+        }
+      })
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const objIds = row.objId || this.ids
+      this.$modal.confirm('是否确认删除能源类型信息编号为"' + objIds + '"的数据项？').then(function() {
+        return delBaseEnergyType(objIds)
+      }).then(() => {
+        this.getList()
+        this.$modal.msgSuccess('删除成功')
+      }).catch(() => {
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ems/base/baseEnergyType/export', {
+        ...this.queryParams
+      }, `baseEnergyType_${new Date().getTime()}.xlsx`)
+    }
+  }
+}
+</script>
diff --git a/hw-ui/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue b/hw-ui/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
new file mode 100644
index 00000000..5eef6149
--- /dev/null
+++ b/hw-ui/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
@@ -0,0 +1,418 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+      <el-form-item label="计量设备编号" prop="monitorCode">
+        <el-input v-model="queryParams.monitorCode" placeholder="请输入计量设备编号" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="计量设备名称" prop="monitorName">
+        <el-input v-model="queryParams.monitorName" placeholder="请输入计量设备名称" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="能源类型" prop="monitorType">
+        <el-select v-model="queryParams.monitorType" placeholder="请选择能源类型">
+          <el-option v-for="item in energyTypeList" :key="item.energyTypeId" :label="item.energyName"
+            :value="item.energyTypeId"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="计量设备位置" prop="monitorAddr">
+        <el-input v-model="queryParams.monitorAddr" placeholder="请输入计量设备位置" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="计量设备状态" prop="monitorStatus">
+        <el-select v-model="queryParams.monitorStatus" placeholder="请选择计量设备状态" clearable>
+          <el-option v-for="dict in dict.type.monitor_status" :key="dict.value" :label="dict.label"
+            :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="采集设备编号" prop="collectDeviceId">
+        <el-input v-model="queryParams.collectDeviceId" placeholder="请输入采集设备编号" clearable
+          @keyup.enter.native="handleQuery" />
+      </el-form-item>
+      <el-form-item label="是否虚拟" prop="isAmmeter">
+        <el-select v-model="queryParams.isAmmeter" placeholder="请选择是否虚拟" clearable>
+          <el-option v-for="dict in dict.type.is_ammeter" :key="dict.value" :label="dict.label" :value="dict.value" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+          v-hasPermi="['ems/base:baseMonitorInfo:add']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-if="refreshTable" v-loading="loading" :data="baseMonitorInfoList" row-key="objId"
+      :default-expand-all="isExpandAll" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
+      <el-table-column label="父级编号" prop="parentId" v-if="columns[1].visible" />
+      <el-table-column label="计量设备编号" align="center" prop="monitorCode" v-if="columns[2].visible" />
+      <el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[3].visible" />
+      <el-table-column label="能源类型" align="center" prop="monitorType" v-if="columns[4].visible">
+        <template slot-scope="scope">
+          {{ dict.type.monitor_type.find(e=>e.value == scope.row.monitorType).label}}
+        </template>
+      </el-table-column>
+      <el-table-column label="计量设备位置" align="center" prop="monitorAddr" v-if="columns[5].visible" />
+      <el-table-column label="计量设备状态" align="center" prop="monitorStatus" v-if="columns[6].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.monitor_status" :value="scope.row.monitorStatus" />
+        </template>
+      </el-table-column>
+      <el-table-column label="采集设备编号" align="center" prop="collectDeviceId" v-if="columns[7].visible" />
+      <el-table-column label="等级" align="center" prop="grade" v-if="columns[9].visible" />
+      <el-table-column label="传感器仪表" align="center" prop="meterTypeId" v-if="columns[10].visible" />
+      <el-table-column label="修正值" align="center" prop="correctValue" v-if="columns[11].visible" />
+      <el-table-column label="是否虚拟" align="center" prop="isAmmeter" v-if="columns[14].visible">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.is_ammeter" :value="scope.row.isAmmeter" />
+        </template>
+      </el-table-column>
+      <el-table-column label="通断复位" align="center" prop="isKeyMonitor" v-if="columns[15].visible" />
+      <el-table-column label="是否断路" align="center" prop="isCircuit" v-if="columns[16].visible" />
+      <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[17].visible" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[18].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[19].visible" />
+      <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[20].visible">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="公摊表类型" align="center" prop="publicShareType" v-if="columns[21].visible" />
+      <el-table-column label="表具层级" align="center" prop="monitorHierarchy" v-if="columns[22].visible" />
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+            v-hasPermi="['ems/base:baseMonitorInfo:edit']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-plus" @click="handleAdd(scope.row)"
+            v-hasPermi="['ems/base:baseMonitorInfo:add']">新增</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+            v-hasPermi="['ems/base:baseMonitorInfo:remove']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改计量设备信息对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-form-item label="父级编号" prop="parentId">
+          <treeselect v-model="form.parentId" :options="baseMonitorInfoOptions" :normalizer="normalizer"
+            placeholder="请选择父级编号" />
+        </el-form-item>
+        <el-form-item label="计量设备编号" prop="monitorCode">
+          <el-input v-model="form.monitorCode" placeholder="请输入计量设备编号" />
+        </el-form-item>
+        <el-form-item label="计量设备名称" prop="monitorName">
+          <el-input v-model="form.monitorName" placeholder="请输入计量设备名称" />
+        </el-form-item>
+        <el-form-item label="能源类型" prop="monitorType">
+          <el-select v-model="form.monitorType" placeholder="请选择能源类型">
+            <el-option v-for="item in energyTypeList" :key="item.energyTypeId" :label="item.energyName"
+              :value="item.energyTypeId"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="计量设备位置" prop="monitorAddr">
+          <el-input v-model="form.monitorAddr" placeholder="请输入计量设备位置" />
+        </el-form-item>
+        <el-form-item label="计量设备状态" prop="monitorStatus">
+          <el-radio-group v-model="form.monitorStatus">
+            <el-radio v-for="dict in dict.type.monitor_status" :key="dict.value"
+              :label="parseInt(dict.value)">{{ dict.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="采集设备编号" prop="collectDeviceId">
+          <el-input v-model="form.collectDeviceId" placeholder="请输入采集设备编号" />
+        </el-form-item>
+        <el-form-item label="等级" prop="grade">
+          <el-input v-model="form.grade" placeholder="请输入等级" />
+        </el-form-item>
+        <el-form-item label="传感器仪表" prop="meterTypeId">
+          <el-input v-model="form.meterTypeId" placeholder="请输入传感器仪表" />
+        </el-form-item>
+        <el-form-item label="修正值" prop="correctValue">
+          <el-input v-model="form.correctValue" placeholder="请输入修正值" />
+        </el-form-item>
+        <el-form-item label="是否虚拟" prop="isAmmeter">
+          <el-radio-group v-model="form.isAmmeter">
+            <el-radio v-for="dict in dict.type.is_ammeter" :key="dict.value"
+              :label="dict.value">{{ dict.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="通断复位" prop="isKeyMonitor">
+          <el-input v-model="form.isKeyMonitor" placeholder="请输入通断复位" />
+        </el-form-item>
+        <el-form-item label="是否断路" prop="isCircuit">
+          <el-input v-model="form.isCircuit" placeholder="请输入是否断路" />
+        </el-form-item>
+        <el-form-item label="公摊表类型" prop="publicShareType">
+          <el-input v-model="form.publicShareType" placeholder="请输入公摊表类型" />
+        </el-form-item>
+        <el-form-item label="表具层级" prop="monitorHierarchy">
+          <el-input v-model="form.monitorHierarchy" placeholder="请输入表具层级" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+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'
+
+export default {
+  name: "BaseMonitorInfo",
+  dicts: ['is_ammeter', 'monitor_status', 'monitor_type'],
+  components: {
+    Treeselect
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 计量设备信息表格数据
+      baseMonitorInfoList: [],
+      // 计量设备信息树选项
+      baseMonitorInfoOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否展开，默认全部展开
+      isExpandAll: true,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 查询参数
+      queryParams: {
+        parentId: null,
+        monitorCode: null,
+        monitorName: null,
+        energyType: null,
+        monitorAddr: null,
+        monitorType: null,
+        monitorStatus: null,
+        collectDeviceId: null,
+        ancestors: null,
+        grade: null,
+        meterTypeId: null,
+        correctValue: null,
+        pt: null,
+        ct: null,
+        isAmmeter: null,
+        isKeyMonitor: null,
+        isCircuit: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        publicShareType: null,
+        monitorHierarchy: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        objId: [
+          { required: true, message: "自增标识不能为空", trigger: "blur" }
+        ],
+        monitorCode: [
+          { required: true, message: "计量设备编号不能为空", trigger: "blur" }
+        ],
+        energyTypeId: [
+          { required: true, message: '能源类型不能为空', trigger: 'blur' }
+        ]
+      },
+      columns: [
+        { key: 0, label: `自增标识`, visible: false },
+        { key: 1, label: `父级编号`, visible: false },
+        { key: 2, label: `计量设备编号`, visible: true },
+        { key: 3, label: `计量设备名称`, visible: true },
+        { key: 3, label: `能源类型`, visible: true },
+        { key: 4, label: `计量设备位置`, visible: true },
+        { key: 5, label: `计量设备类型`, visible: true },
+        { key: 6, label: `计量设备状态`, visible: true },
+        { key: 7, label: `采集设备编号`, visible: true },
+        { key: 8, label: `祖级列表`, visible: true },
+        { key: 9, label: `等级`, visible: false },
+        { key: 10, label: `传感器仪表`, visible: false },
+        { key: 11, label: `修正值`, visible: false },
+        { key: 12, label: `PT值`, visible: true },
+        { key: 13, label: `CT值`, visible: true },
+        { key: 14, label: `是否虚拟`, visible: true },
+        { key: 15, label: `通断复位`, visible: false },
+        { key: 16, label: `是否断路`, visible: false },
+        { key: 17, label: `创建人`, visible: false },
+        { key: 18, label: `创建时间`, visible: false },
+        { key: 19, label: `更新人`, visible: false },
+        { key: 20, label: `更新时间`, visible: false },
+        { key: 21, label: `公摊表类型`, visible: false },
+        { key: 22, label: `表具层级`, visible: false },
+      ],
+      //能源类型选项
+      energyTypeList: []
+    };
+  },
+  created() {
+    getBaseEnergyTypeList({}).then(response => {
+      this.energyTypeList = response.data
+    })
+    this.getList()
+  },
+  methods: {
+    /** 查询计量设备信息列表 */
+    getList() {
+      this.loading = true;
+      listBaseMonitorInfo(this.queryParams).then(response => {
+        this.baseMonitorInfoList = this.handleTree(response.data, "objId", "parentId");
+        this.loading = false;
+      });
+    },
+    /** 转换计量设备信息数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.objId,
+        label: node.monitorName,
+        children: node.children
+      };
+    },
+    /** 查询计量设备信息下拉树结构 */
+    getTreeselect() {
+      listBaseMonitorInfo().then(response => {
+        this.baseMonitorInfoOptions = [];
+        const data = { objId: 0, monitorName: '顶级节点', children: [] };
+        data.children = this.handleTree(response.data, "objId", "parentId");
+        this.baseMonitorInfoOptions.push(data);
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        parentId: null,
+        monitorCode: null,
+        monitorName: null,
+        energyType: null,
+        monitorAddr: null,
+        monitorType: null,
+        monitorStatus: null,
+        collectDeviceId: null,
+        ancestors: null,
+        grade: null,
+        meterTypeId: null,
+        correctValue: null,
+        pt: null,
+        ct: null,
+        isAmmeter: null,
+        isKeyMonitor: null,
+        isCircuit: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        publicShareType: null,
+        monitorHierarchy: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null && row.objId) {
+        this.form.parentId = row.objId;
+      } else {
+        this.form.parentId = 0;
+      }
+      this.open = true;
+      this.title = "添加计量设备信息";
+    },
+    /** 展开/折叠操作 */
+    toggleExpandAll() {
+      this.refreshTable = false;
+      this.isExpandAll = !this.isExpandAll;
+      this.$nextTick(() => {
+        this.refreshTable = true;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null) {
+        this.form.parentId = row.parentId;
+      }
+      getBaseMonitorInfo(row.objId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改计量设备信息";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.objId != null) {
+            updateBaseMonitorInfo(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            // this.form.monitorType = 4;
+            addBaseMonitorInfo(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除计量设备信息编号为"' + row.objId + '"的数据项？').then(function () {
+        return delBaseMonitorInfo(row.objId);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => { });
+    }
+  }
+};
+</script>
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 @@
+<template>
+    <div class="app-container">
+        <el-row :gutter="28">
+            <el-col :span="5" :xs="24">
+                <div class="head-container">
+                <el-input
+                    v-model="workUnitName"
+                    placeholder="请输入物联网设备名称"
+                    clearable
+                    size="small"
+                    prefix-icon="el-icon-search"
+                    style="margin-bottom: 20px"
+                />
+                </div>
+                <div class="head-container">
+                <el-tree
+                    :data="monitorInfoOptions"
+                    :props="monitorProps"
+                    :expand-on-click-node="false"
+                    :filter-node-method="filterNode"
+                    ref="tree"
+                    node-key="id"
+                    default-expand-all
+                    highlight-current
+                    @node-click="handleNodeClick"
+                />
+                </div>
+            </el-col>
+            <el-col :span="19" :xs="24">
+                <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="100px">
+                    <el-form-item label="计量设备编号" prop="monitorId">
+                        <el-input
+                                v-model="queryParams.monitorId"
+                                placeholder="请输入计量设备编号"
+                                clearable
+                                @keyup.enter.native="handleQuery"
+                        />
+                    </el-form-item>
+                    <el-form-item label="采集时间">
+                        <el-date-picker
+                            v-model="daterangeCollectTime"
+                            style="width: 340px"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            type="datetimerange"
+                            range-separator="-"
+                            start-placeholder="开始时间"
+                            end-placeholder="结束时间"
+                        ></el-date-picker>
+                    </el-form-item>
+                    <!-- <el-form-item label="温度" prop="tempreture">
+                        <el-input
+                                v-model="queryParams.tempreture"
+                                placeholder="请输入温度"
+                                clearable
+                                @keyup.enter.native="handleQuery"
+                        />
+                    </el-form-item>
+                    <el-form-item label="湿度" prop="humidity">
+                        <el-input
+                                v-model="queryParams.humidity"
+                                placeholder="请输入湿度"
+                                clearable
+                                @keyup.enter.native="handleQuery"
+                        />
+                    </el-form-item>
+                    <el-form-item label="照度" prop="illuminance">
+                        <el-input
+                                v-model="queryParams.illuminance"
+                                placeholder="请输入照度"
+                                clearable
+                                @keyup.enter.native="handleQuery"
+                        />
+                    </el-form-item>
+                    <el-form-item label="噪声" prop="noise">
+                        <el-input
+                                v-model="queryParams.noise"
+                                placeholder="请输入噪声"
+                                clearable
+                                @keyup.enter.native="handleQuery"
+                        />
+                    </el-form-item>
+                    <el-form-item label="硫化氢浓度" prop="concentration">
+                        <el-input
+                                v-model="queryParams.concentration"
+                                placeholder="请输入硫化氢浓度"
+                                clearable
+                                @keyup.enter.native="handleQuery"
+                        />
+                    </el-form-item> -->
+                    <el-form-item label="记录时间">
+                        <el-date-picker
+                            v-model="daterangeRecordTime"
+                            style="width: 340px"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            type="datetimerange"
+                            range-separator="-"
+                            start-placeholder="开始时间"
+                            end-placeholder="结束时间"
+                        ></el-date-picker>
+                    </el-form-item>
+                    <!-- <el-form-item label=" " prop="confirmPersonID">
+                        <el-input
+                                v-model="queryParams.confirmPersonID"
+                                placeholder="请输入 "
+                                clearable
+                                @keyup.enter.native="handleQuery"
+                        />
+                    </el-form-item>
+                    <el-form-item label=" " prop="confirmTime">
+                        <el-date-picker clearable
+                                        v-model="queryParams.confirmTime"
+                                        type="date"
+                                        value-format="yyyy-MM-dd"
+                                        placeholder="请选择 ">
+                        </el-date-picker>
+                    </el-form-item>
+                    <el-form-item label=" " prop="confirmFlag">
+                        <el-input
+                                v-model="queryParams.confirmFlag"
+                                placeholder="请输入 "
+                                clearable
+                                @keyup.enter.native="handleQuery"
+                        />
+                    </el-form-item> -->
+                    <el-form-item>
+                        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+                        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+                    </el-form-item>
+                </el-form>
+                <el-row :gutter="10" class="mb8">
+<!--                    <el-col :span="1.5">-->
+<!--                        <el-button-->
+<!--                            type="primary"-->
+<!--                            plain-->
+<!--                            icon="el-icon-plus"-->
+<!--                            size="mini"-->
+<!--                            @click="handleAdd"-->
+<!--                            v-hasPermi="['ems/record:recordIOTInstant:add']"-->
+<!--                        >新增</el-button>-->
+<!--                    </el-col>-->
+<!--                    <el-col :span="1.5">-->
+<!--                        <el-button-->
+<!--                            type="success"-->
+<!--                            plain-->
+<!--                            icon="el-icon-edit"-->
+<!--                            size="mini"-->
+<!--                            :disabled="single"-->
+<!--                            @click="handleUpdate"-->
+<!--                            v-hasPermi="['ems/record:recordIOTInstant:edit']"-->
+<!--                        >修改</el-button>-->
+<!--                    </el-col>-->
+<!--                    <el-col :span="1.5">-->
+<!--                        <el-button-->
+<!--                            type="danger"-->
+<!--                            plain-->
+<!--                            icon="el-icon-delete"-->
+<!--                            size="mini"-->
+<!--                            :disabled="multiple"-->
+<!--                            @click="handleDelete"-->
+<!--                            v-hasPermi="['ems/record:recordIOTInstant:remove']"-->
+<!--                        >删除</el-button>-->
+<!--                    </el-col>-->
+                    <el-col :span="1.5">
+                        <el-button
+                            type="warning"
+                            plain
+                            icon="el-icon-download"
+                            size="mini"
+                            @click="handleExport"
+                            v-hasPermi="['ems/record:recordIOTInstant:export']"
+                        >导出</el-button>
+                    </el-col>
+                    <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+                </el-row>
+
+                <el-table v-loading="loading" :data="recordIOTInstantList" @selection-change="handleSelectionChange">
+                    <el-table-column type="selection" width="55" align="center" />
+                        <el-table-column label="主键标识" align="center" prop="objid" v-if="columns[0].visible"/>
+                        <el-table-column label="计量设备编号" align="center" prop="monitorId" v-if="columns[1].visible"/>
+                        <el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[2].visible"/>
+                        <el-table-column label="采集时间" align="center" prop="collectTime" width="180" v-if="columns[3].visible">
+                            <template slot-scope="scope">
+                                <span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="温度" align="center" prop="tempreture" v-if="columns[4].visible"/>
+                        <el-table-column label="湿度" align="center" prop="humidity" v-if="columns[5].visible"/>
+                        <el-table-column label="照度" align="center" prop="illuminance" v-if="columns[6].visible"/>
+                        <el-table-column label="噪声" align="center" prop="noise" v-if="columns[7].visible"/>
+                        <el-table-column label="硫化氢浓度" align="center" prop="concentration" v-if="columns[8].visible"/>
+                        <el-table-column label="记录时间" align="center" prop="recodeTime" width="180" v-if="columns[9].visible">
+                            <template slot-scope="scope">
+                                <span>{{ parseTime(scope.row.recodeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label="pm1" align="center" prop="pm1" v-if="columns[10].visible"/>
+                        <el-table-column label="pm2" align="center" prop="pm2" v-if="columns[11].visible"/>
+                        <el-table-column label="pm10" align="center" prop="pm10" v-if="columns[12].visible"/>
+<!--                        <el-table-column label="报警类型" align="center" prop="alarmType" v-if="columns[10].visible"/>-->
+                        <!-- <el-table-column label=" " align="center" prop="confirmPersonID" v-if="columns[10].visible"/>
+                        <el-table-column label=" " align="center" prop="confirmTime" width="180" v-if="columns[11].visible">
+                            <template slot-scope="scope">
+                                <span>{{ parseTime(scope.row.confirmTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
+                            </template>
+                        </el-table-column>
+                        <el-table-column label=" " align="center" prop="confirmFlag" v-if="columns[12].visible"/> -->
+<!--                    <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">-->
+<!--                        <template slot-scope="scope">-->
+<!--                            <el-button-->
+<!--                                    size="mini"-->
+<!--                                    type="text"-->
+<!--                                    icon="el-icon-edit"-->
+<!--                                    @click="handleUpdate(scope.row)"-->
+<!--                                    v-hasPermi="['ems/record:recordIOTInstant:edit']"-->
+<!--                            >修改</el-button>-->
+<!--                            <el-button-->
+<!--                                    size="mini"-->
+<!--                                    type="text"-->
+<!--                                    icon="el-icon-delete"-->
+<!--                                    @click="handleDelete(scope.row)"-->
+<!--                                    v-hasPermi="['ems/record:recordIOTInstant:remove']"-->
+<!--                            >删除</el-button>-->
+<!--                        </template>-->
+<!--                    </el-table-column>-->
+                </el-table>
+            </el-col>
+        </el-row>
+
+
+        <pagination
+                v-show="total>0"
+                :total="total"
+                :page.sync="queryParams.pageNum"
+                :limit.sync="queryParams.pageSize"
+                @pagination="getList"
+        />
+
+        <!-- 添加或修改物联网实时数据对话框 -->
+        <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+            <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+                <el-form-item label="能源类型" prop="monitorType">
+                    <treeselect v-model="form.monitorType" :options="baseMonitorInfoOptions" :normalizer="normalizer"
+                                placeholder="请选择能源类型"
+                    />
+                </el-form-item>
+                <el-form-item label="计量设备编号" prop="monitorId">
+                    <el-input v-model="form.monitorId" placeholder="请输入计量设备编号" />
+                </el-form-item>
+                <el-form-item label="计量设备名称" prop="monitorName">
+                    <el-input v-model="form.monitorName" placeholder="请输入计量设备编号" />
+                </el-form-item>
+                <el-form-item label="采集时间" prop="collectTime">
+                    <el-date-picker clearable
+                                    v-model="form.collectTime"
+                                    type="date"
+                                    value-format="yyyy-MM-dd"
+                                    placeholder="请选择采集时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label="温度" prop="tempreture">
+                    <el-input v-model="form.tempreture" placeholder="请输入温度" />
+                </el-form-item>
+                <el-form-item label="湿度" prop="humidity">
+                    <el-input v-model="form.humidity" placeholder="请输入湿度" />
+                </el-form-item>
+                <el-form-item label="照度" prop="illuminance">
+                    <el-input v-model="form.illuminance" placeholder="请输入照度" />
+                </el-form-item>
+                <el-form-item label="噪声" prop="noise">
+                    <el-input v-model="form.noise" placeholder="请输入噪声" />
+                </el-form-item>
+                <el-form-item label="硫化氢浓度" prop="concentration">
+                    <el-input v-model="form.concentration" placeholder="请输入硫化氢浓度" />
+                </el-form-item>
+                <el-form-item label="记录时间" prop="recodeTime">
+                    <el-date-picker clearable
+                                    v-model="form.recodeTime"
+                                    type="date"
+                                    value-format="yyyy-MM-dd"
+                                    placeholder="请选择记录时间">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label=" " prop="confirmPersonID">
+                    <el-input v-model="form.confirmPersonID" placeholder="请输入 " />
+                </el-form-item>
+                <el-form-item label=" " prop="confirmTime">
+                    <el-date-picker clearable
+                                    v-model="form.confirmTime"
+                                    type="date"
+                                    value-format="yyyy-MM-dd"
+                                    placeholder="请选择 ">
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item label=" " prop="confirmFlag">
+                    <el-input v-model="form.confirmFlag" placeholder="请输入 " />
+                </el-form-item>
+            </el-form>
+            <div slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="submitForm">确 定</el-button>
+                <el-button @click="cancel">取 消</el-button>
+            </div>
+        </el-dialog>
+    </div>
+</template>
+
+<script>
+    import {
+        listRecordIOTInstant,
+        getRecordIOTInstant,
+        delRecordIOTInstant,
+        addRecordIOTInstant,
+        updateRecordIOTInstant }
+        from "@/api/ems/record/recordIOTInstant";
+    import { getMonitorInfoTree, listBaseMonitorInfo } from '@/api/ems/base/baseMonitorInfo'
+    import Treeselect from '@riophae/vue-treeselect'
+    import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+    export default {
+        name: "RecordIOTInstant",
+        components: {
+            Treeselect
+        },
+        data() {
+            return {
+                workUnitName:null,
+                //下拉树List
+                baseMonitorInfoOptions: [],
+                //左侧树结构List
+                monitorInfoOptions: [],
+                //能原类型信息
+                baseMonitorInfoList: [],
+                    monitorProps: {
+                        children: 'children',
+                        label: 'label'
+                },
+                // 记录时间时间范围
+                daterangeCollectTime: [],
+                // 记录时间时间范围
+                daterangeRecordTime: [],
+                // 遮罩层
+                loading: true,
+                // 选中数组
+                ids: [],
+                // 非单个禁用
+                single: true,
+                // 非多个禁用
+                multiple: true,
+                // 显示搜索条件
+                showSearch: true,
+                // 总条数
+                total: 0,
+                // 物联网实时数据表格数据
+                    recordIOTInstantList: [],
+                // 弹出层标题
+                title: "",
+                // 是否显示弹出层
+                open: false,
+                // 查询参数
+                queryParams: {
+                    params:{},
+                    pageNum: 1,
+                    pageSize: 10,
+                    monitorId: null,
+                    monitorName: null,
+                    collectTime: null,
+                    tempreture: null,
+                    humidity: null,
+                    illuminance: null,
+                    noise: null,
+                    concentration: null,
+                    recodeTime: null,
+                    alarmType: null,
+                    confirmPersonID: null,
+                    confirmTime: null,
+                    confirmFlag: null
+                },
+                // 表单参数
+                form: {},
+                // 表单校验
+                rules: {
+                                objid: [
+                                { required: true, message: "主键标识不能为空", trigger: "blur" }
+                            ],
+                },
+                columns: [
+                        { key: 0, label: `主键标识`, visible: true },
+                        { key: 1, label: `计量设备编号`, visible: true },
+                        { key: 2, label: `计量设备名称`, visible: true },
+                        { key: 3, label: `采集时间`, visible: true },
+                        { key: 4, label: `温度`, visible: true },
+                        { key: 5, label: `湿度`, visible: true },
+                        { key: 6, label: `照度`, visible: true },
+                        { key: 7, label: `噪声`, visible: true },
+                        { key: 8, label: `硫化氢浓度`, visible: true },
+                        { key: 9, label: `记录时间`, visible: true },
+                        { key: 10, label: `pm1`, visible: true },
+                        { key: 11, label: `pm2`, visible: true },
+                        { key: 12, label: `pm10`, visible: true },
+                        // { key: 13, label: `报警类型`, visible: true },
+                ]
+            };
+        },
+        created() {
+            // const nowDate = this.parseTime(new Date(), '{y}-{m}-{d}')
+            // this.daterangeCollectTime[0] = nowDate + ' 00:00:00'
+            // this.daterangeCollectTime[1] = nowDate + ' 23:59:59'
+
+            // this.daterangeRecordTime[0] = nowDate + ' 00:00:00'
+            // this.daterangeRecordTime[1] = nowDate + ' 23:59:59'
+            this.getList();
+            this.getTreeselect()
+            this.getTreeMonitorInfo()
+        },
+        watch: {
+            // 根据名称筛选计量设备树
+            workUnitName(val) {
+            this.$refs.tree.filter(val)
+            }
+        },
+        methods: {
+            /** 转换计量设备信息数据结构 */
+            normalizer(node) {
+                if (node.children && !node.children.length) {
+                    delete node.children
+                }
+                return {
+                    id: node.monitorId,
+                    label: node.monitorName,
+                    children: node.children
+                }
+            },
+            /** 查询计量设备信息下拉树结构   新增用*/
+            getTreeMonitorInfo() {
+            listBaseMonitorInfo({ monitorTypeList: [5,6,7,8,9] }).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;
+                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]
+                }
+                listRecordIOTInstant(this.queryParams).then(response => {
+                    this.recordIOTInstantList = response.rows;
+                    this.total = response.total;
+                    this.loading = false;
+                });
+            },
+            // 取消按钮
+            cancel() {
+                this.open = false;
+                this.reset();
+            },
+            // 表单重置
+            reset() {
+                this.form = {
+                                objid: null,
+                                monitorId: null,
+                                monitorName: null,
+                                collectTime: null,
+                                tempreture: null,
+                                humidity: null,
+                                illuminance: null,
+                                noise: null,
+                                concentration: null,
+                                recodeTime: null,
+                                pm1: null,
+                                pm2: null,
+                                pm10: null,
+                                alarmType: null,
+                                confirmPersonID: null,
+                                confirmTime: null,
+                                confirmFlag: null
+                };
+                this.resetForm("form");
+            },
+            /** 搜索按钮操作 */
+            handleQuery() {
+                this.queryParams.pageNum = 1;
+                this.getList();
+            },
+            /** 重置按钮操作 */
+            resetQuery() {
+                this.daterangeCollectTime = [];
+                this.daterangeRecordTime = [];
+                this.queryParams = {
+                    params:{},
+                    pageNum: 1,
+                    pageSize: 10,
+                    monitorId: null,
+                    monitorName: null,
+                    collectTime: null,
+                    tempreture: null,
+                    humidity: null,
+                    illuminance: null,
+                    noise: null,
+                    concentration: null,
+                    recodeTime: null,
+                    alarmType: null,
+                    confirmPersonID: null,
+                    confirmTime: null,
+                    confirmFlag: null
+                },
+                this.handleQuery();
+            },
+            /** 查询计量设备信息下拉树结构 */
+            getTreeselect() {
+                getMonitorInfoTree({ monitorTypeList: [5,6,7,8,9]}).then(response => {
+                    this.monitorInfoOptions = response.data
+                })
+            },
+            // 筛选节点
+            filterNode(value, data) {
+                if (!value) return true
+                return data.label.indexOf(value) !== -1
+            },
+            // 节点单击事件
+            handleNodeClick(data) {
+                this.queryParams.monitorId = data.code
+                this.handleQuery()
+            },
+            // 多选框选中数据
+            handleSelectionChange(selection) {
+                this.ids = selection.map(item => item.objid)
+                this.single = selection.length!==1
+                this.multiple = !selection.length
+            },
+            /** 新增按钮操作 */
+            handleAdd() {
+                this.reset();
+                this.open = true;
+                this.title = "添加物联网实时数据";
+            },
+            /** 修改按钮操作 */
+            handleUpdate(row) {
+                this.reset();
+                const objid = row.objid || this.ids
+                getRecordIOTInstant(objid).then(response => {
+                    this.form = response.data;
+                    this.open = true;
+                    this.title = "修改物联网实时数据";
+                });
+            },
+            /** 提交按钮 */
+            submitForm() {
+                this.$refs["form"].validate(valid => {
+                    if (valid) {
+                        if (this.form.objid != null) {
+                            updateRecordIOTInstant(this.form).then(response => {
+                                this.$modal.msgSuccess("修改成功");
+                                this.open = false;
+                                this.getList();
+                            });
+                        } else {
+                            addRecordIOTInstant(this.form).then(response => {
+                                this.$modal.msgSuccess("新增成功");
+                                this.open = false;
+                                this.getList();
+                            });
+                        }
+                    }
+                });
+            },
+            /** 删除按钮操作 */
+            handleDelete(row) {
+                const objids = row.objid || this.ids;
+                this.$modal.confirm('是否确认删除物联网实时数据编号为"' + objids + '"的数据项？').then(function() {
+                    return delRecordIOTInstant(objids);
+                }).then(() => {
+                    this.getList();
+                    this.$modal.msgSuccess("删除成功");
+                }).catch(() => {});
+            },
+    /** 导出按钮操作 */
+    handleExport() {
+        this.download('ems/record/recordIOTInstant/export', {
+            ...this.queryParams
+        }, `recordIOTInstant_${new Date().getTime()}.xlsx`)
+    }
+    }
+    };
+</script>
diff --git a/hw-ui/src/views/ems/report/currentIOTCurve/index.vue b/hw-ui/src/views/ems/report/currentIOTCurve/index.vue
new file mode 100644
index 00000000..c6d656b8
--- /dev/null
+++ b/hw-ui/src/views/ems/report/currentIOTCurve/index.vue
@@ -0,0 +1,511 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="28">
+      <el-col :span="5" :xs="24">
+        <div class="head-container">
+          <el-input
+            v-model="workUnitName"
+            placeholder="请输入物联网设备名称"
+            clearable
+            size="small"
+            prefix-icon="el-icon-search"
+            style="margin-bottom: 20px"
+          />
+        </div>
+        <div class="head-container">
+          <el-tree
+            :data="monitorInfoOptions"
+            :props="monitorProps"
+            :expand-on-click-node="false"
+            :filter-node-method="filterNode"
+            ref="tree"
+            node-key="id"
+            default-expand-all
+            highlight-current
+            @node-click="handleNodeClick"
+          />
+        </div>
+      </el-col>
+      <el-col :span="19" :xs="24">
+        <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch"
+                 label-width="100px"
+        >
+          <!--          <el-form-item label="计量设备编号" prop="monitorCode">-->
+          <!--            <el-input-->
+          <!--              v-model="queryParams.monitorCode"-->
+          <!--              placeholder="请输入计量设备编号"-->
+          <!--              clearable-->
+          <!--              @keyup.enter.native="handleQuery"-->
+          <!--            />-->
+          <!--          </el-form-item>-->
+          <el-form-item label="采集时间">
+            <el-date-picker
+              v-model="daterangeCollectTime"
+              style="width: 340px"
+              value-format="yyyy-MM-dd HH:mm:ss"
+              type="datetimerange"
+              range-separator="-"
+              start-placeholder="开始时间"
+              end-placeholder="结束时间"
+            ></el-date-picker>
+          </el-form-item>
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
+
+        <Chart ref="Chart1" class="chart1"/>
+        <!-- <Chart ref="Chart2" class="chart2"/> -->
+      </el-col>
+    </el-row>
+
+
+  </div>
+</template>
+
+<script>
+import {
+  listRecordIOTInstant,
+  getRecordIOTInstant, iotInstantList
+} from '@/api/ems/record/recordIOTInstant'
+import {getMonitorInfoTree} from '@/api/ems/base/baseMonitorInfo'
+import Treeselect from '@riophae/vue-treeselect'
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import {parseTime} from '@/utils/ruoyi'
+import Chart from '@/components/Charts/Chart'
+import * as echarts from 'echarts'
+
+export default {
+  name: 'CurrentIOTCurve',
+  dicts: ['collect_type'],
+  components: {
+    Chart,
+    Treeselect
+  },
+  data() {
+    return {
+      //下拉树List
+      baseMonitorInfoOptions: [],
+      //左侧树结构List
+      monitorInfoOptions: [],
+      workUnitName: undefined,
+      //左侧树结构 检索设备名称
+      selectMonitorName: null,
+      //计量设备信息
+      baseMonitorInfoList: [],
+      // 采集方式时间范围
+      daterangeCollectTime: [],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 电实时数据表格数据
+      dataList: [],
+      // 弹出层标题
+      title: '',
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        monitorId: null,
+        collectTime: null,
+        tempreture: null,
+        humidity: null,
+        illuminance: null,
+        noise: null,
+        concentration: null,
+        recordTime: null,
+        glys: null,
+        zxyg: null,
+        activePower: null,
+        reactivePower: null,
+        collectType: null
+      },
+      // 表单参数
+      form: {},
+      monitorProps: {
+        children: 'children',
+        label: 'label'
+      },
+      // 表单校验
+      rules: {
+        objId: [
+          {required: true, message: '编号不能为空', trigger: 'blur'}
+        ]
+      },
+      columns: [
+        {key: 0, label: `主键标识`, visible: false},
+        {key: 1, label: `计量设备编号`, visible: true},
+        {key: 2, label: `采集时间`, visible: true},
+        {key: 3, label: `温度`, visible: true},
+        {key: 4, label: `湿度`, visible: true},
+        {key: 5, label: `照度`, visible: true},
+        {key: 6, label: `噪声`, visible: true},
+        {key: 7, label: `硫化氢浓度`, visible: true},
+        {key: 8, label: `记录时间`, visible: true},
+        {key: 9, label: `报警类型`, visible: true},
+        {key: 10, label: ``, visible: true},
+        {key: 11, label: ``, visible: false},
+        {key: 12, label: ``, visible: false},
+        {key: 13, label: ``, visible: true},
+        {key: 14, label: ``, visible: true}
+      ]
+    }
+  },
+  created() {
+    const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
+    this.daterangeCollectTime[0] = nowDate + ' 00:00:00'
+    this.daterangeCollectTime[1] = nowDate + ' 23:59:59'
+    this.getTreeselect()
+    this.getList()
+  },
+  watch: {
+    // 根据名称筛选计量设备树
+    workUnitName(val) {
+      this.$refs.tree.filter(val)
+    }
+  },
+  methods: {
+    /** 转换计量设备信息数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children
+      }
+      return {
+        id: node.monitorId,
+        label: node.monitorName,
+        children: node.children
+      }
+    },
+    /** 查询电实时数据列表 */
+    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]
+      }
+      console.log(this.monitorInfoOptions)
+      this.getChart()
+    },
+
+    // 取消按钮
+    cancel() {
+      this.open = false
+      this.reset()
+    },
+
+    // 表单重置
+    reset() {
+      this.form = {
+        objId: null,
+        monitorId: null,
+        collectTime: null,
+        recordTime: null,
+        collectType: 1
+      }
+      this.resetForm('form')
+    },
+
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList()
+    },
+
+    /** 重置按钮操作 */
+    resetQuery() {
+      const nowDate = parseTime(new Date(), '{y}-{m}-{d}')
+      // this.daterangeCollectTime[0] = nowDate + ' 00:00:00'
+      // this.daterangeCollectTime[1] = nowDate + ' 23:59:59'
+      // console.log(this.daterangeCollectTime)
+      this.daterangeCollectTime = [nowDate + ' 00:00:00',nowDate + ' 23:59:59']
+      console.log(this.daterangeCollectTime)
+      this.queryParams.monitorId = null
+      this.resetForm('queryForm')
+      this.handleQuery()
+    },
+
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('ems/record/recordIOTInstant/export', {
+        ...this.queryParams
+      }, `recordIOTInstant_${new Date().getTime()}.xlsx`)
+    },
+
+    /** 查询计量设备信息下拉树结构 */
+    getTreeselect() {
+      getMonitorInfoTree({monitorTypeList: [5, 6, 7, 8, 9]}).then(response => {
+        this.monitorInfoOptions = response.data
+      })
+    },
+
+    /** 筛选节点 */
+    filterNode(value, data) {
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
+    },
+
+    /** 节点单击事件 */
+    handleNodeClick(data, type, a) {
+      console.log(type.parent.data)
+      console.log(a)
+      // this.queryParams.monitorTypeList = type
+      this.queryParams.monitorId = data.code
+      this.selectMonitorName = data.label
+      this.handleQuery()
+    },
+
+    /** 物联网设备曲线 */
+    async getChart() {
+      console.log(this.queryParams.monitorId)
+      if (this.queryParams.monitorId == null) {
+        return
+      }
+      let query = JSON.parse(JSON.stringify(this.queryParams))
+      const {data} = await iotInstantList(query)
+      let option1 = {
+        title: {
+          text: '物联网设备曲线',
+          // this.selectMonitorName
+          x: 'center'
+        },
+        legend: {
+          data: data.monitorTypeArr,
+          right: 0,
+        },
+        grid: {
+          top: '15%',
+          bottom: '10%',
+          left: '3%',
+          right: '3%'
+        },
+        tooltip: {
+          trigger: 'axis',
+          // axisPointer: {
+          //   type: 'shadow',
+          //   label: {
+          //     show: true
+          //   }
+          // }
+        },
+        dataZoom: [{
+          type: 'slider'
+        }],
+        xAxis: {
+          data: data.dataList.map(e => e.collectTime),
+          axisLine: {
+            show: true, //隐藏X轴轴线
+            lineStyle: {
+              color: '#000'
+            }
+          },
+          // axisTick: {
+          //   show: true //隐藏X轴刻度
+          // },
+          axisLabel: {
+            show: true,
+            textStyle: {
+              color: '#000' //X轴文字颜色
+            }
+          }
+        },
+        yAxis: [
+          {
+            type: 'value',
+            name: '数值',
+            nameTextStyle: {
+              color: '#000'
+            },
+            splitLine: {
+              show: false
+            },
+            axisTick: {
+              show: true
+            },
+            axisLine: {
+              show: true,
+              lineStyle: {
+                color: '#000'
+              }
+            },
+            axisLabel: {
+              show: true,
+              textStyle: {
+                color: '#000'
+              }
+            }
+          }
+        ],
+        series: [
+          {
+            tooltip: {
+              show: data.monitorTypeArr.includes('温度') ? true : false
+            },
+            name: '温度',
+            type: data.type,
+            smooth: data.smooth, //平滑曲线显示
+            showAllSymbol: data.showAllSymbol, //显示所有图形。
+            symbol: data.symbol, //标记的图形为实心圆
+            symbolSize: data.symbolSize, //标记的大小
+            // itemStyle: {
+            //   //折线拐点标志的样式
+            //   color: "#058cff",
+            // },
+            // lineStyle: {
+            //   color: "#058cff",
+            // },
+            // areaStyle: {
+            //   color: "rgba(5,140,255, 0.2)",
+            // },
+            data: data.monitorTypeArr.includes('温度') ? data.dataList.map(e => e.tempreture) : []
+          },
+          {
+            tooltip: {
+              show: data.monitorTypeArr.includes('湿度') ? true : false
+            },
+            name: '湿度',
+            type: data.type,
+            smooth: data.smooth, //平滑曲线显示
+            showAllSymbol: data.showAllSymbol, //显示所有图形。
+            symbol: data.symbol, //标记的图形为实心圆
+            symbolSize: data.symbolSize, //标记的大小
+            // itemStyle: {
+            //   //折线拐点标志的样式
+            //   color: "#058cff",
+            // },
+            // lineStyle: {
+            //   color: "#058cff",
+            // },
+            // areaStyle: {
+            //   color: "rgba(5,140,255, 0.2)",
+            // },
+            data: data.monitorTypeArr.includes('湿度') ? data.dataList.map(e => e.humidity) : []
+          },
+          {
+            tooltip: {
+              show: data.monitorTypeArr.includes('噪声') ? true : false
+            },
+            name: '噪声',
+            type: data.type,
+            smooth: data.smooth, //平滑曲线显示
+            showAllSymbol: data.showAllSymbol, //显示所有图形。
+            symbol: data.symbol, //标记的图形为实心圆
+            symbolSize: data.symbolSize, //标记的大小
+            // itemStyle: {
+            //   //折线拐点标志的样式
+            //   color: "#058cff",
+            // },
+            // lineStyle: {
+            //   color: "#058cff",
+            // },
+            // areaStyle: {
+            //   color: "rgba(5,140,255, 0.2)",
+            // },
+            data: data.monitorTypeArr.includes('噪声') ? data.dataList.map(e => e.noise) : []
+          },
+          {
+            tooltip: {
+              show: data.monitorTypeArr.includes('照度') ? true : false
+            },
+            name: '照度',
+            type: data.type,
+            smooth: data.smooth, //平滑曲线显示
+            showAllSymbol: data.showAllSymbol, //显示所有图形。
+            symbol: data.symbol, //标记的图形为实心圆
+            symbolSize: data.symbolSize, //标记的大小
+            // itemStyle: {
+            //   //折线拐点标志的样式
+            //   color: "#058cff",
+            // },
+            // lineStyle: {
+            //   color: "#058cff",
+            // },
+            // areaStyle: {
+            //   color: "rgba(5,140,255, 0.2)",
+            // },
+            data: data.monitorTypeArr.includes('照度') ? data.dataList.map(e => e.illuminance) : []
+          },
+          {
+            tooltip: {
+              show: data.monitorTypeArr.includes('气体浓度') ? true : false
+            },
+            name: '气体浓度',
+            type: data.type,
+            smooth: data.smooth, //平滑曲线显示
+            showAllSymbol: data.showAllSymbol, //显示所有图形。
+            symbol: data.symbol, //标记的图形为实心圆
+            symbolSize: data.symbolSize, //标记的大小
+            // itemStyle: {
+            //   //折线拐点标志的样式
+            //   color: "#058cff",
+            // },
+            // lineStyle: {
+            //   color: "#058cff",
+            // },
+            // areaStyle: {
+            //   color: "rgba(5,140,255, 0.2)",
+            // },
+            data: data.monitorTypeArr.includes('气体浓度') ? data.dataList.map(e => e.concentration) : []
+          },{
+            tooltip: {
+              show: data.monitorTypeArr.includes('pm1') ? true : false
+            },
+            name: 'pm1',
+            type: data.type,
+            smooth: data.smooth, //平滑曲线显示
+            showAllSymbol: data.showAllSymbol, //显示所有图形。
+            symbol: data.symbol, //标记的图形为实心圆
+            symbolSize: data.symbolSize, //标记的大小
+            // itemStyle: {
+            //   //折线拐点标志的样式
+            //   color: "#058cff",
+            // },
+            // lineStyle: {
+            //   color: "#058cff",
+            // },
+            // areaStyle: {
+            //   color: "rgba(5,140,255, 0.2)",
+            // },
+            data: data.monitorTypeArr.includes('pm1') ? data.dataList.map(e => e.pm1) : []
+          }
+        ]
+      }
+      console.log(option1)
+      this.$refs.Chart1.setData(option1)
+
+      echarts.connect(this.$refs.Chart1.chart)
+      // , this.$refs.Chart2.chart
+      this.$refs.Chart1.chart.on('datazoom', (e) => {
+        option1.dataZoom[0].start = e.start
+        option1.dataZoom[0].end = e.end
+        this.$refs.Chart1.setData(option1)
+      })
+      // this.$refs.Chart2.chart.on('datazoom', (e) => {
+      //   option1.dataZoom[0].start = e.start
+      //   option1.dataZoom[0].end = e.end
+      //   this.$refs.Chart1.setData(option1)
+      // })
+    }
+  }
+}
+</script>
+<style scoped>
+.chart1 {
+  width: 100%;
+  height: 75vh;
+}
+
+.chart2 {
+  width: 100%;
+  height: 40vh;
+}
+</style>