From bddb4f19f50163704e83cf2a1f52d82a96fd706f Mon Sep 17 00:00:00 2001
From: dev01 <dev01@yourteam.tw>
Date: Mon, 22 May 2023 18:24:27 +0800
Subject: [PATCH 1/3] =?UTF-8?q?[=E7=B7=8A=E6=80=A5=E6=87=89=E8=AE=8A]=20?=
 =?UTF-8?q?=E4=BE=9D=E6=93=9A=20api=20=E8=AA=BF=E6=95=B4=E6=AC=84=E4=BD=8D?=
 =?UTF-8?q?=E5=90=8D=E7=A8=B1=E5=89=8D=E7=AB=AF=E5=90=8C=E6=AD=A5=E6=9B=B4?=
 =?UTF-8?q?=E5=8B=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FrontendWebApi/Views/EmergencyDeviceMenu/Index.cshtml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/FrontendWebApi/Views/EmergencyDeviceMenu/Index.cshtml b/FrontendWebApi/Views/EmergencyDeviceMenu/Index.cshtml
index 3a79bc3..9aa1481 100644
--- a/FrontendWebApi/Views/EmergencyDeviceMenu/Index.cshtml
+++ b/FrontendWebApi/Views/EmergencyDeviceMenu/Index.cshtml
@@ -412,7 +412,7 @@
             emergencyContactTable = $("#membertable").DataTable({
                 "columns": [
                     {
-                        "data": "name"
+                        "data": "full_name"
                     },
                     {
                         "data": "departmentName"
@@ -1613,9 +1613,9 @@
                     var includeli = "";
                     $.each(rel.data, function (index, val) {
                         if (index == 0) {
-                            includeli += '<li class="list-group-item active" id="li_' + val.emergency_guid + '" > <a class="abc" onclick="GetContentAndMakeItem(\'' + val.emergency_guid + '\',this,' + setting + ')" >' + val.name + '</a></li>';
+                            includeli += '<li class="list-group-item active" id="li_' + val.emergency_guid + '" > <a class="abc" onclick="GetContentAndMakeItem(\'' + val.emergency_guid + '\',this,' + setting + ')" >' + val.full_name + '</a></li>';
                         } else {
-                            includeli += '<li class="list-group-item" id="li_' + val.emergency_guid + '"> <a class="abc" onclick="GetContentAndMakeItem(\'' + val.emergency_guid + '\',this,' + setting + ')" >' + val.name + '</a></li>';
+                            includeli += '<li class="list-group-item" id="li_' + val.emergency_guid + '"> <a class="abc" onclick="GetContentAndMakeItem(\'' + val.emergency_guid + '\',this,' + setting + ')" >' + val.full_name + '</a></li>';
                         }
 
                     });
@@ -1678,7 +1678,7 @@
                     }
 
                     $('#hbr_' + setting).empty();
-                    $('#hbr_' + setting).append('<h2>' + rel.data.name + '</h2>');
+                    $('#hbr_' + setting).append('<h2>' + rel.data.full_name + '</h2>');
                     $('#tag_' + setting).empty();
                     $('#tag_' + setting).append(rel.data.set_doing);
 

From 72b9c77fcd4b48cd7a3dbf7d3462289ab0fdcd9e Mon Sep 17 00:00:00 2001
From: dev01 <dev01@yourteam.tw>
Date: Tue, 23 May 2023 10:58:08 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=89=E8=8F=B1=20Frontend=20=E9=9B=BB?=
 =?UTF-8?q?=E6=A2=AF=E9=80=9F=E5=BA=A6=E5=A2=9E=E5=8A=A01.5=E5=80=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Frontend/js/forge/forgemodel.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Frontend/js/forge/forgemodel.js b/Frontend/js/forge/forgemodel.js
index a0bdaf6..dc5fb0c 100644
--- a/Frontend/js/forge/forgemodel.js
+++ b/Frontend/js/forge/forgemodel.js
@@ -181,7 +181,7 @@ class elevator3D {
         this.ele = option.element;
         this.viewer = option.viewer;
         this.nodeId = option.nodeId;
-        this.speed = option.speed ?? 0.07;
+        this.speed = option.speed ?? 0.18;
         this.tagValue = option.tagValue ?? "";
         this.fragProxys = [];
         this.fragProxy = null;

From 2e3041d007a528eef75dd4064d0dca1b37caef0d Mon Sep 17 00:00:00 2001
From: dev01 <dev01@yourteam.tw>
Date: Wed, 24 May 2023 12:49:35 +0800
Subject: [PATCH 3/3] =?UTF-8?q?[=E5=BE=8C=E5=8F=B0]=20=E5=89=8D=E7=AB=AF?=
 =?UTF-8?q?=E5=B8=B3=E8=99=9F=E7=AE=A1=E7=90=86=20=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E6=AC=8A=E9=99=90=E5=8A=A0=E5=85=A5=E5=8F=AF=E7=94=A8=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=20buidling=5Fguid=20->=20building=5Ftag?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Backend/Views/UserInfo/Index.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Backend/Views/UserInfo/Index.cshtml b/Backend/Views/UserInfo/Index.cshtml
index 40cd35c..e894251 100644
--- a/Backend/Views/UserInfo/Index.cshtml
+++ b/Backend/Views/UserInfo/Index.cshtml
@@ -814,7 +814,7 @@
                         if (rel.data.length > 0) {
                             $('#select_building').empty();
                             $.each(rel.data, function (index, val) {
-                                $("#select_building").append($("<option />").val(val.building_guid).text(val.full_name));
+                                $("#select_building").append($("<option />").val(val.building_tag).text(val.full_name));
                             });
                             //預設查詢第一個
                             $("#select_building").val($("#select_building option:first").val());