tsanie/fleet-contractor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Chen Lily
2023-05-30 17:34:56 +08:00
parent e728c66786
commit 9da1c4cf30
194 changed files with 10680 additions and 9060 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
Site/Security/js/adduser.js
View File

@@ -12,7 +12,7 @@ $(function () {
dialogAUAssets.allowhidden = false;
dialogAUAssets.allowotherfilter = false;
dialogAUAssets.onDialogClosed = function () {
showbg(false);//showmaskbg被FIC里面的覆盖，使用FIC中的showbg
showmaskbg1(false);//showmaskbg被FIC里面的覆盖，使用FIC中的showmaskbg1
};
dialogAUAssets.onOK = function (source) {
var items = [];
@@ -32,19 +32,19 @@ $(function () {
}
}
grid_dtassets.setData(grid_dtassets.innerSource.concat(items));
showbg(false);
showmaskbg1(false);
};
$('#dialog_assetgroup').prop('iframe', true).dialog(function () {
showbg(false);
showmaskbg1(false);
});
$('#dialog_jobsite').prop('iframe', true).dialog(function () {
showbg(false);
showmaskbg1(false);
});
$('#dialog_assettype').prop('iframe', true).dialog(function () {
showbg(false);
showmaskbg1(false);
});
$("#txt_assetgroup_key").keypress(onAssetGroupKeyPress);
@@ -91,7 +91,7 @@ function InitGridSelectedMachines() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@@ -160,12 +160,11 @@ function OnAssetAdd() {
}
function OnAssetAdd1() {
showbg(true);
showmaskbg1(true);
dialogAUAssets.exceptSource = grid_dtassets.innerSource.map(function (s) {
return s.Values.ID;
});
dialogAUAssets.showSelector();
$('#mask_bg').css('height', '100%');
}
function OnMachineDelete() {
@@ -225,7 +224,7 @@ function InitGridSelectedMachineGroups() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@@ -289,7 +288,7 @@ function InitGridAvailableMachineGroups() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@@ -408,7 +407,7 @@ function OnAssetGroupAdd() {
function OnAssetGroupAdd1() {
$('#txt_assetgroup_key').val('');
$('#dialog_assetgroup .dialog-title span.title').text(GetTextByKey("P_UM_SELECTASSETGROUPS", 'Select Asset Groups'));
$('#mask_bg').show();
showmaskbg1(true);
$('#dialog_assetgroup')
.attr('act', 'edit')
.css({
@@ -431,7 +430,7 @@ function OnSetSelectAssetGroups() {
}
showSelectedMachineGroup(_selectedAssetGroups);
$('#dialog_assetgroup').hideDialog();
$('#mask_bg').hide();
showmaskbg1(false);
}
function OnAssetGroupDelete() {
@@ -474,7 +473,7 @@ function InitGridSelectedJobsites() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@@ -539,7 +538,7 @@ function InitGridAvailableJobsites() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@@ -665,7 +664,7 @@ function OnJobsiteAdd() {
function OnJobsiteAdd1() {
$('#txt_jobsite_key').val('');
$('#dialog_jobsite .dialog-title span.title').text(GetTextByKey("P_UM_SELECTJOBSITES", 'Select Jobsites'));
$('#mask_bg').show();
showmaskbg1(true);
$('#dialog_jobsite')
.attr('act', 'edit')
.css({
@@ -687,7 +686,7 @@ function OnSetSelectJobSites() {
}
showSelectedJobsite(_selectedJobsites);
$('#dialog_jobsite').hideDialog();
$('#mask_bg').hide();
showmaskbg1(false);
}
function OnJobsiteDelete() {
@@ -732,7 +731,7 @@ function InitGridSelectedAssetTypes() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@@ -797,7 +796,7 @@ function InitGridAvailableAssetTypes() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@@ -923,7 +922,7 @@ function OnAssetTypeAdd() {
function OnAssetTypeAdd1() {
$('#txt_assettype_key').val('');
$('#dialog_assettype .dialog-title span.title').text(GetTextByKey("P_UM_SELECTASSETTYPES", 'Select Asset Types'));
$('#mask_bg').show();
showmaskbg1(true);
$('#dialog_assettype')
.attr('act', 'edit')
.css({
@@ -945,7 +944,7 @@ function OnSetSelectAssetTypes() {
}
showSelectedAssetType(_selectedAssetTypes);
$('#dialog_assettype').hideDialog();
$('#mask_bg').hide();
showmaskbg1(false);
}
function OnAssetTypeDelete() {

49
Site/Security/js/userfilter.js
View File

@@ -13,7 +13,7 @@ $(function () {
dialogFUAssets.allowotherfilter = false;
dialogFUAssets.uid = uid;
dialogFUAssets.onDialogClosed = function () {
showbg(false);//showmaskbg被FIC里面的覆盖，使用FIC中的showbg
showmaskbg1(false);//showmaskbg被FIC里面的覆盖，使用showmaskbg1
};
dialogFUAssets.onOK = function (source) {
var items = [];
@@ -58,23 +58,23 @@ $(function () {
}
grid_dtfilterassets.setData(grid_dtfilterassets.innerSource.concat(items));
showbg(false);
showmaskbg1(false);
};
$('#dialog_filterassetgroup').prop('iframe', true).dialog(function () {
showbg(false);
showmaskbg1(false);
});
$('#dialog_filterjobsite').prop('iframe', true).dialog(function () {
showbg(false);
showmaskbg1(false);
});
$('#dialog_filterassettype').prop('iframe', true).dialog(function () {
showbg(false);
showmaskbg1(false);
});
$('#dialog_filtertemplate').prop('iframe', true).dialog(function () {
showbg(false);
showmaskbg1(false);
});
$("#sel_filtertemplate").change(function () {
@@ -121,7 +121,7 @@ function InitGridFilterSelectedAssets() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@@ -173,13 +173,12 @@ function OnFilterAssetAdd() {
if (!filterid)
return;
showbg(true);
showmaskbg1(true);
dialogFUAssets.uid = uid;
dialogFUAssets.exceptSource = grid_dtfilterassets.innerSource.map(function (s) {
return s.Values.ID;
return s.Values.ID || s.Values.Id;
});
dialogFUAssets.showSelector();
$('#mask_bg').css('height', '100%');
}
function OnFilterMachineDelete() {
@@ -228,7 +227,7 @@ function InitGridFilterSelectedAssetGroups() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@@ -292,7 +291,7 @@ function InitGridFilterAvailableAssetGroups() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@@ -398,7 +397,7 @@ function OnFilterAssetGroupAdd() {
return;
$('#txt_filterassetgroup_key').val('');
$('#dialog_filterassetgroup .dialog-title span.title').text(GetTextByKey("P_UM_SELECTASSETGROUPS", 'Select Asset Groups'));
$('#mask_bg').show();
showmaskbg1(true);
$('#dialog_filterassetgroup')
.attr('act', 'edit')
.css({
@@ -434,7 +433,7 @@ function OnSetFilterSelectAssetGroups() {
showFilterSelectedAssetGroup(assetgroups);
$('#dialog_filterassetgroup').hideDialog();
$('#mask_bg').hide();
showmaskbg1(false);
}
function OnFilterAssetGroupDelete() {
@@ -482,7 +481,7 @@ function InitGridFilterSelectedJobsites() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@@ -547,7 +546,7 @@ function InitGridFilterAvailableJobsites() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@@ -656,7 +655,7 @@ function OnFilterJobsiteAdd() {
$('#txt_filterjobsite_key').val('');
$('#dialog_filterjobsite .dialog-title span.title').text(GetTextByKey("P_UM_SELECTJOBSITES", 'Select Jobsites'));
$('#mask_bg').show();
showmaskbg1(true);
$('#dialog_filterjobsite')
.attr('act', 'edit')
.css({
@@ -692,7 +691,7 @@ function OnSetFilterSelectJobSites() {
showFilterSelectedJobsite(jobsites);
$('#dialog_filterjobsite').hideDialog();
$('#mask_bg').hide();
showmaskbg1(false);
}
function OnFilterJobsiteDelete() {
@@ -742,7 +741,7 @@ function InitGridFilterSelectedAssetTypes() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@@ -807,7 +806,7 @@ function InitGridFilterAvailableAssetTypes() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@@ -917,7 +916,7 @@ function OnFilterAssetTypeAdd() {
$('#txt_filterassettype_key').val('');
$('#dialog_filterassettype .dialog-title span.title').text(GetTextByKey("P_UM_SELECTASSETTYPES", 'Select Asset Types'));
$('#mask_bg').show();
showmaskbg1(true);
$('#dialog_filterassettype')
.attr('act', 'edit')
.css({
@@ -954,7 +953,7 @@ function OnSetFilterSelectAssetTypes() {
showFilterSelectedAssetType(assettypes);
$('#dialog_filterassettype').hideDialog();
$('#mask_bg').hide();
showmaskbg1(false);
}
function OnFilterAssetTypeDelete() {
@@ -1069,7 +1068,7 @@ function OnAddFilterTemplate() {
tile = GetTextByKey('P_XXXX', 'Copy Filter Template');
$('#dialog_filtertemplate .dialog-title span.title').text(tile);
$('#mask_bg').show();
showmaskbg1(true);
$('#dialog_filtertemplate')
.attr('act', 'add')
.css({
@@ -1084,7 +1083,7 @@ function OnEditFilterTemplate() {
$('#dialog_filtertemplatename').val('');
$('#dialog_filtertemplate .dialog-title span.title').text(GetTextByKey('P_XXXX', 'Edit Filter Template'));
var tempname = $('#sel_filtertemplate').find("option:selected").text();
$('#mask_bg').show();
showmaskbg1(true);
$('#dialog_filtertemplate')
.attr('act', 'edit')
.css({
@@ -1129,7 +1128,7 @@ function OnSetFilterTemplate() {
}
$('#dialog_filtertemplate').hideDialog();
$('#mask_bg').hide();
showmaskbg1(false);
}

2
Site/Security/js/usermanage.js
View File

@@ -359,7 +359,7 @@ function InitGridSelectedMachines() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,