 gsp
|
a9d0ca9f62
Merge branch 'Release2.3' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into Release2.3
|
4 лет назад |
|
gsp
|
f3f7af5145
remove some useless code.
|
4 лет назад |
 zhangjiaxin
|
5f14c2c9e3
解决遗漏的选择颗粒和全部颗粒（Echart三元相图部分）
|
4 лет назад |
|
zhangjiaxin
|
28b830f3ac
修改上次提交
|
4 лет назад |
|
zhangjiaxin
|
2789113e29
Merge branch 'dev' into ZJX
|
4 лет назад |
|
gsp
|
ee3e0e945c
fix the xml enum value format of the result file.
|
4 лет назад |
|
zhangjiaxin
|
f867601db5
临时提交
|
4 лет назад |
|
gsp
|
90085217f2
fix the enum value format of the xml result file.
|
4 лет назад |
|
zhangjiaxin
|
3182a8a609
新增中英文添加（grid表 全部颗粒，选择颗粒），补全Echart选择颗粒和全部颗粒功能
|
4 лет назад |
|
gsp
|
06bea41160
add read simimage.tiff function.
|
4 лет назад |
|
gsp
|
b40e6fbabd
Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev
|
4 лет назад |
|
gsp
|
3c759ce2ce
restore the DATASOURCE_TYPE chosen function.
|
4 лет назад |
|
zhangjiaxin
|
035ffae7a0
处理测量程序打开报告程序时报错的问题
|
4 лет назад |
|
zhangjiaxin
|
965b71f7b2
Merge branch 'dev' into ZJX
|
4 лет назад |
|
gsp
|
04fe12e20f
Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev
|
4 лет назад |
|
gsp
|
1669c3bcc4
add filter particle function .
|
4 лет назад |
|
zhangjiaxin
|
24aa5b44c9
报告程序目测没有遗漏的中文（OTS中英文）
|
4 лет назад |
|
zhangjiaxin
|
185eccdd27
报告程序中英文（界面已没有未转换语言和提示）20211201
|
4 лет назад |
 CXS
|
95baa39d71
测量程序英文化
|
4 лет назад |
|
CXS
|
52de7c2dbe
恢复某些参数
|
4 лет назад |
|
CXS
|
5940b4e60d
测量程序英文化
|
4 лет назад |
|
zhangjiaxin
|
495482b53a
Merge branch 'dev' into ZJX
|
4 лет назад |
|
zhangjiaxin
|
dd4a347a34
更改报告程序中英文
|
4 лет назад |
|
zhangjiaxin
|
e9ccaf04c9
优化报告程序grid表部分的代码
|
4 лет назад |
|
CXS
|
d636861fe9
删除无用代码
|
4 лет назад |
|
CXS
|
beb59a4340
Merge branch 'release2.2' into dev
|
4 лет назад |
|
CXS
|
fa75426190
找回颗粒列表优化代码
|
4 лет назад |
|
CXS
|
a0b45ab920
Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev
|
4 лет назад |
|
zhangjiaxin
|
fe0adff5d0
Merge branch 'dev' into ZJX
|
4 лет назад |
|
gsp
|
904b801aa6
add missing files.
|
4 лет назад |
