From 6bf79d59eb6c19ad781cba518044221e1dea861b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=9C=E7=AC=99=E6=AD=8C?= <2277317060@qq.com>
Date: Fri, 30 Aug 2024 17:45:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  |   1 +
 src/components/Charts/Chart.vue               |   1 +
 .../TemperatureHumidityMonitoring2/index.vue  | 490 ++++++++++++++++++
 .../TemperatureHumidityMonitoring3/index.vue  | 322 ++++++++++++
 .../TemperatureHumidityMonitoring4/index.vue  | 322 ++++++++++++
 5 files changed, 1136 insertions(+)
 create mode 100644 src/views/ems/report/TemperatureHumidityMonitoring2/index.vue
 create mode 100644 src/views/ems/report/TemperatureHumidityMonitoring3/index.vue
 create mode 100644 src/views/ems/report/TemperatureHumidityMonitoring4/index.vue

diff --git a/package.json b/package.json
index 0d054da..b132920 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,7 @@
     "clipboard": "2.0.8",
     "core-js": "^3.37.1",
     "echarts": "5.4.0",
+    "echarts-liquidfill": "^3.1.0",
     "element-ui": "2.15.14",
     "file-saver": "2.0.5",
     "fuse.js": "6.4.3",
diff --git a/src/components/Charts/Chart.vue b/src/components/Charts/Chart.vue
index abd2931..6eb0e6e 100644
--- a/src/components/Charts/Chart.vue
+++ b/src/components/Charts/Chart.vue
@@ -4,6 +4,7 @@
 
 <script>
 import * as echarts from 'echarts';
