 gaoshipeng
|
6dcec88000
Merge branch 'Release2.3' into Release2.4
|
3 лет назад |
 CXS
|
f2a995b8c4
Merge branch 'Release2.3' into cxs
|
3 лет назад |
|
CXS
|
3ef9c8a336
删除颗粒分割部分代码以防止冲突
|
3 лет назад |
 gsp
|
56496b656a
Merge branch 'dev' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into dev
|
3 лет назад |
 zhangjiaxin
|
99196d9d2b
增加选择颗粒，报告导出功能
|
3 лет назад |
|
CXS
|
41666d6d18
为生成发布版本暂时提交
|
3 лет назад |
|
gsp
|
b93b6d3ed9
Merge branch 'dev' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into dev
|
3 лет назад |
|
CXS
|
cf0ead9496
添加 图标
|
3 лет назад |
|
zhangjiaxin
|
4b4e3d05b0
更新优化报告程序删除颗粒代码
|
3 лет назад |
|
CXS
|
e99eedf168
合并解决冲突
|
3 лет назад |
|
CXS
|
bab90d6978
合并解决冲突
|
3 лет назад |
|
CXS
|
bffa59ea53
Merge branch 'dev' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into dev
|
3 лет назад |
 zty
|
9269eac592
修改报告Model位置
|
3 лет назад |
|
zhangjiaxin
|
b3620edca2
报告程序手动删除颗粒（分布图，颗粒分页表）手动备份一键备份数据库，自动备份数据，完成
|
3 лет назад |
|
zhangjiaxin
|
75810b34e3
Merge branch 'Release2.3' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.3
|
3 лет назад |
|
zhangjiaxin
|
bc43d2bc6c
报告程序从数据中删除选中颗粒（未完成临时）
|
3 лет назад |
|
CXS
|
381ac97d65
颗粒列表添加硬度阶段提交2
|
3 лет назад |
|
zhangjiaxin
|
594163abc7
报告程序谱图上增加元素L峰标识
|
3 лет назад |
|
gsp
|
6e8b009708
optimize the xraypos algorithm.
|
3 лет назад |
|
zhangjiaxin
|
44350be220
报告程序更新分布图导出（后台线程，log提示），
|
3 лет назад |
|
zhangjiaxin
|
4f5cc5b2e6
临时补充上次提交
|
3 лет назад |
|
zhangjiaxin
|
f627d716c4
图片拼接导出功能
|
3 лет назад |
|
zhangjiaxin
|
a882dd6207
Merge branch 'GSP' into ZJX
|
3 лет назад |
|
zhangjiaxin
|
16dc81fd4b
清理无效代码，消除编译时的警告项
|
3 лет назад |
|
gsp
|
d49da8cf00
rename the namespace OTSPeriodicTable to OTSRptPeriodicTable
|
3 лет назад |
|
zhangjiaxin
|
d6edfe310a
补充提交
|
3 лет назад |
|
zhangjiaxin
|
ccbe3fae07
导出拼接图片功能代码清理
|
3 лет назад |
|
zhangjiaxin
|
1ae738fc8c
增加分布图中原图拼接导出，原图分类拼接导出功能
|
3 лет назад |
|
zhangjiaxin
|
06b2d5fb79
Merge branch 'Release2.3' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.3
|
3 лет назад |
|
zhangjiaxin
|
d2c415d280
清除报告中未识别颗粒字样，增加导出原图拼接功能（导出原图拼接渲染功能没有完成）
|
3 лет назад |
