From 3f8802b1d63e0bda99ebf792bb3ddf640a29555f Mon Sep 17 00:00:00 2001
From: dev01 <dev01@yourteam.tw>
Date: Fri, 2 Dec 2022 11:21:05 +0800
Subject: [PATCH] =?UTF-8?q?[Forntend][=E7=B3=BB=E7=B5=B1=E7=9B=A3=E6=8E=A7?=
 =?UTF-8?q?]=203D=20=E9=9B=BB=E6=A2=AF=20=E6=8E=92=E5=BA=8F=E8=AA=BF?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Frontend/_sysElevator.html | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Frontend/_sysElevator.html b/Frontend/_sysElevator.html
index cea5226..217e6ef 100644
--- a/Frontend/_sysElevator.html
+++ b/Frontend/_sysElevator.html
@@ -861,7 +861,7 @@
     var subSeviceData = [];    //每個設備訂閱點位值
     var floList = [];          //每個樓層
     var elevObj = null;        //左側 2D 電梯物件
-    var viewer3DNodeIds = [223, 228, 233];
+    var viewer3DNodeIds = [233, 228, 223];
     var elev3DBind = {};
     var elev3DOption = {};
     var elev3DObj = [];
@@ -973,9 +973,11 @@
             subDeviceSetEleManNotSerFloor(master);
         });
         myBaja.setSubscribeDeviceEndCallBack(function (data) {
-            let devNumArr = data.map(x => x.device_number_full).Distinct();
-            $.each(devNumArr, (idx, devNum) => {
-                
+            
+            let devNumArr = data.map(x => { return { devNum: x.device_number_full, priority: allDevList.filter(y => y.device_number == x.device_number_full)[0]?.priority } }).DistinctBy("devNum");
+            devNumArr = devNumArr.oSort("priority");
+            $.each(devNumArr, (idx, devObj) => {
+                devNum = devObj.devNum;
                 let subData = subSeviceData.filter(x => x.device_number == devNum)[0];
 
                 if (subData) {