From 9342a92fcf65274a7860ffd9b72f47203f873070 Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Tue, 25 Jul 2023 20:03:29 +0800 Subject: [PATCH] =?UTF-8?q?WIP:=20Tool=20of=20Calibration=20=E4=BF=A9?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=8F=8AGamma=20Detector=20?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5=E5=92=8C?= =?UTF-8?q?=E9=83=A8=E5=88=86=E4=BA=A4=E4=BA=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/CustomChart/index.vue | 2 +- src/utils/request.js | 2 +- .../spectrumAnalysis/beta-gamma-analysis.vue | 6 +- .../components/Modals/ArrRrrModal.vue | 2 +- .../BetaGammaCommentsModal.vue | 2 +- .../components/BetaDetectorCalibration.vue | 640 ++++++++++++++++++ .../components/GammaDetectorCalibration.vue | 606 +++++++++++++++++ .../BetaGammaEnergyCalibrationModal/index.vue | 29 + .../BetaGammaQCResultsModal.vue | 2 +- .../BetaGammaSampleInfomationModal.vue | 2 +- .../BetaGammaSpectrumModal.vue | 2 +- src/views/spectrumAnalysis/index.vue | 19 +- 12 files changed, 1302 insertions(+), 12 deletions(-) create mode 100644 src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue create mode 100644 src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue create mode 100644 src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue diff --git a/src/components/CustomChart/index.vue b/src/components/CustomChart/index.vue index a785e99..dfd8df0 100644 --- a/src/components/CustomChart/index.vue +++ b/src/components/CustomChart/index.vue @@ -5,7 +5,7 @@ import * as echarts from 'echarts' const events = ['brushEnd'] -const zrEvents = ['mousemove', 'mousedown', 'mouseup'] +const zrEvents = ['mousemove', 'mousedown', 'mouseup', 'click'] export default { props: { diff --git a/src/utils/request.js b/src/utils/request.js index 4d1ace7..dbfa9cd 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -17,7 +17,7 @@ let apiBaseUrl = window._CONFIG['domianURL'] || "/jeecg-boot"; const service = axios.create({ //baseURL: '/jeecg-boot', baseURL: apiBaseUrl, // api base_url - timeout: 9000 // 请求超时时间 + timeout: 60 * 1000 // 请求超时时间 }) const err = (error) => { diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index b66290c..7522132 100644 --- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue +++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue @@ -317,16 +317,16 @@ export default { &-main { height: calc(100% - 51px); display: flex; + gap: 30px; overflow: auto hidden; } .beta-gamma-spectrum-sample { - width: calc(100% - 1111px); + flex: 788; } .beta-and-gamma-spectrum { - width: 1081px; - margin-left: 30px; + flex: 1048; flex-direction: column; .spectrum-charts { diff --git a/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue b/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue index 086c2e9..5854ff8 100644 --- a/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/ArrRrrModal.vue @@ -22,7 +22,7 @@ export default { type: Number }, sampleId: { - type: String + type: Number } }, data() { diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaCommentsModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaCommentsModal.vue index d6c0fc5..37e29fa 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaCommentsModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaCommentsModal.vue @@ -31,7 +31,7 @@ export default { default: true }, sampleId: { - type: String + type: Number } }, data() { diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue new file mode 100644 index 0000000..bf52c3a --- /dev/null +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/BetaDetectorCalibration.vue @@ -0,0 +1,640 @@ + + + + + diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue new file mode 100644 index 0000000..baaa13b --- /dev/null +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue @@ -0,0 +1,606 @@ + + + + + + diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue new file mode 100644 index 0000000..0ecd865 --- /dev/null +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue @@ -0,0 +1,29 @@ + + + + + diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaQCResultsModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaQCResultsModal.vue index 139fe50..9b3ceca 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaQCResultsModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaQCResultsModal.vue @@ -51,7 +51,7 @@ export default { mixins: [ModalMixin], props: { sampleId: { - type: String + type: Number } }, data() { diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSampleInfomationModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSampleInfomationModal.vue index f61472d..f47173e 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSampleInfomationModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSampleInfomationModal.vue @@ -21,7 +21,7 @@ export default { mixins: [ModalMixin], props: { sampleId: { - type: String + type: Number } }, data() { diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSpectrumModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSpectrumModal.vue index f06ba10..edafc8b 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSpectrumModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaSpectrumModal.vue @@ -26,7 +26,7 @@ export default { mixins: [ModalMixin], props: { sampleId: { - type: String + type: Number } }, data() { diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index 1eb69cd..4ae9c92 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -139,6 +139,10 @@ /> + + + + @@ -198,6 +202,7 @@ import BetaGammaQcResultsModal from './components/Modals/BetaGammaModals/BetaGam 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' +import BetaGammaEnergyCalibrationModal from './components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue' // 分析类型 const ANALYZE_TYPE = { @@ -239,7 +244,8 @@ export default { BetaGammaQcResultsModal, BetaGammaRlrModal, StatisticsParamerHistoryModal, - FtransltModal + FtransltModal, + BetaGammaEnergyCalibrationModal }, data() { this.ANALYZE_TYPE = ANALYZE_TYPE @@ -292,6 +298,8 @@ export default { betaGammaCommentsModalVisible: false, // beta-gamma Comments isBetaGammaCommentsAdd: false, // beta-gamma comments 是否新增 + betaGammaEnergyCalibrationModalVisible: true, // beta-gamma 的 Energy Calibration 弹窗 + betaGammaSpectrumModalVisible: false, // beta-gamma spectrum 弹窗 betaGammaSampleInfomationModalVisible: false, // beta-gamma sample infomation 弹窗 betaGammaQCResultsModalVisible: false, // beta-gamma QC Result 弹窗 @@ -304,7 +312,7 @@ export default { this.loadSelectedSample({ dbName: 'auto', sampleType: 'B', - sampleId: '423228' + sampleId: 426120 }) }, methods: { @@ -557,8 +565,15 @@ export default { { type: 'a-menu-item', title: 'Energy', + show: this.isGamma, handler: () => (this.energyCalibrationModalShow = true) }, + { + type: 'a-menu-item', + title: 'Energy Calibration', + show: this.isBetaGamma, + handler: () => (this.betaGammaEnergyCalibrationModalVisible = true) + }, { type: 'a-menu-item', title: 'Resolution',