 CXS
|
82d13e926f
Merge branch 'ZJX' into cxs
|
4 years ago |
 zhangjiaxin
|
c6e5a7cea2
Merge branch 'release2.2' into ZJX
|
4 years ago |
|
CXS
|
594ab95f07
Merge branch 'ZJX' into cxs
|
4 years ago |
|
CXS
|
ff5df59376
删除无效备注，颗粒列表当前卡顿剩余待处理项：抠图
|
4 years ago |
|
CXS
|
b822c6f8dc
颗粒列表优化改进3.0版--修改sql语句，颗粒元素及含量拼接改为内存处理，此版本大幅优化速度！
|
4 years ago |
|
zhangjiaxin
|
594780b235
多语言20211125下午第二版
|
4 years ago |
|
zhangjiaxin
|
41339d810f
多语言新曾文件
|
4 years ago |
|
zhangjiaxin
|
342d16cd9a
Merge branch 'ZJX' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into ZJX
|
4 years ago |
|
zhangjiaxin
|
98f032cebd
报告程序多语言未完成
|
4 years ago |
|
CXS
|
3be225b8fe
颗粒列表优化改进2.2版--重构获取数据库结构，一次性调用所有颗粒数据库信息以减少数据库耗时的影响，进度条及其它一些尝试
|
4 years ago |
|
CXS
|
e7a0d33c33
颗粒列表优化改进2.1版--重构获取数据库结构，一次性调用所有颗粒数据库信息以减少数据库耗时的影响，加快分页速度
|
4 years ago |
|
CXS
|
e85876f76c
颗粒列表结构各种SQL语句优化尝试
|
4 years ago |
|
CXS
|
4f6c66d856
修复优化颗粒列表引起的bug并重新修改获取总条目方式
|
4 years ago |
|
CXS
|
51e48972de
修复条件选择时颗粒总数不准的bug
|
4 years ago |
|
CXS
|
dad632c135
1.调整颗粒总数的获取方式，优化加载速度
|
4 years ago |
|
zhangjiaxin
|
23724881e0
Merge branch 'release2.2' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into release2.2
|
4 years ago |
|
zhangjiaxin
|
8406df13ab
修改未加载测量结果文件，关闭报告程序时报错的问题
|
4 years ago |
|
CXS
|
1e1635a6c7
修改费雷特直径筛选条数
|
4 years ago |
 gsp
|
9852c5aff3
add missing files: DrawFunction.cs
|
4 years ago |
|
gsp
|
0477c2e845
Merge branch 'release2.2' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into release2.2
|
4 years ago |
|
gsp
|
708123761e
optimize the operating speed of aliment image.
|
4 years ago |
|
zhangjiaxin
|
baaa0b5f83
Merge branch 'release2.2' into ZJX
|
4 years ago |
|
zhangjiaxin
|
4df76f314a
清理导出国标中没有用到的函数和代码注释
|
4 years ago |
|
CXS
|
0f9ceed5ac
添加分辨率1024x684
|
4 years ago |
|
zhangjiaxin
|
35e4e2e57b
Merge branch 'release2.2' into ZJX
|
4 years ago |
|
zhangjiaxin
|
2d40c1c385
修改报表元素分布表的格式，元素增加至14个元素，另外增加元素分布表已字符串的形式显示全部元素信息；增加国标导出报表功能；
|
4 years ago |
|
CXS
|
8a583e1195
Merge branch 'release2.2' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into release2.2
|
4 years ago |
|
gsp
|
c5b4987a1a
fix a bug in report.
|
4 years ago |
|
CXS
|
31baf68d0f
Merge branch 'release2.2' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into release2.2
|
4 years ago |
|
gsp
|
3bcfcbec99
Merge branch 'release2.2' of http://172.16.3.77:10080/gaoshipeng/OTS2_0 into release2.2
|
4 years ago |
