diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 2771ee4..a4d364c 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -158,7 +158,7 @@ export default {
   mounted() {
     // 定时获取提示路由信息
     this.getAlarmData()
-    // setInterval(() => this.getAlarmData(), 1000 * 60);
+    setInterval(() => this.getAlarmData(), 1000 * 60);
   },
   components: {
     Breadcrumb,
diff --git a/src/views/ems/record/recordAlarmRule/index.vue b/src/views/ems/record/recordAlarmRule/index.vue
index 1f1997d..18c740f 100644
--- a/src/views/ems/record/recordAlarmRule/index.vue
+++ b/src/views/ems/record/recordAlarmRule/index.vue
@@ -9,7 +9,7 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="触发规则" prop="triggerRule">
+      <!-- <el-form-item label="触发规则" prop="triggerRule">
         <el-select v-model="queryParams.triggerRule" placeholder="请选择触发规则" clearable>
           <el-option
             v-for="dict in dict.type.trigger_rule"
@@ -18,7 +18,7 @@
             :value="dict.value"
           />
         </el-select>
-      </el-form-item>
+      </el-form-item> -->
 <!--      <el-form-item label="通知用户" prop="notifyUser">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.notifyUser"-->
@@ -34,41 +34,41 @@
     </el-form>
 
     <el-row :gutter="10" class="mb8">
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="primary"-->
-<!--          plain-->
-<!--          icon="el-icon-plus"-->
-<!--          size="mini"-->
-<!--          @click="handleAdd"-->
-<!--          v-hasPermi="['ems/record:recordAlarmRule:add']"-->
-<!--        >新增-->
-<!--        </el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="success"-->
-<!--          plain-->
-<!--          icon="el-icon-edit"-->
-<!--          size="mini"-->
-<!--          :disabled="single"-->
-<!--          @click="handleUpdate"-->
-<!--          v-hasPermi="['ems/record:recordAlarmRule:edit']"-->
-<!--        >修改-->
-<!--        </el-button>-->
-<!--      </el-col>-->
-<!--      <el-col :span="1.5">-->
-<!--        <el-button-->
-<!--          type="danger"-->
-<!--          plain-->
-<!--          icon="el-icon-delete"-->
-<!--          size="mini"-->
-<!--          :disabled="multiple"-->
-<!--          @click="handleDelete"-->
-<!--          v-hasPermi="['ems/record:recordAlarmRule:remove']"-->
-<!--        >删除-->
-<!--        </el-button>-->
-<!--      </el-col>-->
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['ems/record:recordAlarmRule:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['ems/record:recordAlarmRule:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['ems/record:recordAlarmRule:remove']"
+        >删除
+        </el-button>
+      </el-col>
       <el-col :span="1.5">
         <el-button
           type="warning"
@@ -88,7 +88,7 @@
       <el-table-column label="自增标识" align="center" prop="objId" v-if="columns[0].visible"/>
       <el-table-column label="规则编号" align="center" prop="ruleId" v-if="columns[1].visible"/>
       <el-table-column label="规则名称" align="center" prop="ruleName" v-if="columns[2].visible"/>
-      <el-table-column label="计量设备编号" align="center" prop="monitorId" v-if="columns[3].visible"/>
+      <el-table-column label="计量设备" align="center" prop="monitorName" v-if="columns[3].visible"/>
       <el-table-column label="记录时间" align="center" prop="collectTime" width="180" v-if="columns[4].visible">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
@@ -102,7 +102,7 @@
       </el-table-column>
       <el-table-column label="触发阈值次数" align="center" prop="triggerNumber" v-if="columns[7].visible"/>
       <el-table-column label="时间范围(分)" align="center" prop="timeRange" v-if="columns[8].visible"/>
-      <el-table-column label="设备离线时间(分钟)" align="center" prop="deviceOfflineTime" v-if="columns[9].visible"/>
+      <el-table-column label="触发阈值量" align="center" prop="triggerValue" v-if="columns[9].visible"/>
       <el-table-column label="通知用户" align="center" prop="notifyUser" v-if="columns[10].visible"/>
       <el-table-column label="备注" align="center" prop="cause" v-if="columns[11].visible"/>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
@@ -115,14 +115,14 @@
             v-hasPermi="['ems/record:recordAlarmRule:edit']"
           >修改
           </el-button>
-<!--          <el-button-->
-<!--            size="mini"-->
-<!--            type="text"-->
-<!--            icon="el-icon-delete"-->
-<!--            @click="handleDelete(scope.row)"-->
-<!--            v-hasPermi="['ems/record:recordAlarmRule:remove']"-->
-<!--          >删除-->
-<!--          </el-button>-->
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['ems/record:recordAlarmRule:remove']"
+          >删除
+          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -138,15 +138,19 @@
     <!-- 添加或修改异常告警规则对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="150px">
-        <el-form-item label="规则编号" prop="ruleId">
+        <!-- <el-form-item label="规则编号" prop="ruleId">
           <el-input v-model="form.ruleId" placeholder="请输入规则编号" disabled/>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item label="规则名称" prop="ruleName">
           <el-input v-model="form.ruleName" placeholder="请输入规则名称"/>
         </el-form-item>
-<!--        <el-form-item label="计量设备编号" prop="monitorId">-->
+        <el-form-item label="计量设备编号" prop="monitorId">
 <!--          <el-input v-model="form.monitorId" placeholder="请输入计量设备编号"/>-->
-<!--        </el-form-item>-->
+          <el-select v-model="form.monitorId" placeholder="请选择计量设备"
+                     @change="handleMonitorChange">
+            <el-option v-for="item in monitorList" :key="item.monitorCode" :label="item.monitorName" :value="item.monitorCode"/>
+          </el-select>
+        </el-form-item>
 <!--        <el-form-item label="记录时间" prop="collectTime">-->
 <!--          <el-date-picker clearable-->
 <!--                          v-model="form.collectTime"-->
@@ -159,7 +163,7 @@
 <!--        <el-form-item label="能源类型" prop="energyType">-->
 <!--          <el-input v-model="form.energyType" placeholder="请输入能源类型"/>-->
 <!--        </el-form-item>-->
-        <el-form-item label="触发规则" prop="triggerRule">
+        <!-- <el-form-item label="触发规则" prop="triggerRule">
           <el-radio-group v-model="form.triggerRule" disabled>
             <el-radio
               v-for="dict in dict.type.trigger_rule"
@@ -168,15 +172,17 @@
             >{{ dict.label }}
             </el-radio>
           </el-radio-group>
+        </el-form-item> -->
+        <el-form-item label="监测字段" prop="monitorField" v-if="selectedMonitorType === 6 || selectedMonitorType === 10">
+          <el-select v-model="form.monitorField" placeholder="请选择监测字段">
+            <el-option v-for="dict in dict.type.monitor_field" :key="dict.value" :label="dict.label" :value="dict.value"/>
+          </el-select>
         </el-form-item>
-<!--        <el-form-item label="触发阈值次数" prop="triggerNumber">-->
-<!--          <el-input v-model="form.triggerNumber" placeholder="请输入触发阈值次数"/>-->
-<!--        </el-form-item>-->
 <!--        <el-form-item label="时间范围(分)" prop="timeRange">-->
 <!--          <el-input v-model="form.timeRange" placeholder="请输入时间范围(分)"/>-->
 <!--        </el-form-item>-->
-        <el-form-item label="设备离线时间(分钟)" prop="deviceOfflineTime">
-          <el-input-number v-model="form.deviceOfflineTime" placeholder="请输入设备离线时间(分钟)"/>
+        <el-form-item label="触发阈值量" prop="triggerValue">
+          <el-input-number v-model="form.triggerValue" placeholder="请输入触发阈值量" :precision="2"/>
         </el-form-item>
 <!--        <el-form-item label="通知用户" prop="notifyUser">-->
 <!--          <el-input v-model="form.notifyUser" placeholder="请输入通知用户"/>-->
@@ -201,10 +207,11 @@ import {
   addRecordAlarmRule,
   updateRecordAlarmRule
 } from '@/api/ems/record/recordAlarmRule'
+import {listBaseMonitorInfo} from "@/api/ems/base/baseMonitorInfo";
 
 export default {
   name: 'RecordAlarmRule',
-  dicts: ['trigger_rule'],
+  dicts: ['trigger_rule',  'monitor_field'],
   data() {
     return {
       // 遮罩层
@@ -225,6 +232,9 @@ export default {
       title: '',
       // 是否显示弹出层
       open: false,
+      // 设备列表
+      monitorList: [],
+      selectedMonitorType: null, // 新增：用于存储选中设备的 monitorType
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -234,10 +244,10 @@ export default {
         monitorId: null,
         collectTime: null,
         energyType: null,
-        triggerRule: null,
-        triggerNumber: null,
+        triggerRule: 0,
+        monitorField: null,
         timeRange: null,
-        deviceOfflineTime: null,
+        triggerValue: null,
         notifyUser: null,
         cause: null
       },
@@ -251,19 +261,19 @@ export default {
       },
       columns: [
         { key: 0, label: `自增标识`, visible: false },
-        { key: 1, label: `规则编号`, visible: true },
+        { key: 1, label: `规则编号`, visible: false },
         { key: 2, label: `规则名称`, visible: true },
-        { key: 3, label: `计量设备编号`, visible: false },
+        { key: 3, label: `计量设备`, visible: true },
         { key: 4, label: `记录时间`, visible: false },
         { key: 5, label: `能源类型`, visible: false },
-        { key: 6, label: `触发规则`, visible: true },
+        { key: 6, label: `触发规则`, visible: false },
         { key: 7, label: `触发阈值次数`, visible: false },
         { key: 8, label: `时间范围(分)`, visible: false },
-        { key: 9, label: `设备离线时间(分钟)`, visible: true },
+        { key: 9, label: `触发阈值量`, visible: true },
         { key: 10, label: `通知用户`, visible: false },
         { key: 11, label: `备注`, visible: true },
         { key: 12, label: `创建人`, visible: false },
-        { key: 13, label: `创建时间`, visible: false },
+        { key: 13, label: `创建时间`, visible: true },
         { key: 14, label: `更新人`, visible: false },
         { key: 15, label: `更新时间`, visible: false }
       ]
@@ -271,6 +281,7 @@ export default {
   },
   created() {
     this.getList()
+    this.getMonitorList()
   },
   methods: {
     /** 查询异常告警规则列表 */
@@ -296,10 +307,10 @@ export default {
         monitorId: null,
         collectTime: null,
         energyType: null,
-        triggerRule: null,
-        triggerNumber: null,
+        triggerRule: 0,
+        monitorField: null,
         timeRange: null,
-        deviceOfflineTime: null,
+        triggerValue: null,
         notifyUser: null,
         cause: null,
         createBy: null,
@@ -307,6 +318,7 @@ export default {
         updateBy: null,
         updateTime: null
       }
+      this.selectedMonitorType = null; // 重置时清空
       this.resetForm('form')
     },
     /** 搜索按钮操作 */
@@ -333,10 +345,15 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      this.reset()
+      this.reset();
       const objId = row.objId || this.ids
       getRecordAlarmRule(objId).then(response => {
         this.form = response.data
+        // 当修改时，需要根据 form.monitorId（实际是monitorCode）初始化 selectedMonitorType
+        const selectedMonitor = this.monitorList.find(m => m.monitorCode === this.form.monitorId);
+        if (selectedMonitor) {
+          this.selectedMonitorType = selectedMonitor.monitorType;
+        }
         this.open = true
         this.title = '修改异常告警规则'
       })
@@ -377,7 +394,28 @@ export default {
       this.download('ems/record/recordAlarmRule/export', {
         ...this.queryParams
       }, `recordAlarmRule_${new Date().getTime()}.xlsx`)
-    }
+    },
+    //获取设备列表用来下拉框
+    getMonitorList() {
+      listBaseMonitorInfo().then(response => {
+        this.monitorList = response.data;
+      })
+    },
+    // 当选择的设备变化时触发
+    handleMonitorChange(monitorId) {
+      // monitorId这里实际传入的是monitorCode值
+      const selectedMonitor = this.monitorList.find(m => m.monitorCode === monitorId);
+      if (selectedMonitor) {
+        this.selectedMonitorType = selectedMonitor.monitorType;
+        // 如果设备类型不是6或10，则清空已选的监测字段
+        if (this.selectedMonitorType !== 6 && this.selectedMonitorType !== 10) {
+          this.form.monitorField = null;
+        }
+      } else {
+        this.selectedMonitorType = null;
+        this.form.monitorField = null; // 如果找不到设备，也清空
+      }
+    },
   }
 }
 </script>