Browse Source

1

样式分支
fyf 2 years ago
parent
commit
a384a28831
8 changed files with 11 additions and 14 deletions
  1. +4
    -7
      BPASmartClient.ScreenLib/AppMain.cs
  2. +1
    -1
      BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1ViewModel.cs
  3. +1
    -1
      BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl2ViewModel.cs
  4. +1
    -1
      BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl3ViewModel.cs
  5. +1
    -1
      BPASmartClient.ScreenLib/总监视大屏/ScreenALLControlViewModel.cs
  6. +1
    -1
      BPASmartClient.ScreenLib/炒锅/ScreenMaxWokControlViewModel.cs
  7. +1
    -1
      BPASmartClient.ScreenLib/炒锅/ScreenMinWokControlViewModel.cs
  8. +1
    -1
      BPASmartClient.ScreenLib/煮面机/ScreenMorksControlViewModel.cs

+ 4
- 7
BPASmartClient.ScreenLib/AppMain.cs View File

@@ -18,7 +18,7 @@ namespace BPASmartClient.ScreenLib
Main.GetInstance.Start(); Main.GetInstance.Start();
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException; AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
FSystemHelper.GetInstance.CreateDesktopShortcut(); FSystemHelper.GetInstance.CreateDesktopShortcut();
//FSystemHelper.GetInstance.AutoStart(true);
FSystemHelper.GetInstance.AutoStart(true);
WindowLargeScreen windowLarge = new WindowLargeScreen(); WindowLargeScreen windowLarge = new WindowLargeScreen();
#region 设置显示页面与标题 #region 设置显示页面与标题
string TitleName = $"{type.Assembly.ManifestModule.Name.Replace(".dll", "")}"; string TitleName = $"{type.Assembly.ManifestModule.Name.Replace(".dll", "")}";
@@ -60,9 +60,8 @@ namespace BPASmartClient.ScreenLib
windowLarge.WindowStyle = WindowStyle.None; windowLarge.WindowStyle = WindowStyle.None;
windowLarge.WindowState = WindowState.Normal; windowLarge.WindowState = WindowState.Normal;
windowLarge.ShowInTaskbar = false; windowLarge.ShowInTaskbar = false;
windowLarge.Topmost = true;
} }
else if (i==1)
else if (i == 1)
{ {
windowLarge2.WindowStartupLocation = WindowStartupLocation.Manual; windowLarge2.WindowStartupLocation = WindowStartupLocation.Manual;
windowLarge2.Left = i * 1920; windowLarge2.Left = i * 1920;
@@ -74,9 +73,8 @@ namespace BPASmartClient.ScreenLib
windowLarge2.WindowStyle = WindowStyle.None; windowLarge2.WindowStyle = WindowStyle.None;
windowLarge2.WindowState = WindowState.Normal; windowLarge2.WindowState = WindowState.Normal;
windowLarge2.ShowInTaskbar = false; windowLarge2.ShowInTaskbar = false;
windowLarge2.Topmost = true;
} }
else if (i==2)
else if (i == 2)
{ {
windowLarge3.WindowStartupLocation = WindowStartupLocation.Manual; windowLarge3.WindowStartupLocation = WindowStartupLocation.Manual;
windowLarge3.Left = i * 1920; windowLarge3.Left = i * 1920;
@@ -88,7 +86,6 @@ namespace BPASmartClient.ScreenLib
windowLarge3.WindowStyle = WindowStyle.None; windowLarge3.WindowStyle = WindowStyle.None;
windowLarge3.WindowState = WindowState.Normal; windowLarge3.WindowState = WindowState.Normal;
windowLarge3.ShowInTaskbar = false; windowLarge3.ShowInTaskbar = false;
windowLarge3.Topmost = true;


} }
} }
@@ -141,7 +138,7 @@ namespace BPASmartClient.ScreenLib
// i++; // i++;
//} //}
#endregion #endregion
windowLarge.Show(); windowLarge2.Show(); windowLarge3.Show();
windowLarge.Show();windowLarge2.Show(); windowLarge3.Show();
break; break;
} }
#endregion #endregion


+ 1
- 1
BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl1ViewModel.cs View File

