xiaoguangbin
|
2d22ac7db4
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-28 17:25:58 +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 |
|
xiaoguangbin
|
8ed7bb2173
|
Merge branch 'feature-Station-dev-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-28 17:22:47 +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 |
|
|
|
7afd8fb702
|
台站监控数据信息弹框标题修改
查询台站监控数据信息接口增加参数
|
2023-10-28 15:57:25 +08:00 |
|
|
|
aa5b97509d
|
字段调整
|
2023-10-28 13:41:14 +08:00 |
|
|
|
fac40cb2dc
|
前端增加数据过滤条件
|
2023-10-28 12:02:06 +08:00 |
|
|
|
d439734ebd
|
切换页面是，关闭定时器接口
如果接口报错，尝试季测若不成功，载关闭
|
2023-10-28 11:58:59 +08:00 |
|
xiaoguangbin
|
b9b6b7af2c
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-28 10:01:34 +08:00 |
|
|
|
092da52363
|
fix: 去掉Beta下的save phd to file
|
2023-10-27 17:20:49 +08:00 |
|
|
|
062b80ea16
|
fix: 点击台站图标打开数据接收状态弹窗时，如果该台站在已关注的台站中，则将其在右侧图表中置顶
|
2023-10-27 17:06:05 +08:00 |
|
xiaoguangbin
|
2bb1a79308
|
Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-27 17:04:02 +08:00 |
|
orgin
|
1f73622556
|
Merge branch 'feature-Station-dev-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-27 17:03:37 +08:00 |
|
任珮宇
|
c2e34c2af3
|
处理地图右侧filter功能不生效的问题
|
2023-10-27 16:52:25 +08:00 |
|
xiaoguangbin
|
34d884ee7a
|
Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-27 16:47:45 +08:00 |
|
|
|
5125c5bf64
|
fix: 修复Filter数据在页面销毁时未重置问题
|
2023-10-27 14:48:32 +08:00 |
|
orgin
|
18880d2647
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-27 14:36:17 +08:00 |
|
任珮宇
|
a62efa494f
|
查询台站数据提供率及有效率 无数据返回是，关闭定时器，等接口有数据是在执行
台站详情弹窗中字段调整
|
2023-10-27 14:28:05 +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 |
|
任珮宇
|
9dd1e3969a
|
台站详情弹窗调整
|
2023-10-27 10:50:01 +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 |
|
xiaoguangbin
|
7fb994c8bb
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-26 15:48:58 +08:00 |
|
xiaoguangbin
|
8d1f572aa6
|
Merge branch 'feature-Alarm-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-26 15:26:31 +08:00 |
|
任珮宇
|
41c34034ed
|
处理Overview 双击进去instances的时候 左侧导航没有切换到对应的的问题
server 切换服务器的时候 数据没有清空 Instances页面报警历史接口问题
|
2023-10-26 15:12:31 +08:00 |
|
orgin
|
8cdeb06cf1
|
Merge branch 'feature-Alarm-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-26 14:50:36 +08:00 |
|
orgin
|
5581bc19bd
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-26 14:50:26 +08:00 |
|
|
|
df457a3e4f
|
fix: 修复底部significance不变的问题
|
2023-10-26 14:45:59 +08:00 |
|
xiaoguangbin
|
35978b7b43
|
Merge branch 'feature-Alarm-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-26 14:29:53 +08:00 |
|
xiaoguangbin
|
e5265561b5
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-26 14:27:27 +08:00 |
|
|
|
fc7c62b504
|
fix: 修复Beta点击QC Flags弹窗中DetectorList 为undefined的问题，gamma双击图表改为显示peak弹窗
|
2023-10-26 13:51:51 +08:00 |
|
|
|
67757b84e7
|
feat: 增加对gamma图表缩放的键盘快捷键
|
2023-10-26 11:39:06 +08:00 |
|
orgin
|
299d3a2f6b
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-26 10:57:21 +08:00 |
|
xiaoguangbin
|
76bcfecebb
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-26 09:42:36 +08:00 |
|
任珮宇
|
78dba4c37c
|
analysis beta Result display 样式错乱问题处理
|
2023-10-26 09:38:32 +08:00 |
|
orgin
|
486b9f5d9f
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-25 19:03:36 +08:00 |
|
xiaoguangbin
|
e105d4c8e0
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-25 18:38:15 +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 |
|
任珮宇
|
5a6387bef9
|
alarm 模块 Alarm information接口调整
|
2023-10-25 11:43:36 +08:00 |
|
xiaoguangbin
|
cdfb4d828e
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-25 08:55:24 +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 |
|
xiaoguangbin
|
2b3731322c
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-23 15:01:19 +08:00 |
|
|
|
c1d3129441
|
fix: 按新接口对接Extrapolation的表格、图表绘制和分析功能
|
2023-10-23 11:27:31 +08:00 |
|
orgin
|
f9472a529f
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-20 18:14:20 +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 |
|
|
|
b7767bd15e
|
fix: Reprocessing All功能，及部分问题修改
|
2023-10-20 17:59:52 +08:00 |
|
|
|
26c4b05abb
|
feat: 文件转换功能
|
2023-10-20 16:54:13 +08:00 |
|
|
|
961f9752f6
|
feat: 对接清理sample缓存功能
|
2023-10-20 10:11:43 +08:00 |
|
xiaoguangbin
|
6f43ad6fd6
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-19 19:51:10 +08:00 |
|
任珮宇
|
e69f1b7c06
|
处理getFileSpectrumChart接口参数
|
2023-10-19 19:32:40 +08:00 |
|
xiaoguangbin
|
ca3b67a957
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-19 19:15:53 +08:00 |
|
任珮宇
|
e89afcba1b
|
后选列表要用表格里面的文件名称要用格式化后的名称
|
2023-10-19 19:08:35 +08:00 |
|
xiaoguangbin
|
e9f17c6108
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-19 18:19:18 +08:00 |
|
任珮宇
|
7e7d2f226a
|
form file 加载本地文件，逻辑调整
|
2023-10-19 17:24:56 +08:00 |
|
xiaoguangbin
|
a59ebff589
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-19 15:47:02 +08:00 |
|
|
|
b70211b4e5
|
fix: BetaGammaExtrapolationModal
|
2023-10-18 18:02:22 +08:00 |
|
|
|
52e360eca5
|
feat: 对接分析功能
|
2023-10-18 17:59:53 +08:00 |
|
|
|
edf91d5e74
|
fix: 修复Beta 2D图表右侧色盘选择颜色逻辑不正确问题
|
2023-10-18 16:15:17 +08:00 |
|
任珮宇
|
7bc449d0ce
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-analysis-RLR-renpy
|
2023-10-18 13:58:21 +08:00 |
|
任珮宇
|
fe748ee4ce
|
处理本地文件 分析之后，然后切换谱之后 右下角的分析结果也被清空了的问题
|
2023-10-18 13:58:02 +08:00 |
|
|
|
1719ea841a
|
fix: 增加分析完成的提示
|
2023-10-18 11:30:33 +08:00 |
|
|
|
3493b27fb5
|
fix: 下拉选择宽度问题
|
2023-10-18 11:27:40 +08:00 |
|
|
|
e9a3a7df46
|
WIP: Extrapolation图表的操作部分
|
2023-10-17 19:03:42 +08:00 |
|
任珮宇
|
0efe3364d5
|
beta 查看RRR的接口参数调整
beta、gamma 查看RRR 逻辑调整，增加权限，（分析后才可以查看）
|
2023-10-17 17:23:38 +08:00 |
|
|
|
c493d0abdc
|
fix: Gamma的Calibration初步优化
|
2023-10-17 15:26:14 +08:00 |
|
|
|
d2878ecd36
|
feat: Strip功能
|
2023-10-17 15:25:53 +08:00 |
|
任珮宇
|
f0dc116793
|
beta 模块 view ARR 和 Automatic Analysis Log 增加按钮权限，及提示信息
|
2023-10-17 15:15:42 +08:00 |
|
任珮宇
|
83d3da81ad
|
gamma File-Format-Ftransit 弹窗中Spectrum Transfer 功能前端代码实现
|
2023-10-17 14:35:56 +08:00 |
|
|
|
0f8d019a56
|
fix: 优化部分逻辑和代码
|
2023-10-17 10:00:48 +08:00 |
|
orgin
|
9bff476b38
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-17 09:03:29 +08:00 |
|
|
|
4edd3d250b
|
feat: Replot功能对接
|
2023-10-16 19:26:51 +08:00 |
|
任珮宇
|
6a1fe4a7a0
|
File-Format-Ftransit 弹窗INT.SPC<=>.IMS和Canberra.IEC<=>.IMS 表单字段默认值调整
|
2023-10-16 18:24:54 +08:00 |
|
任珮宇
|
765507f755
|
处理 Load From File 来源的，ARR 和 Automatic Analysis Log 弹窗的展示逻辑，并给出提示
|
2023-10-16 16:33:19 +08:00 |
|
任珮宇
|
aa6ac23fd5
|
gamma 的 save to file功能（Save as Txt ，Save as Excel）接口对接联调
gamma 的 Save PHD to File 功能接口对接，联调
|
2023-10-16 16:12:04 +08:00 |
|
orgin
|
1b8069890c
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-16 09:33:11 +08:00 |
|
|
|
eddab8db4c
|
WIP: Accept功能
|
2023-10-16 08:35:38 +08:00 |
|
任珮宇
|
90cfebf23e
|
beta 重新分析接口对接，及save to DB 功能调试
|
2023-10-13 19:49:20 +08:00 |
|
|
|
0db383e436
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-analysis-RLR-renpy
|
2023-10-13 19:08:01 +08:00 |
|
|
|
7cc143bbd4
|
WIP: 修改Insert和Fit Peak接口和逻辑，增加BaseLine的Accept接口
|
2023-10-13 19:07:38 +08:00 |
|
orgin
|
1169d3e27e
|
Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-13 14:54:46 +08:00 |
|
orgin
|
f43c9f8c2a
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-13 14:54:29 +08:00 |
|
任珮宇
|
d37106f05f
|
调整后端beta loadFromFile 和 loadFromDB的 XeData参数
|
2023-10-13 11:48:04 +08:00 |
|
|
|
b4782e98df
|
fix: 从服务端加载谱发生错误时，关闭loading；修复reprocessing未成功时也事先清除了series的问题
|
2023-10-13 10:33:46 +08:00 |
|
xiaoguangbin
|
3187130d59
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-13 09:34:24 +08:00 |
|
|
|
f912c4d8dc
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-analysis-RLR-renpy
|
2023-10-12 18:24:38 +08:00 |
|
|
|
eca536a9e2
|
feat: 调用wasm计算新的baseline，因echarts移动点比较复杂，重新用html实现，同时将解析完后的后续操作实现
|
2023-10-12 18:24:28 +08:00 |
|
xiaoguangbin
|
64e3c33ccd
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-12 17:29:23 +08:00 |
|
任珮宇
|
adc3798c99
|
处理重新分析的接口，返回500时，弹窗闪烁的问题
|
2023-10-12 17:28:50 +08:00 |
|
xiaoguangbin
|
c3ae1d96a2
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-12 16:54:59 +08:00 |
|
任珮宇
|
fd9bf12a43
|
gamma 第一次分析之后没有在configure中修改数据 是不允许二次分析的逻辑添加
|
2023-10-12 16:08:59 +08:00 |
|
xiaoguangbin
|
84441e9c42
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-12 15:31:29 +08:00 |
|
xiaoguangbin
|
2a0be5104b
|
Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-12 15:31:16 +08:00 |
|
