diff --git a/ruoyi-ui/src/views/base/baseBusbarInfo/index.vue b/ruoyi-ui/src/views/base/baseBusbarInfo/index.vue
index 6d26644..cbac831 100644
--- a/ruoyi-ui/src/views/base/baseBusbarInfo/index.vue
+++ b/ruoyi-ui/src/views/base/baseBusbarInfo/index.vue
@@ -51,6 +51,26 @@
                 @keyup.enter.native="handleQueryBusbar"
               />
             </el-form-item>
+            <el-form-item label="是否拍照" prop="isPictures">
+              <el-select v-model="queryParamsBusbar.isPictures" placeholder="请选择是否拍照" clearable>
+                <el-option
+                  v-for="dict in dict.type.is_pictures"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
+            <el-form-item label="是否快检" prop="isChecked">
+              <el-select v-model="queryParamsBusbar.isChecked" placeholder="请选择是否快检" clearable>
+                <el-option
+                  v-for="dict in dict.type.busbar_is_checked"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                />
+              </el-select>
+            </el-form-item>
             <el-form-item>
               <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQueryBusbar">搜索</el-button>
               <el-button icon="el-icon-refresh" size="mini" @click="resetQueryBusbar">重置</el-button>
@@ -312,7 +332,7 @@
           <el-input v-model="formBusbar.busbarAlias" placeholder="请输入母排别名" />
         </el-form-item>
         <el-form-item label="电柜编号" prop="cabinetCode" >
-          <el-input v-model="formBusbar.cabinetCode" placeholder="请输入电柜编号" :disabled="formBusbar.cabinetCode!=null" />
+          <el-input v-model="formBusbar.cabinetCode" placeholder="请输入电柜编号" />
         </el-form-item>
         <el-form-item label="母排距离" prop="busbarDist">
           <el-input v-model="formBusbar.busbarDist" placeholder="请输入母排距离" />
@@ -382,7 +402,7 @@
     <el-dialog :title="titleAlarm" :visible.sync="openAlarm" width="500px" append-to-body>
       <el-form ref="formAlarm" :model="formAlarm" :rules="rulesAlarm" label-width="80px">
         <el-form-item label="母排编号" prop="busbarCode">
-          <el-input v-model="formAlarm.busbarCode" placeholder="请输入母排编号" :disabled="formAlarm.busbarCode!=null"/>
+          <el-input v-model="formAlarm.busbarCode" placeholder="请输入母排编号" />
         </el-form-item>
         <el-form-item label="报警别名" prop="alarmAlias">
           <el-input v-model="formAlarm.alarmAlias" placeholder="请输入报警别名" />
@@ -510,6 +530,7 @@ export default {
       daterangeUpdatedTimeAlarm: [],
       // 查询参数
       queryParams: {
+        objId: null,
         busbarCode: null,
         busbarAlias: null,
         cabinetCode: null,
@@ -548,6 +569,7 @@ export default {
       queryParamsAlarm: {
         pageNum: 1,
         pageSize: 10,
+        objId: null,
         busbarCode: null,
         alarmAlias: null,
         alarmContent: null,
@@ -659,15 +681,56 @@ export default {
     /** 重置按钮操作 */
     resetQueryBusbar() {
       this.resetForm("queryFormBusbar");
+      this.queryParamsBusbar = {
+        pageNum: 1,
+        pageSize: 10,
+        objId: null,
+        busbarCode: null,
+        busbarAlias: null,
+        cabinetCode: null,
+        busbarDist: null,
+        isChecked: null,
+        isEnd: null,
+        isFlag: null,
+        remark: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null,
+        isPictures: null,
+        wPanPos: null,
+        wTiltPos: null,
+        wZoomPos: null,
+        isRotate: null
+      };
       this.handleQueryBusbar();
     },
     resetQueryAlarm() {
       this.resetForm("queryFormAlarm");
+      this.queryParamsAlarm = {
+        pageNum: 1,
+        pageSize: 10,
+        objId: null,
+        busbarCode: null,
+        alarmAlias: null,
+        alarmContent: null,
+        alarmType: null,
+        alarmValue: null,
+        judgMethod: null,
+        isFlag: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null
+      };
       this.handleQueryAlarm();
     },
+
     /** 新增按钮操作 */
     handleAddBusbar() {
       this.resetFormBusbar();
+      this.resetForm("queryFormBusbar");
+      this.formBusbar.objId = undefined;
       this.openBusbar = true;
       this.formBusbar.cabinetCode = this.selectedCabinetCode; // 设置电柜编号
       this.titleBusbar = "添加母排信息";
@@ -679,7 +742,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdateBusbar(row) {
-      const id = row.objId || this.ids
+      const id = row.objId || this.idsBusbar
       getBaseBusbarInfo(id).then(response => {
         this.formBusbar = response.data;
         this.openBusbar = true;
@@ -687,7 +750,7 @@ export default {
       });
     },
     handleUpdateAlarm(row) {
-      const id = row.objId || this.ids
+      const id = row.objId || this.idsAlarm
       getBaseAlarmInfo(id).then(response => {
         this.formAlarm = response.data;
         this.openAlarm = true;
@@ -814,11 +877,16 @@ export default {
 
     /** 处理母排信息表格选择变化 */
     handleSelectionChangeBusbar(selection) {
-      this.idsBusbar = selection.map(item => item.id);
+      this.idsBusbar = selection.map(item => item.objId);
       this.singleBusbar = selection.length !== 1;
       this.multipleBusbar = !selection.length;
     },
-
+    /** 处理报警信息表格选择变化 */
+    handleSelectionChangeAlarm(selection) {
+      this.idsAlarm = selection.map(item => item.objId);
+      this.singleAlarm = selection.length !== 1;
+      this.multipleAlarm = !selection.length;
+    },
 
     /** 获取电柜信息树结构 */
     getTreeselect() {