|
|
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 |
|
orgin
|
f17ce2b03b
|
Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-28 18:22:39 +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
|
6a4bb9822d
|
Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-28 17:26:20 +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 |
|
|
|
b39b22afcd
|
Merge branch 'feature-analysis-RLR-renpy' into master-dev
|
2023-10-28 10:46:23 +08:00 |
|
|
|
c974d81e05
|
Merge branch 'feature-Station-dev-renpy' into master-dev
|
2023-10-28 10:41:06 +08:00 |
|
orgin
|
7291800046
|
Merge branch 'feature-Station-dev-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-28 10:13:37 +08:00 |
|
orgin
|
05aa085444
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-10-28 10:11:29 +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 |
|
