|
|
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 |
|
|
|
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 |
|
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 |
|
任珮宇
|
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 |
|
|
|
2ffa1abbce
|
feat: 对接Comments -> Add
|
2023-09-26 14:40:08 +08:00 |
|
|
|
90017662ed
|
fix: 解决scatterGL在各种情况下取值导致的渲染问题
|
2023-09-26 14:39:44 +08:00 |
|
|
|
c81923e744
|
fix: 优化代码，解决scatterGL不受轴线最大/最小值控制的问题
|
2023-09-25 19:42:31 +08:00 |
|
|
|
7d29399802
|
feat: Reprocessing功能，及三个Calibration中的Set to Current接口对接
|
2023-09-25 16:58:46 +08:00 |
|
任珮宇
|
eb03d28eea
|
alarm 模块 服务器页面的接口联调
|
2023-09-25 16:30:04 +08:00 |
|
|
|
3aedc2445d
|
fix: Compare功能，和Configure的Save对接，及部分主页面的修改
|
2023-09-25 14:55:51 +08:00 |
|
|
|
fc63d2c568
|
Merge branch 'feature/spectrum-analysis' into feature-analysis-RLR-renpy
|
2023-09-22 17:26:38 +08:00 |
|
|
|
a921c64f6b
|
fix: 优化部分样式及功能,，增加Gamma的Save to DB 功能，完成Gamma Calibration弹窗中的Call功能
|
2023-09-21 19:41:16 +08:00 |
|
任珮宇
|
dc4780ea73
|
Merge branch 'feature-particulate-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-09-21 18:50:11 +08:00 |
|
任珮宇
|
36cc9afcaa
|
Merge branch 'feature-system-renpy'
|
2023-09-21 18:46:14 +08:00 |
|
任珮宇
|
71ee6027b2
|
Merge branch 'feature-station-renpy'
|
2023-09-21 18:39:34 +08:00 |
|
任珮宇
|
d0a40311b2
|
Merge branch 'feature-analysis-RLR-renpy' into master-dev
|
2023-09-21 17:42:57 +08:00 |
|
任珮宇
|
f23af665bc
|
Merge branch 'feature-Alarm-renpy'
|
2023-09-21 17:33:28 +08:00 |
|
任珮宇
|
76c46d54cc
|
Merge branch 'feature-spectrum-analysis' into feature-analysis-RLR-renpy
# Conflicts:
# src/views/spectrumAnalysis/gamma-analysis.vue
|
2023-09-21 16:12:29 +08:00 |
|
任珮宇
|
bff44aba5a
|
beta Save to DB 接口联调
分析接口返回的数据处理及参数调整
|
2023-09-21 16:04:37 +08:00 |
|
orgin
|
1b0b653ab1
|
fix:解决报警规则表单 请求getItems接口的参数
|
2023-09-21 14:12:52 +08:00 |
|
|
|
acb93dd817
|
feat: 对接保存功能，修复部分BUG
|
2023-09-20 18:58:35 +08:00 |
|
|
|
81e5797c73
|
fix: popover菜单样式问题，及Nuclide Library值不正确的问题
|
2023-09-19 11:50:35 +08:00 |
|
|
|
e2b211bfcc
|
fix: Nuclide Library改为点击弹出，修复切换Peak Infomation时未获取Nuclide Library问题，增加双击弹出Nuclide Review 功能
|
2023-09-18 19:28:08 +08:00 |
|
任珮宇
|
be15cf582e
|
处理 file list 弹窗，单击行取消的功能
file list 当前页勾选后，切换其他分页，清空之前选中项
|
2023-09-18 15:04:57 +08:00 |
|
任珮宇
|
3bfaa90408
|
Zero Time中的保存功能对接
|
2023-09-18 14:39:38 +08:00 |
|
任珮宇
|
8835f93580
|
Merge branch 'feature-spectrum-analysis' into feature-analysis-RLR-renpy
# Conflicts:
# src/views/spectrumAnalysis/beta-gamma-analysis.vue
# src/views/spectrumAnalysis/index.vue
|
2023-09-15 18:31:53 +08:00 |
|
任珮宇
|
801ff3d10a
|
处理 form File 来源 Energy Calibration 弹窗无数据的问题，及接口参数调整
|
2023-09-15 18:17:21 +08:00 |
|
任珮宇
|
a3187a5975
|
处理formDb来源的beta模块 Energy Calibration 弹窗接口不显示数据的问题，及接口参数调整
|
2023-09-15 17:45:46 +08:00 |
|
|
|
08ca6c154d
|
fix: 部分页面增加sampleFileName字段
|
2023-09-15 17:18:22 +08:00 |
|
任珮宇
|
8fa955e4f4
|
Merge branch 'feature-spectrum-analysis' into feature-analysis-RLR-renpy
# Conflicts:
# src/api/manage.js
# src/views/spectrumAnalysis/gamma-analysis.vue
# src/views/spectrumAnalysis/index.vue
|
2023-09-15 16:25:47 +08:00 |
|
|
|
cbaa99e334
|
feat: 由于graphic限制，重写小红框逻辑及撤销逻辑，增加绿色加号的渲染逻辑，完成Replot、Accept功能
|
2023-09-14 19:49:32 +08:00 |
|
任珮宇
|
3024b10f35
|
beta 分析接口调试
|
2023-09-14 19:44:56 +08:00 |
|
任珮宇
|
56e1c9130e
|
处理打开beta RLR 弹窗直接点击save字段无数据的问题
|
2023-09-14 11:41:34 +08:00 |
|
任珮宇
|
e1c30fd326
|
处理RLR弹窗点击下载关闭的问题
|
2023-09-13 19:43:08 +08:00 |
|
|
|
1c16157a27
|
feat: 对接ColorConfig功能，完成Interactive Tools中的Fit功能，及切换回BaseLine的部分处理
|
2023-09-13 19:42:28 +08:00 |
|
任珮宇
|
a289c1de9c
|
beta rlr 弹窗导出调整
|
2023-09-13 19:30:38 +08:00 |
|
任珮宇
|
e4732fbb55
|
beta 模块的RLR 弹窗查询接口调整
beta 模块的RLR 弹窗save下载文件接口联调
|
2023-09-13 19:01:21 +08:00 |
|
orgin
|
c2fde1336e
|
fix:Beta-RLR弹窗 修改接口请求参数
|
2023-09-12 19:52:43 +08:00 |
|
orgin
|
aff0802b49
|
fix: 完成 Beta-RLR 弹窗的 General Infomation，Notes文字内容填充
|
2023-09-12 19:51:02 +08:00 |
|
|
|
5ae9115577
|
fix: 修复部分问题
|
2023-09-12 19:48:15 +08:00 |
|
|
|
acf0fb4706
|
feat: Gamma主页的Peak Infomation和Nuclide Library，分析工具弹窗里的编辑斜率功能
|
2023-09-12 19:42:36 +08:00 |
|
|
|
efe775f0f0
|
gamma 模块的RLR 导出
|
2023-09-12 17:42:19 +08:00 |
|
|
|
6f9a4cbaed
|
feat: 增加Undo撤销功能
|
2023-09-11 18:59:08 +08:00 |
|
|
|
1b80817da3
|
Form file选择能谱文件之后，曲线图没渲染数据
|
2023-09-11 15:58:58 +08:00 |
|
|
|
60c2ed556e
|
处理fileList加载文件后被覆盖的问题
|
2023-09-11 14:51:56 +08:00 |
|
|
|
c9ca7c1a5e
|
处理下载保存文件，弹窗关闭的问题
|
2023-09-11 13:42:54 +08:00 |
|
|
|
2761b0da21
|
完成gamma formFile 模块的功能
|
2023-09-11 11:01:23 +08:00 |
|
|
|
dcc75bd800
|
feat: Calibration剩下的两个弹窗中的各操作和接口对接
|
2023-09-08 18:43:49 +08:00 |
|
|
|
8cfb9d7262
|
处理 File List 显示多条数据的时候样式错乱的问题
|
2023-09-08 16:29:53 +08:00 |
|
|
|
e48d029827
|
formfile模块Beta 对接loadFromFile接口，数据显示
|
2023-09-08 16:23:18 +08:00 |
|
|
|
0fbdc38690
|
调整Load Data From File弹窗中，根据返回的数据状态，显示对应文件的名字颜色
处理点击行，fileName值没空的问题
|
2023-09-08 14:48:57 +08:00 |
|
|
|
890bc9fa73
|
Merge branch 'feature-analysis-RLR-renpy' into feature/spectrum-analysis
|
2023-09-08 11:59:07 +08:00 |
|
|
|
1efe28500e
|
处理Beta View Spectrum 弹窗文件保存的问题
|
2023-09-08 11:04:27 +08:00 |
|
|
|
3cf42843c5
|
File List 表单上面增加“搜索框”用来查询数据
|
2023-09-08 10:40:00 +08:00 |
|
|
|
6ba65075be
|
Merge branch 'feature/spectrum-analysis' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-analysis-RLR-renpy
# Conflicts:
# src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue
# src/views/spectrumAnalysis/components/Modals/DataProcessingLogModal.vue
# src/views/spectrumAnalysis/components/Modals/NuclideActivityAndMDCModal.vue
# src/views/spectrumAnalysis/components/Modals/QcResultsModal.vue
# src/views/spectrumAnalysis/components/Modals/RLRModal/index.vue
# src/views/spectrumAnalysis/components/Modals/SampleInfomationModal.vue
# src/views/spectrumAnalysis/components/PeakInfomation.vue
|
2023-09-07 19:49:40 +08:00 |
|
|
|
e4edd1abfd
|
feat: Energy的增/删/改及Apply操作，Peak Comment和GeneralComment接口对接
|
2023-09-07 19:29:59 +08:00 |
|
|
|
229349d4f9
|
1. File list 改为单机行就可以勾选
. 处理File List 显示20条数据的时候样式错乱的问题
From File 双击Sample 之后，过滤"_S_" 能谱
|
2023-09-07 19:28:42 +08:00 |
|
|
|
1c27c14564
|
完成beta 中excel 的导出功能
|
2023-09-07 18:17:24 +08:00 |
|
|
|
3b516367d3
|
Gamma 导出excel功能开发
|
2023-09-07 17:30:07 +08:00 |
|
|
|
da3e09e847
|
处理弹窗中loading的加载问题
获取普文件列表接口参数调整
|
2023-09-07 15:13:51 +08:00 |
|
