Sic-Software
/
Sic.Framework-Nanjing-Baishi
4
0
Fork 0
Code Issues Pull Requests Projects Releases Activity
806 Commits 21 Branches 0 Tags 72 MiB
Commit Graph

806 Commits

Author SHA1 Message Date
HCL 74af3166a3 1.IoCassette区分6寸和8寸 2023-11-15 14:37:43 +08:00
hanqiangqiang 481d427f5c [UI.Client] 
1添加Recipe历史数据记录
2添加历史数据展示列表
 2023-11-15 09:59:10 +08:00
auvkk 6daccc09f6 [RT.EquipmentLibrary] 
IoMFC.cs中增加一些注释。
 2023-11-14 09:28:10 +08:00
hanqiangqiang 5ff6400818 [RT.EquipmentLibrary] 
IoValue类中，添加BypassEnableTable实时生效
 2023-11-08 11:22:31 +08:00
hanqiangqiang 931057e752 [UI.Client] 
修改SC配置界面Setpoint宽度，由120改为140，修改对模板尺寸
 2023-11-07 13:58:30 +08:00
hanqiangqiang 2f1edf2d72 [RT.EquipmentLibrary] 
1屏蔽温度多次不变化侦测
2昂坤温度保留一位小数
 2023-11-07 13:36:12 +08:00
hanqiangqiang a4c0c07afc [RT.EquipmentLiabrary] 
1添加两种温度注册，兼容按硬件名称分配和按Temp总分显示
2上层注册的温度数据，无法获取时返回值为0
2德国三铯测温添加EnableLogMessage设置后立即生效
 2023-11-07 09:45:04 +08:00
hanqiangqiang 183cbc47d2 [RT.EquipmentLibrary] 
修改温度初始值，修改属性名称
 2023-11-06 17:22:05 +08:00
hanqiangqiang 557e9f8303 [RT.EquipmentLibrary] 
1.IoTC中添加属性，根据属性值判断是否注册温度数据
2.优化温度获取条件逻辑顺序
 2023-11-06 17:15:06 +08:00
hanqiangqiang 4ea50478e4 Merge branch 'develop' into feature/测温重构 2023-11-06 13:43:45 +08:00
hanqiangqiang b1c6da9710 [RT.EquipmentLibrary] 
GasBox注册温度数据源
 2023-11-03 16:45:32 +08:00
hanqiangqiang 007352e675 [RT.EquipmenTlibraty] 
修改气柜加热带获取参数
 2023-11-03 11:31:15 +08:00
hanqiangqiang eb58c809e7 [RT.EquipmentLibrary] 
修改气柜温度监控，按照不同AI来实例化对象，每个AI分别配置参数，
 2023-11-03 11:17:58 +08:00
hanqiangqiang b5dc39746a [RT.EquipmentLibrary] 
调试三铯测温，临时保存
 2023-11-03 10:04:22 +08:00
hanqiangqiang 97b7e85261 [RT.EquipmentLibrary] 
1所有测温硬件功能
2化提示函数
3加温度不变监控
 2023-11-02 17:46:03 +08:00
HCL d9050cde0e 1.解决检测MFC流量计时偶尔不准确问题 2023-11-02 14:55:25 +08:00
hanqiangqiang acae4badfe [RT,EquipmentLibrary] 
1添加德国三铯测温硬件，
2修改测温Log输出类
 2023-11-02 10:28:53 +08:00
hanqiangqiang 25bc154df3 [RT.EquipmentLibrary] 
1添加测温基础功能类，在测温硬件类中，作为对象，提供Log输出和DO操作
2优化数据为null时处理
3删除测温对象多余代码
 2023-11-01 17:17:45 +08:00
hanqiangqiang b0c8e88ff1 [RT.EquipmentLibrary] 
1修改IOTC中根据配置读取温度，兼容旧版本温度数据注册
2修改温度接口中的数据类型
3使用昂坤内存共享方式dll，仿真测试温度读取
 2023-11-01 15:39:21 +08:00
hanqiangqiang db35d7862a [RT.EquipmentLibrsry] 
1整理测温接口
2整理测温赋值
3修改IoTc温度绑定
 2023-11-01 10:48:48 +08:00
hanqiangqiang 6a62465bca Merge branch 'feature/优化Recipe对比功能' into develop 2023-10-26 14:59:32 +08:00
auvkk 094abb37c9 [Common] 
IoManager启动Monitor线程的时机从构造函数移至Initialize()方法。
BoolDataPollProvider中增加断言，方便调试时发现数据注册问题。

[UI.Client]
优化RecipeData的GetXmlString()方法，修正当ComboBox类型参数的Option不存在于格式模板文件中是，输出错误信息，而不是直接抛异常导致难以定位错误的问题。
 2023-10-25 16:40:36 +08:00
