diff --git a/src/utils/chartHelper.js b/src/utils/chartHelper.js index d60b6cf..e5b2bad 100644 --- a/src/utils/chartHelper.js +++ b/src/utils/chartHelper.js @@ -88,4 +88,9 @@ export function buildLineSeries(name, data, color, extra = {}) { animation: false, ...extra } +} + +// 根据name查找series +export function findSeriesByName(series, seriesName) { + return series.find(item => item.name == seriesName) } \ No newline at end of file diff --git a/src/views/spectrumAnalysis/SampleDataMixin.js b/src/views/spectrumAnalysis/SampleDataMixin.js new file mode 100644 index 0000000..0c5f18a --- /dev/null +++ b/src/views/spectrumAnalysis/SampleDataMixin.js @@ -0,0 +1,8 @@ +export default { + inject: ['sample'], + computed: { + sampleData() { + return this.sample() + } + } +} diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/FitPeaksAndBaselineModal.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/FitPeaksAndBaselineModal.vue index f2b2774..3e2dd3e 100644 --- a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/FitPeaksAndBaselineModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/FitPeaksAndBaselineModal.vue @@ -11,7 +11,7 @@
Peaks - Cancel + Cancel
diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/NuclideReviewChart.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/NuclideReviewChart.vue index 2d3339f..6829e1d 100644 --- a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/NuclideReviewChart.vue +++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/NuclideReviewChart.vue @@ -2,6 +2,7 @@ - + diff --git a/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue b/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue index fffabdb..be6b5ed 100644 --- a/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue @@ -162,7 +162,17 @@ export default { getAction(this.url.list, params) .then(res => { if (res.success) { - this.dataSource = res.result.records || res.result + const result = res.result.records || res.result + result.forEach(item => { + const fileName = item.inputFileName + if(fileName) { + const arr = fileName.split('/') + item.inputFileName = arr[arr.length - 1] + } + }) + + this.dataSource = result + if (res.result.total) { this.ipagination.total = res.result.total } else { diff --git a/src/views/spectrumAnalysis/components/Modals/ZeroTimeModal.vue b/src/views/spectrumAnalysis/components/Modals/ZeroTimeModal.vue index 7ea6a0f..5e72a80 100644 --- a/src/views/spectrumAnalysis/components/Modals/ZeroTimeModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/ZeroTimeModal.vue @@ -13,7 +13,7 @@
- +
@@ -68,7 +68,7 @@ Fission Product 2
- +
@@ -76,14 +76,14 @@
- + U-235 U-238 PU-239 - + T>Thermal_spectrum F>Fission_spectrum H->Fast_Neutron @@ -102,7 +102,9 @@
- Analysis + + Analysis + Save Exit
@@ -132,16 +134,10 @@ export default { fissionProductList1: [], fissionProductList2: [], - fissionSelectedItem1: null, - fissionSelectedItem2: null, - dateTime: '', - model: { - date: undefined, - time: undefined, - fissionTarget: '', - fissionEnergy: '' - } + model: {}, + + isAnalyzing: false } }, methods: { @@ -170,33 +166,53 @@ export default { // 选中Fission handleFissonSelect(item, which) { if (which == 1) { - this.fissionSelectedItem1 = item + this.model.nuclide1 = item } else { - this.fissionSelectedItem2 = item + this.model.nuclide2 = item } }, beforeModalOpen() { - this.model.fissionTarget = 'U-235' - this.model.fissionEnergy = 'T' - this.fissionSelectedItem1 = null - this.fissionSelectedItem2 = null + this.model = { + nuclide1: '', + nuclide2: '', + product1: '', + product2: '', + target: 'U-235', + energyTFH: 'T', + date: undefined, + time: undefined + } + this.dateTime = '2015-05-30 17:30:60' this.getInfo() }, // 分析 - handleAnalysis() { - console.log('%c [ ]-188', 'font-size:13px; background:pink; color:#bf2c9f;') + async handleAnalysis() { + if (!this.model.product1 || !this.model.product2) { + this.$message.warn('The Fission Product is invalid!') + return + } + + try { + this.isAnalyzing = true + const { success, result, message } = await getAction('/gamma/ZeroTimeAnalyse', this.model) + if (success) { + this.dateTime = result + } else { + this.$message.error(message) + } + } catch (error) { + console.error(error) + } finally { + this.isAnalyzing = false + } } }, computed: { disabled() { - return ( - !this.fissionSelectedItem1 || - !this.fissionSelectedItem2 || - this.fissionSelectedItem1 == this.fissionSelectedItem2 - ) + return !this.model.nuclide1 || !this.model.nuclide2 || this.model.nuclide1 == this.model.nuclide2 } } } diff --git a/src/views/spectrumAnalysis/components/SpectraListInMenu.vue b/src/views/spectrumAnalysis/components/SpectraListInMenu.vue index 5bc881e..d7c59ac 100644 --- a/src/views/spectrumAnalysis/components/SpectraListInMenu.vue +++ b/src/views/spectrumAnalysis/components/SpectraListInMenu.vue @@ -4,7 +4,7 @@ - {{ getFileName(item.inputFileName) }} + {{ item.inputFileName }} @@ -40,17 +40,6 @@ export default { } } this.$forceUpdate() - }, - - /** - * 获取文件名 - * @param {String} inputFileName - */ - getFileName(inputFileName) { - if (inputFileName) { - const arr = inputFileName.split('/') - return arr[arr.length - 1] - } } }, watch: { diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue index cec04b1..4610bb4 100644 --- a/src/views/spectrumAnalysis/gamma-analysis.vue +++ b/src/views/spectrumAnalysis/gamma-analysis.vue @@ -536,6 +536,7 @@ export default { case 'Channel': case 'Energy': this.graphAssistance.axisType = label + this.option.xAxis.name = label this.handleReset() diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index 0c4835d..d35b1e2 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -152,7 +152,7 @@ - + { + return this.sampleData + } + } + }, + data() { this.ANALYZE_TYPE = ANALYZE_TYPE @@ -335,6 +344,7 @@ export default { rlrModalVisible: false, // Reports -> RLR 弹窗 autoAnalysisMogModalVisible: false, // Log -> Automatic Analysis Log 弹窗 + autoAnalysisMogModalType: 1, // Log -> Automatic Analysis Log 弹窗类型 1为gamma 2为 betagamma /** * 以下是beta-gamma跟前面不同的弹窗 @@ -357,7 +367,8 @@ export default { this.loadSelectedSample({ sampleId: 426530, sampleType: 'G', - dbName: 'auto' + dbName: 'auto', + inputFileName: 'CAX05_001-20230731_1528_S_FULL_37563.6.PHD' }) }, @@ -378,6 +389,7 @@ export default { // 加载选中的样本 async loadSelectedSample(sample) { + console.log('%c [ sample ]-381', 'font-size:13px; background:pink; color:#bf2c9f;', sample) // B是beta-gamma P G是gamma if (sample.sampleType == 'B') { this.analysisType = ANALYZE_TYPE.BETA_GAMMA @@ -884,8 +896,10 @@ export default { { type: 'a-menu-item', title: 'Automatic Analysis Log', - show: this.isBetaGamma, - handler: () => (this.autoAnalysisMogModalVisible = true) + handler: () => { + this.autoAnalysisMogModalType = 1 + this.autoAnalysisMogModalVisible = true + } }, { type: 'a-menu-item',