diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index 95dab69..fd08ecc 100644 --- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue +++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue @@ -116,7 +116,7 @@ - + diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaCategoryResultsModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaCategoryResultsModal.vue new file mode 100644 index 0000000..dd63ed7 --- /dev/null +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaCategoryResultsModal.vue @@ -0,0 +1,78 @@ + + + + diff --git a/src/views/spectrumAnalysis/components/SubOperators/BetaGammaDetailedInfomation.vue b/src/views/spectrumAnalysis/components/SubOperators/BetaGammaDetailedInfomation.vue index e92133a..75a8c58 100644 --- a/src/views/spectrumAnalysis/components/SubOperators/BetaGammaDetailedInfomation.vue +++ b/src/views/spectrumAnalysis/components/SubOperators/BetaGammaDetailedInfomation.vue @@ -74,7 +74,15 @@ const items = [ { label: 'Xe Volume[cm³]', name: 'xeVolume' - } + }, + { + label: 'Auto.Cat', + name: 'autoCategory' + }, + { + label: 'Category', + name: 'manCategory' + }, ] ] export default { diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index 1fe5be1..ee858c0 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -225,6 +225,10 @@ + + + + @@ -269,6 +273,9 @@ import BetaGammaCommentsModal from './components/Modals/BetaGammaModals/BetaGamm import BetaGammaSpectrumModal from './components/Modals/BetaGammaModals/BetaGammaSpectrumModal.vue' import BetaGammaSampleInfomationModal from './components/Modals/BetaGammaModals/BetaGammaSampleInfomationModal.vue' import BetaGammaQcResultsModal from './components/Modals/BetaGammaModals/BetaGammaQCResultsModal.vue' + +import BetaGammaCategoryResultsModal from './components/Modals/BetaGammaModals/BetaGammaCategoryResultsModal.vue' + import BetaGammaRlrModal from './components/Modals/BetaGammaModals/BetaGammaRLRModal/index.vue' import StatisticsParamerHistoryModal from './components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue' import FtransltModal from './components/Modals/FtransltModal/index.vue' @@ -324,6 +331,7 @@ export default { BetaGammaSpectrumModal, BetaGammaSampleInfomationModal, BetaGammaQcResultsModal, + BetaGammaCategoryResultsModal, BetaGammaRlrModal, StatisticsParamerHistoryModal, FtransltModal, @@ -408,6 +416,8 @@ export default { betaGammaSpectrumModalVisible: false, // beta-gamma spectrum 弹窗 betaGammaSampleInfomationModalVisible: false, // beta-gamma sample infomation 弹窗 betaGammaQCResultsModalVisible: false, // beta-gamma QC Result 弹窗 + + categoryResultsVisible: false,//Category results弹窗 betaGammaRlrModalVisible: false, // beta-gamma RLR 弹窗 statisticsParamerHistoryModalVisible: false, // beta-gamma Statistics Paramer History 弹窗 bgLogViewerVisible: false, // beta-gamma Log 下的BG log viewer 弹窗 @@ -1580,6 +1590,13 @@ export default { handler: () => (this.betaGammaRlrModalVisible = true), show: this.isBetaGamma, }, + + { + type: 'a-menu-item', + title: 'Category results', + handler: () => (this.categoryResultsVisible = true), + show: true, + } ], }, ],