refactor(baseInfo): 优化基础信息页面展示和功能

- 注释掉创建人和创建时间列的显示
- 移除电柜编号输入框的禁用属性
- 更新是否检测选项的字典类型
- 调整报警信息列表的加载逻辑
- 修复母排信息和报警信息更新时的 ID 获取问题
IOT
zch 2 months ago
parent 70c53fb3b1
commit 362c51fec3

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

Loading…
Cancel
Save