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

修改Energy Calibration交互逻辑

Browse Source
This commit is contained in:
qiaoqinzheng 2023-10-28 17:20:58 +08:00
parent 092da52363
commit 95ba9eed73
1 changed files with 30 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/components/GammaDetectorCalibration.vue
View File

@ -95,9 +95,9 @@
<span>C to E : </span>
<span>
E =
<a-input-number size="small" v-model="newCalibrationFuncModel.paramA" /> +
<a-input-number size="small" v-model="newCalibrationFuncModel.paramB" /> *C +
<a-input-number size="small" v-model="newCalibrationFuncModel.paramC" /> *C <sup>2</sup>
<a-input-number size="small" v-model="newCalibrationFuncModel.paramA" @change="newCalibrationFuncModelChange()"/> +
<a-input-number size="small" v-model="newCalibrationFuncModel.paramB" @change="newCalibrationFuncModelChange()"/> *C +
<a-input-number size="small" v-model="newCalibrationFuncModel.paramC" @change="newCalibrationFuncModelChange()"/> *C <sup>2</sup>
</span>
</p>
<div class="func">
@ -154,6 +154,7 @@ import { exportEchartImg, getXAxisAndYAxisByPosition, splitAxis } from '@/utils/
import { cloneDeep } from 'lodash'
import { isNullOrUndefined } from '@/utils/util'
import SampleDataMixin from '@/views/spectrumAnalysis/SampleDataMixin'
import { f } from 'vue-area-linkage'
const initialGammaSpectrumChartOption = {
grid: {
@ -571,6 +572,11 @@ export default {
energy,
})
// add之后 需要清空chart黄色的线 20231028：Xiao
if(this.figureChartOption.series[1].data) {
this.figureChartOption.series[1].data = []
}
this.figureChartOption.series[1].markPoint.data.push({ xAxis: channel, yAxis: energy })
const { min, max } = this.getFigureChartMaxAndMin()
@ -593,6 +599,18 @@ export default {
this.isInverse = true
},
// 输入框发生变化
newCalibrationFuncModelChange(val,a) {
// 输入内容的时候 需要清空table数据 20231028：Xiao
this.list = []
// 需要清空chart黄色的线 20231028：Xiao
if(this.figureChartOption.series[1].data) {
this.figureChartOption.series[1].data = []
}
if(this.figureChartOption.series[1].markPoint.data) {
this.figureChartOption.series[1].markPoint.data = []
}
},
// 删除表格里的单项
handleDel(index) {
@ -634,15 +652,20 @@ export default {
// 点击Fitting按钮执行重新计算
async handleFitting() {
const hasEmpty = Object.entries(this.newCalibrationFuncModel).some(([_, v]) => !v)
if (hasEmpty) {
if (hasEmpty && this.list.length < 3) {
return
}
try {
const { success, result, message } = await postAction('/spectrumAnalysis/fitting', {
...this.newCalibrationFuncModel,
tempPoints: this.isFirstFitting
? this.oldScatterSeries
: this.list.map((item) => ({ x: item.channel, y: item.energy })),
// 修改逻辑，如果列表中有数据 以列表的数据优先进行分析 20231028：Xiao
tempPoints: this.list.length > 0
? this.list.map((item) => ({ x: item.channel, y: item.energy }))
: this.oldScatterSeries,
// tempPoints: this.isFirstFitting
// ? this.oldScatterSeries
// : this.list.map((item) => ({ x: item.channel, y: item.energy })),
count: this.isFirstFitting || !this.isInverse ? undefined : this.count,
})
if (success) {