From 63ede005d272902f7912858275c10cf52e77d089 Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Thu, 27 Jul 2023 18:42:51 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A2=9E=E5=8A=A0Strip=E5=BC=B9?= =?UTF-8?q?=E7=AA=97=EF=BC=8C=E5=A2=9E=E5=8A=A0FtransltModal=E4=B8=AD?= =?UTF-8?q?=E5=90=8E=E4=B8=A4=E4=B8=AA=E8=BD=AC=E6=8D=A2=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E5=A2=9E=E5=8A=A0LoadFrom=20DB=20=E4=B8=AD=20CollectS?= =?UTF-8?q?topB=E5=92=8CAcqStartB=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/CanberraIECImsTransfer.vue | 257 ++++++++++++++++++ .../components/IntSpcCanberraIecTransfer.vue | 86 ++++++ .../components/IntSpcImsTransfer.vue | 2 +- .../components/Modals/FtransltModal/index.vue | 14 +- .../components/Modals/LoadFromDBModal.vue | 16 +- .../components/Modals/StripModal.vue | 32 +++ src/views/spectrumAnalysis/index.vue | 34 ++- 7 files changed, 433 insertions(+), 8 deletions(-) create mode 100644 src/views/spectrumAnalysis/components/Modals/FtransltModal/components/CanberraIECImsTransfer.vue create mode 100644 src/views/spectrumAnalysis/components/Modals/FtransltModal/components/IntSpcCanberraIecTransfer.vue create mode 100644 src/views/spectrumAnalysis/components/Modals/StripModal.vue diff --git a/src/views/spectrumAnalysis/components/Modals/FtransltModal/components/CanberraIECImsTransfer.vue b/src/views/spectrumAnalysis/components/Modals/FtransltModal/components/CanberraIECImsTransfer.vue new file mode 100644 index 0000000..7b50ba3 --- /dev/null +++ b/src/views/spectrumAnalysis/components/Modals/FtransltModal/components/CanberraIECImsTransfer.vue @@ -0,0 +1,257 @@ + + + + + diff --git a/src/views/spectrumAnalysis/components/Modals/FtransltModal/components/IntSpcCanberraIecTransfer.vue b/src/views/spectrumAnalysis/components/Modals/FtransltModal/components/IntSpcCanberraIecTransfer.vue new file mode 100644 index 0000000..68d9e79 --- /dev/null +++ b/src/views/spectrumAnalysis/components/Modals/FtransltModal/components/IntSpcCanberraIecTransfer.vue @@ -0,0 +1,86 @@ + + + + + diff --git a/src/views/spectrumAnalysis/components/Modals/FtransltModal/components/IntSpcImsTransfer.vue b/src/views/spectrumAnalysis/components/Modals/FtransltModal/components/IntSpcImsTransfer.vue index de901f7..9014786 100644 --- a/src/views/spectrumAnalysis/components/Modals/FtransltModal/components/IntSpcImsTransfer.vue +++ b/src/views/spectrumAnalysis/components/Modals/FtransltModal/components/IntSpcImsTransfer.vue @@ -94,7 +94,7 @@ -
IMS.ims.rms
+
IMS .ims .rms
diff --git a/src/views/spectrumAnalysis/components/Modals/FtransltModal/index.vue b/src/views/spectrumAnalysis/components/Modals/FtransltModal/index.vue index 066d484..9323783 100644 --- a/src/views/spectrumAnalysis/components/Modals/FtransltModal/index.vue +++ b/src/views/spectrumAnalysis/components/Modals/FtransltModal/index.vue @@ -1,11 +1,15 @@ @@ -13,9 +17,11 @@ diff --git a/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue b/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue index 3c8f97a..099be4b 100644 --- a/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue @@ -152,6 +152,8 @@ export default { } params.AllUsers = this.allUsersValue + params.CollectStopB = this.collectStopValue + params.AcqStartB = this.acqStartValue delete params.checkboxGroup this.onClearSelected() @@ -392,8 +394,8 @@ export default { props: { options: [ { label: 'All User', value: 'AllUsers' }, - { label: 'Collect Stop', value: 'CollectStop' }, - { label: 'Acq.Start', value: 'AcqStart' } + { label: 'Collect Stop', value: 'CollectStopB' }, + { label: 'Acq.Start', value: 'AcqStartB' } ] }, style: { @@ -439,6 +441,16 @@ export default { allUsersValue() { const checkboxGroup = this.queryParam.checkboxGroup return !!(checkboxGroup && checkboxGroup.includes('AllUsers')) + }, + + collectStopValue() { + const checkboxGroup = this.queryParam.checkboxGroup + return !!(checkboxGroup && checkboxGroup.includes('CollectStopB')) + }, + + acqStartValue() { + const checkboxGroup = this.queryParam.checkboxGroup + return !!(checkboxGroup && checkboxGroup.includes('AcqStartB')) } }, watch: { diff --git a/src/views/spectrumAnalysis/components/Modals/StripModal.vue b/src/views/spectrumAnalysis/components/Modals/StripModal.vue new file mode 100644 index 0000000..f5cc095 --- /dev/null +++ b/src/views/spectrumAnalysis/components/Modals/StripModal.vue @@ -0,0 +1,32 @@ + + + + + diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index 80c57bf..00c04af 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -46,6 +46,10 @@ + + + + @@ -209,6 +213,7 @@ import BetaGammaRlrModal from './components/Modals/BetaGammaModals/BetaGammaRLRM import StatisticsParamerHistoryModal from './components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue' import FtransltModal from './components/Modals/FtransltModal/index.vue' import BetaGammaEnergyCalibrationModal from './components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue' +import StripModal from './components/Modals/StripModal.vue' // 分析类型 const ANALYZE_TYPE = { @@ -251,7 +256,8 @@ export default { BetaGammaRlrModal, StatisticsParamerHistoryModal, FtransltModal, - BetaGammaEnergyCalibrationModal + BetaGammaEnergyCalibrationModal, + StripModal }, data() { this.ANALYZE_TYPE = ANALYZE_TYPE @@ -263,6 +269,7 @@ export default { loadFromDbModalVisible: false, // 从数据库加载弹窗 loadFromFileModalVisible: false, // 从文件加载弹窗 + stripModalVisible: false, // Strip 弹窗 ftransltModalVisible: false, // Ftransit 弹窗 sampleData: {}, // 要分析的谱数据 @@ -436,9 +443,16 @@ export default { title: 'Clean All', handler: this.handleCleanAll }, + { + type: 'a-menu-item', + title: 'Strip', + show: this.isGamma, + handler: () => (this.stripModalVisible = true) + }, { type: 'a-menu-item', title: 'Ftransit', + show: this.isGamma, handler: () => (this.ftransltModalVisible = true) } ] @@ -534,32 +548,50 @@ export default { { type: 'a-menu-item', title: 'Configure', + show: this.isGamma, handler: () => (this.analyzeConfigureModalVisible = true) }, { type: 'a-menu-item', title: 'ReProcessing', + show: this.isGamma, handler: () => (this.reprocessingModalVisible = true) }, { type: 'a-menu-item', title: 'Reprocess All', + show: this.isGamma, handler: this.handleReprocessAll }, { type: 'a-menu-item', title: 'Interactive Tool', + show: this.isGamma, handler: () => (this.analyzeInteractiveToolModalVisible = true) }, { type: 'a-menu-item', title: 'Zero Time', + show: this.isGamma, handler: () => (this.zeroTimeModalVisible = true) }, { type: 'a-menu-item', title: 'Korsum', + show: this.isGamma, handler: () => (this.korsumModalShow = true) + }, + { + type: 'a-menu-item', + title: 'Analyze current spectrum', + show: this.isBetaGamma, + handler: () => {} + }, + { + type: 'a-menu-item', + title: 'Analyze all spectra', + show: this.isBetaGamma, + handler: () => {} } ] }