接口对接
This commit is contained in:
parent
c555bdcb3d
commit
d8ca6598bc
|
@ -270,7 +270,8 @@ export default {
|
|||
const { AllData, equation, param, table, uncert } = result
|
||||
// 有数据
|
||||
if (AllData) {
|
||||
const [linePoint, scatterPoint] = AllData
|
||||
// const [linePoint, scatterPoint] = AllData
|
||||
const [scatterPoint] = AllData
|
||||
this.equation = equation
|
||||
this.param = param
|
||||
this.uncert = uncert
|
||||
|
@ -279,13 +280,13 @@ export default {
|
|||
this.generateTableId()
|
||||
|
||||
const series = []
|
||||
series.push(
|
||||
buildLineSeries(
|
||||
'LineSeries',
|
||||
linePoint.pointlist.map(({ x, y }) => [x, y]),
|
||||
linePoint.color
|
||||
)
|
||||
)
|
||||
// series.push(
|
||||
// buildLineSeries(
|
||||
// 'LineSeries',
|
||||
// linePoint.pointlist.map(({ x, y }) => [x, y]),
|
||||
// linePoint.color
|
||||
// )
|
||||
// )
|
||||
series.push({
|
||||
type: 'scatter',
|
||||
data: scatterPoint.pointlist.map(({ x, y }) => {
|
||||
|
|
|
@ -262,7 +262,7 @@ import EfficiencyCalibrationModalBeta from './components/Modals/EfficiencyCalibr
|
|||
import EnergyCalibrationModal from './components/Modals/EnergyCalibrationModal.vue'
|
||||
import EnergyCalibrationModalBeta from './components/Modals/EnergyCalibrationModal-Beta.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 ColorConfigModal from './components/Modals/ColorConfigModal.vue'
|
||||
import DataProcessingLogModal from './components/Modals/DataProcessingLogModal.vue'
|
||||
|
@ -321,7 +321,7 @@ export default {
|
|||
EnergyCalibrationModal,
|
||||
EnergyCalibrationModalBeta,
|
||||
ResolutionCalibrationModal,
|
||||
ResolutionCalibrationModallBeta,
|
||||
ResolutionCalibrationModalBeta,
|
||||
SpectrumCommentsModal,
|
||||
ColorConfigModal,
|
||||
DataProcessingLogModal,
|
||||
|
|
Loading…
Reference in New Issue
Block a user