 cxs
|
2ac4285c71
Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0
|
1 سال پیش |
|
cxs
|
34488a8720
修改 lowcount 列入 其他 颗粒中
|
1 سال پیش |
 zhangjiaxin
|
b11c7a10ab
Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0
|
1 سال پیش |
|
zhangjiaxin
|
5b1d0266fc
报告导出拼接图，修改下背景颜色
|
1 سال پیش |
|
cxs
|
5c631fd153
修改界面保存为保存至默认管理
|
1 سال پیش |
|
zhangjiaxin
|
9ea5c066f9
临时提交
|
1 سال پیش |
|
cxs
|
7d4a6b4f5b
Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0
|
1 سال پیش |
|
cxs
|
8127300ead
修改 测量程序加载已测试过的样品时 清楚数据的报错问题（现在用的trycatch后续有时间修改数据库读取方式非流reader）
|
1 سال پیش |
|
zhangjiaxin
|
da33d6cb43
Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0
|
1 سال پیش |
|
zhangjiaxin
|
bc8045e9c7
国标导出修正，报告导出修改
|
1 سال پیش |
|
cxs
|
ac8271896e
修改为 螺旋,蛇形,Z字形
|
1 سال پیش |
 gsp
|
3592a3896d
remove the in place judgment before moving stage in oxfordwrapper
|
1 سال پیش |
|
gsp
|
8f0c20e505
add the z shape photograph sequence
|
1 سال پیش |
|
gsp
|
0379cd638e
remove some useless comments
|
1 سال پیش |
|
gsp
|
47b4634b71
improve bruker
|
1 سال پیش |
|
gsp
|
70d4801b52
change bruker quantify method to "oxides"
|
1 سال پیش |
|
zhangjiaxin
|
d2b6358098
报告导出优化
|
1 سال پیش |
|
gsp
|
e1b82dc7bb
do not copy the App.config of oxfordwrapper project to local
|
1 سال پیش |
|
gsp
|
d9759e527e
Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0
|
1 سال پیش |
|
cxs
|
44d5103a82
输出execl列头改为中英文
|
1 سال پیش |
|
cxs
|
756870e638
添加配置help
|
1 سال پیش |
|
gsp
|
e08e3b5405
Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0
|
1 سال پیش |
|
gsp
|
8a4f77e39a
reset the OTSIncAMeasureApp.csproj framework to 4.8
|
1 سال پیش |
|
zhangjiaxin
|
17513d4885
Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0
|
1 سال پیش |
|
zhangjiaxin
|
ffe2e71d1d
修复报告程序导出时大分类为空是数据不显示问题
|
1 سال پیش |
|
gsp
|
c558f07cdc
Merge branch 'OTSRelease3_0' of http://36.129.163.148:30080/gogsadmin/OTS into OTSRelease3_0
|
1 سال پیش |
|
gsp
|
008bf0f45b
fix the issue of oxford driver(cann't move to a current position)
|
1 سال پیش |
|
zhangjiaxin
|
73b00dd82d
修复导出国标图的bug
|
1 سال پیش |
|
zhangjiaxin
|
f603f56812
报告程序导出国标图补充提交代码
|
1 سال پیش |
|
zhangjiaxin
|
623f1173b3
ots报告程序增加导出国标图片，导出报告修改报告，数据库里有低计数颗粒导致报错
|
1 سال پیش |
