diff --git a/ruoyi-ui/src/views/base/baseInfo/index.vue b/ruoyi-ui/src/views/base/baseInfo/index.vue
index 9a0e7cb..acefb74 100644
--- a/ruoyi-ui/src/views/base/baseInfo/index.vue
+++ b/ruoyi-ui/src/views/base/baseInfo/index.vue
@@ -34,10 +34,10 @@
       <el-col :span="19" :xs="24">
         <!-- 母排信息 -->
         <div>
-          <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+          <el-form :model="queryParamsBusbar" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
             <el-form-item label="母排编号" prop="busbarCode">
               <el-input
-                v-model="queryParams.busbarCode"
+                v-model="queryParamsBusbar.busbarCode"
                 placeholder="请输入母排编号"
                 clearable
                 @keyup.enter.native="handleQueryBusbar"
@@ -45,7 +45,7 @@
             </el-form-item>
             <el-form-item label="母排别名" prop="busbarAlias">
               <el-input
-                v-model="queryParams.busbarAlias"
+                v-model="queryParamsBusbar.busbarAlias"
                 placeholder="请输入母排别名"
                 clearable
                 @keyup.enter.native="handleQueryBusbar"
@@ -104,7 +104,17 @@
           <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="busbarAlias">
+              <template slot-scope="scope">
+                <el-button type="text" @click="showAlarmsForBusbar(scope.row)">
+                  {{ scope.row.busbarAlias }}
+                </el-button>
+              </template>
+            </el-table-column>
+
             <el-table-column label="所属电柜" align="center" prop="cabinetCode" />
             <el-table-column label="母排距离" align="center" prop="busbarDist" />
             <el-table-column label="是否检测" align="center" prop="isChecked">
@@ -517,6 +527,7 @@ export default {
       queryParamsBusbar: {
         pageNum: 1,
         pageSize: 10,
+        objId: null,
         busbarCode: null,
         busbarAlias: null,
         cabinetCode: null,
@@ -524,6 +535,11 @@ export default {
         isChecked: null,
         isEnd: null,
         isFlag: null,
+        remark: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null,
         isPictures: null,
         wPanPos: null,
         wTiltPos: null,
@@ -607,6 +623,11 @@ export default {
         this.loadingBusbar = false;
       });
     },
+    /** 点击检测位置按钮时显示相关报警信息 */
+    showAlarmsForBusbar(row) {
+      this.queryParamsAlarm.busbarCode = row.busbarCode;
+      this.handleQueryAlarm();
+    },
     /** 查询报警信息列表 */
     getListAlarm() {
       this.queryParamsAlarm.params = {};
@@ -624,16 +645,9 @@ export default {
         this.loadingAlarm = false;
       });
     },
-    /** 树节点点击事件 */
-    handleNodeClick(data) {
-      this.queryParamsBusbar.cabinetCode = data.code
-      this.selectedCabinetCode = data.code; // 保存选中的电柜编号
-/*      this.queryParamsAlarm.busbarCode = data.busbarCode;*/
-      this.handleQueryBusbar()
-/*      this.getListAlarm();*/
-    },
     /** 搜索按钮操作 */
     handleQueryBusbar() {
+      this.queryParamsBusbar.cabinetCode = this.selectedCabinetCode;
       this.queryParamsBusbar.pageNum = 1;
       this.getListBusbar();
     },
@@ -683,7 +697,7 @@ export default {
     submitFormBusbar() {
       this.$refs["formBusbar"].validate(valid => {
         if (valid) {
-          if (this.formBusbar.id !== undefined) {
+          if (this.formBusbar.objId !== undefined) {
             updateBaseBusbarInfo(this.formBusbar).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.openBusbar = false;
@@ -702,7 +716,7 @@ export default {
     submitFormAlarm() {
       this.$refs["formAlarm"].validate(valid => {
         if (valid) {
-          if (this.formAlarm.id !== undefined) {
+          if (this.formAlarm.objId !== undefined) {
             updateBaseAlarmInfo(this.formAlarm).then(response => {
               this.$modal.msgSuccess("修改成功");
               this.openAlarm = false;
@@ -729,7 +743,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDeleteBusbar(row) {
-      const ids = row.id || this.idsBusbar;
+      const ids = row.objId || this.idsBusbar;
       this.$modal.confirm('是否确认删除母排编号为"' + ids + '"的数据项？').then(function() {
         return delBaseBusbarInfo(ids);
       }).then(() => {
@@ -738,7 +752,7 @@ export default {
       }).catch(() => {});
     },
     handleDeleteAlarm(row) {
-      const ids = row.id || this.idsAlarm;
+      const ids = row.objId || this.idsAlarm;
       this.$modal.confirm('是否确认删除报警编号为"' + ids + '"的数据项？').then(function() {
         return delBaseAlarmInfo(ids);
       }).then(() => {
@@ -749,6 +763,7 @@ export default {
     /** 重置表单 */
     resetFormBusbar() {
       this.formBusbar = {
+        objId: null,
         busbarCode: null,
         busbarAlias: null,
         cabinetCode: null,
@@ -756,6 +771,11 @@ export default {
         isChecked: null,
         isEnd: null,
         isFlag: null,
+        remark: null,
+        createdBy: null,
+        createdTime: null,
+        updatedBy: null,
+        updatedTime: null,
         isPictures: null,
         wPanPos: null,
         wTiltPos: null,
@@ -766,6 +786,7 @@ export default {
     },
     resetFormAlarm() {
       this.formAlarm = {
+        objId: null,
         busbarCode: null,
         alarmAlias: null,
         alarmContent: null,
@@ -780,13 +801,37 @@ export default {
       };
       this.resetForm("formAlarm");
     },
+
+    /** 导出按钮操作 */
+    handleExportBusbar() {
+      this.download('base/baseBusbarInfo/export', {
+        ...this.queryParams
+      }, `baseBusbarInfo_${new Date().getTime()}.xlsx`)
+    },
+
+    /** 处理母排信息表格选择变化 */
+    handleSelectionChangeBusbar(selection) {
+      this.idsBusbar = selection.map(item => item.id);
+      this.singleBusbar = selection.length !== 1;
+      this.multipleBusbar = !selection.length;
+    },
+
+
     /** 获取电柜信息树结构 */
     getTreeselect() {
       getBaseCabinetInfoTree({}).then(response => {
         this.InfoOptions = response.data;
       });
     },
-
+    /** 树节点点击事件 */
+    handleNodeClick(data) {
+      this.queryParamsBusbar.cabinetCode = data.code
+      this.selectedCabinetCode = data.code; // 保存选中的电柜编号
+      /*      this.queryParamsAlarm.busbarCode = data.busbarCode;*/
+      this.handleQueryBusbar()
+      /*      this.getListAlarm();*/
+    },
+    // 筛选节点
     filterNode(value, data) {
       if (!value) return true;
       return data.label.indexOf(value) !== -1;