From 4d9088849fe14144fc67ef95528ee5d172d09614 Mon Sep 17 00:00:00 2001
From: dev01 <dev01@yourteam.tw>
Date: Fri, 2 Dec 2022 09:38:06 +0800
Subject: [PATCH] =?UTF-8?q?[Frontend][=E7=B3=BB=E7=B5=B1=E7=9B=A3=E6=8E=A7?=
 =?UTF-8?q?]=20=E9=9B=BB=E6=A2=AF=E7=AE=A1=E7=90=86=20=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=20=E6=8E=92=E5=BA=8F=E9=97=9C=E9=96=89=20|=20datatable=20state?=
 =?UTF-8?q?Save=20=E9=97=9C=E9=96=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Frontend/_sysElevator.html                    | 67 ++++++++++---------
 .../js/yourteam/yourteam.jquery.datatables.js |  2 +-
 2 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/Frontend/_sysElevator.html b/Frontend/_sysElevator.html
index 6a0ed67..cea5226 100644
--- a/Frontend/_sysElevator.html
+++ b/Frontend/_sysElevator.html
@@ -1030,9 +1030,10 @@
 
         let result = [];
         let masterList = allDevList.map(x => x.device_number.split("_")[5]).Distinct();
+        
         // Master(第六段) 區分
         $.each(masterList, (idx, master) => {
-            debugger
+            
             let main = {};
             // 匯入 Master 名稱`
             main.devName = master;
@@ -1043,28 +1044,30 @@
                         main[subKey] = subData[subKey];
                     }
                 })
-            }
-            main._rowType = "master";
-            result.push(main);
-            // 該 Master 底下的設備
-            let devListByMaster = allDevList.filter(x => x.device_number.split("_")[5] == master);
 
-            $.each(devListByMaster, (idx2, devObj) => {
-                let subData = subSeviceData.filter(x => x.device_number == devObj.device_number)[0];
-                if (subData) {
-                    main = {};
-                    main.devNum = devObj.device_number;
-                    main.devName = devObj.full_name;
-                    main._rowType = "device";
-                    // 該設備點位匯入
-                    $.each(Object.keys(subData), (idx3, subKey) => {
-                        main[subKey] = subData[subKey];
-                    })
-                    // 匯入設備資訊(訂閱點位)
-                    result.push(main);
-                }
-            })
+                main._rowType = "master";
+                result.push(main);
+                // 該 Master 底下的設備
+                let devListByMaster = allDevList.filter(x => x.device_number.split("_")[5] == master);
+
+                $.each(devListByMaster, (idx2, devObj) => {
+                    let subData = subSeviceData.filter(x => x.device_number == devObj.device_number)[0];
+                    if (subData) {
+                        main = {};
+                        main.devNum = devObj.device_number;
+                        main.devName = devObj.full_name;
+                        main._rowType = "device";
+                        // 該設備點位匯入
+                        $.each(Object.keys(subData), (idx3, subKey) => {
+                            main[subKey] = subData[subKey];
+                        })
+                        // 匯入設備資訊(訂閱點位)
+                        result.push(main);
+                    }
+                })
+            }
         })
+        console.log("result:",result)
         return result;
     }
 
@@ -1318,15 +1321,16 @@
         let datas = [];
 
         let column_defs = [
-            { "targets": [0], "width": "11%", "sortable": true },
-            { "targets": [1], "width": "11%", "sortable": true },
-            { "targets": [2], "width": "11%", "sortable": true },
-            { "targets": [3], "width": "11%", "sortable": true },
-            { "targets": [4], "width": "11%", "sortable": true },
-            { "targets": [5], "width": "11%", "sortable": true },
-            { "targets": [6], "width": "11%", "sortable": true },
-            { "targets": [7], "width": "11%", "sortable": true },
-            { "targets": [8], "width": "12%", "sortable": true },
+            { "targets": [0], "width": "10%", "sortable": false },
+            { "targets": [1], "width": "10%", "sortable": false },
+            { "targets": [2], "width": "10%", "sortable": false },
+            { "targets": [3], "width": "10%", "sortable": false },
+            { "targets": [4], "width": "10%", "sortable": false },
+            { "targets": [5], "width": "10%", "sortable": false },
+            { "targets": [6], "width": "10%", "sortable": false },
+            { "targets": [7], "width": "10%", "sortable": false },
+            { "targets": [8], "width": "10%", "sortable": false },
+            { "targets": [9], "width": "10%", "sortable": false },
         ];
 
         let columns = [
@@ -1392,6 +1396,7 @@
         ];
 
         eleManTable = new YourTeam.JqDataTables.getTableByStatic(tag, datas, columns, column_defs, null, null, null, null, "tpi");
+        eleManTable.order([]).draw();
     }
 
     // 電梯管理 Modal - 設置 Detail 訂閱內容
@@ -2373,7 +2378,7 @@
 
     //載入3D模型
     function load3DModel() {
-        debugger
+        
 
         launchViewer('dXJuOmFkc2sub2JqZWN0czpvcy5vYmplY3Q6dGEzaHFzZmZ6cWJub3V4a3BsZGt1a3NldzRzajIxdzUtYmltc19tb2RlbHMvJUUzJTgwJTkwJUU1JThGJUIwJUU1JThDJTk3JUU0JUI4JUFEJUU4JThGJUIxJUU1JUE0JUE3JUU2JUE4JTkzJUUzJTgwJTkxQVJDLm53ZA==', (viewer) => {
             $.each(viewer3DNodeIds, function (idx, node) {
diff --git a/Frontend/js/yourteam/yourteam.jquery.datatables.js b/Frontend/js/yourteam/yourteam.jquery.datatables.js
index 85da7f2..6ef18ff 100644
--- a/Frontend/js/yourteam/yourteam.jquery.datatables.js
+++ b/Frontend/js/yourteam/yourteam.jquery.datatables.js
@@ -57,7 +57,7 @@ function fnInitJqDataTablesNoData(tag, dataSet = null, columns = null, columnDef
         "processing": true,
         "columns": columns,
         "aoColumnDefs": columnDefs,
-        "stateSave": true,
+        "stateSave": false,
         "pagingType": "full_numbers",
         "destroy": false,
         "initComplete": initComplete,