hanqiangqiang 608924abfe UI.Client] 
1.Recipe参数添加对比属性IsCompareDifferent，通过函数CompareDifferent来设置
2.IsCompareDifferent添加颜色转换器
3.优化对比界面动画和提示信息
 2023-10-25 13:47:44 +08:00
auvkk 639befe87e [UI.Client] 
修正Recipe编辑视图中所有参数显示空白的问题。
 2023-10-24 18:46:26 +08:00
hanqiangqiang c31e0ed594 Recipe对比合并到Develope分支，报错处理 2023-10-24 17:19:18 +08:00
hanqiangqiang 2f89f5e00e Merge branch 'develop' into RecipeComparison 
# Conflicts:
#	MECF.Framework.UI.Client/CenterViews/Editors/Recipe/RecipeEditorView.xaml
#	MECF.Framework.UI.Client/RecipeEditorLib/DGExtension/DataGridRecipe.xaml
 2023-10-23 09:25:45 +08:00
auvkk baed3056ac Merge branch 'develop' into feature/high-performance-data-collector 2023-10-23 08:49:34 +08:00
SIC1016\caipeilun f5bc63099c 修复配置对比时备份文件夹没有备份文件时无法对比的异常 2023-10-20 18:18:13 +08:00
SIC1016\caipeilun 2f0e6197e2 Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic.Framework into develop_configChangedV2 2023-10-20 14:48:54 +08:00
SIC1016\caipeilun e67c51412e UPS代码修复: 
1.两种UPS设备监控参数均有，仅节点地址不同
2.修改UPS数值转换函数，采集到数据后两者单位不同，需单独转换处理
 2023-10-19 17:05:06 +08:00
hanqiangqiang fa32e573fc [UI.Client] 
1添加图片资源，作为菜单背景
2添加image样式，鼠标悬浮改变数据源
 2023-10-19 13:24:40 +08:00
hanqiangqiang e80f15c09f [UI.Client] 
Recipe对比功能，添加单元格背景设置
 2023-10-19 10:38:31 +08:00
hanqiangqiang 35e381e60c Merge branch 'develop' into 昂坤测温添加配置项 2023-10-18 17:28:54 +08:00
hanqiangqiang ef20419a7e [UI.Client] 
Recipe对比功能修改类名称
 2023-10-18 16:25:36 +08:00
hanqiangqiang a3511fd0c6 [UI.Client] 
1完善Recipe对比，递归获取选择项
2优化界面，添加注释
 2023-10-18 15:48:41 +08:00
SIC1016\caipeilun bcded5fc07 Merge branch 'develop' of http://118.31.5.210:65000/Sic-Software/Sic.Framework into develop 2023-10-18 10:53:09 +08:00
SIC1016\caipeilun efdaa4c5cd 代码修复 ITAUPS走SNMP协议可正常通讯 2023-10-18 10:52:51 +08:00
hanqiangqiang 0d0c94d532 [RT.EquipmentLibrary] 
昂坤添加状态提示
 2023-10-18 10:08:37 +08:00
hanqiangqiang 0b1ac249ff [UI.Client] 
1:Recipe对比功能，添加界面隐藏动画
2:调试递归获取Recipe名称
 2023-10-18 09:37:14 +08:00
auvkk 39b89c3c35 Merge branch 'feature/config-to-disable-single-session-login' into develop 2023-10-17 17:16:01 +08:00
auvkk acf1b1912f [UI.Client] 
修正Recipe编辑视图加载了Recipe，切换到其它视图，再次切换回来时，顶部功能按钮被禁用的问题。
 2023-10-17 17:03:58 +08:00
auvkk a2e8fea103 [Common] 
新增系统配置System.SingleSessionLoginMode，允许关闭单会话登录模式。
 2023-10-17 16:53:32 +08:00
SIC1016\caipeilun b203ec633f 报警项添加 2023-10-17 15:49:49 +08:00
SIC1016\caipeilun 9c93d26306 类名修正 2023-10-17 15:14:27 +08:00
SIC1016\caipeilun 691f1f71ca 重新整理UPS代码 
1.类文件分开
2.ITAUPS继承UPSBase
3.删除不必要代码
 2023-10-17 14:39:00 +08:00
hanqiangqiang 66f8be2fbb [UI.Client] 
删除多余方法
 2023-10-16 17:23:26 +08:00
hanqiangqiang ddf0947c7b [UI.Client] 
1优化函数和变量名称
2添加空表头界面，屏蔽选择的对比界面表头
 2023-10-16 15:48:30 +08:00
SIC1016\caipeilun c3866c6d03 修改备份文件null判断 2023-10-16 09:28:35 +08:00
SL 82721f7a35 [Common] 
日志系统增加输出Debug信息的方法。

[UI.Client]
RecipeEditorViewModel的OnActive方法输出Debug信息用于调试视图无法打开时程序卡死的问题。
 2023-10-14 10:13:30 +08:00
SL 856b7bbbe9 [UI.Client] 
整理RecipeEditorViewModel.cs格式。
 2023-10-14 09:30:50 +08:00