|
|
e7f4656fef
|
fix: beta 下的energy calibration，选了AllSpectrum后，重新分析，把备选列表中相同台站的本地缓存清空，当XeData为空时，不应用
|
2023-11-15 15:09:36 +08:00 |
|
|
|
da2d6acaf3
|
fix: 修改参数
|
2023-11-14 13:46:06 +08:00 |
|
|
|
fb23e422d8
|
fix: 修改Insert Peaks修改值的逻辑
|
2023-11-14 10:07:21 +08:00 |
|
|
|
0b12f3dca1
|
feat: 增加Analyst字段
|
2023-11-14 10:06:04 +08:00 |
|
|
|
6512330880
|
fix
|
2023-11-13 18:33:30 +08:00 |
|
|
|
2cd1cd9f7d
|
fix: 优化load from db搜索栏station和detector列表逻辑
|
2023-11-13 18:27:59 +08:00 |
|
|
|
9d1910e689
|
探测器按照选择的station进行过滤，例如 选择了台站AUX04，那么探测器里只有AUX04的
|
2023-11-13 17:44:47 +08:00 |
|
|
|
bfceec07c3
|
From db 弹窗默认勾选acq.start ，日期框默认一个月
|
2023-11-13 11:12:37 +08:00 |
|
|
|
e0dfaf9ce9
|
选择一条数据之后，回显应该按照表单的值回显
|
2023-11-10 18:37:44 +08:00 |
|
|
|
91b29d157f
|
fix: 修改某些log等文本信息弹窗的可写性
|
2023-11-10 14:11:25 +08:00 |
|
|
|
0984cfcd5c
|
beta 模块中 Energy Calibration 弹窗中点击重新分析，打不开view RRR 弹窗
|
2023-11-10 11:59:25 +08:00 |
|
|
|
cc64c389f3
|
处理beta View RRR 弹窗打不开的问题
|
2023-11-10 10:48:51 +08:00 |
|
|
|
2403bb36fd
|
Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-10 09:40:08 +08:00 |
|
|
|
cda0b089ad
|
处理 beta 重新分析后，view RRR 被拦截的问题
|
2023-11-10 09:39:39 +08:00 |
|
|
|
3ed2a5cd31
|
fix: 打开时重置输入框内容
|
2023-11-09 19:13:48 +08:00 |
|
|
|
f1af8cc8b9
|
fix: ReAnalyse后矩形框未变化的问题
|
2023-11-09 16:39:00 +08:00 |
|
|
|
dd993b4ac8
|
处理遗留的数据格式问题
|
2023-11-09 14:56:54 +08:00 |
|
|
|
a8b4d34536
|
gamma 模块 Interactive tool 弹窗位置
Calibration 点击Reanalysis之后 返回结果 Result display 没有重新渲染
formFile 点击save to DB Result display 数据丢失
|
2023-11-09 10:55:08 +08:00 |
|
|
|
b5c51883da
|
fix: 修复accept后新的baseCtrl未传出来的问题
|
2023-11-09 10:33:17 +08:00 |
|
|
|
e13f8cbc22
|
fix: 修复删除Peak后，在视觉上还存在的问题
|
2023-11-09 10:01:55 +08:00 |
|
|
|
8282663e3e
|
处理弹窗的样式问题
|
2023-11-08 18:42:07 +08:00 |
|
orgin
|
1a45961880
|
Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-08 17:54:44 +08:00 |
|
orgin
|
54aa84f31f
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-08 17:54:40 +08:00 |
|
|
|
2f3947e6cf
|
fix: 修复文件名为null的问题
|
2023-11-08 17:44:57 +08:00 |
|
|
|
c91886a5e9
|
fix: 修改使用不支持直接选择文件的浏览器时，Compare弹窗中获取文件列表的请求发起的时机
|
2023-11-08 17:00:09 +08:00 |
|
orgin
|
693d7bf839
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-08 16:37:28 +08:00 |
|
|
|
63969c8b2c
|
fix: 修复Gamma 交互分析中Replot后错误的赋值的问题
|
2023-11-08 15:28:20 +08:00 |
|
|
|
13256cd226
|
处理gamma calibration 下面的 Energy 、Resolution 、Efficiency 三个功能 ，调整散点的大小
|
2023-11-08 15:07:43 +08:00 |
|
orgin
|
385f0d7bd0
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-08 14:35:11 +08:00 |
|
|
|
b026200b25
|
BetaGamma Analyser Log 和之前一样 直接保存文件，不需要输入名称
|
2023-11-08 14:28:14 +08:00 |
|
orgin
|
8f7f5a7ba4
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-07 17:23:00 +08:00 |
|
|
|
7d2510e8a6
|
fix: 修改BGLogViewer参数问题
|
2023-11-07 17:02:09 +08:00 |
|
|
|
da9257e81b
|
fix: 修复beta清理缓存的调用在load from file时传的文件名不正确问题，getGammaGated接口增加文件名参数
|
2023-11-07 14:30:42 +08:00 |
|
xiaoguangbin
|
a6cb982a0f
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-03 18:14:08 +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 |
|
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 |
|
|
|
5e4abce032
|
fix: 删除峰的时候顺带清空右下角核素列表
|
2023-11-03 10:30:58 +08:00 |
|
|
|
dc9664de47
|
from db 中 sampleType = all 的时候 默认不勾选 sample
|
2023-11-03 10:03:22 +08:00 |
|
|
|
b81d5a9797
|
fix: 修复barChart在操作后未回传值的问题
|
2023-11-02 19:30:51 +08:00 |
|
|
|
481fcf99c3
|
fix: 修复切换Peak切页时barChart未移动的问题
|
2023-11-02 16:49:55 +08:00 |
|
|
|
ad36a1f289
|
fix: 修复部分gamma类型中sampleFileName解析错误的问题，nuclide review弹窗增加切换chart的时候也滚动到table中选中的项的功能
|
2023-11-02 16:12:35 +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 |
|
|
|
a733ae0688
|
fix: 去掉Fit Peaks中的Cancel，修复barChart问题
|
2023-11-02 13:41:19 +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
|
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 |
|
|
|
f50fcf4fa2
|
WIP: 修改Interactive Tools 弹窗诸多问题
|
2023-11-01 11:17:25 +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 |
|
|
|
a2ebcbcacd
|
fix: Fit Peaks后未将新的Peak内容传出来的问题
|
2023-10-31 15:56:07 +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 |
|
|
|
a7b18c57c7
|
WIP: 修改Interactive Tools 弹窗数据的获取方式，底下的表格最后一项改为溢出隐藏，操作markLine时如不可见，则自动居中
|
2023-10-30 19:56:56 +08:00 |
|
|
|
1a849ec336
|
gamma 的 Save Results to File save All 功能对接
|
2023-10-30 19:53:55 +08:00 |
|
|
|
9eeb9435b5
|
feat: 增加SAVE上的loading，增加BG log viewer弹窗
|
2023-10-30 16:01:27 +08:00 |
|
|
|
0672e09dd1
|
fix: 修复Beta 下 Energy Calibration弹窗左下角All Spectrum 未生效问题
|
2023-10-30 11:55:27 +08:00 |
|
|
|
e95fe5da81
|
fix: 修复RLR组件中sampleData重复声明的问题
|
2023-10-30 10:03:51 +08:00 |
|
orgin
|
9ac29bd072
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-28 20:52:08 +08:00 |
|
|
|
6cd3a38a3d
|
调整查看qc文件的判断条件
|
2023-10-28 20:51:42 +08:00 |
|
orgin
|
c46da76c99
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-28 20:46:09 +08:00 |
|
|
|
e61572f87b
|
reports 菜单下的保存文件逻辑调整
|
2023-10-28 19:55:14 +08:00 |
|
qiaoqinzheng
|
774fd4afa8
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-analysis-RLR-renpy
|
2023-10-28 19:33:41 +08:00 |
|
qiaoqinzheng
|
70b654b7f1
|
fix:解决automatic log 弹窗获取不到数据问题
|
2023-10-28 19:33:02 +08:00 |
|
|
|
8b147f86fd
|
Merge branch 'feature-analysis-RLR-renpy' into master-dev
# Conflicts:
# src/mixins/JeecgListMixin.js
|
2023-10-28 18:18:02 +08:00 |
|
|
|
1972d1666c
|
dbaearch 增加状态筛选条件，及接口增加状态筛选字段，
col字段增加排序功能
|
2023-10-28 18:01:55 +08:00 |
|
xiaoguangbin
|
18f343d899
|
fix:Beta 的energy calibration的操作逻辑
|
2023-10-28 17:36:02 +08:00 |
|
qiaoqinzheng
|
56918f36c1
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-analysis-RLR-renpy
|
2023-10-28 17:25:43 +08:00 |
|
qiaoqinzheng
|
95ba9eed73
|
修改Energy Calibration交互逻辑
|
2023-10-28 17:20:58 +08:00 |
|
|
|
6609b7cb92
|
beta viewSpectrum 接口参数调整
|
2023-10-28 16:32:57 +08:00 |
|
|
|
0a483e98d3
|
fix: 增加beta的自动分析日志，修改spectrum页面销毁未清理本地缓存的谱列表信息的问题
|
2023-10-27 13:38:08 +08:00 |
|
|
|
13fc43d8c7
|
fix: 修复beta下Add Comment、Statistics弹窗及load from file文件名问题
|
2023-10-27 10:54:26 +08:00 |
|
|
|
5cc9a647a8
|
fix: 修改statistics paramer history 弹窗中的部分参数
|
2023-10-26 18:26:03 +08:00 |
|
|
|
0f0b3eac14
|
feat: 增加谱切换时本地保存功能，修复extrapolation 和 Spectrum中的问题
|
2023-10-26 18:14:15 +08:00 |
|
任珮宇
|
ad19436f82
|
bata QC results 弹窗查询接口参数调整
bata View Sample Infomation 弹窗查询接口参数调整
|
2023-10-26 17:34:33 +08:00 |
|
任珮宇
|
dee3c57090
|
ARR查询无结果 参数调整
|
2023-10-26 17:04:21 +08:00 |
|
任珮宇
|
8bf55b007c
|
处理form DB 来源的 beta viewRRR 查询报错
|
2023-10-26 16:38:08 +08:00 |
|
|
|
fc7c62b504
|
fix: 修复Beta点击QC Flags弹窗中DetectorList 为undefined的问题，gamma双击图表改为显示peak弹窗
|
2023-10-26 13:51:51 +08:00 |
|
任珮宇
|
9e29991152
|
SampleType 下拉框选择之后过滤Sample下拉框数据
|
2023-10-25 15:47:28 +08:00 |
|
|
|
46c4dcd927
|
fix: 优化gamma页各图形构建方式，修复log10刷选后scatter丢失的问题，优化GraphAssistance组件，默认选中log10，from db默认选择full
|
2023-10-25 14:39:14 +08:00 |
|
任珮宇
|
4ec2fec97b
|
gamma模块下 analyze korsum弹窗 右侧的table改成可编辑的表格
|
2023-10-23 17:37:26 +08:00 |
|
|
|
b936995317
|
fix: 修复保存Results时的文件名称不正确问题，Compare和Strip增加本地直接选择文件功能
|
2023-10-23 15:13:12 +08:00 |
|
|
|
c1d3129441
|
fix: 按新接口对接Extrapolation的表格、图表绘制和分析功能
|
2023-10-23 11:27:31 +08:00 |
|
xiaoguangbin
|
8b36e4bc4e
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-analysis-RLR-renpy
|
2023-10-20 18:10:09 +08:00 |
|
xiaoguangbin
|
489fd642fb
|
feat:krosum弹窗完成分析以及右侧table数据渲染功能
|
2023-10-20 18:09:51 +08:00 |
|
|
|
26c4b05abb
|
feat: 文件转换功能
|
2023-10-20 16:54:13 +08:00 |
|
任珮宇
|
e69f1b7c06
|
处理getFileSpectrumChart接口参数
|
2023-10-19 19:32:40 +08:00 |
|
任珮宇
|
e89afcba1b
|
后选列表要用表格里面的文件名称要用格式化后的名称
|
2023-10-19 19:08:35 +08:00 |
|
任珮宇
|
7e7d2f226a
|
form file 加载本地文件，逻辑调整
|
2023-10-19 17:24:56 +08:00 |
|
|
|
b70211b4e5
|
fix: BetaGammaExtrapolationModal
|
2023-10-18 18:02:22 +08:00 |
|
