Commit Graph

513 Commits

Author SHA1 Message Date
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
任珮宇
5d632a2954 analysis 模块,重新分析弹窗,状态更新实时更新 2023-10-12 15:30:41 +08:00
任珮宇
f14469f8fe 系统消息通知弹窗中的副标题调整
system 模块 scheduling tab页面中日历组件默认让是调整
2023-10-11 10:31:55 +08:00
4a17c09ddd fix: 修复Analysis Settings 部分值未保存的问题 2023-10-11 10:02:47 +08:00
任珮宇
3a413b37fb Merge branch 'feature-Alarm-renpy' into master-dev 2023-10-10 17:29:22 +08:00
任珮宇
1de8300df3 代码结构调整 2023-10-10 17:28:53 +08:00
任珮宇
7e33d014d4 alarm 模块 SERVICE AND PROCESS tab 页面图表调整,及代码优化
alarm 模块 CPU tab 页面图表标题调整
2023-10-10 15:59:37 +08:00
0a021a3c53 fix: Load From File关闭时保留表格内容,修复斜率编辑时值不对的问题,修复有斜率的基线控制点旁边+号位置问题,修复Peak Infomation切换时底部图表标题未更新问题 2023-10-10 15:55:43 +08:00
xiaoguangbin
5676fff627 Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev 2023-10-10 15:50:29 +08:00
orgin
0d39833584 Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev 2023-10-09 20:09:28 +08:00
xiaoguangbin
692cb33145 Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev 2023-10-09 20:07:13 +08:00
36ba4a8167 refactor: 重写PHD解析方法以适配内容各异的文件 2023-10-09 19:10:06 +08:00
任珮宇
fc0e3a79a4 Merge branch 'feature-particulate-renpy' into master-dev 2023-10-09 15:31:03 +08:00
任珮宇
3e0a17f55c 处理web模块 particulate-BLANKPHD 页面中,接口参数调整,及下载问题 2023-10-09 15:30:32 +08:00
a06362f23d feat: 完成Beta的Save Results to File 对接 2023-10-09 14:25:39 +08:00
xiaoguangbin
779acbab5c Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev 2023-10-09 14:15:42 +08:00
任珮宇
79e9a3abaa Merge branch 'feature-Alarm-renpy' into master-dev 2023-10-09 14:13:52 +08:00
任珮宇
c47a405003 Merge branch 'feature-particulate-renpy' into master-dev 2023-10-09 14:13:30 +08:00
任珮宇
1777ca2bf5 web 模块页面冗余代码优化整理 2023-10-09 13:55:03 +08:00
xiaoguangbin
3a3ebcffea Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev 2023-10-09 13:47:53 +08:00
d9052d5d7e fix: 修复Select Library切换时未重置nuclideName的问题 2023-10-09 10:25:01 +08:00
671677a68e feat: 完成新版本Load From File功能 2023-10-08 17:41:37 +08:00
任珮宇
7454b9fbf9 处理系统主页消息提醒模块弹窗中的样式问题 2023-10-08 14:45:49 +08:00
任珮宇
ae1a1c393a 处理system模块页面 menuManage tab页面中编辑弹窗的样式问题 2023-10-08 14:01:47 +08:00
85f4ccb995 feat: 增加Load From File调用File System Access功能 2023-10-07 19:12:42 +08:00
任珮宇
caabe0e6e9 处理 CPU usage of diferent cores 折线图的图例的样式,增加图例翻页的功能
处理cup tab页面,时间和日期调整,页面不刷新的问题
服务器server 模块 tabs 页面,增加切换服务器名称,页面刷新的逻辑
2023-10-07 14:46:07 +08:00
orgin
b4c027a9cd Merge branch 'feature-Alarm-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev 2023-10-07 08:47:50 +08:00
orgin
af6aa12959 Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev 2023-10-07 08:46:47 +08:00
任珮宇
619c57e7b5 服务器和进程页面图表颜色调整
服务器详情页面时间线组件调整,及接口调试数据渲染
2023-09-28 18:09:51 +08:00
任珮宇
9ff580fdd6 server 服务器模块 CPU usage of diferent 数据图形渲染,接口联调 2023-09-28 09:42:16 +08:00
8c974aaf35 fix: Beta Energy Calibration及QC Flags相关问题修改 2023-09-27 17:45:58 +08:00
任珮宇
11ebcfa819 server 服务器模块,cpu页面接口对接,图形渲染 2023-09-27 16:47:55 +08:00
47e6b19c8c fix: 优化顶部操作栏展示条件 2023-09-27 15:55:48 +08:00
e7533a7fe2 fix: 修复Sample菜单下的Sample列表存在的问题 2023-09-27 15:38:36 +08:00
0c06c5af79 fix: 优化、修改某些代码 2023-09-27 14:53:17 +08:00
任珮宇
b69d9d86fd server 服务器模块,监控项页面接口调试 2023-09-27 13:45:42 +08:00
bdaf65ca99 fix: 优化gamma主图表逻辑 2023-09-27 13:41:51 +08:00
任珮宇
11d8d0bd4d 接口字段调整,及相应的逻辑修改,将 sourceId 换成hostId
处理 overView 页面跳转 instances 页面失败的问题
2023-09-27 09:42:41 +08:00
任珮宇
4f73b1b5b2 server 模块,details页面cpu利用率接口调试
server 模块,服务和进程页面,cpu 和 memory 接口调试,数据渲染
2023-09-26 18:15:50 +08:00
ad2a550668 fix: 解决Beta中的 scatterGL 在超出轴线最大最小值范围时依旧渲染的问题 2023-09-26 15:42:49 +08:00
164e98dad2 fix: 解决图表高度问题 2023-09-26 15:41:42 +08:00
f1948e7b3e fix: 修复图表高度问题 2023-09-26 15:15:09 +08:00