 gsp
|
002d310ab2
modify the ProgMgrInfoForm a little.
|
3 jaren geleden |
|
gsp
|
c8abb762b1
Merge branch 'Release2.3' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into Release2.3
|
3 jaren geleden |
|
gsp
|
5e73ff7ca8
change cleanliness to cleanness.
|
3 jaren geleden |
 CXS
|
4e63e14150
Merge branch 'Release2.3' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.3
|
3 jaren geleden |
|
CXS
|
a99b4fcf5b
添加配置文件及参数检测
|
3 jaren geleden |
 zhangjiaxin
|
fff7415687
修改夹杂物字样
|
3 jaren geleden |
|
gsp
|
12c634ea13
fix the resource to adapt all the system
|
3 jaren geleden |
|
gsp
|
5b216b2339
Merge branch 'Release2.3' into CleanlinessforBeijing
|
3 jaren geleden |
|
CXS
|
500991cc37
Merge branch 'Release2.3' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.3
|
3 jaren geleden |
|
CXS
|
058b07efd4
程序管理中添加 大小颗粒阈值 小颗粒Xray时间 设置功能
|
3 jaren geleden |
|
CXS
|
5d259a4141
标准库组分类保存
|
3 jaren geleden |
|
gsp
|
2e0e29deda
delete the useless database.
|
3 jaren geleden |
|
CXS
|
b1845ee55a
Merge branch 'Release2.3' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.3
|
3 jaren geleden |
|
gsp
|
9bf780d865
optimize the FeO identify logic.
|
3 jaren geleden |
|
gsp
|
e3f44ef896
Merge branch 'Release2.3' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.3
|
3 jaren geleden |
|
gsp
|
08deed9ea1
fix the aqtime log error
|
3 jaren geleden |
|
zhangjiaxin
|
2ce7d9f335
修改报告模板为英文显示，以防在英文系统下运行出现乱码
|
3 jaren geleden |
|
zhangjiaxin
|
abc4d62c13
Merge branch 'Release2.3' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.3
|
3 jaren geleden |
|
zhangjiaxin
|
847c842f7f
清除大分类后的无效代码
|
3 jaren geleden |
|
gsp
|
0e6a21eecc
image process algorithm optimization (no dilate and erode)
|
3 jaren geleden |
|
zhangjiaxin
|
b67ebcb21e
元素大分类，阶段结束
|
3 jaren geleden |
|
CXS
|
e71adbe6f6
删重
|
3 jaren geleden |
|
CXS
|
5f2ae35869
Merge branch 'GSP' into cxs
|
3 jaren geleden |
|
gsp
|
dbdf44dba2
adjust the measure flow of IncA . remove some useless Resource xml files.
|
3 jaren geleden |
|
CXS
|
cdd47b8ed0
Merge branch 'GSP' into cxs
|
3 jaren geleden |
|
gsp
|
cf4690dd5a
add two item in the IncASTDData.db(12CaO.7Al2O3 3CaO.Al2O3)
|
3 jaren geleden |
|
gsp
|
aa9eebfadf
Merge branch 'Release2.3' into GSP
|
3 jaren geleden |
|
gsp
|
78544e4bea
add classify group feature.
|
3 jaren geleden |
|
CXS
|
a1a01f3938
样品台移动延时参数化
|
3 jaren geleden |
|
zhangjiaxin
|
10be160aad
修改报告导出大分类（临时提交）
|
3 jaren geleden |
