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

Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev

Browse Source
This commit is contained in:
orgin 2023-11-01 08:52:29 +08:00
commit 6f441b3b35
20 changed files with 17656 additions and 592 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/store/modules/sample.js
View File

@ -9,19 +9,26 @@ const sample = {
ADD_SAMPLE_DATA: (state, sampleData) => { ADD_SAMPLE_DATA: (state, sampleData) => {
const find = state.sampleList.find(item => item.inputFileName == sampleData.inputFileName) const find = state.sampleList.find(item => item.inputFileName == sampleData.inputFileName)
if(find) { if (find) {
find.data = sampleData.data find.data = sampleData.data
} else { } else {
state.sampleList.push(sampleData) state.sampleList.push(sampleData)
} }
}, },
UPDATE_SAMPLE_DATA: (state, { inputFileName, key, data }) => {
const find = state.sampleList.find(item => item.inputFileName == inputFileName)
if (find) {
find.data[key] = data
}
},
REMOVE_SAMPLE_DATA: (state, inputFileName) => { REMOVE_SAMPLE_DATA: (state, inputFileName) => {
const findIndex = state.sampleList.findIndex(item => item.inputFileName == inputFileName) const findIndex = state.sampleList.findIndex(item => item.inputFileName == inputFileName)
state.sampleList.splice(findIndex, 1) state.sampleList.splice(findIndex, 1)
}, },
CLEAR_SAMPLE_DATA: () => { CLEAR_SAMPLE_DATA: (state) => {
state.sampleList = [] state.sampleList = []
} }
}, },

57
src/utils/sampleHelper.js Normal file
View File

@ -0,0 +1,57 @@
/**
* 在返回的allData中查找指定的数据
* @param {Array} allData
* @param {*} name
* @param {*} group
*/
export const getLineData = (allData, name, group, isList = false) => {
const arrFunc = isList ? Array.prototype.filter : Array.prototype.find
return arrFunc.call(allData, item => item.name == name && item.group == group) || {}
}
/**
* 转换pointlist类型数据到series的data可用的数据
*/
export const transformPointListData = pointlist => {
if (!pointlist) {
return []
}
return pointlist.map(({ x, y }) => [x, y])
}
// 查找最近的峰(C++相关)
export const findNearPeak = (channel, peakList) => {
let t_bFind = false, // 是否在峰内
i = 0,
peakNum = peakList.length
for (; i < peakNum; ++i) {
const peak = peakList[i]
if (channel >= peak.left && channel <= peak.right) {
// 如果 channel 在峰的左右边界内
if (peak.multiIndex > 0 && channel > peak.peakCentroid) {
// 如果是重峰，且 channel 在重峰的第一个峰的中心道右侧
let j = i
let temp = channel - peak.peakCentroid
while (++j < peakNum && peakList[j].multiIndex == peak.multiIndex) {
if (Math.abs(peakList[j].peakCentroid - channel) < temp) {
// 找出重峰中峰中心道离 channel 最近的峰
temp = Math.abs(peakList[j].peakCentroid - channel)
i = j
}
}
}
// channel 在索引(i)对应的峰内
t_bFind = true
break
} else if (peak.left > channel) {
// channel 不在任何峰内，找离它最近的峰
if (i > 0 && channel - peakList[i - 1].peakCentroid < peak.peakCentroid - channel) i -= 1
break
}
}
if (i >= peakNum) i -= 1
return {
index: i,
find: t_bFind
}
}

16890
src/views/spectrumAnalysis/baseCtrlJson.json Normal file
View File

File diff suppressed because it is too large Load Diff

6
src/views/spectrumAnalysis/beta-gamma-analysis.vue
View File

