-
-
報表管理
+
+
+
報表管理
-
- (
- @$"select distinct build.full_name as building_name, d.device_building_tag, v1.system_key main_name, v1.system_value main_system_tag, v2.system_key sub_name,
+ @$"select distinct build.full_name as building_name, build.priority as buildPriority, d.device_building_tag, v1.system_key main_name, v1.system_value main_system_tag, v2.system_key sub_name,
v2.system_value sub_system_tag, v1.system_priority, v2.system_priority,
dk.device_normal_color, dk.device_close_color, dk.device_error_color,dk.device_normal_flashing, dk.device_close_flashing, dk.device_error_flashing,
dk.device_normal_text, dk.device_close_text, dk.device_error_text,dk.device_normal_point_name, dk.device_close_point_name, dk.device_error_point_name,
@@ -176,7 +176,7 @@ namespace FrontendWebApi.ApiControllers
select distinct main_system_tag, sub_system_tag from building_menu where is_link = 1
) as bm on v2.system_value = bm.sub_system_tag and v1.system_value = bm.main_system_tag
where c.account = @account
- order by v2.system_priority", new { @account = "webUser", @sub_system_type = sub_system_type, @main_system_type = main_system_type });
+ order by build.priority, v2.system_priority", new { @account = myUser.account, @sub_system_type = sub_system_type, @main_system_type = main_system_type });
var building = dbsub.GroupBy(x => x.device_building_tag).ToList();
apiResult.Data = new List();
diff --git a/FrontendWebApi/ApiControllers/HydroMeterController.cs b/FrontendWebApi/ApiControllers/HydroMeterController.cs
index bbb1cc2..c9ffeef 100644
--- a/FrontendWebApi/ApiControllers/HydroMeterController.cs
+++ b/FrontendWebApi/ApiControllers/HydroMeterController.cs
@@ -13,6 +13,7 @@ using System.IO;
using System.Linq;
using System.Threading.Tasks;
using Ionic.Zip;
+using System.Collections.Immutable;
namespace FrontendWebApi.ApiControllers
{
@@ -408,13 +409,13 @@ namespace FrontendWebApi.ApiControllers
[Route("api/ExportElectricList")]
public FileResult OpeExportExcelElec([FromBody] HydroMeterInput input)
{
- input = new HydroMeterInput();
- input.building_tag = "G6";
- input.floor_tag = new List();
- input.startTime = "2023-06";
- input.tableType = "day";
-
- var result = this.ElectricList(input).Result.Value.Data.ToList();
+ List
-
-
-
-
-
-
-
-
diff --git a/FrontendWebApi/ApiControllers/DeviceManageController.cs b/FrontendWebApi/ApiControllers/DeviceManageController.cs
index a620bc3..46d5154 100644
--- a/FrontendWebApi/ApiControllers/DeviceManageController.cs
+++ b/FrontendWebApi/ApiControllers/DeviceManageController.cs
@@ -156,7 +156,7 @@ namespace FrontendWebApi.ApiControllers
try
{
var dbsub = await frontendRepository.GetAllAsync
-
-
-
-
- 費每度單價
-
-
-
-
- 選擇單一月份
-
-
-
-
-
- > result = new List
- >();
+ var building = backendRepository.GetAllAsync
- > result1 = new List
- >();
+ List
- > result2 = new List
- >();
+ List