From 261fbe0e0a03206c0f5c6cf2faaa30edf4d33795 Mon Sep 17 00:00:00 2001
From: yinq <yinq>
Date: Tue, 5 Aug 2025 16:37:25 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=AE=A1=E9=87=8F=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ems/base/baseMonitorInfo/index.vue  |  2 +-
 .../ems/base/baseMonitorInfoAir/index.vue     | 38 +++++++++----------
 .../base/baseMonitorInfoNitrogen/index.vue    | 34 ++++++++---------
 .../ems/base/baseMonitorInfoSteam/index.vue   |  2 +-
 .../ems/base/baseMonitorInfoWater/index.vue   |  2 +-
 5 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/src/views/ems/base/baseMonitorInfo/index.vue b/src/views/ems/base/baseMonitorInfo/index.vue
index a06ea3c..de71de7 100644
--- a/src/views/ems/base/baseMonitorInfo/index.vue
+++ b/src/views/ems/base/baseMonitorInfo/index.vue
@@ -340,7 +340,7 @@ export default {
     },
     /** 查询计量设备信息下拉树结构 */
     getTreeselect() {
-      listBaseMonitorInfo().then(response => {
+      listBaseMonitorInfo({monitorType: 2}).then(response => {
         this.baseMonitorInfoOptions = [];
         const data = { objId: 0, monitorName: '顶级节点', children: [] };
         data.children = this.handleTree(response.data, "objId", "parentId");
diff --git a/src/views/ems/base/baseMonitorInfoAir/index.vue b/src/views/ems/base/baseMonitorInfoAir/index.vue
index c0c67de..711c65b 100644
--- a/src/views/ems/base/baseMonitorInfoAir/index.vue
+++ b/src/views/ems/base/baseMonitorInfoAir/index.vue
@@ -181,9 +181,9 @@
         <el-form-item label="等级" prop="grade">
           <el-input v-model="form.grade" placeholder="请输入等级" />
         </el-form-item>
-        <el-form-item label="传感器仪表" prop="meterTypeId">
-          <el-input v-model="form.meterTypeId" placeholder="请输入传感器仪表" />
-        </el-form-item>
+<!--        <el-form-item label="传感器仪表" prop="meterTypeId">-->
+<!--          <el-input v-model="form.meterTypeId" placeholder="请输入传感器仪表" />-->
+<!--        </el-form-item>-->
         <el-form-item label="修正值" prop="correctValue">
           <el-input v-model="form.correctValue" placeholder="请输入修正值" />
         </el-form-item>
@@ -196,18 +196,18 @@
             >{{dict.label}}</el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="通断复位" prop="isKeyMonitor">
-          <el-input v-model="form.isKeyMonitor" placeholder="请输入通断复位" />
-        </el-form-item>
-        <el-form-item label="是否断路" prop="isCircuit">
-          <el-input v-model="form.isCircuit" placeholder="请输入是否断路" />
-        </el-form-item>
-        <el-form-item label="公摊表类型" prop="publicShareType">
-          <el-input v-model="form.publicShareType" placeholder="请输入公摊表类型" />
-        </el-form-item>
-        <el-form-item label="表具层级" prop="monitorHierarchy">
-          <el-input v-model="form.monitorHierarchy" placeholder="请输入表具层级" />
-        </el-form-item>
+<!--        <el-form-item label="通断复位" prop="isKeyMonitor">-->
+<!--          <el-input v-model="form.isKeyMonitor" placeholder="请输入通断复位" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="是否断路" prop="isCircuit">-->
+<!--          <el-input v-model="form.isCircuit" placeholder="请输入是否断路" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="公摊表类型" prop="publicShareType">-->
+<!--          <el-input v-model="form.publicShareType" placeholder="请输入公摊表类型" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="表具层级" prop="monitorHierarchy">-->
+<!--          <el-input v-model="form.monitorHierarchy" placeholder="请输入表具层级" />-->
+<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -334,7 +334,7 @@ export default {
     },
     /** 查询计量设备信息下拉树结构 */
     getTreeselect() {
-      listBaseMonitorInfo().then(response => {
+      listBaseMonitorInfo({monitorType: 5}).then(response => {
         this.baseMonitorInfoOptions = [];
         const data = { objId: 0, monitorName: '顶级节点', children: [] };
         data.children = this.handleTree(response.data, "objId", "parentId");
@@ -354,8 +354,8 @@ export default {
         monitorCode: null,
         monitorName: null,
         monitorAddr: null,
-        monitorType: 4,
-        monitorStatus: null,
+        monitorType: 5,
+        monitorStatus: 0,
         collectDeviceId: null,
         ancestors: null,
         grade: null,
@@ -363,7 +363,7 @@ export default {
         correctValue: null,
         pt: null,
         ct: null,
-        isAmmeter: null,
+        isAmmeter: '1',
         isKeyMonitor: null,
         isCircuit: null,
         createBy: null,
diff --git a/src/views/ems/base/baseMonitorInfoNitrogen/index.vue b/src/views/ems/base/baseMonitorInfoNitrogen/index.vue
index 5608998..b5feeb0 100644
--- a/src/views/ems/base/baseMonitorInfoNitrogen/index.vue
+++ b/src/views/ems/base/baseMonitorInfoNitrogen/index.vue
@@ -189,9 +189,9 @@
         <el-form-item label="等级" prop="grade">
           <el-input v-model="form.grade" placeholder="请输入等级"/>
         </el-form-item>
-        <el-form-item label="传感器仪表" prop="meterTypeId">
-          <el-input v-model="form.meterTypeId" placeholder="请输入传感器仪表"/>
-        </el-form-item>
+<!--        <el-form-item label="传感器仪表" prop="meterTypeId">-->
+<!--          <el-input v-model="form.meterTypeId" placeholder="请输入传感器仪表"/>-->
+<!--        </el-form-item>-->
         <el-form-item label="修正值" prop="correctValue">
           <el-input v-model="form.correctValue" placeholder="请输入修正值"/>
         </el-form-item>
@@ -205,18 +205,18 @@
             </el-radio>
           </el-radio-group>
         </el-form-item>
-        <el-form-item label="通断复位" prop="isKeyMonitor">
-          <el-input v-model="form.isKeyMonitor" placeholder="请输入通断复位"/>
-        </el-form-item>
-        <el-form-item label="是否断路" prop="isCircuit">
-          <el-input v-model="form.isCircuit" placeholder="请输入是否断路"/>
-        </el-form-item>
-        <el-form-item label="公摊表类型" prop="publicShareType">
-          <el-input v-model="form.publicShareType" placeholder="请输入公摊表类型"/>
-        </el-form-item>
-        <el-form-item label="表具层级" prop="monitorHierarchy">
-          <el-input v-model="form.monitorHierarchy" placeholder="请输入表具层级"/>
-        </el-form-item>
+<!--        <el-form-item label="通断复位" prop="isKeyMonitor">-->
+<!--          <el-input v-model="form.isKeyMonitor" placeholder="请输入通断复位"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="是否断路" prop="isCircuit">-->
+<!--          <el-input v-model="form.isCircuit" placeholder="请输入是否断路"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="公摊表类型" prop="publicShareType">-->
+<!--          <el-input v-model="form.publicShareType" placeholder="请输入公摊表类型"/>-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="表具层级" prop="monitorHierarchy">-->
+<!--          <el-input v-model="form.monitorHierarchy" placeholder="请输入表具层级"/>-->
+<!--        </el-form-item>-->
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button type="primary" @click="submitForm">确 定</el-button>
@@ -349,7 +349,7 @@ export default {
     },
     /** 查询计量设备信息下拉树结构 */
     getTreeselect() {
-      listBaseMonitorInfo().then(response => {
+      listBaseMonitorInfo({monitorType: 6}).then(response => {
         this.baseMonitorInfoOptions = []
         const data = { objId: 0, monitorName: '顶级节点', children: [] }
         data.children = this.handleTree(response.data, 'objId', 'parentId')
@@ -369,7 +369,7 @@ export default {
         monitorCode: null,
         monitorName: null,
         monitorAddr: null,
-        monitorType: 4,
+        monitorType: 6,
         monitorStatus: null,
         collectDeviceId: null,
         ancestors: null,
diff --git a/src/views/ems/base/baseMonitorInfoSteam/index.vue b/src/views/ems/base/baseMonitorInfoSteam/index.vue
index 87a1090..58d9027 100644
--- a/src/views/ems/base/baseMonitorInfoSteam/index.vue
+++ b/src/views/ems/base/baseMonitorInfoSteam/index.vue
@@ -334,7 +334,7 @@ export default {
     },
     /** 查询计量设备信息下拉树结构 */
     getTreeselect() {
-      listBaseMonitorInfo().then(response => {
+      listBaseMonitorInfo({monitorType: 4}).then(response => {
         this.baseMonitorInfoOptions = [];
         const data = { objId: 0, monitorName: '顶级节点', children: [] };
         data.children = this.handleTree(response.data, "objId", "parentId");
diff --git a/src/views/ems/base/baseMonitorInfoWater/index.vue b/src/views/ems/base/baseMonitorInfoWater/index.vue
index 3622752..a67401e 100644
--- a/src/views/ems/base/baseMonitorInfoWater/index.vue
+++ b/src/views/ems/base/baseMonitorInfoWater/index.vue
@@ -335,7 +335,7 @@ export default {
     },
     /** 查询计量设备信息下拉树结构 */
     getTreeselect() {
-      listBaseMonitorInfo().then(response => {
+      listBaseMonitorInfo({monitorType: 3}).then(response => {
         this.baseMonitorInfoOptions = [];
         const data = { objId: 0, monitorName: '顶级节点', children: [] };
         data.children = this.handleTree(response.data, "objId", "parentId");