CHEN-ZW\acer
|
d3813c8d56
|
Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec
# Conflicts:
# newFront/c#前端/SWS.CAD/Start.cs
|
2025-10-21 13:57:39 +08:00 |
|
CHEN-ZW\acer
|
b31eb505e4
|
1
|
2025-10-21 13:53:04 +08:00 |
|
chenjinbu
|
ce1a577588
|
刷新标注
|
2025-10-17 16:45:00 +08:00 |
|
CHEN-ZW\acer
|
c76c8ada14
|
Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec
# Conflicts:
# newFront/c#前端/SWS.CAD/Commands.cs
# newFront/c#前端/SWS.Electrical/obj/Debug/Views/DialogTest2.g.i.cs
# newFront/c#前端/SWS.Electrical/obj/Debug/Views/SWSDialogWindow.g.cs
# newFront/c#前端/SWS.Electrical/obj/Debug/Views/SWSDialogWindow.g.i.cs
# newFront/c#前端/SWS.WPF/obj/Debug/Views/CustomDialogWindow.g.cs
# newFront/c#前端/SWS.WPF/obj/Debug/Views/CustomDialogWindow.g.i.cs
|
2025-10-09 18:08:19 +08:00 |
|
CHEN-ZW\acer
|
e24ee57355
|
1
|
2025-09-23 16:38:40 +08:00 |
|
CHEN-ZW\acer
|
8fa07593ac
|
Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec
# Conflicts:
# Learun.Framework.Module/Learun.Db/Learun.DataBase.EF.Oracle/obj/Debug/Learun.DataBase.Oracle.csproj.AssemblyReference.cache
# Learun.Framework.Module/Learun.Db/Learun.DataBase.EF.Sqlserver/obj/Debug/Learun.DataBase.SqlServer.csproj.AssemblyReference.cache
# Learun.Framework.Module/Learun.Db/Learun.DataBase.MySql/obj/Debug/Learun.DataBase.MySqlEx.csproj.AssemblyReference.cache
|
2025-09-22 10:02:17 +08:00 |
|
CHEN-ZW\acer
|
50f581ba36
|
Merge branch 'main' of http://27.154.35.18:7053/yuxingheng/009_DI-Elec
|
2025-09-12 12:03:48 +08:00 |
|
CHEN-ZW\acer
|
8a2c73eabb
|
信号管理，io分配bug
|
2025-09-12 12:03:20 +08:00 |
|
chenjinbu
|
4eddfe1f59
|
布置图输入值改成可输入的下拉框，ini操作异常修改，布置图加载修改
|
2025-09-10 10:57:20 +08:00 |
|
CHEN-ZW\acer
|
516581840d
|
1.存在送审时间不提示
|
2025-09-09 08:58:50 +08:00 |
|
CHEN-ZW\acer
|
dec2a796e8
|
信号管理
|
2025-09-04 18:28:02 +08:00 |
|
CHEN-ZW\acer
|
45bd4860bc
|
电气前端提交
|
2025-08-15 16:34:31 +08:00 |
|