diff --git a/ruoyi-ui/src/views/ems/base/baseCollectDeviceInfo/index.vue b/ruoyi-ui/src/views/ems/base/baseCollectDeviceInfo/index.vue
index 767f1a1..954b5af 100644
--- a/ruoyi-ui/src/views/ems/base/baseCollectDeviceInfo/index.vue
+++ b/ruoyi-ui/src/views/ems/base/baseCollectDeviceInfo/index.vue
@@ -98,7 +98,12 @@
       <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="energyTypeName" v-if="columns[3].visible"/>-->
+      <el-table-column label="能源类型" align="center" prop="energyTypeId" v-if="columns[3].visible && form.energyTypeId !== 1">
+        <template slot-scope="scope">
+          <span>{{ getEnergyTypeName(scope.row.energyTypeId) }}</span>
+        </template>
+      </el-table-column>
       <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"/>
@@ -153,7 +158,7 @@
         <el-form-item label="采集设备名称" prop="collectDeviceName">
           <el-input v-model="form.collectDeviceName" placeholder="请输入采集设备名称"/>
         </el-form-item>
-        <el-form-item label="能源类型" prop="energyTypeId">
+<!--        <el-form-item label="能源类型" prop="energyTypeId">
           <el-select v-model="form.energyTypeId" placeholder="请选择能源类型编号">
             <el-option
               v-for="item in energyTypeList"
@@ -162,6 +167,14 @@
               :value="item.energyTypeId"
             ></el-option>
           </el-select>
+        </el-form-item>-->
+        <el-form-item label="能源类型" prop="energyTypeId" v-if="form.energyTypeId !== 1">
+          <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="请输入型号"/>
@@ -289,7 +302,7 @@ export default {
   },
   created() {
     getBaseEnergyTypeList({}).then(response => {
-      this.energyTypeList = response.data
+      this.energyTypeList = response.data.filter(item => item.energyTypeId !== 1)
     })
     this.getList()
   },
