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

7
Site/AssetView/AssetMapView.aspx.cs
View File

@ -161,7 +161,7 @@ public partial class AssetMapView : ContractorBasePage
if (SystemParams.IsDealer)
{
AssetBasicInfo m = null;
var client = FleetServiceClientHelper.CreateClient<AssetQueryClient>();
var client = FleetServiceClientHelper.CreateClient<AssetQueryClient>(session.SessionID);
if (string.IsNullOrEmpty(machineid))
{
m = client.FromAdminAssetBasicInfoByVin(vin);
@ -190,11 +190,14 @@ public partial class AssetMapView : ContractorBasePage
private string GetCompanyID(string machineid, string vin)
{
var session = GetCurrentLoginSession();
if (session == null)
return null;
string companyid = "";
if (SystemParams.IsDealer)
{
AssetBasicInfo m = null;
var client = FleetServiceClientHelper.CreateClient<AssetQueryClient>();
var client = FleetServiceClientHelper.CreateClient<AssetQueryClient>(session.SessionID);
if (string.IsNullOrEmpty(machineid))
{
m = client.FromAdminAssetBasicInfoByVin(vin);

103
Site/AssetView/AssetTimeline.aspx
View File

@ -1,47 +1,54 @@
<%@ Page Title="" Language="C#" MasterPageFile="~/AssetView/AssetViewBase.master" AutoEventWireup="true" CodeFile="AssetTimeline.aspx.cs" Inherits="AssetView_AssetTimeline" %>
<asp:Content ID="Content1" ContentPlaceHolderID="head" Runat="Server">
<asp:Content ID="Content1" ContentPlaceHolderID="head" runat="Server">
<link href="<%=GetFileUrlWithVersion("../css/jquery.datetimepicker.css")%>" rel="stylesheet" />
<script src="<%=GetFileUrlWithVersion("../js/jquery.datetimepicker.full.js")%>"></script>
<style type="text/css">
.table-container {
margin: 4px 10px 0 26px;
}
.table-timeline {
width: 100%;
border-spacing: 0;
table-layout: fixed;
}
.table-timeline th {
width: 4.17%;
border-right: 1px solid white;
background: #444;
color: white;
font-weight: normal;
font-size: 13px;
height: 26px;
}
.table-timeline th,
.table-timeline td {
padding: 0;
}
.table-timeline th {
width: 4.17%;
border-right: 1px solid white;
background: #444;
color: white;
font-weight: normal;
font-size: 13px;
height: 26px;
}
.table-timeline th,
.table-timeline td {
padding: 0;
}
#td-timeline {
height: 30px;
position: relative;
}
#td-timeline div {
height: 26px;
position: absolute;
background: #64965a;
top: 2px;
border-radius: 6px;
}
#td-timeline div.no-start {
border-radius: 0 6px 6px 0;
}
#td-timeline div.no-end {
border-radius: 6px 0 0 6px;
}
#td-timeline div {
height: 26px;
position: absolute;
background: #64965a;
top: 2px;
border-radius: 6px;
}
#td-timeline div.no-start {
border-radius: 0 6px 6px 0;
}
#td-timeline div.no-end {
border-radius: 6px 0 0 6px;
}
</style>
<script type="text/javascript">
_network.root = '<%=Page.ResolveUrl("~/")%>';
@ -143,7 +150,7 @@
}
function OnRefresh(dt) {
if (dict.id != null) {
if (dict && dict.id != null) {
getAssetTimeline(dict.id, dt);
}
}
@ -159,15 +166,19 @@
}
</script>
</asp:Content>
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" Runat="Server">
<asp:Content ID="Content2" ContentPlaceHolderID="ContentPlaceHolder1" runat="Server">
<div class="table-container">
<div style="width: 100px; float: left">
<table class="table-timeline">
<thead>
<tr><th data-lgid="P_MV_TYPE">Type</th></tr>
<tr>
<th data-lgid="P_MV_TYPE">Type</th>
</tr>
</thead>
<tbody>
<tr><td style="height: 30px" data-lgid="P_MV_ONOFFEVENTS">On/Off Events</td></tr>
<tr>
<td style="height: 30px" data-lgid="P_MV_ONOFFEVENTS">On/Off Events</td>
</tr>
</tbody>
</table>
</div>
@ -175,12 +186,30 @@
<table class="table-timeline">
<thead>
<tr id="tr-header">
<th>0:00</th><th>1:00</th><th>2:00</th><th>3:00</th>
<th>4:00</th><th>5:00</th><th>6:00</th><th>7:00</th>
<th>8:00</th><th>9:00</th><th>10:00</th><th>11:00</th>
<th>12:00</th><th>13:00</th><th>14:00</th><th>15:00</th>
<th>16:00</th><th>17:00</th><th>18:00</th><th>19:00</th>
<th>20:00</th><th>21:00</th><th>22:00</th><th>23:00</th>
<th>0:00</th>
<th>1:00</th>
<th>2:00</th>
<th>3:00</th>
<th>4:00</th>
<th>5:00</th>
<th>6:00</th>
<th>7:00</th>
<th>8:00</th>
<th>9:00</th>
<th>10:00</th>
<th>11:00</th>
<th>12:00</th>
<th>13:00</th>
<th>14:00</th>
<th>15:00</th>
<th>16:00</th>
<th>17:00</th>
<th>18:00</th>
<th>19:00</th>
<th>20:00</th>
<th>21:00</th>
<th>22:00</th>
<th>23:00</th>
</tr>
</thead>
<tbody>

10
Site/AssetView/AssetViewBase.master
View File

@ -86,16 +86,6 @@
$(document.body).click(window.parent.ondocumentclick);
}
function resizeContent() {
$('#mask_bg').height($(document).outerHeight(false)).width($(document).outerWidth(false));
}
$(window).resize(function () {
resizeContent();
});
//window.onresize = resizeContent;
resizeContent();
window.ondocumentclick = function (e) {
$(document.body).click();
};

2
Site/AssetView/SingleAssetView.aspx
View File

@ -473,7 +473,7 @@
setTimeout(function () {
timelineLoaded = true;
OnRefresh();
});
},100);
});
$('#div_timeline').show();
}

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

@ -61,7 +61,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_MV_SCHEDULENAME", "Schedule Name"), valueIndex: 'PmScheduleName', css: { 'width': 200, 'text-align': 'left' } },
{ name: 'StartValue', caption: GetTextByKey("P_MV_INITIALSERVICEVALUE", "Initial Service Value"), valueIndex: 'StartValue', css: { 'width': 120, 'text-align': 'right' } },
{ name: 'LastAlertTimeString', caption: GetTextByKey("P_MV_LASTSERVICEDATE", "Last Service Date"), valueIndex: 'LastAlertTimeString', css: { 'width': 120, 'text-align': 'left' } },
@ -454,7 +454,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();