diff --git a/src/views/dashboard/Dashboard.vue b/src/views/dashboard/Dashboard.vue index ae2313e..1cbdc3a 100644 --- a/src/views/dashboard/Dashboard.vue +++ b/src/views/dashboard/Dashboard.vue @@ -72,10 +72,19 @@ const getData = async () => { x, y, { - full_name: device.full_name, + device_number: device.device_number || "", // 設備編號 + device_coordinate: device.device_coordinate || "", // 設備座標 + device_image_url: device.device_image_url, + full_name: device.full_name, // 設備名稱 + main_id: device.main_id, + points: device.points || [], + floor: floor.full_name, state: state, icon: device.device_image ? `${FILE_BASEURL}/upload/device_icon/${device.device_image}` : '', bgColor: bgColor, + Online_color: device.device_normal_color, + Offline_color: device.device_close_color, + Error_color: device.device_error_color, bgSize: 50, } ]; diff --git a/src/views/dashboard/components/DashboardEffectScatter.vue b/src/views/dashboard/components/DashboardEffectScatter.vue index d90d482..4617753 100644 --- a/src/views/dashboard/components/DashboardEffectScatter.vue +++ b/src/views/dashboard/components/DashboardEffectScatter.vue @@ -1,6 +1,7 @@