diff --git a/Frontend/_historyData2.html b/Frontend/_historyData2.html index 378d900..18dd4d6 100644 --- a/Frontend/_historyData2.html +++ b/Frontend/_historyData2.html @@ -273,7 +273,9 @@ $("[name=subRadio]:checked").parent().addClass("btn-info"); subTag = subRadios.val(); //sub tag pageAct.selectedSub = subTag; - await getSidebar(subTag); + if(e){ + await getSidebar(subTag); + } result = true; } @@ -415,7 +417,7 @@ function getData(e) { e?.preventDefault(); - $(loadEle)?.Loading?.("start"); + // $(loadEle)?.Loading?.("start"); let sendData = { Type: pageAct.dateType, Points: pageAct.devicePoiName, @@ -751,6 +753,7 @@ } function getDataFromFavorite(data){ + console.log(data) const dev = data.device_list.map(d=>d.split("_")[1]); const checkBui = device_list.map(({device_list, building_tag})=>({ building_tag, @@ -774,7 +777,7 @@ }) pageAct.devicePoiName = data.points; pageAct.Type = data.type; - selectSub(_, data.device_name_tag) + selectSub(null, data.device_name_tag) const elems = $("[data-point]"); elems.each((i, e) => { let pointName = e.dataset.point; @@ -793,6 +796,7 @@ }else if(e.target.dataset.function == 'del') { delFavorite(e.target.dataset.favorite) }else if(e.target.dataset.function == 'show'){ + console.log(favorite_setting) getDataFromFavorite(favorite_setting.find((d)=>d.favorite_guid===e.target.dataset.favorite)) } })