KWD преди 6 месеца
родител
ревизия
3b95985c80

+ 1 - 1
TeamAAS-VM/Core/FileNameTemplate.cs

@@ -90,7 +90,7 @@ namespace TeamAAS_VP.Core
             // 日期时间变量
             RegisterVariable("Now", () => DateTime.Now);
             RegisterVariable("Today", () => DateTime.Today);
-            RegisterVariable("UtcNow", () => DateTime.UtcNow);
+            RegisterVariable("Now", () => DateTime.Now);
 
             // 可以在这里添加更多内置变量
         }

+ 2 - 29
TeamAAS-VM/Core/Management.cs

@@ -2138,7 +2138,7 @@ namespace TeamAAS_VP.Core
                                             SendTaskMessage($"收到{i}过站检查请求(当站是否生产)...", MessageLevel.Debug);
                                         }
 
-                                        _LastMesCheckTime[i] = DateTime.UtcNow;
+                                        _LastMesCheckTime[i] = DateTime.Now;
                                         LogHelper.WriteLogMes($"【mes开始QUERY】");
                                         SendTaskMessage($"mes开始QUERY", MessageLevel.Info);
                                         if (systemConfig.IsBasePartCodeGetSN)//是否基于零件码,判断是否过站
@@ -2295,7 +2295,7 @@ namespace TeamAAS_VP.Core
                                         string pressure = string.Join(",", pressureList);
                                         string turn = string.Join(",", turnList);
                                         //这里现在上传的结果都是锁付站的,如果存在其他附属站的数据需要上传时,将不适用,要根据实际情况进行调整
-                                        (bool isSuccess, string response) = await _mesService.SubmitGetAsync(ProductMainSN[i], "", torque, pressure, turn, resultIndex == 1 ? true : false, _LastMesCheckTime[i], DateTime.UtcNow);
+                                        (bool isSuccess, string response) = await _mesService.SubmitGetAsync(ProductMainSN[i], "", torque, pressure, turn, resultIndex == 1 ? true : false, _LastMesCheckTime[i], serverTimeResult.Now);
                                         if (isSuccess)
                                         {
                                             LogHelper.WriteLogMes($"上传mes成功");
@@ -2400,33 +2400,6 @@ namespace TeamAAS_VP.Core
                                                         });
                                                     }
                                                 }
-                                                //else
-                                                //{
-                                                //    DFC.Add(new DataFormCtq
-                                                //    {
-                                                //        PPID = ProductMainSN[i],
-                                                //        PROCESS_NAME = stationConfig.DataInfo.PROCESS_NAME,
-                                                //        PROCESS_START_TIME = _LastMesCheckTime[i].ToString(),
-                                                //        CTQ_NAME = "Pressure",
-                                                //        CTQ_VALUE = lockResult.Pressure,
-                                                //        CTQ_LSL = stationConfig.DataInfo.CTQ_LSL_Pressure,
-                                                //        CTQ_USL = stationConfig.DataInfo.CTQ_USL_Pressure,
-                                                //        PROCESS_END_TIME = serverTimeResult.Now.ToString(),
-                                                //        SUPPLIER_NAME = stationConfig.DataInfo.SUPPLIER_NAME,
-                                                //        COMMODITY_TYPE = stationConfig.DataInfo.COMMODITY_TYPE,
-                                                //        REVISION = stationConfig.DataInfo.REVISION,
-                                                //        WO = wo,
-                                                //        MFG_LOT = stationConfig.DataInfo.MFG_LOT,
-                                                //        MFG_ASSY_LINE = stationConfig.DataInfo.MFG_ASSY_LINE,
-                                                //        PROCESS_OUTCOME = pressureRes ? "PASS" : "FAIL",
-                                                //        PROCESS_MACHINE_ID = stationConfig.DataInfo.PROCESS_MACHINE_ID,
-                                                //        CTQ_UNIT_OF_MEASURE = "N",
-                                                //        ERROR_MESSAGE = pressureRes ? "" : "Pressure_Spec OOS"
-                                                //    });
-                                                //    //压力值
-                                                //    //dataItems.Add("Pressure", pressure);
-                                                //    recordResult = RecordOtherStationResult(i, dataItems, ProductMainSN[i], serverTimeResult.Now.Subtract(_LastMesCheckTime[i]).TotalSeconds, _LastMesCheckTime[i], stationConfig.SaveCsvPath);
-                                                //}
                                                 recordResult = RecordStationResult(i, DFC, ProductMainSN[i], serverTimeResult.Now.Subtract(_LastMesCheckTime[i]).TotalSeconds, _LastMesCheckTime[i], stationConfig.SaveCsvPath);
                                                 if (recordResult)
                                                 {

+ 2 - 2
TeamAAS-VM/Core/Robots/XYZU_Robot.cs

@@ -548,7 +548,7 @@ namespace TeamAAS_VP.Core.Robots
                 foreach (var node in actNodes)
                 {
                     lastPos[node] = float.NaN;
-                    lastChange[node] = DateTime.UtcNow;
+                    lastChange[node] = DateTime.Now;
                 }
 
                 const float movementThreshold = 0.01f; // 判断位置变化的阈值,避免噪声
@@ -570,7 +570,7 @@ namespace TeamAAS_VP.Core.Robots
                         // 如果读取失败,继续让 CheckMoveFinished 来处理状态或超时
                     }
 
