Commit Graph

674 Commits

Author SHA1 Message Date
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
f50fcf4fa2 WIP: 修改Interactive Tools 弹窗诸多问题 2023-11-01 11:17:25 +08:00
xiaoguangbin
9e1377d5df Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev 2023-11-01 11:04:17 +08:00
xiaoguangbin
515f8ff43f Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev 2023-11-01 11:04:11 +08:00
cc8e027322 取消analysis 模块中所有的弹窗点击蒙层关闭的功能 2023-11-01 10:57:18 +08:00
d2838ebb12 弹窗打开时点击其他的地方不允许关闭弹窗 2023-11-01 10:47:49 +08:00
orgin
6f441b3b35 Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev 2023-11-01 08:52:29 +08:00
d6b48e13e8 Merge branch 'feature-particulate-renpy' into master-dev 2023-10-31 17:23:16 +08:00
99e92f4491 web 模块下所有的 qcphd,sphdf,sphdp 这三个普的查询日期都默认为一周 2023-10-31 17:20:59 +08:00
a2ebcbcacd fix: Fit Peaks后未将新的Peak内容传出来的问题 2023-10-31 15:56:07 +08:00
7601491497 fix: 去掉聚焦时的边框 2023-10-31 15:49:13 +08:00
3ba00dc3c7 refactor: 重构Color Config和Interactive获取和处理数据的方式,修改监听keydown事件的元素为局部元素 2023-10-31 15:44:26 +08:00
90d90da2eb 处理分页模块中所有弹窗的表格数字回显的格式及beta 的Result display 模块数据格式 2023-10-31 13:34:36 +08:00
xiaoguangbin
98f17c8e31 Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev 2023-10-30 20:48:50 +08:00