@ -478,6 +478,12 @@ export default {
handler(newVal, oldVal) { handler(newVal, oldVal) {
// this.currResultDisplay = newVal.XeData // this.currResultDisplay = newVal.XeData
this.resultDisplay = newVal.XeData || [] this.resultDisplay = newVal.XeData || []
this.$store.commit('UPDATE_SAMPLE_DATA', {
inputFileName: this.sample.inputFileName,
key: 'XeData',
data: newVal.XeData
})
}, },
immediate: true, immediate: true,
deep: true, deep: true,

421
src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/index.vue
View File

@ -36,6 +36,7 @@
<span @click="handleChangeMarkLine('next')">&gt;</span> <span @click="handleChangeMarkLine('next')">&gt;</span>
</p> </p>
<custom-table <custom-table
size="small"
:class="list.length ? 'has-data' : ''" :class="list.length ? 'has-data' : ''"
:list="list" :list="list"
:columns="columns" :columns="columns"
@ -215,6 +216,7 @@ import Response from './Response.json'
import { updateBaseLine } from '@/utils/WasmHelper' import { updateBaseLine } from '@/utils/WasmHelper'
import RectList from './components/RectList.vue' import RectList from './components/RectList.vue'
import { isNullOrUndefined } from '@/utils/util' import { isNullOrUndefined } from '@/utils/util'
import { findNearPeak, getLineData, transformPointListData } from '@/utils/sampleHelper'
// 初始配置 // 初始配置
const initialOption = { const initialOption = {
@ -223,7 +225,7 @@ const initialOption = {
left: 40, left: 40,
right: 30, right: 30,
bottom: 30, bottom: 30,
containLabel: true containLabel: true,
}, },
title: { title: {
text: '', text: '',
@ -234,39 +236,39 @@ const initialOption = {
rich: { rich: {
a: { a: {
padding: [0, 20, 0, 0], padding: [0, 20, 0, 0],
fontSize: 16 fontSize: 16,
} },
} },
} },
}, },
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
axisPointer: { axisPointer: {
lineStyle: { lineStyle: {
color: '#3CAEBB', color: '#3CAEBB',
width: 1 width: 1,
} },
}, },
formatter: undefined, formatter: undefined,
className: 'figure-chart-option-tooltip' className: 'figure-chart-option-tooltip',
}, },
xAxis: { xAxis: {
axisLine: { axisLine: {
lineStyle: { lineStyle: {
color: '#ade6ee' color: '#ade6ee',
} },
}, },
splitLine: { splitLine: {
show: false show: false,
}, },
axisLabel: { axisLabel: {
textStyle: { textStyle: {
color: '#ade6ee' color: '#ade6ee',
} },
}, },
min: 1, min: 1,
max: 'dataMax', max: 'dataMax',
animation: false animation: false,
}, },
yAxis: { yAxis: {
type: 'log', type: 'log',
@ -275,31 +277,31 @@ const initialOption = {
nameGap: 40, nameGap: 40,
nameTextStyle: { nameTextStyle: {
color: '#8FD4F8', color: '#8FD4F8',
fontSize: 16 fontSize: 16,
}, },
axisLine: { axisLine: {
show: true, show: true,
lineStyle: { lineStyle: {
color: '#ade6ee' color: '#ade6ee',
} },
}, },
splitLine: { splitLine: {
show: true, show: true,
lineStyle: { lineStyle: {
color: 'rgba(173, 230, 238, .2)' color: 'rgba(173, 230, 238, .2)',
} },
}, },
axisLabel: { axisLabel: {
textStyle: { textStyle: {
color: '#ade6ee' color: '#ade6ee',
} },
}, },
min: 0.1, min: 0.1,
max: 'dataMax', max: 'dataMax',
animation: false animation: false,
}, },
series: [], series: [],
brush: {} brush: {},
} }
const columns = [ const columns = [
@ -308,61 +310,62 @@ const columns = [
customRender: (_, __, index) => { customRender: (_, __, index) => {
return index + 1 return index + 1
}, },
width: 60 width: 60,
}, },
{ {
title: 'Energy (keV)', title: 'Energy (keV)',
dataIndex: 'energy', dataIndex: 'energy',
width: 120, width: 120,
customRender: text => { customRender: (text) => {
return text.toFixed(3) return text.toFixed(3)
} },
}, },
{ {
title: 'Centroid (C)', title: 'Centroid (C)',
dataIndex: 'peakCentroid', dataIndex: 'peakCentroid',
width: 120, width: 120,
customRender: text => { customRender: (text) => {
return text.toFixed(3) return text.toFixed(3)
} },
}, },
{ {
title: 'FWHM (keV)', title: 'FWHM (keV)',
dataIndex: 'fwhm', dataIndex: 'fwhm',
width: 120, width: 120,
customRender: text => { customRender: (text) => {
return text.toFixed(3) return text.toFixed(3)
} },
}, },
{ {
title: 'Area', title: 'Area',
dataIndex: 'area', dataIndex: 'area',
width: 120, width: 120,
customRender: text => { customRender: (text) => {
return text.toFixed(3) return text.toFixed(3)
} },
}, },
{ {
title: 'Detectability', title: 'Detectability',
dataIndex: 'significance', dataIndex: 'significance',
width: 120, width: 120,
customRender: text => { customRender: (text) => {
return text.toFixed(3) return text.toFixed(3)
} },
}, },
{ {
title: '#Cmnt', title: '#Cmnt',
dataIndex: 'comments', dataIndex: 'comments',
width: 120 width: 120,
}, },
{ {
title: 'Nuclides', title: 'Nuclides',
dataIndex: 'nuclides', dataIndex: 'nuclides',
width: 120, width: 120,
customRender: text => { ellipsis: true,
customRender: (text) => {
return text && text.join(';') return text && text.join(';')
} },
} },
] ]
// 缩略图配置 // 缩略图配置
@ -371,43 +374,43 @@ const thumbnailOption = {
top: 0, top: 0,
left: 5, left: 5,
right: 5, right: 5,
bottom: 0 bottom: 0,
}, },
xAxis: { xAxis: {
type: 'category', type: 'category',
axisLine: { axisLine: {
show: false show: false,
}, },
splitLine: { splitLine: {
show: false show: false,
}, },
axisLabel: { axisLabel: {
show: false show: false,
}, },
min: 1, min: 1,
max: 'dataMax' max: 'dataMax',
}, },
yAxis: { yAxis: {
type: 'value', type: 'value',
axisLine: { axisLine: {
show: false show: false,
}, },
splitLine: { splitLine: {
show: false show: false,
}, },
axisLabel: { axisLabel: {
show: false show: false,
}, },
min: 0.1, min: 0.1,
max: 'dataMax' max: 'dataMax',
}, },
series: null series: null,
} }
const nuclideIdentifyModal = { const nuclideIdentifyModal = {
possibleNuclide: '', possibleNuclide: '',
tolerance: 0.5, tolerance: 0.5,
identifiedNuclide: '' identifiedNuclide: '',
} }
// 操作类型 // 操作类型
@ -415,7 +418,7 @@ const Operators = {
ADD: 1, // 新增 ADD: 1, // 新增
REMOVE: 2, // 移除 REMOVE: 2, // 移除
MODIFY: 3, // 改变 MODIFY: 3, // 改变
SLOPE_CHANGE: 4 // 改变slope SLOPE_CHANGE: 4, // 改变slope
} }
export default { export default {
@ -428,7 +431,13 @@ export default {
NuclideReviewModal, NuclideReviewModal,
GeneralCommentModal, GeneralCommentModal,
EditSlopeModal, EditSlopeModal,
RectList RectList,
},
props: {
colorConfig: {
type: Object,
default: () => ({}),
},
}, },
data() { data() {
this.columns = columns this.columns = columns
@ -447,7 +456,6 @@ export default {
list: [], list: [],
BaseCtrls: {}, BaseCtrls: {},
baseCtrls_Copy: {}, baseCtrls_Copy: {},
FitBaseLine: '#fff',
sampleId: -1, sampleId: -1,
peakCommentModalVisible: false, // Comment 弹窗是否显示 peakCommentModalVisible: false, // Comment 弹窗是否显示
@ -477,66 +485,46 @@ export default {
isReploting: false, isReploting: false,
operationStack: [], // 操作记录 operationStack: [], // 操作记录
replotNeeded: false replotNeeded: false,
} }
}, },
created() { created() {
this.option.tooltip.formatter = params => { this.option.tooltip.formatter = (params) => {
const channel = parseInt(params[0].value[0]) const channel = parseInt(params[0].value[0])
const energy = this.energy[channel - 1] const energy = this.energy.pointlist ? this.energy.pointlist[channel - 1].x : 0
return `<div class="channel">Channel: ${channel}</div> return `<div class="channel">Channel: ${channel}</div>
<div class="energy">${isNullOrUndefined(energy) ? '' : `Energy: ${energy.toFixed(2)}`}</div>` <div class="energy">${isNullOrUndefined(energy) ? '' : `Energy: ${energy.toFixed(2)}`}</div>`
} }
}, },
methods: { methods: {
async getInfo() { async getInfo() {
try { this.option.series = []
this.isLoading = true this.thumbnailOption.series = []
this.option.series = [] this.list = []
this.thumbnailOption.series = [] this.model = cloneDeep(nuclideIdentifyModal)
this.list = []
this.model = cloneDeep(nuclideIdentifyModal)
const { success, result, message } = await getAction('/gamma/InteractiveTool', { const { inputFileName } = this.sampleData
sampleId: this.sampleId,
fileName: this.fileName
})
// const { success, result, message } = cloneDeep(Response) const currSampleDetailInfo = await this.$store.dispatch('GET_SAMPLE_DATA', inputFileName)
const {
data: { allData, shadowChannelChart, shapeChannelData, peak, BaseCtrls },
} = currSampleDetailInfo
if (success) { const channelBaseLine = getLineData(allData, 'BaseLine', 'channel')
this.isLoading = false const channelPeakGroup = getLineData(allData, 'Peak', 'channel', true)
const {
barChart,
channelBaseCPChart,
channelBaseLineChart,
channelCountChart,
channelPeakChart,
energy,
table,
BaseCtrls,
FitBaseLine
} = result
console.log('%c [ ]-374', 'font-size:13px; background:pink; color:#bf2c9f;', result) const allEnergy = getLineData(allData, 'Energy', 'energy')
this.channelBaseCPChart = channelBaseCPChart this.channelBaseCPChart = shapeChannelData
this.channelBaseLineChart = channelBaseLineChart this.channelBaseLineChart = channelBaseLine
this.channelCountChart = channelCountChart this.channelCountChart = shadowChannelChart
this.channelPeakChart = channelPeakChart this.channelPeakChart = channelPeakGroup
this.energy = energy this.energy = allEnergy
this.BaseCtrls = BaseCtrls this.BaseCtrls = BaseCtrls
this.FitBaseLine = FitBaseLine this.barChart = shadowChannelChart
this.barChart = barChart
this.setChartOption(channelBaseLineChart, channelCountChart, channelPeakChart, channelBaseCPChart, barChart) this.setChartOption(channelBaseLine, shadowChannelChart, channelPeakGroup, shapeChannelData, shadowChannelChart)
this.list = table this.list = peak
} else {
this.$message.error(message)
}
} catch (error) {
console.error(error)
}
}, },
setChartOption(baseLine, count, peaks, baseCP, bar) { setChartOption(baseLine, count, peaks, baseCP, bar) {
@ -554,7 +542,7 @@ export default {
// 推入基线控制点 // 推入基线控制点
series.push(this.buildCtrlPoint(baseCP)) series.push(this.buildCtrlPoint(baseCP))
this.thumbnailOption.series = this.buildBarChart(bar) // this.thumbnailOption.series = this.buildBarChart(bar)
this.option.series = series this.option.series = series
}, },
@ -573,10 +561,6 @@ export default {
}, },
beforeModalOpen() { beforeModalOpen() {
const { sampleId, inputFileName } = this.sampleData
this.sampleId = sampleId
this.fileName = inputFileName
this.getInfo() this.getInfo()
this.reset() this.reset()
}, },
@ -586,36 +570,15 @@ export default {
const { offsetX, offsetY } = param const { offsetX, offsetY } = param
const point = getXAxisAndYAxisByPosition(this.$refs.chartRef.getChartInstance(), offsetX, offsetY) const point = getXAxisAndYAxisByPosition(this.$refs.chartRef.getChartInstance(), offsetX, offsetY)
if (point) { if (point) {
const xAxis = parseInt(point[0].toFixed()) const xAxis = Math.round(point[0])
this.option.series[0].markLine.data[0].xAxis = xAxis this.setMarkLineXAxis(xAxis)
this.currChannel = xAxis this.currChannel = xAxis
const { index } = findNearPeak(xAxis, this.list)
// 获取每一段 Channel 中的最大值
const maxXAxises = this.getPeakMaxValues()
let index = 0
// 计算当前选中的xAxis跟哪条 peak的最大值 最近
if (xAxis >= maxXAxises[maxXAxises.length - 1]) {
index = maxXAxises.length - 1
} else if (xAxis <= maxXAxises[0]) {
index = 0
} else {
for (let i = 1; i < maxXAxises.length; i++) {
const prev = maxXAxises[i - 1]
const curr = maxXAxises[i]
if (xAxis >= prev && xAxis <= curr) {
index = xAxis - prev < curr - xAxis ? i - 1 : i
break
}
continue
}
}
if (this.list.length) { if (this.list.length) {
const selectedRow = this.list[index] const selectedRow = this.list[index]
this.selectedKeys = [selectedRow.index] this.selectTableRow(selectedRow.index)
this.getSelPosNuclide(selectedRow) this.getSelPosNuclide(selectedRow)
this.selectedTableItem = selectedRow this.selectedTableItem = selectedRow
} }
@ -640,7 +603,7 @@ export default {
left = channel left = channel
} }
const peaksBetweenChannel = this.list.filter(peak => { const peaksBetweenChannel = this.list.filter((peak) => {
const centroidId = peak.peakCentroid const centroidId = peak.peakCentroid
return centroidId >= left && centroidId <= right return centroidId >= left && centroidId <= right
}) })
@ -665,36 +628,63 @@ export default {
// 切换图表上的红色竖线及表格选中 // 切换图表上的红色竖线及表格选中
handleChangeMarkLine(direction) { handleChangeMarkLine(direction) {
const markLineOption = this.option.series[0].markLine.data[0] const prevAxis = this.getMarkLineXAxis()
const prevAxis = markLineOption.xAxis let i,
size = this.list.length
// 获取每一段 Channel 中的最大值
const maxXAxises = this.getPeakMaxValues()
if (direction == 'next') { if (direction == 'next') {
// 找到第一个比prevAxis大的xAxis for (i = 0; i < size; i++) {
const find = maxXAxises.find(xAxis => xAxis > prevAxis) const centroid = Math.round(this.list[i].peakCentroid)
if (find) { if (centroid > prevAxis) {
markLineOption.xAxis = find this.setMarkLineXAxis(centroid)
const selectedRow = this.list[i]
this.selectedTableItem = selectedRow
this.selectTableRow(selectedRow.index)
this.getSelPosNuclide(selectedRow)
return
}
} }
} else if (direction == 'prev') { } else if (direction == 'prev') {
// 找到第一个比prevAxis小的xAxis for (i = size - 1; i >= 0; i--) {
const find = cloneDeep(maxXAxises) if (Math.round(this.list[i].peakCentroid) < prevAxis) {
.reverse() this.setMarkLineXAxis(Math.round(this.list[i].peakCentroid))
.find(xAxis => xAxis < prevAxis) const selectedRow = this.list[i]
if (find) { this.selectedTableItem = selectedRow
markLineOption.xAxis = find this.selectTableRow(selectedRow.index)
this.getSelPosNuclide(selectedRow)
return
}
} }
} }
},
const xAxis = markLineOption.xAxis selectTableRow(key) {
if (xAxis >= 0) { this.selectedKeys = [key]
const index = maxXAxises.findIndex(item => item == xAxis) },
if (index !== -1) {
this.selectedKeys = [this.list[index].index] // 设置红色标记线的位置
} setMarkLineXAxis(xAxis) {
const markLineOption = this.option.series[0].markLine.data[0]
markLineOption.xAxis = xAxis
const { xAxis: chartXAxisOption } = this.option
const { max, min } = chartXAxisOption
// 如果不在范围内
if (xAxis >= max || xAxis <= min) {
const halfDiff = (max - min) / 2
const lastChannel = this.channelCountChart.pointlist[this.channelCountChart.pointlist.length - 1].x
let nextMax = xAxis + halfDiff
let nextMin = xAxis - halfDiff
chartXAxisOption.max = nextMax > lastChannel ? lastChannel : nextMax
chartXAxisOption.min = nextMin < 1 ? 1 : nextMin
} }
}, },
getMarkLineXAxis() {
const markLineOption = this.option.series[0].markLine.data[0]
return markLineOption.xAxis
},
// 获取右下角possible nuclide 和 identified nuclide // 获取右下角possible nuclide 和 identified nuclide
async getSelPosNuclide(row) { async getSelPosNuclide(row) {
this.model.possibleNuclide = '' this.model.possibleNuclide = ''
@ -703,10 +693,11 @@ export default {
if (!row._possible) { if (!row._possible) {
this.$set(row, '_loading', true) this.$set(row, '_loading', true)
try { try {
const { sampleId, inputFileName: fileName } = this.sampleData
const { success, result, message } = await getAction('/gamma/getSelPosNuclide', { const { success, result, message } = await getAction('/gamma/getSelPosNuclide', {
sampleId: this.sampleId, sampleId,
channel: parseInt(row.peakCentroid), channel: Math.round(row.peakCentroid),
fileName: this.fileName fileName,
}) })
if (success) { if (success) {
const { possible } = result const { possible } = result
@ -724,9 +715,9 @@ export default {
// 获取每一段 Channel 中的最大值 // 获取每一段 Channel 中的最大值
getPeakMaxValues() { getPeakMaxValues() {
const maxXAxises = this.channelPeakChart.map(item => { const maxXAxises = this.channelPeakChart.map((item) => {
const allY = item.pointlist.map(point => point.y) const allY = item.pointlist.map((point) => point.y)
const max = item.pointlist.find(point => point.y == Math.max(...allY)) const max = item.pointlist.find((point) => point.y == Math.max(...allY))
return max.x return max.x
}) })
return maxXAxises return maxXAxises
@ -772,7 +763,7 @@ export default {
shadowEnergyChart, shadowEnergyChart,
shapeChannelData, shapeChannelData,
shapeEnergyData, shapeEnergyData,
table table,
} = result } = result
this.$bus.$emit('gammaRefresh', { this.$bus.$emit('gammaRefresh', {
@ -781,7 +772,8 @@ export default {
shadowChannelChart, shadowChannelChart,
shadowEnergyChart, shadowEnergyChart,
shapeChannelData, shapeChannelData,
shapeEnergyData shapeEnergyData,
peak: table,
}) })
this.channelPeakChart = channelPeakChart this.channelPeakChart = channelPeakChart
@ -828,8 +820,8 @@ export default {
content: 'Are you sure to delete this peak?', content: 'Are you sure to delete this peak?',
cancelButtonProps: { cancelButtonProps: {
props: { props: {
type: 'warn' type: 'warn',
} },
}, },
onOk: async () => { onOk: async () => {
// this.list.splice(findIndex, 1) // this.list.splice(findIndex, 1)
@ -850,7 +842,7 @@ export default {
const { inputFileName: fileName } = this.sampleData const { inputFileName: fileName } = this.sampleData
const { success, result, message } = await getAction('/gamma/deletePeak', { const { success, result, message } = await getAction('/gamma/deletePeak', {
fileName, fileName,
curRow: this.curRow curRow: this.curRow,
}) })
if (success) { if (success) {
const { const {
@ -860,7 +852,7 @@ export default {
shadowEnergyChart, shadowEnergyChart,
shapeChannelData, shapeChannelData,
shapeEnergyData, shapeEnergyData,
table table,
} = result } = result
this.$bus.$emit('gammaRefresh', { this.$bus.$emit('gammaRefresh', {
@ -869,7 +861,8 @@ export default {
shadowChannelChart, shadowChannelChart,
shadowEnergyChart, shadowEnergyChart,
shapeChannelData, shapeChannelData,
shapeEnergyData shapeEnergyData,
peak: table,
}) })
this.channelPeakChart = channelPeakChart this.channelPeakChart = channelPeakChart
@ -887,7 +880,10 @@ export default {
series.push(this.buildCtrlPoint(this.channelBaseCPChart)) series.push(this.buildCtrlPoint(this.channelBaseCPChart))
this.list = table this.list = table
this.opts.notMerge = true
this.option.series = series this.option.series = series
this.resetChartOpts()
this.selectedKeys = [] this.selectedKeys = []
} else { } else {
@ -896,7 +892,7 @@ export default {
} catch (error) { } catch (error) {
console.error(error) console.error(error)
} }
} },
}) })
}, },
@ -923,11 +919,24 @@ export default {
return return
} }
const channel = row.peakCentroid const channel = Math.round(row.peakCentroid)
this.currChannel = channel this.currChannel = channel
this.option.series[0].markLine.data[0].xAxis = channel this.option.series[0].markLine.data[0].xAxis = channel
const { xAxis: chartXAxisOption } = this.option
const { max, min } = chartXAxisOption
// 如果不在范围内
if (channel >= max || channel <= min) {
const halfDiff = (max - min) / 2
const lastChannel = this.channelCountChart.pointlist[this.channelCountChart.pointlist.length - 1].x
let nextMax = channel + halfDiff
let nextMin = channel - halfDiff
chartXAxisOption.max = nextMax > lastChannel ? lastChannel : nextMax
chartXAxisOption.min = nextMin < 1 ? 1 : nextMin
}
this.getSelPosNuclide(row) this.getSelPosNuclide(row)
this.selectedTableItem = row this.selectedTableItem = row
@ -946,8 +955,8 @@ export default {
key: 'brush', key: 'brush',
brushOption: { brushOption: {
// 参见 brush 组件的 brushType。如果设置为 false 则关闭“可刷选状态”。 // 参见 brush 组件的 brushType。如果设置为 false 则关闭“可刷选状态”。
brushType: 'rect' brushType: 'rect',
} },
}) })
}, },
@ -962,12 +971,12 @@ export default {
// 清理刷选的范围 // 清理刷选的范围
chart.dispatchAction({ chart.dispatchAction({
type: 'brush', type: 'brush',
areas: [] areas: [],
}) })
// 改为不可刷选状态 // 改为不可刷选状态
chart.dispatchAction({ chart.dispatchAction({
type: 'takeGlobalCursor' type: 'takeGlobalCursor',
}) })
}, },
@ -978,8 +987,8 @@ export default {
if (areas) { if (areas) {
const range = areas.range const range = areas.range
const [[minX, maxX], [minY, maxY]] = range const [[minX, maxX], [minY, maxY]] = range
const point1 = chart.convertFromPixel({ seriesIndex: 0 }, [minX, minY]).map(num => parseInt(num.toFixed())) const point1 = chart.convertFromPixel({ seriesIndex: 0 }, [minX, minY]).map((num) => parseInt(num.toFixed()))
const point2 = chart.convertFromPixel({ seriesIndex: 0 }, [maxX, maxY]).map(num => parseInt(num.toFixed())) const point2 = chart.convertFromPixel({ seriesIndex: 0 }, [maxX, maxY]).map((num) => parseInt(num.toFixed()))
const xAxisMax = chart.getModel().getComponent('xAxis').axis.scale._extent[1] const xAxisMax = chart.getModel().getComponent('xAxis').axis.scale._extent[1]
const yAxisMax = this.option.yAxis.max const yAxisMax = this.option.yAxis.max
let [x1, y2, x2, y1] = [...point1, ...point2] // 根据解析出的数据确定真实的范围 let [x1, y2, x2, y1] = [...point1, ...point2] // 根据解析出的数据确定真实的范围
@ -1034,9 +1043,9 @@ export default {
const baseLineEditSeries = buildLineSeries( const baseLineEditSeries = buildLineSeries(
'BaseLine_Edit', 'BaseLine_Edit',
this.baseCtrls_Copy.baseline.map((val, index) => [index + 1, val]), this.baseCtrls_Copy.baseline.map((val, index) => [index + 1, val]),
this.FitBaseLine, this.colorConfig.Color_Fitbase || '#fff',
{ {
zlevel: 21 zlevel: 21,
} }
) )
this.option.series.push(baseLineEditSeries) this.option.series.push(baseLineEditSeries)
@ -1050,13 +1059,13 @@ export default {
this.btnGroupType = 1 this.btnGroupType = 1
this.opts.notMerge = true this.opts.notMerge = true
const baseLineEditSeries = findSeriesByName(this.option.series, 'BaseLine_Edit') const baseLineEditSeries = findSeriesByName(this.option.series, 'BaseLine_Edit')
const index = this.option.series.findIndex(item => item == baseLineEditSeries) const index = this.option.series.findIndex((item) => item == baseLineEditSeries)
this.option.series.splice(index, 1) this.option.series.splice(index, 1)
this.clearRect() this.clearRect()
const baseLineSeries = findSeriesByName(this.option.series, 'BaseLine') const baseLineSeries = findSeriesByName(this.option.series, 'BaseLine')
baseLineSeries.data = this.channelBaseLineChart.pointlist.map(({ x, y }) => [x, y]) // 恢复基线 baseLineSeries.data = transformPointListData(this.channelBaseLineChart.pointlist) // 恢复基线
const baseLineCP = findSeriesByName(this.option.series, 'BaseLine_Ctrl_Point') const baseLineCP = findSeriesByName(this.option.series, 'BaseLine_Ctrl_Point')
baseLineCP.data = this.buildCPPointData(this.channelBaseCPChart) baseLineCP.data = this.buildCPPointData(this.channelBaseCPChart)
@ -1096,7 +1105,7 @@ export default {
this.isModifying = false this.isModifying = false
this.pushOperationStack(Operators.MODIFY, { this.pushOperationStack(Operators.MODIFY, {
index, index,
prevYAxis prevYAxis,
}) })
}, },
@ -1120,7 +1129,7 @@ export default {
// 重绘Peaks // 重绘Peaks
redrawPeaks(peakList) { redrawPeaks(peakList) {
this.option.series = this.option.series.filter(item => { this.option.series = this.option.series.filter((item) => {
return !item.name.includes('Peak_') return !item.name.includes('Peak_')
}) })
this.option.series.push(...this.buildPeaks(peakList)) this.option.series.push(...this.buildPeaks(peakList))
@ -1196,7 +1205,7 @@ export default {
index: i, index: i,
removeXAxis, removeXAxis,
removeYAxis, removeYAxis,
removeYSlope removeYSlope,
}) })
}, },
@ -1232,7 +1241,7 @@ export default {
this.$refs.editSlopeModal.open({ this.$refs.editSlopeModal.open({
index: i, index: i,
value: yslope[i], value: yslope[i],
allowNaN: !(i == 0 || i == n - 1) allowNaN: !(i == 0 || i == n - 1),
}) })
}, },
@ -1246,7 +1255,7 @@ export default {
yslope[index] = slope yslope[index] = slope
this.pushOperationStack(Operators.SLOPE_CHANGE, { this.pushOperationStack(Operators.SLOPE_CHANGE, {
index, index,
slope: prevSlope slope: prevSlope,
}) })
this.redrawBaseLine() this.redrawBaseLine()
this.buildRect() this.buildRect()
@ -1269,7 +1278,7 @@ export default {
const { success, result, message } = await postAction('/gamma/replotBaseLine', { const { success, result, message } = await postAction('/gamma/replotBaseLine', {
...this.baseCtrls_Copy, ...this.baseCtrls_Copy,
fileName, fileName,
replotNeeded: this.replotNeeded replotNeeded: this.replotNeeded,
}) })
if (success) { if (success) {
const { chartData, peakSet, shapeData } = result const { chartData, peakSet, shapeData } = result
@ -1288,8 +1297,8 @@ export default {
color, color,
point: { point: {
x: xAxis, x: xAxis,
y: yctrl[index] y: yctrl[index],
} },
} }
}) })
baseLineCP.data = this.buildCPPointData(baseCPPoints) baseLineCP.data = this.buildCPPointData(baseCPPoints)
@ -1323,8 +1332,8 @@ export default {
itemStyle: { itemStyle: {
color: 'transparent', color: 'transparent',
borderColor: color, borderColor: color,
borderWidth: size / 2 borderWidth: size / 2,
} },
} }
}) })
}, },
@ -1358,7 +1367,7 @@ export default {
this.isAccepting = true this.isAccepting = true
const { success, result, message } = await postAction('/gamma/acceptBaseLine', { const { success, result, message } = await postAction('/gamma/acceptBaseLine', {
...this.baseCtrls_Copy, ...this.baseCtrls_Copy,
fileName fileName,
}) })
if (success) { if (success) {
this.BaseCtrls = cloneDeep(this.baseCtrls_Copy) this.BaseCtrls = cloneDeep(this.baseCtrls_Copy)
@ -1372,7 +1381,7 @@ export default {
shadowEnergyChart, shadowEnergyChart,
shapeChannelData, shapeChannelData,
shapeData, shapeData,
shapeEnergyData shapeEnergyData,
} = result } = result
this.channelBaseLineChart = channelBaseLineChart this.channelBaseLineChart = channelBaseLineChart
@ -1416,7 +1425,7 @@ export default {
curRow: this.curRow, curRow: this.curRow,
nuclideName: possibleNuclide, nuclideName: possibleNuclide,
fileName, fileName,
list_identify: nuclides list_identify: nuclides,
}) })
if (success) { if (success) {
nuclides.push(possibleNuclide) nuclides.push(possibleNuclide)
@ -1439,7 +1448,7 @@ export default {
if (this.selectedTableItem._deleting) { if (this.selectedTableItem._deleting) {
return return
} }
const findIndex = nuclides.findIndex(nuclide => nuclide == this.model.identifiedNuclide) const findIndex = nuclides.findIndex((nuclide) => nuclide == this.model.identifiedNuclide)
if (-1 !== findIndex) { if (-1 !== findIndex) {
try { try {
this.$set(this.selectedTableItem, '_deleting', true) this.$set(this.selectedTableItem, '_deleting', true)
@ -1448,7 +1457,7 @@ export default {
curRow: this.curRow, curRow: this.curRow,
nuclideName: this.model.identifiedNuclide, nuclideName: this.model.identifiedNuclide,
fileName, fileName,
list_identify: nuclides list_identify: nuclides,
}) })
if (success) { if (success) {
nuclides.splice(findIndex, 1) nuclides.splice(findIndex, 1)
@ -1467,43 +1476,35 @@ export default {
buildBaseLine(channelBaseLineChart) { buildBaseLine(channelBaseLineChart) {
return buildLineSeries( return buildLineSeries(
'BaseLine', 'BaseLine',
channelBaseLineChart.pointlist.map(({ x, y }) => [x, y]), transformPointListData(channelBaseLineChart.pointlist),
channelBaseLineChart.color, channelBaseLineChart.color,
{ {
markLine: { markLine: {
silent: true, silent: true,
symbol: 'none', symbol: 'none',
label: { label: {
show: false show: false,
}, },
lineStyle: { lineStyle: {
color: 'red', color: 'red',
width: 1 width: 1,
}, },
data: [{ xAxis: -1 }] data: [{ xAxis: -1 }],
}, },
zlevel: 10 zlevel: 10,
} }
) )
}, },
// 构建count // 构建count
buildCountLine(channelCountChart) { buildCountLine(channelCountChart) {
return buildLineSeries( return buildLineSeries('CountChart', transformPointListData(channelCountChart.pointlist), channelCountChart.color)
'CountChart',
channelCountChart.pointlist.map(({ x, y }) => [x, y]),
channelCountChart.color
)
}, },
// 构建Peaks // 构建Peaks
buildPeaks(channelPeakChart) { buildPeaks(channelPeakChart) {
return channelPeakChart.map((item, index) => { return channelPeakChart.map((item, index) => {
return buildLineSeries( return buildLineSeries('Peak_' + (index + 1), transformPointListData(item.pointlist), item.color)
'Peak_' + (index + 1),
item.pointlist.map(({ x, y }) => [x, y]),
item.color
)
}) })
}, },
@ -1515,7 +1516,7 @@ export default {
data: this.buildCPPointData(channelBaseCPChart), data: this.buildCPPointData(channelBaseCPChart),
silent: true, silent: true,
animation: false, animation: false,
zlevel: 20 zlevel: 20,
} }
}, },
@ -1526,7 +1527,7 @@ export default {
barChart.map(({ x, y }) => [x, y]), barChart.map(({ x, y }) => [x, y]),
'#fff', '#fff',
{ {
silent: true silent: true,
} }
) )
}, },
@ -1539,7 +1540,7 @@ export default {
pushOperationStack(operator, operand) { pushOperationStack(operator, operand) {
this.operationStack.push({ this.operationStack.push({
operator, operator,
operand operand,
}) })
}, },
@ -1584,19 +1585,19 @@ export default {
*/ */
clearOperationStack() { clearOperationStack() {
this.operationStack = [] this.operationStack = []
} },
}, },
computed: { computed: {
curRow() { curRow() {
const [selectedKey] = this.selectedKeys const [selectedKey] = this.selectedKeys
const findIndex = this.list.findIndex(item => item.index == selectedKey) const findIndex = this.list.findIndex((item) => item.index == selectedKey)
return findIndex return findIndex
}, },
isOperationStackEmpty() { isOperationStackEmpty() {
return this.operationStack.length == 0 return this.operationStack.length == 0
} },
} },
} }
</script> </script>

