[Frontend] forge 熱點共用化調整 |

Frontend/_sysMonAll.html

@@ -36,7 +36,7 @@
 
 <script>
     var allDevList = [];  //全設備清單
-    let devicePointList = [];
+    var devicePointList = [];
     
     $(function () {
         getBuildMenu((arr, data) => {
@@ -47,7 +47,6 @@
             if (arr.indexOf(5) != -1) {
                 setHotspotPoint();
                 show3DModel(data.urn_3D);
-                console.log("start ---------");
                 
             }
         });
@@ -246,28 +245,37 @@
         }, null, "POST").send();
     }
 
+    // Card 即時狀態
+    function drawStateTabBlo() {
+        let strHtml = `<div style="height:15rem">
+                            <iframe src="/ord?station:%7Cslot:/TPE/B1/EE/E4/R2F/NA/WHT/N1|view:?fullScreen=true" width="100%" height="100%"></iframe>
+                       </div>`
+        return strHtml;
+    }
+
     function show3DModel(urn) {
         launchViewerForHotspot(urn, (viewer, nodeIds) => {
-
+            getHotspotPoint();
-        });
+        },"[name=forgeViewer]");
     }
 
     function getHotspotPoint() {
         let url = baseApiUrl + "/api/GetDevForCor";
-        let sendData = {
+        let sendData = [{
-            "area_tag": pageAct.AreaTag,
+            "device_area_tag": pageAct.AreaTag,
-            "building_tag": pageAct.buiTag,
+            "device_building_tag": pageAct.buiTag,
-            "system_tag": pageAct.sysMainTag,
+            "device_system_tag": pageAct.sysMainTag,
-            "name_tag": pageAct.sysSubTag,
+            "device_name_tag": pageAct.sysSubTag,
-        };
+        }];
         objSendData.Data = sendData;
-        $.post(url, sendData, function (rel) {
+        ytAjax = new YourTeam.Ajax(url, objSendData, function (res) {
-            if (rel.code == "9999") {
+            if (!res || res.code != "0000" || !res.data) {
-                toast_error(rel.msg);
+
-                return;
+            } else {
+                devicePointList.push(res.data.device_coordinate_3d);
             }
-            devicePointList.push(rel.data.device_coordinate_3d);
+        }, null, "POST").send();
-        }, 'json');
+       
     }
 
     function setHotspotPoint() {

Frontend/index.html

@@ -2248,7 +2248,6 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li
                 })
 
                 onEvent("yt:tab:change", "#lightSch-tab", function () {
-                    debugger
                     if (pageAct.sysMainTag == "LT" && $("#lightSchModal").length != 0) {
                         loadLightSchTable();
                         $("#lightSchModal").modal("show");

Frontend/js/forge/forgemodel.js

@@ -6,7 +6,8 @@ var elevatorSpeed;
 var selector = "#forgeViewer";
 let myDataList;
 
-function launchViewer(urn, callback, selector = "#forgeViewer") {
+function launchViewer(urn, callback, _selector = "#forgeViewer") {
+    selector = _selector;
     var options = {
         env: 'AutodeskProduction',
         getAccessToken: getForgeToken
@@ -52,7 +53,8 @@ function launchViewer(urn, callback, selector = "#forgeViewer") {
     });
 }
 
-function launchViewerForHotspot(urn, callback, selector = "#forgeViewer") {
+function launchViewerForHotspot(urn, callback, _selector = "#forgeViewer") {
+    selector = _selector;
     var av = Autodesk.Viewing;
     var options = {
         env: 'AutodeskProduction',
@@ -305,13 +307,14 @@ function onDocumentLoadSuccess(doc, eleOption) {
 
 }
 
-function getNodeIdByDbIds(allDbIdsStr,callback) {
+function getNodeIdByDbIds(allDbIdsStr, callback = null) {
     let curDbId = 0;
     let tagId = 0;
     let _parentId = 0;
     let _childId = 0;
     let evelMap = new Map();
     let finTimeout = null;
+    let isCalled = false;
 
     allDbIdsStr.forEach((dbId) => {
         curDbId = parseInt(dbId);
@@ -338,7 +341,10 @@ function getNodeIdByDbIds(allDbIdsStr,callback) {
                                     console.log("map: " + evelMap);
                                     clearTimeout(finTimeout)
                                     finTimeout = setTimeout(() => {
+                                        if (isCalled == false) {
+                                            isCalled = true;
                                             callback ? callback(evelMap) : "";
+                                        }
                                     }, 10)
 
                                 })
@@ -346,6 +352,14 @@ function getNodeIdByDbIds(allDbIdsStr,callback) {
                             }
                         });
                     })
+                } else {
+                    clearTimeout(finTimeout)
+                    finTimeout = setTimeout(() => {
+                        if (isCalled == false) {
+                            isCalled = true;
+                            callback ? callback([]) : "";
+                        }
+                    }, 10)
                 }
             });
         })
@@ -441,9 +455,25 @@ function onDocumentLoadFailure(viewerErrorCode) {
 }
 
 function getForgeToken(callback) {
-    fetch(baseApiUrl + '/api/forge/oauth/token').then(res => {
+    fetch(forgeTokenBase.url).then(res => {
         res.json().then(data => {
-            callback(data.dictionary.access_token, data.dictionary.expires_in);
+            let limitResType = ["object", "undefined"];
+            let access_token = data;
+            $.each(forgeTokenBase.res_access_token, (idx, dict) => {
+                access_token = access_token[dict];
+            })
+
+            let expires_in = data;
+            $.each(forgeTokenBase.res_expires_in, (idx, dict) => {
+                expires_in = expires_in[dict];
+            })
+
+            if (limitResType.includes(typeof access_token) || limitResType.includes(typeof expires_in)) {
+                access_token = "", expires_in = "";
+                throw "access_token or expires_in on the ForgeTokenBase object for getting forge token by URL is not the correct path.";
+            }
+
+            callback(access_token, expires_in);
         });
     });
     //callback("eyJhbGciOiJSUzI1NiIsImtpZCI6IlU3c0dGRldUTzlBekNhSzBqZURRM2dQZXBURVdWN2VhIn0.eyJzY29wZSI6WyJkYXRhOndyaXRlIiwiZGF0YTpyZWFkIiwiYnVja2V0OnJlYWQiLCJidWNrZXQ6dXBkYXRlIiwiYnVja2V0OmNyZWF0ZSJdLCJjbGllbnRfaWQiOiJUQTNocXNGZnpRYk5PVVhLcGxkS1VLU2V3NFNKMjF3NSIsImF1ZCI6Imh0dHBzOi8vYXV0b2Rlc2suY29tL2F1ZC9hand0ZXhwNjAiLCJqdGkiOiJiemxzWE5qWElvZ2R1UjUzTUJkdlhrTTNTT01qeVB1bHJrMmdTVWJudGNTeDg1b01kRG1xejg3Z05jenJkRzhpIiwiZXhwIjoxNjY4MTgzMDM2fQ.VU3qLwTJ9nlXnomKCdk4y5UcgszGEO_zlvE7w5mWWajeBMwKLo-zw7LJEqUEajRksvssppR9SbVsjLSx-vDVc3DRhCo3jYTWKPT1T3wQrlkOSqLeIrAdnKdBDNBWKgrGJt_xcmXc3dZ3XNKf9L_F6Ex808rUlo6cem1mcPpKl1jCBDqKu1mAX7aDtZ65TTQZbGGhbG4HdnET-d1i5w4LunGN11UAHhDUW3n0SWWIBL27PiiUQONZttajhD5st6IngYLcjr93BYVyJmDF7-wm4WZlHSw2OnXIfbJcFXEd83uVv_Rej4UXjzZ0e6kHwzc2nvGvKSIFu3Nt7CabdR8CkA", 3599);

Frontend/js/init.js

@@ -17,6 +17,13 @@ var common = {
     SysErr: "系統內部發生錯誤，請聯繫系統管理員"
 }
 var objSendData = { Data: null };
+var initAreaTag = "TPE";
+var n4Sup = "Mitsubishi_Sup";
+var forgeTokenBase = {
+    url: baseApiUrl + '/api/forge/oauth/token',
+    res_access_token: ["dictionary", "access_token"],
+    res_expires_in: ["dictionary", "expires_in"]
+};
 
 //重新轉址 for Niagara4
 var temp_cuurent_Url_pathname = window.location.pathname.split("/").slice(0, 3);