code-image-backup-public/fastbee
1
0
Fork 0
mirror of https://gitee.com/beecue/fastbee.git synced 2025-12-18 00:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

设备日志改进

Browse Source
This commit is contained in:
kerwincui
2022-06-11 16:41:19 +08:00
parent 33a7ba9645
commit eeac05745f
9 changed files with 80 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vue/src/views/index.vue
View File

@@ -549,6 +549,7 @@ export default {
productName: data[i].productName,
activeTime: data[i].activeTime == null ? '' : data[i].activeTime,
deviceId: data[i].deviceId,
serialNumber:data[i].serialNumber,
});
}
}
@@ -573,6 +574,7 @@ export default {
formatter: function (params) {
var htmlStr = '<div style="padding:5px;line-height:28px;">';
htmlStr += "设备名称： <span style='color:#409EFF'>" + params.data.name + "</span><br />";
htmlStr += "设备编号： " + params.data.serialNumber + "<br />";
htmlStr += "设备状态： ";
if (params.data.status == 1) {
htmlStr += "<span style='color:#E6A23C'>未激活</span>" + "<br />";

14
vue/src/views/iot/device/device-log.vue
View File

@@ -16,23 +16,31 @@
</el-form>
<el-table v-loading="loading" :data="deviceLogList" size="mini">
<el-table-column label="编号" align="center" prop="logId" width="100" />
<el-table-column label="编号" align="center" prop="logId" width="120" />
<el-table-column label="类型" align="center" prop="logType" width="120">
<template slot-scope="scope">
<dict-tag :options="dict.type.iot_device_log_type" :value="scope.row.logType" />
</template>
</el-table-column>
<el-table-column label="时间" align="center" prop="createTime" width="180">
<el-table-column label="模式" align="center" prop="logType" width="120">
<template slot-scope="scope">
<el-tag type="primary" v-if="scope.row.mode==1">影子模式</el-tag>
<el-tag type="success" v-else-if="scope.row.mode==2">在线模式</el-tag>
<el-tag type="info" v-else>其他</el-tag>
</template>
</el-table-column>
<el-table-column label="时间" align="center" prop="createTime" width="150">
<template slot-scope="scope">
<span>{{ scope.row.createTime }}</span>
</template>
</el-table-column>
<el-table-column label="标识符" align="center" prop="identity" />
<el-table-column label="动作" align="left" header-align="center" prop="logValue">
<template slot-scope="scope">
<div v-html="formatValueDisplay(scope.row)"></div>
</template>
</el-table-column>
<el-table-column label="标识符" align="center" prop="identity" />
<el-table-column label="备注" header-align="center" align="left" prop="remark">
<template slot-scope="scope">
{{scope.row.remark==null ?"无":scope.row.remark}}