 zty
|
51ddcd9106
添加缺失的代码
|
2 years ago |
 cxs
|
a9148c8573
修改报告初始化显示界面为图表
|
2 years ago |
|
zty
|
de13a4a30a
Merge branch 'Release2.5' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into zty
|
2 years ago |
 zhangjiaxin
|
98d7235932
修复报告程序备份数据库功能bug
|
3 years ago |
 gsp
|
e1c2b9a424
Merge branch 'GSP' into Release2.5
|
3 years ago |
|
zty
|
4e176c30c2
Merge branch 'Release2.4' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into zty
|
3 years ago |
|
zhangjiaxin
|
8e8a37747e
修改优化备份数据代码位置
|
3 years ago |
|
zty
|
92afa09f46
添加二次采集功能
|
3 years ago |
|
zhangjiaxin
|
98e69983de
临时提交
|
3 years ago |
 zty
|
f409fb4728
添加特殊颗粒处理页面
|
3 years ago |
|
zty
|
59da107576
报告添加堆叠图
|
3 years ago |
 CXS
|
bab90d6978
合并解决冲突
|
3 years ago |
|
CXS
|
bffa59ea53
Merge branch 'dev' of http://36.129.163.148:10080/gaoshipeng/OTS2_0 into dev
|
3 years ago |
|
zty
|
9269eac592
修改报告Model位置
|
3 years ago |
|
zhangjiaxin
|
bc43d2bc6c
报告程序从数据中删除选中颗粒（未完成临时）
|
3 years ago |
|
CXS
|
80acb4fb15
修改bug及添加极值分析法按钮
|
3 years ago |
|
gsp
|
f407b90a1f
add ipc support for Measure app.
|
3 years ago |
|
gsp
|
80c8578289
improve log logic in report app
|
3 years ago |
|
CXS
|
46870e4230
删除报告中菜单项复制和全部复制项
|
3 years ago |
|
CXS
|
7b6ca320e6
change format of report
|
3 years ago |
|
CXS
|
d856f007d2
删除元素成分图
|
3 years ago |
|
CXS
|
8b33c89708
1.删除中英文配置文件
|
3 years ago |
|
gsp
|
6bd835c00c
binding the Nlog window to a window which is in our application.
|
3 years ago |
|
zhangjiaxin
|
3a6d30faf0
修改报告程序选择测量结果文件时选择取消报错的问题
|
3 years ago |
|
CXS
|
1ce3798a1f
报告程序添加帮助界面说明
|
3 years ago |
|
zhangjiaxin
|
698fc029fb
测量程序打开报告程序，分布图没有加载grid表需要切换，因合并代码是发生的已解决
|
3 years ago |
|
zhangjiaxin
|
2789113e29
Merge branch 'dev' into ZJX
|
3 years ago |
|
zhangjiaxin
|
f867601db5
临时提交
|
3 years ago |
|
gsp
|
06bea41160
add read simimage.tiff function.
|
3 years ago |
|
gsp
|
b40e6fbabd
Merge branch 'dev' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into dev
|
3 years ago |
