From a5bcf2e8fbaf16e1d64196851e1c553a6621a89e Mon Sep 17 00:00:00 2001 From: dev01 Date: Mon, 22 May 2023 16:29:07 +0800 Subject: [PATCH 1/4] =?UTF-8?q?[=E7=B7=8A=E6=80=A5=E6=87=89=E8=AE=8A]=20?= =?UTF-8?q?=E8=A8=AD=E5=82=99=E7=B8=BD=E6=94=AC=20Filter=20Panel=20?= =?UTF-8?q?=E5=89=8D=E7=AB=AF=E7=A8=8B=E5=BA=8F=E5=84=AA=E5=8C=96=E5=8F=8A?= =?UTF-8?q?=E8=AA=BF=E6=95=B4=20|=20=E7=B7=8A=E6=80=A5=E6=87=89=E8=AE=8A?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E9=A0=81=E9=9D=A2=E7=9B=B4=E6=8E=A5=E5=B0=8E?= =?UTF-8?q?=E9=80=B2=E8=A8=AD=E5=82=99=E7=B8=BD=E8=A6=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Views/EmergencyDeviceMenu/Index.cshtml | 46 +++++++++++-------- FrontendWebApi/Views/Login/Index.cshtml | 2 +- 2 files changed, 28 insertions(+), 20 deletions(-) diff --git a/FrontendWebApi/Views/EmergencyDeviceMenu/Index.cshtml b/FrontendWebApi/Views/EmergencyDeviceMenu/Index.cshtml index ac07ab6..3a79bc3 100644 --- a/FrontendWebApi/Views/EmergencyDeviceMenu/Index.cshtml +++ b/FrontendWebApi/Views/EmergencyDeviceMenu/Index.cshtml @@ -224,7 +224,7 @@ *@
-
+
@@ -349,8 +349,11 @@ var Verifybool = false; //-驗證成功 var CloseVerify = false; var ToVerifyType = 0; - + $(function () { + $("#emergency-item-form").submit((e) => { + e.preventDefault(); + }) //#region 定時取得報警設備(3s) interval_id = setInterval(function () { @@ -409,7 +412,7 @@ emergencyContactTable = $("#membertable").DataTable({ "columns": [ { - "data": "full_name" + "data": "name" }, { "data": "departmentName" @@ -453,7 +456,7 @@ SmsMemberTable = $("#smsMemberTable").DataTable({ "columns": [ { - "data": "full_name" + "data": "name" }, { "data": "departmentName" @@ -869,6 +872,7 @@ is_need_reload = true; ChangeFilterBuilding(); + UpdateDeviceAmount(); @*console.log("SelectedFilter", SelectedFilter);*@ } //#endregion @@ -889,6 +893,7 @@ is_need_reload = true; ChangeFilterBuilding(); + UpdateDeviceAmount(); @*console.log("SelectedFilter", SelectedFilter);*@ } //#endregion @@ -956,6 +961,7 @@ is_need_reload = true; ChangeFilterFloor(); + UpdateDeviceAmount(); @*console.log("SelectedFilter", SelectedFilter);*@ } //#endregion @@ -968,7 +974,7 @@ disaster.groupBuildings.forEach(function (building, building_index) { if (building.tag == SelectedFilter.building_tag) { //抓取選擇棟別的底下樓層 building.groupFloors.forEach(function (floor, floor_index) { - if (temp_all_floor.findIndex(x => x.guid == floor.guid) < 0) { //表示未加入，需加入 + if (temp_all_floor.findIndex(x => x.name == floor.name) < 0) { //表示未加入，需加入 temp_all_floor.push(floor); } }); @@ -981,7 +987,7 @@ $("#floors").append(``); var html = ""; temp_all_floor.forEach(function (floor, floor_index) { - html += ''; + html += ''; }); $('#floors').append(html); @@ -1001,32 +1007,34 @@ $('#floors').find('.btn-outline-success').removeClass('btn-outline-success').addClass('btn-success'); SelectedFilter.floor_guids = []; temp_all_floor.forEach(function (floor, floor_index) { - SelectedFilter.floor_guids.push(floor.guid); + SelectedFilter.floor_guids.push(floor.name); }); } is_need_reload = true; ChangeFilterLayer2(); + UpdateDeviceAmount(); @*console.log("SelectedFilter", SelectedFilter);*@ } //#endregion //#region 選擇樓層 - function SelectFloor(floor_guid, e) { + function SelectFloor(floor_tag, e) { select_all_floor = false; - var floor_index = SelectedFilter.floor_guids.findIndex(x => x == floor_guid); + var floor_index = SelectedFilter.floor_guids.findIndex(x => x == floor_tag); if (floor_index > -1) { //已選擇 -> 未選擇 SelectedFilter.floor_guids.splice(floor_index, 1); $(e).removeClass('btn-success').addClass('btn-outline-success'); } else { //未選擇 -> 已選擇 - SelectedFilter.floor_guids.push(floor_guid); + SelectedFilter.floor_guids.push(floor_tag); $(e).removeClass('btn-outline-success').addClass('btn-success'); } is_need_reload = true; ChangeFilterLayer2(); + UpdateDeviceAmount(); @*console.log("SelectedFilter", SelectedFilter);*@ } //#endregion @@ -1039,7 +1047,7 @@ disaster.groupBuildings.forEach(function (building, building_index) { if (building.tag == SelectedFilter.building_tag) { //抓取選擇棟別的底下樓層 building.groupFloors.forEach(function (floor, floor_index) { - if (SelectedFilter.floor_guids.findIndex(x => x == floor.guid) > -1) { //抓取選擇樓層的底下大類 + if (SelectedFilter.floor_guids.findIndex(x => x == floor.name) > -1) { //抓取選擇樓層的底下大類 floor.groupLayer2s.forEach(function (layer2, layer2_index) { if (temp_all_layer2.findIndex(x => x.value == layer2.value) < 0) { temp_all_layer2.push(layer2); @@ -1098,6 +1106,7 @@ is_need_reload = true; ChangeFilterLayer3(); + UpdateDeviceAmount(); @*console.log("SelectedFilter", SelectedFilter);*@ } //#endregion @@ -1118,6 +1127,7 @@ is_need_reload = true; ChangeFilterLayer3(); + UpdateDeviceAmount(); @*console.log("SelectedFilter", SelectedFilter);*@ } //#endregion @@ -1130,7 +1140,7 @@ disaster.groupBuildings.forEach(function (building, building_index) { if (building.tag == SelectedFilter.building_tag) { //抓取選擇棟別的底下樓層 building.groupFloors.forEach(function (floor, floor_index) { - if (SelectedFilter.floor_guids.findIndex(x => x == floor.guid) > -1) { //抓取選擇樓層的底下大類 + if (SelectedFilter.floor_guids.findIndex(x => x == floor.name) > -1) { //抓取選擇樓層的底下大類 floor.groupLayer2s.forEach(function (layer2, layer2_index) { if (SelectedFilter.layer2.findIndex(x => x == layer2.value) > -1) { //抓取選擇大類的底下小類 layer2.groupLayer3s.forEach(function (layer3, layer3_index) { @@ -1203,6 +1213,7 @@ is_need_reload = true; ResetDeviceTable(); + UpdateDeviceAmount(); } //#endregion @@ -1222,6 +1233,7 @@ is_need_reload = true; ResetDeviceTable(); + UpdateDeviceAmount(); } //#endregion @@ -1601,9 +1613,9 @@ var includeli = ""; $.each(rel.data, function (index, val) { if (index == 0) { - includeli += '
  • ' + val.full_name + '
    • '; + includeli += '
  • ' + val.name + '
    • '; } else { - includeli += '
  • ' + val.full_name + '
    • '; + includeli += '
  • ' + val.name + '
    • '; } }); @@ -1666,7 +1678,7 @@ } $('#hbr_' + setting).empty(); - $('#hbr_' + setting).append('

    ' + rel.data.full_name + '

    '); + $('#hbr_' + setting).append('

    ' + rel.data.name + '

    '); $('#tag_' + setting).empty(); $('#tag_' + setting).append(rel.data.set_doing); @@ -1751,7 +1763,6 @@ } function PassVerify(Vbool) { - console.log(SmsMemberTable.data().toArray()) if (ToVerifyType == 0) { if (Vbool) { var url = "api/EmergencyDevice/CheckVerifybool"; @@ -1788,9 +1799,6 @@ $('#list_' + EmerLastsetting).find('.active').children().trigger('click'); $('#emergency-verify-modal').modal('hide'); } - - - } } if (ToVerifyType == 1) { diff --git a/FrontendWebApi/Views/Login/Index.cshtml b/FrontendWebApi/Views/Login/Index.cshtml index 5d90c0c..994097b 100644 --- a/FrontendWebApi/Views/Login/Index.cshtml +++ b/FrontendWebApi/Views/Login/Index.cshtml @@ -78,7 +78,7 @@ async: false, dataType: 'json', success: function (rel) { - window.location = "/Home/Index/"; + window.location = "/EmergencyDeviceMenu"; }, error: function (xhr, textStatus, thrownError) { alert(textStatus); From 27d3edaa0f88dbcfd13ffed9a68771e930a14264 Mon Sep 17 00:00:00 2001 From: dev02 Date: Mon, 22 May 2023 18:12:40 +0800 Subject: [PATCH 2/4] =?UTF-8?q?[=E5=BE=8C=E7=AB=AF]=20=E6=B0=B4=E9=9B=BB?= =?UTF-8?q?=E5=A0=B1=E8=A1=A8=20=E4=BF=AE=E6=94=B9=E5=B9=B4=E5=BA=A6?= =?UTF-8?q?=E5=A0=B1=E8=A1=A8group=20by=20=E5=95=8F=E9=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FrontendWebApi/ApiControllers/HydroMeterController.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/FrontendWebApi/ApiControllers/HydroMeterController.cs b/FrontendWebApi/ApiControllers/HydroMeterController.cs index 3d9dfcf..ba6a116 100644 --- a/FrontendWebApi/ApiControllers/HydroMeterController.cs +++ b/FrontendWebApi/ApiControllers/HydroMeterController.cs @@ -87,6 +87,8 @@ namespace FrontendWebApi.ApiControllers var table = input.tableType == "year" ? "archive_electric_meter_day" : "archive_electric_meter_" + input.tableType; var dateFormat = input.tableType == "day" || input.tableType == "week" ? "%Y-%m-%d" : input.tableType == "month" ? "%Y-%m" : input.tableType == "year" ? "%Y" : null; + var aemmEndDate = input.tableType == "year" ? $"year(DATE_ADD(fd.date, INTERVAL +1 {input.tableType}))" : $"DATE_ADD(fd.date, INTERVAL +1 {input.tableType})"; + var aemmStaDate = input.tableType == "year" ? "year(fd.date)" : "fd.date"; var sql = $@"set @i = -1; select fd.device_number, aemm.avg_rawdata, DATE_FORMAT(fd.date, @dateFormat) as timestamp from ( @@ -111,7 +113,7 @@ namespace FrontendWebApi.ApiControllers from {table} where start_timestamp >= @startTime and end_timestamp < @endTime and point = 'KWH' and SUBSTRING_INDEX(device_number, '_', 1) = @building_tag {sqlWhere} {sqlGroup} - ) aemm on aemm.start_timestamp >= fd.date and aemm.end_timestamp < DATE_ADD(fd.date, INTERVAL +1 {input.tableType}) and aemm.device_number = fd.device_number + ) aemm on aemm.start_timestamp >= {aemmStaDate} and aemm.end_timestamp < {aemmEndDate} and aemm.device_number = fd.device_number order by fd.device_number, fd.date"; var rawData = await backendRepository.GetAllAsync(sql, new { startTime = startTime, endtime = endTime, building_tag = input.building_tag, floor_tag = input.floor_tag, dateFormat = dateFormat }); From bddb4f19f50163704e83cf2a1f52d82a96fd706f Mon Sep 17 00:00:00 2001 From: dev01 Date: Mon, 22 May 2023 18:24:27 +0800 Subject: [PATCH 3/4] =?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 += '
  • ' + val.name + '
    • '; + includeli += '
  • ' + val.full_name + '
    • '; } else { - includeli += '
  • ' + val.name + '
    • '; + includeli += '
  • ' + val.full_name + '
    • '; } }); @@ -1678,7 +1678,7 @@ } $('#hbr_' + setting).empty(); - $('#hbr_' + setting).append('

    ' + rel.data.name + '

    '); + $('#hbr_' + setting).append('

    ' + rel.data.full_name + '

    '); $('#tag_' + setting).empty(); $('#tag_' + setting).append(rel.data.set_doing); From 72b9c77fcd4b48cd7a3dbf7d3462289ab0fdcd9e Mon Sep 17 00:00:00 2001 From: dev01 Date: Tue, 23 May 2023 10:58:08 +0800 Subject: [PATCH 4/4] =?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;