设备可视化健康表现统一秒

赖素文
1 parent c6d44d9b
Showing 3 changed files with 13 additions and 13 deletions
sys/Hh.Mes.POJO/ViewModel/Equipment/EquipmentHealthVM.cs
sys/Hh.Mes.Service/WebService/Equipment/EquipmentVisualService.cs
web/WebMvc/wwwroot/productjs/equipment/EquipmentVisual.js
@@ -12,15 +12,15 @@ namespace Hh.Mes.POJO.ViewModel.Equipment
  
     public class EquipmentStatusDto
     {
-        /// <summary>
-        /// 当天开机时间【小时】
-        /// </summary>
-        public double TodayPowerTime { get; set; }
-
-        /// <summary>
-        /// 本月开机时间 【小时】
-        /// </summary>
-        public double CurrentMonthPowerTime { get; set; }
+		/// <summary>
+		/// 当天开机时间【秒】
+		/// </summary>
+		public double TodayPowerTime { get; set; }
+
+		/// <summary>
+		/// 本月开机时间 【秒】
+		/// </summary>
+		public double CurrentMonthPowerTime { get; set; }
  
         /// <summary> 
         /// 空闲时间 秒
@@ -97,10 +97,10 @@ namespace Hh.Mes.Service.WebService.Equipment
             {
                 EquipmentStatus = new EquipmentStatusDto
                 {
-                    TodayPowerTime = TimeSpan.FromSeconds(records.Sum(x => x.statusDuration)).TotalHours,
+                    TodayPowerTime = TimeSpan.FromSeconds(records.Sum(x => x.statusDuration)).TotalSeconds,
                     CurrentMonthPowerTime = TimeSpan.FromSeconds(Context.Queryable<daq_equipment_status_record_history>()
                                                                         .Where(x => x.equipmentCode == model.equipmentCode &&  x.createTime >= currentMonthStartTime)
-                                                                        .Sum(x => x.statusDuration)).TotalHours,
+                                                                        .Sum(x => x.statusDuration)).TotalSeconds,
  
                     RunTime = runTimeSeconds,
                     FreeTime = freeTimeSeconds,
@@ -309,8 +309,8 @@ layui.config({
  
  
  
-                $("#TodayPowerTime").text(parseInt(data.equipmentHealth.EquipmentStatus.TodayPowerTime) + " (小时)")
-                $("#CurrentMonthPowerTime").text(parseInt(data.equipmentHealth.EquipmentStatus.CurrentMonthPowerTime) + " (小时)")
+                $("#TodayPowerTime").text(app.methods.convertSecondsToTime(data.equipmentHealth.EquipmentStatus.TodayPowerTime) )
+                $("#CurrentMonthPowerTime").text(app.methods.convertSecondsToTime(data.equipmentHealth.EquipmentStatus.CurrentMonthPowerTime) )
  
                 //占比和时间明细
                 $("#RunProportion").text(data.equipmentHealth.EquipmentStatus.RunProportion + "%")