jay.chang/ibms-dome
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FrontednWebApi] 調整昇位圖卡片排序

Browse Source
This commit is contained in:
GiteaAdmin 2023-01-31 13:54:00 +08:00
parent 569deab3f7
commit 4606f1bdc0
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Backend/Controllers/MybaseController.cs
View File

@ -71,7 +71,7 @@ namespace Backend.Controllers
var showview = backendRepository.GetAllAsync<string>($@"select ap.ShowView from userinfo us var showview = backendRepository.GetAllAsync<string>($@"select ap.ShowView from userinfo us
left join role_auth ra on ra.role_guid = us.role_guid left join role_auth ra on ra.role_guid = us.role_guid
left join auth_page ap on ap.AuthCode = ra.AuthCode left join auth_page ap on ap.AuthCode = ra.AuthCode
where us.userinfo_guid = '{myUserInfo.Userinfo_guid}'"); where us.userinfo_guid = '{myUserInfo.Userinfo_guid}' and ap.ShowView is not null");
myUserInfo.ShowView = showview.Result; myUserInfo.ShowView = showview.Result;
ViewBag.myUserInfo = myUserInfo; ViewBag.myUserInfo = myUserInfo;

7
FrontendWebApi/ApiControllers/DeviceManageController.cs
View File

@ -251,7 +251,7 @@ namespace FrontendWebApi.ApiControllers
} }
/// <summary> /// <summary>
/// 設備列表 /// 系統監控內頁 - 設備列表
/// </summary> /// </summary>
/// <param name="fd">floor_tag: null->總覽</param> /// <param name="fd">floor_tag: null->總覽</param>
/// <returns></returns> /// <returns></returns>
@ -270,7 +270,7 @@ namespace FrontendWebApi.ApiControllers
else if (string.IsNullOrEmpty(fd.building_tag)) else if (string.IsNullOrEmpty(fd.building_tag))
{ {
apiResult.Code = "0002"; apiResult.Code = "0002";
apiResult.Msg = "必須選擇東別"; apiResult.Msg = "必須選擇棟別";
return BadRequest(apiResult); return BadRequest(apiResult);
} }
@ -294,7 +294,8 @@ namespace FrontendWebApi.ApiControllers
from device d from device d
left join device_kind dk on d.device_building_tag = dk.device_building_tag and d.device_system_tag = dk.device_system_tag left join device_kind dk on d.device_building_tag = dk.device_building_tag and d.device_system_tag = dk.device_system_tag
and d.device_name_tag = dk.device_name_tag and d.device_name_tag = dk.device_name_tag
where d.deleted = 0 and d.device_name_tag = @sub_system_tag and d.device_building_tag = @building_tag and d.device_floor_tag = @floor_tag"; where d.deleted = 0 and d.device_name_tag = @sub_system_tag and d.device_building_tag = @building_tag and d.device_floor_tag = @floor_tag
order by d.device_number";
var dlParam = new { @sub_system_tag = fd.sub_system_tag, @building_tag = fd.building_tag, @floor_tag = f.full_name }; var dlParam = new { @sub_system_tag = fd.sub_system_tag, @building_tag = fd.building_tag, @floor_tag = f.full_name };
dl = await backendRepository.GetAllAsync<DeviceLists>(sqlString, dlParam); dl = await backendRepository.GetAllAsync<DeviceLists>(sqlString, dlParam);