@@ -298,8 +311,8 @@ export default {
     getList() {
       this.loading = true
       listBaseCollectDeviceInfo(this.queryParams).then(response => {
-        this.baseCollectDeviceInfoList = response.rows
-        this.total = response.total
+        this.baseCollectDeviceInfoList = response.rows.filter(item => item.energyTypeId !== 1)
+        this.total = this.baseCollectDeviceInfoList.length
         this.loading = false
       })
     },
diff --git a/ruoyi-ui/src/views/ems/base/baseEnergyType/index.vue b/ruoyi-ui/src/views/ems/base/baseEnergyType/index.vue
index 42567eb..f9d9970 100644
--- a/ruoyi-ui/src/views/ems/base/baseEnergyType/index.vue
+++ b/ruoyi-ui/src/views/ems/base/baseEnergyType/index.vue
@@ -170,9 +170,9 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        objId: [
+/*        objId: [
           { required: true, message: '自增标识不能为空', trigger: 'blur' }
-        ]
+        ]*/
       },
       columns: [
         { key: 0, label: `自增标识`, visible: false },
@@ -195,10 +195,11 @@ export default {
     getList() {
       this.loading = true
       listBaseEnergyType(this.queryParams).then(response => {
-        this.baseEnergyTypeList = response.rows
+        this.baseEnergyTypeList = response.rows.filter(item => item.energyTypeId !== 1)
+        console.log(this.baseEnergyTypeList)
         this.total = response.total
         this.loading = false
-      })
+      });
     },
     // 取消按钮
     cancel() {
diff --git a/ruoyi-ui/src/views/ems/base/baseMonitorInfo/index.vue b/ruoyi-ui/src/views/ems/base/baseMonitorInfo/index.vue
index 3cb437d..a61bfb7 100644
--- a/ruoyi-ui/src/views/ems/base/baseMonitorInfo/index.vue
+++ b/ruoyi-ui/src/views/ems/base/baseMonitorInfo/index.vue
@@ -253,7 +253,7 @@ export default {
         monitorCode: null,
         monitorName: null,
         monitorAddr: null,
-        monitorType: 2,
+        monitorType: 1,
         monitorStatus: null,
         collectDeviceId: null,
         ancestors: null,
diff --git a/ruoyi-ui/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue b/ruoyi-ui/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
index 5da07cb..6ca84d6 100644
--- a/ruoyi-ui/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
+++ b/ruoyi-ui/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
@@ -56,9 +56,14 @@
       <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">
+<!--      <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}}
+          <span>{{ getEnergyTypeName(scope.row.monitorType) }}</span>
+        </template>
+      </el-table-column>-->
+      <el-table-column label="能源类型" align="center" prop="monitorType" v-if="columns[4].visible && form.monitorType !== 1">
+        <template slot-scope="scope">
+          <span>{{ getEnergyTypeName(scope.row.monitorType) }}</span>
         </template>
       </el-table-column>
       <el-table-column label="计量设备位置" align="center" prop="monitorAddr" v-if="columns[5].visible" />
@@ -117,11 +122,16 @@
         <el-form-item label="计量设备名称" prop="monitorName">
           <el-input v-model="form.monitorName" placeholder="请输入计量设备名称" />
         </el-form-item>
-        <el-form-item label="能源类型" prop="monitorType">
+<!--        <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="monitorType" v-if="form.monitorType !== 1">
+          <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="请输入计量设备位置" />
@@ -272,18 +282,25 @@ export default {
     };
   },
   created() {
-    getBaseEnergyTypeList({}).then(response => {
+/*    getBaseEnergyTypeList({}).then(response => {
       this.energyTypeList = response.data
-    })
+    })*/
+    getBaseEnergyTypeList({}).then(response => {
+      this.energyTypeList = response.data.filter(item => item.energyTypeId !== 1);
+    });
     this.getList()
   },
   methods: {
     /** 查询计量设备信息列表 */
     getList() {
       this.loading = true;
-      listBaseMonitorInfo(this.queryParams).then(response => {
+/*      listBaseMonitorInfo(this.queryParams).then(response => {
         this.baseMonitorInfoList = this.handleTree(response.data, "objId", "parentId");
         this.loading = false;
+      });*/
+      listBaseMonitorInfo(this.queryParams).then(response => {
+        this.baseMonitorInfoList = this.handleTree(response.data.filter(item => item.monitorType !== 1), "objId", "parentId");
+        this.loading = false;
       });
     },
     /** 转换计量设备信息数据结构 */
@@ -412,7 +429,17 @@ export default {
         this.getList();
         this.$modal.msgSuccess("删除成功");
       }).catch(() => { });
-    }
+    },
+    /** 根据能源类型ID获取名称 */
+/*    getEnergyTypeName(energyTypeId) {
+      const energyType = this.energyTypeList.find(item => item.energyTypeId === energyTypeId);
+      return energyType ? energyType.energyName : '';
+    },*/
+    getEnergyTypeName(energyTypeId) {
+      if (energyTypeId === 1) return ''; // 当 energyType 为 1 时不显示
+      const energyType = this.energyTypeList.find(item => item.energyTypeId === energyTypeId);
+      return energyType ? energyType.energyName : '';
+    },
   }
 };
 </script>
diff --git a/ruoyi-ui/src/views/ems/record/recordIOTInstant/index.vue b/ruoyi-ui/src/views/ems/record/recordIOTInstant/index.vue
index e1f8087..55700da 100644
--- a/ruoyi-ui/src/views/ems/record/recordIOTInstant/index.vue
+++ b/ruoyi-ui/src/views/ems/record/recordIOTInstant/index.vue
@@ -86,7 +86,7 @@
                                 clearable
                                 @keyup.enter.native="handleQuery"
                         />
-                    </el-form-item> -->
+                    </el-form-item> &ndash;&gt;-->
                     <el-form-item label="记录时间">
                         <el-date-picker
                             v-model="daterangeRecordTime"
@@ -175,7 +175,7 @@
 
                 <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="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">
@@ -183,17 +183,17 @@
                                 <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">
