|
|
@ -171,30 +171,30 @@
|
|
|
|
<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="主键标识" align="center" prop="objid" v-if="columns[0].visible"/>
|
|
|
|
<el-table-column label="计量设备编号" align="center" prop="monitorId" v-if="columns[1].visible"/>
|
|
|
|
<el-table-column label="计量设备编号" align="center" prop="monitorId" v-if="columns[1].visible"/>
|
|
|
|
<el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[1].visible"/>
|
|
|
|
<el-table-column label="计量设备名称" align="center" prop="monitorName" v-if="columns[2].visible"/>
|
|
|
|
<el-table-column label="采集时间" align="center" prop="collectTime" width="180" v-if="columns[2].visible">
|
|
|
|
<el-table-column label="采集时间" align="center" prop="collectTime" width="180" v-if="columns[3].visible">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
|
|
|
<span>{{ parseTime(scope.row.collectTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="温度" align="center" prop="tempreture" v-if="columns[3].visible"/>
|
|
|
|
<el-table-column label="温度" align="center" prop="tempreture" v-if="columns[4].visible"/>
|
|
|
|
<el-table-column label="湿度" align="center" prop="humidity" v-if="columns[4].visible"/>
|
|
|
|
<el-table-column label="湿度" align="center" prop="humidity" v-if="columns[5].visible"/>
|
|
|
|
<el-table-column label="照度" align="center" prop="illuminance" v-if="columns[5].visible"/>
|
|
|
|
<el-table-column label="照度" align="center" prop="illuminance" v-if="columns[6].visible"/>
|
|
|
|
<el-table-column label="噪声" align="center" prop="noise" v-if="columns[6].visible"/>
|
|
|
|
<el-table-column label="噪声" align="center" prop="noise" v-if="columns[7].visible"/>
|
|
|
|
<el-table-column label="硫化氢浓度" align="center" prop="concentration" v-if="columns[7].visible"/>
|
|
|
|
<el-table-column label="硫化氢浓度" align="center" prop="concentration" v-if="columns[8].visible"/>
|
|
|
|
<el-table-column label="记录时间" align="center" prop="recodeTime" width="180" v-if="columns[8].visible">
|
|
|
|
<el-table-column label="记录时间" align="center" prop="recodeTime" width="180" v-if="columns[9].visible">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<span>{{ parseTime(scope.row.recodeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
|
|
|
<span>{{ parseTime(scope.row.recodeTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="报警类型" align="center" prop="alarmType" v-if="columns[9].visible"/>
|
|
|
|
<el-table-column label="报警类型" align="center" prop="alarmType" v-if="columns[10].visible"/>
|
|
|
|
<el-table-column label=" " align="center" prop="confirmPersonID" v-if="columns[10].visible"/>
|
|
|
|
<!-- <el-table-column label=" " align="center" prop="confirmPersonID" v-if="columns[10].visible"/>
|
|
|
|
<el-table-column label=" " align="center" prop="confirmTime" width="180" v-if="columns[11].visible">
|
|
|
|
<el-table-column label=" " align="center" prop="confirmTime" width="180" v-if="columns[11].visible">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<span>{{ parseTime(scope.row.confirmTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
|
|
|
<span>{{ parseTime(scope.row.confirmTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
|
|
|
|
</template>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label=" " align="center" prop="confirmFlag" v-if="columns[12].visible"/>
|
|
|
|
<el-table-column label=" " align="center" prop="confirmFlag" v-if="columns[12].visible"/> -->
|
|
|
|
<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">
|
|
|
|
<el-button
|
|
|
|
<el-button
|
|
|
@ -369,14 +369,15 @@
|
|
|
|
columns: [
|
|
|
|
columns: [
|
|
|
|
{ key: 0, label: `主键标识`, visible: true },
|
|
|
|
{ key: 0, label: `主键标识`, visible: true },
|
|
|
|
{ key: 1, label: `计量设备编号`, visible: true },
|
|
|
|
{ key: 1, label: `计量设备编号`, visible: true },
|
|
|
|
{ key: 2, label: `采集时间`, visible: true },
|
|
|
|
{ key: 2, label: `计量设备名称`, visible: true },
|
|
|
|
{ key: 3, label: `温度`, visible: true },
|
|
|
|
{ key: 3, label: `采集时间`, visible: true },
|
|
|
|
{ key: 4, label: `湿度`, visible: true },
|
|
|
|
{ key: 4, label: `温度`, visible: true },
|
|
|
|
{ key: 5, label: `照度`, visible: true },
|
|
|
|
{ key: 5, label: `湿度`, visible: true },
|
|
|
|
{ key: 6, label: `噪声`, visible: true },
|
|
|
|
{ key: 6, label: `照度`, visible: true },
|
|
|
|
{ key: 7, label: `硫化氢浓度`, visible: true },
|
|
|
|
{ key: 7, label: `噪声`, visible: true },
|
|
|
|
{ key: 8, label: `记录时间`, visible: true },
|
|
|
|
{ key: 8, label: `硫化氢浓度`, visible: true },
|
|
|
|
{ key: 9, label: `报警类型`, visible: true },
|
|
|
|
{ key: 9, label: `记录时间`, visible: true },
|
|
|
|
|
|
|
|
{ key: 10, label: `报警类型`, visible: true },
|
|
|
|
]
|
|
|
|
]
|
|
|
|
};
|
|
|
|
};
|
|
|
|
},
|
|
|
|
},
|
|
|
|