diff --git a/ruoyi-module/src/main/java/com/ruoyi/base/controller/BaseBusbarInfoController.java b/ruoyi-module/src/main/java/com/ruoyi/base/controller/BaseBusbarInfoController.java
index 8ca0b39..21e098b 100644
--- a/ruoyi-module/src/main/java/com/ruoyi/base/controller/BaseBusbarInfoController.java
+++ b/ruoyi-module/src/main/java/com/ruoyi/base/controller/BaseBusbarInfoController.java
@@ -110,4 +110,15 @@ public class BaseBusbarInfoController extends BaseController
         return success(baseBusbarInfoService.countBaseBusbarInfo());
     }
 
+    /**
+     * 查询母排信息列表
+     */
+    @PreAuthorize("@ss.hasPermi('base:baseBusbarInfo:list')")
+    @PostMapping("/baseBusbarInfolist")
+    public AjaxResult baseBusbarInfolist(BaseBusbarInfo baseBusbarInfo)
+    {
+        List<BaseBusbarInfo> list = baseBusbarInfoService.selectBaseBusbarInfoList(baseBusbarInfo);
+        return success(list);
+    }
+
 }
diff --git a/ruoyi-module/src/main/java/com/ruoyi/base/domain/CabinetAndBusbarTree.java b/ruoyi-module/src/main/java/com/ruoyi/base/domain/CabinetAndBusbarTree.java
index 51e6876..5302381 100644
--- a/ruoyi-module/src/main/java/com/ruoyi/base/domain/CabinetAndBusbarTree.java
+++ b/ruoyi-module/src/main/java/com/ruoyi/base/domain/CabinetAndBusbarTree.java
@@ -29,6 +29,8 @@ public class CabinetAndBusbarTree implements Serializable
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private List<CabinetAndBusbarTree> children;
 
+    private Long busbarCode;
+
     public CabinetAndBusbarTree()
     {
 
@@ -51,6 +53,7 @@ public class CabinetAndBusbarTree implements Serializable
 
     public CabinetAndBusbarTree(BaseBusbarInfo baseBusbarInfo) {
         this.id = baseBusbarInfo.getObjId();
+        this.busbarCode = baseBusbarInfo.getBusbarCode();
         this.label = baseBusbarInfo.getBusbarAlias();
         this.code = baseBusbarInfo.getBusbarCode().toString();
         this.children = baseBusbarInfo.getChildren().stream().map(CabinetAndBusbarTree::new).collect(Collectors.toList());
@@ -105,4 +108,11 @@ public class CabinetAndBusbarTree implements Serializable
         this.children.add(child);
     }
 
+    public Long getBusbarCode() {
+        return busbarCode;
+    }
+
+    public void setBusbarCode(Long busbarCode) {
+        this.busbarCode = busbarCode;
+    }
 }
diff --git a/ruoyi-module/src/main/resources/mapper/record/RecordBusbarAlarmMapper.xml b/ruoyi-module/src/main/resources/mapper/record/RecordBusbarAlarmMapper.xml
index c4eba6c..8a7c769 100644
--- a/ruoyi-module/src/main/resources/mapper/record/RecordBusbarAlarmMapper.xml
+++ b/ruoyi-module/src/main/resources/mapper/record/RecordBusbarAlarmMapper.xml
@@ -37,7 +37,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                bai.alarm_content,
                bbi.busbar_alias
         from record_busbar_alarm rba
-                 LEFT JOIN base_alarm_info bai ON rba.busbar_code = bai.busbar_code
+                 LEFT JOIN base_alarm_info bai ON rba.busbar_code = bai.busbar_code and rba.alarm_type = bai.alarm_type
         left join  base_busbar_info bbi on rba.busbar_code = bbi.busbar_code
     </sql>
 
diff --git a/ruoyi-ui/src/api/base/baseBusbarInfo.js b/ruoyi-ui/src/api/base/baseBusbarInfo.js
index 3b958a2..8446005 100644
--- a/ruoyi-ui/src/api/base/baseBusbarInfo.js
+++ b/ruoyi-ui/src/api/base/baseBusbarInfo.js
@@ -52,3 +52,11 @@ export function countBusbar() {
       method: 'post'
     })
 }
+
+export function baseBusbarInfolist(data) {
+  return request({
+    url: '/base/baseBusbarInfo/baseBusbarInfolist',
+    method: 'post',
+    data: data
+  })
+}
diff --git a/ruoyi-ui/src/views/base/baseAlarmInfo/index.vue b/ruoyi-ui/src/views/base/baseAlarmInfo/index.vue
index 335fee2..a01a510 100644
--- a/ruoyi-ui/src/views/base/baseAlarmInfo/index.vue
+++ b/ruoyi-ui/src/views/base/baseAlarmInfo/index.vue
@@ -218,14 +218,25 @@
     <!-- 添加或修改报警信息对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="母排编号" prop="busbarCode">
