滚动大屏修改

ZR.Model/MES/BI/carouselBoard/CarouselBoardDto.cs

@@ -280,6 +280,11 @@ namespace ZR.Model.mes.carouselBoard
         /// </summary>
         public string AlarmType { get; set; }
 
+        /// <summary>
+        /// 报警区域
+        /// </summary>
+        public string AlarmArea { get; set; }
+
         /// <summary>
         /// 报警内容
         /// </summary>
@@ -290,6 +295,11 @@ namespace ZR.Model.mes.carouselBoard
         /// </summary>
         public DateTime? AlarmTime { get; set; }
 
+        /// <summary>
+        /// 持续时间(秒)
+        /// </summary>
+        public int Duration { get; set; }
+
         /// <summary>
         /// 处理状态
         /// </summary>

ZR.Service/mes/BI/carouselBoard/CarouselBoardService.cs

@@ -90,10 +90,13 @@ namespace ZR.Service.MES.carouselBoard
                 .Select(it => new DeviceAlarmCarouseDto
                 {
                     Id = it.AlarmNo,
+                    AlarmArea = it.Area,
                     AlarmType = it.AlarmCircuit,
                     AlarmContent = it.MessageText,
                     AlarmTime = it.AlarmTime,
-                    HandleStatus = it.Status
+                    Duration = it.Duration.Value,
+                    HandleStatus = it.Status,
+                    
                 })
                 .ToList();
             return result;
@@ -173,7 +176,6 @@ namespace ZR.Service.MES.carouselBoard
             List<WorkOrderCarouseDto> workorders = Context
                 .Queryable<ProWorkorder_v2>()
                 .Where(it => it.Remark3 == "是") // 只获取有效的工单
-                .Where(it => it.Status == 1) // 只获取状态为1的工单
                 .Where(it => it.Year == currentYear) // 筛选当前年份
                 .Where(it => it.Week == currentWeek) // 筛选当前周
                 .Where(it => it.Date == currentDay) // 筛选当前日