From aee4a2df9488e708edddace2d3c073fa4214187b Mon Sep 17 00:00:00 2001
From: dev01 <dev01@yourteam.tw>
Date: Mon, 13 Nov 2023 18:24:11 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=89=8D=E7=AB=AF][=E7=B7=8A=E6=80=A5?=
 =?UTF-8?q?=E6=87=89=E8=AE=8A]=20=E9=BB=9E=E6=93=8A=E7=81=BD=E5=AE=B3?=
 =?UTF-8?q?=E9=A1=9E=E5=88=A5=E5=BD=B1=E9=9F=BF=E6=A3=9F=E5=88=A5=E5=85=A8?=
 =?UTF-8?q?=E9=81=B8=E6=8C=89=E9=88=95=E5=95=8F=E9=A1=8C=E4=BF=AE=E6=AD=A3?=
 =?UTF-8?q?=20|=20[Layout]=20=E5=8F=96=E5=BE=97=E8=AD=A6=E6=88=92=E5=80=BC?=
 =?UTF-8?q?=E8=A8=AD=E5=AE=9A=E5=80=BC=E6=93=8A=E8=A8=AD=E5=AE=9A=E8=AD=A6?=
 =?UTF-8?q?=E6=88=92=E5=80=BC=20api=20=E7=9B=B8=E5=B0=8D=E8=B7=AF=E5=BE=91?=
 =?UTF-8?q?=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FrontendWebApi/Views/EmergencyDeviceMenu/Index.cshtml | 9 ++++++---
 FrontendWebApi/Views/Shared/_Layout.cshtml            | 4 ++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/FrontendWebApi/Views/EmergencyDeviceMenu/Index.cshtml b/FrontendWebApi/Views/EmergencyDeviceMenu/Index.cshtml
index 9fe73ab..133df90 100644
--- a/FrontendWebApi/Views/EmergencyDeviceMenu/Index.cshtml
+++ b/FrontendWebApi/Views/EmergencyDeviceMenu/Index.cshtml
@@ -360,7 +360,7 @@
         var Verifybool = false; //-驗證成功
         var CloseVerify = false;
         var ToVerifyType = 0;
-       
+        var isFirstLoad = true;
         $(function () {
              $("#emergency-item-form").submit((e) => {
                 e.preventDefault();
@@ -457,7 +457,7 @@
             SmsMemberTable = $("#smsMemberTable").DataTable({
                 "columns": [
                     {
-                        "data": "name"
+                        "data": "full_name"
                     },
                     {
                         "data": "departmentName"
@@ -975,7 +975,10 @@
                 $('#building').append(`<button type="button" class="btn btn-secondary waves-effect waves-themed d-inline-block ml-2 all-btn" onclick="AllBuilding()">  全選 </button>`);
                 $('#building').append(html);
 
-                $('#building').find('button').first().click();
+                if(isFirstLoad){
+                    $('#building').find('button').first().click();
+                    isFirstLoad = false;
+                }
             }
             else {
                 var html = "";
diff --git a/FrontendWebApi/Views/Shared/_Layout.cshtml b/FrontendWebApi/Views/Shared/_Layout.cshtml
index 993fec4..b9a3064 100644
--- a/FrontendWebApi/Views/Shared/_Layout.cshtml
+++ b/FrontendWebApi/Views/Shared/_Layout.cshtml
@@ -1009,7 +1009,7 @@
         }
 
         function getWarningValue(){
-            let url = "api/WarningValue/GetWarningValue";
+            let url = "/api/WarningValue/GetWarningValue";
            
              $.post(url, {}, function (rel) {
                 if (rel.code != "0000") {
@@ -1049,7 +1049,7 @@
             ]
             };
 
-            let url = "api/WarningValue/SetWarningValue";
+            let url = "/api/WarningValue/SetWarningValue";
 
             $.post(url, sendData, function (rel) {
                 if (rel.code != "0000") {