Sic03-8inch/SicUI
DESKTOP-1N1NK8A\auvkk 8782215da1 Merge branch 'feature/update-signal-tower' into develop
# Conflicts:
#	ThirdParty/MECF.Framework/MECF.Framework.Common.dll
#	ThirdParty/MECF.Framework/MECF.Framework.RT.Core.dll
#	ThirdParty/MECF.Framework/MECF.Framework.RT.EquipmentLibrary.dll
#	ThirdParty/MECF.Framework/MECF.Framework.Simulator.Core.dll
#	ThirdParty/MECF.Framework/MECF.Framework.UI.Client.dll
#	ThirdParty/MECF.Framework/MECF.Framework.UI.Core.dll
#	ThirdParty/MECF.Framework/Sicentury.Core.dll
2023-05-08 15:03:53 +08:00
..
Config Add project files. 2023-03-03 15:42:13 +08:00
Controls 修正Common库中图片资源的类型为Resource。 2023-03-15 13:42:50 +08:00
Converter 增加ENG模式。 2023-03-03 16:45:39 +08:00
Dialog Add project files. 2023-03-03 15:42:13 +08:00
Models 1:修改报警信息 2023-05-06 10:53:01 +08:00
Properties 更新库文件,使三色灯支持工作模式配置。 2023-05-08 09:42:15 +08:00
Resources/Images 增加ENG模式。 2023-03-03 16:45:39 +08:00
Styles 添加Coating生长功能 2023-04-23 14:18:42 +08:00
Themes Add project files. 2023-03-03 15:42:13 +08:00
App.config 新增SpareTemp水温报警信息。 2023-04-23 18:03:29 +08:00
App.xaml 添加Coating生长功能 2023-04-23 14:18:42 +08:00
App.xaml.cs Add project files. 2023-03-03 15:42:13 +08:00
Bootstrapper.cs 修正DataLog中的曲线图无法显示的问题。 2023-04-20 10:59:37 +08:00
ClientApp.cs Test2 2023-04-21 15:26:37 +08:00
MainView.xaml 修正主窗体中LOG下拉框可能被撑的很大的问题。 2023-04-19 15:46:02 +08:00
MainView.xaml.cs Add project files. 2023-03-03 15:42:13 +08:00
MainViewModel.cs Update from svn. 2023-03-28 13:24:11 +08:00
ProcessMonitorView.xaml ProcessMonitor界面合并,删除WinDataView界面 2023-04-23 09:52:16 +08:00
ProcessMonitorView.xaml.cs ProcessMonitor界面合并,删除WinDataView界面 2023-04-23 09:52:16 +08:00
ProcessMonitorViewModel.cs ProcessMonitor界面合并,删除WinDataView界面 2023-04-23 09:52:16 +08:00
RtIpAddressInput.xaml Add project files. 2023-03-03 15:42:13 +08:00
RtIpAddressInput.xaml.cs Add project files. 2023-03-03 15:42:13 +08:00
RtIpAddressSetting.ico Add project files. 2023-03-03 15:42:13 +08:00
SicUI.csproj 添加Coating生长功能 2023-04-23 14:18:42 +08:00
Splash.xaml 移除Splash中调试用的Path。 2023-04-15 13:56:02 +08:00
Splash.xaml.cs Add project files. 2023-03-03 15:42:13 +08:00
StartupArguments.cs Add project files. 2023-03-03 15:42:13 +08:00
TrayCoatingThicknessView.xaml 添加Coating生长功能 2023-04-23 14:18:42 +08:00
TrayCoatingThicknessView.xaml.cs 添加Coating生长功能 2023-04-23 14:18:42 +08:00
TrayCoatingThicknessViewModel.cs 添加Coating生长功能 2023-04-23 14:18:42 +08:00
packages.config 添加Coating生长功能 2023-04-23 14:18:42 +08:00