diff --git a/Frontend/_sysMonAll.html b/Frontend/_sysMonAll.html index f9e15b1..f52f202 100644 --- a/Frontend/_sysMonAll.html +++ b/Frontend/_sysMonAll.html @@ -367,9 +367,6 @@ function show3DModel(urn) { $(loadEle).Loading("start"); - if (pageAct.sysMainTag == "LT") { - setLightPoint(allDevList); - } launchViewerForHotspot(urn, (viewer, nodeIds) => { let devDbIds = allDevList.map(x => x.forge_dbid); /*hideAllObjects(devDbIds);*/ @@ -475,6 +472,10 @@ }) setHotspotPoint(myDataList); + if (pageAct.sysMainTag == "LT") { + setLightPoint(myDataList); + console.log("myDataList", myDataList) + } callback ? callback() : ""; } }, null, "POST").send(); diff --git a/Frontend/index.html b/Frontend/index.html index 0095295..34c8456 100644 --- a/Frontend/index.html +++ b/Frontend/index.html @@ -782,6 +782,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li "lib/chart.js/Chart.min", "lib/dropzone/dropzone-min", "lib/jstree-master/jstree.min", + "lib/notifications/sweetalert2/sweetalert2.bundle", ], loadedMasterPack); } @@ -992,7 +993,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li }) $(window).on("timeout:3s", function () { - debugger + getSystemAlarmByBaja((data) => { if (typeof getAlarmSub != "undefined" && getAlarmSub) { getAlarmSub(data); @@ -1027,7 +1028,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li dataType: 'json', success: function (rel) { if (rel.code != "0000") { - toast_error(rel.msg || "系統內部發生錯誤,請聯絡系統管理員"); + toast_error(rel.msg || common.SysErr); return; } else { @@ -1037,7 +1038,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li } }, error: function (xhr, textStatus, thrownError) { - alert(textStatus); + alert(common.SysErr); } }); @@ -1602,52 +1603,52 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li } function showWarToast() { - let options = { - "closeButton": false, - "debug": false, - "newestOnTop": true, - "progressBar": false, - "positionClass": "toast-top-right", - "preventDuplicates": false, - "onclick": null, - "showDuration": "300", - "hideDuration": "1000", - "timeOut": 0, - "extendedTimeOut": 0, - "showEasing": "swing", - "hideEasing": "linear", - "showMethod": "fadeIn", - "hideMethod": "fadeOut", - "tapToDismiss": false - } + //let options = { + // "closeButton": false, + // "debug": false, + // "newestOnTop": true, + // "progressBar": false, + // "positionClass": "toast-top-right", + // "preventDuplicates": false, + // "onclick": null, + // "showDuration": "300", + // "hideDuration": "1000", + // "timeOut": 0, + // "extendedTimeOut": 0, + // "showEasing": "swing", + // "hideEasing": "linear", + // "showMethod": "fadeIn", + // "hideMethod": "fadeOut", + // "tapToDismiss": false + //} - if ($("#toast-container .toast").length < 2) { - let strConHtml = `