|
|
3ac3f41842
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-analysis-RLR-renpy
|
2023-11-03 18:11:50 +08:00 |
|
|
|
91a580ec8c
|
save to db 之后 需要回显对应的 Sample ID
|
2023-11-03 18:10:54 +08:00 |
|
|
|
af9c537f34
|
fix: 修复accept后peak值不对的问题
|
2023-11-03 18:02:35 +08:00 |
|
xiaoguangbin
|
4d2a40cb35
|
Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-03 17:20:19 +08:00 |
|
|
|
449570f171
|
处理表格数据格式
|
2023-11-03 17:05:45 +08:00 |
|
|
|
820614cf28
|
fix: 修复语法错误
|
2023-11-03 15:30:59 +08:00 |
|
|
|
50c8c0d4d2
|
fix: 修改table的size
|
2023-11-03 15:22:28 +08:00 |
|
|
|
dae3882b50
|
Data Recevice status Monitoring 弹窗图表点击legned，渲染图表的时候，会回到初始定位的地方
|
2023-11-03 14:42:24 +08:00 |
|
orgin
|
118814f667
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-03 13:49:42 +08:00 |
|
xiaoguangbin
|
4eaeda87ff
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-03 11:51:54 +08:00 |
|
|
|
ceefce8f9c
|
fix: 完善删除功能
|
2023-11-03 11:12:52 +08:00 |
|
xiaoguangbin
|
4cd6430bd0
|
Merge branch 'feature-Station-dev-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-03 10:37:24 +08:00 |
|
|
|
5e4abce032
|
fix: 删除峰的时候顺带清空右下角核素列表
|
2023-11-03 10:30:58 +08:00 |
|
|
|
1b2ccfc6b7
|
beta 重新分析接口增加条件判断，处理错误信息
|
2023-11-03 10:23:34 +08:00 |
|
|
|
dc9664de47
|
from db 中 sampleType = all 的时候 默认不勾选 sample
|
2023-11-03 10:03:22 +08:00 |
|
xiaoguangbin
|
855de3b665
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-03 08:52:06 +08:00 |
|
|
|
b81d5a9797
|
fix: 修复barChart在操作后未回传值的问题
|
2023-11-02 19:30:51 +08:00 |
|
xiaoguangbin
|
306770c7ea
|
Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-02 18:51:28 +08:00 |
|
xiaoguangbin
|
406da1a132
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-02 18:35:59 +08:00 |
|
|
|
fa9b9c7398
|
增加提示消息
|
2023-11-02 18:35:25 +08:00 |
|
xiaoguangbin
|
c3ecfc4583
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-02 18:24:52 +08:00 |
|
|
|
ea08ccdf63
|
fix: 增加删除sample列表时清理 calibration-gamma 的功能
|
2023-11-02 18:02:33 +08:00 |
|
|
|
36c42be01f
|
调整本地文件如果没有分析过，save to db需要进行判断，不允许请求接口
如果保存失败，需要把接口错误结果提示处理
Beta不需要显示 save current
save to db 没有触发“转圈”特效
|
2023-11-02 17:55:15 +08:00 |
|
|
|
481fcf99c3
|
fix: 修复切换Peak切页时barChart未移动的问题
|
2023-11-02 16:49:55 +08:00 |
|
xiaoguangbin
|
9231c26d32
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-02 16:13:59 +08:00 |
|
|
|
ad36a1f289
|
fix: 修复部分gamma类型中sampleFileName解析错误的问题，nuclide review弹窗增加切换chart的时候也滚动到table中选中的项的功能
|
2023-11-02 16:12:35 +08:00 |
|
|
|
98ce272d05
|
调整 beta 普重计算接口代码调整
|
2023-11-02 15:18:24 +08:00 |
|
xiaoguangbin
|
6678e1bf71
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-02 14:39:27 +08:00 |
|
xiaoguangbin
|
2704aab82d
|
Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-02 14:22:31 +08:00 |
|
|
|
6cc9d9ae69
|
fix: NuclideReview 返回为空时的处理
|
2023-11-02 13:53:59 +08:00 |
|
xiaoguangbin
|
ae866d1bdd
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-02 13:52:09 +08:00 |
|
orgin
|
27f08b2fe2
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-02 13:42:55 +08:00 |
|
orgin
|
a8cb864938
|
Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-02 13:42:44 +08:00 |
|
|
|
a733ae0688
|
fix: 去掉Fit Peaks中的Cancel，修复barChart问题
|
2023-11-02 13:41:19 +08:00 |
|
|
|
c18ec9bb10
|
调整数值的显示格式
|
2023-11-02 11:50:26 +08:00 |
|
xiaoguangbin
|
b1dc1e6e64
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-02 10:43:41 +08:00 |
|
|
|
5b0bb1ec4e
|
fix: BG Log Viewer和QC Results对字段
|
2023-11-02 10:43:13 +08:00 |
|
|
|
4feda76add
|
fix: Peak Infomation最后一列溢出隐藏，Resolution报错的问题
|
2023-11-02 10:42:28 +08:00 |
|
xiaoguangbin
|
04c9092b76
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-02 10:25:19 +08:00 |
|
xiaoguangbin
|
2bdb5f3534
|
merge RLR
|
2023-11-02 10:24:25 +08:00 |
|
|
|
2196ded56c
|
SampleType切换的时候应该修改sample下拉框对对应的内容，默认选择第一个
|
2023-11-02 10:17:52 +08:00 |
|
xiaoguangbin
|
ce20269bbe
|
Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-02 10:12:53 +08:00 |
|
xiaoguangbin
|
fea099fe4f
|
fix:1 修改fitting逻辑解决计算错误问题；2 增加数据缓存，再次打开他弹窗回显上一次fitting结果
|
2023-11-02 10:12:38 +08:00 |
|
|
|
ffb78dc975
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-analysis-RLR-renpy
|
2023-11-02 09:29:26 +08:00 |
|
|
|
3ef23d83b9
|
Form file 分析之后，点击RRR，接口出现错误信息
|
2023-11-02 09:29:05 +08:00 |
|
|
|
72c7c7beb9
|
fix: 修复Gamma Analysis和Interactive Tools中的诸多问题
|
2023-11-01 20:10:49 +08:00 |
|
|
|
b509ff23a0
|
处理gamma by DB 如果分析状态为true 时，RRR 弹窗打不开的问题
|
2023-11-01 17:38:31 +08:00 |
|
orgin
|
28b6d764e2
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-01 14:48:12 +08:00 |
|
orgin
|
287e042d87
|
Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-01 14:48:03 +08:00 |
|
|
|
a64cbc77ae
|
取消系统中所有模块页面的modal 弹窗点击蒙层关闭的效果
|
2023-11-01 14:14:35 +08:00 |
|
