|
|
7e637c8c85
|
使用keep alive 缓存组件后，定时器不能销毁的问题
|
2023-11-08 18:04:41 +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
|
4a337648ae
|
Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-08 14:35:58 +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 |
|
|
|
c8c1c021ea
|
fix: 各页面keepAlive功能
|
2023-11-08 11:47:49 +08:00 |
|
|
|
7ecd609185
|
先加载 Gamma 谱，然后从 From DB 加载Beta 谱，切换到 Beta 右下角有分析结果，切换到 Gamma 谱再切回 Beta，右下角分析结果没有了
|
2023-11-08 10:52:26 +08:00 |
|
|
|
cb8adf6808
|
fix: database修复Collect Stop 和Acq.Start参数不正确问题
|
2023-11-08 10:08:21 +08:00 |
|
orgin
|
cd09d7d974
|
Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-07 18:08:24 +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 |
|
qiaoqinzheng
|
ea63c3ac08
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-07 16:42:03 +08:00 |
|
|
|
4e9304ec9d
|
fix: 台站增加搜索功能
|
2023-11-07 15:40:22 +08:00 |
|
orgin
|
a330a34ee7
|
Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-07 15:14:01 +08:00 |
|
orgin
|
f586af01c5
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-07 15:13:45 +08:00 |
|
|
|
da9257e81b
|
fix: 修复beta清理缓存的调用在load from file时传的文件名不正确问题，getGammaGated接口增加文件名参数
|
2023-11-07 14:30:42 +08:00 |
|
|
|
30d6f111d3
|
前端页面点击abnormal alarm标签页面跳转到了spectrum analysis标签页面
|
2023-11-07 13:54:45 +08:00 |
|
|
|
1777d174e2
|
feat: 增加beta下右下角的放大镜功能，修改左侧图表上层叠方框的颜色
|
2023-11-06 17:53:21 +08:00 |
|
orgin
|
4121038a6a
|
Merge branch 'feature-Station-dev-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-06 16:10:03 +08:00 |
|
|
|
f072b2d40b
|
fix: 增加initValue的调用，增加gamma下的save phd to file的save all
|
2023-11-06 15:36:02 +08:00 |
|
orgin
|
111eda41b2
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-06 14:54:37 +08:00 |
|
|
|
4303ec5fa1
|
处理From file 点击 load 按钮之后没有添加到候选列表
|
2023-11-06 14:45:19 +08:00 |
|
orgin
|
52efa463f5
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-06 11:03:26 +08:00 |
|
|
|
515cfe18f1
|
Calibration 点击 reanalysis 按钮之后得到新结果没有渲染
|
2023-11-06 10:22:36 +08:00 |
|
|
|
cf92cf8d73
|
database 模块日期筛选，默认一周
|
2023-11-03 19:05:45 +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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
|
|
4c84da88ea
|
beta 的 Save Results to File 功能调整
增加 save to Html 功能，及接口调试
|
2023-10-30 19:39:02 +08:00 |
|
|
|
9eeb9435b5
|
feat: 增加SAVE上的loading，增加BG log viewer弹窗
|
2023-10-30 16:01:27 +08:00 |
|
|
|
3ae3dee3d2
|
fix: 修复store中的问题
|
2023-10-30 15:15:56 +08:00 |
|
|
|
d5d15ad5b4
|
fix: 修复beta下重新分析后，Result Display的数据没缓存的问题
|
2023-10-30 14:02:30 +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 |
|
|
|
cb7718b006
|
fix: Data Recevice status Monitoring 右侧图表legend未重置的问题
|
2023-10-30 09:48:48 +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 |
|
