|
|
e5d7894455
|
处理 Reprocessing all 第二次打开弹窗时，文件名为清空的问题
|
2023-11-17 11:46:07 +08:00 |
|
|
|
31d6fabea8
|
fix: 修复beta的analyze current spectrum后，ROI未更新问题
|
2023-11-17 10:40:55 +08:00 |
|
|
|
ae1113c3df
|
overview中删除数据需要刷新列表（确保该模块其他页面也在删除的时候刷新了）
|
2023-11-17 09:50:51 +08:00 |
|
|
|
9038fc5116
|
参数调整，接口错误信息处理
|
2023-11-16 19:01:00 +08:00 |
|
xiaoguangbin
|
eb1ea53b8f
|
fix：解决beta的calibration tab是beta 点击reanalyze不生效问题
|
2023-11-16 18:55:10 +08:00 |
|
|
|
709a0c069a
|
gamma功能的configureSave接口 增加 applyAll字段
Reprocessing all 请求接口的时候改为依次调用分析接口
分析全部需要隐藏单个文件的进度弹窗；
分析全部的时候增加进度条弹窗；
beta的Statistics功能模块增加一个字段 xeResultFlag
|
2023-11-16 18:19:24 +08:00 |
|
|
|
f6450af8b2
|
所有下载的按钮增加load效果，如果下载失败记得关掉load
出现不能查询的提示，table的loading应该关闭了
台站下拉框增加过滤
|
2023-11-16 14:19:12 +08:00 |
|
|
|
5861337d44
|
如果分析成功了，分析进度的弹窗即便是没有接收到后面的 ws 消息也要关闭弹窗
ws 创建连接的时候后面的key 改为userId+'_'+Date.now()
请求重新分析接口参数调整
|
2023-11-16 09:39:28 +08:00 |
|
|
|
c1270be5c2
|
gamma 重分析接口增加processKey参数
|
2023-11-15 19:23:06 +08:00 |
|
xiaoguangbin
|
006ae8fc22
|
fix:解决beta谱在calibration分析后应用all，其他谱没有缓存calibration参数问题
|
2023-11-15 19:14:29 +08:00 |
|
|
|
5797dfc529
|
beta 增加initValue接口的调用
|
2023-11-15 18:51:35 +08:00 |
|
|
|
f849f07dd4
|
交互库的数据SampleId 相同的时候我选择一条，其他的不要关联选中，交互库现在会有多条SampleID相同的数据
Load From Database表格不要出现换行
|
2023-11-15 18:33:25 +08:00 |
|
|
|
d431f339c2
|
处理重分析后，刻度更新的显示问题
|
2023-11-15 17:39:37 +08:00 |
|
|
|
186e7cf88c
|
处理参数
|
2023-11-15 17:07:45 +08:00 |
|
|
|
46d433f803
|
已经分析好几次了，分析进度上面部分 calibrationUpdates 应该没有了
|
2023-11-15 16:36:45 +08:00 |
|
|
|
e7f4656fef
|
fix: beta 下的energy calibration，选了AllSpectrum后，重新分析，把备选列表中相同台站的本地缓存清空，当XeData为空时，不应用
|
2023-11-15 15:09:36 +08:00 |
|
|
|
06d3e99725
|
fix
|
2023-11-15 14:41:21 +08:00 |
|
|
|
e14525169e
|
大量数据的表格添加滚动条
|
2023-11-15 14:35:10 +08:00 |
|
|
|
7136b65158
|
处理测试接口的校验问题，
处理候去db name 接口的参数问题
|
2023-11-15 14:28:28 +08:00 |
|
|
|
9c30a2d773
|
处理 alarm 模块，DB Monitor overview 页面表格字段，及样式调整
处理新增表单的校验问题
调整instances tablespace 页签查询接口及参数
|
2023-11-15 13:38:27 +08:00 |
|
|
|
d57dcfa147
|
人工交互分析的 getDBSpectrumChart 接口增加 analyst 参数
|
2023-11-15 09:39:09 +08:00 |
|
|
|
f971cd048d
|
参数调整
|
2023-11-15 09:08:29 +08:00 |
|
|
|
e8ffe4b686
|
web 模块 页面详情种的zip下载功能对接
|
2023-11-14 18:16:11 +08:00 |
|
|
|
0423207abf
|
alarm 模块 db overview 页面，新增和编辑表单增加驱动类和数据源地址字段
皆苦参数调整
增加test 测试功能
|
2023-11-14 15:38:41 +08:00 |
|
|
|
5487cf3289
|
web statistics 模块中，所有页面的详情中隐藏 TXT 下载按钮
|
2023-11-14 14:08:29 +08:00 |
|
|
|
da2d6acaf3
|
fix: 修改参数
|
2023-11-14 13:46:06 +08:00 |
|
|
|
a071df3b66
|
fix: 增加initValue和gammaByDB参数
|
2023-11-14 11:29:02 +08:00 |
|
|
|
e0ae878a6d
|
fix: 修复文件下载时乱码的问题
|
2023-11-14 11:12:31 +08:00 |
|
|
|
fb23e422d8
|
fix: 修改Insert Peaks修改值的逻辑
|
2023-11-14 10:07:21 +08:00 |
|
|
|
0b12f3dca1
|
feat: 增加Analyst字段
|
2023-11-14 10:06:04 +08:00 |
|
|
|
e97469038b
|
fix: 文件名解析问题
|
2023-11-14 09:18:38 +08:00 |
|
|
|
6512330880
|
fix
|
2023-11-13 18:33:30 +08:00 |
|
|
|
2cd1cd9f7d
|
fix: 优化load from db搜索栏station和detector列表逻辑
|
2023-11-13 18:27:59 +08:00 |
|
|
|
9d1910e689
|
探测器按照选择的station进行过滤，例如 选择了台站AUX04，那么探测器里只有AUX04的
|
2023-11-13 17:44:47 +08:00 |
|
|
|
d6a234bac5
|
fix: 修复toPrecision精度问题
|
2023-11-13 15:56:44 +08:00 |
|
|
|
2b8d41a5ce
|
下载文件的名称按照analysis模块的格式命名
|
2023-11-13 15:27:58 +08:00 |
|
|
|
bfceec07c3
|
From db 弹窗默认勾选acq.start ，日期框默认一个月
|
2023-11-13 11:12:37 +08:00 |
|
|
|
e0dfaf9ce9
|
选择一条数据之后，回显应该按照表单的值回显
|
2023-11-10 18:37:44 +08:00 |
|
|
|
d31a12b8e4
|
fix: 修复PHDParser 对异形文件名解析问题
|
2023-11-10 18:12:02 +08:00 |
|
|
|
88348f4f78
|
fix: 修改Save to Txt调的接口
|
2023-11-10 16:41:35 +08:00 |
|
|
|
8459081c5c
|
feat: 增加Energy Calibration重新分析回调后对主页面右侧Energy的影响
|
2023-11-10 15:43:29 +08:00 |
|
|
|
b1c86a8077
|
服务器监控页面中的tablespace 页面渲染及接口联调
|
2023-11-10 14:58:14 +08:00 |
|
|
|
91b29d157f
|
fix: 修改某些log等文本信息弹窗的可写性
|
2023-11-10 14:11:25 +08:00 |
|
|
|
0984cfcd5c
|
beta 模块中 Energy Calibration 弹窗中点击重新分析，打不开view RRR 弹窗
|
2023-11-10 11:59:25 +08:00 |
|
|
|
cc64c389f3
|
处理beta View RRR 弹窗打不开的问题
|
2023-11-10 10:48:51 +08:00 |
|
|
|
2403bb36fd
|
Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-10 09:40:08 +08:00 |
|
|
|
cda0b089ad
|
处理 beta 重新分析后，view RRR 被拦截的问题
|
2023-11-10 09:39:39 +08:00 |
|
|
|
3ed2a5cd31
|
fix: 打开时重置输入框内容
|
2023-11-09 19:13:48 +08:00 |
|
|
|
f1af8cc8b9
|
fix: ReAnalyse后矩形框未变化的问题
|
2023-11-09 16:39:00 +08:00 |
|
|
|
dd993b4ac8
|
处理遗留的数据格式问题
|
2023-11-09 14:56:54 +08:00 |
|
|
|
a8b4d34536
|
gamma 模块 Interactive tool 弹窗位置
Calibration 点击Reanalysis之后 返回结果 Result display 没有重新渲染
formFile 点击save to DB Result display 数据丢失
|
2023-11-09 10:55:08 +08:00 |
|
|
|
b5c51883da
|
fix: 修复accept后新的baseCtrl未传出来的问题
|
2023-11-09 10:33:17 +08:00 |
|
|
|
e13f8cbc22
|
fix: 修复删除Peak后，在视觉上还存在的问题
|
2023-11-09 10:01:55 +08:00 |
|
|
|
8282663e3e
|
处理弹窗的样式问题
|
2023-11-08 18:42:07 +08:00 |
|
|
|
7e637c8c85
|
使用keep alive 缓存组件后，定时器不能销毁的问题
|
2023-11-08 18:04:41 +08:00 |
|
orgin
|
1a45961880
|
Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-08 17:54:44 +08:00 |
|
orgin
|
54aa84f31f
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-08 17:54:40 +08:00 |
|
|
|
2f3947e6cf
|
fix: 修复文件名为null的问题
|
2023-11-08 17:44:57 +08:00 |
|
|
|
c91886a5e9
|
fix: 修改使用不支持直接选择文件的浏览器时，Compare弹窗中获取文件列表的请求发起的时机
|
2023-11-08 17:00:09 +08:00 |
|
orgin
|
693d7bf839
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-08 16:37:28 +08:00 |
|
|
|
63969c8b2c
|
fix: 修复Gamma 交互分析中Replot后错误的赋值的问题
|
2023-11-08 15:28:20 +08:00 |
|
|
|
13256cd226
|
处理gamma calibration 下面的 Energy 、Resolution 、Efficiency 三个功能 ，调整散点的大小
|
2023-11-08 15:07:43 +08:00 |
|
orgin
|
4a337648ae
|
Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-08 14:35:58 +08:00 |
|
orgin
|
385f0d7bd0
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-08 14:35:11 +08:00 |
|
|
|
b026200b25
|
BetaGamma Analyser Log 和之前一样 直接保存文件，不需要输入名称
|
2023-11-08 14:28:14 +08:00 |
|
|
|
c8c1c021ea
|
fix: 各页面keepAlive功能
|
2023-11-08 11:47:49 +08:00 |
|
|
|
7ecd609185
|
先加载 Gamma 谱，然后从 From DB 加载Beta 谱，切换到 Beta 右下角有分析结果，切换到 Gamma 谱再切回 Beta，右下角分析结果没有了
|
2023-11-08 10:52:26 +08:00 |
|
|
|
cb8adf6808
|
fix: database修复Collect Stop 和Acq.Start参数不正确问题
|
2023-11-08 10:08:21 +08:00 |
|
orgin
|
cd09d7d974
|
Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-07 18:08:24 +08:00 |
|
orgin
|
8f7f5a7ba4
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-07 17:23:00 +08:00 |
|
|
|
7d2510e8a6
|
fix: 修改BGLogViewer参数问题
|
2023-11-07 17:02:09 +08:00 |
|
qiaoqinzheng
|
ea63c3ac08
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-07 16:42:03 +08:00 |
|
|
|
4e9304ec9d
|
fix: 台站增加搜索功能
|
2023-11-07 15:40:22 +08:00 |
|
orgin
|
a330a34ee7
|
Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-07 15:14:01 +08:00 |
|
orgin
|
f586af01c5
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-07 15:13:45 +08:00 |
|
|
|
da9257e81b
|
fix: 修复beta清理缓存的调用在load from file时传的文件名不正确问题，getGammaGated接口增加文件名参数
|
2023-11-07 14:30:42 +08:00 |
|
|
|
30d6f111d3
|
前端页面点击abnormal alarm标签页面跳转到了spectrum analysis标签页面
|
2023-11-07 13:54:45 +08:00 |
|
|
|
1777d174e2
|
feat: 增加beta下右下角的放大镜功能，修改左侧图表上层叠方框的颜色
|
2023-11-06 17:53:21 +08:00 |
|
orgin
|
4121038a6a
|
Merge branch 'feature-Station-dev-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-06 16:10:03 +08:00 |
|
|
|
f072b2d40b
|
fix: 增加initValue的调用，增加gamma下的save phd to file的save all
|
2023-11-06 15:36:02 +08:00 |
|
orgin
|
111eda41b2
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-06 14:54:37 +08:00 |
|
|
|
4303ec5fa1
|
处理From file 点击 load 按钮之后没有添加到候选列表
|
2023-11-06 14:45:19 +08:00 |
|
orgin
|
52efa463f5
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-06 11:03:26 +08:00 |
|
|
|
515cfe18f1
|
Calibration 点击 reanalysis 按钮之后得到新结果没有渲染
|
2023-11-06 10:22:36 +08:00 |
|
|
|
cf92cf8d73
|
database 模块日期筛选，默认一周
|
2023-11-03 19:05:45 +08:00 |
|
xiaoguangbin
|
a6cb982a0f
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-03 18:14:08 +08:00 |
|
|
|
3ac3f41842
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into feature-analysis-RLR-renpy
|
2023-11-03 18:11:50 +08:00 |
|
|
|
91a580ec8c
|
save to db 之后 需要回显对应的 Sample ID
|
2023-11-03 18:10:54 +08:00 |
|
|
|
af9c537f34
|
fix: 修复accept后peak值不对的问题
|
2023-11-03 18:02:35 +08:00 |
|
xiaoguangbin
|
4d2a40cb35
|
Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-03 17:20:19 +08:00 |
|
|
|
449570f171
|
处理表格数据格式
|
2023-11-03 17:05:45 +08:00 |
|
|
|
820614cf28
|
fix: 修复语法错误
|
2023-11-03 15:30:59 +08:00 |
|
|
|
50c8c0d4d2
|
fix: 修改table的size
|
2023-11-03 15:22:28 +08:00 |
|
|
|
dae3882b50
|
Data Recevice status Monitoring 弹窗图表点击legned，渲染图表的时候，会回到初始定位的地方
|
2023-11-03 14:42:24 +08:00 |
|
orgin
|
118814f667
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-03 13:49:42 +08:00 |
|
xiaoguangbin
|
4eaeda87ff
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-03 11:51:54 +08:00 |
|
|
|
ceefce8f9c
|
fix: 完善删除功能
|
2023-11-03 11:12:52 +08:00 |
|
xiaoguangbin
|
4cd6430bd0
|
Merge branch 'feature-Station-dev-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-03 10:37:24 +08:00 |
|
|
|
5e4abce032
|
fix: 删除峰的时候顺带清空右下角核素列表
|
2023-11-03 10:30:58 +08:00 |
|
|
|
1b2ccfc6b7
|
beta 重新分析接口增加条件判断，处理错误信息
|
2023-11-03 10:23:34 +08:00 |
|
|
|
dc9664de47
|
from db 中 sampleType = all 的时候 默认不勾选 sample
|
2023-11-03 10:03:22 +08:00 |
|
xiaoguangbin
|
855de3b665
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-03 08:52:06 +08:00 |
|
|
|
b81d5a9797
|
fix: 修复barChart在操作后未回传值的问题
|
2023-11-02 19:30:51 +08:00 |
|
xiaoguangbin
|
306770c7ea
|
Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-02 18:51:28 +08:00 |
|
xiaoguangbin
|
406da1a132
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-02 18:35:59 +08:00 |
|
|
|
fa9b9c7398
|
增加提示消息
|
2023-11-02 18:35:25 +08:00 |
|
xiaoguangbin
|
c3ecfc4583
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-02 18:24:52 +08:00 |
|
|
|
ea08ccdf63
|
fix: 增加删除sample列表时清理 calibration-gamma 的功能
|
2023-11-02 18:02:33 +08:00 |
|
|
|
36c42be01f
|
调整本地文件如果没有分析过，save to db需要进行判断，不允许请求接口
如果保存失败，需要把接口错误结果提示处理
Beta不需要显示 save current
save to db 没有触发“转圈”特效
|
2023-11-02 17:55:15 +08:00 |
|
|
|
481fcf99c3
|
fix: 修复切换Peak切页时barChart未移动的问题
|
2023-11-02 16:49:55 +08:00 |
|
xiaoguangbin
|
9231c26d32
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-02 16:13:59 +08:00 |
|
|
|
ad36a1f289
|
fix: 修复部分gamma类型中sampleFileName解析错误的问题，nuclide review弹窗增加切换chart的时候也滚动到table中选中的项的功能
|
2023-11-02 16:12:35 +08:00 |
|
|
|
98ce272d05
|
调整 beta 普重计算接口代码调整
|
2023-11-02 15:18:24 +08:00 |
|
xiaoguangbin
|
6678e1bf71
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-02 14:39:27 +08:00 |
|
|
|
6cc9d9ae69
|
fix: NuclideReview 返回为空时的处理
|
2023-11-02 13:53:59 +08:00 |
|
xiaoguangbin
|
ae866d1bdd
|
Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
|
2023-11-02 13:52:09 +08:00 |
|
|
|
a733ae0688
|
fix: 去掉Fit Peaks中的Cancel，修复barChart问题
|
2023-11-02 13:41:19 +08:00 |
|
|
|
c18ec9bb10
|
调整数值的显示格式
|
2023-11-02 11:50:26 +08:00 |
|
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 |
|
任珮宇
|
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 |
|
|
|
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 |
|
|
|
4a3e5c8957
|
fix: 修复ColorPicker中的问题
|
2023-09-14 19:43:15 +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 |
|
