sync
This commit is contained in:
parent
d831a707ae
commit
e728c66786
@ -6,7 +6,7 @@ MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{E24C65DC-7377-472B-9ABA-BC803B73C61A}") = "Site", "Site\", "{C2BC3E5B-B059-4B6C-8563-07FEAE54AF6B}"
|
||||
ProjectSection(WebsiteProperties) = preProject
|
||||
TargetFrameworkMoniker = ".NETFramework,Version%3Dv4.7.2"
|
||||
ProjectReferences = "{9d398985-9424-4fc7-a637-6b5b204d8f7c}|iicontractorsitelib.dll;{515fb61f-f032-4a48-8f32-93b59b9d37f8}|iicontractorbl.dll;{39E2A8C6-F58F-4839-B7C1-82D44153FC3A}|FICBLC.dll;{DDDA41C4-099D-4614-8925-B11F70459886}|EqpQueryIntfLibForPC.dll;{E4DB03B6-8D79-4B54-BBAE-3F916FED4398}|FICExport.dll;{4963DEB2-F0E3-44A3-B5E1-E13E191A8DE8}|FICIntf.dll;{3FFA4093-4325-4FBB-A874-F288BFDCF7BA}|FICIntfAdv.dll;{F47EBF77-EED3-44E2-9983-EF556372A648}|FICModels.dll;{A2948428-15E6-4BBC-B46D-3EFDA3D5F34C}|FRPTExtIntf.dll;{B0110465-8537-4FE7-BEE6-B10FAA0BA92D}|FleetClientBase.dll;{A872B915-D7F0-4E7F-81E7-742DBB4DBBBA}|FleetServiceClient.dll;{c181bd0e-4b98-4adc-ba92-bb389550d1f6}|FIChartLib.dll;"
|
||||
ProjectReferences = "{9d398985-9424-4fc7-a637-6b5b204d8f7c}|iicontractorsitelib.dll;{515fb61f-f032-4a48-8f32-93b59b9d37f8}|iicontractorbl.dll;{39E2A8C6-F58F-4839-B7C1-82D44153FC3A}|FICBLC.dll;{DDDA41C4-099D-4614-8925-B11F70459886}|EqpQueryIntfLibForPC.dll;{E4DB03B6-8D79-4B54-BBAE-3F916FED4398}|FICExport.dll;{4963DEB2-F0E3-44A3-B5E1-E13E191A8DE8}|FICIntf.dll;{3FFA4093-4325-4FBB-A874-F288BFDCF7BA}|FICIntfAdv.dll;{F47EBF77-EED3-44E2-9983-EF556372A648}|FICModels.dll;{A2948428-15E6-4BBC-B46D-3EFDA3D5F34C}|FRPTExtIntf.dll;{c181bd0e-4b98-4adc-ba92-bb389550d1f6}|FIChartLib.dll;{b0110465-8537-4fe7-bee6-b10faa0ba92d}|FleetClientBase.dll;{a872b915-d7f0-4e7f-81e7-742dbb4dbbba}|FleetServiceClient.dll;"
|
||||
Debug.AspNetCompiler.VirtualPath = "/localhost_5246"
|
||||
Debug.AspNetCompiler.PhysicalPath = "Site\"
|
||||
Debug.AspNetCompiler.TargetPath = "PrecompiledWeb\localhost_5246\"
|
||||
@ -37,35 +37,31 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IronIntelSiteServiceHost",
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LanguageExtractTool", "LanguageExtractTool\LanguageExtractTool.csproj", "{BE465497-20E8-4C29-B98F-3AF19996F1CB}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConverImage", "..\..\..\MyProjects\PO_General\Src\ConverImage\ConverImage.csproj", "{64030316-4944-43C1-8F35-C7AE6BD71518}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConvertXml2Sqlite", "E:\PO\tools\ConvertXml2Sqlite\ConvertXml2Sqlite.csproj", "{6DADAE33-4436-4D6D-96FD-3AB415AA826F}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FIC", "FIC", "{A29EDD95-7564-4A09-AD02-4FF284082DA9}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FICBLC", "..\..\..\FI_G3\FICG5Core\Service\FICBLC\FICBLC.csproj", "{39E2A8C6-F58F-4839-B7C1-82D44153FC3A}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FICBLC", "..\..\..\FI\FICG5\Core\Service\FICBLC\FICBLC.csproj", "{39E2A8C6-F58F-4839-B7C1-82D44153FC3A}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EqpQueryIntfLibForPC", "..\..\..\FI\EquipQueryApp\Interface\EqpQueryIntfLibForPC\EqpQueryIntfLibForPC.csproj", "{DDDA41C4-099D-4614-8925-B11F70459886}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EqpQueryIntfLibForPC", "..\..\..\Projects\Apps\EquipQueryApp\Interface\EqpQueryIntfLibForPC\EqpQueryIntfLibForPC.csproj", "{DDDA41C4-099D-4614-8925-B11F70459886}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FRPTExtIntf", "..\..\..\FI_G3\FICG5Core\Service\ExtAppIntf\FRPTExtIntf.csproj", "{A2948428-15E6-4BBC-B46D-3EFDA3D5F34C}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FRPTExtIntf", "..\..\..\FI\FICG5\Core\Service\ExtAppIntf\FRPTExtIntf.csproj", "{A2948428-15E6-4BBC-B46D-3EFDA3D5F34C}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FICIntf", "..\..\..\FI_G3\FICG5Core\Service\FICIntf\FICIntf\FICIntf.csproj", "{4963DEB2-F0E3-44A3-B5E1-E13E191A8DE8}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FICIntf", "..\..\..\FI\FICG5\Core\Service\FICIntf\FICIntf\FICIntf.csproj", "{4963DEB2-F0E3-44A3-B5E1-E13E191A8DE8}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FICIntfAdv", "..\..\..\FI_G3\FICG5Core\Service\FICIntf\FICIntfAdv\FICIntfAdv.csproj", "{3FFA4093-4325-4FBB-A874-F288BFDCF7BA}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FICIntfAdv", "..\..\..\FI\FICG5\Core\Service\FICIntf\FICIntfAdv\FICIntfAdv.csproj", "{3FFA4093-4325-4FBB-A874-F288BFDCF7BA}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FICModels", "..\..\..\FI_G3\FICG5Core\Service\FICModels\FICModels.csproj", "{F47EBF77-EED3-44E2-9983-EF556372A648}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FICModels", "..\..\..\FI\FICG5\Core\Service\FICModels\FICModels.csproj", "{F47EBF77-EED3-44E2-9983-EF556372A648}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FICExport", "..\..\..\FI_G3\FICG5Core\Service\FICExport\FICExport.csproj", "{E4DB03B6-8D79-4B54-BBAE-3F916FED4398}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FICExport", "..\..\..\FI\FICG5\Core\Service\FICExport\FICExport.csproj", "{E4DB03B6-8D79-4B54-BBAE-3F916FED4398}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FICEmailSubscribe", "..\..\..\FI_G3\FICG5Core\Service\FICEmailSubscribe\FICEmailSubscribe.csproj", "{8650F244-1D1A-4627-8B15-8FFA4B34932F}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FICEmailSubscribe", "..\..\..\FI\FICG5\Core\Service\FICEmailSubscribe\FICEmailSubscribe.csproj", "{8650F244-1D1A-4627-8B15-8FFA4B34932F}"
|
||||
EndProject
|
||||
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DataModel", "DataModel", "{B7B7275E-2530-4E8D-9AE3-C49B4BADCF67}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FleetClientBase", "..\..\Service\DataModel\FleetClientBase\FleetClientBase.csproj", "{B0110465-8537-4FE7-BEE6-B10FAA0BA92D}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FleetClientBase", "..\..\..\ForesightServices\Service\DataModel\FleetClientBase\FleetClientBase.csproj", "{B0110465-8537-4FE7-BEE6-B10FAA0BA92D}"
|
||||
EndProject
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FleetServiceClient", "..\..\Service\DataModel\FleetServiceClient\FleetServiceClient.csproj", "{A872B915-D7F0-4E7F-81E7-742DBB4DBBBA}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FleetServiceClient", "..\..\..\ForesightServices\Service\DataModel\FleetServiceClient\FleetServiceClient.csproj", "{A872B915-D7F0-4E7F-81E7-742DBB4DBBBA}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FIChartLib", "..\..\..\FI_G3\FICG5Core\FICore\FIChartLib\FIChartLib.csproj", "{C181BD0E-4B98-4ADC-BA92-BB389550D1F6}"
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FIChartLib", "..\..\..\FI\FICore\FIChartLib\FIChartLib.csproj", "{C181BD0E-4B98-4ADC-BA92-BB389550D1F6}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
@ -97,14 +93,6 @@ Global
|
||||
{BE465497-20E8-4C29-B98F-3AF19996F1CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{BE465497-20E8-4C29-B98F-3AF19996F1CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{BE465497-20E8-4C29-B98F-3AF19996F1CB}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{64030316-4944-43C1-8F35-C7AE6BD71518}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{64030316-4944-43C1-8F35-C7AE6BD71518}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{64030316-4944-43C1-8F35-C7AE6BD71518}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{64030316-4944-43C1-8F35-C7AE6BD71518}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{6DADAE33-4436-4D6D-96FD-3AB415AA826F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{6DADAE33-4436-4D6D-96FD-3AB415AA826F}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{6DADAE33-4436-4D6D-96FD-3AB415AA826F}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{6DADAE33-4436-4D6D-96FD-3AB415AA826F}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{39E2A8C6-F58F-4839-B7C1-82D44153FC3A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{39E2A8C6-F58F-4839-B7C1-82D44153FC3A}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{39E2A8C6-F58F-4839-B7C1-82D44153FC3A}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
|
||||
@ -192,11 +192,11 @@
|
||||
<WCFMetadata Include="Connected Services\" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\Service\DataModel\FleetClientBase\FleetClientBase.csproj">
|
||||
<ProjectReference Include="..\..\..\..\ForesightServices\Service\DataModel\FleetClientBase\FleetClientBase.csproj">
|
||||
<Project>{b0110465-8537-4fe7-bee6-b10faa0ba92d}</Project>
|
||||
<Name>FleetClientBase</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\..\Service\DataModel\FleetServiceClient\FleetServiceClient.csproj">
|
||||
<ProjectReference Include="..\..\..\..\ForesightServices\Service\DataModel\FleetServiceClient\FleetServiceClient.csproj">
|
||||
<Project>{a872b915-d7f0-4e7f-81e7-742dbb4dbbba}</Project>
|
||||
<Name>FleetServiceClient</Name>
|
||||
</ProjectReference>
|
||||
|
||||
@ -179,27 +179,27 @@
|
||||
<None Include="LHBIS.snk" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\..\..\FI_G3\FICG5Core\Service\FICBLC\FICBLC.csproj">
|
||||
<ProjectReference Include="..\..\..\..\FI\FICG5\Core\Service\FICBLC\FICBLC.csproj">
|
||||
<Project>{39e2a8c6-f58f-4839-b7c1-82d44153fc3a}</Project>
|
||||
<Name>FICBLC</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\..\..\FI_G3\FICG5Core\Service\FICIntf\FICIntfAdv\FICIntfAdv.csproj">
|
||||
<ProjectReference Include="..\..\..\..\FI\FICG5\Core\Service\FICIntf\FICIntfAdv\FICIntfAdv.csproj">
|
||||
<Project>{3ffa4093-4325-4fbb-a874-f288bfdcf7ba}</Project>
|
||||
<Name>FICIntfAdv</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\..\..\FI_G3\FICG5Core\Service\FICIntf\FICIntf\FICIntf.csproj">
|
||||
<ProjectReference Include="..\..\..\..\FI\FICG5\Core\Service\FICIntf\FICIntf\FICIntf.csproj">
|
||||
<Project>{4963deb2-f0e3-44a3-b5e1-e13e191a8de8}</Project>
|
||||
<Name>FICIntf</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\..\..\FI_G3\FICG5Core\Service\FICModels\FICModels.csproj">
|
||||
<ProjectReference Include="..\..\..\..\FI\FICG5\Core\Service\FICModels\FICModels.csproj">
|
||||
<Project>{f47ebf77-eed3-44e2-9983-ef556372a648}</Project>
|
||||
<Name>FICModels</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\..\Service\DataModel\FleetClientBase\FleetClientBase.csproj">
|
||||
<ProjectReference Include="..\..\..\..\ForesightServices\Service\DataModel\FleetClientBase\FleetClientBase.csproj">
|
||||
<Project>{b0110465-8537-4fe7-bee6-b10faa0ba92d}</Project>
|
||||
<Name>FleetClientBase</Name>
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\..\Service\DataModel\FleetServiceClient\FleetServiceClient.csproj">
|
||||
<ProjectReference Include="..\..\..\..\ForesightServices\Service\DataModel\FleetServiceClient\FleetServiceClient.csproj">
|
||||
<Project>{a872b915-d7f0-4e7f-81e7-742dbb4dbbba}</Project>
|
||||
<Name>FleetServiceClient</Name>
|
||||
</ProjectReference>
|
||||
|
||||
@ -212,6 +212,18 @@
|
||||
_network.request("JobSite/AddJobSite.aspx?tp=ashx", -1, method, param, callback, error, nolog);
|
||||
}
|
||||
|
||||
function showConfirm1(msg, title, fok, fcancel) {
|
||||
$("#dialogmask").show();
|
||||
_dialog.showConfirm(msg, title, function (e) {
|
||||
$("#dialogmask").hide();
|
||||
if (typeof fok === 'function') {
|
||||
fok(e);
|
||||
}
|
||||
}, function () {
|
||||
$("#dialogmask").hide();
|
||||
});
|
||||
}
|
||||
|
||||
function OnAdd() {
|
||||
jobsiteid = undefined;
|
||||
jobsiteitem = undefined;
|
||||
@ -1781,15 +1793,14 @@
|
||||
}
|
||||
|
||||
function OnSiteChanging(item, input) {
|
||||
var checked = $(input).prop('checked');
|
||||
var input_chk = $(input).closest('td').find('input');
|
||||
var checked = $(input_chk).prop('checked');
|
||||
var text = GetTextByKey("P_JS_ONSITETIPS", "You have manually assigned a jobsite. This action will disable geofence alerts and jobsite auto-assignment. Do you want to proceed? ");
|
||||
if (!checked)
|
||||
text = GetTextByKey("P_JS_ONSITETIPS1", "Are you sure you want to change the on-site of the asset:{0}?").replace('{0}', item.Name);
|
||||
|
||||
$("#dialogmask").show();
|
||||
showConfirm(text, GetTextByKey("P_JS_ONSITECHANGE", "On Site Change"), function () {
|
||||
$("#dialogmask").hide();
|
||||
$(input).prop('checked', !$(input).prop('checked')).change();
|
||||
showConfirm1(text, GetTextByKey("P_JS_ONSITECHANGE", "On Site Change"), function () {
|
||||
$(input_chk).prop('checked', !$(input_chk).prop('checked')).change();
|
||||
});
|
||||
}
|
||||
|
||||
@ -1876,7 +1887,7 @@
|
||||
reset: GetTextByKey("P_GRID_RESET", "Reset")
|
||||
};
|
||||
var list_columns = [
|
||||
{ name: 'OnSite', caption: GetTextByKey("P_JS_ONSITE", "On Site"), valueIndex: 'OnSite', type: 3, css: { 'width': 60, 'text-align': 'center' } },
|
||||
{ name: 'OnSite', caption: GetTextByKey("P_JS_ONSITE", "On Site"), valueIndex: 'OnSite', type: 3, css: { 'width': 70, 'text-align': 'center' } },
|
||||
{ name: 'DisplayName', caption: GetTextByKey("P_JS_ASSETNAME", "Asset Name"), valueIndex: 'Name', css: { 'width': 170, 'text-align': 'left' } },
|
||||
{ name: 'MakeName', caption: GetTextByKey("P_JS_MAKE", "Make"), valueIndex: 'MakeName', css: { 'width': 90, 'text-align': 'left' } },
|
||||
{ name: 'ModelName', caption: GetTextByKey("P_JS_MODEL", "Model"), valueIndex: 'ModelName', css: { 'width': 90, 'text-align': 'left' } },
|
||||
|
||||
@ -530,12 +530,13 @@
|
||||
}
|
||||
|
||||
function OnSiteChanging(item, input) {
|
||||
var checked = $(input).prop('checked');
|
||||
var input_chk = $(input).closest('td').find('input');
|
||||
var checked = $(input_chk).prop('checked');
|
||||
var text = GetTextByKey("P_JS_ONSITETIPS", "You have manually assigned a jobsite. This action will disable geofence alerts and jobsite auto-assignment. Do you want to proceed? ");
|
||||
if (!checked)
|
||||
text = GetTextByKey("P_JS_ONSITETIPS1", "Are you sure you want to change the on-site of the asset:{0}?").replace('{0}', item.Name);
|
||||
showConfirm(text, GetTextByKey("P_JS_ONSITECHANGE", "On Site Change"), function () {
|
||||
$(input).prop('checked', !$(input).prop('checked')).change();
|
||||
$(input_chk).prop('checked', !$(input_chk).prop('checked')).change();
|
||||
});
|
||||
}
|
||||
|
||||
@ -757,7 +758,7 @@
|
||||
reset: GetTextByKey("P_GRID_RESET", "Reset")
|
||||
};
|
||||
var list_columns = [
|
||||
{ name: 'OnSite', caption: GetTextByKey("P_JS_ONSITE", "On Site"), valueIndex: 'OnSite', type: 3, css: { 'width': 60, 'text-align': 'center' } },
|
||||
{ name: 'OnSite', caption: GetTextByKey("P_JS_ONSITE", "On Site"), valueIndex: 'OnSite', type: 3, css: { 'width': 70, 'text-align': 'center' } },
|
||||
{ name: 'DisplayName', caption: GetTextByKey("P_JS_ASSETNAME", "Asset Name"), valueIndex: 'Name', css: { 'width': 170, 'text-align': 'left' } },
|
||||
{ name: 'MakeName', caption: GetTextByKey("P_JS_MAKE", "Make"), valueIndex: 'MakeName', css: { 'width': 90, 'text-align': 'left' } },
|
||||
{ name: 'ModelName', caption: GetTextByKey("P_JS_MODEL", "Model"), valueIndex: 'ModelName', css: { 'width': 90, 'text-align': 'left' } },
|
||||
|
||||
@ -2067,7 +2067,7 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<div id="odometerlist" style="width: 670px;"></div>
|
||||
<div id="odometerlist" style="width: 680px;"></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
@ -2083,7 +2083,7 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<div id="enginehourslist" style="width: 670px;"></div>
|
||||
<div id="enginehourslist" style="width: 680px;"></div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@ -2097,7 +2097,7 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<div id="locationlist" style="width: 670px;"></div>
|
||||
<div id="locationlist" style="width: 680px;"></div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@ -2111,7 +2111,7 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<div id="idlehourlist" style="width: 670px;"></div>
|
||||
<div id="idlehourlist" style="width: 680px;"></div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@ -2125,7 +2125,7 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<div id="fuelusedlist" style="width: 670px;"></div>
|
||||
<div id="fuelusedlist" style="width: 680px;"></div>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
@ -2139,7 +2139,7 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td>
|
||||
<div id="fuelremaininglist" style="width: 670px;"></div>
|
||||
<div id="fuelremaininglist" style="width: 680px;"></div>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
@ -2210,15 +2210,15 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="label" colspan="2">
|
||||
<div id="odometermostrecent" style="height: 75px;"></div>
|
||||
<div id="odometermostrecent" style="height: 90px; width:920px;"></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td data-lgid="P_MA_XXXXXX" colspan="2">The 24 hours following the timestamp above:</td>
|
||||
<td data-lgid="P_MA_XXXXXX" colspan="2">The 24 hours following the user provided date:</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="label" colspan="2">
|
||||
<div id="odometerhislist" style="height: 320px;"></div>
|
||||
<div id="odometerhislist" style="height: 300px; width:920px;"></div>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
@ -2270,15 +2270,15 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="label" colspan="2">
|
||||
<div id="enginehoursmostrecent" style="height: 75px;"></div>
|
||||
<div id="enginehoursmostrecent" style="height: 90px;width:920px;"></div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td data-lgid="P_MA_XXXXXX" colspan="2">The 24 hours following the timestamp above:</td>
|
||||
<td data-lgid="P_MA_XXXXXX" colspan="2">The 24 hours following the user provided date:</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td class="label" colspan="2">
|
||||
<div id="enginehourshislist" style="height: 320px;"></div>
|
||||
<div id="enginehourshislist" style="height: 300px;width:920px;"></div>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
@ -261,7 +261,7 @@ function getEngineHoursHis() {
|
||||
showAlert(data, GetTextByKey("P_MA_ERROR", 'Error'));
|
||||
return;
|
||||
}
|
||||
ShowEngineHoursHis(data);
|
||||
//ShowEngineHoursHis(data);
|
||||
ShowMostRecentEngineHours(data);
|
||||
}, function (err) {
|
||||
hideLoading();
|
||||
|
||||
@ -251,7 +251,7 @@ function getOdometerHis() {
|
||||
showAlert(data, GetTextByKey("P_MA_ERROR", 'Error'));
|
||||
return;
|
||||
}
|
||||
ShowOdometerHis(data);
|
||||
//ShowOdometerHis(data);
|
||||
ShowMostRecentOdometer(data);
|
||||
}, function (err) {
|
||||
hideLoading();
|
||||
|
||||
@ -3310,7 +3310,7 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<td colspan="2" style="padding-left: 135px;">
|
||||
<div id="cusomercontactlist" style="height: 190px; width: 784px;"></div>
|
||||
<div id="cusomercontactlist" style="height: 190px; width: 792px;"></div>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
|
||||
@ -140,7 +140,8 @@
|
||||
line-height: 30px;
|
||||
margin-left: 20px;
|
||||
margin-bottom: 15px;
|
||||
width: 850px;
|
||||
width: 1000px !important;
|
||||
table-layout: fixed;
|
||||
}
|
||||
|
||||
.td_module {
|
||||
@ -1723,7 +1724,7 @@
|
||||
|
||||
for (var j = 0; j < feature.AvailablePermissions.length; j++) {
|
||||
var pm = feature.AvailablePermissions[j];
|
||||
td = $('<td style="width: 150px;"></td>');
|
||||
td = $('<td style="width: 170px;text-align:right;"></td>');
|
||||
tr.append(td);
|
||||
var name = "";
|
||||
if (pm === 0)
|
||||
@ -1754,9 +1755,12 @@
|
||||
ipt.addClass("commondefault");
|
||||
td.append(ipt);
|
||||
}
|
||||
for (var k = feature.AvailablePermissions.length; k < 4; k++) {//目前最多4列，不足4列的补齐4列
|
||||
td = $('<td style="width: 170px;text-align:right;"></td>');
|
||||
tr.append(td);
|
||||
}
|
||||
$("input:radio[name='feature_" + feature.Id + "'][value='" + features[i].Item2[0] + "']").prop("checked", true);
|
||||
|
||||
td = $('<td></td>');
|
||||
tr.append(td);
|
||||
}
|
||||
return tb;
|
||||
|
||||
116
Site/Web.config
116
Site/Web.config
@ -1,6 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version="1.0"?>
|
||||
<configuration>
|
||||
<!--
|
||||
<!--
|
||||
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.
|
||||
|
||||
The following attributes can be set on the <httpRuntime> tag.
|
||||
@ -8,63 +8,57 @@
|
||||
<httpRuntime targetFramework="4.7.1" />
|
||||
</system.Web>
|
||||
-->
|
||||
<system.web>
|
||||
<compilation debug="true" targetFramework="4.7.2">
|
||||
<assemblies>
|
||||
<add assembly="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
|
||||
<add assembly="System.Runtime, Version=4.0.0.0, Culture=neutral, PublicKeyToken=B03F5F7F11D50A3A" />
|
||||
</assemblies>
|
||||
</compilation>
|
||||
<httpRuntime targetFramework="4.5" executionTimeout="3600" maxRequestLength="20480" />
|
||||
<!--<machineKey decryptionKey="FFAFF40DD223435D0736467A122ECE72A9FFB61CF257F794,IsolateApps" validationKey="6B98751EFBE7AC90FB8BE5EAAAD90EA7B487D79679D3E91043B081EB72E8F284B72DCC2EF362EE4CD47C830C923344A0331CDE4DAE50FA305114B623A90FFB9F,IsolateApps"/>-->
|
||||
<pages>
|
||||
<namespaces>
|
||||
<add namespace="IronIntel.Contractor" />
|
||||
</namespaces>
|
||||
</pages>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<staticContent>
|
||||
<remove fileExtension=".woff" />
|
||||
<remove fileExtension=".woff2" />
|
||||
<mimeMap fileExtension=".woff" mimeType="font/x-woff" />
|
||||
<mimeMap fileExtension=".woff2" mimeType="application/font-woff2" />
|
||||
</staticContent>
|
||||
<security>
|
||||
<requestFiltering>
|
||||
<requestLimits maxAllowedContentLength="102400000" />
|
||||
</requestFiltering>
|
||||
</security>
|
||||
<handlers>
|
||||
<add name="ficservice" path="ficservice" verb="*" type="FI.FIC.FICServiceHandler" />
|
||||
</handlers>
|
||||
<caching>
|
||||
<profiles>
|
||||
<add extension=".machinetypeicon.ashx" policy="CacheForTimePeriod" kernelCachePolicy="CacheForTimePeriod" duration="00:05:00" />
|
||||
</profiles>
|
||||
</caching>
|
||||
<urlCompression doDynamicCompression="true" />
|
||||
<httpCompression>
|
||||
<dynamicTypes>
|
||||
<remove mimeType="application/json"/>
|
||||
<add mimeType="application/json" enabled="true"/>
|
||||
</dynamicTypes>
|
||||
</httpCompression>
|
||||
</system.webServer>
|
||||
<appSettings>
|
||||
<!--<add key="JRE_IronIntelDb" value="Data Source=192.168.25.214;Initial Catalog=JRE_IRONINTEL;Integrated Security=false;User ID=fi;Password=database"/>-->
|
||||
<!--<add key="DbConntionString" value="Data Source=192.168.25.214;Initial Catalog=FORESIGHT_FLV_IICON_004;Integrated Security=false;User ID=fi;Password=database"/>-->
|
||||
<!--<add key="DbConntionString" value="Data Source=192.168.25.214;Initial Catalog=FORESIGHT_FLV_IICON_006;Integrated Security=false;User ID=fi;Password=database"/>-->
|
||||
<!--<add key="DbConntionString" value="Data Source=192.168.25.214;Initial Catalog=IRONINTEL_IRONDEALERS;Integrated Security=false;User ID=fi;Password=database"/>-->
|
||||
<!--<add key="DbConntionString" value="Data Source=192.168.25.214;Initial Catalog=IRONINTEL_IRONDEV;Integrated Security=false;User ID=fi;Password=database"/>-->
|
||||
<!--<add key="DbConntionString" value="Data Source=192.168.25.215\ironintel;Initial Catalog=IRONINTEL_IRONDEALERS;Integrated Security=false;User ID=fi;Password=database"/>-->
|
||||
<add key="DbConntionString" value="Data Source=192.168.25.215\ironintel;Initial Catalog=FORESIGHT_FLV_IICON004;Integrated Security=false;User ID=fi;Password=database" />
|
||||
<!-- <add key="DbConntionString" value="Data Source=192.168.25.215\ironintel;Initial Catalog=FORESIGHT_FLV_IICON_006;Integrated Security=false;User ID=fi;Password=database"/> -->
|
||||
<!--<add key="DbConntionString" value="Data Source=192.168.25.215\ironintel;Initial Catalog=IRONINTEL_IRONDEV;Integrated Security=false;User ID=fi;Password=database"/>-->
|
||||
<add key="JRE_IronIntelDb" value="Data Source=192.168.25.215\ironintel;Initial Catalog=JRE_IRONINTEL;Integrated Security=false;User ID=fi;Password=database" />
|
||||
<add key="AppVersion" value="2.17.1.19" />
|
||||
<add key="LastUpdateTime" value="10/17/2016 10:36:26.229" />
|
||||
<!--<add key="FleetAssetServiceAddress" value="http://192.168.25.210:5081/fleet/1/fleetsvc"/>-->
|
||||
<add key="FleetAssetServiceAddress" value="http://192.168.25.210:5081/fleet/2/fleetsvc" />
|
||||
</appSettings>
|
||||
<system.web>
|
||||
<compilation debug="true" targetFramework="4.7.2">
|
||||
<assemblies>
|
||||
<add assembly="netstandard, Version=2.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51" />
|
||||
</assemblies>
|
||||
</compilation>
|
||||
<httpRuntime targetFramework="4.5" executionTimeout="3600" maxRequestLength="20480"/>
|
||||
<!--<machineKey decryptionKey="FFAFF40DD223435D0736467A122ECE72A9FFB61CF257F794,IsolateApps" validationKey="6B98751EFBE7AC90FB8BE5EAAAD90EA7B487D79679D3E91043B081EB72E8F284B72DCC2EF362EE4CD47C830C923344A0331CDE4DAE50FA305114B623A90FFB9F,IsolateApps"/>-->
|
||||
<pages>
|
||||
<namespaces>
|
||||
<add namespace="IronIntel.Contractor"/>
|
||||
</namespaces>
|
||||
</pages>
|
||||
</system.web>
|
||||
<system.webServer>
|
||||
<staticContent>
|
||||
<remove fileExtension=".woff"/>
|
||||
<remove fileExtension=".woff2"/>
|
||||
<mimeMap fileExtension=".woff" mimeType="font/x-woff"/>
|
||||
<mimeMap fileExtension=".woff2" mimeType="application/font-woff2"/>
|
||||
</staticContent>
|
||||
<security>
|
||||
<requestFiltering>
|
||||
<requestLimits maxAllowedContentLength="102400000" />
|
||||
</requestFiltering>
|
||||
</security>
|
||||
<handlers>
|
||||
<add name="ficservice" path="ficservice" verb="*" type="FI.FIC.FICServiceHandler" />
|
||||
</handlers>
|
||||
<urlCompression doDynamicCompression="true" />
|
||||
<httpCompression>
|
||||
<dynamicTypes>
|
||||
<remove mimeType="application/json"/>
|
||||
<add mimeType="application/json" enabled="true"/>
|
||||
</dynamicTypes>
|
||||
</httpCompression>
|
||||
</system.webServer>
|
||||
<appSettings>
|
||||
<!--<add key="JRE_IronIntelDb" value="Data Source=192.168.25.214;Initial Catalog=JRE_IRONINTEL;Integrated Security=false;User ID=fi;Password=database"/>-->
|
||||
<!--<add key="DbConntionString" value="Data Source=192.168.25.214;Initial Catalog=FORESIGHT_FLV_IICON_004;Integrated Security=false;User ID=fi;Password=database"/>-->
|
||||
<!--<add key="DbConntionString" value="Data Source=192.168.25.214;Initial Catalog=FORESIGHT_FLV_IICON_006;Integrated Security=false;User ID=fi;Password=database"/>-->
|
||||
<!--<add key="DbConntionString" value="Data Source=192.168.25.214;Initial Catalog=IRONINTEL_IRONDEALERS;Integrated Security=false;User ID=fi;Password=database"/>-->
|
||||
<!--<add key="DbConntionString" value="Data Source=192.168.25.214;Initial Catalog=IRONINTEL_IRONDEV;Integrated Security=false;User ID=fi;Password=database"/>-->
|
||||
<!--<add key="DbConntionString" value="Data Source=192.168.25.215\ironintel;Initial Catalog=IRONINTEL_IRONDEALERS;Integrated Security=false;User ID=fi;Password=database"/>-->
|
||||
<add key="DbConntionString" value="Data Source=192.168.25.215\ironintel;Initial Catalog=FORESIGHT_FLV_IICON004;Integrated Security=false;User ID=fi;Password=database"/>
|
||||
<!--<add key="DbConntionString" value="Data Source=192.168.25.215\ironintel;Initial Catalog=FORESIGHT_FLV_IICON_006;Integrated Security=false;User ID=fi;Password=database"/>-->
|
||||
<!--<add key="DbConntionString" value="Data Source=192.168.25.215\ironintel;Initial Catalog=IRONINTEL_IRONDEV;Integrated Security=false;User ID=fi;Password=database"/>-->
|
||||
<add key="JRE_IronIntelDb" value="Data Source=192.168.25.215\ironintel;Initial Catalog=JRE_IRONINTEL;Integrated Security=false;User ID=fi;Password=database"/>
|
||||
<add key="AppVersion" value="2.17.1.19"/>
|
||||
<add key="LastUpdateTime" value="10/17/2016 10:36:26.229"/>
|
||||
<!--<add key="FleetAssetServiceAddress" value="http://192.168.25.210:5081/fleet/1/fleetsvc;http://192.168.25.210:5081/fleet/2/fleetsvc"/>-->
|
||||
<add key="FleetAssetServiceAddress" value="http://192.168.25.210:5081/fleet/2/fleetsvc"/>
|
||||
</appSettings>
|
||||
</configuration>
|
||||
@ -184,9 +184,9 @@ input[type="checkbox"], input[type="radio"] {
|
||||
.maskbg {
|
||||
top: 0;
|
||||
left: 0;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
position: absolute;
|
||||
right:0;
|
||||
bottom:0;
|
||||
position: fixed;
|
||||
background: #000;
|
||||
opacity: 0.2;
|
||||
/*margin: 0 4px;*/
|
||||
|
||||
@ -77,7 +77,11 @@
|
||||
}*/
|
||||
|
||||
.data-grid .data-grid-body .data-grid-row > td > span {
|
||||
display: flex;
|
||||
/*display: flex;*/
|
||||
}
|
||||
|
||||
.data-grid, .data-grid input[type=text] {
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
.status-cell {
|
||||
|
||||
@ -49,7 +49,7 @@
|
||||
// checkbox
|
||||
name: 'check',
|
||||
key: 'Selected',
|
||||
width: 30,
|
||||
width: 40,
|
||||
align: 'center',
|
||||
sortable: false,
|
||||
allcheck: true,
|
||||
|
||||
2
Site/js/lib/app.min.css
vendored
2
Site/js/lib/app.min.css
vendored
File diff suppressed because one or more lines are too long
16
Site/js/lib/app.min.js
vendored
16
Site/js/lib/app.min.js
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
2
Site/js/lib/ui.min.css
vendored
2
Site/js/lib/ui.min.css
vendored
File diff suppressed because one or more lines are too long
4
Site/js/lib/ui.min.js
vendored
4
Site/js/lib/ui.min.js
vendored
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
4
Site/js/lib/utility.min.js
vendored
4
Site/js/lib/utility.min.js
vendored
@ -1,4 +1,4 @@
|
||||
(function(i,c){typeof exports=="object"&&typeof module<"u"?c(exports):typeof define=="function"&&define.amd?define(["exports"],c):(i=typeof globalThis<"u"?globalThis:i||self,c(i["lib-utility"]={}))})(this,function(i){"use strict";function c(e,t,n){if(e==null)return;let r=`; domain=${location.host}; path=/`;if(n!=null){const l=new Date;l.setTime(l.getTime()+n*24*60*60*1e3),r+=`; expires=${l.toGMTString()}`}/^(https|wss):$/.test(location.protocol)&&(r+="; secure"),document.cookie=`${e}=${encodeURIComponent(t)}${r}`}function f(e){if(e==null)return null;e+="=";const t=document.cookie.split(";");for(let n of t)if(n=n.trim(),n.indexOf(e)===0)return decodeURIComponent(n.substring(e.length));return null}function $(e){c(e,"",-1)}function d(e){return/^(https?|wss?|ftp):/.test(e)||typeof consts>"u"?e:(consts.path||"")+e}function w(e,t={}){return fetch(d(e),{method:t.method||"GET",headers:{...t.customerHeaders,Accept:t.accept||"application/json"},signal:t.signal,cache:"default"})}function A(e,t,n={}){return t instanceof FormData||(typeof t!="string"&&(t=JSON.stringify(t)),n.customerHeaders==null&&(n.customerHeaders={}),n.customerHeaders["Content-Type"]==null&&(n.customerHeaders["Content-Type"]="application/json")),fetch(d(e),{method:n.method||"POST",headers:n.customerHeaders,body:t,signal:n.signal,cache:"no-cache"})}function O(e,t,n={}){return new Promise((r,l)=>{const a=new XMLHttpRequest;if(a.onreadystatechange=function(){this.readyState===XMLHttpRequest.DONE&&(this.status===200?r(this):l(`${this.status} ${this.statusText}: ${this.responseText}`))},typeof n.progress=="function"&&a.upload.addEventListener("progress",function(u){u.lengthComputable&&n.progress.call(this,u)},!1),a.open("POST",d(e)),n.customerHeaders!=null)for(let u of Object.entries(n.customerHeaders))a.setRequestHeader(u[0],u[1]);a.send(t)})}function o(e){return e==null||typeof e!="string"||e.length===0}function C(e,t,n){return o(e)||t==null?!1:(typeof t!="string"&&(t=String(t)),n?e.toLowerCase().indexOf(t.toLowerCase())>=0:e.indexOf(t)>=0)}function L(e,t){return o(e)||o(t)?!1:e.indexOf(t)===e.length-t.length}function N(e,t,n){return o(e)||isNaN(t)||t<=e.length?e:(n??" ").repeat(t-e.length)}function H(e){const t=/(http|ftp|https):\/\/.+?(\s|\r\n|\r|\n|\"|\'|\*|$)/g,n=e.match(t);if(e=m(e),(n==null?void 0:n.length)>0){const r=[];for(let l of n)l=l.replace(/["'\r\n ]/g,""),r.indexOf(l)<0&&r.push(l);for(let l of r)e=e.replaceAll(l,'<a target="_blank" href="'+l+'"><svg><use xlink:href="'+(typeof consts<"u"&&consts.path||"")+'fonts/fa-regular.svg#link"></use></svg></a>')}return e}function m(e){return e==null?"":String(e).replaceAll("&","&").replaceAll("<","<").replaceAll(">",">").replaceAll(`\r
|
||||
(function(i,c){typeof exports=="object"&&typeof module<"u"?c(exports):typeof define=="function"&&define.amd?define(["exports"],c):(i=typeof globalThis<"u"?globalThis:i||self,c(i["lib-utility"]={}))})(this,function(i){"use strict";function c(e,t,n){if(e==null)return;let r=`; domain=${location.host}; path=/`;if(n!=null){const l=new Date;l.setTime(l.getTime()+n*24*60*60*1e3),r+=`; expires=${l.toGMTString()}`}/^(https|wss):$/.test(location.protocol)&&(r+="; secure"),document.cookie=`${e}=${encodeURIComponent(t)}${r}`}function f(e){if(e==null)return null;e+="=";const t=document.cookie.split(";");for(let n of t)if(n=n.trim(),n.indexOf(e)===0)return decodeURIComponent(n.substring(e.length));return null}function k(e){c(e,"",-1)}function d(e){return/^(https?|wss?|ftp):/.test(e)||typeof consts>"u"?e:(consts.path||"")+e}function w(e,t={}){return fetch(d(e),{method:t.method||"GET",headers:{...t.customerHeaders,Accept:t.accept||"application/json"},signal:t.signal,cache:"default"})}function A(e,t,n={}){return t instanceof FormData||(typeof t!="string"&&(t=JSON.stringify(t)),n.customerHeaders==null&&(n.customerHeaders={}),n.customerHeaders["Content-Type"]==null&&(n.customerHeaders["Content-Type"]="application/json")),fetch(d(e),{method:n.method||"POST",headers:n.customerHeaders,body:t,signal:n.signal,cache:"no-cache"})}function O(e,t,n={}){return new Promise((r,l)=>{const a=new XMLHttpRequest;if(a.onreadystatechange=function(){this.readyState===XMLHttpRequest.DONE&&(this.status===200?r(this):l(`${this.status} ${this.statusText}: ${this.responseText}`))},typeof n.progress=="function"&&a.upload.addEventListener("progress",function(u){u.lengthComputable&&n.progress.call(this,u)},!1),a.open("POST",d(e)),n.customerHeaders!=null)for(let u of Object.entries(n.customerHeaders))a.setRequestHeader(u[0],u[1]);a.send(t)})}function o(e){return e==null||typeof e!="string"||e.length===0}function C(e,t,n){return o(e)||t==null?!1:(typeof t!="string"&&(t=String(t)),n?e.toLowerCase().indexOf(t.toLowerCase())>=0:e.indexOf(t)>=0)}function L(e,t){return o(e)||o(t)?!1:e.indexOf(t)===e.length-t.length}function N(e,t,n){return o(e)||isNaN(t)||t<=e.length?e:(n??" ").repeat(t-e.length)}function H(e){const t=/(http|ftp|https):\/\/.+?(\s|\r\n|\r|\n|\"|\'|\*|$)/g,n=e.match(t);if(e=m(e),(n==null?void 0:n.length)>0){const r=[];for(let l of n)l=l.replace(/["'\r\n ]/g,""),r.indexOf(l)<0&&r.push(l);for(let l of r)e=e.replaceAll(l,'<a target="_blank" href="'+l+'"><svg><use xlink:href="'+(typeof consts<"u"&&consts.path||"")+'fonts/fa-regular.svg#link"></use></svg></a>')}return e}function m(e){return e==null?"":String(e).replaceAll("&","&").replaceAll("<","<").replaceAll(">",">").replaceAll(`\r
|
||||
`,"<br/>").replaceAll(`
|
||||
`,"<br/>").replaceAll(" "," ")}let g;function h(){var n,r;let e;switch(typeof consts<"u"&&(e=f((n=consts.cookie)==null?void 0:n.lang),o(e)&&(e=(r=consts.user)==null?void 0:r.language)),o(e)&&(e=f("lgid")),o(e)&&(e=navigator.language||"en-us"),e=e.toLowerCase().replace(/-/g,"_"),o(e)&&(e="en"),e){case"en":case"en_au":case"fr":case"zh_cn":return e}const t=e.split("_")[0];switch(t){case"en":case"fr":return t}return"en"}function T(e){return typeof consts<"u"?(consts.prefix||"")+`res_${e}`:`res_${e}`}async function v(e=""){const t=h(),r=await(await w(`language/${t}${e}`)).json();return localStorage.setItem(T(t),JSON.stringify(r)),r}async function p(e,t){(t==null||typeof consts>"u")&&(t=await v(e));const n=Number(consts.resver);return(isNaN(t.ver)||isNaN(n)||n>t.ver)&&(console.log(`found new language res version: ${t.ver} => ${n}`),t=await v(e)),Object.defineProperty(t,"r",{writable:!1,configurable:!1,enumerable:!1,value:function(r,l){return s(this,r,l)}}),g=t,t}function s(e,t,n){return e[t]??n}function S(e,t){for(let n of e.querySelectorAll("[data-lgid]")){const r=n.dataset.lgid;n.tagName==="INPUT"?n.value=s(t,r,n.value):n.innerText=s(t,r,n.innerText)}for(let n of e.querySelectorAll("[data-title-lgid]")){const r=n.dataset.titleLgid;n.setAttribute("title",s(t,r,n.getAttribute("title")))}for(let n of e.querySelectorAll("[data-placeholder-lgid]")){const r=n.dataset.placeholderLgid;n.setAttribute("placeholder",s(t,r,n.getAttribute("placeholder")))}}async function P(e=document.body,t={}){const n=h();let r=localStorage.getItem(T(n)),l;if(r!=null)try{r=JSON.parse(r),l=await p(t.template,r)}catch(a){console.error("error while parsing lgres, try refresh ...",a),l=await p(t.template)}else l=await p(t.template);try{return document.readyState==="loading"?await new Promise((a,u)=>{let k=setTimeout(()=>u("timeout"),3e4);document.addEventListener("DOMContentLoaded",()=>{clearTimeout(k),k=void 0,typeof t.callback=="function"&&t.callback(l),S(e,l),a(l)})}):(typeof t.callback=="function"&&t.callback(l),S(e,l),l)}catch(a){console.error("error while loading language res ...",a)}}function y(e,t){return g!=null?s(g,e,t):t}const E={get current(){return h()},get unknownError(){return y("unknownError","An unknown error occurred, please contact the administrator.")},get savedSuccessfully(){return y("savedSuccessfully","Saved successfully.")}};let b=typeof globalThis<"u"?globalThis:self;function M(e){return!isNaN(e)&&e>0}function j(){return/mobile/i.test(navigator.userAgent)}function q(e,t=100,n=b,...r){if(e==null)return;e.tiid&&clearTimeout(e.tiid);const l=new Date;e.tdate==null||l-e.tdate>t?(e.apply(n,r),e.tdate=l):e.tiid=setTimeout(()=>e.apply(n,r),t)}function _(e,t=100,n=b,...r){e!=null&&(e.tiid&&clearTimeout(e.tiid),e.tiid=setTimeout(()=>e.apply(n,r),t))}function I(e){return(e>0?Math.floor:Math.ceil)(e)}function R(e){return/^\w[-\w.+]*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/.test(e)}function U(e){return/^[1-9]\d{9,}$/.test(e)}i.contains=C,i.debounce=_,i.deleteCookie=$,i.endsWith=L,i.escapeHtml=m,i.formatUrl=H,i.get=w,i.getCookie=f,i.global=b,i.init=P,i.isEmail=R,i.isMobile=j,i.isPhone=U,i.isPositive=M,i.lang=E,i.nullOrEmpty=o,i.padStart=N,i.post=A,i.r=y,i.setCookie=c,i.throttle=q,i.truncate=I,i.upload=O,Object.defineProperty(i,Symbol.toStringTag,{value:"Module"})});
|
||||
`,"<br/>").replaceAll(" "," ")}let g;function h(){var n,r;let e;switch(typeof consts<"u"&&(e=f((n=consts.cookie)==null?void 0:n.lang),o(e)&&(e=(r=consts.user)==null?void 0:r.language)),o(e)&&(e=f("lgid")),o(e)&&(e=navigator.language||"en-us"),e=e.toLowerCase().replace(/-/g,"_"),o(e)&&(e="en"),e){case"en":case"en_au":case"fr":case"zh_cn":return e}const t=e.split("_")[0];switch(t){case"en":case"fr":return t}return"en"}function T(e){return typeof consts<"u"?(consts.prefix||"")+`res_${e}`:`res_${e}`}async function v(e=""){const t=h(),r=await(await w(`language/${t}${e}`)).json();return localStorage.setItem(T(t),JSON.stringify(r)),r}async function p(e,t){(t==null||typeof consts>"u")&&(t=await v(e));const n=Number(consts.resver);return(isNaN(t.ver)||isNaN(n)||n>t.ver)&&(console.log(`found new language res version: ${t.ver} => ${n}`),t=await v(e)),Object.defineProperty(t,"r",{writable:!1,configurable:!1,enumerable:!1,value:function(r,l){return s(this,r,l)}}),g=t,t}function s(e,t,n){return e[t]??n}function S(e,t){for(let n of e.querySelectorAll("[data-lgid]")){const r=n.dataset.lgid;n.tagName==="INPUT"?n.value=s(t,r,n.value):n.innerText=s(t,r,n.innerText)}for(let n of e.querySelectorAll("[data-title-lgid]")){const r=n.dataset.titleLgid;n.setAttribute("title",s(t,r,n.getAttribute("title")))}for(let n of e.querySelectorAll("[data-placeholder-lgid]")){const r=n.dataset.placeholderLgid;n.setAttribute("placeholder",s(t,r,n.getAttribute("placeholder")))}}async function E(e=document.body,t={}){const n=h();let r=localStorage.getItem(T(n)),l;if(r!=null)try{r=JSON.parse(r),l=await p(t.template,r)}catch(a){console.error("error while parsing lgres, try refresh ...",a),l=await p(t.template)}else l=await p(t.template);try{return document.readyState==="loading"?await new Promise((a,u)=>{let $=setTimeout(()=>u("timeout"),3e4);document.addEventListener("DOMContentLoaded",()=>{clearTimeout($),$=void 0,typeof t.callback=="function"&&t.callback(l),S(e,l),a(l)})}):(typeof t.callback=="function"&&t.callback(l),S(e,l),l)}catch(a){console.error("error while loading language res ...",a)}}function y(e,t){return g!=null?s(g,e,t):t}const P={get current(){return h()},get unknownError(){return y("unknownError","An unknown error occurred, please contact the administrator.")},get savedSuccessfully(){return y("savedSuccessfully","Saved successfully.")}};let b=typeof globalThis<"u"?globalThis:self;function M(e){return!isNaN(e)&&e>0}function j(){return/mobile/i.test(navigator.userAgent)}function q(e,t=100,n=b,...r){if(e==null)return;e.tiid&&clearTimeout(e.tiid);const l=new Date;e.tdate==null||l-e.tdate>t?(e.apply(n,r),e.tdate=l):e.tiid=setTimeout(()=>e.apply(n,r),t)}function R(e,t=100,n=b,...r){e!=null&&(e.tiid&&clearTimeout(e.tiid),e.tiid=setTimeout(()=>e.apply(n,r),t))}function _(e){return(e>0?Math.floor:Math.ceil)(e)}function I(e){return/^\w[-\w.+]*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/.test(e)}function U(e){return!!(/^[1-9]\d{9,}$/.test(e)||/^\+?[1-9][\d-]{9,}\d$/.test(e)&&/^[1-9]\d{9,}$/.test(e.replace("+","").replace(new RegExp("-","g"),"")))}i.contains=C,i.debounce=R,i.deleteCookie=k,i.endsWith=L,i.escapeHtml=m,i.formatUrl=H,i.get=w,i.getCookie=f,i.global=b,i.init=E,i.isEmail=I,i.isMobile=j,i.isPhone=U,i.isPositive=M,i.lang=P,i.nullOrEmpty=o,i.padStart=N,i.post=A,i.r=y,i.setCookie=c,i.throttle=q,i.truncate=_,i.upload=O,Object.defineProperty(i,Symbol.toStringTag,{value:"Module"})});
|
||||
//# sourceMappingURL=utility.min.js.map
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -370,7 +370,7 @@ if (typeof (MapObject) !== "function") {
|
||||
this.showWeatherLayer = function (state) {
|
||||
if (state) {
|
||||
if (!this.WeatherLayer)
|
||||
this.WeatherLayer = new ArcGISDynamicMapServiceLayerC("https://nowcoast.noaa.gov/arcgis/rest/services/nowcoast/radar_meteo_imagery_nexrad_time/MapServer");
|
||||
this.WeatherLayer = new ArcGISDynamicMapServiceLayerC("https://new.nowcoast.noaa.gov/arcgis/rest/services/nowcoast/radar_meteo_imagery_nexrad_time/MapServer");
|
||||
this.WeatherLayer.refreshInterval = 5;
|
||||
this.MyMap.addLayer(this.WeatherLayer);
|
||||
}
|
||||
|
||||
@ -34,7 +34,7 @@ var default_page;
|
||||
fcancel();
|
||||
}
|
||||
mask.fadeOut(100);
|
||||
}, true);
|
||||
}, null, true);
|
||||
}
|
||||
window.showalert = function (msg, title, icon, next) {
|
||||
_dialog.showAlert(msg, title, icon, next, true);
|
||||
|
||||
@ -14,6 +14,10 @@
|
||||
clientId="4rtayAqWRTnOhEnC"
|
||||
clientSecret="6aca392a6b9e47739fff264e138ad7ab"
|
||||
matchAll="true"/>
|
||||
<serverUrl url="https://geocode.arcgis.com/arcgis/rest/services/World/GeocodeServer"
|
||||
clientId="4rtayAqWRTnOhEnC"
|
||||
clientSecret="6aca392a6b9e47739fff264e138ad7ab"
|
||||
matchAll="true"/>
|
||||
</serverUrls>
|
||||
</ProxyConfig>
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user