67
src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BGLogViewer.vue Normal file
View File

@ -0,0 +1,67 @@
<template>
<custom-modal v-model="visible" title="BetaGamma Analyser Log" :width="800">
<a-spin :spinning="isLoading">
<a-textarea class="bg-log-viewer" v-model="content"></a-textarea>
</a-spin>
<div slot="custom-footer">
<a-button type="primary" @click="handleClick">Save As</a-button>
</div>
</custom-modal>
</template>
<script>
import ModalMixin from '@/mixins/ModalMixin'
import { getAction } from '@/api/manage'
import SampleDataMixin from '@/views/spectrumAnalysis/SampleDataMixin'
import { showSaveFileModal } from '@/utils/file'
export default {
mixins: [ModalMixin, SampleDataMixin],
data() {
return {
content: '',
}
},
methods: {
async getDetail() {
try {
this.isLoading = true
const { dbName, sampleId, sampleFileName, gasFileName, detFileName, qcFileName } = this.newSampleData
const { success, result, message } = await getAction('/spectrumAnalysis/viewBGLogViewer', {
dbName,
sampleId,
sampleFileName,
gasFileName,
detFileName,
qcFileName,
})
if (success) {
console.log('%c [ ]-21', 'font-size:13px; background:pink; color:#bf2c9f;', result)
this.content = 'test'
} else {
this.$message.error(message)
}
} catch (error) {
console.error(error)
} finally {
this.isLoading = false
}
},
beforeModalOpen() {
this.getDetail()
},
handleClick() {
const blob = new Blob([this.content], { type: 'text/plain' })
showSaveFileModal(blob, 'txt')
},
},
}
</script>
<style lang="less" scoped>
.bg-log-viewer {
height: 400px;
overflow: auto;
}
</style>

41
src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue
View File