+<!--                        <el-table-column label="温度" align="center" prop="tempreture" v-if="columns[4].visible"/>-->
+                        <el-table-column label="湿度" align="center" prop="humidity" v-if="columns[4].visible"/>
+                        <el-table-column label="照度" align="center" prop="illuminance" v-if="columns[5].visible"/>
+                        <el-table-column label="噪声" align="center" prop="noise" v-if="columns[6].visible"/>
+                        <el-table-column label="硫化氢浓度" align="center" prop="concentration" v-if="columns[7].visible"/>
+                        <el-table-column label="记录时间" align="center" prop="recodeTime" width="180" v-if="columns[8].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="报警类型" align="center" prop="alarmType" v-if="columns[10].visible"/>
+                        <el-table-column label="报警类型" align="center" prop="alarmType" v-if="columns[9].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">
@@ -235,28 +235,22 @@
         <!-- 添加或修改物联网实时数据对话框 -->
         <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="monitorId">
+                <treeselect v-model="form.monitorId" :options="baseMonitorInfoOptions" :normalizer="normalizer"
+                            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"
+                                    type="datetime"
+                                    value-format="yyyy-MM-dd HH:mm:ss"
                                     placeholder="请选择采集时间">
                     </el-date-picker>
                 </el-form-item>
-                <el-form-item label="温度" prop="tempreture">
+<!--                <el-form-item label="温度" prop="tempreture">
                     <el-input v-model="form.tempreture" placeholder="请输入温度" />
-                </el-form-item>
+                </el-form-item>-->
                 <el-form-item label="湿度" prop="humidity">
                     <el-input v-model="form.humidity" placeholder="请输入湿度" />
                 </el-form-item>
@@ -368,28 +362,30 @@
                     alarmType: null,
                     confirmPersonID: null,
                     confirmTime: null,
-                    confirmFlag: null
+                    confirmFlag: null,
+                    energyType: null,
+                    monitorType: null,
                 },
                 // 表单参数
                 form: {},
                 // 表单校验
                 rules: {
-                                objid: [
+/*                                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: `报警类型`, visible: true },
+/*                        { key: 4, 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 },
                 ]
             };
         },
@@ -417,19 +413,20 @@
                     delete node.children
                 }
                 return {
-                    id: node.monitorId,
+                    id: node.monitorCode,
                     label: node.monitorName,
-                    children: node.children
+                    children: node.children,
+                    monitorType: node.monitorType // 添加 monitorType 字段
                 }
             },
             /** 查询计量设备信息下拉树结构   新增用*/
             getTreeMonitorInfo() {
-            listBaseMonitorInfo({ monitorTypeList: [5,6,7,8,9] }).then(response => {
+              listBaseMonitorInfo({ }).then(response => {
                 this.baseMonitorInfoOptions = []
-                const data = { objId: 0, monitorName: '顶级节点', children: [] }
-                data.children = this.handleTree(response.data, 'objId', 'parentId')
+                const data = { monitorCode: 0, monitorName: '顶级节点', children: [] }
+                data.children = this.handleTree(response.data.filter(item => item.monitorType !== 1), 'objId', 'parentId')
                 this.baseMonitorInfoOptions.push(data)
-            })
+              })
             },
             /** 查询物联网实时数据列表 */
             getList() {
@@ -443,9 +440,10 @@
                     this.queryParams.params['endRecordTime'] = this.daterangeRecordTime[1]
                 }
                 listRecordIOTInstant(this.queryParams).then(response => {
-                    this.recordIOTInstantList = response.rows;
-                    this.total = response.total;
-                    this.loading = false;
+                  this.recordIOTInstantList = response.rows.filter(item => item.monitorType !== 1);
+                  console.log(this.recordIOTInstantList);
+                  this.total = this.recordIOTInstantList.length;
+                  this.loading = false;
                 });
             },
             // 取消按钮
@@ -469,7 +467,9 @@
                                 alarmType: null,
                                 confirmPersonID: null,
                                 confirmTime: null,
-                                confirmFlag: null
+                                confirmFlag: null,
+                  energyType: null,
+                  monitorType: null,
                 };
                 this.resetForm("form");
             },
