Commit a2e8cc7190963875b4fda90db3de84651fa170a6
Merge branch 'fix/edge-device/08-05' into 'main_dev'
perf: 云端设备上传设备图片,点击同步边缘,边缘端图片变为一致,但是云端的边缘实例设备中,图片没有显示 See merge request yunteng/thingskit-front!1430
Showing
2 changed files
with
4 additions
and
1 deletions
| @@ -66,6 +66,9 @@ export interface EdgeDeviceItemType { | @@ -66,6 +66,9 @@ export interface EdgeDeviceItemType { | ||
| 66 | tbDeviceId: string; | 66 | tbDeviceId: string; | 
| 67 | tbProfileId: string; | 67 | tbProfileId: string; | 
| 68 | defaultQueueName: string; | 68 | defaultQueueName: string; | 
| 69 | + deviceInfo?: { | ||
| 70 | + avatar: string; | ||
| 71 | + }; | ||
| 69 | image: string; | 72 | image: string; | 
| 70 | type: string; | 73 | type: string; | 
| 71 | default: boolean; | 74 | default: boolean; | 
| @@ -84,7 +84,7 @@ | @@ -84,7 +84,7 @@ | ||
| 84 | <a-row :gutter="{ xs: 8, sm: 16, md: 24, lg: 32 }"> | 84 | <a-row :gutter="{ xs: 8, sm: 16, md: 24, lg: 32 }"> | 
| 85 | <a-col class="gutter-row" :span="3"> | 85 | <a-col class="gutter-row" :span="3"> | 
| 86 | <div class="!flex flex-col justify-between items-center"> | 86 | <div class="!flex flex-col justify-between items-center"> | 
| 87 | - <div><Image :src="edgeDevicePng" :width="180" /></div> | 87 | + <div><Image :src="recordData?.deviceInfo?.avatar || edgeDevicePng" :width="180" /></div> | 
| 88 | <div class="!flex flex-col mt-3"> | 88 | <div class="!flex flex-col mt-3"> | 
| 89 | <span style="color: #1d2129" class="font-bold">{{ | 89 | <span style="color: #1d2129" class="font-bold">{{ | 
| 90 | recordData?.alias ? recordData?.alias : recordData?.name | 90 | recordData?.alias ? recordData?.alias : recordData?.name |