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