 CXS
|
381757e086
添加SysMgrApp中的Nlog输出
|
3 gadi atpakaļ |
|
CXS
|
ab13a986f8
Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev
|
3 gadi atpakaļ |
|
CXS
|
7a73de227d
修改扫描图尺寸与程序管理相对应
|
3 gadi atpakaļ |
 gsp
|
a6dcbcbdfc
Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev
|
3 gadi atpakaļ |
|
gsp
|
782ac7795b
optimize the DefaultParam and StageParam loading method code.
|
3 gadi atpakaļ |
 thermoscientific@163.com
|
86c56add6d
更新sysMgrapp 图像高度值
|
3 gadi atpakaļ |
|
CXS
|
b97579452c
修改bluke2.2标注
|
3 gadi atpakaļ |
 zhangjiaxin
|
bbce047294
调整报告界面结构减少中间空隙
|
3 gadi atpakaļ |
|
zhangjiaxin
|
7783c92351
Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev
|
3 gadi atpakaļ |
|
zhangjiaxin
|
fc597fbd98
比对修改分析数据图右侧的计算方式，1.5版本没有此功能，现没实现暂时隐藏
|
3 gadi atpakaļ |
|
CXS
|
ebecae0aba
处理bug：已建样品时打开文件后取消打开文件 编辑默认参数不修改点保存 样品被删除
|
3 gadi atpakaļ |
|
zhangjiaxin
|
c29201217f
Merge branch 'dev' into ZJX
|
3 gadi atpakaļ |
|
zhangjiaxin
|
a50fdad17e
导出报表后分析数据图变空的bug修改完成
|
3 gadi atpakaļ |
|
CXS
|
a5c1780434
Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev
|
3 gadi atpakaļ |
|
CXS
|
ecf8ed54f8
处理bug：测量时间不准确
|
3 gadi atpakaļ |
|
zhangjiaxin
|
adf9e39226
编辑报告模板-颗粒尺寸分析结果-计算方法切换失败
|
3 gadi atpakaļ |
|
CXS
|
71072832a0
处理 bug：程序管理-默认样品台配置编辑不点应用也会保存修改信息
|
3 gadi atpakaļ |
|
CXS
|
d43710b992
修改 分析数据表-样品测量信息-查询条件有小数时程序报错 bug
|
3 gadi atpakaļ |
|
CXS
|
430c8398a5
Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev
|
3 gadi atpakaļ |
|
zhangjiaxin
|
854d52fff6
修改编辑报告模板-元素成分图-显示图形切换失败bug和编辑报告模板-夹杂物分类图-显示图形切换失败bug
|
3 gadi atpakaļ |
|
CXS
|
87f798bb09
Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev
|
3 gadi atpakaļ |
|
CXS
|
e46d6d5448
修改颗粒列表选项只填一个报错bug
|
3 gadi atpakaļ |
|
zhangjiaxin
|
5892b1f54f
报告页眉页脚编辑无效果bug修改完成
|
3 gadi atpakaļ |
|
zhangjiaxin
|
5f29b8c1e3
Merge branch 'ZJX' into dev
|
3 gadi atpakaļ |
|
zhangjiaxin
|
1c28f2d7d0
修改bug编辑报告模板-显示结果概况不勾选，但输出报告中仍显示该模块
|
3 gadi atpakaļ |
|
CXS
|
5580b58f5c
更新xml文件
|
3 gadi atpakaļ |
|
CXS
|
3391b02fef
处理样品测量信息界面的若干bug
|
3 gadi atpakaļ |
|
CXS
|
ce8dd528c2
处理bug 分析数据表 查询条件填写0时报错问题
|
3 gadi atpakaļ |
|
CXS
|
77f25836a0
处理bug：分析图右键选择颗粒无效
|
3 gadi atpakaļ |
|
CXS
|
8527e89bc8
隐藏显示过小颗粒按钮
|
3 gadi atpakaļ |