@@ -69,7 +69,7 @@ namespace BPASmartClient.ScreenLib
OrderCount = modelMaxWok.SplitMeals_CreditCardCount_1 + modelMaxWok.SplitMeals_CreditCardCount_2; OrderCount = modelMaxWok.SplitMeals_CreditCardCount_1 + modelMaxWok.SplitMeals_CreditCardCount_2;
} }
})); }));
Thread.Sleep(1000);
Thread.Sleep(100);
}), $"{DateTime.Now}_1,线程服务"); }), $"{DateTime.Now}_1,线程服务");
} }
} }


+ 1
- 1
BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl2ViewModel.cs View File

@@ -69,7 +69,7 @@ namespace BPASmartClient.ScreenLib


} }
})); }));
Thread.Sleep(1000);
Thread.Sleep(100);
}), $"{DateTime.Now}_2,线程服务"); }), $"{DateTime.Now}_2,线程服务");
} }
} }


+ 1
- 1
BPASmartClient.ScreenLib/分餐机/ScreenSplitMealsControl3ViewModel.cs View File

@@ -68,7 +68,7 @@ namespace BPASmartClient.ScreenLib
OrderCount = modelMaxWok.SplitMeals_CreditCardCount_5 + modelMaxWok.SplitMeals_CreditCardCount_6; OrderCount = modelMaxWok.SplitMeals_CreditCardCount_5 + modelMaxWok.SplitMeals_CreditCardCount_6;
} }
})); }));
Thread.Sleep(1000);
Thread.Sleep(100);
}), $"{DateTime.Now}_3,线程服务"); }), $"{DateTime.Now}_3,线程服务");
} }
} }


+ 1
- 1
BPASmartClient.ScreenLib/总监视大屏/ScreenALLControlViewModel.cs View File

@@ -237,7 +237,7 @@ namespace BPASmartClient.ScreenLib
StatsCountAll= JsonConvert.DeserializeObject<ObservableCollection<StatsAllModel>>(str); StatsCountAll= JsonConvert.DeserializeObject<ObservableCollection<StatsAllModel>>(str);
} }
})); }));
Thread.Sleep(2000);
Thread.Sleep(100);
}), $"{DateTime.Now},线程服务"); }), $"{DateTime.Now},线程服务");
} }
} }


+ 1
- 1
BPASmartClient.ScreenLib/炒锅/ScreenMaxWokControlViewModel.cs View File

@@ -103,7 +103,7 @@ namespace BPASmartClient.ScreenLib
OrderCount = modelMaxWok.MaxWok_OrderCount_1 + modelMaxWok.MaxWok_OrderCount_2; OrderCount = modelMaxWok.MaxWok_OrderCount_1 + modelMaxWok.MaxWok_OrderCount_2;
} }
})); }));
Thread.Sleep(1000);
Thread.Sleep(100);
}), $"{DateTime.Now},线程服务"); }), $"{DateTime.Now},线程服务");
} }
} }


+ 1
- 1
BPASmartClient.ScreenLib/炒锅/ScreenMinWokControlViewModel.cs View File

@@ -102,7 +102,7 @@ namespace BPASmartClient.ScreenLib


} }
})); }));
Thread.Sleep(1000);
Thread.Sleep(100);
}), $"{DateTime.Now},线程服务"); }), $"{DateTime.Now},线程服务");
} }
} }


+ 1
- 1
BPASmartClient.ScreenLib/煮面机/ScreenMorksControlViewModel.cs View File

@@ -85,7 +85,7 @@ namespace BPASmartClient.ScreenLib
OrderMakeListOver = JsonConvert.DeserializeObject<ObservableCollection<OrderMakeFormModel>>(JsonConvert.SerializeObject(ViewData.MakeOrderOver)); OrderMakeListOver = JsonConvert.DeserializeObject<ObservableCollection<OrderMakeFormModel>>(JsonConvert.SerializeObject(ViewData.MakeOrderOver));
} }
})); }));
Thread.Sleep(1000);
Thread.Sleep(100);
}), $"{DateTime.Now},线程服务"); }), $"{DateTime.Now},线程服务");
} }
} }


Loading…
Cancel
Save