-
-
+
@@ -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..401d1ed 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,17 @@
// 電梯移動訂閱程序載入
let forge3DElev = new Forge3DElevFull(elevOption);
forge3DElev.bajaEndCallback = function () {
+ debugger
+ /*hideAllObjects(this.getNodeIds());*/
+ setTransparentBuilding(0);
endPageLoading();
}
forge3DElev.bajaChaCallback = function (data) {
subDeviceSetStatus(data);
}
forge3DElev.init();
+
+
});
}
diff --git a/Frontend/_sysMonAll.html b/Frontend/_sysMonAll.html
index c7473f0..4bab82c 100644
--- a/Frontend/_sysMonAll.html
+++ b/Frontend/_sysMonAll.html
@@ -36,6 +36,7 @@