 CXS
|
62c9dfbf0a
样品测量信息添加选择颗粒完毕
|
4 years ago |
|
CXS
|
e57a88d109
颗粒成分表选择颗粒功能添加完成
|
4 years ago |
|
CXS
|
225bca179f
测量程序中程序管理修改为checkbox
|
4 years ago |
|
CXS
|
f4a5eea098
Merge branch 'Release2.3' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into Release2.3
|
4 years ago |
|
CXS
|
22a3719934
修改报告概况bug
|
4 years ago |
 gsp
|
dd045b5c8c
alter the usingXray data to bool type in COTSXRayParam.
|
4 years ago |
|
CXS
|
c7966e3124
Merge branch 'Release2.3' into cxs_dev
|
4 years ago |
|
gsp
|
a9d0ca9f62
Merge branch 'Release2.3' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into Release2.3
|
4 years ago |
|
gsp
|
f3f7af5145
remove some useless code.
|
4 years ago |
|
CXS
|
ba0fd4123f
Merge branch 'Release2.3' into cxs_dev
|
4 years ago |
 zhangjiaxin
|
5f14c2c9e3
解决遗漏的选择颗粒和全部颗粒（Echart三元相图部分）
|
4 years ago |
|
CXS
|
e2161a6953
Merge branch 'Release2.3' into cxs_dev
|
4 years ago |
|
zhangjiaxin
|
28b830f3ac
修改上次提交
|
4 years ago |
|
zhangjiaxin
|
2789113e29
Merge branch 'dev' into ZJX
|
4 years ago |
|
CXS
|
38447ae104
选择颗粒改版2
|
4 years ago |
|
gsp
|
ee3e0e945c
fix the xml enum value format of the result file.
|
4 years ago |
|
zhangjiaxin
|
f867601db5
临时提交
|
4 years ago |
|
gsp
|
90085217f2
fix the enum value format of the xml result file.
|
4 years ago |
|
zhangjiaxin
|
3182a8a609
新增中英文添加（grid表 全部颗粒，选择颗粒），补全Echart选择颗粒和全部颗粒功能
|
4 years ago |
|
CXS
|
4041b6894e
概况表测量面积修改
|
4 years ago |
|
gsp
|
06bea41160
add read simimage.tiff function.
|
4 years ago |
|
gsp
|
b40e6fbabd
Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev
|
4 years ago |
|
gsp
|
3c759ce2ce
restore the DATASOURCE_TYPE chosen function.
|
4 years ago |
|
zhangjiaxin
|
035ffae7a0
处理测量程序打开报告程序时报错的问题
|
4 years ago |
|
zhangjiaxin
|
965b71f7b2
Merge branch 'dev' into ZJX
|
4 years ago |
|
gsp
|
04fe12e20f
Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev
|
4 years ago |
|
gsp
|
1669c3bcc4
add filter particle function .
|
4 years ago |
|
zhangjiaxin
|
24aa5b44c9
报告程序目测没有遗漏的中文（OTS中英文）
|
4 years ago |
|
zhangjiaxin
|
185eccdd27
报告程序中英文（界面已没有未转换语言和提示）20211201
|
4 years ago |
|
CXS
|
95baa39d71
测量程序英文化
|
4 years ago |
