xiaoguangbin/AnalysisSystemForRadionuclide_vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
589 Commits 6 Branches 1 Tag 11 MiB
28b6d764e2
Commit Graph

589 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
orgin
28b6d764e2 Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev 2023-11-01 14:48:12 +08:00
orgin
287e042d87 Merge branch 'master-dev' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev 2023-11-01 14:48:03 +08:00
任珮宇
a64cbc77ae 取消系统中所有模块页面的modal 弹窗点击蒙层关闭的效果 2023-11-01 14:14:35 +08:00
Xu Zhimeng
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
orgin
6f441b3b35 Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev 2023-11-01 08:52:29 +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
Xu Zhimeng
a2ebcbcacd fix: Fit Peaks后未将新的Peak内容传出来的问题 2023-10-31 15:56:07 +08:00
Xu Zhimeng
7601491497 fix: 去掉聚焦时的边框 2023-10-31 15:49:13 +08:00
Xu Zhimeng
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
Xu Zhimeng
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
Xu Zhimeng
9eeb9435b5 feat: 增加SAVE上的loading，增加BG log viewer弹窗 2023-10-30 16:01:27 +08:00
Xu Zhimeng
3ae3dee3d2 fix: 修复store中的问题 2023-10-30 15:15:56 +08:00
Xu Zhimeng
d5d15ad5b4 fix: 修复beta下重新分析后，Result Display的数据没缓存的问题 2023-10-30 14:02:30 +08:00
Xu Zhimeng
0672e09dd1 fix: 修复Beta 下 Energy Calibration弹窗左下角All Spectrum 未生效问题 2023-10-30 11:55:27 +08:00
Xu Zhimeng
e95fe5da81 fix: 修复RLR组件中sampleData重复声明的问题 2023-10-30 10:03:51 +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
Xu Zhimeng
092da52363 fix: 去掉Beta下的save phd to file 2023-10-27 17:20:49 +08:00