diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index d1e5a74..b66290c 100644 --- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue +++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue @@ -8,7 +8,7 @@ QC Flags - + Spectra @@ -138,9 +138,9 @@ import BetaGammaSpectrumChart from './components/BetaGammaSpectrumChart.vue' import ComparisonModal from './components/Modals/ComparisonModal.vue' import ResultDisplay from './components/ResultDisplay.vue' import SpectrumLineChart from './components/SpectrumLineChart.vue' +import BetaGammaQcFlags from './components/SubOperators/BetaGammaQcFlags.vue' import DetailedInfomation from './components/SubOperators/DetailedInfomation.vue' import PopOverWithIcon from './components/SubOperators/PopOverWithIcon.vue' -import QcFlags from './components/SubOperators/QcFlags.vue' import Spectra from './components/SubOperators/Spectra.vue' export default { @@ -153,8 +153,8 @@ export default { DetailedInfomation, PopOverWithIcon, - QcFlags, - Spectra + Spectra, + BetaGammaQcFlags }, props: { sample: { @@ -163,6 +163,8 @@ export default { }, data() { return { + qcFlags: {}, + spectraVisible: false, spectraType: 'sample', @@ -216,7 +218,14 @@ export default { Boundary, // 左侧2d图表的矩形 XeData, // 右下角Result Display - spectrumData + spectrumData, + + AcqTimeBtn, // QC Flags 相关 + CollectTimeBtn, // QC Flags 相关 + SampleVolumeBtn, // QC Flags 相关 + XeVolumeBtn, // QC Flags 相关 + GasBgBtn, // QC Flags 相关 + DetBgBtn // QC Flags 相关 } = this.sampleDetail[type] this.histogramDataList = histogramDataList @@ -232,6 +241,15 @@ export default { this.betaEnergyData = betaEnergyData this.resultDisplay = XeData + + this.qcFlags = { + AcqTimeBtn, + CollectTimeBtn, + SampleVolumeBtn, + XeVolumeBtn, + GasBgBtn, + DetBgBtn + } }, resize() { diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue index bcbe02c..7baa547 100644 --- a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue +++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue @@ -28,7 +28,7 @@
- +
-
+
Reset Chart
- + @@ -109,7 +109,7 @@ Del
- +
@@ -128,7 +128,7 @@ diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue index fbea5bd..cf51ca6 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue @@ -2,9 +2,9 @@
- + - + - + - + Xe131m Xe133m Xe133 Xe135 - + MDC @@ -55,7 +55,7 @@
- + Xe Result Flag
@@ -126,8 +126,8 @@
-
- + +
@@ -138,7 +138,7 @@ + + diff --git a/src/views/spectrumAnalysis/components/Modals/FtransltModal/index.vue b/src/views/spectrumAnalysis/components/Modals/FtransltModal/index.vue new file mode 100644 index 0000000..066d484 --- /dev/null +++ b/src/views/spectrumAnalysis/components/Modals/FtransltModal/index.vue @@ -0,0 +1,23 @@ + + + + + diff --git a/src/views/spectrumAnalysis/components/Modals/KorsumModal.vue b/src/views/spectrumAnalysis/components/Modals/KorsumModal.vue index a446510..3e4c3b3 100644 --- a/src/views/spectrumAnalysis/components/Modals/KorsumModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/KorsumModal.vue @@ -2,7 +2,7 @@
- +
-
+ - +
@@ -136,14 +136,14 @@
-
+
+ + diff --git a/src/views/spectrumAnalysis/components/TitleOverBoarder.vue b/src/views/spectrumAnalysis/components/TitleOverBorder.vue similarity index 100% rename from src/views/spectrumAnalysis/components/TitleOverBoarder.vue rename to src/views/spectrumAnalysis/components/TitleOverBorder.vue diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index a092827..1eb69cd 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -43,6 +43,10 @@ + + + + @@ -128,7 +132,11 @@ - + @@ -136,11 +144,14 @@ - + - + @@ -186,6 +197,7 @@ import BetaGammaSampleInfomationModal from './components/Modals/BetaGammaModals/ import BetaGammaQcResultsModal from './components/Modals/BetaGammaModals/BetaGammaQCResultsModal.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' // 分析类型 const ANALYZE_TYPE = { @@ -226,7 +238,8 @@ export default { BetaGammaSampleInfomationModal, BetaGammaQcResultsModal, BetaGammaRlrModal, - StatisticsParamerHistoryModal + StatisticsParamerHistoryModal, + FtransltModal }, data() { this.ANALYZE_TYPE = ANALYZE_TYPE @@ -238,6 +251,7 @@ export default { loadFromDbModalVisible: false, // 从数据库加载弹窗 loadFromFileModalVisible: false, // 从文件加载弹窗 + ftransltModalVisible: false, // Ftransit 弹窗 sampleData: {}, // 要分析的谱数据 @@ -407,6 +421,11 @@ export default { type: 'a-menu-item', title: 'Clean All', handler: this.handleCleanAll + }, + { + type: 'a-menu-item', + title: 'Ftransit', + handler: () => (this.ftransltModalVisible = true) } ] },