diff --git a/Frontend/_energyManagement.html b/Frontend/_energyManagement.html
index 8f66e17..b1ca50c 100644
--- a/Frontend/_energyManagement.html
+++ b/Frontend/_energyManagement.html
@@ -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> - 用電狀況
@@ -32,7 +35,7 @@
                                 </div>
                                 <div class="col-sm-12 col-lg-6 d-flex flex-column">
                                     <h4 class="py-3">用電比較</h4>
-                                    <div id="elecCompNoData" class="row justify-content-center align-items-center h-100"  style="display:none;">
+                                    <div id="elecCompNoData" class="row justify-content-center align-items-center h-100" style="display:none;">
                                         <h4>無資料</h4>
                                     </div>
                                     <div style="width:100%; min-height:300px;">
@@ -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,114 +78,116 @@
                         </div>
                     </div>
                 </div>
-            </div>
 
-            <div class="row mt-5 mx-0">
-                <ul class="nav nav-tabs w-100" 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>
-                <div class="tab-content border border-top-0 p-3 w-100">
-                    <div class="tab-pane fade show active" id="tab_borders_icons-1" role="tabpanel">
-                        <div class="frame-wrap">
-                            <table class="table table-bordered table-striped text-center m-0">
-                                <thead class="thead-themed">
-                                    <tr>
-                                        <th>日期</th>
-                                        <th>開始-結束</th>
-                                        <th>卸載時長<br>minutes</th>
-                                        <th>預計卸載量<br>kW</th>
-                                        <th>是否啟用</th>
-                                        <th>名稱</th>
-                                        <th>功能</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <tr>
-                                        <td>2022-09-01</td>
-                                        <td>11:00:00<br>11:30:00</td>
-                                        <td>30</td>
-                                        <td>40</td>
-                                        <td><input type="checkbox"> 啟用</td>
-                                        <td>停車場單號照明</td>
-                                        <td><a href="#" class="btn btn-info">修改</a></td>
-                                    </tr>
-                                    <tr>
-                                        <td>2022-09-01</td>
-                                        <td>11:00:00<br>11:30:00</td>
-                                        <td>30</td>
-                                        <td>40</td>
-                                        <td><input type="checkbox"> 啟用</td>
-                                        <td>停車場單號照明</td>
-                                        <td><a href="#" class="btn btn-info">修改</a></td>
-                                    </tr>
-                                    <tr>
-                                        <td>2022-09-01</td>
-                                        <td>11:00:00<br>11:30:00</td>
-                                        <td>30</td>
-                                        <td>40</td>
-                                        <td><input type="checkbox"> 啟用</td>
-                                        <td>停車場單號照明</td>
-                                        <td><a href="#" class="btn btn-info">修改</a></td>
-                                    </tr>
-                                </tbody>
-                            </table>
+                <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>
+                    <div class="tab-content border border-top-0 p-3 w-100">
+                        <div class="tab-pane fade show active" id="tab_borders_icons-1" role="tabpanel">
+                            <div class="frame-wrap">
+                                <table class="table table-bordered table-striped text-center m-0">
+                                    <thead class="thead-themed">
+                                        <tr>
+                                            <th>日期</th>
+                                            <th>開始-結束</th>
+                                            <th>卸載時長<br>minutes</th>
+                                            <th>預計卸載量<br>kW</th>
+                                            <th>是否啟用</th>
+                                            <th>名稱</th>
+                                            <th>功能</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        <tr>
+                                            <td>2022-09-01</td>
+                                            <td>11:00:00<br>11:30:00</td>
+                                            <td>30</td>
+                                            <td>40</td>
+                                            <td><input type="checkbox"> 啟用</td>
+                                            <td>停車場單號照明</td>
+                                            <td><a href="#" class="btn btn-info">修改</a></td>
+                                        </tr>
+                                        <tr>
+                                            <td>2022-09-01</td>
+                                            <td>11:00:00<br>11:30:00</td>
+                                            <td>30</td>
+                                            <td>40</td>
+                                            <td><input type="checkbox"> 啟用</td>
+                                            <td>停車場單號照明</td>
+                                            <td><a href="#" class="btn btn-info">修改</a></td>
+                                        </tr>
+                                        <tr>
+                                            <td>2022-09-01</td>
+                                            <td>11:00:00<br>11:30:00</td>
+                                            <td>30</td>
+                                            <td>40</td>
+                                            <td><input type="checkbox"> 啟用</td>
+                                            <td>停車場單號照明</td>
+                                            <td><a href="#" class="btn btn-info">修改</a></td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
                         </div>
