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) {