Commit 2e25fcbcbc3283b2bd4d3dedb4764ee3dfc9239e

Authored by fengtao
1 parent c5d9d0ad

revert:变换状态位置

@@ -6,6 +6,12 @@ import { DeviceTypeEnum, DeviceState } from '/@/api/device/model/deviceModel'; @@ -6,6 +6,12 @@ import { DeviceTypeEnum, DeviceState } from '/@/api/device/model/deviceModel';
6 // 表格列数据 6 // 表格列数据
7 export const columns: BasicColumn[] = [ 7 export const columns: BasicColumn[] = [
8 { 8 {
  9 + title: '状态',
  10 + dataIndex: 'deviceState',
  11 + width: 120,
  12 + slots: { customRender: 'deviceState' },
  13 + },
  14 + {
9 title: '设备图片', 15 title: '设备图片',
10 dataIndex: 'deviceInfo.avatar', 16 dataIndex: 'deviceInfo.avatar',
11 width: 120, 17 width: 120,
@@ -45,12 +51,6 @@ export const columns: BasicColumn[] = [ @@ -45,12 +51,6 @@ export const columns: BasicColumn[] = [
45 width: 180, 51 width: 180,
46 }, 52 },
47 { 53 {
48 - title: '状态',  
49 - dataIndex: 'deviceState',  
50 - width: 120,  
51 - slots: { customRender: 'deviceState' },  
52 - },  
53 - {  
54 title: '最后连接时间', 54 title: '最后连接时间',
55 dataIndex: 'lastOnlineTime', 55 dataIndex: 'lastOnlineTime',
56 format: (text) => text && formatToDate(text, 'YYYY-MM-DD HH:mm:ss'), 56 format: (text) => text && formatToDate(text, 'YYYY-MM-DD HH:mm:ss'),