From 0bd2d0483dc0d880c002e51a7ddfe702d7913488 Mon Sep 17 00:00:00 2001
From: dev01 <dev01@yourteam.tw>
Date: Wed, 7 Jun 2023 17:28:35 +0800
Subject: [PATCH] =?UTF-8?q?[=E5=BE=8C=E5=8F=B0][=E7=B7=8A=E6=80=A5?=
 =?UTF-8?q?=E6=87=89=E8=AE=8A]=20=E5=8F=AF=E5=A4=9A=E9=81=B8=E6=A3=9F?=
 =?UTF-8?q?=E5=88=A5=E5=89=8D=E7=AB=AF=E7=A8=8B=E5=BA=8F=E5=8F=8Aapi?=
 =?UTF-8?q?=E8=AA=BF=E6=95=B4=E4=B8=B2=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 FrontendWebApi/ApiControllers/EmergencyDeviceController.cs | 2 +-
 FrontendWebApi/Views/EmergencyHardwareMenu/Index.cshtml    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/FrontendWebApi/ApiControllers/EmergencyDeviceController.cs b/FrontendWebApi/ApiControllers/EmergencyDeviceController.cs
index 0ba06f1..5571a65 100644
--- a/FrontendWebApi/ApiControllers/EmergencyDeviceController.cs
+++ b/FrontendWebApi/ApiControllers/EmergencyDeviceController.cs
@@ -108,7 +108,7 @@ namespace FrontendWebApi.ApiControllers
 
         [HttpPost]
         [Route("api/EmergencyDevice")]
-        public async Task<ActionResult<ApiResult<List<deviceMenu>>>> EmergencyDevice([FromBody] selectdevice selectdevice)
+        public async Task<ActionResult<ApiResult<List<deviceMenu>>>> EmergencyDevice(selectdevice selectdevice)
         {
             ApiResult<List<deviceMenu>> apiResult = new ApiResult<List<deviceMenu>>();
             if (!jwtlife)
diff --git a/FrontendWebApi/Views/EmergencyHardwareMenu/Index.cshtml b/FrontendWebApi/Views/EmergencyHardwareMenu/Index.cshtml
index 3696639..e67fc7e 100644
--- a/FrontendWebApi/Views/EmergencyHardwareMenu/Index.cshtml
+++ b/FrontendWebApi/Views/EmergencyHardwareMenu/Index.cshtml
@@ -26,9 +26,9 @@
                 <div class="panel-hdr">
                     <div class="col-auto">防災類別</div>
                     <div class="col" id="disaster">防災類別</div>
-                    <div class="col-auto">
+                   @* <div class="col-auto">
                         <button type="button" class="btn btn-secondary" onclick="OnSimulationExercise('', '',1)">模擬演練</button>
-                    </div>
+                    </div>*@
                 </div>
                 <div class="panel-hdr">
                     <div class="col-auto">棟別</div>
@@ -629,7 +629,7 @@
                     "type": "POST",
                     "data": function (d) {
                         d.select_disasters = SelectedFilter.disasters;
-                        d.selectbuilding = SelectedFilter.building_tag;
+                        d.selectbuilding = SelectedFilter.building_tag != "" ? [SelectedFilter.building_tag] : [];
                         d.select_Floors = SelectedFilter.floor_guids;
                         d.select_Layer3 = SelectedFilter.layer3;
                     },