@ -52,6 +52,12 @@ import TitleOverBorder from '@/views/spectrumAnalysis/components/TitleOverBorder
export default { export default {
components: { BetaDetectorCalibration, GammaDetectorCalibration, TitleOverBorder }, components: { BetaDetectorCalibration, GammaDetectorCalibration, TitleOverBorder },
mixins: [ModalMixin, SampleDataMixin], mixins: [ModalMixin, SampleDataMixin],
props: {
sampleList: {
type: Array,
required: true,
},
},
data() { data() {
return { return {
currTab: 'gamma', currTab: 'gamma',
@ -85,6 +91,28 @@ export default {
this.gammaEnergyValid = val this.gammaEnergyValid = val
}, },
handleReAnalyse() { handleReAnalyse() {
const regExp = /^([A-Z]{1,}\d{1,})_/
const regMatched = this.newSampleData.inputFileName.match(regExp)
const currStationName = regMatched[1]
const dbNames = [],
sampleIds = [],
sampleFileNames = [],
gasFileNames = [],
detFileNames = [],
qcFileNames = []
const matchedSampleList = this.sampleList.filter((item) => item.inputFileName.includes(currStationName))
matchedSampleList.forEach(
({ dbName, sampleId, sampleFileName, gasFileName, detFileName, qcFileName, qcFileStatus }) => {
dbNames.push(dbName || '')
sampleIds.push(sampleId || '')
sampleFileNames.push(sampleFileName)
gasFileNames.push(gasFileName)
detFileNames.push(detFileName)
qcFileNames.push(qcFileStatus ? qcFileName : '')
}
)
let params = { let params = {
applyType: this.newCalibrationIsAppliedTo, applyType: this.newCalibrationIsAppliedTo,
sampleData: this.recalculateROICountsFor.includes('sample') ? true : false, sampleData: this.recalculateROICountsFor.includes('sample') ? true : false,
@ -93,13 +121,14 @@ export default {
qcData: this.recalculateROICountsFor.includes('qc') ? true : false, qcData: this.recalculateROICountsFor.includes('qc') ? true : false,
betaEnergyValid: this.betaEnergyValid, betaEnergyValid: this.betaEnergyValid,
gammaEnergyValid: this.gammaEnergyValid, gammaEnergyValid: this.gammaEnergyValid,
dbNames: [this.newSampleData.dbName], dbNames,
sampleIds: [this.newSampleData.sampleId ? this.newSampleData.sampleId : ''], sampleIds,
sampleFileNames: [this.newSampleData.inputFileName], sampleFileNames,
gasFileNames: [this.newSampleData.gasFileName], gasFileNames,
detFileNames: [this.newSampleData.detFileName], detFileNames,
qcFileNames: [this.newSampleData.qcFileName], qcFileNames,
currentFileName: this.newSampleData.inputFileName, currentFileName: this.newSampleData.inputFileName,
currentQCFileName: this.newSampleData.qcFileName,
} }
postAction('/spectrumAnalysis/ReAnalyse', params).then((res) => { postAction('/spectrumAnalysis/ReAnalyse', params).then((res) => {
if (res.success) { if (res.success) {

7
src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaQCResultsModal.vue
View File

@ -30,6 +30,13 @@ const columns = [
title: 'Value', title: 'Value',
dataIndex: 'value', dataIndex: 'value',
align: 'center', align: 'center',
customRender: (text) => {
if (text !== 'Match' && text !== 'UnMatch') {
return parseFloat(Number(text).toPrecision(6))
} else {
return text
}
},
}, },
{ {
title: 'Status', title: 'Status',

5
src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/index.vue
View File

@ -116,11 +116,6 @@ export default {
AdditionalInfo, AdditionalInfo,
Notes, Notes,
}, },
props: {
sampleData: {
type: Object,
},
},
data() { data() {
this.tabs = tabs this.tabs = tabs
return { return {

80
src/views/spectrumAnalysis/components/Modals/ColorConfigModal.vue
View File

@ -24,53 +24,59 @@ const configList = [
{ {
title: 'Spectrum Line', title: 'Spectrum Line',
key: 'Color_Spec', key: 'Color_Spec',
desc: 'Color of the original spectrum line' desc: 'Color of the original spectrum line',
}, },
{ {
title: 'Baseline', title: 'Baseline',
key: 'Color_Base', key: 'Color_Base',
desc: 'Color of baseline' desc: 'Color of baseline',
}, },
{ {
title: 'Lc Line', title: 'Lc Line',
key: 'Color_Lc', key: 'Color_Lc',
desc: 'Color of lc line' desc: 'Color of lc line',
}, },
{ {
title: 'Scac Line', title: 'Scac Line',
key: 'Color_Scac', key: 'Color_Scac',
desc: 'Color of scac line' desc: 'Color of scac line',
}, },
{ {
title: 'Peak Line', title: 'Peak Line',
key: 'Color_Peak', key: 'Color_Peak',
desc: "Color of all peaks' curve" desc: "Color of all peaks' curve",
}, },
{ {
title: 'Compare Line', title: 'Compare Line',
key: 'Color_Compare', key: 'Color_Compare',
desc: 'Color of another spectrum line which is used to compare with current spectrum' desc: 'Color of another spectrum line which is used to compare with current spectrum',
}, },
{ {
title: 'Spec Sum Line', title: 'Spec Sum Line',
key: 'Color_Strip', key: 'Color_Strip',
desc: 'Color of the line which is the sum of current spectrum and other spectrum Multiplied by a ratio' desc: 'Color of the line which is the sum of current spectrum and other spectrum Multiplied by a ratio',
}, },
{ {
title: 'Spec Cut Line', title: 'Spec Cut Line',
key: 'spectCutLine', key: 'spectCutLine',
desc: 'Color of the line which is the difference of current spectrum and other spectrum Multiplied by a ratio' desc: 'Color of the line which is the difference of current spectrum and other spectrum Multiplied by a ratio',
}, },
{ {
title: 'FitBase Line', title: 'FitBase Line',
key: 'Color_Fitbase', key: 'Color_Fitbase',
desc: 'Color of the base line in edit state' desc: 'Color of the base line in edit state',
} },
] ]
export default { export default {
mixins: [ModalMixin], mixins: [ModalMixin],
components: { components: {
ColorPicker ColorPicker,
},
props: {
colorConfig: {
type: Object,
default: () => ({}),
},
}, },
data() { data() {
this.configList = configList this.configList = configList
@ -84,8 +90,8 @@ export default {
Color_Compare: 'green', // Sample -> Compare下的颜色 Color_Compare: 'green', // Sample -> Compare下的颜色
Color_Strip: 'rgb(0, 0, 255)', // Sample -> Compare下的颜色 Color_Strip: 'rgb(0, 0, 255)', // Sample -> Compare下的颜色
spectCutLine: 'rgb(33, 90, 104)', // 无作用 spectCutLine: 'rgb(33, 90, 104)', // 无作用
Color_Fitbase: 'white' // Interactive Tool 弹窗中，进入BaseLine编辑模式时的基线副本的颜色 Color_Fitbase: 'white', // Interactive Tool 弹窗中，进入BaseLine编辑模式时的基线副本的颜色
} },
} }
}, },
methods: { methods: {
@ -93,40 +99,16 @@ export default {
return color return color
}, },
async getData() {
try {
this.isLoading = true
const { success, result, message } = await getAction('/gamma/viewColorConfig')
if (success) {
Object.entries(result).forEach(([k, v]) => {
this.config[k] = v
})
} else {
this.$message.error(message)
}
} catch (error) {
console.error(error)
} finally {
this.isLoading = false
}
},
beforeModalOpen() { beforeModalOpen() {
this.getData() Object.entries(this.colorConfig).forEach(([k, v]) => {
this.config[k] = v
})
}, },
// 应用颜色 // 应用颜色
async handleApply() { async handleApply() {
const { const { Color_Spec, Color_Peak, Color_Lc, Color_Base, Color_Scac, Color_Compare, Color_Strip, Color_Fitbase } =
Color_Spec, this.config
Color_Peak,
Color_Lc,
Color_Base,
Color_Scac,
Color_Compare,
Color_Strip,
Color_Fitbase
} = this.config
const { success, message } = await putAction('/gamma/updateColorConfig', { const { success, message } = await putAction('/gamma/updateColorConfig', {
colorSpec: Color_Spec, colorSpec: Color_Spec,
colorPeak: Color_Peak, colorPeak: Color_Peak,
@ -135,22 +117,16 @@ export default {
colorScac: Color_Scac, colorScac: Color_Scac,
colorCompare: Color_Compare, colorCompare: Color_Compare,
colorFitbase: Color_Fitbase, colorFitbase: Color_Fitbase,
colorStrip: Color_Strip colorStrip: Color_Strip,
}) })
if (success) { if (success) {
this.$bus.$emit( this.$emit('colorChange', this.config)
'colorChange',
Object.entries(this.config).reduce((prev, [key, value]) => {
prev[key] = value
return prev
}, {})
)
} else { } else {
this.$message.error(message) this.$message.error(message)
throw new Error(message) throw new Error(message)
} }
} },
} },
} }
</script> </script>

118
src/views/spectrumAnalysis/components/Modals/EfficiencyCalibrationModal.vue
View File

@ -12,13 +12,13 @@
style: { style: {
width: '70px', width: '70px',
textAlign: 'left', textAlign: 'left',
flexShrink: 0 flexShrink: 0,
} },
}" }"
:wrapperCol="{ :wrapperCol="{
style: { style: {
flex: 1 flex: 1,
} },
}" }"
> >
<a-form-model-item label="Energy"> <a-form-model-item label="Energy">
@ -54,13 +54,7 @@
<div> <div>
<label> <label>
<a-button type="primary" :loading="isCalling" @click="handleCall">Call</a-button> <a-button type="primary" :loading="isCalling" @click="handleCall">Call</a-button>
<input <input ref="fileInput" type="file" accept=".ent" style="display: none" @change="handleFileChange" />
ref="fileInput"
type="file"
accept=".ent"
style="display: none;"
@change="handleFileChange"
/>
</label> </label>
<a-button type="primary" :loading="isSaving" @click="handleSave">Save</a-button> <a-button type="primary" :loading="isSaving" @click="handleSave">Save</a-button>
</div> </div>
@ -126,23 +120,23 @@ const columns = [
{ {
title: 'Energy(keV)', title: 'Energy(keV)',
dataIndex: 'energy', dataIndex: 'energy',
customRender: (text) => Number(text).toFixed(3) customRender: (text) => parseFloat(Number(text).toPrecision(6)),
}, },
{ {
title: 'Efficiency', title: 'Efficiency',
dataIndex: 'efficiency', dataIndex: 'efficiency',
customRender: (text) => Number(text).toFixed(3) customRender: (text) => parseFloat(Number(text).toPrecision(6)),
}, },
{ {
title: 'Fit(keV)', title: 'Fit(keV)',
dataIndex: 'fit', dataIndex: 'fit',
customRender: (text) => Number(text).toFixed(3) customRender: (text) => parseFloat(Number(text).toPrecision(6)),
}, },
{ {
title: 'Delta(%)', title: 'Delta(%)',
dataIndex: 'delta', dataIndex: 'delta',
customRender: (text) => Number(text).toFixed(3) customRender: (text) => parseFloat(Number(text).toPrecision(6)),
} },
] ]
const initialOption = { const initialOption = {
@ -150,99 +144,99 @@ const initialOption = {
top: 20, top: 20,
right: 20, right: 20,
bottom: 50, bottom: 50,
left: 70 left: 70,
}, },
title: { title: {
text: 'Channel', text: 'Channel',
textStyle: { textStyle: {
color: '#8FD4F8', color: '#8FD4F8',
fontSize: 14, fontSize: 14,
fontWeight: 'normal' fontWeight: 'normal',
}, },
right: 10, right: 10,
bottom: 0 bottom: 0,
}, },
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
formatter: params => { formatter: (params) => {
const [x, y] = params[0].value const [x, y] = params[0].value
const energy = parseInt(x) const energy = parseInt(x)
const efficiency = y.toFixed(3) const efficiency = y.toFixed(3)
return `<div class="channel">Energy: ${energy}</div> return `<div class="channel">Energy: ${energy}</div>
<div class="energy">Efficiency: ${efficiency}</div>` <div class="energy">Efficiency: ${efficiency}</div>`
}, },
className: 'figure-chart-option-tooltip' className: 'figure-chart-option-tooltip',
}, },
xAxis: { xAxis: {
min: 1, min: 1,
max: 'dataMax', max: 'dataMax',
axisLabel: { axisLabel: {
color: '#fff' color: '#fff',
}, },
axisLine: { axisLine: {
lineStyle: { lineStyle: {
color: '#fff' color: '#fff',
} },
}, },
splitLine: { splitLine: {
show: false show: false,
} },
}, },
yAxis: { yAxis: {
axisLabel: { axisLabel: {
color: '#fff' color: '#fff',
}, },
axisTick: { axisTick: {
show: false show: false,
}, },
axisLine: { axisLine: {
lineStyle: { lineStyle: {
color: '#fff' color: '#fff',
} },
}, },
splitLine: { splitLine: {
show: false show: false,
}, },
name: 'keV', name: 'keV',
nameLocation: 'center', nameLocation: 'center',
nameGap: 50, nameGap: 50,
nameTextStyle: { nameTextStyle: {
color: '#8FD4F8', color: '#8FD4F8',
fontSize: 14 fontSize: 14,
} },
}, },
series: [] series: [],
} }
const functions = [ const functions = [
{ {
label: 'Interpolation', label: 'Interpolation',
value: 1 value: 1,
}, },
{ {
label: 'HT Efficiency', label: 'HT Efficiency',
value: 5 value: 5,
}, },
{ {
label: 'Log Polynomial', label: 'Log Polynomial',
value: 6 value: 6,
}, },
{ {
label: 'Invlog Polynomial', label: 'Invlog Polynomial',
value: 8 value: 8,
}, },
{ {
label: 'HAE Efficiency(1-3)', label: 'HAE Efficiency(1-3)',
value: 93 value: 93,
}, },
{ {
label: 'HAE Efficiency(1-2)', label: 'HAE Efficiency(1-2)',
value: 94 value: 94,
}, },
{ {
label: 'HAE Efficiency(1-2-3)', label: 'HAE Efficiency(1-2-3)',
value: 95 value: 95,
} },
] ]
export default { export default {
@ -266,11 +260,11 @@ export default {
currSelectedDataSource: '', currSelectedDataSource: '',
appliedDataSource: '', appliedDataSource: '',
opts: { opts: {
notMerge: true notMerge: true,
}, },
ECutAnalysis_Low: -1, ECutAnalysis_Low: -1,
G_energy_span: -1, G_energy_span: -1,
funcId: 1 funcId: 1,
} }
}, },
methods: { methods: {
@ -282,7 +276,7 @@ export default {
sampleId, sampleId,
fileName, fileName,
currentText, currentText,
width: 922 width: 922,
}) })
this.isLoading = false this.isLoading = false
if (success) { if (success) {
@ -332,15 +326,15 @@ export default {
value: [x, y], value: [x, y],
itemStyle: { itemStyle: {
color: scatterPoint.color, color: scatterPoint.color,
borderWidth: 0 borderWidth: 0,
} },
} }
}), }),
emphasis: { emphasis: {
disabled: true disabled: true,
}, },
animation: false, animation: false,
zlevel: 20 zlevel: 20,
}) })
this.option.series = series this.option.series = series
} }
@ -390,7 +384,7 @@ export default {
this.list.splice(i, 0, { this.list.splice(i, 0, {
energy: energy, energy: energy,
efficiency efficiency,
}) })
this.uncert.splice(i, 0, 0.5) this.uncert.splice(i, 0, 0.5)
@ -463,12 +457,12 @@ export default {
const { success, result, message } = await postAction('/gamma/changeDataEfficiency', { const { success, result, message } = await postAction('/gamma/changeDataEfficiency', {
sampleId, sampleId,
fileName, fileName,
m_vCurEnergy: this.list.map(item => item.energy), m_vCurEnergy: this.list.map((item) => item.energy),
m_vCurEffi: this.list.map(item => item.efficiency), m_vCurEffi: this.list.map((item) => item.efficiency),
m_vCurUncert: this.uncert, m_vCurUncert: this.uncert,
m_curParam: this.param, m_curParam: this.param,
funcId: this.funcId, funcId: this.funcId,
width: 922 width: 922,
}) })
if (success) { if (success) {
this.handleResult(result) this.handleResult(result)
@ -487,10 +481,10 @@ export default {
try { try {
this.isSaving = true this.isSaving = true
const res = await postAction('/gamma/saveDataEfficiency', { const res = await postAction('/gamma/saveDataEfficiency', {
m_vCurEnergy: this.list.map(item => item.energy), m_vCurEnergy: this.list.map((item) => item.energy),
m_vCurEffi: this.list.map(item => item.efficiency), m_vCurEffi: this.list.map((item) => item.efficiency),
m_vCurUncert: this.uncert, m_vCurUncert: this.uncert,
funcId: this.funcId funcId: this.funcId,
}) })
if (typeof res == 'string') { if (typeof res == 'string') {
const blob = new Blob([res], { type: 'text/plain' }) const blob = new Blob([res], { type: 'text/plain' })
@ -548,18 +542,18 @@ export default {
let curCalName = this.currSelectedDataSource let curCalName = this.currSelectedDataSource
// 如果沒选中以Input开头的，也就是选中了PHD之类的 // 如果沒选中以Input开头的，也就是选中了PHD之类的
if (!curCalName.includes('Input')) { if (!curCalName.includes('Input')) {
curCalName = `Input ${this.dataSourceList.filter(item => item.includes('Input')).length + 1}` curCalName = `Input ${this.dataSourceList.filter((item) => item.includes('Input')).length + 1}`
} }
const { sampleId, inputFileName: fileName } = this.sampleData const { sampleId, inputFileName: fileName } = this.sampleData
const { success, result, message } = await postAction('/gamma/applyDataEfficiency', { const { success, result, message } = await postAction('/gamma/applyDataEfficiency', {
m_vCurEnergy: this.list.map(item => item.energy), m_vCurEnergy: this.list.map((item) => item.energy),
m_vCurEffi: this.list.map(item => item.efficiency), m_vCurEffi: this.list.map((item) => item.efficiency),
m_vCurUncert: this.uncert, m_vCurUncert: this.uncert,
m_curParam: this.param, m_curParam: this.param,
curCalName, curCalName,
sampleId, sampleId,
fileName fileName,
}) })
if (success) { if (success) {
this.handleDataSourceClick(curCalName) this.handleDataSourceClick(curCalName)
@ -591,8 +585,8 @@ export default {
} catch (error) { } catch (error) {
console.error(error) console.error(error)
} }
} },
} },
} }
</script> </script>

102
src/views/spectrumAnalysis/components/Modals/EnergyCalibrationModal.vue
View File

@ -12,13 +12,13 @@
style: { style: {
width: '70px', width: '70px',
textAlign: 'left', textAlign: 'left',
flexShrink: 0 flexShrink: 0,
} },
}" }"
:wrapperCol="{ :wrapperCol="{
style: { style: {
flex: 1 flex: 1,
} },
}" }"
> >
<a-form-model-item label="Channel"> <a-form-model-item label="Channel">
@ -54,13 +54,7 @@
<div> <div>
<label> <label>
<a-button type="primary" :loading="isCalling" @click="handleCall">Call</a-button> <a-button type="primary" :loading="isCalling" @click="handleCall">Call</a-button>
<input <input ref="fileInput" type="file" accept=".ent" style="display: none" @change="handleFileChange" />
ref="fileInput"
type="file"
accept=".ent"
style="display: none;"
@change="handleFileChange"
/>
</label> </label>
<a-button type="primary" :loading="isSaving" @click="handleSave">Save</a-button> <a-button type="primary" :loading="isSaving" @click="handleSave">Save</a-button>
</div> </div>
@ -121,23 +115,23 @@ const columns = [
{ {
title: 'Channel', title: 'Channel',
dataIndex: 'channel', dataIndex: 'channel',
customRender: (text) => Number(text).toFixed(3) customRender: (text) => parseFloat(Number(text).toPrecision(6)),
}, },
{ {
title: 'Energy(keV)', title: 'Energy(keV)',
dataIndex: 'energy', dataIndex: 'energy',
customRender: (text) => Number(text).toFixed(3) customRender: (text) => parseFloat(Number(text).toPrecision(6)),
}, },
{ {
title: 'Fit(keV)', title: 'Fit(keV)',
dataIndex: 'fit', dataIndex: 'fit',
customRender: (text) => Number(text).toFixed(3) customRender: (text) => parseFloat(Number(text).toPrecision(6)),
}, },
{ {
title: 'Delta(%)', title: 'Delta(%)',
dataIndex: 'delta', dataIndex: 'delta',
customRender: (text) => Number(text).toFixed(3) customRender: (text) => parseFloat(Number(text).toPrecision(6)),
} },
] ]
const initialOption = { const initialOption = {
@ -145,68 +139,68 @@ const initialOption = {
top: 20, top: 20,
right: 20, right: 20,
bottom: 50, bottom: 50,
left: 70 left: 70,
}, },
title: { title: {
text: 'Channel', text: 'Channel',
textStyle: { textStyle: {
color: '#8FD4F8', color: '#8FD4F8',
fontSize: 14, fontSize: 14,
fontWeight: 'normal' fontWeight: 'normal',
}, },
right: 10, right: 10,
bottom: 0 bottom: 0,
}, },
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
formatter: params => { formatter: (params) => {
const [x, y] = params[0].value const [x, y] = params[0].value
const channel = parseInt(x) const channel = parseInt(x)
const energy = y.toFixed(3) const energy = y.toFixed(3)
return `<div class="channel">Channel: ${channel}</div> return `<div class="channel">Channel: ${channel}</div>
<div class="energy">Energy: ${energy}</div>` <div class="energy">Energy: ${energy}</div>`
}, },
className: 'figure-chart-option-tooltip' className: 'figure-chart-option-tooltip',
}, },
xAxis: { xAxis: {
min: 1, min: 1,
max: 'dataMax', max: 'dataMax',
axisLabel: { axisLabel: {
color: '#fff' color: '#fff',
}, },
axisLine: { axisLine: {
lineStyle: { lineStyle: {
color: '#fff' color: '#fff',
} },
}, },
splitLine: { splitLine: {
show: false show: false,
} },
}, },
yAxis: { yAxis: {
axisLabel: { axisLabel: {
color: '#fff' color: '#fff',
}, },
axisTick: { axisTick: {
show: false show: false,
}, },
axisLine: { axisLine: {
lineStyle: { lineStyle: {
color: '#fff' color: '#fff',
} },
}, },
splitLine: { splitLine: {
show: false show: false,
}, },
name: 'keV', name: 'keV',
nameLocation: 'center', nameLocation: 'center',
nameGap: 50, nameGap: 50,
nameTextStyle: { nameTextStyle: {
color: '#8FD4F8', color: '#8FD4F8',
fontSize: 14 fontSize: 14,
} },
}, },
series: [] series: [],
} }
export default { export default {
@ -228,11 +222,11 @@ export default {
currSelectedDataSource: '', currSelectedDataSource: '',
appliedDataSource: '', appliedDataSource: '',
opts: { opts: {
notMerge: true notMerge: true,
}, },
rg_high: -1, rg_high: -1,
rg_low: -1 rg_low: -1,
} }
}, },
methods: { methods: {
@ -244,7 +238,7 @@ export default {
sampleId, sampleId,
fileName, fileName,
currentText, currentText,
width: 922 width: 922,
}) })
this.isLoading = false this.isLoading = false
if (success) { if (success) {
@ -294,15 +288,15 @@ export default {
value: [x, y], value: [x, y],
itemStyle: { itemStyle: {
color: scatterPoint.color, color: scatterPoint.color,
borderWidth: 0 borderWidth: 0,
} },
} }
}), }),
emphasis: { emphasis: {
disabled: true disabled: true,
}, },
animation: false, animation: false,
zlevel: 20 zlevel: 20,
}) })
this.option.series = series this.option.series = series
} }
@ -351,7 +345,7 @@ export default {
this.list.splice(i, 0, { this.list.splice(i, 0, {
channel: centroid, channel: centroid,
energy energy,
}) })
this.uncert.splice(i, 0, 0.5) this.uncert.splice(i, 0, 0.5)
@ -424,11 +418,11 @@ export default {
const { success, result, message } = await postAction('/gamma/changeDataEnergy', { const { success, result, message } = await postAction('/gamma/changeDataEnergy', {
sampleId, sampleId,
fileName, fileName,
m_vCurCentroid: this.list.map(item => item.channel), m_vCurCentroid: this.list.map((item) => item.channel),
m_vCurEnergy: this.list.map(item => item.energy), m_vCurEnergy: this.list.map((item) => item.energy),
m_vCurUncert: this.uncert, m_vCurUncert: this.uncert,
m_curParam: this.param, m_curParam: this.param,
width: 922 width: 922,
}) })
if (success) { if (success) {
this.handleResult(result) this.handleResult(result)
@ -447,9 +441,9 @@ export default {
try { try {
this.isSaving = true this.isSaving = true
const res = await postAction('/gamma/saveDataEnergy', { const res = await postAction('/gamma/saveDataEnergy', {
m_vCurCentroid: this.list.map(item => item.channel), m_vCurCentroid: this.list.map((item) => item.channel),
m_vCurEnergy: this.list.map(item => item.energy), m_vCurEnergy: this.list.map((item) => item.energy),
m_vCurUncert: this.uncert m_vCurUncert: this.uncert,
}) })
if (typeof res == 'string') { if (typeof res == 'string') {
const blob = new Blob([res], { type: 'text/plain' }) const blob = new Blob([res], { type: 'text/plain' })
@ -507,18 +501,18 @@ export default {
let curCalName = this.currSelectedDataSource let curCalName = this.currSelectedDataSource
// 如果沒选中以Input开头的，也就是选中了PHD之类的 // 如果沒选中以Input开头的，也就是选中了PHD之类的
if (!curCalName.includes('Input')) { if (!curCalName.includes('Input')) {
curCalName = `Input ${this.dataSourceList.filter(item => item.includes('Input')).length + 1}` curCalName = `Input ${this.dataSourceList.filter((item) => item.includes('Input')).length + 1}`
} }
const { sampleId, inputFileName: fileName } = this.sampleData const { sampleId, inputFileName: fileName } = this.sampleData
const { success, result, message } = await postAction('/gamma/applyDataEnergy', { const { success, result, message } = await postAction('/gamma/applyDataEnergy', {
m_vCurCentroid: this.list.map(item => item.channel), m_vCurCentroid: this.list.map((item) => item.channel),
m_vCurEnergy: this.list.map(item => item.energy), m_vCurEnergy: this.list.map((item) => item.energy),
m_vCurUncert: this.uncert, m_vCurUncert: this.uncert,
m_curParam: this.param, m_curParam: this.param,
curCalName, curCalName,
sampleId, sampleId,
fileName fileName,
}) })
if (success) { if (success) {
this.handleDataSourceClick(curCalName) this.handleDataSourceClick(curCalName)
@ -550,8 +544,8 @@ export default {
} catch (error) { } catch (error) {
console.error(error) console.error(error)
} }
} },
} },
} }
</script> </script>

17
src/views/spectrumAnalysis/components/Modals/NuclideActivityAndMDCModal.vue
View File

@ -64,53 +64,56 @@ const columns = [
title: 'Energy (keV)', title: 'Energy (keV)',
dataIndex: 'energy', dataIndex: 'energy',
customRender: (text) => { customRender: (text) => {
return text && text !== 'null' ? Number(text).toPrecision(6) : text return text && text !== 'null' ? parseFloat(Number(text).toPrecision(6)) : text
}, },
}, },
{ {
title: 'Yield (%)', title: 'Yield (%)',
dataIndex: 'yield', dataIndex: 'yield',
customRender: (text) => {
return text && text !== 'null' ? parseFloat(Number(text).toPrecision(6)) : text
},
}, },
{ {
title: 'Efficiency', title: 'Efficiency',
dataIndex: 'efficiency', dataIndex: 'efficiency',
customRender: (text) => { customRender: (text) => {
return text && text !== 'null' ? Number(text).toPrecision(6) : text return text && text !== 'null' ? parseFloat(Number(text).toPrecision(6)) : text
}, },
}, },
{ {
title: 'Activity (Bq)', title: 'Activity (Bq)',
dataIndex: 'activity', dataIndex: 'activity',
customRender: (text) => { customRender: (text) => {
return text && text !== 'null' ? Number(text).toPrecision(6) : text return text && text !== 'null' ? parseFloat(Number(text).toPrecision(6)) : text
}, },
}, },
{ {
title: 'Act Err (%)', title: 'Act Err (%)',
dataIndex: 'actErr', dataIndex: 'actErr',
customRender: (text) => { customRender: (text) => {
return text && text !== 'null' ? Number(text).toPrecision(6) : text return text && text !== 'null' ? parseFloat(Number(text).toPrecision(6)) : text
}, },
}, },
{ {
title: 'MDA (Bq)', title: 'MDA (Bq)',
dataIndex: 'mda', dataIndex: 'mda',
customRender: (text) => { customRender: (text) => {
return text && text !== 'null' ? Number(text).toPrecision(6) : text return text && text !== 'null' ? parseFloat(Number(text).toPrecision(6)) : text
}, },
}, },
{ {
title: 'Conc (uBq/m3)', title: 'Conc (uBq/m3)',
dataIndex: 'conc', dataIndex: 'conc',
customRender: (text) => { customRender: (text) => {
return text && text !== 'null' ? Number(text).toPrecision(6) : text return text && text !== 'null' ? parseFloat(Number(text).toPrecision(6)) : text
}, },
}, },
{ {
title: 'MDC (uBq/m3)', title: 'MDC (uBq/m3)',
dataIndex: 'mdc', dataIndex: 'mdc',
customRender: (text) => { customRender: (text) => {
return text && text !== 'null' ? Number(text).toPrecision(5) : text return text && text !== 'null' ? parseFloat(Number(text).toPrecision(6)) : text
}, },
}, },
] ]

58
src/views/spectrumAnalysis/components/Modals/NuclideLibraryModal.vue
View File

@ -47,7 +47,7 @@
:columns="daughterColumns" :columns="daughterColumns"
:list="daughterList" :list="daughterList"
:pagination="false" :pagination="false"
:scroll="{ y: 84 }" :scroll="{ y: 84 }"
rowKey="daughters" rowKey="daughters"
@rowDblClick="handleParentDBClick($event.daughters)" @rowDblClick="handleParentDBClick($event.daughters)"
></custom-table> ></custom-table>
@ -86,9 +86,7 @@
</div> </div>
<div class="nuclide-library-settings-operation"> <div class="nuclide-library-settings-operation">
<a-space :size="10"> <a-space :size="10">
<span> <span> Energy: </span>
Energy:
</span>
<a-input v-model="model.editEnergy"></a-input> <a-input v-model="model.editEnergy"></a-input>
<a-input-number <a-input-number
v-model="model.err" v-model="model.err"
@ -122,18 +120,18 @@ const daughterColumns = [
{ {
title: 'Name', title: 'Name',
dataIndex: 'daughters', dataIndex: 'daughters',
align: 'center' align: 'center',
}, },
{ {
title: 'Ratio', title: 'Ratio',
dataIndex: 'branchingratios', dataIndex: 'branchingratios',
align: 'center' align: 'center',
}, },
{ {
title: 'Status', title: 'Status',
dataIndex: 'daughtersstable', dataIndex: 'daughtersstable',
align: 'center' align: 'center',
} },
] ]
// 主体表格配置 // 主体表格配置
@ -143,43 +141,35 @@ const mainColumns = [
width: 80, width: 80,
customRender: (_, __, index) => { customRender: (_, __, index) => {
return index + 1 return index + 1
} },
}, },
{ {
title: 'Full Name', title: 'Full Name',
dataIndex: 'fullName' dataIndex: 'fullName',
}, },
{ {
title: 'Energy(keV)', title: 'Energy(keV)',
dataIndex: 'energy', dataIndex: 'energy',
width: 100, width: 100,
customRender: text => { customRender: (text) => parseFloat(Number(text).toPrecision(6)),
return toFixed(text, 3)
}
}, },
{ {
title: 'Energy Uncert(%)', title: 'Energy Uncert(%)',
dataIndex: 'energyUncert', dataIndex: 'energyUncert',
width: 120, width: 120,
customRender: text => { customRender: (text) => parseFloat(Number(text * 100).toPrecision(6)),
return text ? toFixed(text * 100, 6) : ''
}
}, },
{ {
title: 'Yield', title: 'Yield',
dataIndex: 'yield', dataIndex: 'yield',
width: 80, width: 80,
customRender: text => { customRender: (text) => parseFloat(Number(text).toPrecision(6)),
return toFixed(text, 3)
}
}, },
{ {
title: 'Yield Uncert(%)', title: 'Yield Uncert(%)',
dataIndex: 'yieldUncert', dataIndex: 'yieldUncert',
width: 120, width: 120,
customRender: text => { customRender: (text) => parseFloat(Number(text).toPrecision(6)),
return toFixed(text, 3)
}
}, },
{ {
title: 'KeyLine', title: 'KeyLine',
@ -187,15 +177,15 @@ const mainColumns = [
width: 100, width: 100,
align: 'center', align: 'center',
scopedSlots: { scopedSlots: {
customRender: 'keyLine' customRender: 'keyLine',
} },
} },
] ]
export default { export default {
mixins: [ModalMixin, SampleDataMixin], mixins: [ModalMixin, SampleDataMixin],
components: { components: {
TitleOverBorder TitleOverBorder,
}, },
data() { data() {
this.daughterColumns = daughterColumns this.daughterColumns = daughterColumns
@ -210,7 +200,7 @@ export default {
model: {}, model: {},
selectedNuclide: {}, // 当前选中的Nuclide selectedNuclide: {}, // 当前选中的Nuclide
selectedParent: {} // 当前选中的Parent selectedParent: {}, // 当前选中的Parent
} }
}, },
methods: { methods: {
@ -224,19 +214,19 @@ export default {
const { success, result, message } = await getAction('/gamma/NuclideLibrary', { const { success, result, message } = await getAction('/gamma/NuclideLibrary', {
sampleId, sampleId,
fileName, fileName,
...this.model ...this.model,
}) })
if (success) { if (success) {
const { const {
daughter: { list_parent, table_daughter }, daughter: { list_parent, table_daughter },
nuclLinesLibs, nuclLinesLibs,
nuclideInfo, nuclideInfo,
nuclides nuclides,
} = result } = result
this.nuclideList = nuclides this.nuclideList = nuclides
this.parentList = list_parent ? list_parent.filter(item => item) : [] this.parentList = list_parent ? list_parent.filter((item) => item) : []
this.daughterList = table_daughter ? table_daughter.filter(item => item.daughters) : [] this.daughterList = table_daughter ? table_daughter.filter((item) => item.daughters) : []
this.nuclideInfo = nuclideInfo this.nuclideInfo = nuclideInfo
this.nuclLinesLibs = nuclLinesLibs this.nuclLinesLibs = nuclLinesLibs
@ -259,7 +249,7 @@ export default {
libraryName: 'UserLibrary', libraryName: 'UserLibrary',
err: 0.5, err: 0.5,
editEnergy: '', editEnergy: '',
nuclideName: '' nuclideName: '',
} }
this.getInfo(true) this.getInfo(true)
}, },
@ -300,8 +290,8 @@ export default {
handleParentDBClick(item) { handleParentDBClick(item) {
this.model.nuclideName = item this.model.nuclideName = item
this.getInfo() this.getInfo()
} },
} },
} }
</script> </script>

