diff --git a/src/views/ems/base/baseMonitorInfo/index.vue b/src/views/ems/base/baseMonitorInfo/index.vue
index 5effc61..f62a7d9 100644
--- a/src/views/ems/base/baseMonitorInfo/index.vue
+++ b/src/views/ems/base/baseMonitorInfo/index.vue
@@ -37,7 +37,7 @@
       <el-col :span="1.5">
         <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
       </el-col>
-      <right-toolbar v-model:show-search="showSearch" @query-table="getList" :columns="columns"></right-toolbar>
+      <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
     </el-row>
 
     <el-table
@@ -47,44 +47,31 @@
       row-key="objId"
       :default-expand-all="isExpandAll"
       :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
+      border
+      stripe
     >
-      <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="monitorAddr" v-if="columns[4].visible" />
-      <el-table-column label="采集设备名称" align="center" prop="collectDeviceName" v-if="columns[7].visible" />
-      <el-table-column label="等级" align="center" prop="grade" v-if="columns[9].visible" />
-      <el-table-column label="传感器仪表" align="center" prop="meterTypeId" v-if="columns[10].visible" />
-      <el-table-column label="修正值" align="center" prop="correctValue" v-if="columns[11].visible" />
-      <el-table-column label="PT值" align="center" prop="pt" v-if="columns[12].visible" width="60" />
-      <el-table-column label="CT值" align="center" prop="ct" v-if="columns[13].visible" width="60" />
-      <el-table-column label="是否虚拟" align="center" prop="isAmmeter" v-if="columns[14].visible" width="100">
+      <!-- 设备名称放第一列，树形展开箭头会自动出现在此列 -->
+      <el-table-column label="计量设备名称" prop="monitorName" min-width="200" show-overflow-tooltip>
+        <template #default="scope">
+          <span>{{ scope.row.monitorName }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="设备编号" align="center" prop="monitorCode" min-width="130" show-overflow-tooltip />
+      <el-table-column label="设备位置" align="center" prop="monitorAddr" min-width="120" show-overflow-tooltip />
+      <el-table-column label="采集设备" align="center" prop="collectDeviceName" min-width="120" show-overflow-tooltip />
+      <el-table-column label="PT值" align="center" prop="pt" width="70" />
+      <el-table-column label="CT值" align="center" prop="ct" width="70" />
+      <el-table-column label="是否虚拟" align="center" prop="isAmmeter" width="90">
         <template #default="scope">
           <dict-tag :options="dict.type.is_ammeter" :value="scope.row.isAmmeter" />
         </template>
       </el-table-column>
-      <el-table-column label="通断复位" align="center" prop="isKeyMonitor" v-if="columns[15].visible" />
-      <el-table-column label="是否断路" align="center" prop="isCircuit" v-if="columns[16].visible" />
-      <el-table-column label="计量设备状态" align="center" prop="monitorStatus" v-if="columns[6].visible" width="100">
+      <el-table-column label="设备状态" align="center" prop="monitorStatus" width="100">
         <template #default="scope">
           <dict-tag :options="dict.type.monitor_status" :value="scope.row.monitorStatus" />
         </template>
       </el-table-column>
-      <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[17].visible" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[18].visible">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[19].visible" />
-      <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[20].visible">
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="公摊表类型" align="center" prop="publicShareType" v-if="columns[21].visible" />
-      <el-table-column label="表具层级" align="center" prop="monitorHierarchy" v-if="columns[22].visible" />
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180">
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
         <template #default="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['ems/base:baseMonitorInfo:edit']"
             >修改</el-button
@@ -100,67 +87,78 @@
     </el-table>
 
     <!-- 添加或修改计量设备信息对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-      <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
-        <el-form-item label="父级编号" prop="parentId">
-          <EmsTreeSelect v-model="form.parentId" :options="baseMonitorInfoOptions" :normalizer="normalizer" placeholder="请选择父级编号" />
-        </el-form-item>
-        <el-form-item label="计量设备编号" prop="monitorCode">
-          <el-input v-model="form.monitorCode" 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="monitorAddr">
-          <el-input v-model="form.monitorAddr" placeholder="请输入计量设备位置" />
-        </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" :label="parseInt(dict.value)">{{ dict.label }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="采集设备" prop="collectDeviceId">
-          <el-select v-model="form.collectDeviceId" placeholder="请选择采集设备">
-            <el-option
-              v-for="item in collectDeviceList"
-              :key="item.collectDeviceId"
-              :label="item.collectDeviceName"
-              :value="item.collectDeviceId"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <!--        <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="correctValue">-->
-        <!--          <el-input v-model="form.correctValue" placeholder="请输入修正值" />-->
-        <!--        </el-form-item>-->
-        <el-form-item label="PT值" prop="pt">
-          <el-input-number v-model="form.pt" placeholder="请输入PT值" />
-        </el-form-item>
-        <el-form-item label="CT值" prop="ct">
-          <el-input-number v-model="form.ct" placeholder="请输入CT值" />
-        </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" :label="dict.value">{{ 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-dialog :title="title" v-model="open" width="960px" append-to-body>
+      <el-form ref="formRef" :model="form" :rules="rules" label-width="110px">
+        <!-- ===== 基本信息 ===== -->
+        <el-divider content-position="left">基本信息</el-divider>
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <el-form-item label="上级节点" prop="parentId">
+              <EmsTreeSelect v-model="form.parentId" :options="baseMonitorInfoOptions" :normalizer="normalizer" placeholder="请选择上级节点" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备编号" prop="monitorCode">
+              <el-input v-model="form.monitorCode" placeholder="请输入计量设备编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <el-form-item label="设备名称" prop="monitorName">
+              <el-input v-model="form.monitorName" placeholder="请输入计量设备名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备位置" prop="monitorAddr">
+              <el-input v-model="form.monitorAddr" placeholder="请输入计量设备位置" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- ===== 设备配置 ===== -->
+        <el-divider content-position="left">设备配置</el-divider>
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <el-form-item label="采集设备" prop="collectDeviceId">
+              <el-select v-model="form.collectDeviceId" placeholder="请选择采集设备" style="width: 100%">
+                <el-option
+                  v-for="item in collectDeviceList"
+                  :key="item.collectDeviceId"
+                  :label="item.collectDeviceName"
+                  :value="item.collectDeviceId"
+                />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <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" :label="parseInt(dict.value)">{{ dict.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- ===== 电气参数 ===== -->
+        <el-divider content-position="left">电气参数</el-divider>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="PT值" prop="pt">
+              <el-input-number v-model="form.pt" placeholder="PT" :controls="false" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="CT值" prop="ct">
+              <el-input-number v-model="form.ct" placeholder="CT" :controls="false" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <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" :label="dict.value">{{ dict.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -182,7 +180,6 @@ import {
   updateBaseMonitorInfo
 } from '@/api/ems/base/baseMonitorInfo';
 import EmsTreeSelect from '@/views/ems/components/EmsTreeSelect.vue';