@@ -504,8 +504,9 @@
             },
             /** 查询计量设备信息下拉树结构 */
             getTreeselect() {
-                getMonitorInfoTree({ monitorTypeList: [5,6,7,8,9]}).then(response => {
-                    this.monitorInfoOptions = response.data
+                getMonitorInfoTree({}).then(response => {
+                  console.log(response.data)
+                  this.monitorInfoOptions = response.data.filter(item => item.monitorType !== 1);
                 })
             },
             // 筛选节点
diff --git a/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring/index.vue b/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring/index.vue
index df362fe..494d01c 100644
--- a/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring/index.vue
+++ b/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring/index.vue
@@ -132,7 +132,8 @@ export default {
         zxyg: null,
         activePower: null,
         reactivePower: null,
-        collectType: null
+        collectType: null,
+        monitorType: 1,
       },
       // 表单参数
       form: {},
@@ -142,9 +143,9 @@ export default {
       },
       // 表单校验
       rules: {
-        objId: [
+/*        objId: [
           { required: true, message: '编号不能为空', trigger: 'blur' }
-        ]
+        ]*/
       },
       columns: [
         { key: 0, label: `主键标识`, visible: false },
@@ -215,7 +216,8 @@ export default {
         monitorId: null,
         collectTime: null,
         recordTime: null,
-        collectType: 1
+        collectType: 1,
+        monitorType: 1,
       }
       this.resetForm('form')
     },
@@ -241,7 +243,7 @@ export default {
 
     /** 查询计量设备信息下拉树结构 */
     getTreeselect() {
-      getMonitorInfoTree({ monitorTypeList: [5,6,7,8,9],monitorType:this.$route.query.monitorType}).then(response => {
+      getMonitorInfoTree({ monitorTypeList: [1],monitorType:this.$route.query.monitorType}).then(response => {
         this.monitorInfoOptions = response.data
       })
     },
diff --git a/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring2/index.vue b/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring2/index.vue
index 7a227ab..6568ce1 100644
--- a/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring2/index.vue
+++ b/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring2/index.vue
@@ -135,7 +135,8 @@ export default {
         zxyg: null,
         activePower: null,
         reactivePower: null,
-        collectType: null
+        collectType: null,
+        monitorType: 3
       },
       // 表单参数
       form: {},
@@ -218,7 +219,7 @@ export default {
         monitorId: null,
         collectTime: null,
         recordTime: null,
-        collectType: 1
+        collectType: 3
       }
       this.resetForm('form')
     },
@@ -244,7 +245,7 @@ export default {
 
     /** 查询计量设备信息下拉树结构 */
     getTreeselect() {
-      getMonitorInfoTree({ monitorTypeList: [5,6,7,8,9],monitorType:this.$route.query.monitorType}).then(response => {
+      getMonitorInfoTree({ monitorTypeList: [3],monitorType:this.$route.query.monitorType}).then(response => {
         this.monitorInfoOptions = response.data
       })
     },
diff --git a/ruoyi-ui/src/views/ems/report/currentIOTCurve/index.vue b/ruoyi-ui/src/views/ems/report/currentIOTCurve/index.vue
index 9354a88..a0dfd5f 100644
--- a/ruoyi-ui/src/views/ems/report/currentIOTCurve/index.vue
+++ b/ruoyi-ui/src/views/ems/report/currentIOTCurve/index.vue
@@ -237,8 +237,8 @@ export default {
 
     /** 查询计量设备信息下拉树结构 */
     getTreeselect() {
-      getMonitorInfoTree({monitorTypeList: [5, 6, 7, 8, 9]}).then(response => {
-        this.monitorInfoOptions = response.data
+      getMonitorInfoTree({}).then(response => {
+        this.monitorInfoOptions = response.data.filter(item => item.monitorType !== 1);
       })
     },
 
diff --git a/ruoyi-ui/src/views/ems/report/currentIOTCurveTemp/index.vue b/ruoyi-ui/src/views/ems/report/currentIOTCurveTemp/index.vue
new file mode 100644
index 0000000..619797d
--- /dev/null
+++ b/ruoyi-ui/src/views/ems/report/currentIOTCurveTemp/index.vue
@@ -0,0 +1,483 @@
+<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: [1]}).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.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) : []
+          }
+        ]
+      }
+      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>