 gsp
|
27fedabd2c
sysmgr system handle.
|
4 anos atrás |
|
gsp
|
bb618871bb
Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev
|
4 anos atrás |
|
gsp
|
89772cb5e4
improve the cleanliness system logic. Remove the particle gray filter feature.
|
4 anos atrás |
 zhangjiaxin
|
1b17835dce
Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev
|
4 anos atrás |
|
zhangjiaxin
|
801ace08a0
修改补全xml文档
|
4 anos atrás |
 CXS
|
303028f8f2
优化配置数据
|
4 anos atrás |
|
CXS
|
6b88c097d0
更新xml文档
|
4 anos atrás |
|
gsp
|
ee1b8b0066
add missing files
|
4 anos atrás |
|
gsp
|
b8ee7aceba
rename some variables.
|
4 anos atrás |
|
gsp
|
49aef5d3a0
OTSControl optimize.
|
4 anos atrás |
|
gsp
|
1d89e367c3
the bruker driver can work . doesn't call the DisConnectSem(closeclient) method.
|
4 anos atrás |
|
gsp
|
6f067b92b2
Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev
|
4 anos atrás |
|
gsp
|
6a28276206
add cleanliness system support.
|
4 anos atrás |
|
CXS
|
0d64eced60
更新 sysmgrapp Nlog
|
4 anos atrás |
|
CXS
|
79b79ed3a6
Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev
|
4 anos atrás |
|
CXS
|
381757e086
添加SysMgrApp中的Nlog输出
|
4 anos atrás |
|
zhangjiaxin
|
575f4b8188
Merge branch 'dev' into ZJX
|
4 anos atrás |
|
CXS
|
ab13a986f8
Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev
|
4 anos atrás |
|
CXS
|
7a73de227d
修改扫描图尺寸与程序管理相对应
|
4 anos atrás |
|
gsp
|
a6dcbcbdfc
Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev
|
4 anos atrás |
|
gsp
|
782ac7795b
optimize the DefaultParam and StageParam loading method code.
|
4 anos atrás |
 thermoscientific@163.com
|
86c56add6d
更新sysMgrapp 图像高度值
|
5 anos atrás |
|
zhangjiaxin
|
2ab2730d07
删除一些注释，无修改
|
5 anos atrás |
|
CXS
|
b97579452c
修改bluke2.2标注
|
5 anos atrás |
|
zhangjiaxin
|
bbce047294
调整报告界面结构减少中间空隙
|
5 anos atrás |
|
zhangjiaxin
|
7783c92351
Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev
|
5 anos atrás |
|
zhangjiaxin
|
fc597fbd98
比对修改分析数据图右侧的计算方式，1.5版本没有此功能，现没实现暂时隐藏
|
5 anos atrás |
|
CXS
|
ebecae0aba
处理bug：已建样品时打开文件后取消打开文件 编辑默认参数不修改点保存 样品被删除
|
5 anos atrás |
|
zhangjiaxin
|
c29201217f
Merge branch 'dev' into ZJX
|
5 anos atrás |
|
zhangjiaxin
|
a50fdad17e
导出报表后分析数据图变空的bug修改完成
|
5 anos atrás |