-import { getBaseEnergyTypeList } from '@/api/ems/base/baseEnergyType';
 import { getCollectDeviceInfo } from '@/api/ems/base/baseCollectDeviceInfo';
 import { handleTree } from '@/utils/ruoyi';
 
@@ -345,124 +342,7 @@ const state = reactive({
       }
     ]
   },
-  columns: [
-    {
-      key: 0,
-      label: `自增标识`,
-      visible: false
-    },
-    {
-      key: 1,
-      label: `父级编号`,
-      visible: false
-    },
-    {
-      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: false
-    },
-    {
-      key: 10,
-      label: `传感器仪表`,
-      visible: false
-    },
-    {
-      key: 11,
-      label: `修正值`,
-      visible: false
-    },
-    {
-      key: 12,
-      label: `PT值`,
-      visible: true
-    },
-    {
-      key: 13,
-      label: `CT值`,
-      visible: true
-    },
-    {
-      key: 14,
-      label: `是否虚拟`,
-      visible: true
-    },
-    {
-      key: 15,
-      label: `通断复位`,
-      visible: false
-    },
-    {
-      key: 16,
-      label: `是否断路`,
-      visible: false
-    },
-    {
-      key: 17,
-      label: `创建人`,
-      visible: false
-    },
-    {
-      key: 18,
-      label: `创建时间`,
-      visible: false
-    },
-    {
-      key: 19,
-      label: `更新人`,
-      visible: false
-    },
-    {
-      key: 20,
-      label: `更新时间`,
-      visible: false
-    },
-    {
-      key: 21,
-      label: `公摊表类型`,
-      visible: false
-    },
-    {
-      key: 22,
-      label: `表具层级`,
-      visible: false
-    }
-  ],
-  // 采集设备选项选项
+  // 采集设备选项
   collectDeviceList: []
 } as any);
 
