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

8
Site/SystemSettings/AssetAertFilter.aspx
View File

@ -318,7 +318,7 @@
<div id="availablefilterassetgrouplist" style="height: 400px; width: 630px; margin: 10px 0 4px;"></div>
</div>
<div class="dialog-func">
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: 26px;" />
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: unset;" />
<input type="button" onclick="OnSetFilterSelectAssetGroups();" value="OK" data-lgid="P_UM_OK" tabindex="17" />
<div class="clear"></div>
</div>
@ -336,7 +336,7 @@
<div id="filteravailablejobsitelist" style="height: 400px; width: 630px; margin: 10px 0 4px;"></div>
</div>
<div class="dialog-func">
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: 26px;" />
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: unset;" />
<input type="button" onclick="OnSetFilterSelectJobSites();" value="OK" data-lgid="P_UM_OK" tabindex="17" />
</div>
<div class="maskbg" style="display: none;"></div>
@ -353,7 +353,7 @@
<div id="filteravailableassettypelist" style="height: 400px; width: 630px; margin: 10px 0 4px;"></div>
</div>
<div class="dialog-func">
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: 26px;" />
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: unset;" />
<input type="button" onclick="OnSetFilterSelectAssetTypes();" value="OK" data-lgid="P_UM_OK" tabindex="17" />
</div>
<div class="maskbg" style="display: none;"></div>
@ -371,7 +371,7 @@
</table>
</div>
<div class="dialog-func">
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: 26px;" />
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: unset;" />
<input type="button" onclick="OnSetFilterTemplate();" value="OK" data-lgid="P_UM_OK" tabindex="17" />
</div>
<div class="maskbg" style="display: none;"></div>

2
Site/SystemSettings/ManageDepartments.aspx
View File

@ -373,7 +373,7 @@
<tr>
<td class="label" data-lgid="P_SET_NOTES_COLON">Notes:</td>
<td>
<textarea id="dialog_notes" class="inputbox" maxlength="1000" tabindex="1" style="width: 320px;"></textarea></td>
<textarea id="dialog_notes" maxlength="1000" tabindex="1" style="width: 320px;"></textarea></td>
</tr>
</table>
</div>

6
Site/SystemSettings/ManageLocations.aspx
View File

