diff --git a/ruoyi-ui/src/views/base/baseInfo/index.vue b/ruoyi-ui/src/views/base/baseInfo/index.vue
index adc0c61..9a0e7cb 100644
--- a/ruoyi-ui/src/views/base/baseInfo/index.vue
+++ b/ruoyi-ui/src/views/base/baseInfo/index.vue
@@ -249,7 +249,7 @@
                 <dict-tag :options="dict.type.is_flag" :value="scope.row.isFlag"/>
               </template>
             </el-table-column>
-            <el-table-column label="创建人" align="center" prop="createdBy" />
+<!--            <el-table-column label="创建人" align="center" prop="createdBy" />
             <el-table-column label="创建时间" align="center" prop="createdTime" width="180">
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.createdTime, '{y}-{m}-{d}') }}</span>
@@ -260,7 +260,7 @@
               <template slot-scope="scope">
                 <span>{{ parseTime(scope.row.updatedTime, '{y}-{m}-{d}') }}</span>
               </template>
-            </el-table-column>
+            </el-table-column>-->
             <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
               <template slot-scope="scope">
                 <el-button
@@ -302,8 +302,8 @@
         <el-form-item label="母排别名" prop="busbarAlias">
           <el-input v-model="formBusbar.busbarAlias" placeholder="请输入母排别名" />
         </el-form-item>
-        <el-form-item label="电柜编号" prop="cabinetCode">
-          <el-input v-model="formBusbar.cabinetCode" placeholder="请输入电柜编号" disabled="!null"/>
+        <el-form-item label="电柜编号" prop="cabinetCode" >
+          <el-input v-model="formBusbar.cabinetCode" placeholder="请输入电柜编号" />
         </el-form-item>
         <el-form-item label="母排距离" prop="busbarDist">
           <el-input v-model="formBusbar.busbarDist" placeholder="请输入母排距离" />
@@ -311,7 +311,7 @@
         <el-form-item label="是否检测" prop="isChecked">
           <el-radio-group v-model="formBusbar.isChecked">
             <el-radio
-              v-for="dict in dict.type.busbar_is_checked"
+              v-for="dict in dict.type.is_checked"
               :key="dict.value"
               :label="parseInt(dict.value)"
             >{{dict.label}}</el-radio>
@@ -467,7 +467,7 @@ export default {
 
       // 遮罩层
       loadingBusbar: true,
-      loadingAlarm: true,
+      loadingAlarm: false,
       // 选中数组
       idsBusbar: [],
       idsAlarm: [],
@@ -609,7 +609,6 @@ export default {
     },
     /** 查询报警信息列表 */
     getListAlarm() {
-      this.loadingAlarm = true;
       this.queryParamsAlarm.params = {};
       if (null != this.daterangeCreatedTimeAlarm && '' != this.daterangeCreatedTimeAlarm) {
         this.queryParamsAlarm.params["beginCreatedTime"] = this.daterangeCreatedTimeAlarm[0];
@@ -665,7 +664,7 @@ export default {
     },
     /** 修改按钮操作 */
     handleUpdateBusbar(row) {
-      const id = row.id || this.idsBusbar.length === 1 ? this.idsBusbar[0] : "";
+      const id = row.objId || this.ids
       getBaseBusbarInfo(id).then(response => {
         this.formBusbar = response.data;
         this.openBusbar = true;
@@ -673,7 +672,7 @@ export default {
       });
     },
     handleUpdateAlarm(row) {
-      const id = row.id || this.idsAlarm.length === 1 ? this.idsAlarm[0] : "";
+      const id = row.objId || this.ids
       getBaseAlarmInfo(id).then(response => {
         this.formAlarm = response.data;
         this.openAlarm = true;