@@ -470,7 +350,6 @@ const {
   baseMonitorInfoList,
   baseMonitorInfoOptions,
   collectDeviceList,
-  columns,
   form,
   isExpandAll,
   loading,
diff --git a/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue b/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
index cdc390f..ad68aab 100644
--- a/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
+++ b/src/views/ems/base/baseMonitorInfoIOTDevice/index.vue
@@ -85,7 +85,7 @@
         <el-col :span="1.5">
           <el-button type="info" plain icon="el-icon-sort" size="mini" @click="toggleExpandAll">展开/折叠</el-button>
         </el-col>
-        <right-toolbar v-model:show-search="showSearch" @query-table="getList" :columns="columns"></right-toolbar>
+        <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
       </el-row>
 
       <el-table
@@ -96,57 +96,33 @@
         :default-expand-all="isExpandAll"
         :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
         class="data-table"
+        border
+        stripe
       >
-        <el-table-column label="序号" type="index" width="60" align="center" v-if="columns[0].visible" />
-        <el-table-column label="计量设备编号" align="center" prop="monitorCode" 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="monitorType" v-if="columns[4].visible">
-        <template #default="scope">
-          {{ dict.type.monitor_type.find(e=>e.value == scope.row.monitorType).label}}
-        </template>
-      </el-table-column> -->
-        <el-table-column label="能源类型" align="center" prop="energyName" v-if="columns[3].visible"> </el-table-column>
-        <el-table-column label="计量设备位置" align="center" prop="monitorAddr" v-if="columns[4].visible" />
-        <el-table-column label="计量设备状态" align="center" prop="monitorStatus" v-if="columns[5].visible">
-          <template #default="scope">
-            <dict-tag :options="dict.type.monitor_status" :value="scope.row.monitorStatus" />
-          </template>
-        </el-table-column>
-        <el-table-column label="采集设备名称" align="center" prop="collectDeviceName" v-if="columns[6].visible" />
-        <el-table-column label="点位类型" align="center" prop="pointType" v-if="columns[19].visible" />
-        <el-table-column label="单位" align="center" prop="unitName" v-if="columns[20].visible" />
-        <el-table-column label="安装位置" align="center" prop="locationName" v-if="columns[21].visible" />
-        <el-table-column label="传感器类型" align="center" prop="sensorType" v-if="columns[22].visible" />
-        <el-table-column label="启用报警" align="center" prop="alarmEnable" v-if="columns[23].visible">
-          <template #default="scope">
-            <dict-tag :options="dict.type.is_flag" :value="scope.row.alarmEnable" />
-          </template>
-        </el-table-column>
-        <el-table-column label="等级" align="center" prop="grade" v-if="columns[7].visible" />
-        <el-table-column label="传感器仪表" align="center" prop="meterTypeId" v-if="columns[8].visible" />
-        <el-table-column label="修正值" align="center" prop="correctValue" v-if="columns[9].visible" />
-        <el-table-column label="是否虚拟" align="center" prop="isAmmeter" v-if="columns[10].visible">
+        <!-- 设备名称放第一列，树形展开箭头会自动出现在此列 -->
+        <el-table-column label="设备名称" prop="monitorName" min-width="200" show-overflow-tooltip />
+        <el-table-column label="设备编号" align="center" prop="monitorCode" min-width="120" show-overflow-tooltip />
+        <el-table-column label="能源类型" align="center" prop="energyName" min-width="90" />
+        <el-table-column label="点位类型" align="center" prop="pointType" min-width="90" />
+        <el-table-column label="单位" align="center" prop="unitName" width="70" />
+        <el-table-column label="安装位置" align="center" prop="locationName" min-width="110" show-overflow-tooltip />
+        <el-table-column label="采集设备" align="center" prop="collectDeviceName" min-width="110" show-overflow-tooltip />
+        <el-table-column label="是否虚拟" align="center" prop="isAmmeter" width="80">
           <template #default="scope">
             <dict-tag :options="dict.type.is_ammeter" :value="scope.row.isAmmeter" />
           </template>
         </el-table-column>
-        <el-table-column label="通断复位" align="center" prop="isKeyMonitor" v-if="columns[11].visible" />
-        <el-table-column label="是否断路" align="center" prop="isCircuit" v-if="columns[12].visible" />
-        <el-table-column label="创建人" align="center" prop="createBy" v-if="columns[13].visible" />
-        <el-table-column label="创建时间" align="center" prop="createTime" width="180" v-if="columns[14].visible">
+        <el-table-column label="设备状态" align="center" prop="monitorStatus" width="90">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
+            <dict-tag :options="dict.type.monitor_status" :value="scope.row.monitorStatus" />
           </template>
         </el-table-column>
-        <el-table-column label="更新人" align="center" prop="updateBy" v-if="columns[15].visible" />
-        <el-table-column label="更新时间" align="center" prop="updateTime" width="180" v-if="columns[16].visible">
+        <el-table-column label="报警" align="center" prop="alarmEnable" width="70">
           <template #default="scope">
-            <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
+            <dict-tag :options="dict.type.is_flag" :value="scope.row.alarmEnable" />
           </template>
         </el-table-column>
-        <el-table-column label="公摊表类型" align="center" prop="publicShareType" v-if="columns[17].visible" />
-        <el-table-column label="表具层级" align="center" prop="monitorHierarchy" v-if="columns[18].visible" />
-        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="240">
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="240" fixed="right">
           <template #default="scope">
             <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['ems/base:baseMonitorInfo:edit']"
               >修改</el-button
@@ -172,116 +148,158 @@
     </section>
 
     <!-- 添加或修改计量设备信息对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body class="themed-dialog">
-      <div class="dialog-tip">
-        <span class="tip-dot"></span>
-        设备档案字段较多，这里按业务主数据录入，隐藏技术字段继续保留在提交链路中，避免影响 EMS 现有流程。
-      </div>
-      <el-form ref="formRef" :model="form" :rules="rules" label-width="120px" class="dialog-form">
-        <el-form-item label="父级编号" prop="parentId">
-          <EmsTreeSelect v-model="form.parentId" :options="baseMonitorInfoOptions" :normalizer="normalizer" placeholder="请选择父级编号" />
-        </el-form-item>
-        <el-form-item label="计量设备编号" prop="monitorCode">
-          <el-input v-model="form.monitorCode" 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="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="monitorAddr">
-          <el-input v-model="form.monitorAddr" placeholder="请输入计量设备位置" />
-        </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" :label="parseInt(dict.value)">{{ dict.label }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="采集设备" prop="collectDeviceId">
-          <el-select v-model="form.collectDeviceId" placeholder="请选择采集设备">
-            <el-option
-              v-for="item in collectDeviceList"
-              :key="item.collectDeviceId"
-              :label="item.collectDeviceName"
-              :value="item.collectDeviceId"
-            ></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="点位类型" prop="pointType">
-          <el-input v-model="form.pointType" placeholder="请输入点位类型" />
-        </el-form-item>
-        <el-form-item label="单位" prop="unitName">
-          <el-input v-model="form.unitName" placeholder="请输入单位" />
-        </el-form-item>
-        <el-form-item label="设备序列号" prop="deviceSn">
-          <el-input v-model="form.deviceSn" placeholder="请输入设备序列号" />
-        </el-form-item>
-        <el-form-item label="安装位置" prop="locationName">
-          <el-input v-model="form.locationName" placeholder="请输入安装位置" />
-        </el-form-item>
-        <el-form-item label="所属柜体" prop="cabinetName">
-          <el-input v-model="form.cabinetName" placeholder="请输入所属柜体" />
-        </el-form-item>
-        <el-form-item label="所属回路" prop="circuitName">
-          <el-input v-model="form.circuitName" placeholder="请输入所属回路" />
-        </el-form-item>
-        <el-form-item label="相别" prop="phaseNo">
-          <el-input v-model="form.phaseNo" placeholder="请输入相别" />
-        </el-form-item>
-        <el-form-item label="传感器类型" prop="sensorType">
-          <el-input v-model="form.sensorType" placeholder="请输入传感器类型" />
-        </el-form-item>
-        <el-form-item label="测量精度" prop="measurePrecision">
-          <el-input-number v-model="form.measurePrecision" placeholder="请输入测量精度" :precision="4" />
-        </el-form-item>
-        <el-form-item label="量程下限" prop="rangeMin">
-          <el-input-number v-model="form.rangeMin" placeholder="请输入量程下限" :precision="4" />
-        </el-form-item>
-        <el-form-item label="量程上限" prop="rangeMax">
-          <el-input-number v-model="form.rangeMax" placeholder="请输入量程上限" :precision="4" />
-        </el-form-item>
-        <el-form-item label="启用报警" prop="alarmEnable">
-          <el-radio-group v-model="form.alarmEnable">
-            <el-radio v-for="dict in dict.type.is_flag" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="启用曲线" prop="curveEnable">
-          <el-radio-group v-model="form.curveEnable">
-            <el-radio v-for="dict in dict.type.is_flag" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="展示排序" prop="displaySort">
-          <el-input-number v-model="form.displaySort" placeholder="请输入展示排序" :precision="0" />
-        </el-form-item>
-        <!--        <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="correctValue">-->
-        <!--          <el-input v-model="form.correctValue" placeholder="请输入修正值" />-->
-        <!--        </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" :label="dict.value">{{ 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-dialog :title="title" v-model="open" width="960px" append-to-body class="themed-dialog">
+      <el-form ref="formRef" :model="form" :rules="rules" label-width="110px" class="dialog-form">
+        <!-- ===== 基本信息 ===== -->
+        <el-divider content-position="left">基本信息</el-divider>
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <el-form-item label="上级节点" prop="parentId">
+              <EmsTreeSelect v-model="form.parentId" :options="baseMonitorInfoOptions" :normalizer="normalizer" placeholder="请选择上级节点" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="设备编号" prop="monitorCode">
+              <el-input v-model="form.monitorCode" placeholder="请输入计量设备编号" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <el-form-item label="设备名称" prop="monitorName">
+              <el-input v-model="form.monitorName" placeholder="请输入计量设备名称" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="能源类型" prop="monitorType">
+              <el-select v-model="form.monitorType" placeholder="请选择能源类型" style="width: 100%">
+                <el-option v-for="item in energyTypeList" :key="item.energyTypeId" :label="item.energyName" :value="item.energyTypeId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <el-form-item label="设备位置" prop="monitorAddr">
+              <el-input v-model="form.monitorAddr" placeholder="请输入计量设备位置" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <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" :label="parseInt(dict.value)">{{ dict.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- ===== 采集配置 ===== -->
+        <el-divider content-position="left">采集配置</el-divider>
+        <el-row :gutter="24">
+          <el-col :span="12">
+            <el-form-item label="采集设备" prop="collectDeviceId">
+              <el-select v-model="form.collectDeviceId" placeholder="请选择采集设备" style="width: 100%">
+                <el-option v-for="item in collectDeviceList" :key="item.collectDeviceId" :label="item.collectDeviceName" :value="item.collectDeviceId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="点位类型" prop="pointType">
+              <el-input v-model="form.pointType" placeholder="点位类型" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
+            <el-form-item label="单位" prop="unitName">
+              <el-input v-model="form.unitName" placeholder="单位" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- ===== 安装信息 ===== -->
+        <el-divider content-position="left">安装信息</el-divider>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="安装位置" prop="locationName">
+              <el-input v-model="form.locationName" placeholder="安装位置" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="所属柜体" prop="cabinetName">
+              <el-input v-model="form.cabinetName" placeholder="所属柜体" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="所属回路" prop="circuitName">
+              <el-input v-model="form.circuitName" placeholder="所属回路" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="相别" prop="phaseNo">
+              <el-input v-model="form.phaseNo" placeholder="相别" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="设备序列号" prop="deviceSn">
+              <el-input v-model="form.deviceSn" placeholder="设备序列号" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="展示排序" prop="displaySort">
+              <el-input-number v-model="form.displaySort" placeholder="排序" :precision="0" :controls="false" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- ===== 传感器参数 ===== -->
+        <el-divider content-position="left">传感器参数</el-divider>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="传感器类型" prop="sensorType">
+              <el-input v-model="form.sensorType" placeholder="传感器类型" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="测量精度" prop="measurePrecision">
+              <el-input-number v-model="form.measurePrecision" placeholder="精度" :precision="4" :controls="false" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <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" :label="dict.value">{{ dict.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="量程下限" prop="rangeMin">
+              <el-input-number v-model="form.rangeMin" placeholder="下限" :precision="4" :controls="false" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="量程上限" prop="rangeMax">
+              <el-input-number v-model="form.rangeMax" placeholder="上限" :precision="4" :controls="false" style="width: 100%" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- ===== 功能开关 ===== -->
+        <el-divider content-position="left">功能开关</el-divider>
+        <el-row :gutter="24">
+          <el-col :span="8">
+            <el-form-item label="启用报警" prop="alarmEnable">
+              <el-radio-group v-model="form.alarmEnable">
+                <el-radio v-for="dict in dict.type.is_flag" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="启用曲线" prop="curveEnable">
+              <el-radio-group v-model="form.curveEnable">
+                <el-radio v-for="dict in dict.type.is_flag" :key="dict.value" :label="dict.value">{{ dict.label }}</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <template #footer>
         <div class="dialog-footer">
@@ -629,132 +647,6 @@ const state = reactive({
       }
     ]
   },
