zly преди 1 месец
родител
ревизия
7675079348
променени са 2 файла, в които са добавени 8 реда и са изтрити 7 реда
  1. 7 6
      TeamAAS-VM/Core/Management.cs
  2. 1 1
      TeamAAS-VM/ViewModels/MainWindowViewModel.cs

+ 7 - 6
TeamAAS-VM/Core/Management.cs

@@ -3605,11 +3605,10 @@ namespace TeamAAS_VP.Core
                                                         var device = _configService.GetDeviceInfo(i);
                                                         var config = _configService.GetSystemConfiguration();
                                                         string filePath = "";
-                                                        (bool isSuc, string resp) = await _mesService.SendFtpFileAsync(ProductMainSN, filename);
-                                                        if (isSuc)
+                                                        //(bool isSuc, string resp) = await _mesService.SendFtpFileAsync(ProductMainSN, filename);
+                                                        if (true)
                                                         {
-                                                            LogHelper.WriteLogMes($"上传数据成功");
-                                                            SendTaskMessage($"上传数据成功", MessageLevel.Debug);
+                                                           
 
                                                             //filePath = $"D:\\Image\\Recored\\{dt.ToString("yyyy-MM")}\\{dt.ToString("MM-dd")}\\{currentProduct.Name}\\{ProductMainSN}";
                                                             filePath = $"{PhotoPath}\\Recored\\{dt.ToString("yyyy-MM")}\\{dt.ToString("MM-dd")}\\{currentProduct.Name}\\{ProductMainSN}";
@@ -3641,6 +3640,8 @@ namespace TeamAAS_VP.Core
 
                                                             try { CompressionImage(filePath, filename, device.Station, device.FixtureId); }
                                                             catch (Exception zipEx) { LogHelper.WriteLogError($"压缩图片文件夹失败", zipEx); }
+                                                            LogHelper.WriteLogMes($"上传数据成功");
+                                                            SendTaskMessage($"上传数据成功", MessageLevel.Debug);
                                                             //上传csv
                                                             bool isAfter20 = dt.Hour >= 20;
                                                             //判断是否是新的一天
@@ -3668,8 +3669,8 @@ namespace TeamAAS_VP.Core
                                                         }
                                                         else
                                                         {
-                                                            LogHelper.WriteLogMes($"上传数据失败");
-                                                            SendTaskMessage($"上传数据失败", MessageLevel.Error);
+                                                            //LogHelper.WriteLogMes($"上传数据失败");
+                                                            //SendTaskMessage($"上传数据失败", MessageLevel.Error);
                                                         }
                                                     }
                                                     else

+ 1 - 1
TeamAAS-VM/ViewModels/MainWindowViewModel.cs

@@ -69,7 +69,7 @@ namespace TeamAAS_VP.ViewModels
         /// 工程师和管理员权限的无操作超时时长。
         /// 超过该时长后自动切回操作员权限。
         /// </summary>
-        private TimeSpan PermissionIdleTimeout = TimeSpan.FromMinutes(1);
+        private TimeSpan PermissionIdleTimeout = TimeSpan.FromMinutes(999999);
 
         /// <summary>
         /// 权限空闲检测计时器。