feat(base): 修复优化母排信息展示和查询功能

- 重写部分代码,优化母排信息展示和查询逻辑
- 添加检测位置点击事件,显示相关报警信息
- 修复删除功能,使用正确的 ID 字段
- 修复表格选择变化处理
- 添加数据导出功能
- 重构树节点点击事件处理
IOT
zch 3 months ago
parent 362c51fec3
commit 0e59771359

@ -34,10 +34,10 @@
<el-col :span="19" :xs="24"> <el-col :span="19" :xs="24">
<!-- 母排信息 --> <!-- 母排信息 -->
<div> <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-form-item label="母排编号" prop="busbarCode">
<el-input <el-input
v-model="queryParams.busbarCode" v-model="queryParamsBusbar.busbarCode"
placeholder="请输入母排编号" placeholder="请输入母排编号"
clearable clearable
@keyup.enter.native="handleQueryBusbar" @keyup.enter.native="handleQueryBusbar"
@ -45,7 +45,7 @@
</el-form-item> </el-form-item>
<el-form-item label="母排别名" prop="busbarAlias"> <el-form-item label="母排别名" prop="busbarAlias">
<el-input <el-input
v-model="queryParams.busbarAlias" v-model="queryParamsBusbar.busbarAlias"
placeholder="请输入母排别名" placeholder="请输入母排别名"
clearable clearable
@keyup.enter.native="handleQueryBusbar" @keyup.enter.native="handleQueryBusbar"
@ -104,7 +104,17 @@
<el-table v-loading="loadingBusbar" :data="baseBusbarInfoList" @selection-change="handleSelectionChangeBusbar"> <el-table v-loading="loadingBusbar" :data="baseBusbarInfoList" @selection-change="handleSelectionChangeBusbar">
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column label="检测编号" align="center" prop="busbarCode" /> <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="cabinetCode" />
<el-table-column label="母排距离" align="center" prop="busbarDist" /> <el-table-column label="母排距离" align="center" prop="busbarDist" />
<el-table-column label="是否检测" align="center" prop="isChecked"> <el-table-column label="是否检测" align="center" prop="isChecked">
@ -517,6 +527,7 @@ export default {
queryParamsBusbar: { queryParamsBusbar: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
objId: null,
busbarCode: null, busbarCode: null,
busbarAlias: null, busbarAlias: null,
cabinetCode: null, cabinetCode: null,
@ -524,6 +535,11 @@ export default {
isChecked: null, isChecked: null,
isEnd: null, isEnd: null,
isFlag: null, isFlag: null,
remark: null,
createdBy: null,
createdTime: null,
updatedBy: null,
updatedTime: null,
isPictures: null, isPictures: null,
wPanPos: null, wPanPos: null,
wTiltPos: null, wTiltPos: null,
@ -607,6 +623,11 @@ export default {
this.loadingBusbar = false; this.loadingBusbar = false;
}); });
}, },
/** 点击检测位置按钮时显示相关报警信息 */
showAlarmsForBusbar(row) {
this.queryParamsAlarm.busbarCode = row.busbarCode;
this.handleQueryAlarm();
},
/** 查询报警信息列表 */ /** 查询报警信息列表 */
getListAlarm() { getListAlarm() {
this.queryParamsAlarm.params = {}; this.queryParamsAlarm.params = {};
@ -624,16 +645,9 @@ export default {
this.loadingAlarm = false; this.loadingAlarm = false;
}); });
}, },
/** 树节点点击事件 */
handleNodeClick(data) {
this.queryParamsBusbar.cabinetCode = data.code
this.selectedCabinetCode = data.code; //
/* this.queryParamsAlarm.busbarCode = data.busbarCode;*/
this.handleQueryBusbar()
/* this.getListAlarm();*/
},
/** 搜索按钮操作 */ /** 搜索按钮操作 */
handleQueryBusbar() { handleQueryBusbar() {
this.queryParamsBusbar.cabinetCode = this.selectedCabinetCode;
this.queryParamsBusbar.pageNum = 1; this.queryParamsBusbar.pageNum = 1;
this.getListBusbar(); this.getListBusbar();
}, },
@ -683,7 +697,7 @@ export default {
submitFormBusbar() { submitFormBusbar() {
this.$refs["formBusbar"].validate(valid => { this.$refs["formBusbar"].validate(valid => {
if (valid) { if (valid) {
if (this.formBusbar.id !== undefined) { if (this.formBusbar.objId !== undefined) {
updateBaseBusbarInfo(this.formBusbar).then(response => { updateBaseBusbarInfo(this.formBusbar).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.openBusbar = false; this.openBusbar = false;
@ -702,7 +716,7 @@ export default {
submitFormAlarm() { submitFormAlarm() {
this.$refs["formAlarm"].validate(valid => { this.$refs["formAlarm"].validate(valid => {
if (valid) { if (valid) {
if (this.formAlarm.id !== undefined) { if (this.formAlarm.objId !== undefined) {
updateBaseAlarmInfo(this.formAlarm).then(response => { updateBaseAlarmInfo(this.formAlarm).then(response => {
this.$modal.msgSuccess("修改成功"); this.$modal.msgSuccess("修改成功");
this.openAlarm = false; this.openAlarm = false;
@ -729,7 +743,7 @@ export default {
}, },
/** 删除按钮操作 */ /** 删除按钮操作 */
handleDeleteBusbar(row) { handleDeleteBusbar(row) {
const ids = row.id || this.idsBusbar; const ids = row.objId || this.idsBusbar;
this.$modal.confirm('是否确认删除母排编号为"' + ids + '"的数据项?').then(function() { this.$modal.confirm('是否确认删除母排编号为"' + ids + '"的数据项?').then(function() {
return delBaseBusbarInfo(ids); return delBaseBusbarInfo(ids);
}).then(() => { }).then(() => {
@ -738,7 +752,7 @@ export default {
}).catch(() => {}); }).catch(() => {});
}, },
handleDeleteAlarm(row) { handleDeleteAlarm(row) {
const ids = row.id || this.idsAlarm; const ids = row.objId || this.idsAlarm;
this.$modal.confirm('是否确认删除报警编号为"' + ids + '"的数据项?').then(function() { this.$modal.confirm('是否确认删除报警编号为"' + ids + '"的数据项?').then(function() {
return delBaseAlarmInfo(ids); return delBaseAlarmInfo(ids);
}).then(() => { }).then(() => {
@ -749,6 +763,7 @@ export default {
/** 重置表单 */ /** 重置表单 */
resetFormBusbar() { resetFormBusbar() {
this.formBusbar = { this.formBusbar = {
objId: null,
busbarCode: null, busbarCode: null,
busbarAlias: null, busbarAlias: null,
cabinetCode: null, cabinetCode: null,
@ -756,6 +771,11 @@ export default {
isChecked: null, isChecked: null,
isEnd: null, isEnd: null,
isFlag: null, isFlag: null,
remark: null,
createdBy: null,
createdTime: null,
updatedBy: null,
updatedTime: null,
isPictures: null, isPictures: null,
wPanPos: null, wPanPos: null,
wTiltPos: null, wTiltPos: null,
@ -766,6 +786,7 @@ export default {
}, },
resetFormAlarm() { resetFormAlarm() {
this.formAlarm = { this.formAlarm = {
objId: null,
busbarCode: null, busbarCode: null,
alarmAlias: null, alarmAlias: null,
alarmContent: null, alarmContent: null,
@ -780,13 +801,37 @@ export default {
}; };
this.resetForm("formAlarm"); 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() { getTreeselect() {
getBaseCabinetInfoTree({}).then(response => { getBaseCabinetInfoTree({}).then(response => {
this.InfoOptions = response.data; 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) { filterNode(value, data) {
if (!value) return true; if (!value) return true;
return data.label.indexOf(value) !== -1; return data.label.indexOf(value) !== -1;

Loading…
Cancel
Save