diff --git a/src/views/spectrumAnalysis/components/Modals/RLRModal/components/Header.vue b/src/views/spectrumAnalysis/components/Modals/RLRModal/components/Header.vue index 149d02e..e00d9d9 100644 --- a/src/views/spectrumAnalysis/components/Modals/RLRModal/components/Header.vue +++ b/src/views/spectrumAnalysis/components/Modals/RLRModal/components/Header.vue @@ -72,25 +72,35 @@ export default { watch: { allData: { handler(val) { - console.log(val); + this.model.msgId = val.header_msg_id; + this.model.dataType = val.header_data_type; + this.model.priorityLevel = val.header_priority_level; + this.model.stationCode = val.header_station_code; + this.model.srid = val.header_srid; + this.model.labCode = val.header_lab_code; + this.model.labDetector = val.header_lab_detector; + this.model.reportType = val.header_report_type; + this.model.reportnumber = val.header_report_number; + this.model.sampleCategory = val.header_sample_category; + this.model.transmission = val.header_transmission; }, deep: true, immediate:true } }, - mounted () { - this.model.msgId = this.allData.header_msg_id; - this.model.dataType = this.allData.header_data_type; - this.model.priorityLevel = this.allData.header_priority_level; - this.model.stationCode = this.allData.header_station_code; - this.model.srid = this.allData.header_srid; - this.model.labCode = this.allData.header_lab_code; - this.model.labDetector = this.allData.header_lab_detector; - this.model.reportType = this.allData.header_report_type; - this.model.reportnumber = this.allData.header_report_number; - this.model.sampleCategory = this.allData.header_sample_category; - this.model.transmission = this.allData.header_transmission; - }, + // mounted () { + // this.model.msgId = this.allData.header_msg_id; + // this.model.dataType = this.allData.header_data_type; + // this.model.priorityLevel = this.allData.header_priority_level; + // this.model.stationCode = this.allData.header_station_code; + // this.model.srid = this.allData.header_srid; + // this.model.labCode = this.allData.header_lab_code; + // this.model.labDetector = this.allData.header_lab_detector; + // this.model.reportType = this.allData.header_report_type; + // this.model.reportnumber = this.allData.header_report_number; + // this.model.sampleCategory = this.allData.header_sample_category; + // this.model.transmission = this.allData.header_transmission; + // }, data() { this.priorityLevbelOptions = priorityLevbelOptions this.reportTypeOptions = reportTypeOptions diff --git a/src/views/spectrumAnalysis/components/Modals/RLRModal/index.vue b/src/views/spectrumAnalysis/components/Modals/RLRModal/index.vue index 2afce8a..e7e80c9 100644 --- a/src/views/spectrumAnalysis/components/Modals/RLRModal/index.vue +++ b/src/views/spectrumAnalysis/components/Modals/RLRModal/index.vue @@ -1,71 +1,73 @@ @@ -136,23 +138,23 @@ export default { data() { this.tabs = tabs return { + isLoading: false, activeKey: 0, allInfo: {} } }, - mounted () { - this.getGammaViewRLR(); - }, methods: { beforeModalOpen() { this.activeKey = 0 + this.getGammaViewRLR(); }, getGammaViewRLR() { + this.isLoading = true let params = { sampleId: this.sampleId } getAction("/gamma/viewRLR", params).then(res => { - console.log(res); + this.isLoading = false if (res.success) { this.allInfo = res.result } else {