diff --git a/src/views/spectrumAnalysis/beta-analysis.vue b/src/views/spectrumAnalysis/beta-analysis.vue
index bf089f3..e14880c 100644
--- a/src/views/spectrumAnalysis/beta-analysis.vue
+++ b/src/views/spectrumAnalysis/beta-analysis.vue
@@ -124,14 +124,63 @@ export default {
boundaryList: [],
sampleDetail: {},
qcFlags: {},
- resultDisplay: [],
+ resultDisplay: [
+ {
+ sampleId: null,
+ idAnalysis: null,
+ nuclideName: 'Xe131m',
+ conc: -0.049,
+ concErr: 0.04272,
+ mdc: 0.14539,
+ lc: 0.06362626536110005,
+ nidFlag: 0,
+ moddate: null,
+ color: 'red',
+ },
+ {
+ sampleId: null,
+ idAnalysis: null,
+ nuclideName: 'Xe133',
+ conc: 0.07727,
+ concErr: 0.0631,
+ mdc: 0.23981,
+ lc: 0.09916332268275692,
+ nidFlag: 0,
+ moddate: null,
+ color: '#ffcc30',
+ },
+ {
+ sampleId: null,
+ idAnalysis: null,
+ nuclideName: 'Xe133m',
+ conc: -0.07186,
+ concErr: 0.03596,
+ mdc: 0.11014,
+ lc: 0.044521536189968125,
+ nidFlag: 0,
+ moddate: null,
+ color: 'red',
+ },
+ {
+ sampleId: null,
+ idAnalysis: null,
+ nuclideName: 'Xe135',
+ conc: 0.26636,
+ concErr: 0.23193,
+ mdc: 0.77578,
+ lc: 0.3655879636569543,
+ nidFlag: 0,
+ moddate: null,
+ color: '#ffcc30',
+ },
+ ],
currIdx: 0,
}
},
watch: {
sample: {
async handler(newVal, oldVal) {
- this.resultDisplay = []
+ // this.resultDisplay = []
const sampleData = await this.$store.dispatch('GET_SAMPLE_DATA', newVal.inputFileName)
if (sampleData) {
const { data, from } = sampleData
@@ -263,7 +312,11 @@ export default {
console.log(item)
},
handleGetFlag(val, obj) {
- console.log(val, obj)
+ this.resultDisplay.forEach((item) => {
+ if (item.nuclideName === obj.nuclideName) {
+ item.nidFlag = val ? 1 : 0
+ }
+ })
},
resize() {},
},
diff --git a/src/views/spectrumAnalysis/components/Modals/SpectrumModal.vue b/src/views/spectrumAnalysis/components/Modals/SpectrumModal.vue
index 166a2a4..329e0df 100644
--- a/src/views/spectrumAnalysis/components/Modals/SpectrumModal.vue
+++ b/src/views/spectrumAnalysis/components/Modals/SpectrumModal.vue
@@ -1,9 +1,14 @@
- {{ content }}
-
+ {{ spectrum }}
+ {{ phdSpectrum }}
+