diff --git a/src/views/device/Device.vue b/src/views/device/Device.vue
index 1c1f227..cc30716 100644
--- a/src/views/device/Device.vue
+++ b/src/views/device/Device.vue
@@ -25,7 +25,8 @@
在线
维护
故障
- 离线
+ 离线
+ 未知
@@ -242,6 +243,11 @@
d.status = statuses.data[d.id] || "OFFLINE";
return d;
});
+ }).catch(() => {
+ this.listData = data.records.map(d => {
+ d.status = "UNKNOW";
+ return d;
+ });
});
}).catch(() => {
}).finally(() => {
diff --git a/src/views/event/DeviceEvent.vue b/src/views/event/DeviceEvent.vue
index ac3270a..031e4ad 100644
--- a/src/views/event/DeviceEvent.vue
+++ b/src/views/event/DeviceEvent.vue
@@ -25,10 +25,6 @@
已确认
未确认
-
-
- {{scope.row.createTime-scope.row.originTime||""}}
-
@@ -119,6 +115,14 @@
width: 500,
type: 'textarea',
overHidden: true
+ }, {
+ label: '事件日期',
+ prop: 'originTime',
+ width: 180,
+ span: 10,
+ disabled: true,
+ type: 'date',
+ format: 'yyyy-MM-dd HH:mm:ss.SSS'
}, {
label: '确认',
prop: 'confirm',
@@ -139,22 +143,8 @@
}
]
}, {
- label: '采集日期',
- prop: 'originTime',
- width: 180,
- span: 10,
- disabled: true,
- type: 'date',
- format: 'yyyy-MM-dd HH:mm:ss.SSS'
- }, {
- label: '延时(毫秒)',
- prop: 'interval',
- width: 90,
- span: 4,
- slot: true
- }, {
- label: '保存日期',
- prop: 'createTime',
+ label: '确认日期',
+ prop: 'confirmTime',
width: 180,
span: 10,
disabled: true,