From eba516ca9885843a34d2ea87013489886621be24 Mon Sep 17 00:00:00 2001
From: dev01 <dev01@yourteam.tw>
Date: Fri, 2 Dec 2022 16:25:57 +0800
Subject: [PATCH] =?UTF-8?q?[Frontend][=E6=AD=B7=E5=8F=B2=E8=B3=87=E6=96=99?=
 =?UTF-8?q?]=20=E8=A8=82=E9=96=B1=20Loading=20=E7=A8=8B=E5=BA=8F=E8=A3=9C?=
 =?UTF-8?q?=E4=B8=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Frontend/_historyData.html | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/Frontend/_historyData.html b/Frontend/_historyData.html
index a2543c1..f89f042 100644
--- a/Frontend/_historyData.html
+++ b/Frontend/_historyData.html
@@ -198,6 +198,7 @@
                 if (index == 0) {
 					strHtml += `<button onClick="setValue(null, null, '${val.points}', this)" type="button" class="btn btn-dark waves-effect waves-themed">${val.full_name} ${val.points}</button>`;
                     pageAct.deviceItem = val.points;
+                    pageAct.devicePoiName = val.full_name + ' ' + val.points;
                     getData();
                 } else {
 					strHtml += `<button onClick="setValue(null, null, '${val.points}', this)" type="button" class="btn btn-secondary waves-effect waves-themed">${val.full_name} ${val.points}</button>`;
@@ -231,7 +232,8 @@
 			t.fnClearTable();
             if (res.data.length > 0)
                 t.fnAddData(res.data);
-		}
+        }
+        $(loadEle).Loading("close");
     }
 
     function setValue(deviceNumber, deviceName, deviceItem, elem) {
@@ -242,7 +244,8 @@
             pageAct.deviceName = deviceName;
             devPointsList();
         }
-		else if (deviceItem != null && deviceItem != undefined) {
+        else if (deviceItem != null && deviceItem != undefined) {
+            pageAct.devicePoiName = $(elem).text();
             pageAct.deviceItem = deviceItem;
             getData();
 		}
@@ -330,7 +333,7 @@
     function loadTable(data) {
         if (data) {
             $.each(data, function (i, v) {
-                v.type = deviceName;
+				v.type = pageAct.devicePoiName;
             });
         }