SicMultiplate/SicUI
SIC1016\caipeilun a7455bf1be Merge branch 'DevelopBase' of http://118.31.5.210:65000/Sic-Software/Sic08 into DevelopBase
# 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/zh/Sicentury.Localization.resources.dll
2024-02-28 14:33:07 +08:00
..
Controls 控件模块是否在线禁用右击菜单和拖拽,修改模块PM1,PM1,Load,UnLoad 2024-01-15 17:23:32 +08:00
Converter 更新多用户登录机制: 2023-10-06 09:50:11 +08:00
Dialog Add project files. 2023-03-03 15:42:13 +08:00
Models Merge branch 'DevelopBase' of http://118.31.5.210:65000/Sic-Software/Sic08 into DevelopBase 2024-02-28 14:33:07 +08:00
Properties 版本号修改为 1.3.0.40226 2024-02-26 15:29:23 +08:00
Resources/Images 曲线列表新增时间、配方名称标签,增加界面可读性 2023-09-14 09:13:47 +08:00
Themes 更新库文件(Commit 95195e4) 2023-06-19 18:52:48 +08:00
App.config 更新多用户登录机制: 2023-10-06 09:50:11 +08:00
App.xaml 更新库文件a4824c3,增加汉化内容。 2023-12-21 16:26:59 +08:00
App.xaml.cs Add project files. 2023-03-03 15:42:13 +08:00
Bootstrapper.cs Merge branch 'feature/维保界面V1.0' into DevelopBase 2024-02-26 11:02:43 +08:00
ClientApp.cs Test2 2023-04-21 15:26:37 +08:00
GlobalUsings.cs 更新库文件(Commit 592ed68),整合8号机PMProcessView视图及其相关视图。 2023-06-29 12:10:20 +08:00
MainView.xaml 添加视图菜单汉化临时保存 2024-01-10 14:02:03 +08:00
MainView.xaml.cs 更新多用户登录机制: 2023-10-06 09:50:11 +08:00
MainViewModel.cs 更新维护代码 2024-02-26 10:47:35 +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 更新库文件a4824c3,增加汉化内容。 2023-12-21 16:26:59 +08:00
Splash.xaml 更新多用户登录机制: 2023-10-06 09:50:11 +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
TimeredMainViewModel.cs 更新多用户登录机制: 2023-10-06 09:50:11 +08:00