diff --git a/DataVAPI.Tools/IOT/ScreenMonitorModel.cs b/DataVAPI.Tools/IOT/ScreenMonitorModel.cs index 9b20b36..b3f9e04 100644 --- a/DataVAPI.Tools/IOT/ScreenMonitorModel.cs +++ b/DataVAPI.Tools/IOT/ScreenMonitorModel.cs @@ -194,12 +194,12 @@ namespace DataVAPI.Tool.IOT if (_B_Month > 0) { MonthColor = new ALYColor { r = 18, g = 186, b = 96, a = 1 }; - B_MonthStr = $"增长 {_B_Year}%"; + B_MonthStr = $"增长 {_B_Month}%"; } else { MonthColor = new ALYColor { r = 255, g = 0, b = 0, a = 1 }; - B_MonthStr = $"下降 {_B_Year}%"; + B_MonthStr = $"下降 {_B_Month}%"; } } } @@ -216,12 +216,12 @@ namespace DataVAPI.Tool.IOT if (_B_Day > 0) { DayColor = new ALYColor { r = 18, g = 186, b = 96, a = 1 }; - B_DayStr = $"增长 {_B_Year}%"; + B_DayStr = $"增长 {_B_Day}%"; } else { DayColor = new ALYColor { r = 255, g = 0, b = 0, a = 1 }; - B_DayStr = $"下降 {_B_Year}%"; + B_DayStr = $"下降 {_B_Day}%"; } } } diff --git a/DataVAPI/UpAndDown/ProcessServer.cs b/DataVAPI/UpAndDown/ProcessServer.cs index 439a0fc..a1b1338 100644 --- a/DataVAPI/UpAndDown/ProcessServer.cs +++ b/DataVAPI/UpAndDown/ProcessServer.cs @@ -233,11 +233,7 @@ namespace DataVAPI.UpAndDown devModel.OrderDataState = orderProvider.GetAllOrderDataState(new DataVApi.Order.RequestModel.FullScreenInput()); devModel.LocSale = orderProvider.GetLocSale(); object obj = orderProvider.OrderNumber(new DataVApi.Order.RequestModel.FullScreenBasic()); - OrderCount orderCount = Tools.JsonToObjectTools(Tools.JsonConvertTools(obj)); - orderCount.B_Month = orderCount.B_Month; - orderCount.B_Year = orderCount.B_Year; - orderCount.B_Day = orderCount.B_Day; - devModel.OrderNumber = orderCount; + devModel.OrderNumber = Tools.JsonToObjectTools(Tools.JsonConvertTools(obj)); ScreenMonitorModel screen1Monitor = Tools.JsonToObjectTools(devModel.ToJSON()); #region 1.设置data默认值 if (screen1Monitor.operatingDeviceStatus.data.Count == 0)