From 91c2a5373474be2ced4fe47bda83257617a0bc9e Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Mon, 9 Dec 2024 17:37:39 +0800
Subject: [PATCH] =?UTF-8?q?change(ems):=20=E8=B0=83=E6=95=B4=E6=B8=A9?=
 =?UTF-8?q?=E5=BA=A6=E6=B9=BF=E5=BA=A6=E7=9B=91=E6=B5=8B=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E7=9A=84=E8=AE=BE=E5=A4=87=E7=B1=BB=E5=9E=8B=E9=80=89=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 TemperatureHumidityMonitoring2 组件中增加了 collectType、energyTypeId、energyType 和 monitorTypeId 字段
- 在 TemperatureHumidityMonitoring3 组件中修改了 getTreeselect 方法，只查询类型为 3 的设备
- 移除了 TemperatureHumidityMonitoring3 组件中的 objId 验证规则
---
 .../TemperatureHumidityMonitoring2/index.vue      | 15 +++++++++------
 .../TemperatureHumidityMonitoring3/index.vue      |  6 +++---
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring2/index.vue b/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring2/index.vue
index 97d3d60..ba864bf 100644
--- a/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring2/index.vue
+++ b/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring2/index.vue
@@ -135,8 +135,11 @@ export default {
         zxyg: null,
         activePower: null,
         reactivePower: null,
-        collectType: null,
-        monitorType: 3
+        collectType: 3,
+        monitorType: 3,
+        energyTypeId: 3,
+        energyType: 3,
+        monitorTypeId: 3
       },
       // 表单参数
       form: {},
@@ -146,9 +149,7 @@ export default {
       },
       // 表单校验
       rules: {
-        objId: [
-          { required: true, message: '编号不能为空', trigger: 'blur' }
-        ]
+
       },
       columns: [
         { key: 0, label: `主键标识`, visible: false },
@@ -245,7 +246,9 @@ export default {
 
     /** 查询计量设备信息下拉树结构 */
     getTreeselect() {
-      getMonitorInfoTree({ monitorTypeList: [3]}).then(response => {
+      debugger
+      console.log(123213)
+      getMonitorInfoTree({monitorTypeList: [3]}).then(response => {
         this.monitorInfoOptions = response.data
       })
     },
diff --git a/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring3/index.vue b/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring3/index.vue
index 5dab568..68daeee 100644
--- a/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring3/index.vue
+++ b/ruoyi-ui/src/views/ems/report/TemperatureHumidityMonitoring3/index.vue
@@ -145,9 +145,9 @@ export default {
       },
       // 表单校验
       rules: {
-        objId: [
+/*        objId: [
           {required: true, message: '编号不能为空', trigger: 'blur'}
-        ]
+        ]*/
       },
       columns: [
         {key: 0, label: `主键标识`, visible: false},
@@ -245,7 +245,7 @@ export default {
     /** 查询计量设备信息下拉树结构 */
     getTreeselect() {
       getMonitorInfoTree({
-        monitorTypeList: [5, 6, 7, 8, 9],
+        monitorTypeList: [3],
         monitorType: this.$route.query.monitorType
       }).then(response => {
         this.monitorInfoOptions = response.data