Merge remote-tracking branch 'origin/develop' into develop

src/views/device/Device.vue

@@ -25,7 +25,8 @@
                     <el-tag v-if="scope.row.status==='ONLINE'" type="success" effect="plain">在线</el-tag>
                     <el-tag v-else-if="scope.row.status==='MAINTAIN'" type="warning" effect="plain">维护</el-tag>
                     <el-tag v-else-if="scope.row.status==='FAULT'" type="danger" effect="plain">故障</el-tag>
-                    <el-tag v-else type="info" effect="plain">离线</el-tag>
+                    <el-tag v-else-if="scope.row.status==='OFFLINE'" type="danger" effect="plain">离线</el-tag>
+                    <el-tag v-else type="info" effect="plain">未知</el-tag>
                 </template>
             </avue-crud>
         </base-card>
@@ -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(() => {

src/views/event/DeviceEvent.vue

@@ -25,10 +25,6 @@
                     <el-tag v-if="scope.row.confirm===true" type="success" effect="plain">已确认</el-tag>
                     <el-tag v-else type="info" effect="plain">未确认</el-tag>
                 </template>
-
-                <template slot="interval" slot-scope="scope">
-                    {{scope.row.createTime-scope.row.originTime||""}}
-                </template>
             </avue-crud>
         </base-card>
     </el-col>
@@ -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: '采集日期',
+                            label: '确认日期',
-                            prop: 'originTime',
+                            prop: 'confirmTime',
-                            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',
                             width: 180,
                             span: 10,
                             disabled: true,