refactor(ems): 优化环境监测记录页面

- 移除了不必要的列定义和相关代码
- 根据设备类型动态显示传感器数据列
- 调整了表格列的宽度和显示逻辑
- 删除了未使用的采集时间字段
- 简化了表单输入项
boardTest
zch 3 weeks ago
parent e5e42bfca7
commit 3c69d362ef

@ -184,48 +184,38 @@
v-hasPermi="['ems/record:recordIotenvInstant:export']" v-hasPermi="['ems/record:recordIotenvInstant:export']"
>导出</el-button> >导出</el-button>
</el-col> </el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table v-loading="loading" :data="recordIotenvInstantList" @selection-change="handleSelectionChange"> <el-table v-loading="loading" :data="recordIotenvInstantList" @selection-change="handleSelectionChange">
<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="objid" v-if="columns[0].visible"/>--> <el-table-column label="序号" type="index" width="55" align="center" />
<el-table-column label="序号" type="index" width="55" align="center" v-if="columns[0].visible" /> <el-table-column label="计量设备" align="center" prop="monitorName" min-width="150">
<el-table-column label="计量设备" align="center" prop="monitorName" v-if="columns[1].visible">
</el-table-column> </el-table-column>
<el-table-column label="温度" align="center" prop="temperature" v-if="columns[2].visible">
<!-- 根据设备类型显示对应的传感器数据列 -->
<!-- type=5: 只显示温度 -->
<el-table-column v-if="!selectedNodeType || selectedNodeType === 5 || selectedNodeType === 6"
label="温度(℃)" align="center" prop="temperature" width="100">
</el-table-column> </el-table-column>
<el-table-column label="湿度" align="center" prop="humidity" v-if="columns[3].visible">
<!-- type=6: 显示温度和湿度 -->
<el-table-column v-if="!selectedNodeType || selectedNodeType === 6"
label="湿度(%)" align="center" prop="humidity" width="100">
</el-table-column> </el-table-column>
<el-table-column label="照度" align="center" prop="illuminance" v-if="columns[4].visible">
</el-table-column>
<el-table-column label="噪声" align="center" prop="noise" v-if="columns[5].visible">
</el-table-column>
<!-- <el-table-column label="硫化氢浓度" align="center" prop="concentration" v-if="columns[6].visible">
</el-table-column>
<el-table-column label="振动-速度(mm/s)" align="center" prop="vibrationSpeed" v-if="columns[7].visible">
</el-table-column>
<el-table-column label="振动-位移(um)" align="center" prop="vibrationDisplacement" v-if="columns[8].visible">
</el-table-column>
<el-table-column label="振动-加速度(g)" align="center" prop="vibrationAcceleration" v-if="columns[9].visible">
</el-table-column>
<el-table-column label="振动-温度(℃)" align="center" prop="vibrationTemp" v-if="columns[10].visible">
<!-- 照度列暂时隐藏如需要可根据type显示 -->
<!-- <el-table-column v-if="!selectedNodeType"
label="照度(lx)" align="center" prop="illuminance" width="100">
</el-table-column> --> </el-table-column> -->
<el-table-column label="采集时间" align="center" prop="collectTime" width="180" v-if="columns[6].visible">
<!-- type=7: 显示噪声 -->
<el-table-column v-if="!selectedNodeType || selectedNodeType === 7"
label="噪声(dB)" align="center" prop="noise" width="100">
</el-table-column> </el-table-column>
<el-table-column label="记录时间" align="center" prop="recodeTime" width="180" v-if="columns[7].visible">
<!-- 记录时间列给足够的宽度 -->
<el-table-column label="记录时间" align="center" prop="recodeTime" width="200">
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
@ -270,9 +260,9 @@
<el-form-item label="湿度" prop="humidity"> <el-form-item label="湿度" prop="humidity">
<el-input v-model="form.humidity" placeholder="请输入湿度" /> <el-input v-model="form.humidity" placeholder="请输入湿度" />
</el-form-item> </el-form-item>
<el-form-item label="照度" prop="illuminance"> <!-- <el-form-item label="照度" prop="illuminance">
<el-input v-model="form.illuminance" placeholder="请输入照度" /> <el-input v-model="form.illuminance" placeholder="请输入照度" />
</el-form-item> </el-form-item> -->
<el-form-item label="噪声" prop="noise"> <el-form-item label="噪声" prop="noise">
<el-input v-model="form.noise" placeholder="请输入噪声" /> <el-input v-model="form.noise" placeholder="请输入噪声" />
</el-form-item> </el-form-item>
@ -291,14 +281,14 @@
<el-form-item label="振动-温度(℃)" prop="vibrationTemp"> <el-form-item label="振动-温度(℃)" prop="vibrationTemp">
<el-input v-model="form.vibrationTemp" placeholder="请输入振动-温度(℃)" /> <el-input v-model="form.vibrationTemp" placeholder="请输入振动-温度(℃)" />
</el-form-item> --> </el-form-item> -->
<el-form-item label="采集时间" prop="collectTime"> <!-- <el-form-item label="采集时间" prop="collectTime">
<el-date-picker clearable <el-date-picker clearable
v-model="form.collectTime" v-model="form.collectTime"
type="date" type="date"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
placeholder="请选择采集时间"> placeholder="请选择采集时间">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item> -->
<el-form-item label="记录时间" prop="recodeTime"> <el-form-item label="记录时间" prop="recodeTime">
<el-date-picker clearable <el-date-picker clearable
v-model="form.recodeTime" v-model="form.recodeTime"
@ -386,22 +376,7 @@ export default {
form: {}, form: {},
// //
rules: { rules: {
}, }
columns: [
{ key: 0, label: `标识`, visible: true },
{ key: 1, label: `计量设备`, visible: true },
{ key: 2, label: `温度`, visible: true },
{ key: 3, label: `湿度`, visible: true },
{ key: 4, label: `照度`, visible: true },
{ key: 5, label: `噪声`, visible: true },
// { key: 6, label: ``, visible: true },
// { key: 7, label: `-(mm/s)`, visible: false },
// { key: 8, label: `-(um)`, visible: false },
// { key: 9, label: `-(g)`, visible: false },
// { key: 10, label: `-()`, visible: false },
{ key: 6, label: `采集时间`, visible: false },
{ key: 7, label: `记录时间`, visible: true },
]
}; };
}, },
created() { created() {
@ -414,9 +389,6 @@ export default {
this.daterangeRecordTime[0] = yesterday+ ' 08:00:00' this.daterangeRecordTime[0] = yesterday+ ' 08:00:00'
this.daterangeRecordTime[1] = today + ' 08:00:00' this.daterangeRecordTime[1] = today + ' 08:00:00'
//
this.updateColumnsVisibility();
this.getTreeMonitorInfo() this.getTreeMonitorInfo()
this.getTreeselect() this.getTreeselect()
this.getList(); this.getList();
@ -494,7 +466,7 @@ export default {
// type // type
this.selectedNodeType = data.type; this.selectedNodeType = data.type;
this.updateColumnsVisibility(); console.log('选中节点类型:', this.selectedNodeType);
this.handleQuery(); this.handleQuery();
}, },
@ -563,7 +535,6 @@ export default {
this.selectedNodeType = null; this.selectedNodeType = null;
this.queryParams.monitorId = null; this.queryParams.monitorId = null;
this.queryParams.monitorIds = []; this.queryParams.monitorIds = [];
this.updateColumnsVisibility();
this.handleQuery(); this.handleQuery();
}, },
@ -632,47 +603,6 @@ export default {
}) })
}, },
//
updateColumnsVisibility() {
//
this.columns.forEach(col => {
if (col.key >= 2 && col.key <= 5) { //
col.visible = false;
}
});
if (!this.selectedNodeType) {
//
this.columns[2].visible = true; //
this.columns[3].visible = true; // 湿
this.columns[4].visible = true; //
this.columns[5].visible = true; //
return;
}
// type
switch (this.selectedNodeType) {
case 5: //
this.columns[2].visible = true; //
break;
case 6: // 湿湿
this.columns[2].visible = true; //
this.columns[3].visible = true; // 湿
break;
case 7: //
this.columns[5].visible = true; //
break;
default:
//
this.columns[2].visible = true; //
this.columns[3].visible = true; // 湿
this.columns[4].visible = true; //
this.columns[5].visible = true; //
}
console.log('更新列显示:', this.selectedNodeType, this.columns.map(c => ({key: c.key, label: c.label, visible: c.visible})));
},
} }
}; };
</script> </script>

Loading…
Cancel
Save