102
src/views/spectrumAnalysis/components/Modals/ResolutionCalibrationModal.vue
View File

@ -12,13 +12,13 @@
style: { style: {
width: '70px', width: '70px',
textAlign: 'left', textAlign: 'left',
flexShrink: 0 flexShrink: 0,
} },
}" }"
:wrapperCol="{ :wrapperCol="{
style: { style: {
flex: 1 flex: 1,
} },
}" }"
> >
<a-form-model-item label="Energy"> <a-form-model-item label="Energy">
@ -54,13 +54,7 @@
<div> <div>
<label> <label>
<a-button type="primary" :loading="isCalling" @click="handleCall">Call</a-button> <a-button type="primary" :loading="isCalling" @click="handleCall">Call</a-button>
<input <input ref="fileInput" type="file" accept=".ent" style="display: none" @change="handleFileChange" />
ref="fileInput"
type="file"
accept=".ent"
style="display: none;"
@change="handleFileChange"
/>
</label> </label>
<a-button type="primary" :loading="isSaving" @click="handleSave">Save</a-button> <a-button type="primary" :loading="isSaving" @click="handleSave">Save</a-button>
</div> </div>
@ -121,23 +115,23 @@ const columns = [
{ {
title: 'Energy(keV)', title: 'Energy(keV)',
dataIndex: 'energy', dataIndex: 'energy',
customRender: (text) => Number(text).toFixed(3) customRender: (text) => parseFloat(Number(text).toPrecision(6)),
}, },
{ {
title: 'FWHM(keV)', title: 'FWHM(keV)',
dataIndex: 'fwhm', dataIndex: 'fwhm',
customRender: (text) => Number(text).toFixed(3) customRender: (text) => parseFloat(Number(text).toPrecision(6)),
}, },
{ {
title: 'Fit(keV)', title: 'Fit(keV)',
dataIndex: 'fit', dataIndex: 'fit',
customRender: (text) => Number(text).toFixed(3) customRender: (text) => parseFloat(Number(text).toPrecision(6)),
}, },
{ {
title: 'Delta(%)', title: 'Delta(%)',
dataIndex: 'delta', dataIndex: 'delta',
customRender: (text) => Number(text).toFixed(3) customRender: (text) => parseFloat(Number(text).toPrecision(6)),
} },
] ]
const initialOption = { const initialOption = {
@ -145,68 +139,68 @@ const initialOption = {
top: 20, top: 20,
right: 20, right: 20,
bottom: 50, bottom: 50,
left: 70 left: 70,
}, },
title: { title: {
text: 'Channel', text: 'Channel',
textStyle: { textStyle: {
color: '#8FD4F8', color: '#8FD4F8',
fontSize: 14, fontSize: 14,
fontWeight: 'normal' fontWeight: 'normal',
}, },
right: 10, right: 10,
bottom: 0 bottom: 0,
}, },
tooltip: { tooltip: {
trigger: 'axis', trigger: 'axis',
formatter: params => { formatter: (params) => {
const [x, y] = params[0].value const [x, y] = params[0].value
const energy = parseInt(x) const energy = parseInt(x)
const fwhm = y.toFixed(3) const fwhm = y.toFixed(3)
return `<div class="channel">Energy: ${energy}</div> return `<div class="channel">Energy: ${energy}</div>
<div class="energy">Fwhm: ${fwhm}</div>` <div class="energy">Fwhm: ${fwhm}</div>`
}, },
className: 'figure-chart-option-tooltip' className: 'figure-chart-option-tooltip',
}, },
xAxis: { xAxis: {
min: 1, min: 1,
max: 'dataMax', max: 'dataMax',
axisLabel: { axisLabel: {
color: '#fff' color: '#fff',
}, },
axisLine: { axisLine: {
lineStyle: { lineStyle: {
color: '#fff' color: '#fff',
} },
}, },
splitLine: { splitLine: {
show: false show: false,
} },
}, },
yAxis: { yAxis: {
axisLabel: { axisLabel: {
color: '#fff' color: '#fff',
}, },
axisTick: { axisTick: {
show: false show: false,
}, },
axisLine: { axisLine: {
lineStyle: { lineStyle: {
color: '#fff' color: '#fff',
} },
}, },
splitLine: { splitLine: {
show: false show: false,
}, },
name: 'keV', name: 'keV',
nameLocation: 'center', nameLocation: 'center',
nameGap: 50, nameGap: 50,
nameTextStyle: { nameTextStyle: {
color: '#8FD4F8', color: '#8FD4F8',
fontSize: 14 fontSize: 14,
} },
}, },
series: [] series: [],
} }
export default { export default {
@ -228,10 +222,10 @@ export default {
currSelectedDataSource: '', currSelectedDataSource: '',
appliedDataSource: '', appliedDataSource: '',
opts: { opts: {
notMerge: true notMerge: true,
}, },
ECutAnalysis_Low: -1, ECutAnalysis_Low: -1,
G_energy_span: -1 G_energy_span: -1,
} }
}, },
methods: { methods: {
@ -243,7 +237,7 @@ export default {
sampleId, sampleId,
fileName, fileName,
currentText, currentText,
width: 922 width: 922,
}) })
this.isLoading = false this.isLoading = false
if (success) { if (success) {
@ -293,15 +287,15 @@ export default {
value: [x, y], value: [x, y],
itemStyle: { itemStyle: {
color: scatterPoint.color, color: scatterPoint.color,
borderWidth: 0 borderWidth: 0,
} },
} }
}), }),
emphasis: { emphasis: {
disabled: true disabled: true,
}, },
animation: false, animation: false,
zlevel: 20 zlevel: 20,
}) })
this.option.series = series this.option.series = series
} }
@ -350,7 +344,7 @@ export default {
this.list.splice(i, 0, { this.list.splice(i, 0, {
energy: energy, energy: energy,
fwhm fwhm,
}) })
this.uncert.splice(i, 0, 0.5) this.uncert.splice(i, 0, 0.5)
@ -423,10 +417,10 @@ export default {
const { success, result, message } = await postAction('/gamma/changeDataResolution', { const { success, result, message } = await postAction('/gamma/changeDataResolution', {
sampleId, sampleId,
fileName, fileName,
m_vCurEnergy: this.list.map(item => item.energy), m_vCurEnergy: this.list.map((item) => item.energy),
m_vCurReso: this.list.map(item => item.fwhm), m_vCurReso: this.list.map((item) => item.fwhm),
m_vCurUncert: this.uncert, m_vCurUncert: this.uncert,
m_curParam: this.param m_curParam: this.param,
}) })
if (success) { if (success) {
this.handleResult(result) this.handleResult(result)
@ -445,9 +439,9 @@ export default {
try { try {
this.isSaving = true this.isSaving = true
const res = await postAction('/gamma/saveDataResolution', { const res = await postAction('/gamma/saveDataResolution', {
m_vCurEnergy: this.list.map(item => item.energy), m_vCurEnergy: this.list.map((item) => item.energy),
m_vCurReso: this.list.map(item => item.fwhm), m_vCurReso: this.list.map((item) => item.fwhm),
m_vCurUncert: this.uncert m_vCurUncert: this.uncert,
}) })
if (typeof res == 'string') { if (typeof res == 'string') {
const blob = new Blob([res], { type: 'text/plain' }) const blob = new Blob([res], { type: 'text/plain' })
@ -505,18 +499,18 @@ export default {
let curCalName = this.currSelectedDataSource let curCalName = this.currSelectedDataSource
// 如果沒选中以Input开头的，也就是选中了PHD之类的 // 如果沒选中以Input开头的，也就是选中了PHD之类的
if (!curCalName.includes('Input')) { if (!curCalName.includes('Input')) {
curCalName = `Input ${this.dataSourceList.filter(item => item.includes('Input')).length + 1}` curCalName = `Input ${this.dataSourceList.filter((item) => item.includes('Input')).length + 1}`
} }
const { sampleId, inputFileName: fileName } = this.sampleData const { sampleId, inputFileName: fileName } = this.sampleData
const { success, result, message } = await postAction('/gamma/applyDataResolution', { const { success, result, message } = await postAction('/gamma/applyDataResolution', {
m_vCurEnergy: this.list.map(item => item.energy), m_vCurEnergy: this.list.map((item) => item.energy),
m_vCurReso: this.list.map(item => item.fwhm), m_vCurReso: this.list.map((item) => item.fwhm),
m_vCurUncert: this.uncert, m_vCurUncert: this.uncert,
m_curParam: this.param, m_curParam: this.param,
curCalName, curCalName,
sampleId, sampleId,
fileName fileName,
}) })
if (success) { if (success) {
this.handleDataSourceClick(curCalName) this.handleDataSourceClick(curCalName)
@ -548,8 +542,8 @@ export default {
} catch (error) { } catch (error) {
console.error(error) console.error(error)
} }
} },
} },
} }
</script> </script>

2
src/views/spectrumAnalysis/components/Modals/SaveSettingModal.vue
View File

@ -39,7 +39,7 @@ export default {
}, },
handleOk() { handleOk() {
this.$emit('save', this.saveFormat) this.$emit('save', this.saveFormat, this.saveAll)
}, },
}, },
computed: { computed: {

18
src/views/spectrumAnalysis/components/MultiLevelMenu.vue
View File

@ -6,7 +6,7 @@
<div v-if="item.children" :key="index"> <div v-if="item.children" :key="index">
<a-menu class="multi-level-menu-sub-menu"> <a-menu class="multi-level-menu-sub-menu">
<template v-for="child in item.children"> <template v-for="child in item.children">
<a-menu-item v-if="child.show !== false" :key="child.key" @click="handleSubMenuClick(item, child)"> <a-menu-item v-if="child.show !== false" :key="child.key" @click="handleSubMenuClick(item, child)">
{{ child.title }} {{ child.title }}
</a-menu-item> </a-menu-item>
</template> </template>
@ -22,23 +22,23 @@ export default {
props: { props: {
children: { children: {
type: Array, type: Array,
default: () => [] default: () => [],
}, },
width: { width: {
type: String, type: String,
default: 'auto' default: 'auto',
} },
}, },
methods: { methods: {
handleMenuClick(item) { handleMenuClick(item) {
if (!item.children) { // if (!item.children) {
this.$emit('menuClick', item) this.$emit('menuClick', item)
} // }
}, },
handleSubMenuClick(item, child) { handleSubMenuClick(item, child) {
this.$emit('submenuClick', { item, child }) this.$emit('submenuClick', { item, child })
} },
} },
} }
</script> </script>

7
src/views/spectrumAnalysis/components/PeakInfomation.vue
View File

@ -47,10 +47,12 @@ const columns = [
{ {
title: 'Energy(keV)', title: 'Energy(keV)',
dataIndex: 'energy', dataIndex: 'energy',
customRender: (text) => parseFloat(Number(text).toPrecision(6)),
}, },
{ {
title: 'Centroid', title: 'Centroid',
dataIndex: 'centroid', dataIndex: 'centroid',
customRender: (text) => parseFloat(Number(text).toPrecision(6)),
}, },
{ {
title: 'Multiplet', title: 'Multiplet',
@ -59,22 +61,27 @@ const columns = [
{ {
title: 'Fwhm(keV)', title: 'Fwhm(keV)',
dataIndex: 'fwhm', dataIndex: 'fwhm',
customRender: (text) => parseFloat(Number(text).toPrecision(6)),
}, },
{ {
title: 'NetArea', title: 'NetArea',
dataIndex: 'netArea', dataIndex: 'netArea',
customRender: (text) => parseFloat(Number(text).toPrecision(6)),
}, },
{ {
title: 'AreaErr(%)', title: 'AreaErr(%)',
dataIndex: 'areaErr', dataIndex: 'areaErr',
customRender: (text) => parseFloat(Number(text).toPrecision(6)),
}, },
{ {
title: 'Significant', title: 'Significant',
dataIndex: 'significant', dataIndex: 'significant',
customRender: (text) => parseFloat(Number(text).toPrecision(6)),
}, },
{ {
title: 'Sensitivity', title: 'Sensitivity',
dataIndex: 'sensitivity', dataIndex: 'sensitivity',
customRender: (text) => parseFloat(Number(text).toPrecision(6)),
}, },
{ {
title: 'Indentify', title: 'Indentify',

86
src/views/spectrumAnalysis/gamma-analysis.vue
View File

@ -42,7 +42,7 @@
<!-- 二级交互栏结束 --> <!-- 二级交互栏结束 -->
<!-- 主体部分 --> <!-- 主体部分 -->
<div class="gamma-analysis-main"> <div class="gamma-analysis-main">
<div class="gamma-analysis-chart"> <div class="gamma-analysis-chart" ref="chartContainerRef" tabindex="0" @keydown="handleKeyboardEvent">
<CustomChart <CustomChart
ref="chartRef" ref="chartRef"
:option="option" :option="option"
@ -140,6 +140,8 @@ import { ACCESS_TOKEN } from '@/store/mutation-types'
import StripModal from './components/Modals/StripModal.vue' import StripModal from './components/Modals/StripModal.vue'
import { FilePicker } from '@/utils/FilePicker' import { FilePicker } from '@/utils/FilePicker'
import { zipFile } from '@/utils/file' import { zipFile } from '@/utils/file'
import { findNearPeak } from '@/utils/sampleHelper'
import baseCtrlJson from './baseCtrlJson.json'
export default { export default {
props: { props: {
@ -232,20 +234,14 @@ export default {
this.setChartBottomTitle(0, 0, 0) this.setChartBottomTitle(0, 0, 0)
this.option.tooltip.formatter = this.tooltipFormatter this.option.tooltip.formatter = this.tooltipFormatter
this.$bus.$on('colorChange', this.handleColorChange)
this.$bus.$on('gammaRefresh', this.handleRefresh) this.$bus.$on('gammaRefresh', this.handleRefresh)
this.$bus.$on('accept', this.handleAccept) this.$bus.$on('accept', this.handleAccept)
document.addEventListener('keydown', this.handleKeyboardEvent)
}, },
destroyed() { destroyed() {
this.cancelLastRequest() this.cancelLastRequest()
this.$bus.$off('colorChange', this.handleColorChange)
this.$bus.$off('gammaRefresh', this.handleRefresh) this.$bus.$off('gammaRefresh', this.handleRefresh)
this.$bus.$off('accept', this.handleAccept) this.$bus.$off('accept', this.handleAccept)
document.removeEventListener('keydown', this.handleKeyboardEvent)
}, },
mounted() { mounted() {
this.option.brush = { toolbox: [] } this.option.brush = { toolbox: [] }
@ -413,7 +409,6 @@ export default {
}, },
initWebSocket: function () { initWebSocket: function () {
console.log('qweqwerq')
// WebSocket与普通的请求所用协议有所不同，ws等同于http，wss等同于https // WebSocket与普通的请求所用协议有所不同，ws等同于http，wss等同于https
var userId = store.getters.userInfo.id var userId = store.getters.userInfo.id
var url = var url =
@ -535,7 +530,7 @@ export default {
this.$store.commit('ADD_SAMPLE_DATA', { this.$store.commit('ADD_SAMPLE_DATA', {
inputFileName, inputFileName,
data: result, data: Object.assign(result, { BaseCtrls: baseCtrlJson }),
from: flag, from: flag,
}) })
@ -868,6 +863,7 @@ export default {
// 点击图表，设置红线 // 点击图表，设置红线
handleChartClick(param) { handleChartClick(param) {
this.$refs.chartContainerRef.focus()
const { offsetX, offsetY } = param const { offsetX, offsetY } = param
const point = getXAxisAndYAxisByPosition(this.getChart(), offsetX, offsetY) const point = getXAxisAndYAxisByPosition(this.getChart(), offsetX, offsetY)
if (point) { if (point) {
@ -884,50 +880,13 @@ export default {
// 设置图表底部的标题 // 设置图表底部的标题
setChartBottomTitle(channel, energy, counts) { setChartBottomTitle(channel, energy, counts) {
const { index, find } = this.findNearPeak(channel) const { index, find } = findNearPeak(channel, this.peakList)
this.option.title.text = `{a|Channel:${channel}} {a|Energy:${energy || '0.00'}} {a|Counts:${ this.option.title.text = `{a|Channel:${channel}} {a|Energy:${energy || '0.00'}} {a|Counts:${
counts || '0.0' counts || '0.0'
}} {a|Significance:${find ? this.peakList[index].significance.toFixed(2) : '0.00'}}` }} {a|Significance:${find ? this.peakList[index].significance.toFixed(2) : '0.00'}}`
}, },
// 查找最近的峰(C++相关)
findNearPeak(channel) {
let t_bFind = false,
i = 0,
peakNum = this.peakList.length
for (; i < peakNum; ++i) {
const peak = this.peakList[i]
if (channel >= peak.left && channel <= peak.right) {
// 如果 channel 在峰的左右边界内
if (peak.multiIndex > 0 && channel > peak.peakCentroid) {
// 如果是重峰，且 channel 在重峰的第一个峰的中心道右侧
let j = i
let temp = channel - peak.peakCentroid
while (++j < peakNum && this.peakList[j].multiIndex == peak.multiIndex) {
if (Math.abs(this.peakList[j].peakCentroid - channel) < temp) {
// 找出重峰中峰中心道离 channel 最近的峰
temp = Math.abs(this.peakList[j].peakCentroid - channel)
i = j
}
}
}
// channel 在索引(i)对应的峰内
t_bFind = true
break
} else if (peak.left > channel) {
// channel 不在任何峰内，找离它最近的峰
if (i > 0 && channel - this.peakList[i - 1].peakCentroid < peak.peakCentroid - channel) i -= 1
break
}
}
if (i >= peakNum) i -= 1
return {
index: i,
find: t_bFind,
}
},
// 根据xAixs值找channel、energy和counts // 根据xAixs值找channel、energy和counts
getEnergyAndCountsByXAxis(xAxis) { getEnergyAndCountsByXAxis(xAxis) {
let channel, energy, counts let channel, energy, counts
@ -1343,6 +1302,7 @@ export default {
// 从分析工具刷新部分数据 // 从分析工具刷新部分数据
handleRefresh(data) { handleRefresh(data) {
data.DetailedInformation = this.detailedInfomation data.DetailedInformation = this.detailedInfomation
data.QCFlag = this.qcFlags
this.clearCompareLine() this.clearCompareLine()
this.redrawPeakLine() this.redrawPeakLine()
this.dataProcess(data) this.dataProcess(data)
@ -1350,36 +1310,29 @@ export default {
// 分析工具Accept时刷新部分数据 // 分析工具Accept时刷新部分数据
handleAccept(data) { handleAccept(data) {
console.log('%c [ data ]-1166', 'font-size:13px; background:pink; color:#bf2c9f;', data)
const { const {
allData, allData,
barChart,
channelBaseLineChart,
peakSet, peakSet,
shadowChannelChart, shadowChannelChart,
shadowEnergyChart, shadowEnergyChart,
shapeChannelData, shapeChannelData,
shapeData,
shapeEnergyData, shapeEnergyData,
} = data } = data
const result = {
DetailedInformation: this.detailedInfomation,
QCFlag: this.qcFlags,
allData,
shadowChannelChart,
shadowEnergyChart,
shapeChannelData,
shapeEnergyData,
peak: peakSet,
}
this.clearCompareLine() this.clearCompareLine()
this.channelData.peakGroup = this.getLineData(allData, 'Peak', 'channel', true)
this.energyData.peakGroup = this.getLineData(allData, 'Peak', 'energy', true)
this.redrawPeakLine() this.redrawPeakLine()
this.dataProcess(result)
this.channelData.baseLine = this.getLineData(allData, 'BaseLine', 'channel')
this.energyData.baseLine = this.getLineData(allData, 'BaseLine', 'energy')
this.redrawLineBySeriesName(
'BaseLine',
this.energyData.baseLine,
this.channelData.baseLine,
this.graphAssistance.Baseline
)
this.channelData.baseLineCP = shapeChannelData
this.energyData.baseLineCP = shapeEnergyData
this.redrawCtrlPointBySeriesName()
}, },
// 显示比较弹窗 // 显示比较弹窗
@ -1772,6 +1725,7 @@ export default {
height: 100%; height: 100%;
position: relative; position: relative;
overflow: hidden; overflow: hidden;
outline: none;
} }
&-thumbnail { &-thumbnail {

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

@ -10,7 +10,10 @@
:overlay-style="operation.style" :overlay-style="operation.style"
:key="operation.title" :key="operation.title"
> >
<a-button type="primary">{{ operation.title }}</a-button> <a-button type="primary">
<a-icon type="loading" v-if="operation.loading"></a-icon>
{{ operation.title }}
</a-button>
<div slot="overlay"> <div slot="overlay">
<template v-for="(child, index) in operation.children"> <template v-for="(child, index) in operation.children">
<component v-if="child.show !== false" :is="child.type" :key="index" v-bind="child.attrs" v-on="child.on"> <component v-if="child.show !== false" :is="child.type" :key="index" v-bind="child.attrs" v-on="child.on">
@ -88,7 +91,11 @@
<!-- 分析-设置弹窗结束 --> <!-- 分析-设置弹窗结束 -->
<!-- 分析工具弹窗开始 --> <!-- 分析工具弹窗开始 -->
<analyze-interactive-tool-modal v-model="analyzeInteractiveToolModalVisible" :sampleId="sampleData.sampleId" /> <analyze-interactive-tool-modal
v-model="analyzeInteractiveToolModalVisible"
:sampleId="sampleData.sampleId"
:colorConfig="colorConfig"
/>
<!-- 分析工具弹窗结束 --> <!-- 分析工具弹窗结束 -->
<!-- Korsum 弹窗开始 --> <!-- Korsum 弹窗开始 -->
@ -116,7 +123,7 @@
<!-- SpectrumComments 弹窗结束 --> <!-- SpectrumComments 弹窗结束 -->
<!-- Color Config 弹窗开始 --> <!-- Color Config 弹窗开始 -->
<color-config-modal v-model="colorConfigModalVisible" /> <color-config-modal v-model="colorConfigModalVisible" :colorConfig="colorConfig" @colorChange="handleColorChange" />
<!-- Color Config 弹窗结束 --> <!-- Color Config 弹窗结束 -->
<!-- Data Processing Log 弹窗开始 --> <!-- Data Processing Log 弹窗开始 -->
@ -165,6 +172,7 @@
<!-- Beta-Gamma 的Energy Calibration开始 --> <!-- Beta-Gamma 的Energy Calibration开始 -->
<beta-gamma-energy-calibration-modal <beta-gamma-energy-calibration-modal
v-model="betaGammaEnergyCalibrationModalVisible" v-model="betaGammaEnergyCalibrationModalVisible"
:sampleList="sampleList"
@sendInfo="getCheckFlag" @sendInfo="getCheckFlag"
@sendXeData="getXeData" @sendXeData="getXeData"
/> />
@ -190,12 +198,13 @@
<!-- Beta-Gamma 的 QC Result 弹窗 结束 --> <!-- Beta-Gamma 的 QC Result 弹窗 结束 -->
<!-- Beta-Gamma 的 RLR 弹窗 --> <!-- Beta-Gamma 的 RLR 弹窗 -->
<beta-gamma-rlr-modal v-model="betaGammaRlrModalVisible" :sampleData="sampleData" /> <beta-gamma-rlr-modal v-model="betaGammaRlrModalVisible" />
<!-- Beta-Gamma 的 RLR 弹窗 结束 --> <!-- Beta-Gamma 的 RLR 弹窗 结束 -->
<!-- Beta-Gamma 的 Statistics Paramer History 弹窗 --> <!-- Beta-Gamma 的 Statistics Paramer History 弹窗 -->
<statistics-paramer-history-modal v-model="statisticsParamerHistoryModalVisible" /> <statistics-paramer-history-modal v-model="statisticsParamerHistoryModalVisible" />
<!-- Beta-Gamma 的 Statistics Paramer History 弹窗 结束 --> <!-- Beta-Gamma 的 Statistics Paramer History 弹窗 结束 -->
<bg-log-viewer v-model="bgLogViewerVisible" />
</div> </div>
</template> </template>
<script> <script>
@ -239,6 +248,7 @@ import BetaGammaExtrapolationModal from './components/Modals/BetaGammaModals/Bet
import { getAction } from '@/api/manage' import { getAction } from '@/api/manage'
import { clearSampleCache } from './clearSampleCache' import { clearSampleCache } from './clearSampleCache'
import { fetchAndDownload } from '@/utils/file' import { fetchAndDownload } from '@/utils/file'
import BGLogViewer from './components/Modals/BetaGammaModals/BGLogViewer.vue'
// 分析类型 // 分析类型
const ANALYZE_TYPE = { const ANALYZE_TYPE = {
@ -283,6 +293,7 @@ export default {
BetaGammaEnergyCalibrationModal, BetaGammaEnergyCalibrationModal,
AutomaticAnalysisLogModal, AutomaticAnalysisLogModal,
BetaGammaExtrapolationModal, BetaGammaExtrapolationModal,
BgLogViewer: BGLogViewer,
}, },
provide() { provide() {
@ -360,6 +371,7 @@ export default {
betaGammaQCResultsModalVisible: false, // beta-gamma QC Result 弹窗 betaGammaQCResultsModalVisible: false, // beta-gamma QC Result 弹窗
betaGammaRlrModalVisible: false, // beta-gamma RLR 弹窗 betaGammaRlrModalVisible: false, // beta-gamma RLR 弹窗
statisticsParamerHistoryModalVisible: false, // beta-gamma Statistics Paramer History 弹窗 statisticsParamerHistoryModalVisible: false, // beta-gamma Statistics Paramer History 弹窗
bgLogViewerVisible: false, // beta-gamma Log 下的BG log viewer 弹窗
analyseCurrentSpectrumData: {}, analyseCurrentSpectrumData: {},
resultDisplayFlag: [], resultDisplayFlag: [],
params_toDB: { params_toDB: {
@ -387,6 +399,10 @@ export default {
updateFlag: '2', updateFlag: '2',
isReAnalyed_gamma: false, isReAnalyed_gamma: false,
isReAnalyed_beta: false, isReAnalyed_beta: false,
isSaving: false,
colorConfig: {}, // 颜色配置
} }
}, },
created() { created() {
@ -397,6 +413,7 @@ export default {
// dbName: 'auto', // dbName: 'auto',
// inputFileName: 'CAX05_001-20230731_1528_S_FULL_37563.6.PHD', // inputFileName: 'CAX05_001-20230731_1528_S_FULL_37563.6.PHD',
// }) // })
this.getColorConfig()
}, },
destroyed() { destroyed() {
@ -409,7 +426,6 @@ export default {
this.isReAnalyed_gamma = val this.isReAnalyed_gamma = val
}, },
getUpdateFlag(val) { getUpdateFlag(val) {
console.log('qerq', val)
this.updateFlag = val this.updateFlag = val
}, },
getcommentsInfo(val) { getcommentsInfo(val) {
@ -417,10 +433,10 @@ export default {
}, },
getStationName(arg, val, flag) { getStationName(arg, val, flag) {
arg.forEach((item) => { arg.forEach((item) => {
item.conc = Number(item.conc).toFixed(6) item.conc = Number(item.conc).toPrecision(6)
item.concErr = Number(item.concErr).toFixed(6) item.concErr = Number(item.concErr).toPrecision(6)
item.lc = Number(item.lc).toFixed(6) item.lc = Number(item.lc).toPrecision(6)
item.mdc = Number(item.mdc).toFixed(6) item.mdc = Number(item.mdc).toPrecision(6)
}) })
this.resultDisplayFlag = arg this.resultDisplayFlag = arg
this.params_toDB.stationName = val this.params_toDB.stationName = val
@ -492,13 +508,39 @@ export default {
}, },
// 保存结果到文件， 服务端生成文件，前端下载 // 保存结果到文件， 服务端生成文件，前端下载
async handleSaveResultsToFile(saveFormat) { async handleSaveResultsToFile(saveFormat, isSaveAll = false) {
this.isSaving = true
if (this.isGamma) { if (this.isGamma) {
const url = saveFormat == 'xls' ? '/gamma/saveToExcel' : saveFormat == 'txt' ? '/gamma/saveToTxt' : '' if (!isSaveAll) {
let params = { const url = saveFormat == 'xls' ? '/gamma/saveToExcel' : saveFormat == 'txt' ? '/gamma/saveToTxt' : ''
fileName: this.newSampleData.inputFileName, let params = {
fileName: this.newSampleData.inputFileName,
}
try {
await fetchAndDownload(url, params, 'get')
} catch (error) {
console.error(error)
} finally {
this.isSaving = false
}
} else {
let list = this.sampleList.filter((item) => item.sampleType !== 'B')
if (list.length > 0) {
list.forEach(async (item) => {
const url = saveFormat == 'xls' ? '/gamma/saveToExcel' : saveFormat == 'txt' ? '/gamma/saveToTxt' : ''
let params = {
fileName: item.inputFileName,
}
try {
await fetchAndDownload(url, params, 'get')
} catch (error) {
console.error(error)
} finally {
this.isSaving = false
}
})
}
} }
fetchAndDownload(url, params, 'get')
} }
if (this.isBetaGamma) { if (this.isBetaGamma) {
const url = const url =
@ -523,8 +565,13 @@ export default {
this.params_toDB.detFileName = this.newSampleData.detFileName this.params_toDB.detFileName = this.newSampleData.detFileName
this.params_toDB.qcFileName = this.newSampleData.qcFileName this.params_toDB.qcFileName = this.newSampleData.qcFileName
this.params_toDB.dbName = this.newSampleData.dbName this.params_toDB.dbName = this.newSampleData.dbName
try {
fetchAndDownload(url, this.params_toDB) await fetchAndDownload(url, this.params_toDB)
} catch (error) {
console.error(error)
} finally {
this.isSaving = false
}
} }
}, },
@ -615,7 +662,7 @@ export default {
}) })
// 处理当前的谱的reprocessing // 处理当前的谱的reprocessing
if(inputFileName && sampleType !== 'B') { if (inputFileName && sampleType !== 'B') {
this.$refs.gammaAnalysisRef.reProcessing(false) this.$refs.gammaAnalysisRef.reProcessing(false)
} }
}, },
@ -678,10 +725,10 @@ export default {
this.analyseCurrentSpectrumData = res.result this.analyseCurrentSpectrumData = res.result
this.resultDisplayFlag = res.result.XeData this.resultDisplayFlag = res.result.XeData
this.resultDisplayFlag.forEach((item) => { this.resultDisplayFlag.forEach((item) => {
item.conc = item.conc.toFixed(6) item.conc = item.conc.toPrecision(6)
item.concErr = item.concErr.toFixed(6) item.concErr = item.concErr.toPrecision(6)
item.lc = item.lc.toFixed(6) item.lc = item.lc.toPrecision(6)
item.mdc = item.mdc.toFixed(6) item.mdc = item.mdc.toPrecision(6)
}) })
} else { } else {
this.$message.warning(res.message) this.$message.warning(res.message)
@ -700,14 +747,13 @@ export default {
} }
postAction('/spectrumAnalysis/analyseAllSpectrum', params).then((res) => { postAction('/spectrumAnalysis/analyseAllSpectrum', params).then((res) => {
if (res.success) { if (res.success) {
console.log(res)
this.analyseCurrentSpectrumData = res.result this.analyseCurrentSpectrumData = res.result
this.resultDisplayFlag = res.result.XeData this.resultDisplayFlag = res.result.XeData
this.resultDisplayFlag.forEach((item) => { this.resultDisplayFlag.forEach((item) => {
item.conc = item.conc.toFixed(6) item.conc = item.conc.toPrecision(6)
item.concErr = item.concErr.toFixed(6) item.concErr = item.concErr.toPrecision(6)
item.lc = item.lc.toFixed(6) item.lc = item.lc.toPrecision(6)
item.mdc = item.mdc.toFixed(6) item.mdc = item.mdc.toPrecision(6)
}) })
} else { } else {
this.$message.warning(res.message) this.$message.warning(res.message)
@ -725,6 +771,26 @@ export default {
} }
} }
}, },
// 获取颜色配置
async getColorConfig() {
try {
const { success, result, message } = await getAction('/gamma/viewColorConfig')
if (success) {
this.colorConfig = result
} else {
this.$message.error(message)
}
} catch (error) {
console.error(error)
}
},
// 颜色修改
handleColorChange(colorConfig) {
this.colorConfig = colorConfig
this.$refs.gammaAnalysisRef.handleColorChange(colorConfig)
},
}, },
computed: { computed: {
// 顶部菜单栏配置 // 顶部菜单栏配置
@ -802,6 +868,7 @@ export default {
}, },
{ {
title: 'SAVE', title: 'SAVE',
loading: this.isSaving,
children: [ children: [
{ {
type: 'MultiLevelMenu', type: 'MultiLevelMenu',
@ -810,6 +877,23 @@ export default {
children: [ children: [
{ {
title: 'Save Results to File', title: 'Save Results to File',
children: [
{
title: 'Save Txt',
key: 'saveTxt',
show: this.isBetaGamma,
},
{
title: 'Save Excel',
key: 'saveExcel',
show: this.isBetaGamma,
},
{
title: 'Save Html',
key: 'saveHtml',
show: this.isBetaGamma,
},
],
}, },
{ {
title: 'Save Results to DB', title: 'Save Results to DB',
@ -821,6 +905,7 @@ export default {
{ {
title: 'Save All', title: 'Save All',
key: 'all', key: 'all',
show: this.isGamma,
}, },
], ],
key: 'resultsToDB', key: 'resultsToDB',
@ -845,14 +930,21 @@ export default {
}, },
on: { on: {
menuClick: () => { menuClick: () => {
console.log(this.isBetaGamma, this.isGamma) if (this.isGamma) {
this.saveSettingModalVisible = true this.saveSettingModalVisible = true
}
}, },
submenuClick: ({ item, child }) => { submenuClick: ({ item, child }) => {
if (item.key == 'resultsToDB') { if (item.key == 'resultsToDB') {
this.handleSaveResultsToDB(child.key) this.handleSaveResultsToDB(child.key)
} else if (item.key == 'phdToFile') { } else if (item.key == 'phdToFile') {
this.handleSavePHDToFile(child.key) this.handleSavePHDToFile(child.key)
} else if (child.key == 'saveTxt') {
this.handleSaveResultsToFile('txt')
} else if (child.key == 'saveExcel') {
this.handleSaveResultsToFile('xls')
} else if (child.key == 'saveHtml') {
this.handleSaveResultsToFile('html')
} }
}, },
}, },
@ -1048,7 +1140,6 @@ export default {
type: 'a-menu-item', type: 'a-menu-item',
title: 'ARR', title: 'ARR',
handler: () => { handler: () => {
console.log(this.newSampleData)
if (this.newSampleData.sampleId) { if (this.newSampleData.sampleId) {
this.arrOrRRRModalVisible = true this.arrOrRRRModalVisible = true
this.arrOrRRRModalExtraData = {} this.arrOrRRRModalExtraData = {}
@ -1196,7 +1287,9 @@ export default {
type: 'a-menu-item', type: 'a-menu-item',
title: 'BG log viewer', title: 'BG log viewer',
show: this.isBetaGamma, show: this.isBetaGamma,
handler: () => {}, handler: () => {
this.bgLogViewerVisible = true
},
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',