From 8fbf4465c18d71fcc8a3f76a172306de54682832 Mon Sep 17 00:00:00 2001
From: zch <zangch@mesnac.com>
Date: Fri, 15 Nov 2024 16:53:02 +0800
Subject: [PATCH] =?UTF-8?q?fix(ems):=20=E4=BF=AE=E5=A4=8D=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=AD=97=E5=85=B8=E5=BC=95=E7=94=A8=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 baseCollectDeviceInfo 组件中，将 isFlag 字段的字典类型从 is_flag 修改为 base_collect_device_info_is_flag
- 在 baseMonitorInfoIOTDevice 组件中，将 monitorStatus 和 isAmmeter 字段的字典类型分别修改为 monitor_info_monitor_status 和 monitor_infois_ammeter
---
 .../views/ems/base/baseCollectDeviceInfo/index.vue   |  4 ++--
 .../ems/base/baseMonitorInfoIOTDevice/index.vue      | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ruoyi-ui/src/views/ems/base/baseCollectDeviceInfo/index.vue b/ruoyi-ui/src/views/ems/base/baseCollectDeviceInfo/index.vue
index b84b282..767f1a1 100644
--- a/ruoyi-ui/src/views/ems/base/baseCollectDeviceInfo/index.vue
+++ b/ruoyi-ui/src/views/ems/base/baseCollectDeviceInfo/index.vue
@@ -110,7 +110,7 @@
       <el-table-column label="安装地址" align="center" prop="settingAddress" v-if="columns[8].visible"/>
       <el-table-column label="启用标识" align="center" prop="isFlag" v-if="columns[9].visible">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
+          <dict-tag :options="dict.type.base_collect_device_info_is_flag" :value="scope.row.isFlag"/>
         </template>
       </el-table-column>
       <el-table-column label="备注" align="center" prop="remark" v-if="columns[10].visible"/>
@@ -187,7 +187,7 @@
         <el-form-item label="启用标识" prop="isFlag">
           <el-radio-group v-model="form.isFlag">
             <el-radio
-              v-for="dict in dict.type.is_flag"
+              v-for="dict in dict.type.base_collect_device_info_is_flag"
               :key="dict.value"
               :label="dict.value"
             >{{ dict.label }}
diff --git a/ruoyi-ui/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue b/ruoyi-ui/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
index dbadb16..5da07cb 100644
--- a/ruoyi-ui/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
+++ b/ruoyi-ui/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
@@ -21,7 +21,7 @@
       </el-form-item>
       <el-form-item label="计量设备状态" prop="monitorStatus">
         <el-select v-model="queryParams.monitorStatus" placeholder="请选择计量设备状态" clearable>
-          <el-option v-for="dict in dict.type.monitor_status" :key="dict.value" :label="dict.label"
+          <el-option v-for="dict in dict.type.monitor_info_monitor_status" :key="dict.value" :label="dict.label"
             :value="dict.value" />
         </el-select>
       </el-form-item>
@@ -31,7 +31,7 @@
       </el-form-item>
       <el-form-item label="是否虚拟" prop="isAmmeter">
         <el-select v-model="queryParams.isAmmeter" placeholder="请选择是否虚拟" clearable>
-          <el-option v-for="dict in dict.type.is_ammeter" :key="dict.value" :label="dict.label" :value="dict.value" />
+          <el-option v-for="dict in dict.type.monitor_infois_ammeter" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -64,7 +64,7 @@
       <el-table-column label="计量设备位置" align="center" prop="monitorAddr" v-if="columns[5].visible" />
       <el-table-column label="计量设备状态" align="center" prop="monitorStatus" v-if="columns[6].visible">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.monitor_status" :value="scope.row.monitorStatus" />
+          <dict-tag :options="dict.type.monitor_info_monitor_status" :value="scope.row.monitorStatus" />
         </template>
       </el-table-column>
       <el-table-column label="采集设备编号" align="center" prop="collectDeviceId" v-if="columns[7].visible" />
@@ -73,7 +73,7 @@
       <el-table-column label="修正值" align="center" prop="correctValue" v-if="columns[11].visible" />
       <el-table-column label="是否虚拟" align="center" prop="isAmmeter" v-if="columns[14].visible">
         <template slot-scope="scope">
-          <dict-tag :options="dict.type.is_ammeter" :value="scope.row.isAmmeter" />
+          <dict-tag :options="dict.type.monitor_infois_ammeter" :value="scope.row.isAmmeter" />
         </template>
       </el-table-column>
       <el-table-column label="通断复位" align="center" prop="isKeyMonitor" v-if="columns[15].visible" />
@@ -128,7 +128,7 @@
         </el-form-item>
         <el-form-item label="计量设备状态" prop="monitorStatus">
           <el-radio-group v-model="form.monitorStatus">
-            <el-radio v-for="dict in dict.type.monitor_status" :key="dict.value"
+            <el-radio v-for="dict in dict.type.monitor_info_monitor_status" :key="dict.value"
               :label="parseInt(dict.value)">{{ dict.label }}</el-radio>
           </el-radio-group>
         </el-form-item>
@@ -146,7 +146,7 @@
         </el-form-item>
         <el-form-item label="是否虚拟" prop="isAmmeter">
           <el-radio-group v-model="form.isAmmeter">
-            <el-radio v-for="dict in dict.type.is_ammeter" :key="dict.value"
+            <el-radio v-for="dict in dict.type.monitor_infois_ammeter" :key="dict.value"
               :label="dict.value">{{ dict.label }}</el-radio>
           </el-radio-group>
         </el-form-item>