diff --git a/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue b/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue index 5854ff8..590fefb 100644 --- a/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue @@ -38,6 +38,8 @@ export default { case 3: url = '/spectrumAnalysis/viewARR' break + case 4: + url = '/spectrumAnalysis/viewRRR' } try { this.content = '' diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaExtrapolationModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaExtrapolationModal.vue new file mode 100644 index 0000000..521e77c --- /dev/null +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaExtrapolationModal.vue @@ -0,0 +1,760 @@ + + + + + + Sample Infomation + + + Acquisition Start: + {{ detail.acquisitionStart }} + + + Acq Real Time: + {{ detail.acquisitionRealTime }} + + + Acq Live Time: + {{ detail.acquisitionLiveTime }} + + + + + + + + + Gamma Spectrum:Sample + + + + + Channel: {{ customToolTip.channel }} + Energy: {{ customToolTip.energy }} + + + + + + Beta Spectrum:Sample + + + + + + + + + + + + + + Gamma Window Setting + + Gamma Window Begin: + Channel + Gamma Window End: + Channel + + + + Parameter Setting + + Min of Energy: + keV + Half Life: + Day + + + + Function of Fitting + + + Linear + 2-polynomial + + + + + + + Analyse + Exit + + + + + + + + + + Delete + + + + + + + + + + + + + Snapshot + Analyser Result + + + + + + + + y = ax + b + + + y = axx + bx + c + + + + + + Reference Time : + + 这是内容 + + + + Xe Activity (Bq) : + + 这是内容 + + + + + + + + + + + + + + + + + + diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index 798b5bb..20ac8ff 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -155,6 +155,10 @@ /> + + + + @@ -171,7 +175,7 @@ - + @@ -220,6 +224,7 @@ import FtransltModal from './components/Modals/FtransltModal/index.vue' import BetaGammaEnergyCalibrationModal from './components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue' import StripModal from './components/Modals/StripModal.vue' import AutomaticAnalysisLogModal from './components/Modals/BetaGammaModals/AutomaticAnalysisLogModal.vue' +import BetaGammaExtrapolationModal from './components/Modals/BetaGammaModals/BetaGammaExtrapolationModal.vue' // 分析类型 const ANALYZE_TYPE = { @@ -264,7 +269,8 @@ export default { FtransltModal, BetaGammaEnergyCalibrationModal, StripModal, - AutomaticAnalysisLogModal + AutomaticAnalysisLogModal, + BetaGammaExtrapolationModal }, data() { this.ANALYZE_TYPE = ANALYZE_TYPE @@ -321,6 +327,7 @@ export default { isBetaGammaCommentsAdd: false, // beta-gamma comments 是否新增 betaGammaEnergyCalibrationModalVisible: false, // beta-gamma 的 Energy Calibration 弹窗 + betaGammaExtrapolationModalVisible: false, // beta-gamma 的 Extrapolation 弹窗 betaGammaSpectrumModalVisible: false, // beta-gamma spectrum 弹窗 betaGammaSampleInfomationModalVisible: false, // beta-gamma sample infomation 弹窗 @@ -613,6 +620,18 @@ export default { show: this.isGamma, handler: () => (this.energyCalibrationModalShow = true) }, + { + type: 'a-menu-item', + title: 'Resolution', + show: this.isGamma, + handler: () => (this.resolutionCalibrationModalShow = true) + }, + { + type: 'a-menu-item', + title: 'Efficiency', + show: this.isGamma, + handler: () => (this.efficiencyCalibrationModalShow = true) + }, { type: 'a-menu-item', title: 'Energy Calibration', @@ -621,13 +640,9 @@ export default { }, { type: 'a-menu-item', - title: 'Resolution', - handler: () => (this.resolutionCalibrationModalShow = true) - }, - { - type: 'a-menu-item', - title: 'Efficiency', - handler: () => (this.efficiencyCalibrationModalShow = true) + title: 'Extrapolation', + show: this.isBetaGamma, + handler: () => (this.betaGammaExtrapolationModalVisible = true) } ] } diff --git a/src/views/spectrumAnalysis/useChart.js b/src/views/spectrumAnalysis/useChart.js new file mode 100644 index 0000000..818fcd7 --- /dev/null +++ b/src/views/spectrumAnalysis/useChart.js @@ -0,0 +1,66 @@ +/** + * 返回一个默认的配置 + * @param {*} minX + * @param {*} maxX + * @param {*} intervalX + * @param {*} minY + * @param {*} maxY + * @param {*} intervalY + * @returns + */ +export function useBaseChartSetting(minX = 0, maxX = 265, intervalX = 64, minY = 0, maxY = 0, intervalY = 0) { + return { + grid: { + top: 20, + right: 20, + bottom: 20, + left: 10, + containLabel: true + }, + xAxis: { + min: minX, + max: maxX, + interval: intervalX, + axisLine: { + lineStyle: { + color: 'rgb(119, 181, 213, 0.5)' + } + }, + splitLine: { + show: true, + lineStyle: { + color: 'rgba(119, 181, 213, .2)' + } + }, + axisTick: { + show: false + }, + axisLabel: { + color: '#ade6ee' + } + }, + yAxis: { + min: minY, + max: maxY, + interval: intervalY, + axisLine: { + show: true, + lineStyle: { + color: 'rgb(119, 181, 213, 0.5)' + } + }, + splitLine: { + show: true, + lineStyle: { + color: 'rgba(119, 181, 213, .2)' + } + }, + axisTick: { + show: false + }, + axisLabel: { + color: '#ade6ee' + } + } + } +}