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 |
|
|
|
c8c1c021ea
|
fix: 各页面keepAlive功能
|
2023-11-08 11:47:49 +08:00 |
|
|
|
cb8adf6808
|
fix: database修复Collect Stop 和Acq.Start参数不正确问题
|
2023-11-08 10:08:21 +08:00 |
|
|
|
30d6f111d3
|
前端页面点击abnormal alarm标签页面跳转到了spectrum analysis标签页面
|
2023-11-07 13:54:45 +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 |
|
|
|
dae3882b50
|
Data Recevice status Monitoring 弹窗图表点击legned，渲染图表的时候，会回到初始定位的地方
|
2023-11-03 14:42:24 +08:00 |
|
xiaoguangbin
|
2bdb5f3534
|
merge RLR
|
2023-11-02 10:24:25 +08:00 |
|
|
|
72c7c7beb9
|
fix: 修复Gamma Analysis和Interactive Tools中的诸多问题
|
2023-11-01 20:10:49 +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 |
|
|
|
d2838ebb12
|
弹窗打开时点击其他的地方不允许关闭弹窗
|
2023-11-01 10:47:49 +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 |
|
|
|
e9a3a7df46
|
WIP: Extrapolation图表的操作部分
|
2023-10-17 19:03:42 +08:00 |
|
任珮宇
|
f14469f8fe
|
系统消息通知弹窗中的副标题调整
system 模块 scheduling tab页面中日历组件默认让是调整
|
2023-10-11 10:31:55 +08:00 |
|
任珮宇
|
79e9a3abaa
|
Merge branch 'feature-Alarm-renpy' into master-dev
|
2023-10-09 14:13:52 +08:00 |
|
任珮宇
|
7454b9fbf9
|
处理系统主页消息提醒模块弹窗中的样式问题
|
2023-10-08 14:45:49 +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 |
|
|
|
164e98dad2
|
fix: 解决图表高度问题
|
2023-09-26 15:41:42 +08:00 |
|
|
|
f1948e7b3e
|
fix: 修复图表高度问题
|
2023-09-26 15:15:09 +08:00 |
|
|
|
7d29399802
|
feat: Reprocessing功能，及三个Calibration中的Set to Current接口对接
|
2023-09-25 16:58:46 +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 |
|
任珮宇
|
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 |
|
|
|
4a3e5c8957
|
fix: 修复ColorPicker中的问题
|
2023-09-14 19:43:15 +08:00 |
|
|
|
1c16157a27
|
feat: 对接ColorConfig功能，完成Interactive Tools中的Fit功能，及切换回BaseLine的部分处理
|
2023-09-13 19:42:28 +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 |
|
|
|
e6c3b405f8
|
修改二级菜单的默认颜色
|
2023-09-05 13:45:51 +08:00 |
|
|
|
d867093ad4
|
核素默认管理页面接口参数调整
系统管理模块修改menu组件默认样式
|
2023-09-05 11:45:49 +08:00 |
|
|
|
a8a963c43e
|
处理rlr弹窗中 PeakFit 表格删除数据时的问题，及增加提示消息
|
2023-09-01 16:52:28 +08:00 |
|
|
|
aec35ab1e2
|
颜色标识固定在上面，不要跟随滚动条滚动
|
2023-09-01 14:36:00 +08:00 |
|
|
|
cbc576d15f
|
处理数据接收状态窗口滚动条的问题
数据接受状态弹窗重新打开之后 loading 效果不明显，添加蒙版
|
2023-08-30 10:37:36 +08:00 |
|
|
|
62ca472c62
|
feat: 对接Energy Calibration弹窗、Nuclide Library弹窗和Config User Library弹窗中的接口和部分逻辑
|
2023-08-29 19:54:09 +08:00 |
|
|
|
469e67dd86
|
数据接受统计弹窗loading效果调整
|
2023-08-29 18:49:01 +08:00 |
|
|
|
388911e20c
|
修改触发搜索的逻辑代码，删除按下enter 搜索
|
2023-08-29 17:10:18 +08:00 |
|
|
|
82e8482275
|
处理无法在 web 和 alarm间切换(在 Alarm 下面操作一会再点击 WEB 之后无法跳转)的问题
|
2023-08-29 11:37:25 +08:00 |
|
|
|
0b3258f723
|
fix: 完成AnalyzeInteractiveTool弹窗中的部分操作，修改刷选操作以解决Log10下选框表现不正确的问题，对接Comments下的View中的接口，对接Energy Calibration接口
|
2023-08-28 19:52:35 +08:00 |
|
|
|
3ce128affc
|
web 模块table表格样式调整
|
2023-08-22 18:34:41 +08:00 |
|
|
|
e7e540f6e9
|
筛选条件需要固定在顶部，不要受影响table滚动条影响
|
2023-08-21 11:25:05 +08:00 |
|
|
|
75db97b2e8
|
feat: 完成Channel和Energy数据的切换，并解决类型为Energy时，刷选范围不正确的问题，优化散点图在大数据下的表现
|
2023-08-17 19:11:42 +08:00 |
|
|
|
5672b47ca4
|
fix: 修复存在的问题
|
2023-08-08 19:11:37 +08:00 |
|
|
|
6b9c8f2fb4
|
Merge branch 'feature-custom-menus' into feature-particulate-renpy
|
2023-08-02 13:37:03 +08:00 |
|
|
|
373dfd87b0
|
Merge branch 'bugfix/custom-table' into feature-particulate-renpy
|
2023-08-01 18:14:59 +08:00 |
|
|
|
d575368b48
|
Merge pull request '处理模块之间跳转后，地址栏和二级路由选中的菜单不匹配的问题' (#11) from feature-custom-menus into feature-Alarm-renpy
|
2023-08-01 17:03:23 +08:00 |
|
|
|
39c519b818
|
处理模块之间跳转后，地址栏和二级路由选中的菜单不匹配的问题
|
2023-08-01 16:50:41 +08:00 |
|
