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

[運維作業] 修改系小類顯示

Browse Source
This commit is contained in:
dev02 2023-02-15 18:54:33 +08:00
parent fbcf4befb0
commit 887fcef66a
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Frontend/_operation.html
View File

@ -443,6 +443,7 @@
pageAct.selSysSub = []; pageAct.selSysSub = [];
pageAct.selSysMain = []; pageAct.selSysMain = [];
pageAct.imageFile = []; pageAct.imageFile = [];
let pageInit = true;
sysList(); sysList();
@ -508,6 +509,11 @@
initDate(); initDate();
event(); event();
$('div.image-full-show').css("display", "none"); $('div.image-full-show').css("display", "none");
if (pageInit) {
$("#selAllSys").click();
pageInit = false;
}
}); });
function loadOpeFirmTable() { function loadOpeFirmTable() {

10
FrontendWebApi/ApiControllers/OperationController.cs
View File

@ -808,10 +808,7 @@ namespace FrontendWebApi.ApiControllers
sWhere += $@" and ofi.device_system_category_layer2 in @main_system_tag"; sWhere += $@" and ofi.device_system_category_layer2 in @main_system_tag";
} }
if (ofl.sub_system_tag != null)
{
sWhere += $@" and ofi.device_system_category_layer3 in @sub_system_tag"; sWhere += $@" and ofi.device_system_category_layer3 in @sub_system_tag";
}
var sqlString = @$"select ofi.*, v2.system_key var sqlString = @$"select ofi.*, v2.system_key
from operation_firm ofi from operation_firm ofi
@ -1058,17 +1055,14 @@ namespace FrontendWebApi.ApiControllers
if (ofl.main_system_tag != null) if (ofl.main_system_tag != null)
{ {
sWhere += $@" and opr.device_system_category_layer2 in @main_system_tag"; sWhere += $@" and opr.device_system_category_layer2 in @main_system_tag";
}
}
if (ofl.sub_system_tag != null)
{
sWhere += $@" and opr.device_system_category_layer3 in @sub_system_tag";
}
if (ofl.serial_number != null) if (ofl.serial_number != null)
{ {
sWhere += $@" and opr.formId like '%{ofl.serial_number}%'"; sWhere += $@" and opr.formId like '%{ofl.serial_number}%'";
} }
sWhere += $@" and opr.device_system_category_layer3 in @sub_system_tag";
var sqlString = $@"select opr.* , concat(d.device_floor_tag, ' ', d.full_name) as device_name, ui.full_name as user_full_name var sqlString = $@"select opr.* , concat(d.device_floor_tag, ' ', d.full_name) as device_name, ui.full_name as user_full_name
from operation_record opr from operation_record opr
left join device d on opr.fix_do_code = d.device_number and d.deleted = 0 and d.device_area_tag = SUBSTRING_INDEX(opr.fix_do_code, '_', 1) left join device d on opr.fix_do_code = d.device_number and d.deleted = 0 and d.device_area_tag = SUBSTRING_INDEX(opr.fix_do_code, '_', 1)