jay.chang/ibms-dome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitea.mjm-staging.developers-homelab.net/BIMS/BIMS

Browse Source
This commit is contained in:
dev02 2023-05-24 12:58:33 +08:00
commit 6f80966014
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Backend/Views/UserInfo/Index.cshtml
View File

@ -814,7 +814,7 @@
if (rel.data.length > 0) { if (rel.data.length > 0) {
$('#select_building').empty(); $('#select_building').empty();
$.each(rel.data, function (index, val) { $.each(rel.data, function (index, val) {
$("#select_building").append($("<option />").val(val.building_guid).text(val.full_name)); $("#select_building").append($("<option />").val(val.building_tag).text(val.full_name));
}); });
//預設查詢第一個 //預設查詢第一個
$("#select_building").val($("#select_building option:first").val()); $("#select_building").val($("#select_building option:first").val());

2
Frontend/js/forge/forgemodel.js
View File

@ -181,7 +181,7 @@ class elevator3D {
this.ele = option.element; this.ele = option.element;
this.viewer = option.viewer; this.viewer = option.viewer;
this.nodeId = option.nodeId; this.nodeId = option.nodeId;
this.speed = option.speed ?? 0.07; this.speed = option.speed ?? 0.18;
this.tagValue = option.tagValue ?? ""; this.tagValue = option.tagValue ?? "";
this.fragProxys = []; this.fragProxys = [];
this.fragProxy = null; this.fragProxy = null;

8
FrontendWebApi/Views/EmergencyDeviceMenu/Index.cshtml
View File

@ -412,7 +412,7 @@
emergencyContactTable = $("#membertable").DataTable({ emergencyContactTable = $("#membertable").DataTable({
"columns": [ "columns": [
{ {
"data": "name" "data": "full_name"
}, },
{ {
"data": "departmentName" "data": "departmentName"
@ -1613,9 +1613,9 @@
var includeli = ""; var includeli = "";
$.each(rel.data, function (index, val) { $.each(rel.data, function (index, val) {
if (index == 0) { if (index == 0) {
includeli += '<li class="list-group-item active" id="li_' + val.emergency_guid + '" > <a class="abc" onclick="GetContentAndMakeItem(\'' + val.emergency_guid + '\',this,' + setting + ')" >' + val.name + '</a></li>'; includeli += '<li class="list-group-item active" id="li_' + val.emergency_guid + '" > <a class="abc" onclick="GetContentAndMakeItem(\'' + val.emergency_guid + '\',this,' + setting + ')" >' + val.full_name + '</a></li>';
} else { } else {
includeli += '<li class="list-group-item" id="li_' + val.emergency_guid + '"> <a class="abc" onclick="GetContentAndMakeItem(\'' + val.emergency_guid + '\',this,' + setting + ')" >' + val.name + '</a></li>'; includeli += '<li class="list-group-item" id="li_' + val.emergency_guid + '"> <a class="abc" onclick="GetContentAndMakeItem(\'' + val.emergency_guid + '\',this,' + setting + ')" >' + val.full_name + '</a></li>';
} }
}); });
@ -1678,7 +1678,7 @@
} }
$('#hbr_' + setting).empty(); $('#hbr_' + setting).empty();
$('#hbr_' + setting).append('<h2>' + rel.data.name + '</h2>'); $('#hbr_' + setting).append('<h2>' + rel.data.full_name + '</h2>');
$('#tag_' + setting).empty(); $('#tag_' + setting).empty();
$('#tag_' + setting).append(rel.data.set_doing); $('#tag_' + setting).append(rel.data.set_doing);