更改
This commit is contained in:
@@ -133,10 +133,13 @@ namespace CapMachine.Wpf
|
||||
containerRegistry.RegisterSingleton<CanFdDriveService>();
|
||||
|
||||
containerRegistry.RegisterSingleton<LinDriveService>();
|
||||
containerRegistry.RegisterSingleton<ZlgCanDriveService>();
|
||||
containerRegistry.RegisterSingleton<ZlgLinDriveService>();
|
||||
containerRegistry.RegisterSingleton<MachineRtDataService>();
|
||||
containerRegistry.RegisterSingleton<DataRecordService>();
|
||||
containerRegistry.RegisterSingleton<HighSpeedDataService>();
|
||||
//containerRegistry.RegisterSingleton<PPCService>();
|
||||
containerRegistry.RegisterSingleton<PPCService>();
|
||||
containerRegistry.RegisterSingleton<SysRunService>();
|
||||
|
||||
containerRegistry.RegisterSingleton<ComActionService>();
|
||||
@@ -187,6 +190,8 @@ namespace CapMachine.Wpf
|
||||
containerRegistry.RegisterForNavigation<CANConfigView, CANConfigViewModel>();
|
||||
containerRegistry.RegisterForNavigation<CANFDConfigView, CANFDConfigViewModel>();
|
||||
containerRegistry.RegisterForNavigation<LINConfigView, LinConfigViewModel>();
|
||||
containerRegistry.RegisterForNavigation<ZlgCanDriveConfigView, ZlgCanDriveConfigViewModel>();
|
||||
containerRegistry.RegisterForNavigation<ZlgLinDriveConfigView, ZlgLinDriveConfigViewModel>();
|
||||
|
||||
|
||||
//注册Dialog视图时绑定VM
|
||||
@@ -200,13 +205,17 @@ namespace CapMachine.Wpf
|
||||
containerRegistry.RegisterDialog<DialogExpInfoView, DialogExpInfoViewModel>();
|
||||
containerRegistry.RegisterDialog<DialogUserView, DialogUserViewModel>();
|
||||
containerRegistry.RegisterDialog<DialogCanRwConfigView, DialogCanRwConfigViewModel>();
|
||||
containerRegistry.RegisterDialog<DialogZlgCanLinRwConfigView, DialogZlgCanLinRwConfigViewModel>();
|
||||
containerRegistry.RegisterDialog<DialogCanLinConfigCreateView, DialogCanLinConfigCreateViewModel>();
|
||||
containerRegistry.RegisterDialog<DialogPIDConfigView, DialogPIDConfigViewModel>();
|
||||
containerRegistry.RegisterDialog<DialogLimitConfigView, DialogLimitConfigViewModel>();
|
||||
containerRegistry.RegisterDialog<DialogSuperHeatCoolConfigView, DialogSuperHeatCoolConfigViewModel>();
|
||||
containerRegistry.RegisterDialog<DialogLogicRuleView, DialogLogicRuleViewModel>();
|
||||
containerRegistry.RegisterDialog<DialogCanLinConfigImExportView, DialogCanLinConfigImExportViewModel>();
|
||||
containerRegistry.RegisterDialog<DialogCANFdSchConfigView, DialogCANFdSchConfigViewModel>();
|
||||
containerRegistry.RegisterDialog<DialogCANSchConfigView, DialogCANSchConfigViewModel>();
|
||||
containerRegistry.RegisterDialog<DialogZlgCANSchConfigView, DialogZlgCANSchConfigViewModel>();
|
||||
containerRegistry.RegisterDialog<DialogZlgCANFDSchConfigView, DialogZlgCANFDSchConfigViewModel>();
|
||||
containerRegistry.RegisterDialog<DialogLINSchConfigView, DialogLINSchConfigViewModel>();
|
||||
|
||||
containerRegistry.RegisterDialog<SplashScreenView, SplashScreenViewModel>();
|
||||
|
||||
@@ -746,6 +746,9 @@
|
||||
<None Update="Key\PublicKey.xml">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="NLog.config">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Update="TagConfig\SysTags.json">
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
|
||||
@@ -77,7 +77,7 @@ namespace CapMachine.Wpf.Services
|
||||
//}));
|
||||
MenuItems.Add(new NavigationItem("", "工艺过程", "MonitorView"));
|
||||
MenuItems.Add(new NavigationItem("", "CAN配置", "CANConfigView"));
|
||||
//MenuItems.Add(new NavigationItem("", "CANFD配置", "CANFDConfigView"));
|
||||
MenuItems.Add(new NavigationItem("", "CANFD配置", "CANFDConfigView"));
|
||||
MenuItems.Add(new NavigationItem("", "LIN配置", "LINConfigView"));
|
||||
//MenuItems.Add(new NavigationItem("", "ZLG CAN配置", "ZlgCanDriveConfigView"));
|
||||
//MenuItems.Add(new NavigationItem("", "ZLG LIN配置", "ZlgLinDriveConfigView"));
|
||||
|
||||
@@ -448,20 +448,20 @@ namespace CapMachine.Wpf.Services
|
||||
// 处理 err2
|
||||
}
|
||||
|
||||
if (TryUpdateThermodynamicSixResults(out var thermoErr))
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(thermoErr))
|
||||
{
|
||||
Logger?.Error($"六个物性结果计算警告: {thermoErr}");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (!string.IsNullOrWhiteSpace(thermoErr))
|
||||
{
|
||||
Logger?.Error($"六个物性结果计算失败: {thermoErr}");
|
||||
}
|
||||
}
|
||||
//if (TryUpdateThermodynamicSixResults(out var thermoErr))
|
||||
//{
|
||||
// if (!string.IsNullOrWhiteSpace(thermoErr))
|
||||
// {
|
||||
// Logger?.Error($"六个物性结果计算警告: {thermoErr}");
|
||||
// }
|
||||
//}
|
||||
//else
|
||||
//{
|
||||
// if (!string.IsNullOrWhiteSpace(thermoErr))
|
||||
// {
|
||||
// Logger?.Error($"六个物性结果计算失败: {thermoErr}");
|
||||
// }
|
||||
//}
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
||||
6
build-errors-sln-release.txt
Normal file
6
build-errors-sln-release.txt
Normal file
@@ -0,0 +1,6 @@
|
||||
|
||||
宸叉垚鍔熺敓鎴愩€?
|
||||
2541 涓鍛?
|
||||
0 涓敊璇?
|
||||
|
||||
宸茬敤鏃堕棿 00:00:15.76
|
||||
6
build-errors-sln.txt
Normal file
6
build-errors-sln.txt
Normal file
@@ -0,0 +1,6 @@
|
||||
|
||||
宸叉垚鍔熺敓鎴愩€?
|
||||
6 涓鍛?
|
||||
0 涓敊璇?
|
||||
|
||||
宸茬敤鏃堕棿 00:00:01.52
|
||||
13
build-errors.txt
Normal file
13
build-errors.txt
Normal file
@@ -0,0 +1,13 @@
|
||||
E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\App.xaml.cs(214,46): error CS0246: 鏈兘鎵惧埌绫诲瀷鎴栧懡鍚嶇┖闂村悕鈥淒ialogCANFdSchConfigView鈥?鏄惁缂哄皯 using 鎸囦护鎴栫▼搴忛泦寮曠敤?) [E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\CapMachine.Wpf_zrtyujqf_wpftmp.csproj]
|
||||
E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\App.xaml.cs(214,72): error CS0246: 鏈兘鎵惧埌绫诲瀷鎴栧懡鍚嶇┖闂村悕鈥淒ialogCANFdSchConfigViewModel鈥?鏄惁缂哄皯 using 鎸囦护鎴栫▼搴忛泦寮曠敤?) [E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\CapMachine.Wpf_zrtyujqf_wpftmp.csproj]
|
||||
E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\ViewModels\CANFDConfigViewModel.cs(530,65): error CS1061: 鈥淭oomossCanFD鈥濇湭鍖呭惈鈥淟oadCmdDataToDrive鈥濈殑瀹氫箟锛屽苟涓旀壘涓嶅埌鍙帴鍙楃涓€涓€淭oomossCanFD鈥濈被鍨嬪弬鏁扮殑鍙闂墿灞曟柟娉曗€淟oadCmdDataToDrive鈥?鏄惁缂哄皯 using 鎸囦护鎴栫▼搴忛泦寮曠敤?) [E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\CapMachine.Wpf_zrtyujqf_wpftmp.csproj]
|
||||
E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\ViewModels\CANFDConfigViewModel.cs(752,49): error CS1061: 鈥淭oomossCanFD鈥濇湭鍖呭惈鈥淯pdateSchDataByCmdDataChanged鈥濈殑瀹氫箟锛屽苟涓旀壘涓嶅埌鍙帴鍙楃涓€涓€淭oomossCanFD鈥濈被鍨嬪弬鏁扮殑鍙闂墿灞曟柟娉曗€淯pdateSchDataByCmdDataChanged鈥?鏄惁缂哄皯 using 鎸囦护鎴栫▼搴忛泦寮曠敤?) [E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\CapMachine.Wpf_zrtyujqf_wpftmp.csproj]
|
||||
E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\ViewModels\CANFDConfigViewModel.cs(1021,49): error CS1061: 鈥淭oomossCanFD鈥濇湭鍖呭惈鈥淪chEnable鈥濈殑瀹氫箟锛屽苟涓旀壘涓嶅埌鍙帴鍙楃涓€涓€淭oomossCanFD鈥濈被鍨嬪弬鏁扮殑鍙闂墿灞曟柟娉曗€淪chEnable鈥?鏄惁缂哄皯 using 鎸囦护鎴栫▼搴忛泦寮曠敤?) [E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\CapMachine.Wpf_zrtyujqf_wpftmp.csproj]
|
||||
E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\ViewModels\CANFDConfigViewModel.cs(1181,57): error CS1061: 鈥淭oomossCanFD鈥濇湭鍖呭惈鈥淪chEnable鈥濈殑瀹氫箟锛屽苟涓旀壘涓嶅埌鍙帴鍙楃涓€涓€淭oomossCanFD鈥濈被鍨嬪弬鏁扮殑鍙闂墿灞曟柟娉曗€淪chEnable鈥?鏄惁缂哄皯 using 鎸囦护鎴栫▼搴忛泦寮曠敤?) [E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\CapMachine.Wpf_zrtyujqf_wpftmp.csproj]
|
||||
E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\ViewModels\CANFDConfigViewModel.cs(1183,39): error CS1061: 鈥淐anFdDriveService鈥濇湭鍖呭惈鈥淟istCANFdScheduleConfig鈥濈殑瀹氫箟锛屽苟涓旀壘涓嶅埌鍙帴鍙楃涓€涓€淐anFdDriveService鈥濈被鍨嬪弬鏁扮殑鍙闂墿灞曟柟娉曗€淟istCANFdScheduleConfig鈥?鏄惁缂哄皯 using 鎸囦护鎴栫▼搴忛泦寮曠敤?) [E:\MyTest\VS2022\CapMachine\CapMachine\CapMachine.Wpf\CapMachine.Wpf_zrtyujqf_wpftmp.csproj]
|
||||
|
||||
鐢熸垚澶辫触銆?
|
||||
1233 涓鍛?
|
||||
7 涓敊璇?
|
||||
|
||||
宸茬敤鏃堕棿 00:00:06.42
|
||||
Reference in New Issue
Block a user