@ -508,6 +508,7 @@
$('#dialog_selectlocation').dialog(function () {
if (!$("#dialog_location").is(":visible"))
showmaskbg(false);
$('#dialog_location').find('.maskbg').hide();
});
$('#searchinputtxt').keydown(searchEnter);
@ -557,6 +558,7 @@
$('#dialog_selectlocation .dialog-title span.title').text(GetTextByKey("P_SET_SELECTLOCATION", "Select Location"));
showmaskbg(true);
$('#dialog_location').find('.maskbg').show();
d.css({
'top': (document.documentElement.clientHeight - d.height()) / 3,
'left': (document.documentElement.clientWidth - d.width()) / 2
@ -595,6 +597,7 @@
function OnSelectLocationOK() {
$('#dialog_selectlocation').hideDialog();
$('#dialog_location').find('.maskbg').hide();
var loc = mapctrl.getLocation();
if (locationdata) {
locationdata.Latitude = loc[0];
@ -763,7 +766,7 @@
<tr>
<td class="label" data-lgid="P_SET_NOTES_COLON">Notes:</td>
<td colspan="2">
<textarea id="dialog_notes" class="inputbox" maxlength="1000" tabindex="6" style="width: 320px;"></textarea></td>
<textarea id="dialog_notes" maxlength="1000" tabindex="6" style="width: 320px;"></textarea></td>
</tr>
</table>
</div>
@ -772,6 +775,7 @@
<input type="button" onclick="OnDialogOK();" value="OK" data-lgid="P_SET_OK" tabindex="7" />
<div class="clear"></div>
</div>
<div class="maskbg" style="display: none;"></div>
</div>
<div class="dialog" id="dialog_selectlocation" style="display: none;">

2
Site/SystemSettings/ManageRegions.aspx
View File

@ -413,7 +413,7 @@
<tr>
<td class="label" data-lgid="P_SET_NOTES_COLON">Notes:</td>
<td>
<textarea id="dialog_notes" class="inputbox" maxlength="1000" tabindex="1" style="width: 320px;"></textarea></td>
<textarea id="dialog_notes" maxlength="1000" tabindex="1" style="width: 320px;"></textarea></td>
</tr>
</table>
</div>

2
Site/SystemSettings/SettingColors.aspx
View File

@ -304,7 +304,7 @@
IsDefault: $('#isdefault').is(':checked'),
UIStyleID: $('#styleID').text() == "" ? -1 : parseInt($('#styleID').text()),
UIStyleName: encodeURIComponent($.trim($('#stylename_input').val()))
UIStyleName: htmlencode($.trim($('#stylename_input').val()))
};
if (!iscolorStr(styledata.ChartTitleBackgroundColor)) {

2
Site/SystemSettings/SystemParams.aspx
View File

@ -159,7 +159,7 @@
<table>
<tr>
<td>
<textarea id="dialog_paramvalue" class="inputbox" tabindex="1" style="width: 475px; height: 200px;"></textarea></td>
<textarea id="dialog_paramvalue" tabindex="1" style="width: 475px; height: 200px;"></textarea></td>
</tr>
</table>
</div>

26
Site/SystemSettings/UserOptions.aspx
View File

@ -195,6 +195,22 @@
var uid = '<%=IID%>';
var IsSupperAdmin =<%=IsSupperAdmin ?"true":"false"%>;
function showmaskbg1(flag, noanimation) {
if (window.parent && typeof window.parent.onmaskbg == 'function') {
window.parent.onmaskbg(flag, noanimation);
}
$('#mask_bg').children().hide();
if (noanimation) {
$('#mask_bg').css('display', flag ? '' : 'none');
} else {
if (flag) {
$('#mask_bg').fadeIn(100);
} else {
$('#mask_bg').fadeOut(100);
}
}
}
function requestFIC(service, method, param, callback, error) {
$.ajax({
url: _network.root + 'fic/fic/FICSvc.ashx?fmt=json&SN=' + Math.random(),
@ -508,7 +524,7 @@
<div id="tab_filter" data-page="tab_filter" style="display: none;">
<div style="margin: 9px 6px 20px">
<span class="title" data-lgid="P_XXXX">Filter Templates:</span>
<select id="sel_filtertemplate" style="width: 300px;"></select>
<select id="sel_filtertemplate" style="width: 300px; height: 20px;"></select>
<span class="sbutton iconadd" onclick="onOpenFilterTemplate(0);" data-lgid="P_UM_ADD"></span>
<span class="sbutton iconedit" onclick="onOpenFilterTemplate(1);" data-lgid="P_UM_EDIT"></span>
<span class="sbutton iconcopy" onclick="onOpenFilterTemplate(2);" data-lgid="P_IPT_COPY"></span>
@ -571,7 +587,7 @@
<div id="availablefilterassetgrouplist" style="height: 400px; width: 630px; margin: 10px 0 4px;"></div>
</div>
<div class="dialog-func">
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: 26px;" />
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: unset;" />
<input type="button" onclick="OnSetFilterSelectAssetGroups();" value="OK" data-lgid="P_UM_OK" tabindex="17" />
<div class="clear"></div>
</div>
@ -589,7 +605,7 @@
<div id="filteravailablejobsitelist" style="height: 400px; width: 630px; margin: 10px 0 4px;"></div>
</div>
<div class="dialog-func">
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: 26px;" />
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: unset;" />
<input type="button" onclick="OnSetFilterSelectJobSites();" value="OK" data-lgid="P_UM_OK" tabindex="17" />
</div>
<div class="maskbg" style="display: none;"></div>
@ -606,7 +622,7 @@
<div id="filteravailableassettypelist" style="height: 400px; width: 630px; margin: 10px 0 4px;"></div>
</div>
<div class="dialog-func">
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: 26px;" />
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: unset;" />
<input type="button" onclick="OnSetFilterSelectAssetTypes();" value="OK" data-lgid="P_UM_OK" tabindex="17" />
</div>
<div class="maskbg" style="display: none;"></div>
@ -624,7 +640,7 @@
</table>
</div>
<div class="dialog-func">
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: 26px;" />
<input type="button" value="Cancel" data-lgid="P_UM_CANCEL" class="dialog-close" tabindex="18" style="height: unset;" />
<input type="button" onclick="OnSetFilterTemplate();" value="OK" data-lgid="P_UM_OK" tabindex="17" />
</div>
<div class="maskbg" style="display: none;"></div>

57
Site/SystemSettings/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);
};
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 () {
@ -117,7 +117,7 @@ function InitGridFilterSelectedAssets() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -169,12 +169,11 @@ function OnFilterAssetAdd() {
if (!filterid)
return;
showbg(true);
showmaskbg1(true);
dialogFUAssets.exceptSource = grid_dtfilterassets.innerSource.map(function (s) {
return s.Values.ID;
});
dialogFUAssets.showSelector();
$('#mask_bg').css('height', '100%');
}
function OnFilterMachineDelete() {
@ -223,7 +222,7 @@ function InitGridFilterSelectedAssetGroups() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -287,7 +286,7 @@ function InitGridFilterAvailableAssetGroups() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -392,14 +391,14 @@ 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({
'top': (document.documentElement.clientHeight - $('#dialog_filterassetgroup').height()) / 3,
'left': (document.documentElement.clientWidth - $('#dialog_filterassetgroup').width()) / 2
})
.showDialog();
.showDialogfixed();
GetFilerAssetGroupList();
}
@ -428,7 +427,7 @@ function OnSetFilterSelectAssetGroups() {
showFilterSelectedAssetGroup(assetgroups);
$('#dialog_filterassetgroup').hideDialog();
$('#mask_bg').hide();
showmaskbg1(false);
}
function OnFilterAssetGroupDelete() {
@ -476,7 +475,7 @@ function InitGridFilterSelectedJobsites() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -541,7 +540,7 @@ function InitGridFilterAvailableJobsites() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -649,14 +648,14 @@ 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({
'top': (document.documentElement.clientHeight - $('#dialog_filterjobsite').height()) / 3,
'left': (document.documentElement.clientWidth - $('#dialog_filterjobsite').width()) / 2
})
.showDialog();
.showDialogfixed();
GetFilterJobsiteList();
}
@ -685,7 +684,7 @@ function OnSetFilterSelectJobSites() {
showFilterSelectedJobsite(jobsites);
$('#dialog_filterjobsite').hideDialog();
$('#mask_bg').hide();
showmaskbg1(false);
}
function OnFilterJobsiteDelete() {
@ -735,7 +734,7 @@ function InitGridFilterSelectedAssetTypes() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -800,7 +799,7 @@ function InitGridFilterAvailableAssetTypes() {
// checkbox
name: 'check',
key: 'selected',
width: 30,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@ -909,14 +908,14 @@ 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({
'top': (document.documentElement.clientHeight - $('#dialog_filterassettype').height()) / 3,
'left': (document.documentElement.clientWidth - $('#dialog_filterassettype').width()) / 2
})
.showDialog();
.showDialogfixed();
GetFilterAssetTypeList();
}
@ -946,7 +945,7 @@ function OnSetFilterSelectAssetTypes() {
showFilterSelectedAssetType(assettypes);
$('#dialog_filterassettype').hideDialog();
$('#mask_bg').hide();
showmaskbg1(false);
}
function OnFilterAssetTypeDelete() {
@ -1058,14 +1057,14 @@ 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({
'top': (document.documentElement.clientHeight - $('#dialog_filtertemplate').height()) / 3,
'left': (document.documentElement.clientWidth - $('#dialog_filtertemplate').width()) / 2
})
.showDialog();
.showDialogfixed();
$('#dialog_filtertemplatename').focus();
}
@ -1073,14 +1072,14 @@ 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({
'top': (document.documentElement.clientHeight - $('#dialog_filtertemplate').height()) / 3,
'left': (document.documentElement.clientWidth - $('#dialog_filtertemplate').width()) / 2
})
.showDialog();
.showDialogfixed();
$('#dialog_filtertemplatename').val(tempname).focus();
}
@ -1118,7 +1117,7 @@ function OnSetFilterTemplate() {
}
$('#dialog_filtertemplate').hideDialog();
$('#mask_bg').hide();
showmaskbg1(false);
}