Commit Graph

7 Commits

Author SHA1 Message Date
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
1c27c14564 完成beta 中excel 的导出功能 2023-09-07 18:17:24 +08:00
3b516367d3 Gamma 导出excel功能开发 2023-09-07 17:30:07 +08:00
116baccd0f fix: 移动控制点功能,接口增加fileName字段,Zero Time根据新接口修改逻辑,对接Fit Peaks弹窗接口,Nuclide Review增加搜索功能, 2023-09-05 19:06:19 +08:00
cfe0b7f134 feat: 对接PeakInfomation、ARR、RRR、QC Results、SampleInfomation和Spectrum弹窗接口 2023-08-30 13:36:53 +08:00
728e557006 feat: Beta Gamma的各弹窗,对接部分接口 2023-07-20 14:11:37 +08:00
38b23f5e0d feat: 增加RLR弹窗中所有子页面,增加Arr、SampleInfo、QC Results弹窗 2023-07-17 19:37:46 +08:00