+import 'echarts-liquidfill'
 import Logo from "@/layout/components/Sidebar/Logo";
 
 export default {
diff --git a/src/views/ems/report/TemperatureHumidityMonitoring2/index.vue b/src/views/ems/report/TemperatureHumidityMonitoring2/index.vue
new file mode 100644
index 0000000..7a227ab
--- /dev/null
+++ b/src/views/ems/report/TemperatureHumidityMonitoring2/index.vue
@@ -0,0 +1,490 @@
+<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"
+            ref="tree"
+            show-checkbox
+            node-key="code"
+            :check-strictly="true"
+            default-expand-all
+            :expand-on-click-node="false"
+            highlight-current
+            @check="handleNodeClick">
+          </el-tree>
+        </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>
+<!--        <div v-for="item in list" class="chart">-->
+<!--          <Chart ref="Chart1" style="width: 100%;height: 100%" :chartOption="getChart(item)"/>-->
+<!--          <div class="title">{{item.monitorName}}</div>-->
+<!--        </div>-->
+        <div class="chart">
+          <Chart ref="Chart1" style="width: 100%;height: 100%" :chartOption="getChart()"/>
+        </div>
+      </el-col>
+    </el-row>
+
+
+  </div>
+</template>
+
+<script>
+import {
+  listRecordIOTInstant,
+  getRecordIOTInstant, iotInstantList
+} from '@/api/ems/record/recordIOTInstant'
+import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo'
+import { iotInstantMonitoring } from '@/api/ems/report/TemperatureHumidityMonitoring'
+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:[],
+      //下拉树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],monitorType:this.$route.query.monitorType}).then(response => {
+        this.monitorInfoOptions = response.data
+      })
+    },
+
+    /** 筛选节点 */
+    filterNode(value, data) {
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
+    },
+
+    /** 节点单击事件 */
+    async handleNodeClick(a,datas) {
+      // console.log(datas.checkedKeys)
+      const {data}  = await iotInstantMonitoring({monitorCodeList:datas.checkedKeys.toString()})
+      this.list = data
+      // console.log(data)
+      // this.queryParams.monitorTypeList = type
+      // this.queryParams.monitorId = data.code
+      // this.selectMonitorName = data.label
+      // this.handleQuery()
+    },
+
+    /** 物联网设备曲线 */
+     getChart(e) {
+      // if(!e)return
+      function Pie() {
+        let dataArr = [];
+        for (var i = 0; i < 150; i++) {
+          if (i % 2 === 0) {
+            dataArr.push({
+              name: (i + 1).toString(),
+              value: 50,
+              itemStyle: {
+                normal: {
+                  color: "#00AFFF",
+                  borderWidth: 0,
+                  borderColor: "rgba(0,0,0,0)",
+                },
+              },
+            });
+          } else {
+            dataArr.push({
+              name: (i + 1).toString(),
+              value: 100,
+              itemStyle: {
+                normal: {
+                  color: "rgba(0,0,0,0)",
+                  borderWidth: 0,
+                  borderColor: "rgba(0,0,0,0)",
+                },
+              },
+            });
+          }
+        }
+        return dataArr;
+      }
+      let option = {
+        backgroundColor: "rgba(255, 255, 255)",
+        // title: {
+        //   text: '',
+        //   textStyle: {
+        //     fontWeight: 'normal',
+        //     fontSize: 25,
+        //     color: 'rgb(97, 142, 205)'
+        //   }
+        // },
+        series: [
+          {
+            // value: 50, //  内容 配合formatter
+            type: "liquidFill",
+            radius: "70%", // 控制中间圆球的尺寸（此处可以理解为距离外圈圆的距离控制）
+            center: ["50%", "50%"],
+            data: [
+              0.6,
+              {
+                value: 0.6,
+                direction: "left", //波浪方向
+              },
+            ], // data个数代表波浪数
+            backgroundStyle: {
+              borderWidth: 1,
+              color: "rgba(62, 208, 255, 1)", // 球体本景色
+            },
+            amplitude: "6  %", //波浪的振幅
+            // 修改波浪颜色
+            // color: ['#0286ea', 'l#0b99ff'], // 每个波浪不同颜色，颜色数组长度为对应的波浪个数
+            color: [
+              {
+                type: "linear",
+                x: 0,
+                y: 0,
+                x2: 0,
+                y2: 1,
+                colorStops: [
+                  {
+                    offset: 1,
+                    color: "#6CDEFC",
+                  },
+                  {
+                    offset: 0,
+                    color: "#429BF7",
+                  },
+                ],
+                globalCoord: false,
+              },
+            ],
+            label: {
+              normal: {
+                // formatter: 0.87 * 100 + '\n%',
+                formatter: 0.6 * 100 + "\n{d|%}",
+                //  formatter: function(params){
+                //     return params.value* 100 + " \n%";
+                // },
+                rich: {
+                  d: {
+                    fontSize: 36,
+                  },
+                },
+                textStyle: {
+                  fontSize: 48,
+                  color: "#fff",
+                },
+              },
+            },
+            outline: {
+              show: false,
+            },
+          },
+          {
+            type: "pie",
+            z: 1,
+            center: ["50%", "50%"],
+            radius: ["72%", "73.5%"], // 控制外圈圆的粗细
+            hoverAnimation: false,
+            data: [
+              {
+                name: "",
+                value: 500,
+                labelLine: {
+                  show: false,
+                },
+                itemStyle: {
+                  color: "#00AFFF",
+                },
+                emphasis: {
+                  labelLine: {
+                    show: false,
+                  },
+                  itemStyle: {
+                    color: "#00AFFF",
+                  },
+                },
+              },
+            ],
+          },
+          {
+            //外发光
+            type: "pie",
+            z: 1,
+            zlevel: -1,
+            radius: ["70%", "90.5%"],
+            center: ["50%", "50%"],
+            hoverAnimation: false,
+            clockWise: false,
+            itemStyle: {
+              normal: {
+                borderWidth: 20,
+                color: "rgba(224,242,255,1)",
+              },
+            },
+            label: {
+              show: false,
+            },
+            data: [100],
+          },
+          {
+            //底层外发光
+            type: "pie",
+            z: 1,
+            zlevel: -2,
+            radius: ["70%", "100%"],
+            center: ["50%", "50%"],
+            hoverAnimation: false,
+            clockWise: false,
+            itemStyle: {
+              normal: {
+                borderWidth: 20,
+                color: "rgba(224,242,255,.4)",
+              },
+            },
+            label: {
+              show: false,
+            },
+            data: [100],
+          },
+          {
+            type: "pie",
+            zlevel: 0,
+            silent: true,
+            radius: ["78%", "80%"],
+            z: 1,
+            label: {
+              normal: {
+                show: false,
+              },
+            },
+            labelLine: {
+              normal: {
+                show: false,
+              },
+            },
+            data: Pie(),
+          },
+        ],
+      };
+
+      return option
+      // this.$refs.Chart1.setData(option)
+    }
+  }
+}
+</script>
+<style scoped>
+.chart {
+  display: inline-block;
+  width: 50%;
+  height: 40vh;
+  position: relative;
+}
+.chart .title{
+  position: absolute;
+  bottom: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  font-size: 1vw;
+  font-weight: 700;
+}
+
+.chart2 {
+  width: 100%;
+  height: 40vh;
+}
+</style>
diff --git a/src/views/ems/report/TemperatureHumidityMonitoring3/index.vue b/src/views/ems/report/TemperatureHumidityMonitoring3/index.vue
new file mode 100644
index 0000000..6941b3a
--- /dev/null
+++ b/src/views/ems/report/TemperatureHumidityMonitoring3/index.vue
@@ -0,0 +1,322 @@
+<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"
+            ref="tree"
+            show-checkbox
+            node-key="code"
+            :check-strictly="true"
+            default-expand-all
+            :expand-on-click-node="false"
+            highlight-current
+            @check="handleNodeClick">
+          </el-tree>
+        </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>
+        <!--        <div v-for="item in list" class="chart">-->
+        <!--          <Chart ref="Chart1" style="width: 100%;height: 100%" :chartOption="getChart(item)"/>-->
+        <!--          <div class="title">{{item.monitorName}}</div>-->
+        <!--        </div>-->
+        <div class="chart">
+          <Chart ref="Chart1" style="width: 100%;height: 100%" :chartOption="getChart()"/>
+        </div>
+      </el-col>
+    </el-row>
+
+
+  </div>
+</template>
+
+<script>
+import {
+  listRecordIOTInstant,
+  getRecordIOTInstant, iotInstantList
+} from '@/api/ems/record/recordIOTInstant'
+import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo'
+import { iotInstantMonitoring } from '@/api/ems/report/TemperatureHumidityMonitoring'
+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:[],
+      //下拉树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],monitorType:this.$route.query.monitorType}).then(response => {
+        this.monitorInfoOptions = response.data
+      })
+    },
+
+    /** 筛选节点 */
+    filterNode(value, data) {
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
+    },
+
+    /** 节点单击事件 */
+    async handleNodeClick(a,datas) {
+      // console.log(datas.checkedKeys)
+      const {data}  = await iotInstantMonitoring({monitorCodeList:datas.checkedKeys.toString()})
+      this.list = data
+      // console.log(data)
+      // this.queryParams.monitorTypeList = type
+      // this.queryParams.monitorId = data.code
+      // this.selectMonitorName = data.label
+      // this.handleQuery()
+    },
+
+    /** 物联网设备曲线 */
+    getChart(e) {
+      // if(!e)return
+      let option = {
+        series: [
+          {
+            name: 'Pressure',
+            type: 'gauge',
+            detail: {
+              formatter: '{value}',
+              // offsetCenter: [0, '-40%'] ,
+            },
+            center:['25%','50%'],
+            radius:'90%',
+            data: [
+              {
+                value:12,
+                name: '温度',
+                title: {
+                  // offsetCenter: [0, '-20%'] ,
+                },
+              }
+            ]
+          },
+        ]
+      };
+      return option
+      // this.$refs.Chart1.setData(option)
+    }
+  }
+}
+</script>
+<style scoped>
+.chart {
+  display: inline-block;
+  width: 50%;
+  height: 40vh;
+  position: relative;
+}
+.chart .title{
+  position: absolute;
+  bottom: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  font-size: 1vw;
+  font-weight: 700;
+}
+
+.chart2 {
+  width: 100%;
+  height: 40vh;
+}
+</style>
diff --git a/src/views/ems/report/TemperatureHumidityMonitoring4/index.vue b/src/views/ems/report/TemperatureHumidityMonitoring4/index.vue
new file mode 100644
index 0000000..6941b3a
--- /dev/null
+++ b/src/views/ems/report/TemperatureHumidityMonitoring4/index.vue
@@ -0,0 +1,322 @@
+<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"
+            ref="tree"
+            show-checkbox
+            node-key="code"
+            :check-strictly="true"
+            default-expand-all
+            :expand-on-click-node="false"
+            highlight-current
+            @check="handleNodeClick">
+          </el-tree>
+        </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>
+        <!--        <div v-for="item in list" class="chart">-->
+        <!--          <Chart ref="Chart1" style="width: 100%;height: 100%" :chartOption="getChart(item)"/>-->
+        <!--          <div class="title">{{item.monitorName}}</div>-->
+        <!--        </div>-->
+        <div class="chart">
+          <Chart ref="Chart1" style="width: 100%;height: 100%" :chartOption="getChart()"/>
+        </div>
+      </el-col>
+    </el-row>
+
+
+  </div>
+</template>
+
+<script>
+import {
+  listRecordIOTInstant,
+  getRecordIOTInstant, iotInstantList
+} from '@/api/ems/record/recordIOTInstant'
+import { getMonitorInfoTree } from '@/api/ems/base/baseMonitorInfo'
+import { iotInstantMonitoring } from '@/api/ems/report/TemperatureHumidityMonitoring'
+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:[],
+      //下拉树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],monitorType:this.$route.query.monitorType}).then(response => {
+        this.monitorInfoOptions = response.data
+      })
+    },
+
+    /** 筛选节点 */
+    filterNode(value, data) {
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
+    },
+
+    /** 节点单击事件 */
+    async handleNodeClick(a,datas) {
+      // console.log(datas.checkedKeys)
+      const {data}  = await iotInstantMonitoring({monitorCodeList:datas.checkedKeys.toString()})
+      this.list = data
+      // console.log(data)
+      // this.queryParams.monitorTypeList = type
+      // this.queryParams.monitorId = data.code
+      // this.selectMonitorName = data.label
+      // this.handleQuery()
+    },
+
+    /** 物联网设备曲线 */
+    getChart(e) {
+      // if(!e)return
+      let option = {
+        series: [
+          {
+            name: 'Pressure',
+            type: 'gauge',
+            detail: {
+              formatter: '{value}',
+              // offsetCenter: [0, '-40%'] ,
+            },
+            center:['25%','50%'],
+            radius:'90%',
+            data: [
+              {
+                value:12,
+                name: '温度',
+                title: {
+                  // offsetCenter: [0, '-20%'] ,
+                },
+              }
+            ]
+          },
+        ]
+      };
+      return option
+      // this.$refs.Chart1.setData(option)
+    }
+  }
+}
+</script>
+<style scoped>
+.chart {
+  display: inline-block;
+  width: 50%;
+  height: 40vh;
+  position: relative;
+}
+.chart .title{
+  position: absolute;
+  bottom: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  font-size: 1vw;
+  font-weight: 700;
+}
+
+.chart2 {
+  width: 100%;
+  height: 40vh;
+}
+</style>