This commit is contained in:
2023-05-30 17:34:56 +08:00
parent e728c66786
commit 9da1c4cf30
194 changed files with 10680 additions and 9060 deletions

View File

@@ -49,7 +49,7 @@
// checkbox
name: 'check',
key: 'Selected',
width: 40,
width: 45,
align: 'center',
sortable: false,
allcheck: true,
@@ -125,53 +125,57 @@
allowFilter: true,
styleFilter: styleFilter,
bgFilter: bgFilter
},
{
key: 'AcquisitionType',
caption: GetTextByKey("P_MA_ACQUISITIONTYPE", "Acquisition Type"),
width: 120,
allowFilter: true,
styleFilter: styleFilter,
bgFilter: bgFilter
},
{
key: 'AssetGroups',
caption: GetTextByKey("P_JS_ASSETGROUP", "Asset Group"),
width: 160,
allowFilter: false,
styleFilter: styleFilter,
bgFilter: bgFilter,
filter: function (item) {
if (item.AssetGroups)
return item.AssetGroups.join(", ");
else
return "";
}
},
{
key: 'Jobsites',
caption: GetTextByKey("P_JOBSITE", "Jobsite"),
width: 160,
allowFilter: false,
styleFilter: styleFilter,
bgFilter: bgFilter,
filter: function (item) {
if (item.Jobsites && item.Jobsites.length > 0) {
var r = "";
for (var i = 0; i < item.Jobsites.length; i++) {
r += item.Jobsites[i].Key;
if (item.Jobsites[i].Value && item.Jobsites[i].Value != "")
r += "(" + item.Jobsites[i].Value + ")";
r += ", ";
}
r = r.substring(0, r.length - 2);
return r;
}
else
return "";
}
}
);
if (this.jobsiteId == null) {
columns.push(
{
key: 'AcquisitionType',
caption: GetTextByKey("P_MA_ACQUISITIONTYPE", "Acquisition Type"),
width: 120,
allowFilter: true,
styleFilter: styleFilter,
bgFilter: bgFilter
},
{
key: 'AssetGroups',
caption: GetTextByKey("P_JS_ASSETGROUP", "Asset Group"),
width: 160,
allowFilter: false,
styleFilter: styleFilter,
bgFilter: bgFilter,
filter: function (item) {
if (item.AssetGroups)
return item.AssetGroups.join(", ");
else
return "";
}
},
{
key: 'Jobsites',
caption: GetTextByKey("P_JOBSITE", "Jobsite"),
width: 160,
allowFilter: false,
styleFilter: styleFilter,
bgFilter: bgFilter,
filter: function (item) {
if (item.Jobsites && item.Jobsites.length > 0) {
var r = "";
for (var i = 0; i < item.Jobsites.length; i++) {
r += item.Jobsites[i].Key;
if (item.Jobsites[i].Value && item.Jobsites[i].Value != "")
r += "(" + item.Jobsites[i].Value + ")";
r += ", ";
}
r = r.substring(0, r.length - 2);
return r;
}
else
return "";
}
}
);
}
//grid.canMultiSelect = true;
grid.columns = columns;
grid.init();
@@ -233,11 +237,11 @@
this.machineList = $('<div style="width: 1188px; height: 400px; margin: 10px 0 4px"></div>').appendTo(content);
var dialogFunction = $('<div class="dialog-func"></div>').appendTo(dialog);
$('<input type="button" value="' + GetTextByKey("P_SELECTASSETS_CANCEL", "Cancel") + '" class="dialog-close" />').appendTo(dialogFunction).css("height", 26);//height与Workspace.css冲突
$('<input type="button" value="' + GetTextByKey("P_SELECTASSETS_CANCEL", "Cancel") + '" class="dialog-close" />').appendTo(dialogFunction).css("height", "unset");//height与Workspace.css冲突
$('<input type="button" value="' + GetTextByKey("P_SELECTASSETS_OK", "OK") + '" />').click(onOKClick.bind(this)).appendTo(dialogFunction);
$('<div class="clear"></div>').appendTo(dialogFunction);
$('<div class="maskbg" style="display: none"><div class="loading_icon icon c-spin"></div></div>').appendTo(dialog);
$('<div class="maskbg" style="display: none"><div class="loading_icon c-spin"></div></div>').appendTo(dialog);
// init
initMachinesGrid.call(this, this.machineList);
@@ -263,10 +267,10 @@
if (this.jobsiteId == null && this.allowhidden) {
this.showHidden.prop('checked', false);
}
dialog.attr('init', '1').showDialog().css({
dialog.attr('init', '1').css({
'top': (document.documentElement.clientHeight - $('#dialog_machines').height()) / (topRatio || 3),
'left': (document.documentElement.clientWidth - $('#dialog_machines').width()) / 2
});
}).showDialogfixed();
this.gridAssets.setData([]);
onSearch.call(this);
};