diff --git a/Frontend/_graphManagement.html b/Frontend/_graphManagement.html index 55749cb..8ecee15 100644 --- a/Frontend/_graphManagement.html +++ b/Frontend/_graphManagement.html @@ -16,7 +16,7 @@
-
+
+新增 @@ -65,7 +65,7 @@
- +
@@ -278,8 +278,8 @@ let dowLoaEle = YT.Alert.Tip("準備下載中...", "show", true); let rowData = graTable.row($(this).closest("tr")).data(); let apiUrl = baseApiUrl + `/File/Download?type=graph&savename=${rowData.oriSavName}&oriname=${rowData.oriOrgName}`; - let extname = rowData.oriOrgName?.split(".").slice(-1) || "dwg"; - download(token, apiUrl, rowData.name + "_原設計圖" + "." + extname, function () { + + download(token, apiUrl, rowData.oriOrgName, function () { $(dowLoaEle.ele).YTAlert().hide(); }); }) @@ -390,8 +390,8 @@ Create: { label: "新增", _disabled: function (data) { - if (depth >= 3) { - return true; //第五層後無法新增 + if (depth >= 4) { + return true; //第三層後無法新增 } return false; }, @@ -405,6 +405,12 @@ }, Rename: { label: "重新命名", + _disabled: function (data) { + if ($node.id == "0") { + return true; //最上層無法編輯 + } + return false; + }, action: function (obj) { tree.edit($node); /* tree.sort($node, true)*/ @@ -412,6 +418,12 @@ }, Remove: { label: "移除", + _disabled: function (data) { + if ($node.id == "0") { + return true; //最上層無法移除 + } + return false; + }, action: function (obj) { tree.delete_node($node); } @@ -426,18 +438,27 @@ } function treeEvent() { + let selectedNode = []; $('#graTree').on("loaded.jstree", function (e, data) { - let topNode = $('#graTree').jstree(true).get_node("#"); + let topNode = $('#graTree').jstree(true).get_node("0"); $('#graTree').jstree(true).select_node(topNode.children[0]); $("#graTree").jstree("open_node", 0); }) $('#graTree').on("select_node.jstree", function (e, data) { - dtAjaxResetSendData(graTable, { layer_id: parseInt(data.node.id) }); - graTable.ajax.reload(); - - curLayerId = parseInt(data.node.id); - $("#graLayer").text(levelNameByNodeId(data.node)); - $("#curLevText").text(levelNameByNodeId(data.node)); + if (data.node.id != "0") { + dtAjaxResetSendData(graTable, { layer_id: parseInt(data.node.id) }); + graTable.ajax.reload(); + selectedNode.unshift(data.node.id); + if (selectedNode.length > 3) { + selectedNode.splice(selectedNode.length - 1, 1); + } + curLayerId = parseInt(data.node.id); + $("#graLayer").text(levelNameByNodeId(data.node)); + $("#curLevText").text(levelNameByNodeId(data.node)); + } else { + $("#graTree").jstree(true).deselect_node(data.node); + $("#graTree").jstree(true).select_node(selectedNode[0]); + } }) $("#graTree").on('create_node.jstree', function (e, data) { let main = {}; @@ -537,14 +558,14 @@ let names = []; let curNode = $('#graTree').jstree(true).get_node(node); let parents = curNode.parents.reverse(); - + for (let i = parents.length - 1; i >= 0; i--) { - if (parents[i] != "#") { + if (parents[i] != "#") { let node = $('#graTree').jstree(true).get_node(parents[i]); names.push(node.text); } } - + names.push(curNode.text); return names.join("/"); diff --git a/Frontend/_sysElevator.html b/Frontend/_sysElevator.html index 43e788f..084a7dd 100644 --- a/Frontend/_sysElevator.html +++ b/Frontend/_sysElevator.html @@ -2371,8 +2371,9 @@ //載入3D模型 function load3DModel() { - launchViewer(pageAct.urn, (viewer) => { + + let elevOption = { selector: "#forgeViewer", viewer: viewer, @@ -2382,12 +2383,16 @@ // 電梯移動訂閱程序載入 let forge3DElev = new Forge3DElevFull(elevOption); forge3DElev.bajaEndCallback = function () { + debugger + hideAllObjects(this.getNodeIds()); endPageLoading(); } forge3DElev.bajaChaCallback = function (data) { subDeviceSetStatus(data); } forge3DElev.init(); + + }); } diff --git a/Frontend/_sysMonAll.html b/Frontend/_sysMonAll.html index c7473f0..53220b8 100644 --- a/Frontend/_sysMonAll.html +++ b/Frontend/_sysMonAll.html @@ -45,9 +45,7 @@ setLightColor(); } if (arr.indexOf(3) != -1) { - getHotspotPoint(() => { - getLightDevice(); show3DModel(data.urn_3D); }); @@ -264,7 +262,11 @@ } function show3DModel(urn) { + $(loadEle).Loading("start"); launchViewerForHotspot(urn, (viewer, nodeIds) => { + let devDbIds = allDevList.map(x => x.forge_dbid); + hideAllObjects(devDbIds); + $(loadEle).Loading("close"); let devices = allDevList.map(x => { return { roomDbId: !isNaN(parseInt(x.room_dbid)) ? parseInt(x.room_dbid) : -1, @@ -300,6 +302,8 @@ endPageLoading(); } forge3DElev.init(); + }, () => { + $(loadEle).Loading("close"); }, "[name=forgeViewer]"); } @@ -337,50 +341,11 @@ } - async function getLightDevice() {//callback = null - getLightData(null); - let url = baseApiUrl + "/api/GetDevNodeForCor"; - let sendData = { - "device_area_tag": pageAct.AreaTag, - "device_building_tag": pageAct.buiTag, - "device_system_tag": pageAct.sysMainTag, - "device_name_tag": pageAct.sysSubTag, - }; - objSendData.Data = sendData; - ytAjax = new YourTeam.Ajax(url, objSendData, function (res) { - if (!res || res.code != "0000" || !res.data) { - - } else { - - let myLightList = []; - $.each(res.data, (idx, data) => { - let item = {}; - item.position = {}; - if (data.device_node_coordinate_3d != null && isJSON(data.device_node_coordinate_3d)) { - item.position = JSON.parse(data.device_node_coordinate_3d); - } - $.extend(item, data); - myLightList.push(item); - }) - - console.log("2", myLightList); - setLightList(myLightList); - //callback ? callback() : ""; - } - }, null, "POST").send(); - - } - function setHotspotPoint(myDataList = []) { console.log(myDataList) getHopspotPoint(myDataList); } - async function setLightList(myDataList = []) { - console.log(myDataList); - getLightData(myDataList); - } - var parentEle = ""; onEvent("autodesk:click:sprite", "[name=forgeViewer]", function (e, obj) { forgeUnFocusAll(); diff --git a/Frontend/_sysMonFloor.html b/Frontend/_sysMonFloor.html index a656da7..ff6ff9b 100644 --- a/Frontend/_sysMonFloor.html +++ b/Frontend/_sysMonFloor.html @@ -1034,10 +1034,11 @@ // show 3D 模型 function show3DModel(urn) { + $(loadEle).Loading("start"); launchViewerForHotspot(urn, (viewer, nodeIds) => { let nextFloor = getNextFloor(pageAct.floGuid); let curFloTag = pageAct.floTag; - debugger + if (!nextFloor) { toast_warning("超出樓層範圍"); return; @@ -1050,7 +1051,9 @@ nextFloor = nextFloor.split("U")[1]; } - getLevelsData(curFloTag, nextFloor); + getLevelsData(curFloTag, nextFloor, function () { + $(loadEle).Loading("close"); + }); setHeatMap(); let elevOption = { @@ -1066,6 +1069,8 @@ endPageLoading(); } forge3DElev.init(); + + }); } diff --git a/Frontend/index.html b/Frontend/index.html index a9afa74..1408eb2 100644 --- a/Frontend/index.html +++ b/Frontend/index.html @@ -140,7 +140,7 @@ License: You must have a valid license purchased only from wrapbootstrap.com (li