-  columns: [
-    // { key: 0, label: `自增标识`, visible: false },
-    {
-      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: 5,
-      label: `计量设备状态`,
-      visible: true
-    },
-    {
-      key: 6,
-      label: `采集设备名称`,
-      visible: false
-    },
-    {
-      key: 7,
-      label: `等级`,
-      visible: false
-    },
-    {
-      key: 8,
-      label: `传感器仪表`,
-      visible: false
-    },
-    {
-      key: 9,
-      label: `修正值`,
-      visible: false
-    },
-    // { key: 12, label: `PT值`, visible: false },
-    // { key: 13, label: `CT值`, visible: false },
-    {
-      key: 10,
-      label: `是否虚拟`,
-      visible: true
-    },
-    {
-      key: 11,
-      label: `通断复位`,
-      visible: false
-    },
-    {
-      key: 12,
-      label: `是否断路`,
-      visible: false
-    },
-    {
-      key: 13,
-      label: `创建人`,
-      visible: false
-    },
-    {
-      key: 14,
-      label: `创建时间`,
-      visible: false
-    },
-    {
-      key: 15,
-      label: `更新人`,
-      visible: false
-    },
-    {
-      key: 16,
-      label: `更新时间`,
-      visible: false
-    },
-    {
-      key: 17,
-      label: `公摊表类型`,
-      visible: false
-    },
-    {
-      key: 18,
-      label: `表具层级`,
-      visible: false
-    },
-    {
-      key: 19,
-      label: `点位类型`,
-      visible: true
-    },
-    {
-      key: 20,
-      label: `单位`,
-      visible: true
-    },
-    {
-      key: 21,
-      label: `安装位置`,
-      visible: true
-    },
-    {
-      key: 22,
-      label: `传感器类型`,
-      visible: true
-    },
-    {
-      key: 23,
-      label: `启用报警`,
-      visible: true
-    }
-  ],
   //能源类型选项
   energyTypeList: [],
   // 采集设备下拉只展示名称，技术 ID 仍保留在提交参数中。
@@ -797,7 +689,6 @@ const state = reactive({
 const {
   baseMonitorInfoList,
   baseMonitorInfoOptions,
-  columns,
   currentDevice,
   energyTypeList,
   collectDeviceList,