diff --git a/ruoyi-ui/src/views/base/baseBusbarInfo/index.vue b/ruoyi-ui/src/views/base/baseBusbarInfo/index.vue
index 1b314c2..6d26644 100644
--- a/ruoyi-ui/src/views/base/baseBusbarInfo/index.vue
+++ b/ruoyi-ui/src/views/base/baseBusbarInfo/index.vue
@@ -103,18 +103,17 @@
           </el-row>
           <el-table v-loading="loadingBusbar" :data="baseBusbarInfoList" @selection-change="handleSelectionChangeBusbar">
             <el-table-column type="selection" width="55" align="center" />
-            <el-table-column label="检测编号" align="center" prop="busbarCode" />
 
-            <!--            <el-table-column label="检测位置" align="center" prop="busbarAlias" />-->
-
-            <el-table-column label="检测位置" align="center" prop="busbarAlias">
+<!--            <el-table-column label="检测编号" align="center" prop="busbarCode" />-->
+            <el-table-column label="检测编号" align="center" prop="busbarCode">
               <template slot-scope="scope">
                 <el-button type="text" @click="showAlarmsForBusbar(scope.row)">
-                  {{ scope.row.busbarAlias }}
+                  {{ scope.row.busbarCode }}
                 </el-button>
               </template>
             </el-table-column>
 
+            <el-table-column label="检测位置" align="center" prop="busbarAlias" />
             <el-table-column label="所属电柜" align="center" prop="cabinetCode" />
             <el-table-column label="母排距离" align="center" prop="busbarDist" />
             <el-table-column label="是否检测" align="center" prop="isChecked">
@@ -625,20 +624,22 @@ export default {
     },
     /** 点击检测位置按钮时显示相关报警信息 */
     showAlarmsForBusbar(row) {
+      this.queryParamsAlarm.params = {};
       this.queryParamsAlarm.busbarCode = row.busbarCode;
       this.handleQueryAlarm();
     },
     /** 查询报警信息列表 */
     getListAlarm() {
-      this.queryParamsAlarm.params = {};
-      if (null != this.daterangeCreatedTimeAlarm && '' != this.daterangeCreatedTimeAlarm) {
+      this.loadingAlarm = true;
+      /*this.queryParamsAlarm.params = {};*/
+/*      if (null != this.daterangeCreatedTimeAlarm && '' != this.daterangeCreatedTimeAlarm) {
         this.queryParamsAlarm.params["beginCreatedTime"] = this.daterangeCreatedTimeAlarm[0];
         this.queryParamsAlarm.params["endCreatedTime"] = this.daterangeCreatedTimeAlarm[1];
       }
       if (null != this.daterangeUpdatedTimeAlarm && '' != this.daterangeUpdatedTimeAlarm) {
         this.queryParamsAlarm.params["beginUpdatedTime"] = this.daterangeUpdatedTimeAlarm[0];
         this.queryParamsAlarm.params["endUpdatedTime"] = this.daterangeUpdatedTimeAlarm[1];
-      }
+      }*/
       listBaseAlarmInfo(this.queryParamsAlarm).then(response => {
         this.baseAlarmInfoList = response.rows;
         this.totalAlarm = response.total;