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

[Frontend][電梯管理] 2D 3D 切換紐拿掉 | [能源管理] 水資源及天然氣資源 內容清空

Browse Source
This commit is contained in:
dev01 2022-12-23 17:27:16 +08:00
parent e7ad2e2261
commit 47dad15e3e
2 changed files with 123 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Frontend/_energyManagement.html
View File

@ -1,17 +1,20 @@
<main id="js-page-content" role="main" class="page-content">
<div class="row">
<div class="col-sm-12 col-xl-7">
<div class="col-12">
<div class="btn-group mb-3">
<button type="button" class="btn btn-secondary waves-effect waves-themed active" data-id="0" data-tabname="energyTab">用電管理</button>
<button type="button" class="btn btn-secondary waves-effect waves-themed" data-id="1" data-tabname="energyTab">天然氣管理</button>
<button type="button" class="btn btn-secondary waves-effect waves-themed" data-id="2" data-tabname="energyTab">水資源管理</button>
<button type="button" class="btn btn-secondary waves-effect waves-themed" data-id="3" data-tabname="energyTab">再生能源</button>
</div>
<div class="row" >
</div>
<div class="row col-12">
<div class="row col-xl-6 m-0 p-0">
<div id="eneSubSysList" class="row col-12 m-0 p-0"></div>
<div class="col-sm-12 col-xl-12">
<div id="panel-2" class="panel panel-locked" data-panel-sortable data-panel-collapsed data-panel-close>
<div class="col-sm-12 col-xl-12 align-self-end">
<div id="panel-2" class="panel panel-locked mb-0" data-panel-sortable data-panel-collapsed data-panel-close>
<div class="panel-hdr">
<h2>
<span id="actSubSysText"></span> - 用電狀況
@ -45,10 +48,8 @@
</div>
</div>
</div>
</div>
<div class="col-sm-12 col-xl-5">
<div class="row">
<div class="col-sm-12 col-lg-12 mb-2">
<div class="row flex-column col-xl-6 m-0 p-0">
<div class="col-auto mb-2">
<div class="card">
<div class="card-body">
<div class="d-flex justify-content-between align-items-center mb-3">
@ -77,10 +78,9 @@
</div>
</div>
</div>
</div>
<div class="row mt-5 mx-0">
<ul class="nav nav-tabs w-100" role="tablist">
<div class="row col mx-0">
<ul class="nav nav-tabs w-100 align-items-end" role="tablist">
<li class="nav-item"> <a class="nav-link active" data-toggle="tab" href="#tab_borders_icons-1" role="tab">自動卸載設定</a> </li>
<li class="nav-item"> <a class="nav-link" data-toggle="tab" href="#tab_borders_icons-2" role="tab">手動卸載控制</a> </li>
</ul>
@ -184,6 +184,9 @@
</div>
</div>
</div>
</div>
</div>
@ -508,8 +511,12 @@
}
onEvent("yt:tab:change", "[data-tabname=energyTab]", function () {
$("#eneSubSysList").parent("div").show();
let type = $(this).data("id");
getSubSysList(type);
getElecBySubSysTag();
if (type == "1" || type == "2") {
$("#eneSubSysList").parent("div").hide();
}
})
</script>

10
Frontend/_sysElevator.html
View File

@ -67,20 +67,20 @@
<div style="position:relative ">
<div id="elevatorBlock" class="elevator">
<div class="elevator-header">
<div class="row m-0 align-items-center p-2 gap-3 btn-group btn-group-toggle">
<!--<div class="row m-0 align-items-center p-2 gap-3 btn-group btn-group-toggle">
<button class="btn btn-secondary btn-sm " data-tabname="floShowType" data-target="#2dDiv">
2D
</button>
<button class="btn btn-secondary btn-sm active" data-tabname="floShowType" data-target="#3dDiv" onclick="show3D()">
3D
</button>
</div>
</div>-->
</div>
<div class="elevator-body d-flex align-items-center justify-content-center" style="height:85vh;">
<div id="2dDiv" class="p-2" data-tabname="floShowType" data-tabrole="child">
<!--<div id="2dDiv" class="p-2" data-tabname="floShowType" data-tabrole="child">
<table id="floorTable" class="elevator-build m-auto">
</table>
</div>
</div>-->
<div id="3dDiv" class="w-100 h-100 position-relative" data-tabname="floShowType" data-tabrole="child">
<div id="forgeViewer" style=""></div>
</div>
@ -940,7 +940,7 @@
setCards();
subDeviceSetStatus();
setEleManTable();
show3D();
})
function getFloDevList() {