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

77
Site/MachineDeviceManagement/js/adj_enginehours.js
View File

@ -229,18 +229,18 @@ function InitEnginehoursHisGridData() {
}
function getEnineHours() {
showLoading();
showsubloading("adjustenginehoursmask", true);
grid_enginehoursdt.setData([]);
devicerequest("GetAssetCurrentEngineHours", contractorid + String.fromCharCode(170) + machineid, function (data) {
hideLoading();
showsubloading("adjustenginehoursmask", false);
if (typeof (data) === "string") {
showAlert(data, GetTextByKey("P_MA_ERROR", 'Error'));
return;
}
ShowEngineHours(data);
}, function (err) {
hideLoading();
showsubloading("adjustenginehoursmask", false);
});
}
@ -248,7 +248,7 @@ function getEnineHours() {
function getEngineHoursHis() {
grid_enginehoursmostrecentdt.setData([]);
grid_enginehourshisdt.setData([]);
showLoading();
showsubloading("adjustenginehoursmask", true);
var methodname = "GetCalampEngineHoursHistory";
if (isPedigreeEH)
methodname = "GetPedigreeEngineHoursHistory";
@ -256,7 +256,7 @@ function getEngineHoursHis() {
methodname = "GetOEMDD2EngineHoursHistory";
devicerequest(methodname, contractorid + String.fromCharCode(170) + machineid, function (data) {
hideLoading();
showsubloading("adjustenginehoursmask", false);
if (typeof (data) === "string") {
showAlert(data, GetTextByKey("P_MA_ERROR", 'Error'));
return;
@ -264,7 +264,7 @@ function getEngineHoursHis() {
//ShowEngineHoursHis(data);
ShowMostRecentEngineHours(data);
}, function (err) {
hideLoading();
showsubloading("adjustenginehoursmask", false);
});
}
@ -282,27 +282,23 @@ function getEngineHoursHisPreview() {
if (item.EngineHours !== "") {
if (isNaN(item.EngineHours)) {
showAlert(GetTextByKey("P_MA_FORMATERROR", '{0} format error.').replace('{0}', enginehourstxt), alerttitle);
$('#adjustenginehoursmask').hide();
return;
}
else {
if (item.EngineHours <= 0) {
showAlert(GetTextByKey("P_MA_MUSTBEGREATERTHAN0", '{0} must be greater than 0.').replace('{0}', enginehourstxt), alerttitle);
$('#adjustenginehoursmask').hide();
return;
}
}
}
else {
showAlert(GetTextByKey("P_MA_NOTBEEMPTY", '{0} cannot be empty.').replace('{0}', enginehourstxt), alerttitle);
$('#adjustenginehoursmask').hide();
return;
}
if (item.EngineHoursDate === "") {
showAlert(GetTextByKey("P_MA_NOTBEEMPTY", '{0} cannot be empty.').replace('{0}', enginehourstxt), alerttitle);
$('#adjustenginehoursmask').hide();
return;
}
var offset = $('#dialogadjust_enginehourstimezone').find("option:selected").attr("offset");
@ -319,7 +315,7 @@ function getEngineHoursHisPreview() {
function GetCalampEngineHoursHistoryPreview(item) {
grid_enginehourshisdt.setData([]);
showLoading();
showsubloading("adjustenginehoursmask", true);
var param = JSON.stringify(item);
param = htmlencode(param);
@ -329,7 +325,7 @@ function GetCalampEngineHoursHistoryPreview(item) {
if (isOEMDD2EH)
methodname = "GetOEMDD2EngineHoursHistoryPreview";
devicerequest(methodname, param, function (data) {
hideLoading();
showsubloading("adjustenginehoursmask", false);
if (typeof (data) === "string") {
showAlert(data, GetTextByKey("P_MA_ERROR", 'Error'));
return;
@ -337,7 +333,7 @@ function GetCalampEngineHoursHistoryPreview(item) {
ShowEngineHoursHis(data);
ShowMostRecentEngineHoursPreview(data);
}, function (err) {
hideLoading();
showsubloading("adjustenginehoursmask", false);
});
}
@ -461,11 +457,11 @@ function openAdjustEngineHours() {
function OnAdjustEngineHours() {
$('#adjustenginehoursmask').show();
showsubmask("adjustenginehoursmask", true);
var alerttitle = GetTextByKey("P_MA_ADJUSTENGINEHOURS", 'Adjust Engine Hours');
var enginehourstxt = GetTextByKey("P_MA_ENGINEHOURS", "Engine Hours");
showConfirm('Do you want to adjust the engine hours?', alerttitle, function () {
$('#adjustodomask').hide();
showConfirm1('Do you want to adjust the engine hours?', alerttitle, function () {
showsubmask("adjustenginehoursmask", false);
var item = {
'CustomerID': contractorid,
'AssetID': machineid,
@ -478,26 +474,26 @@ function OnAdjustEngineHours() {
if (item.EngineHours !== "") {
if (isNaN(item.EngineHours)) {
showAlert(GetTextByKey("P_MA_FORMATERROR", '{0} format error.').replace('{0}', enginehourstxt), alerttitle);
$('#adjustenginehoursmask').hide();
showsubmask("adjustenginehoursmask", false);
return;
}
else {
if (item.EngineHours <= 0) {
showAlert(GetTextByKey("P_MA_MUSTBEGREATERTHAN0", '{0} must be greater than 0.').replace('{0}', enginehourstxt), alerttitle);
$('#adjustenginehoursmask').hide();
showsubmask("adjustenginehoursmask", false);
return;
}
}
}
else {
showAlert(GetTextByKey("P_MA_NOTBEEMPTY", '{0} cannot be empty.').replace('{0}', enginehourstxt), alerttitle);
$('#adjustenginehoursmask').hide();
showsubmask("adjustenginehoursmask", false);
return;
}
if (item.EngineHoursDate === "") {
showAlert(GetTextByKey("P_MA_NOTBEEMPTY", '{0} cannot be empty.').replace('{0}', enginehourstxt), alerttitle);
$('#adjustenginehoursmask').hide();
showsubmask("adjustenginehoursmask", false);
return;
}
var offset = $('#dialogadjust_enginehourstimezone').find("option:selected").attr("offset");
@ -510,7 +506,7 @@ function OnAdjustEngineHours() {
CheckEngineHourMinimumTime(item, "submit");
}, function () {
$('#adjustenginehoursmask').hide();
showsubmask("adjustenginehoursmask", false);
});
}
@ -518,12 +514,13 @@ function CheckEngineHourMinimumTime(item, type) {
var param = JSON.stringify(item);
param = htmlencode(param);
devicerequest("CheckEngineHourMinimumTime", param, function (data) {
showsubmask("adjustenginehoursmask", false);
if (data > 0) {
if (data == 1)
showAlert(GetTextByKey("P_MA_CHECKENGINEHOURSMINNIMUMTIME", "The adjustment cannot be completed as provided. The engine hours reading date provided cannot be prior to initial telematic data available for the asset."), GetTextByKey("P_MA_ADJUSTENGINEHOURS", 'Adjust Engine Hours'));
else
showAlert(GetTextByKey("P_MA_CHECKENGINEHOURSMINNIMUMTIME1", "The adjustment cannot be completed as provided. The engine hours reading date provided must be prior to or equal to the latest telematic data available for the asset."), GetTextByKey("P_MA_ADJUSTENGINEHOURS", 'Adjust Engine Hours'));
$('#adjustenginehoursmask').hide();
return;
} else {
if (type === "submit")
@ -532,18 +529,20 @@ function CheckEngineHourMinimumTime(item, type) {
GetCalampEngineHoursHistoryPreview(item);
}
}, function (err) {
showsubmask("adjustenginehoursmask", false);
});
}
function SaveAdjustEngineHours(item) {
showloading(true);
showsubloading("adjustenginehoursmask", true);
var param = JSON.stringify(item);
param = htmlencode(param);
showsubloading("adjustenginehoursmask", true);
var alerttitle = GetTextByKey("P_MA_ADJUSTENGINEHOURS", GetTextByKey("P_MA_ADJUSTENGINEHOURS", 'Adjust Engine Hours'));
devicerequest("SaveAdjustEngineHours", param, function (data) {
showloading(false);
showsubloading("adjustenginehoursmask", false);
if (data !== 'OK') {
showAlert(data, alerttitle);
} else {
@ -553,12 +552,11 @@ function SaveAdjustEngineHours(item) {
}
$('#dialog_adjustenginehours').hideDialog();
$('#adjustenginehoursmask').hide();
showmaskbg(false);
}, function (err) {
console.log(err);
showloading(false);
showAlert(GetTextByKey("P_MA_FAILEDTO", "Failed to {0}.").replace('{0}', alerttitle), alerttitle);
$('#adjustenginehoursmask').hide();
showsubloading("adjustenginehoursmask", false);
});
}
@ -598,11 +596,10 @@ function openAddEnginHours() {
function OnAddEngineHours() {
$('#addenginehoursmask').show();
showsubmask("addenginehoursmask", true);
var alerttitle = GetTextByKey("P_MA_ADDENGINEHOURS", 'Add Engine Hours');
var enginehourstxt = GetTextByKey("P_MA_ENGINEHOURS", "Engine Hours");
showConfirm(GetTextByKey("P_MA_DOYOUWANTTOADDTHEENGINEHOURS", 'Do you want to add the engine hours?'), alerttitle, function () {
$('#adjustodomask').hide();
showConfirm1(GetTextByKey("P_MA_DOYOUWANTTOADDTHEENGINEHOURS", 'Do you want to add the engine hours?'), alerttitle, function () {
var item = {
'CustomerID': contractorid,
'AssetID': machineid,
@ -614,26 +611,26 @@ function OnAddEngineHours() {
if (item.EngineHours !== "") {
if (isNaN(item.EngineHours)) {
showAlert(GetTextByKey("P_MA_FORMATERROR", '{0} format error.').replace('{0}', enginehourstxt), alerttitle);
$('#addenginehoursmask').hide();
showsubmask("addenginehoursmask", false);
return;
}
else {
if (item.EngineHours <= 0) {
showAlert(GetTextByKey("P_MA_MUSTBEGREATERTHAN0", '{0} must be greater than 0.').replace('{0}', enginehourstxt), alerttitle);
$('#addenginehoursmask').hide();
showsubmask("addenginehoursmask", false);
return;
}
}
}
else {
showAlert(GetTextByKey("P_MA_NOTBEEMPTY", '{0} cannot be empty.').replace('{0}', enginehourstxt), alerttitle);
$('#addenginehoursmask').hide();
showsubmask("addenginehoursmask", false);
return;
}
if (item.EngineHoursDate === "") {
showAlert(GetTextByKey("P_MA_NOTBEEMPTY", '{0} cannot be empty.').replace('{0}', enginehourstxt), alerttitle);
$('#addenginehoursmask').hide();
showsubmask("addenginehoursmask", false);
return;
}
var offset = $('#dialogadd_enginehourstimezone').find("option:selected").attr("offset");
@ -644,12 +641,12 @@ function OnAddEngineHours() {
item.EngineHoursDate = item.EngineHoursDate.replace("-", "/") + " " + hour + ":" + minute + ":" + "00";
showloading(true);
var param = JSON.stringify(item);
param = htmlencode(param);
showsubloading("addenginehoursmask", true);
devicerequest("AddManuallyInputEngineHours", param, function (data) {
showloading(false);
showsubloading("addenginehoursmask", false);
if (data !== 'OK') {
if (data === "Failed")
data = GetTextByKey("P_MA_FAILED", "Failed");
@ -661,16 +658,16 @@ function OnAddEngineHours() {
}
$('#dialog_addenginehours').hideDialog();
$('#addenginehoursmask').hide();
showmaskbg(false);
}, function (err) {
console.log(err);
showloading(false);
showsubloading("addenginehoursmask", false);
showAlert(GetTextByKey("P_MA_FAILEDTO", "Failed to {0}.").replace('{0}', GetTextByKey("P_MA_ADDENGINEHOURS", "Add Engine Hours")), alerttitle);
$('#addenginehoursmask').hide();
});
}, function () {
$('#addenginehoursmask').hide();
showsubmask("addenginehoursmask", false);
});
}

76
Site/MachineDeviceManagement/js/adj_odometer.js
View File

@ -219,23 +219,23 @@ function InitOdometerHisGridData() {
function getOdometers() {
grid_odometerdt.setData([]);
showLoading();
showsubloading("adjustodomask", true);
devicerequest("GetAssetCurrentOdometer", contractorid + String.fromCharCode(170) + machineid, function (data) {
hideLoading();
showsubloading("adjustodomask", false);
if (typeof (data) === "string") {
showAlert(data, GetTextByKey("P_MA_ERROR", 'Error'));
return;
}
ShowOdometers(data);
}, function (err) {
hideLoading();
showsubloading("adjustodomask", false);
});
}
function getOdometerHis() {
grid_odometermostrecentdt.setData([]);
grid_odometerhisdt.setData([]);
showLoading();
showsubloading("adjustodomask", true);
var methodname = "";
if (isCalampOdo)
@ -246,7 +246,7 @@ function getOdometerHis() {
methodname = "GetSmartWitnessOdometerHistory";
devicerequest(methodname, contractorid + String.fromCharCode(170) + machineid, function (data) {
hideLoading();
showsubloading("adjustodomask", false);
if (typeof (data) === "string") {
showAlert(data, GetTextByKey("P_MA_ERROR", 'Error'));
return;
@ -254,7 +254,7 @@ function getOdometerHis() {
//ShowOdometerHis(data);
ShowMostRecentOdometer(data);
}, function (err) {
hideLoading();
showsubloading("adjustodomask", false);
});
}
@ -271,27 +271,23 @@ function getOdometerHisPreview() {
if (item.Odometer !== "") {
if (isNaN(item.Odometer)) {
showAlert(GetTextByKey("P_MA_ODOMETERFORMATERROR", 'Odometer format error.'), alerttitle);
$('#adjustodomask').hide();
return;
}
else {
if (item.Odometer <= 0) {
showAlert(GetTextByKey("P_MA_ODOMETERMUSTBEGREATERTHAN0", 'ODOMeter must be greater than 0.'), alerttitle);
$('#adjustodomask').hide();
return;
}
}
}
else {
showAlert(GetTextByKey("P_MA_ODOMETRCANNOTBEEMPTY", "Odometer cannot be empty."), alerttitle);
$('#adjustodomask').hide();
return;
}
if (item.OdometerDate === "") {
showAlert(GetTextByKey("P_MA_ODOMETRDATACANNOTBEEMPTY", "Odometer date cannot be empty."), alerttitle);
$('#adjustodomask').hide();
hideLoading();
return;
}
@ -309,7 +305,7 @@ function getOdometerHisPreview() {
function GetOdometerHistoryPreview(item) {
grid_odometerhisdt.setData([]);
showLoading();
showsubloading("adjustodomask", true);
var param = JSON.stringify(item);
param = htmlencode(param);
if (isCalampOdo)
@ -320,7 +316,7 @@ function GetOdometerHistoryPreview(item) {
methodname = "GetSmartWitnessOdometerHistoryPreview";
devicerequest(methodname, param, function (data) {
hideLoading();
showsubloading("adjustodomask", false);
if (typeof (data) === "string") {
showAlert(data, GetTextByKey("P_MA_ERROR", 'Error'));
return;
@ -328,7 +324,7 @@ function GetOdometerHistoryPreview(item) {
ShowOdometerHis(data);
ShowMostRecentOdometerPreview(data);
}, function (err) {
hideLoading();
showsubloading("adjustodomask", false);
});
}
@ -446,9 +442,9 @@ function openAdjustOdometer() {
}
function OnAdjustOdometer() {
$('#adjustodomask').show();
showsubmask("adjustodomask", true);
var alerttitle = GetTextByKey("P_MA_ADJUSTODOMETER", "Adjust Odometer");
showConfirm(GetTextByKey("P_MA_DOYOUWANTTOADJUSTTHEODOMETER", 'Do you want to adjust the odometer?'), alerttitle, function () {
showConfirm1(GetTextByKey("P_MA_DOYOUWANTTOADJUSTTHEODOMETER", 'Do you want to adjust the odometer?'), alerttitle, function () {
var item = {
'CustomerID': contractorid,
'AssetID': machineid,
@ -462,26 +458,26 @@ function OnAdjustOdometer() {
if (item.Odometer !== "") {
if (isNaN(item.Odometer)) {
showAlert(GetTextByKey("P_MA_ODOMETERFORMATERROR", 'Odometer format error.'), alerttitle);
$('#adjustodomask').hide();
showsubmask("adjustodomask", false);
return;
}
else {
if (item.Odometer <= 0) {
showAlert(GetTextByKey("P_MA_ODOMETERMUSTBEGREATERTHAN0", 'ODOMeter must be greater than 0.'), alerttitle);
$('#adjustodomask').hide();
showsubmask("adjustodomask", false);
return;
}
}
}
else {
showAlert(GetTextByKey("P_MA_ODOMETRCANNOTBEEMPTY", "Odometer cannot be empty."), alerttitle);
$('#adjustodomask').hide();
showsubmask("adjustodomask", false);
return;
}
if (item.OdometerDate === "") {
showAlert(GetTextByKey("P_MA_ODOMETRDATACANNOTBEEMPTY", "Odometer date cannot be empty."), alerttitle);
$('#adjustodomask').hide();
showsubmask("adjustodomask", false);
return;
}
var offset = $('#dialogadjust_odometertimezone').find("option:selected").attr("offset");
@ -495,9 +491,8 @@ function OnAdjustOdometer() {
CheckOdometerMinnimumTime(item, "submit");
}, function () {
$('#adjustodomask').hide();
showsubmask("adjustodomask", false);
});
}
@ -505,12 +500,13 @@ function CheckOdometerMinnimumTime(item, type) {
var param = JSON.stringify(item);
param = htmlencode(param);
devicerequest("CheckOdometerMinnimumTime", param, function (data) {
showsubmask("adjustodomask", false);
if (data > 0) {
if (data == 1)
showAlert(GetTextByKey("P_MA_CHECKODOMETERMINNIMUMTIME1", "The adjustment cannot be completed as provided. The odometer reading date provided cannot be prior to initial telematic data available for the asset."), GetTextByKey("P_MA_ADJUSTODOMETER", "Adjust Odometer"));
else
showAlert(GetTextByKey("P_MA_CHECKODOMETERMINNIMUMTIME", "The adjustment cannot be completed as provided. The odometer reading date provided must be prior to or equal to the latest telematic data available for the asset."), GetTextByKey("P_MA_ADJUSTODOMETER", "Adjust Odometer"));
$('#adjustodomask').hide();
return;
} else {
if (type === "submit")
@ -519,16 +515,17 @@ function CheckOdometerMinnimumTime(item, type) {
GetOdometerHistoryPreview(item);
}
}, function (err) {
showsubmask("adjustodomask", false);
});
}
function SaveAdjustOdometer(item) {
showloading(true);
showsubloading("adjustodomask", true);
var param = JSON.stringify(item);
param = htmlencode(param);
devicerequest("SaveAdjustOdometer", param, function (data) {
showloading(false);
showsubloading("adjustodomask", false);
if (data !== 'OK') {
showAlert(data, GetTextByKey("P_MA_ADJUSTODOMETER", "Adjust Odometer"));
} else {
@ -538,11 +535,10 @@ function SaveAdjustOdometer(item) {
}
$('#dialog_adjustodometer').hideDialog();
$('#adjustodomask').hide();
showmaskbg(false);
}, function (err) {
showloading(false);
showAlert(GetTextByKey("P_MA_FAILEDTOADJUSTDOMETER", 'Failed to adjust Odometer.'), GetTextByKey("P_MA_ADJUSTODOMETER", "Adjust Odometer"));
$('#adjustodomask').hide();
showsubloading("adjustodomask", false);
});
}
@ -571,7 +567,6 @@ function openAddOdometer() {
$('#dialog_addodometer .dialog-title span.title').text(GetTextByKey("P_MA_ADDODOMETER", 'Add Odometer'));
showmaskbg(true);
$('#dialog_addodometer')
.attr('act', 'add')
.css({
'top': (document.documentElement.clientHeight - $('#dialog_addodometer').height()) / 3,
'left': (document.documentElement.clientWidth - $('#dialog_addodometer').width()) / 2
@ -581,9 +576,9 @@ function openAddOdometer() {
}
function OnAddOdometer() {
$('#addodomask').show();
showsubmask("addodomask", true);
var alerttile = GetTextByKey("P_MA_ADDODOMETER", 'Add Odometer');
showConfirm(GetTextByKey("P_MA_DOYOUWANTTOADDTHEODOMETER", 'Do you want to add the odometer?'), alerttile, function () {
showConfirm1(GetTextByKey("P_MA_DOYOUWANTTOADDTHEODOMETER", 'Do you want to add the odometer?'), alerttile, function () {
var item = {
'CustomerID': contractorid,
'AssetID': machineid,
@ -596,26 +591,26 @@ function OnAddOdometer() {
if (item.Odometer !== "") {
if (isNaN(item.Odometer)) {
showAlert(GetTextByKey("P_MA_ODOMETERFORMATERROR", 'Odometer format error.'), alerttile);
$('#addodomask').hide();
showsubmask("addodomask", false);
return;
}
else {
if (item.Odometer <= 0) {
showAlert(GetTextByKey("P_MA_ODOMETERMUSTBEGREATERTHAN0", 'ODOMeter must be greater than 0.'), alerttile);
$('#addodomask').hide();
showsubmask("addodomask", false);
return;
}
}
}
else {
showAlert(GetTextByKey("P_MA_ODOMETRCANNOTBEEMPTY", "Odometer cannot be empty."), alerttile);
$('#addodomask').hide();
showsubmask("addodomask", false);
return;
}
if (item.OdometerDate === "") {
showAlert(GetTextByKey("P_MA_ODOMETRDATACANNOTBEEMPTY", "Odometer date cannot be empty."), alerttile);
$('#addodomask').hide();
showsubmask("addodomask", false);
return;
}
var offset = $('#dialogadd_odometertimezone').find("option:selected").attr("offset");
@ -625,11 +620,12 @@ function OnAddOdometer() {
var minute = $('#dialogadd_timeminute').val();
item.OdometerDate = item.OdometerDate.replace("-", "/") + " " + hour + ":" + minute + ":" + "00";
showloading(true);
var param = JSON.stringify(item);
param = htmlencode(param);
showsubloading("addodomask", true);
devicerequest("AddManuallyInputOdometer", param, function (data) {
showloading(false);
showsubloading("addodomask", false);
if (data !== 'OK') {
showAlert(data, alerttile);
} else {
@ -639,15 +635,13 @@ function OnAddOdometer() {
}
$('#dialog_addodometer').hideDialog();
$('#addodomask').hide();
showmaskbg(false);
}, function (err) {
showloading(false);
showAlert('Failed to add Odometer.', alerttile);
$('#addodomask').hide();
showsubloading("addodomask", false);
});
}, function () {
$('#addodomask').hide();
showsubloading("addodomask", false);
});
}

5
Site/MachineDeviceManagement/js/assetother.js
View File

@ -167,7 +167,8 @@ function InitJobSiteGridData() {
col.events = {
onchange: function () {
inputChanged = true;
jobsiteinputChanged = true;
if (this.OnSite)
jobsiteinputChanged = true;
}
};
col.tooltip = GetTextByKey("P_MA_ONSITETITLE", "The On Site box should only be checked if the asset has a permanent assignment not based on location. Geofence and Jobsite Add/Remove will not be triggered if checked.");
@ -265,7 +266,7 @@ function InitAssetGroupGridData() {
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
var list_columns = [
{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 30, 'text-align': 'center' } },
{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 45, 'text-align': 'center' } },
{ name: 'GroupName', caption: GetTextByKey("P_MA_GROUPNAME", "Group Name"), valueIndex: 'GroupName', css: { 'width': 300, 'text-align': 'left' } }
];
var columns = [];

4
Site/MachineDeviceManagement/js/assetpm.js
View File

@ -36,7 +36,7 @@ function InitPMGridData() {
reset: GetTextByKey("P_GRID_RESET", "Reset")
};
var list_columns = [
{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 30, 'text-align': 'center' } },
{ name: 'Selected', caption: "", valueIndex: 'Selected', type: 3, css: { 'width': 45, 'text-align': 'center' } },
{ name: 'PmScheduleName', caption: GetTextByKey("P_MA_SCHEDULENAME", "Schedule Name"), valueIndex: 'PmScheduleName', css: { 'width': 200, 'text-align': 'left' } },
{ name: 'StartValue', caption: GetTextByKey("P_MA_INITIALSERVICEVALUE", "Initial Service Value"), valueIndex: 'StartValue', css: { 'width': 120, 'text-align': 'right' } },
{ name: 'LastAlertTimeString', caption: GetTextByKey("P_MA_LASTSERVICEDATE", "Last Service Date"), valueIndex: 'LastAlertTimeString', css: { 'width': 120, 'text-align': 'left' } },
@ -429,7 +429,7 @@ function createTBMContent(contentctrl, pmschedule) {
item.PmScheduleID = pmschedule.PmScheduleID;
//item.PMType = pmschedule.PmScheduleType;
if (radio1.prop("checked")) {
item.StartDate = nowdate;
item.StartDate = currentdate;
}
else {
item.StartDate = txtLastServiceDate.val();

1
Site/MachineDeviceManagement/js/mergeasset.js
View File

@ -223,7 +223,6 @@ function OnMergeAsset() {
dialogSelectMergeAssets.exceptShareAsset = true;
dialogSelectMergeAssets.exceptSource = [machineid];
dialogSelectMergeAssets.showSelector(3, true);//与attachmentInfo中的showSelector冲突,需设置force
$('#mask_bg').css('height', '100%');
}
var mergeassetid;