|
|
f849f07dd4
|
交互库的数据SampleId 相同的时候我选择一条，其他的不要关联选中，交互库现在会有多条SampleID相同的数据
Load From Database表格不要出现换行
|
2023-11-15 18:33:25 +08:00 |
|
|
|
d431f339c2
|
处理重分析后，刻度更新的显示问题
|
2023-11-15 17:39:37 +08:00 |
|
|
|
186e7cf88c
|
处理参数
|
2023-11-15 17:07:45 +08:00 |
|
|
|
46d433f803
|
已经分析好几次了，分析进度上面部分 calibrationUpdates 应该没有了
|
2023-11-15 16:36:45 +08:00 |
|
|
|
e7f4656fef
|
fix: beta 下的energy calibration，选了AllSpectrum后，重新分析，把备选列表中相同台站的本地缓存清空，当XeData为空时，不应用
|
2023-11-15 15:09:36 +08:00 |
|
|
|
06d3e99725
|
fix
|
2023-11-15 14:41:21 +08:00 |
|
|
|
e14525169e
|
大量数据的表格添加滚动条
|
2023-11-15 14:35:10 +08:00 |
|
|
|
7136b65158
|
处理测试接口的校验问题，
处理候去db name 接口的参数问题
|
2023-11-15 14:28:28 +08:00 |
|
|
|
9c30a2d773
|
处理 alarm 模块，DB Monitor overview 页面表格字段，及样式调整
处理新增表单的校验问题
调整instances tablespace 页签查询接口及参数
|
2023-11-15 13:38:27 +08:00 |
|
|
|
d57dcfa147
|
人工交互分析的 getDBSpectrumChart 接口增加 analyst 参数
|
2023-11-15 09:39:09 +08:00 |
|
|
|
f971cd048d
|
参数调整
|
2023-11-15 09:08:29 +08:00 |
|
|
|
e8ffe4b686
|
web 模块 页面详情种的zip下载功能对接
|
2023-11-14 18:16:11 +08:00 |
|
|
|
0423207abf
|
alarm 模块 db overview 页面，新增和编辑表单增加驱动类和数据源地址字段
皆苦参数调整
增加test 测试功能
|
2023-11-14 15:38:41 +08:00 |
|
|
|
5487cf3289
|
web statistics 模块中，所有页面的详情中隐藏 TXT 下载按钮
|
2023-11-14 14:08:29 +08:00 |
|
|
|
da2d6acaf3
|
fix: 修改参数
|
2023-11-14 13:46:06 +08:00 |
|
|
|
a071df3b66
|
fix: 增加initValue和gammaByDB参数
|
2023-11-14 11:29:02 +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 |
|
|
|
2b8d41a5ce
|
下载文件的名称按照analysis模块的格式命名
|
2023-11-13 15:27:58 +08:00 |
|
|
|
bfceec07c3
|
From db 弹窗默认勾选acq.start ，日期框默认一个月
|
2023-11-13 11:12:37 +08:00 |
|
|
|
e0dfaf9ce9
|
选择一条数据之后，回显应该按照表单的值回显
|
2023-11-10 18:37:44 +08:00 |
|
|
|
d31a12b8e4
|
fix: 修复PHDParser 对异形文件名解析问题
|
2023-11-10 18:12:02 +08:00 |
|
|
|
88348f4f78
|
fix: 修改Save to Txt调的接口
|
2023-11-10 16:41:35 +08:00 |
|
|
|
8459081c5c
|
feat: 增加Energy Calibration重新分析回调后对主页面右侧Energy的影响
|
2023-11-10 15:43:29 +08:00 |
|
|
|
b1c86a8077
|
服务器监控页面中的tablespace 页面渲染及接口联调
|
2023-11-10 14:58:14 +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 |
|
|
|
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 |
|
