joylink/rt-sim-training-client
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

报警状态调整

Browse Source
This commit is contained in:
fan 2020-10-30 14:39:38 +08:00
parent 4f567c474a
commit 8a92b5e448
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableHmi.vue
View File

@ -25,19 +25,8 @@
</el-col> </el-col>
<el-col :span="4" style="text-align: center;"> <el-col :span="4" style="text-align: center;">
<el-button style="margin-left: 10px;" @click="queryData(true)">查询</el-button> <el-button style="margin-left: 10px;" @click="queryData(true)">查询</el-button>
</el-col>
</el-row>
<el-row>
<el-col :span="10" style="text-align: center;">
<div style="display: inline-block;margin-right: 5px;">设备编号:</div>
<el-input v-model="deviceCode" placeholder="请输入内容" style="width:220px;" size="small" />
</el-col>
<el-col :span="10" style="text-align: center;">
<div style="display: inline-block;margin-right: 5px;margin-left: 10px;">元素编号:</div>
<el-input v-model="elementCode" placeholder="请输入内容" style="width:220px;" size="small" />
</el-col>
<el-col :span="4" style="text-align: center;">
<el-button style="margin-left: 10px;" @click="queryData(false)">撤销查询</el-button> <el-button style="margin-left: 10px;" @click="queryData(false)">撤销查询</el-button>
</el-col> </el-col>
</el-row> </el-row>
</div> </div>
@ -66,7 +55,11 @@
<el-table-column prop="level" label="报警级别" /> <el-table-column prop="level" label="报警级别" />
<el-table-column prop="time" label="日期/时间" width="150px" /> <el-table-column prop="time" label="日期/时间" width="150px" />
<el-table-column prop="code" label="报警序号" /> <el-table-column prop="code" label="报警序号" />
<el-table-column prop="deviceCode" label="设备编号" /> <el-table-column prop="deviceCode" label="设备编号">
<template slot-scope="scope">
<span>{{ handleDeviceName(scope.row.deviceCode) }}</span>
</template>
</el-table-column>
<el-table-column prop="address" label="信号编号" /> <el-table-column prop="address" label="信号编号" />
<el-table-column prop="address" label="元素编号" /> <el-table-column prop="address" label="元素编号" />
<el-table-column prop="confirmed" label="确认"> <el-table-column prop="confirmed" label="确认">
@ -76,7 +69,7 @@
</el-table-column> </el-table-column>
<el-table-column prop="confirmedUserName" label="确认人编号" width="120px" /> <el-table-column prop="confirmedUserName" label="确认人编号" width="120px" />
<el-table-column prop="confirmTime" label="确认时间" width="150px" /> <el-table-column prop="confirmTime" label="确认时间" width="150px" />
<el-table-column prop="recover" label="恢复"> <el-table-column prop="recoverTime" label="恢复">
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ scope.row.recovered? 'Y':'N' }}</span> <span>{{ scope.row.recovered? 'Y':'N' }}</span>
</template> </template>
@ -145,6 +138,10 @@ export default {
}).catch(() => { }).catch(() => {
this.$message.error('确认消息失败！'); this.$message.error('确认消息失败！');
}); });
},
handleDeviceName(code) {
const device = this.$store.getters['map/getDeviceByCode'](code);
return device.name;
} }
} }
}; };

10
src/jmapNew/theme/haerbin_01/menus/menuDialog/alarmTableLow.vue
View File

@ -32,7 +32,11 @@
<span>{{ handleDeviceType(scope.row.deviceCode) }}</span> <span>{{ handleDeviceType(scope.row.deviceCode) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="deviceCode" label="设备编号" /> <el-table-column prop="deviceCode" label="设备编号">
<template slot-scope="scope">
<span>{{ handleDeviceName(scope.row.deviceCode) }}</span>
</template>
</el-table-column>
<el-table-column prop="code" label="故障号" /> <el-table-column prop="code" label="故障号" />
<el-table-column prop="description" label="故障描述" /> <el-table-column prop="description" label="故障描述" />
<el-table-column prop="recover" label="已恢复"> <el-table-column prop="recover" label="已恢复">
@ -101,6 +105,10 @@ export default {
handleDeviceType(code) { handleDeviceType(code) {
const device = this.$store.getters['map/getDeviceByCode'](code); const device = this.$store.getters['map/getDeviceByCode'](code);
return deviceType[device.type]; return deviceType[device.type];
},
handleDeviceName(code) {
const device = this.$store.getters['map/getDeviceByCode'](code);
return device.name;
} }
} }
}; };