Accept
@@ -474,6 +474,7 @@ export default {
isFitting: false, // 正在进行Fit操作
firstFittingChannel: null, // Fit操作时点击的第一个channel
isAccepting: false,
+ isReploting: false,
operationStack: [] // 操作记录
}
@@ -529,7 +530,6 @@ export default {
this.setChartOption(channelBaseLineChart, channelCountChart, channelPeakChart, channelBaseCPChart, barChart)
this.list = table
-
} else {
this.$message.error(message)
}
@@ -787,7 +787,13 @@ export default {
this.channelBaseLineChart = channelBaseLineChart
this.barChart = barChart
- this.setChartOption(channelBaseLineChart, this.channelCountChart, channelPeakChart, this.channelBaseCPChart, barChart)
+ this.setChartOption(
+ channelBaseLineChart,
+ this.channelCountChart,
+ channelPeakChart,
+ this.channelBaseCPChart,
+ barChart
+ )
this.list = table
},
@@ -796,7 +802,13 @@ export default {
const { channelPeakChart, table } = result
this.channelPeakChart = channelPeakChart
- this.setChartOption(this.channelBaseLineChart, this.channelCountChart, channelPeakChart, this.channelBaseCPChart, this.barChart)
+ this.setChartOption(
+ this.channelBaseLineChart,
+ this.channelCountChart,
+ channelPeakChart,
+ this.channelBaseCPChart,
+ this.barChart
+ )
this.list = table
},
@@ -1035,7 +1047,10 @@ export default {
else {
this.btnGroupType = 1
this.opts.notMerge = true
- this.option.series.splice(this.option.series.length - 1, 1) // 去掉白色的基线副本
+ const baseLineEditSeries = findSeriesByName(this.option.series, 'BaseLine_Edit')
+ const index = this.option.series.findIndex(item => item == baseLineEditSeries)
+ this.option.series.splice(index, 1)
+
this.clearRect()
const baseLineSeries = findSeriesByName(this.option.series, 'BaseLine')
@@ -1044,6 +1059,8 @@ export default {
const baseLineCP = findSeriesByName(this.option.series, 'BaseLine_Ctrl_Point')
baseLineCP.data = this.buildCPPointData(this.channelBaseCPChart)
+ this.redrawPeaks(this.channelPeakChart)
+
this.$nextTick(() => {
this.resetChartOpts()
})
@@ -1098,6 +1115,14 @@ export default {
}
},
+ // 重绘Peaks
+ redrawPeaks(peakList) {
+ this.option.series = this.option.series.filter((item) => {
+ return !item.name.includes('Peak_')
+ })
+ this.option.series.push(...this.buildPeaks(peakList))
+ },
+
/**
* 设置小方块可拖拽
*/
@@ -1231,26 +1256,53 @@ export default {
},
// 将原先的基线和控制点移动到新位置
- handleReplot() {
- const { xctrl, yctrl, yslope, baseline } = this.baseCtrls_Copy
- const baseLineSeries = findSeriesByName(this.option.series, 'BaseLine')
- baseLineSeries.data = baseline.map((val, index) => [index + 1, val])
+ async handleReplot() {
+ try {
+ const { inputFileName: fileName } = this.sampleData
+ this.isReploting = true
+ const { success, result, message } = await postAction('/gamma/replotBaseLine', {
+ ...this.baseCtrls_Copy,
+ fileName,
+ replotNeeded: true
+ })
+ if (success) {
+ const { chartData, peakSet, shapeData } = result
- const baseLineCP = findSeriesByName(this.option.series, 'BaseLine_Ctrl_Point')
- // 第一个控制点（因为第一个和最后一个不会被删除）
- const firstCP = this.channelBaseCPChart[0]
- const { color, size } = firstCP
- const baseCPPoints = xctrl.map((xAxis, index) => {
- return {
- size,
- color,
- point: {
- x: xAxis,
- y: yctrl[index]
- }
+ const { xctrl, yctrl, yslope, baseline } = this.baseCtrls_Copy
+ const baseLineSeries = findSeriesByName(this.option.series, 'BaseLine')
+ baseLineSeries.data = baseline.map((val, index) => [index + 1, val])
+
+ const baseLineCP = findSeriesByName(this.option.series, 'BaseLine_Ctrl_Point')
+ // 第一个控制点（因为第一个和最后一个不会被删除）
+ const firstCP = this.channelBaseCPChart[0]
+ const { color, size } = firstCP
+ const baseCPPoints = xctrl.map((xAxis, index) => {
+ return {
+ size,
+ color,
+ point: {
+ x: xAxis,
+ y: yctrl[index]
+ }
+ }
+ })
+ baseLineCP.data = this.buildCPPointData(baseCPPoints)
+
+ this.opts.notMerge = true
+ this.redrawPeaks(peakSet)
+ this.$nextTick(() => {
+ this.resetChartOpts()
+ })
+
+ this.BaseCtrls = cloneDeep(this.baseCtrls_Copy)
+ } else {
+ this.$message.error(message)
}
- })
- baseLineCP.data = this.buildCPPointData(baseCPPoints)
+ } catch (error) {
+ console.error(error)
+ } finally {
+ this.isReploting = false
+ }
},
/**
@@ -1272,8 +1324,8 @@ export default {
// 确定对Baseline Control Points 的操作
async handleAccept() {
- this.BaseCtrls = cloneDeep(this.baseCtrls_Copy)
- const { baseline, xctrl, yctrl } = this.BaseCtrls
+ // this.BaseCtrls = cloneDeep(this.baseCtrls_Copy)
+ // const { baseline, xctrl, yctrl } = this.BaseCtrls
// this.channelBaseLineChart.pointlist = baseline.map((val, index) => {
// return {
// x: index + 1,
@@ -1298,10 +1350,12 @@ export default {
try {
this.isAccepting = true
const { success, result, message } = await postAction('/gamma/acceptBaseLine', {
- ...this.BaseCtrls,
+ ...this.baseCtrls_Copy,
fileName
})
if (success) {
+ this.BaseCtrls = cloneDeep(this.baseCtrls_Copy)
+
const {
allData,
barChart,
diff --git a/src/views/spectrumAnalysis/components/Modals/FtransltModal/components/CanberraIECImsTransfer.vue b/src/views/spectrumAnalysis/components/Modals/FtransltModal/components/CanberraIECImsTransfer.vue
index 7b50ba3..26c9c6f 100644
--- a/src/views/spectrumAnalysis/components/Modals/FtransltModal/components/CanberraIECImsTransfer.vue
+++ b/src/views/spectrumAnalysis/components/Modals/FtransltModal/components/CanberraIECImsTransfer.vue
@@ -3,23 +3,31 @@
-
+
-
+
-
+
-
+
-
- Total air volume sampled
-
-
+
Total air volume sampled
+
@@ -30,58 +38,63 @@
Designator
-
-
- Save All
-
+
Save All
Save as Txt
Save as Excel
- Save as Html
+
@@ -25,13 +23,13 @@ export default {
components: { TitleOverBorder },
props: {
value: {
- type: Boolean
- }
+ type: Boolean,
+ },
},
data() {
return {
saveAll: false,
- saveFormat: 'txt'
+ saveFormat: 'txt',
}
},
methods: {
@@ -42,7 +40,7 @@ export default {
handleOk() {
this.$emit('save', this.saveFormat)
- }
+ },
},
computed: {
visible: {
@@ -55,9 +53,9 @@ export default {
}
return this.value
- }
- }
- }
+ },
+ },
+ },
}
diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue
index 8076147..b423f07 100644
--- a/src/views/spectrumAnalysis/gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/gamma-analysis.vue
@@ -1193,7 +1193,6 @@ export default {
this.channelData.baseLineCP = shapeChannelData
this.energyData.baseLineCP = shapeEnergyData
this.redrawCtrlPointBySeriesName()
-
},
// 显示比较弹窗
@@ -1475,7 +1474,6 @@ export default {
watch: {
currStep: {
handler(val) {
- console.log('dfad', val)
if (val && val == '0') {
this.abc = true
this.reprocessingModalVisible = true
@@ -1496,7 +1494,6 @@ export default {
},
updateFlag: {
handler(val) {
- console.log('dfad', val)
this.newCheckBox_updateCal = val
},
immediate: true,
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index 17e0fa0..e0a0afa 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -481,30 +481,39 @@ export default {
// 保存结果到文件， 服务端生成文件，前端下载
async handleSaveResultsToFile(saveFormat) {
- const url =
- saveFormat == 'xls'
- ? '/spectrumAnalysis/saveToExcel'
- : saveFormat == 'txt'
- ? '/spectrumAnalysis/saveToTxt'
- : saveFormat == 'html'
- ? '/spectrumAnalysis/saveToHTML'
- : ''
- if (!this.resultDisplayFlag) {
- this.$message.warn('Please Analyse Spectrum First')
- return
+ if (this.isGamma) {
+ const url = saveFormat == 'xls' ? '/gamma/saveToExcel' : saveFormat == 'txt' ? '/gamma/saveToTxt' : ''
+ let params = {
+ fileName: this.newSampleData.inputFileName,
+ }
+ downloadFile(url, `result.${saveFormat}`, params, 'get')
}
+ if (this.isBetaGamma) {
+ const url =
+ saveFormat == 'xls'
+ ? '/spectrumAnalysis/saveToExcel'
+ : saveFormat == 'txt'
+ ? '/spectrumAnalysis/saveToTxt'
+ : saveFormat == 'html'
+ ? '/spectrumAnalysis/saveToHTML'
+ : ''
+ if (!this.resultDisplayFlag) {
+ this.$message.warn('Please Analyse Spectrum First')
+ return
+ }
- this.resultDisplayFlag.forEach((item) => {
- this.params_toDB[`${item.nuclideName.toLowerCase()}Flag`] = item.nidFlag
- })
+ this.resultDisplayFlag.forEach((item) => {
+ this.params_toDB[`${item.nuclideName.toLowerCase()}Flag`] = item.nidFlag
+ })
- this.params_toDB.sampleFileName = this.newSampleData.inputFileName
- this.params_toDB.gasFileName = this.newSampleData.gasFileName
- this.params_toDB.detFileName = this.newSampleData.detFileName
- this.params_toDB.qcFileName = this.newSampleData.qcFileName
- this.params_toDB.dbName = this.newSampleData.dbName
+ this.params_toDB.sampleFileName = this.newSampleData.inputFileName
+ this.params_toDB.gasFileName = this.newSampleData.gasFileName
+ this.params_toDB.detFileName = this.newSampleData.detFileName
+ this.params_toDB.qcFileName = this.newSampleData.qcFileName
+ this.params_toDB.dbName = this.newSampleData.dbName
- downloadFile(url, `result.${saveFormat}`, this.params_toDB, 'post')
+ downloadFile(url, `result.${saveFormat}`, this.params_toDB, 'post')
+ }
},
/**
@@ -572,6 +581,13 @@ export default {
*/
handleSavePHDToFile(type) {
console.log('%c [ savePHDToFile ]-162', 'font-size:13px; background:pink; color:#bf2c9f;', type)
+ if (this.isGamma) {
+ const url = '/gamma/saveToPHD'
+ let params = {
+ fileName: this.newSampleData.inputFileName,
+ }
+ downloadFile(url, `result.PHD`, params, 'get')
+ }
},
handleReprocessAll() {
@@ -718,7 +734,7 @@ export default {
{
type: 'a-menu-item',
title: 'Ftransit',
- show: this.isGamma,
+ show: this.isGamma || this.isBetaGamma,
handler: () => (this.ftransltModalVisible = true),
},
{
@@ -797,6 +813,7 @@ export default {
},
on: {
menuClick: () => {
+ console.log(this.isBetaGamma, this.isGamma)
this.saveSettingModalVisible = true
},
submenuClick: ({ item, child }) => {
@@ -1000,9 +1017,14 @@ export default {
type: 'a-menu-item',
title: 'ARR',
handler: () => {
- this.arrOrRRRModalVisible = true
- this.arrOrRRRModalExtraData = {}
- this.arrOrRRRModalType = 1
+ console.log(this.newSampleData)
+ if (this.newSampleData.sampleId) {
+ this.arrOrRRRModalVisible = true
+ this.arrOrRRRModalExtraData = {}
+ this.arrOrRRRModalType = 1
+ } else {
+ this.$message.warning("The file isn't existed.")
+ }
},
show: this.isGamma,
},
@@ -1117,8 +1139,17 @@ export default {
title: 'Automatic Analysis Log',
show: this.isBetaGamma || this.isGamma,
handler: () => {
- this.autoAnalysisMogModalType = this.isGamma ? 1 : this.isBetaGamma ? 2 : 1
- this.autoAnalysisMogModalVisible = true
+ if (this.isGamma) {
+ if (this.newSampleData.sampleId) {
+ this.autoAnalysisMogModalType = this.isGamma ? 1 : this.isBetaGamma ? 2 : 1
+ this.autoAnalysisMogModalVisible = true
+ } else {
+ this.$message.warning("The file isn't existed.")
+ }
+ } else if (this.isBetaGamma) {
+ this.autoAnalysisMogModalType = this.isGamma ? 1 : this.isBetaGamma ? 2 : 1
+ this.autoAnalysisMogModalVisible = true
+ }
},
},
{