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 += ``;
pageAct.deviceItem = val.points;
+ pageAct.devicePoiName = val.full_name + ' ' + val.points;
getData();
} else {
strHtml += ``;
@@ -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;
});
}