refactor(ems): 注释采集设备名称和通知用户列,更新列的索引值

boardTest
zch 3 weeks ago
parent c9d570ad86
commit b1c72d6ae9

@ -115,31 +115,31 @@
<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="monitorName" 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="collectDeviceName" v-if="columns[2].visible"/> <!-- <el-table-column label="采集设备名称" align="center" prop="collectDeviceName" v-if="columns[2].visible"/> -->
<el-table-column label="记录时间" align="center" prop="collectTime" width="180" v-if="columns[3].visible"> <el-table-column label="记录时间" align="center" prop="collectTime" width="180" v-if="columns[2].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="alarmType" v-if="columns[4].visible"> <el-table-column label="异常类型" align="center" prop="alarmType" v-if="columns[3].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.alarm_type" :value="scope.row.alarmType"/> <dict-tag :options="dict.type.alarm_type" :value="scope.row.alarmType"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="异常状态" align="center" prop="alarmStatus" v-if="columns[5].visible"> <el-table-column label="异常状态" align="center" prop="alarmStatus" v-if="columns[4].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<dict-tag :options="dict.type.alarm_status" :value="scope.row.alarmStatus"/> <dict-tag :options="dict.type.alarm_status" :value="scope.row.alarmStatus"/>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="异常数据" align="center" prop="alarmData" v-if="columns[6].visible"/> <el-table-column label="异常数据" align="center" prop="alarmData" v-if="columns[5].visible"/>
<el-table-column label="操作人员" align="center" prop="operationName" v-if="columns[7].visible"/> <el-table-column label="操作人员" align="center" prop="operationName" v-if="columns[6].visible"/>
<el-table-column label="操作时间" align="center" prop="operationTime" width="180" v-if="columns[8].visible"> <el-table-column label="操作时间" align="center" prop="operationTime" width="180" v-if="columns[7].visible">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ parseTime(scope.row.operationTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span> <span>{{ parseTime(scope.row.operationTime, '{y}-{m}-{d} {h}:{i}:{s}') }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="备注" align="center" prop="cause" v-if="columns[9].visible"/> <el-table-column label="备注" align="center" prop="cause" v-if="columns[8].visible"/>
<el-table-column label="通知用户" align="center" prop="notifyUser" v-if="columns[14].visible"/> <!-- <el-table-column label="通知用户" align="center" prop="notifyUser" v-if="columns[14].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
@ -296,19 +296,19 @@ export default {
columns: [ columns: [
{ key: 0, label: `自增标识`, visible: false }, { key: 0, label: `自增标识`, visible: false },
{ key: 1, label: `计量设备编号`, visible: true }, { key: 1, label: `计量设备编号`, visible: true },
{ key: 2, label: `采集设备编号`, visible: false }, // { key: 2, label: ``, visible: false },
{ key: 3, label: `记录时间`, visible: true }, { key: 2, label: `记录时间`, visible: true },
{ key: 4, label: `异常类型`, visible: true }, { key: 3, label: `异常类型`, visible: true },
{ key: 5, label: `异常状态`, visible: true }, { key: 4, label: `异常状态`, visible: true },
{ key: 6, label: `异常数据`, visible: true }, { key: 5, label: `异常数据`, visible: true },
{ key: 7, label: `操作人员`, visible: true }, { key: 6, label: `操作人员`, visible: true },
{ key: 8, label: `操作时间`, visible: true }, { key: 7, label: `操作时间`, visible: true },
{ key: 9, label: `备注`, visible: false }, { key: 8, label: `备注`, visible: false },
{ key: 10, label: `创建人`, visible: false }, { key: 9, label: `创建人`, visible: false },
{ key: 11, label: `创建时间`, visible: true }, { key: 10, label: `创建时间`, visible: true },
{ key: 12, label: `更新人`, visible: false }, { key: 11, label: `更新人`, visible: false },
{ key: 13, label: `更新时间`, visible: false }, { key: 12, label: `更新时间`, visible: false },
{ key: 14, label: `通知用户`, visible: false } // { key: 14, label: ``, visible: false }
] ]
} }
}, },

Loading…
Cancel
Save