-                    var now = DateTime.UtcNow;
+                    var now = DateTime.Now;
 
                     // 更新每个节点的变化时间:只要任意一个轴在最近 Timeout 时间内有变化,就视为系统仍在运动
                     foreach (var node in actNodes)

+ 26 - 26
TeamAAS-VM/Data/SystemDatabaseService.cs

@@ -128,7 +128,7 @@ namespace TeamAAS_VP.Data
             {
                 UserId = userId,
                 Success = true,
-                Time = DateTime.UtcNow,
+                Time = DateTime.Now,
                 Message = "Set as current user"
             };
 
@@ -148,7 +148,7 @@ namespace TeamAAS_VP.Data
             {
                 UserId = user.Id,
                 Success = true,
-                Time = DateTime.UtcNow,
+                Time = DateTime.Now,
                 Message = user.UserName
             };
             await RecordUserLoginAsync(rec);
@@ -192,7 +192,7 @@ namespace TeamAAS_VP.Data
         public async Task RecordUserLoginAsync(UserLoginRecord record)
         {
             if (record == null) throw new ArgumentNullException(nameof(record));
-            if (record.Time == default(DateTime)) record.Time = DateTime.UtcNow;
+            if (record.Time == default(DateTime)) record.Time = DateTime.Now;
             await _db.Insertable(record).ExecuteCommandAsync();
         }
 
