diff --git a/src/api/ems/record/recordIOTInstant.js b/src/api/ems/record/recordIOTInstant.js
index 55278d9..264b093 100644
--- a/src/api/ems/record/recordIOTInstant.js
+++ b/src/api/ems/record/recordIOTInstant.js
@@ -42,3 +42,12 @@ export function delRecordIOTInstant(objid) {
     method: 'delete'
   })
 }
+
+// 查询电实时数据（曲线）
+export function iotInstantList(query) {
+  return request({
+    url: '/ems/record/recordIOTInstant/iotInstantList',
+    method: 'get',
+    params: query
+  })
+}
diff --git a/src/api/ems/report/reportPointIOT.js b/src/api/ems/report/reportPointIOT.js
new file mode 100644
index 0000000..709d5c0
--- /dev/null
+++ b/src/api/ems/report/reportPointIOT.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询电整点数据列表
+export function listReportPointIOT(query) {
+  return request({
+    url: '/ems/report/reportPointIOT/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询电整点数据详细
+export function getReportPointIOT(objId) {
+  return request({
+    url: '/ems/report/reportPointIOT/' + objId,
+    method: 'get'
+  })
+}
+
+// 新增电整点数据
+export function addReportPointIOT(data) {
+  return request({
+    url: '/ems/report/reportPointIOT',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改电整点数据
+export function updateReportPointIOT(data) {
+  return request({
+    url: '/ems/report/reportPointIOT',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除电整点数据
+export function delReportPointIOT(objId) {
+  return request({
+    url: '/ems/report/reportPointIOT/' + objId,
+    method: 'delete'
+  })
+}
diff --git a/src/views/ems/base/baseMonitorInfo/index.vue b/src/views/ems/base/baseMonitorInfo/index.vue
index a06ea3c..3cb437d 100644
--- a/src/views/ems/base/baseMonitorInfo/index.vue
+++ b/src/views/ems/base/baseMonitorInfo/index.vue
@@ -282,6 +282,9 @@ export default {
         monitorCode: [
           { required: true, message: "计量设备编号不能为空", trigger: "blur" }
         ],
+        monitorName: [
+          { required: true, message: "计量设备名称不能为空", trigger: "blur" }
+        ],
       },
       columns: [
         {key: 0, label: `自增标识`, visible: false},
diff --git a/src/views/ems/record/recordIOTInstant/index.vue b/src/views/ems/record/recordIOTInstant/index.vue
index 36f4e1f..ed9bd71 100644
--- a/src/views/ems/record/recordIOTInstant/index.vue
+++ b/src/views/ems/record/recordIOTInstant/index.vue
@@ -2,7 +2,7 @@
     <div class="app-container">
         <el-row :gutter="28">
             <el-col :span="5" :xs="24">
-                <!-- <div class="head-container">
+                <div class="head-container">
                 <el-input
                     v-model="workUnitName"
                     placeholder="请输入物联网设备名称"
@@ -11,7 +11,7 @@
                     prefix-icon="el-icon-search"
                     style="margin-bottom: 20px"
                 />
-                </div> -->
+                </div>
                 <div class="head-container">
                 <el-tree
                     :data="monitorInfoOptions"
@@ -171,6 +171,7 @@
                     <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[1].visible"/>
                         <el-table-column label="采集时间" align="center" prop="collectTime" width="180" v-if="columns[2].visible">
                             <template slot-scope="scope">
                                 <span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -236,6 +237,9 @@
                 <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"
@@ -340,18 +344,19 @@
                 queryParams: {
                     pageNum: 1,
                     pageSize: 10,
-                                monitorId: null,
-                                collectTime: null,
-                                tempreture: null,
-                                humidity: null,
-                                illuminance: null,
-                                noise: null,
-                                concentration: null,
-                                recodeTime: null,
-                                alarmType: null,
-                                confirmPersonID: null,
-                                confirmTime: null,
-                                confirmFlag: null
+                    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: {},
@@ -429,6 +434,7 @@
                 this.form = {
                                 objid: null,
                                 monitorId: null,
+                                monitorName: null,
                                 collectTime: null,
                                 tempreture: null,
                                 humidity: null,
diff --git a/src/views/ems/record/recordVibrationInstant/index.vue b/src/views/ems/record/recordVibrationInstant/index.vue
index 8b497a3..9301054 100644
--- a/src/views/ems/record/recordVibrationInstant/index.vue
+++ b/src/views/ems/record/recordVibrationInstant/index.vue
@@ -334,6 +334,7 @@ export default {
         temperature: null,
         recodeTime: null,
         monitorName: null,
+        remark: null
       },
       // 表单参数
       form: {},
diff --git a/src/views/ems/report/currentIOTCurve/index.vue b/src/views/ems/report/currentIOTCurve/index.vue
new file mode 100644
index 0000000..fbf78a5
--- /dev/null
+++ b/src/views/ems/report/currentIOTCurve/index.vue
@@ -0,0 +1,484 @@
+<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() {
+      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() {
+      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.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.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.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.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.dataList.map(e =>e.concentration)
+          }
+        ]
+      }
+      
+      this.$refs.Chart1.setData(option1)
+      // option1 && Chart1.setOption(option1);
+      // this.$refs.Chart2.setData(option2)
+      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>
+.chart1 {
+  width: 100%;
+  height: 75vh;
+}
+
+.chart2 {
+  width: 100%;
+  height: 40vh;
+}
+</style>