This commit is contained in:
2023-04-28 12:21:24 +08:00
parent 156d145a48
commit 88e0a25ecd
162 changed files with 26324 additions and 7519 deletions

View File

@@ -80,6 +80,7 @@ namespace IronIntel.Contractor.Machines
/// 前端选择的时区的分钟偏移
/// </summary>
public int OffsetMinute { get; set; }
public string DataSource { get; set; }
}
public class CalampOdometerInfo
{
@@ -95,15 +96,15 @@ namespace IronIntel.Contractor.Machines
{
get
{
return AsofTime.ToString("MM/dd/yyyy HH:mm");
return AsofTime.ToString("M/d/yyyy h:m tt");
}
}
public DateTime AsofTime_Local { get; set; }
public DateTime AsofTimeLocal { get; set; }
public string EventTimeLocalText
{
get
{
return AsofTime_Local.ToString("MM/dd/yyyy HH:mm");
return AsofTimeLocal.ToString("M/d/yyyy h:m tt");
}
}
}
@@ -123,15 +124,41 @@ namespace IronIntel.Contractor.Machines
{
get
{
return AsofTime.ToString("MM/dd/yyyy HH:mm");
return AsofTime.ToString("M/d/yyyy h:m tt");
}
}
public DateTime AsofTime_Local { get; set; }
public DateTime AsofTimeLocal { get; set; }
public string EventTimeLocalText
{
get
{
return AsofTime_Local.ToString("MM/dd/yyyy HH:mm");
return AsofTimeLocal.ToString("M/d/yyyy h:m tt");
}
}
}
public class SmartWitnessOdometerInfo
{
public long AssetId { get; set; }
public string DeviceSN { get; set; }
public DateTime AsofTime { get; set; }
public string UOM { get; set; }
public double Gps { get; set; }
public double Gps_Calc { get; set; }
//public double VBUS { get; set; }
//public double VBUS_Calc { get; set; }
public string EventTimeText
{
get
{
return AsofTime.ToString("M/d/yyyy h:m tt");
}
}
public DateTime AsofTimeLocal { get; set; }
public string EventTimeLocalText
{
get
{
return AsofTimeLocal.ToString("M/d/yyyy h:m tt");
}
}
}
@@ -150,14 +177,16 @@ namespace IronIntel.Contractor.Machines
{
public long LogId { get; set; }
public long AssetId { get; set; }
public string DisplayName { get; set; }//Asset Name
public string VIN { get; set; }
public DateTime AdjustmentTime { get; set; }
public string AdjustmentTimeText { get { return AdjustmentTime.ToString("MM/dd/yyyy HH:mm"); } }
public string AdjustmentTimeText { get { return AdjustmentTime.ToString("M/d/yyyy h:m tt"); } }
public DateTime OdometerTime { get; set; }
public string OdometerTimeText { get { return OdometerTime.ToString("MM/dd/yyyy HH:mm"); } }
public string OdometerTimeText { get { return OdometerTime.ToString("M/d/yyyy h:m tt"); } }
public DateTime AdjustmentLocalTime { get; set; }
public string AdjustmentLocalTimeText { get { return AdjustmentLocalTime.ToString("MM/dd/yyyy HH:mm"); } }
public string AdjustmentLocalTimeText { get { return AdjustmentLocalTime.ToString("M/d/yyyy h:m tt"); } }
public DateTime OdometerLocalTime { get; set; }
public string OdometerLocalTimeText { get { return OdometerLocalTime.ToString("MM/dd/yyyy HH:mm"); } }
public string OdometerLocalTimeText { get { return OdometerLocalTime.ToString("M/d/yyyy h:m tt"); } }
private double _Odometer;
public double Odometer