|
|
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 |
|
