fix: 修复accept后新的baseCtrl未传出来的问题
This commit is contained in:
parent
e13f8cbc22
commit
b5c51883da
|
@ -799,7 +799,7 @@ export default {
|
||||||
shapeChannelData,
|
shapeChannelData,
|
||||||
shapeEnergyData,
|
shapeEnergyData,
|
||||||
peak: table,
|
peak: table,
|
||||||
barChart: this.barChart
|
barChart: this.barChart,
|
||||||
})
|
})
|
||||||
|
|
||||||
this.channelPeakChart = channelPeakChart
|
this.channelPeakChart = channelPeakChart
|
||||||
|
@ -917,7 +917,6 @@ export default {
|
||||||
this.selectedKeys = []
|
this.selectedKeys = []
|
||||||
|
|
||||||
this.selectedTableItem = null
|
this.selectedTableItem = null
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
this.$message.error(message)
|
this.$message.error(message)
|
||||||
}
|
}
|
||||||
|
@ -1441,7 +1440,7 @@ export default {
|
||||||
this.resetChartOpts()
|
this.resetChartOpts()
|
||||||
})
|
})
|
||||||
|
|
||||||
this.$bus.$emit('accept', result)
|
this.$bus.$emit('accept', { ...result, BaseCtrls: cloneDeep(this.baseCtrls_Copy) })
|
||||||
} else {
|
} else {
|
||||||
this.$message.error(message)
|
this.$message.error(message)
|
||||||
}
|
}
|
||||||
|
|
|
@ -1382,7 +1382,7 @@ export default {
|
||||||
|
|
||||||
// 分析工具Accept时刷新部分数据
|
// 分析工具Accept时刷新部分数据
|
||||||
handleAccept(data) {
|
handleAccept(data) {
|
||||||
const { allData, peak, shadowChannelChart, shadowEnergyChart, shapeChannelData, shapeEnergyData, barChart } = data
|
const { allData, peak, shadowChannelChart, shadowEnergyChart, shapeChannelData, shapeEnergyData, barChart, BaseCtrls } = data
|
||||||
|
|
||||||
const result = {
|
const result = {
|
||||||
DetailedInformation: this.detailedInfomation,
|
DetailedInformation: this.detailedInfomation,
|
||||||
|
@ -1393,7 +1393,7 @@ export default {
|
||||||
shapeChannelData,
|
shapeChannelData,
|
||||||
shapeEnergyData,
|
shapeEnergyData,
|
||||||
peak,
|
peak,
|
||||||
BaseCtrls: this.baseCtrls,
|
BaseCtrls,
|
||||||
bAnalyed: this.bAnalyed,
|
bAnalyed: this.bAnalyed,
|
||||||
barChart
|
barChart
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user