 zty
|
4e176c30c2
Merge branch 'Release2.4' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into zty
|
%!s(int64=3) %!d(string=hai) anos |
 zhangjiaxin
|
8e8a37747e
修改优化备份数据代码位置
|
%!s(int64=3) %!d(string=hai) anos |
 gsp
|
855b3eba13
optimize the particle revision function
|
%!s(int64=3) %!d(string=hai) anos |
|
zty
|
92afa09f46
添加二次采集功能
|
%!s(int64=3) %!d(string=hai) anos |
|
gsp
|
e6fb0d4bd9
Merge branch 'dev' into Release2.4
|
%!s(int64=3) %!d(string=hai) anos |
 zty
|
3dd9d38cf7
1.修复不能取消颗粒分离的bug
|
%!s(int64=3) %!d(string=hai) anos |
|
zty
|
31f69bc0a1
Merge branch 'dev' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into dev
|
%!s(int64=3) %!d(string=hai) anos |
|
zty
|
f409fb4728
添加特殊颗粒处理页面
|
%!s(int64=3) %!d(string=hai) anos |
|
gsp
|
56496b656a
Merge branch 'dev' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into dev
|
%!s(int64=3) %!d(string=hai) anos |
|
zhangjiaxin
|
99196d9d2b
增加选择颗粒，报告导出功能
|
%!s(int64=3) %!d(string=hai) anos |
|
gsp
|
b93b6d3ed9
Merge branch 'dev' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into dev
|
%!s(int64=3) %!d(string=hai) anos |
|
zhangjiaxin
|
4b4e3d05b0
更新优化报告程序删除颗粒代码
|
%!s(int64=3) %!d(string=hai) anos |
 CXS
|
e99eedf168
合并解决冲突
|
%!s(int64=3) %!d(string=hai) anos |
|
CXS
|
bab90d6978
合并解决冲突
|
%!s(int64=3) %!d(string=hai) anos |
|
CXS
|
bffa59ea53
Merge branch 'dev' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into dev
|
%!s(int64=3) %!d(string=hai) anos |
|
zty
|
9269eac592
修改报告Model位置
|
%!s(int64=3) %!d(string=hai) anos |
|
zhangjiaxin
|
b3620edca2
报告程序手动删除颗粒（分布图，颗粒分页表）手动备份一键备份数据库，自动备份数据，完成
|
%!s(int64=3) %!d(string=hai) anos |
|
zhangjiaxin
|
75810b34e3
Merge branch 'Release2.3' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into Release2.3
|
%!s(int64=3) %!d(string=hai) anos |
|
zhangjiaxin
|
bc43d2bc6c
报告程序从数据中删除选中颗粒（未完成临时）
|
%!s(int64=3) %!d(string=hai) anos |
|
CXS
|
381ac97d65
颗粒列表添加硬度阶段提交2
|
%!s(int64=3) %!d(string=hai) anos |
|
zhangjiaxin
|
594163abc7
报告程序谱图上增加元素L峰标识
|
%!s(int64=3) %!d(string=hai) anos |
|
gsp
|
6e8b009708
optimize the xraypos algorithm.
|
%!s(int64=3) %!d(string=hai) anos |
|
zhangjiaxin
|
44350be220
报告程序更新分布图导出（后台线程，log提示），
|
%!s(int64=3) %!d(string=hai) anos |
|
zhangjiaxin
|
4f5cc5b2e6
临时补充上次提交
|
%!s(int64=3) %!d(string=hai) anos |
|
zhangjiaxin
|
f627d716c4
图片拼接导出功能
|
%!s(int64=3) %!d(string=hai) anos |
|
zhangjiaxin
|
a882dd6207
Merge branch 'GSP' into ZJX
|
%!s(int64=3) %!d(string=hai) anos |
|
zhangjiaxin
|
16dc81fd4b
清理无效代码，消除编译时的警告项
|
%!s(int64=3) %!d(string=hai) anos |
|
gsp
|
d49da8cf00
rename the namespace OTSPeriodicTable to OTSRptPeriodicTable
|
%!s(int64=3) %!d(string=hai) anos |
|
zhangjiaxin
|
d6edfe310a
补充提交
|
%!s(int64=3) %!d(string=hai) anos |
|
zhangjiaxin
|
ccbe3fae07
导出拼接图片功能代码清理
|
%!s(int64=3) %!d(string=hai) anos |