+<!--        <el-form-item label="母排编号" prop="busbarCode">
           <el-input v-model="form.busbarCode" placeholder="请输入母排编号" />
+        </el-form-item>-->
+        <el-form-item label="母排编号" prop="busbarCode">
+          <el-select v-model="form.busbarCode" placeholder="请选择母排编号">
+            <el-option
+              v-for="item in InfoOptions"
+              :key="item.objId"
+              :label="item.busbarAlias"
+              :value="item.busbarCode"
+            ></el-option>
+          </el-select>
         </el-form-item>
+
         <el-form-item label="报警别名" prop="alarmAlias">
           <el-input v-model="form.alarmAlias" placeholder="请输入报警别名" />
         </el-form-item>
         <el-form-item label="报警内容">
-          <editor v-model="form.alarmContent" :min-height="192"/>
+          <el-input v-model="form.alarmContent" placeholder="请输入报警内容"/>
         </el-form-item>
         <el-form-item label="报警类型" prop="alarmType">
           <el-select v-model="form.alarmType" placeholder="请选择报警类型">
@@ -291,10 +302,16 @@
 
 <script>
 import { listBaseAlarmInfo, getBaseAlarmInfo, delBaseAlarmInfo, addBaseAlarmInfo, updateBaseAlarmInfo } from "@/api/base/baseAlarmInfo";
+import {CabinetAndBusbarTree} from "@/api/record/recordBusbarTemp";
+import Treeselect from '@riophae/vue-treeselect'
+import {baseBusbarInfolist} from "@/api/base/baseBusbarInfo";
 
 export default {
   name: "BaseAlarmInfo",
   dicts: ['judg_method', 'is_flag', 'alarm_type'],
+  components: {
+    Treeselect
+  },
   data() {
     return {
       // 遮罩层
@@ -319,6 +336,8 @@ export default {
       daterangeCreatedTime: [],
       // 更新时间时间范围
       daterangeUpdatedTime: [],
+      // 下拉树选项
+      InfoOptions: [],
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -345,6 +364,7 @@ export default {
   },
   created() {
     this.getList();
+    this.getTreeselect();
   },
   methods: {
     /** 查询报警信息列表 */
@@ -364,6 +384,10 @@ export default {
         this.total = response.total;
         this.loading = false;
       });
+      baseBusbarInfolist({}).then(response => {
+        this.InfoOptions = response.data;
+      });
+
     },
     // 取消按钮
     cancel() {
diff --git a/ruoyi-ui/src/views/record/recordBusbarAlarm/index.vue b/ruoyi-ui/src/views/record/recordBusbarAlarm/index.vue
index 0e291c6..4fbb1d7 100644
--- a/ruoyi-ui/src/views/record/recordBusbarAlarm/index.vue
+++ b/ruoyi-ui/src/views/record/recordBusbarAlarm/index.vue
@@ -32,7 +32,7 @@
       </el-col>
       <el-col :span="19" :xs="24">
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="租户号" prop="objId">
+<!--      <el-form-item label="租户号" prop="objId">
         <el-input
           v-model="queryParams.objId"
           placeholder="请输入租户号"
@@ -55,7 +55,7 @@
           clearable
           @keyup.enter.native="handleQuery"
         />
-      </el-form-item>
+      </el-form-item>-->
 <!--      <el-form-item label="最高温度" prop="tempMax">
         <el-input
           v-model="queryParams.tempMax"
diff --git a/ruoyi-ui/src/views/record/recordBusbarTemp/index.vue b/ruoyi-ui/src/views/record/recordBusbarTemp/index.vue
index 7ab0920..d9e55f7 100644
--- a/ruoyi-ui/src/views/record/recordBusbarTemp/index.vue
+++ b/ruoyi-ui/src/views/record/recordBusbarTemp/index.vue
@@ -417,7 +417,6 @@
     </el-dialog>
 
 
-
 <!-- 图片显示对话框 -->
 <!-- 通过增加key属性来确保每次图片URL更新时，Vue都会重新渲染图片元素，从而避免显示旧的缓存图片。 -->
     <el-dialog :title="photoTitle" :visible.sync="photoOpen" width="1333px" append-to-body>
@@ -431,8 +430,6 @@
       </div>
     </el-dialog>
 
-
-
   </div>
 </template>
 
@@ -452,7 +449,6 @@ export default {
   dicts: ['record_busbar_temp_is_alarm', 'record_busbar_temp_is_flag','rout_model'],
   data() {
     return {
-
       //电柜信息下拉树选项
       InfoOptions: [],
       //左侧树结构筛选框
@@ -463,7 +459,6 @@ export default {
         /*        label: (data) => `(编号${data.code}) ${data.label} `*/
       },
 
-
       // 遮罩层
       loading: true,
       // 选中数组