-                    </div>
-                    <div class="tab-pane fade" id="tab_borders_icons-2" role="tabpanel">
-                        <div class="frame-wrap">
-                            <div class="mb-3"> <a href="#" class="btn btn-success">+ 新增</a> </div>
-                            <table class="table table-bordered table-striped text-center m-0">
-                                <thead class="thead-themed">
-                                    <tr>
-                                        <th>編號</th>
-                                        <th>名稱</th>
-                                        <th>建立人</th>
-                                        <th>建立時間</th>
-                                        <th>功能</th>
-                                    </tr>
-                                </thead>
-                                <tbody>
-                                    <tr>
-                                        <td>1</td>
-                                        <td>平台管理員</td>
-                                        <td>王小明</td>
-                                        <td>2022-05-02 12:08</td>
-                                        <td><a href="#" class="btn btn-info">修改</a>　<a href="#" class="btn btn-danger">刪除</a></td>
-                                    </tr>
-                                    <tr>
-                                        <td>2</td>
-                                        <td>平台運維</td>
-                                        <td>王小明</td>
-                                        <td>2022-05-02 12:08</td>
-                                        <td>
-                                            <div class="custom-control custom-switch">
-                                                <input type="radio" class="custom-control-input" id="customSwitch2radio" checked="" name="defaultSwitchRadioExample">
-                                                <label class="custom-control-label" for="customSwitch2radio">Checked</label>
-                                            </div>
-                                        </td>
-                                    </tr>
-                                    <tr>
-                                        <td>3</td>
-                                        <td>客戶管理員</td>
-                                        <td>王小明</td>
-                                        <td>2022-05-02 12:08</td>
-                                        <td><a href="#" class="btn btn-info">修改</a>　<a href="#" class="btn btn-danger">刪除</a></td>
-                                    </tr>
-                                    <tr>
-                                        <td>4</td>
-                                        <td>客戶運維</td>
-                                        <td>王小明</td>
-                                        <td>2022-05-02 12:08</td>
-                                        <td><a href="#" class="btn btn-info">修改</a>　<a href="#" class="btn btn-danger">刪除</a></td>
-                                    </tr>
-                                </tbody>
-                            </table>
+                        <div class="tab-pane fade" id="tab_borders_icons-2" role="tabpanel">
+                            <div class="frame-wrap">
+                                <div class="mb-3"> <a href="#" class="btn btn-success">+ 新增</a> </div>
+                                <table class="table table-bordered table-striped text-center m-0">
+                                    <thead class="thead-themed">
+                                        <tr>
+                                            <th>編號</th>
+                                            <th>名稱</th>
+                                            <th>建立人</th>
+                                            <th>建立時間</th>
+                                            <th>功能</th>
+                                        </tr>
+                                    </thead>
+                                    <tbody>
+                                        <tr>
+                                            <td>1</td>
+                                            <td>平台管理員</td>
+                                            <td>王小明</td>
+                                            <td>2022-05-02 12:08</td>
+                                            <td><a href="#" class="btn btn-info">修改</a>　<a href="#" class="btn btn-danger">刪除</a></td>
+                                        </tr>
+                                        <tr>
+                                            <td>2</td>
+                                            <td>平台運維</td>
+                                            <td>王小明</td>
+                                            <td>2022-05-02 12:08</td>
+                                            <td>
+                                                <div class="custom-control custom-switch">
+                                                    <input type="radio" class="custom-control-input" id="customSwitch2radio" checked="" name="defaultSwitchRadioExample">
+                                                    <label class="custom-control-label" for="customSwitch2radio">Checked</label>
+                                                </div>
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td>3</td>
+                                            <td>客戶管理員</td>
+                                            <td>王小明</td>
+                                            <td>2022-05-02 12:08</td>
+                                            <td><a href="#" class="btn btn-info">修改</a>　<a href="#" class="btn btn-danger">刪除</a></td>
+                                        </tr>
+                                        <tr>
+                                            <td>4</td>
+                                            <td>客戶運維</td>
+                                            <td>王小明</td>
+                                            <td>2022-05-02 12:08</td>
+                                            <td><a href="#" class="btn btn-info">修改</a>　<a href="#" class="btn btn-danger">刪除</a></td>
+                                        </tr>
+                                    </tbody>
+                                </table>
+                            </div>
                         </div>
                     </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>
\ No newline at end of file
diff --git a/Frontend/_sysElevator.html b/Frontend/_sysElevator.html
index 9201177..afe49fd 100644
--- a/Frontend/_sysElevator.html
+++ b/Frontend/_sysElevator.html
@@ -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() {