@@ -399,9 +399,9 @@ namespace TeamAAS_VP.Data
         public async Task<int> GetTodayProductionAsync(string productName)
         {
             //今天的起始时间
-            var todayStart = DateTime.UtcNow.Date;
+            var todayStart = DateTime.Now.Date;
             //今天的结束时间
-            var todayEnd = DateTime.UtcNow.Date;
+            var todayEnd = DateTime.Now.Date;
             todayEnd = todayEnd.AddDays(1);
             //按照产品名称和时间范围查询生产记录的总数
             var total = await _db.Queryable<ProductionRecord>()
@@ -417,8 +417,8 @@ namespace TeamAAS_VP.Data
         /// <returns></returns>
         public async Task<int> GetLastHourProductionAsync(string productName)
         {
-            var lastHourStart = DateTime.UtcNow.AddHours(-1);
-            var lastHourEnd = DateTime.UtcNow;
+            var lastHourStart = DateTime.Now.AddHours(-1);
+            var lastHourEnd = DateTime.Now;
             //按照产品名称和时间范围查询生产记录的总数
             var total = await _db.Queryable<ProductionRecord>()
                 .Where(r => r.ProductName == productName && r.Timestamp >= lastHourStart && r.Timestamp < lastHourEnd)
@@ -434,7 +434,7 @@ namespace TeamAAS_VP.Data
         public Task<int> GetCurrentMonthProductionAsync(string productName)
         {
 
-            var now = DateTime.UtcNow;
+            var now = DateTime.Now;
             var monthStart = new DateTime(now.Year, now.Month, 1);
             var monthEnd = monthStart.AddMonths(1);
             //按照产品名称和时间范围查询生产记录的总数
@@ -451,7 +451,7 @@ namespace TeamAAS_VP.Data
         /// <returns></returns>
         public Task<int> GetCurrentWeekProductionAsync(string productName)
         {
-            var now = DateTime.UtcNow;
+            var now = DateTime.Now;
             var weekStart = FirstDayOfWeek(now);
             var weekEnd = weekStart.AddDays(7);
             //按照产品名称和时间范围查询生产记录的总数
@@ -524,7 +524,7 @@ namespace TeamAAS_VP.Data
         /// <returns></returns>
         public async Task<Dictionary<DateTime, Dictionary<string, int>>> GetMonthlyProductionByDayAndCategoryAsync(string productName)
         {
-            var now = DateTime.UtcNow;
+            var now = DateTime.Now;
             var monthStart = new DateTime(now.Year, now.Month, 1);
             var monthEnd = monthStart.AddMonths(1);
             var list = await _db.Queryable<ProductionRecord>()
@@ -549,7 +549,7 @@ namespace TeamAAS_VP.Data
         /// <returns></returns>
         public async Task<Dictionary<int, Dictionary<string, int>>> GetWeeklyProductionByDayAndCategoryAsync(string productName)
         {
-            var now = DateTime.UtcNow;
+            var now = DateTime.Now;
             var weekStart = FirstDayOfWeek(now);
             var weekEnd = weekStart.AddDays(7);
             var list = await _db.Queryable<ProductionRecord>()
@@ -573,7 +573,7 @@ namespace TeamAAS_VP.Data
         /// <returns></returns>
         public async Task<Dictionary<int, Dictionary<string, int>>> GetDailyProductionByHourAndCategoryAsync(string productName)
         {
-            var now = DateTime.UtcNow;
+            var now = DateTime.Now;
             var dayStart = now.Date;
             var dayEnd = dayStart.AddDays(1);
             var list = await _db.Queryable<ProductionRecord>()
@@ -616,7 +616,7 @@ namespace TeamAAS_VP.Data
         public async Task RecordAlarmAsync(AlarmRecord alarm)
         {
             if (alarm == null) throw new ArgumentNullException(nameof(alarm));
-            if (alarm.Time == default(DateTime)) alarm.Time = DateTime.UtcNow;
+            if (alarm.Time == default(DateTime)) alarm.Time = DateTime.Now;
             await _db.Insertable(alarm).ExecuteCommandAsync();
         }
 
@@ -649,7 +649,7 @@ namespace TeamAAS_VP.Data
             try
             {
                 if (result == null) throw new ArgumentNullException(nameof(result));
-                if (result.Timestamp == default(DateTime)) result.Timestamp = DateTime.UtcNow;
+                if (result.Timestamp == default(DateTime)) result.Timestamp = DateTime.Now;
                 await _db.Insertable(result).ExecuteCommandAsync();
             }
             catch (Exception)
@@ -703,7 +703,7 @@ namespace TeamAAS_VP.Data
         public async Task RecordScrewFeederBatchAsync(ScrewFeederBatchRecord record)
         {
             if (record == null) throw new ArgumentNullException(nameof(record));
-            if (record.ChangeTime == default(DateTime)) record.ChangeTime = DateTime.UtcNow;
+            if (record.ChangeTime == default(DateTime)) record.ChangeTime = DateTime.Now;
             record.Id = record.Id == Guid.Empty ? Guid.NewGuid() : record.Id;
             await _db.Insertable(record).ExecuteCommandAsync();
         }
@@ -777,7 +777,7 @@ namespace TeamAAS_VP.Data
         public async Task RecordPhotoCaptureAsync(PhotoCaptureRecord record)
         {
             if (record == null) throw new ArgumentNullException(nameof(record));
-            if (record.CaptureTime == default(DateTime)) record.CaptureTime = DateTime.UtcNow;
+            if (record.CaptureTime == default(DateTime)) record.CaptureTime = DateTime.Now;
             record.Id = record.Id == Guid.Empty ? Guid.NewGuid() : record.Id;
             await _db.Insertable(record).ExecuteCommandAsync();
         }
@@ -831,7 +831,7 @@ namespace TeamAAS_VP.Data
         public async Task RecordHeadChangeAsync(HeadChangeRecord record)
         {
             if (record == null) throw new ArgumentNullException(nameof(record));
-            if (record.ChangeTime == default(DateTime)) record.ChangeTime = DateTime.UtcNow;
+            if (record.ChangeTime == default(DateTime)) record.ChangeTime = DateTime.Now;
             record.Id = record.Id == Guid.Empty ? Guid.NewGuid() : record.Id;
             await _db.Insertable(record).ExecuteCommandAsync();
         }
@@ -895,7 +895,7 @@ namespace TeamAAS_VP.Data
                 {
                     var newRec = new HeadChangeRecord
                     {
-                        ChangeTime = DateTime.UtcNow,
+                        ChangeTime = DateTime.Now,
                         HeadBatchNumber = string.Empty,
                         CurrentLockCount = 1,
                         OperatorName = operatorName
@@ -928,7 +928,7 @@ namespace TeamAAS_VP.Data
         public async Task RecordNozzleChangeAsync(NozzleChangeRecord record)
         {
             if (record == null) throw new ArgumentNullException(nameof(record));
-            if (record.ChangeTime == default(DateTime)) record.ChangeTime = DateTime.UtcNow;
+            if (record.ChangeTime == default(DateTime)) record.ChangeTime = DateTime.Now;
             record.Id = record.Id == Guid.Empty ? Guid.NewGuid() : record.Id;
             await _db.Insertable(record).ExecuteCommandAsync();
         }
@@ -975,7 +975,7 @@ namespace TeamAAS_VP.Data
                 {
                     var newRec = new NozzleChangeRecord
                     {
-                        ChangeTime = DateTime.UtcNow,
+                        ChangeTime = DateTime.Now,
                         NozzleBatchNumber = string.Empty,
                         CurrentLockCount = 1,
                         OperatorName = operatorName
@@ -1026,7 +1026,7 @@ namespace TeamAAS_VP.Data
             {
                 var record = new NozzleChangeRecord
                 {
-                    ChangeTime = DateTime.UtcNow.AddMinutes(-i * 10),
+                    ChangeTime = DateTime.Now.AddMinutes(-i * 10),
                     NozzleBatchNumber = $"Batch-{i}",
                     CurrentLockCount = i,
                     OperatorName = $"Operator-{i}"
@@ -1039,7 +1039,7 @@ namespace TeamAAS_VP.Data
             {
                 var record = new HeadChangeRecord
                 {
-                    ChangeTime = DateTime.UtcNow.AddMinutes(-i * 15),
+                    ChangeTime = DateTime.Now.AddMinutes(-i * 15),
                     HeadBatchNumber = $"HeadBatch-{i}",
                     CurrentLockCount = i,
                     OperatorName = $"HeadOperator-{i}"
@@ -1052,7 +1052,7 @@ namespace TeamAAS_VP.Data
             {
                 var record = new ScrewFeederBatchRecord
                 {
-                    ChangeTime = DateTime.UtcNow.AddMinutes(-i * 20),
+                    ChangeTime = DateTime.Now.AddMinutes(-i * 20),
                     BatchNumber = $"ScrewBatch-{i}",
                     FeederNumber = i + 1
                 };
@@ -1068,7 +1068,7 @@ namespace TeamAAS_VP.Data
                     ProductName = "产品1",
                     Category = (i % 2 == 0) ? "OK" : "NG",
                     Quantity = 1,
-                    Timestamp = DateTime.UtcNow.AddMinutes(-i * 5),
+                    Timestamp = DateTime.Now.AddMinutes(-i * 5),
                     UserName = "TestUser",
                     Remark = $"TotalSeconds:1.10"
                 };
@@ -1081,7 +1081,7 @@ namespace TeamAAS_VP.Data
                 var result = new LockResult(i % 4, $"PN-{i % 5}", 10.5f, 0.3f, (i % 3 != 0))
                 {
                     ProductName = "产品1",
-                    Timestamp = DateTime.UtcNow.AddMinutes(-i * 3),
+                    Timestamp = DateTime.Now.AddMinutes(-i * 3),
                 };
                 await RecordLockResultAsync(result);
             }
@@ -1098,7 +1098,7 @@ namespace TeamAAS_VP.Data
                         CameraName = $"下相机",
                         ProductSN = $"SN-{i}",
                         IsSuccess = (i % 2 == 0),
-                        CaptureTime = DateTime.UtcNow.AddMinutes(-i * 7),
+                        CaptureTime = DateTime.Now.AddMinutes(-i * 7),
                         ImagePath = $"/images/photo_{i}.jpg"
                     };
                     await RecordPhotoCaptureAsync(record);

+ 1 - 1
TeamAAS-VM/Models/AlarmRecord.cs

@@ -26,6 +26,6 @@ namespace TeamAAS_VP.Models
         [SugarColumn(Length = 255, IsNullable = true)]
         public string Source { get; set; }
 
-        public DateTime Time { get; set; } = DateTime.UtcNow;
+        public DateTime Time { get; set; } = DateTime.Now;
     }
 }

+ 1 - 1
TeamAAS-VM/Models/HeadChangeRecord.cs

@@ -12,7 +12,7 @@ namespace TeamAAS_VP.Models
         /// <summary>
         /// ¸ü»»Ê±¼ä
         /// </summary>
-        public DateTime ChangeTime { get; set; } = DateTime.UtcNow;
+        public DateTime ChangeTime { get; set; } = DateTime.Now;
 
         /// <summary>
         /// ÅûÍ·ÅúºÅ

+ 1 - 1
TeamAAS-VM/Models/NozzleChangeRecord.cs

@@ -12,7 +12,7 @@ namespace TeamAAS_VP.Models
         /// <summary>
         /// ¸ü»»Ê±¼ä
         /// </summary>
-        public DateTime ChangeTime { get; set; } = DateTime.UtcNow;
+        public DateTime ChangeTime { get; set; } = DateTime.Now;
 
         /// <summary>
         /// Îü×ìÅúºÅ

+ 1 - 1
TeamAAS-VM/Models/PhotoCaptureRecord.cs

@@ -12,7 +12,7 @@ namespace TeamAAS_VP.Models
         /// <summary>
         /// ÅÄÕÕʱ¼ä
         /// </summary>
-        public DateTime CaptureTime { get; set; } = DateTime.UtcNow;
+        public DateTime CaptureTime { get; set; } = DateTime.Now;
 
         /// <summary>
         /// Åä·½Ãû

+ 1 - 1
TeamAAS-VM/Models/ProductionRecord.cs

@@ -28,7 +28,7 @@ namespace TeamAAS_VP.Models
         [SugarColumn(Length = 255, IsNullable = true)]
         public string DeviceName { get; set; }
 
-        public DateTime Timestamp { get; set; } = DateTime.UtcNow;
+        public DateTime Timestamp { get; set; } = DateTime.Now;
         /// <summary>
         /// Category like "OK", "NG", etc.
         /// </summary>

+ 1 - 1
TeamAAS-VM/Models/ScrewFeederBatchRecord.cs

@@ -23,7 +23,7 @@ namespace TeamAAS_VP.Models
         /// <summary>
         /// 更换批次的时间
         /// </summary>
-        public DateTime ChangeTime { get; set; } = DateTime.UtcNow;
+        public DateTime ChangeTime { get; set; } = DateTime.Now;
 
         /// <summary>
         /// 操作员姓名

+ 1 - 1
TeamAAS-VM/Models/UserLoginRecord.cs

@@ -11,7 +11,7 @@ namespace TeamAAS_VP.Models
 
         public int UserId { get; set; }
 
-        public DateTime Time { get; set; } = DateTime.UtcNow;
+        public DateTime Time { get; set; } = DateTime.Now;
 
         public bool Success { get; set; }
 

+ 2 - 2
TeamAAS-VM/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@ using System.Windows;
 //可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*",如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2.2.1")]
-[assembly: AssemblyFileVersion("1.2.2.1")]
+[assembly: AssemblyVersion("1.2.2.2")]
+[assembly: AssemblyFileVersion("1.2.2.2")]

+ 1 - 1
TeamAAS-VM/Services/ConfigService.cs

@@ -1519,7 +1519,7 @@ namespace TeamAAS_VP.Services
                 {
                     BatchNumber = batchNumber,
                     PackSize = packSize,
-                    ChangeTime = DateTime.UtcNow,
+                    ChangeTime = DateTime.Now,
                     RemainingCount = remainingAfter,
                     FeederNumber = feederNumber,
                     FeederName = feederName,

+ 4 - 4
TeamAAS-VM/Services/RemoteCommandService.cs

@@ -714,10 +714,10 @@ namespace TeamAAS_VP.Services
             var token = _cycleTimingCts.Token;
             Task.Run(async () =>
             {
-                var startTime = DateTime.UtcNow;
+                var startTime = DateTime.Now;
                 while (!token.IsCancellationRequested)
                 {
-                    var elapsed = DateTime.UtcNow - startTime;
+                    var elapsed = DateTime.Now - startTime;
                     OnCycleTimingTicked(elapsed);
                     await Task.Delay(100, token);
                 }
@@ -749,7 +749,7 @@ namespace TeamAAS_VP.Services
                 Category = countItem,
                 ProductName = _productService.GetCurrentProduct()?.Name ?? "Unknown",
                 Quantity = 1,
-                Timestamp = DateTime.UtcNow
+                Timestamp = DateTime.Now
             });
             return Task.FromResult(true);
         }
@@ -788,7 +788,7 @@ namespace TeamAAS_VP.Services
                 Code = alarmCode,
                 Message = alarmDescription,
                 Source = "Unknown",
-                Time = DateTime.UtcNow
+                Time = DateTime.Now
             });
             return Task.FromResult(true);
         }

+ 3 - 3
TeamAAS-VM/ViewModels/Home/AddScrewViewModel.cs

@@ -141,7 +141,7 @@ namespace TeamAAS_VP.ViewModels.Home
                 SelectedFeeder.BatchNumber = refreshed.BatchNumber;
                 CurrentBatchNumber = refreshed.BatchNumber;
                 RemainingCount = refreshed.RemainingCount;
-                LastAddTime = DateTime.UtcNow.ToString("u");
+                LastAddTime = DateTime.Now.ToString("u");
             }
             Management management = _container.Resolve<Management>();
             if (SelectedFeeder.FeederNumber == 1)
@@ -156,7 +156,7 @@ namespace TeamAAS_VP.ViewModels.Home
                 {
                     BatchNumber = NewBatchNumber,
                     PackSize = SelectedFeeder.PackSize,
-                    ChangeTime = DateTime.UtcNow,
+                    ChangeTime = DateTime.Now,
                     RemainingCount = SelectedFeeder.RemainingCount,
                     FeederNumber = SelectedFeeder.FeederNumber,
                     FeederName = SelectedFeeder.Name,
@@ -182,7 +182,7 @@ namespace TeamAAS_VP.ViewModels.Home
                 SelectedFeeder.BatchNumber = refreshed.BatchNumber;
                 CurrentBatchNumber = refreshed.BatchNumber;
                 RemainingCount = refreshed.RemainingCount;
-                LastAddTime = DateTime.UtcNow.ToString("u");
+                LastAddTime = DateTime.Now.ToString("u");
             }
             Management management = _container.Resolve<Management>();
             if (SelectedFeeder.FeederNumber==1)

+ 1 - 1
TeamAAS-VM/ViewModels/User/CardLoginWindowViewModel.cs

@@ -246,7 +246,7 @@ namespace TeamAAS_VP.ViewModels.User
 
                     // mark current user in system DB and record login
                     await _systemDatabaseService.SetCurrentUserAsync(user.Id);
-                    await _systemDatabaseService.RecordUserLoginAsync(new UserLoginRecord { UserId = user.Id, Success = true, Time = DateTime.UtcNow, Message = "Login success" });
+                    await _systemDatabaseService.RecordUserLoginAsync(new UserLoginRecord { UserId = user.Id, Success = true, Time = DateTime.Now, Message = "Login success" });
                     _eventAggregator.GetEvent<UserLoginNotification>().Publish(user);
                     View.DialogResult = true;
                 }

+ 2 - 2
TeamAAS-VM/ViewModels/User/LoginViewModel.cs

@@ -151,7 +151,7 @@ namespace TeamAAS_VP.ViewModels.User
 
                     // mark current user in system DB and record login
                     await _systemDatabaseService.SetCurrentUserAsync(user.Id);
-                    //await _systemDatabaseService.RecordUserLoginAsync(new UserLoginRecord { UserId = user.Id, Success = true, Time = DateTime.UtcNow, Message = "Login success" });
+                    //await _systemDatabaseService.RecordUserLoginAsync(new UserLoginRecord { UserId = user.Id, Success = true, Time = DateTime.Now, Message = "Login success" });
 
                     _eventAggregator.GetEvent<SnackbarMessageNotification>().Publish(new MessageParameter() { Msg = $"{Lang.登录成功}!", Duration = 1 });
                     _eventAggregator.GetEvent<UserLoginNotification>().Publish(user);
@@ -160,7 +160,7 @@ namespace TeamAAS_VP.ViewModels.User
             catch (Exception ex)
             {
                 // authentication failed or error
-                await _systemDatabaseService.RecordUserLoginAsync(new UserLoginRecord { UserId = 0, Success = false, Time = DateTime.UtcNow, Message = $"Login failed for {SelectedUserName}: {ex.Message}" });
+                await _systemDatabaseService.RecordUserLoginAsync(new UserLoginRecord { UserId = 0, Success = false, Time = DateTime.Now, Message = $"Login failed for {SelectedUserName}: {ex.Message}" });
                 _eventAggregator.GetEvent<SnackbarMessageNotification>().Publish(new MessageParameter() { Msg = Lang.密码错误, Duration = 1 });
             }
         }

+ 2 - 2
TeamAAS-VM/Views/HomeView.xaml

@@ -34,8 +34,8 @@
 
         <Grid Grid.Row="0">
             <Grid.RowDefinitions>
-                <RowDefinition Height="*" />
-                <RowDefinition Height="*" />
+                <RowDefinition Height="0.65*" />
+                <RowDefinition Height="0.4*" />
             </Grid.RowDefinitions>
             <!--图像-->
             <local:ShowVisionRender Grid.Row="0"