Commit d50c4b765a7e3b857263ba116c0b294d832a1fe4

Authored by fengwotao
1 parent cb97b1cf

fix: DEFECT-1235 设备显示出来别名,图一显示为图二样式,再前面加入别名

@@ -18,13 +18,13 @@ export const columns: BasicColumn[] = [ @@ -18,13 +18,13 @@ export const columns: BasicColumn[] = [
18 { 18 {
19 title: '设备图片', 19 title: '设备图片',
20 dataIndex: 'deviceInfo.avatar', 20 dataIndex: 'deviceInfo.avatar',
21 - width: 80, 21 + width: 70,
22 slots: { customRender: 'img' }, 22 slots: { customRender: 'img' },
23 }, 23 },
24 { 24 {
25 dataIndex: 'name', 25 dataIndex: 'name',
26 title: '设备名称/设备SN', 26 title: '设备名称/设备SN',
27 - width: 200, 27 + width: 210,
28 slots: { customRender: 'name', title: 'deviceTitle' }, 28 slots: { customRender: 'name', title: 'deviceTitle' },
29 customRender: ({ record }) => { 29 customRender: ({ record }) => {
30 return h( 30 return h(
@@ -32,10 +32,10 @@ export const columns: BasicColumn[] = [ @@ -32,10 +32,10 @@ export const columns: BasicColumn[] = [
32 { 32 {
33 style: { cursor: 'pointer', color: '#377dff' }, 33 style: { cursor: 'pointer', color: '#377dff' },
34 onClick: () => { 34 onClick: () => {
35 - handeleCopy(record.name || record.alias); 35 + handeleCopy(`${record.alias}/${record.name}`);
36 }, 36 },
37 }, 37 },
38 - record.name || record.alias 38 + `${record.alias}/${record.name}`
39 ); 39 );
40 }, 40 },
41 }, 41 },