xiaoguangbin/AnalysisSystemForRadionuclide_vue
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

接口对接

Browse Source
This commit is contained in:
任珮宇 2024-01-12 18:47:28 +08:00
parent c555bdcb3d
commit d8ca6598bc
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal-Beta.vue
View File

@ -270,7 +270,8 @@ export default {
const { AllData, equation, param, table, uncert } = result const { AllData, equation, param, table, uncert } = result
// 有数据 // 有数据
if (AllData) { if (AllData) {
const [linePoint, scatterPoint] = AllData // const [linePoint, scatterPoint] = AllData
const [scatterPoint] = AllData
this.equation = equation this.equation = equation
this.param = param this.param = param
this.uncert = uncert this.uncert = uncert
@ -279,13 +280,13 @@ export default {
this.generateTableId() this.generateTableId()
const series = [] const series = []
series.push( // series.push(
buildLineSeries( // buildLineSeries(
'LineSeries', // 'LineSeries',
linePoint.pointlist.map(({ x, y }) => [x, y]), // linePoint.pointlist.map(({ x, y }) => [x, y]),
linePoint.color // linePoint.color
) // )
) // )
series.push({ series.push({
type: 'scatter', type: 'scatter',
data: scatterPoint.pointlist.map(({ x, y }) => { data: scatterPoint.pointlist.map(({ x, y }) => {

4
src/views/spectrumAnalysis/index.vue
View File

@ -262,7 +262,7 @@ import EfficiencyCalibrationModalBeta from './components/Modals/EfficiencyCalibr
import EnergyCalibrationModal from './components/Modals/EnergyCalibrationModal.vue' import EnergyCalibrationModal from './components/Modals/EnergyCalibrationModal.vue'
import EnergyCalibrationModalBeta from './components/Modals/EnergyCalibrationModal-Beta.vue' import EnergyCalibrationModalBeta from './components/Modals/EnergyCalibrationModal-Beta.vue'
import ResolutionCalibrationModal from './components/Modals/ResolutionCalibrationModal.vue' import ResolutionCalibrationModal from './components/Modals/ResolutionCalibrationModal.vue'
import ResolutionCalibrationModallBeta from './components/Modals/ResolutionCalibrationModal-Beta.vue' import ResolutionCalibrationModalBeta from './components/Modals/ResolutionCalibrationModal-Beta.vue'
import SpectrumCommentsModal from './components/Modals/SpectrumCommentsModal.vue' import SpectrumCommentsModal from './components/Modals/SpectrumCommentsModal.vue'
import ColorConfigModal from './components/Modals/ColorConfigModal.vue' import ColorConfigModal from './components/Modals/ColorConfigModal.vue'
import DataProcessingLogModal from './components/Modals/DataProcessingLogModal.vue' import DataProcessingLogModal from './components/Modals/DataProcessingLogModal.vue'
@ -321,7 +321,7 @@ export default {
EnergyCalibrationModal, EnergyCalibrationModal,
EnergyCalibrationModalBeta, EnergyCalibrationModalBeta,
ResolutionCalibrationModal, ResolutionCalibrationModal,
ResolutionCalibrationModallBeta, ResolutionCalibrationModalBeta,
SpectrumCommentsModal, SpectrumCommentsModal,
ColorConfigModal, ColorConfigModal,
DataProcessingLogModal, DataProcessingLogModal,