From 995cd77beff6ef1263ae3aabd261e66e8bfd2fc0 Mon Sep 17 00:00:00 2001
From: ko1234 <ko.ko@mjmtech.com.tw>
Date: Fri, 25 Jul 2025 17:20:06 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E9=A0=81=E8=A8=AD=E5=82=99=20modal=20?=
 =?UTF-8?q?=E8=A9=B3=E7=B4=B0=E8=B3=87=E6=96=99=E8=A3=9C=E9=BD=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dashboard/Dashboard.vue                    |  6 ++++++
 .../components/DashboardEffectScatterModal.vue       | 12 ++++++------
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/dashboard/Dashboard.vue b/src/views/dashboard/Dashboard.vue
index 1cbdc3a..dbfe4a6 100644
--- a/src/views/dashboard/Dashboard.vue
+++ b/src/views/dashboard/Dashboard.vue
@@ -85,6 +85,12 @@ const getData = async () => {
             Online_color: device.device_normal_color,
             Offline_color: device.device_close_color,
             Error_color: device.device_error_color,
+            brand: device.brand || "",
+            device_model: device.device_model,
+            operation_name: device.operation_name,
+            operation_contact_person: device.operation_contact_person,
+            buying_date: device.buying_date,
+            created_at: device.created_at,
             bgSize: 50,
           }
         ];
diff --git a/src/views/dashboard/components/DashboardEffectScatterModal.vue b/src/views/dashboard/components/DashboardEffectScatterModal.vue
index 3687470..20379df 100644
--- a/src/views/dashboard/components/DashboardEffectScatterModal.vue
+++ b/src/views/dashboard/components/DashboardEffectScatterModal.vue
@@ -257,24 +257,24 @@ const handleCancel = () => {
                 </td>
                 <td class="p-2 border">{{ props.data.device_coordinate }}</td>
               </tr>
-              <!--
+              
               <tr>
                 <td class="p-2 border">{{ $t("assetManagement.brand_and_modal") }}</td>
-                <td class="p-2 border">{{ deviceInfo.brand }} / {{ deviceInfo.modal }}</td>
+                <td class="p-2 border">{{ props.data.brand }} / {{ props.data.device_model }}</td>
               </tr>
               <tr>
                 <td class="p-2 border">{{ $t("assetManagement.company_and_contact") }}</td>
-                <td class="p-2 border">{{ deviceInfo.company }} / {{ deviceInfo.contact }}</td>
+                <td class="p-2 border">{{ props.data.operation_name }} / {{ props.data.operation_contact_person }}</td>
               </tr>
               <tr>
                 <td class="p-2 border">{{ $t("assetManagement.buying_date") }}</td>
-                <td class="p-2 border">{{ deviceInfo.buying_date }}</td>
+                <td class="p-2 border">{{ props.data.buying_date }}</td>
               </tr>
               <tr>
                 <td class="p-2 border">{{ $t("assetManagement.created_at") }}</td>
-                <td class="p-2 border">{{ deviceInfo.created_at }}</td>
+                <td class="p-2 border">{{ props.data.created_at }}</td>
               </tr>
-              -->
+             
             </tbody>
           </table>
         </div>