Merge branch 'feature-analysis-RLR-renpy' of http://git.hivekion.com:3000/xiaoguangbin/AnalysisSystemForRadionuclide_vue into master-dev
This commit is contained in:
commit
118814f667
|
@ -80,9 +80,13 @@ export class PHDParser {
|
|||
|
||||
// 如果解析的是sample 文件,则解析相关联的文件
|
||||
if (this.isSample) {
|
||||
const filePrefixes = this.getFilePrefixes(headerInfo[2])
|
||||
this.sampleFilePrefix = filePrefixes.splice(0, 1)[0]
|
||||
this.otherFilePrefixes = filePrefixes
|
||||
if (this.fileType == 'B') {
|
||||
const filePrefixes = this.getFilePrefixes(headerInfo[2])
|
||||
this.sampleFilePrefix = filePrefixes.splice(0, 1)[0]
|
||||
this.otherFilePrefixes = filePrefixes
|
||||
} else {
|
||||
this.sampleFilePrefix = this.getGammaFilePrefix(headerInfo[2])
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -166,7 +170,7 @@ export class PHDParser {
|
|||
}
|
||||
|
||||
/**
|
||||
* 获取全部文件名
|
||||
* 获取全部文件名前缀
|
||||
* @param {string} text
|
||||
*/
|
||||
getFilePrefixes(text) {
|
||||
|
@ -179,4 +183,15 @@ export class PHDParser {
|
|||
})
|
||||
return filePrefixes
|
||||
}
|
||||
|
||||
/**
|
||||
* 获取gamma的文件名前缀
|
||||
* @param {string} text
|
||||
*/
|
||||
getGammaFilePrefix(text) {
|
||||
const regExp = /[A-Z]{1,}\d{1,}_\d{1,}-\d{4}\/\d{2}\/\d{2}[-\s]\d{2}:\d{2}/
|
||||
const result = text.match(regExp)
|
||||
const regExpDate = /(\d{4})\/(\d{2})\/(\d{2})[ -](\d{2}):(\d{2})/
|
||||
return result[0].replace(regExpDate, '$1$2$3_$4$5') + '_'
|
||||
}
|
||||
}
|
||||
|
|
|
@ -121,7 +121,7 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import { getAction } from '../../api/manage'
|
||||
import { getAction, postAction } from '../../api/manage'
|
||||
import BetaGammaChartContainer from './components/BetaGammaChartContainer.vue'
|
||||
import BetaGammaSpectrumChart from './components/BetaGammaSpectrumChart.vue'
|
||||
import StatisticsParamerHistoryModalForQcFlags from './components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue'
|
||||
|
@ -180,14 +180,15 @@ export default {
|
|||
sample: {
|
||||
type: Object,
|
||||
},
|
||||
analyseCurrentSpectrum: {
|
||||
type: Object,
|
||||
},
|
||||
// analyseCurrentSpectrum: {
|
||||
// type: Object,
|
||||
// },
|
||||
},
|
||||
data() {
|
||||
this.SampleType = SampleType
|
||||
|
||||
return {
|
||||
analyseCurrentSpectrum: {},
|
||||
qcFlags: {},
|
||||
|
||||
spectraVisible: false,
|
||||
|
@ -449,6 +450,59 @@ export default {
|
|||
this.betaEnergyData = energy
|
||||
}
|
||||
},
|
||||
// beta Analyze current spectrum 分析接口
|
||||
getAnalyzeCurrentSpectrum() {
|
||||
let params = {
|
||||
dbNames: [this.sample.dbName],
|
||||
sampleIds: [this.sample.sampleId ? this.sample.sampleId : ''],
|
||||
sampleFileNames: [this.sample.inputFileName],
|
||||
gasFileNames: [this.sample.gasFileName],
|
||||
detFileNames: [this.sample.detFileName],
|
||||
qcFileNames: [this.sample.qcFileName],
|
||||
}
|
||||
postAction('/spectrumAnalysis/analyseCurrentSpectrum', params).then((res) => {
|
||||
if (res.success) {
|
||||
// this.isReAnalyed_beta = true
|
||||
this.analyseCurrentSpectrum = res.result
|
||||
if (res.result.XeData && res.result.XeData.length > 0) {
|
||||
res.result.XeData.forEach((item) => {
|
||||
item.conc = parseFloat(item.conc.toPrecision(6))
|
||||
item.concErr = parseFloat(item.concErr.toPrecision(6))
|
||||
item.lc = parseFloat(item.lc.toPrecision(6))
|
||||
item.mdc = parseFloat(item.mdc.toPrecision(6))
|
||||
})
|
||||
this.$emit('reAnalyCurr', true, res.result.XeData)
|
||||
}
|
||||
} else {
|
||||
this.$message.warning(res.message)
|
||||
}
|
||||
})
|
||||
},
|
||||
getAnalyzeAllSpectrum() {
|
||||
let params = {
|
||||
dbNames: [this.sample.dbName],
|
||||
sampleIds: [this.sample.sampleId ? this.sample.sampleId : ''],
|
||||
sampleFileNames: [this.sample.inputFileName],
|
||||
gasFileNames: [this.sample.gasFileName],
|
||||
detFileNames: [this.sample.detFileName],
|
||||
qcFileNames: [this.sample.qcFileName],
|
||||
currentFileName: this.sample.inputFileName,
|
||||
}
|
||||
postAction('/spectrumAnalysis/analyseAllSpectrum', params).then((res) => {
|
||||
if (res.success) {
|
||||
this.analyseCurrentSpectrum = res.result
|
||||
res.result.XeData.forEach((item) => {
|
||||
item.conc = parseFloat(item.conc.toPrecision(6))
|
||||
item.concErr = parseFloat(item.concErr.toPrecision(6))
|
||||
item.lc = parseFloat(item.lc.toPrecision(6))
|
||||
item.mdc = parseFloat(item.mdc.toPrecision(6))
|
||||
})
|
||||
this.$emit('reAnalyAll', true, res.result.XeData)
|
||||
} else {
|
||||
this.$message.warning(res.message)
|
||||
}
|
||||
})
|
||||
},
|
||||
},
|
||||
watch: {
|
||||
sample: {
|
||||
|
@ -482,7 +536,7 @@ export default {
|
|||
this.$store.commit('UPDATE_SAMPLE_DATA', {
|
||||
inputFileName: this.sample.inputFileName,
|
||||
key: 'XeData',
|
||||
data: newVal.XeData
|
||||
data: newVal.XeData,
|
||||
})
|
||||
},
|
||||
immediate: true,
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
<a-button type="primary" :disabled="isLoading" :loading="isAcceptting" @click="handlePeaks(true)">
|
||||
Peaks
|
||||
</a-button>
|
||||
<a-button>Cancel</a-button>
|
||||
<a-button @click="visible = false">Cancel</a-button>
|
||||
</a-space>
|
||||
</div>
|
||||
</custom-modal>
|
||||
|
|
|
@ -59,6 +59,7 @@
|
|||
</a-form-model>
|
||||
</div>
|
||||
<a-table
|
||||
ref="tableRef"
|
||||
:class="list.length ? 'has-data' : ''"
|
||||
:columns="columns"
|
||||
:dataSource="list"
|
||||
|
@ -77,9 +78,7 @@
|
|||
<!-- 以下是图表部分 -->
|
||||
<div class="nuclide-review-chart">
|
||||
<div class="nuclide-review-chart-prev">
|
||||
<span @click="handleChangeChart('prev')">
|
||||
<
|
||||
</span>
|
||||
<span @click="handleChangeChart('prev')"> < </span>
|
||||
</div>
|
||||
<a-row class="nuclide-review-chart-list">
|
||||
<a-col class="nuclide-review-chart-item" :span="8" v-for="(chartItem, index) in currChartList" :key="index">
|
||||
|
@ -94,9 +93,7 @@
|
|||
</a-col>
|
||||
</a-row>
|
||||
<div class="nuclide-review-chart-next">
|
||||
<span @click="handleChangeChart('next')">
|
||||
>
|
||||
</span>
|
||||
<span @click="handleChangeChart('next')"> > </span>
|
||||
</div>
|
||||
</div>
|
||||
<!-- 图表部分结束 -->
|
||||
|
@ -116,32 +113,32 @@ const columns = [
|
|||
width: '5%',
|
||||
customRender: (_, __, index) => {
|
||||
return index + 1
|
||||
}
|
||||
},
|
||||
},
|
||||
{
|
||||
title: 'Full Name',
|
||||
dataIndex: 'fullName',
|
||||
width: '15%'
|
||||
width: '15%',
|
||||
},
|
||||
{
|
||||
title: 'Energy',
|
||||
dataIndex: 'energy',
|
||||
width: '15%'
|
||||
width: '15%',
|
||||
},
|
||||
{
|
||||
title: 'Energy Err',
|
||||
dataIndex: 'energyUncert',
|
||||
width: '15%'
|
||||
width: '15%',
|
||||
},
|
||||
{
|
||||
title: 'Abundance(%)',
|
||||
dataIndex: 'yield',
|
||||
width: '15%'
|
||||
width: '15%',
|
||||
},
|
||||
{
|
||||
title: 'Abundance Err(%)',
|
||||
dataIndex: 'yieldUncert',
|
||||
width: '15%'
|
||||
width: '15%',
|
||||
},
|
||||
{
|
||||
title: 'KeyLine',
|
||||
|
@ -149,20 +146,20 @@ const columns = [
|
|||
width: '15%',
|
||||
align: 'center',
|
||||
scopedSlots: {
|
||||
customRender: 'keyLine'
|
||||
}
|
||||
}
|
||||
customRender: 'keyLine',
|
||||
},
|
||||
},
|
||||
]
|
||||
export default {
|
||||
components: { NuclideReviewChart },
|
||||
mixins: [ModalMixin, SampleDataMixin],
|
||||
props: {
|
||||
channel: {
|
||||
type: Number
|
||||
type: Number,
|
||||
},
|
||||
nuclide: {
|
||||
type: String
|
||||
}
|
||||
type: String,
|
||||
},
|
||||
},
|
||||
data() {
|
||||
this.columns = columns
|
||||
|
@ -177,13 +174,13 @@ export default {
|
|||
currChartList: [], // 当前展示的图表的列表,一般是3个
|
||||
|
||||
model: {},
|
||||
info: {}
|
||||
info: {},
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
// 搜索栏的向前/向后按钮
|
||||
handleNuclideChange(direction) {
|
||||
const currIndex = this.nuclideList.findIndex(item => item == this.currNuclide)
|
||||
const currIndex = this.nuclideList.findIndex((item) => item == this.currNuclide)
|
||||
if (direction == 'prev' && currIndex > 0) {
|
||||
this.handleNuclideClick(currIndex - 1)
|
||||
} else if (direction == 'next' && currIndex !== this.nuclideList.length - 1) {
|
||||
|
@ -191,6 +188,13 @@ export default {
|
|||
}
|
||||
},
|
||||
|
||||
scrollIntoView(index) {
|
||||
const tableEle = this.$refs.tableRef.$el
|
||||
const tableBodyEle = tableEle.querySelector('.ant-table-body')
|
||||
const prevEle = tableBodyEle.querySelector(`.ant-table-row:nth-child(${index + 1})`)
|
||||
tableBodyEle.scrollTop = prevEle.offsetTop
|
||||
},
|
||||
|
||||
// 左侧核素列表点击
|
||||
handleNuclideClick(index) {
|
||||
this.currNuclide = this.nuclideList[index]
|
||||
|
@ -226,15 +230,19 @@ export default {
|
|||
const willJumpIndex = currIndex - 3
|
||||
if (willJumpIndex >= 0) {
|
||||
this.selectTableRow(willJumpIndex)
|
||||
this.scrollIntoView(willJumpIndex)
|
||||
} else {
|
||||
this.selectTableRow(0)
|
||||
this.scrollIntoView(0)
|
||||
}
|
||||
} else if (direction == 'next') {
|
||||
const willJumpIndex = currIndex + 3
|
||||
if (willJumpIndex <= this.list.length - 2) {
|
||||
this.selectTableRow(willJumpIndex)
|
||||
this.scrollIntoView(willJumpIndex)
|
||||
} else {
|
||||
this.selectTableRow(this.list.length - 1)
|
||||
this.scrollIntoView(this.list.length - 1)
|
||||
}
|
||||
}
|
||||
},
|
||||
|
@ -246,8 +254,8 @@ export default {
|
|||
on: {
|
||||
click: () => {
|
||||
this.selectTableRow(index)
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
}
|
||||
},
|
||||
|
||||
|
@ -259,17 +267,15 @@ export default {
|
|||
const { success, result, message } = await getAction('/gamma/nuclideReview', {
|
||||
sampleId: sampleId,
|
||||
channel: this.channel,
|
||||
fileName
|
||||
fileName,
|
||||
})
|
||||
if (success) {
|
||||
this.model = {
|
||||
energy: result.energy,
|
||||
tolerance: 0.5
|
||||
energy: result ? result.energy : undefined,
|
||||
tolerance: 0.5,
|
||||
}
|
||||
|
||||
this.handleResData(result)
|
||||
this.isLoading = false
|
||||
|
||||
if (this.nuclide && this.nuclideList.length) {
|
||||
this.currNuclide = this.nuclide
|
||||
this.getInfoByNuclide()
|
||||
|
@ -279,18 +285,32 @@ export default {
|
|||
}
|
||||
} catch (error) {
|
||||
console.error(error)
|
||||
} finally {
|
||||
this.isLoading = false
|
||||
}
|
||||
},
|
||||
|
||||
// 处理返回的数据
|
||||
handleResData(result) {
|
||||
if (!result) {
|
||||
result = {
|
||||
chart: [],
|
||||
halfLife: null,
|
||||
halfLifeErr: null,
|
||||
lines: null,
|
||||
list: [],
|
||||
name: '',
|
||||
table: [],
|
||||
}
|
||||
}
|
||||
|
||||
const { chart, halfLife, halfLifeErr, lines, list, name, table } = result
|
||||
|
||||
this.info = {
|
||||
halfLife,
|
||||
halfLifeErr,
|
||||
lines,
|
||||
name
|
||||
name,
|
||||
}
|
||||
|
||||
this.list = table
|
||||
|
@ -311,7 +331,7 @@ export default {
|
|||
const { success, result, message } = await getAction('/gamma/changeNuclide', {
|
||||
sampleId,
|
||||
nuclideName: this.currNuclide,
|
||||
fileName: inputFileName
|
||||
fileName: inputFileName,
|
||||
})
|
||||
if (success) {
|
||||
const { chart, halfLife, halfLifeErr, lines, name, table } = result
|
||||
|
@ -320,7 +340,7 @@ export default {
|
|||
halfLife,
|
||||
halfLifeErr,
|
||||
lines,
|
||||
name
|
||||
name,
|
||||
}
|
||||
|
||||
this.list = table
|
||||
|
@ -350,7 +370,7 @@ export default {
|
|||
const { success, result, message } = await getAction('/gamma/searchNuclide', {
|
||||
sampleId,
|
||||
fileName,
|
||||
...this.model
|
||||
...this.model,
|
||||
})
|
||||
if (success) {
|
||||
this.handleResData(result)
|
||||
|
@ -362,8 +382,8 @@ export default {
|
|||
} finally {
|
||||
this.isLoading = false
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
}
|
||||
</script>
|
||||
|
||||
|
|
|
@ -550,9 +550,7 @@ export default {
|
|||
this.option.series = series
|
||||
|
||||
this.thumbnailOption.series = this.buildBarChart(bar)
|
||||
const thumbnailYMax = this.getThumbnailYMax(0, bar.length)
|
||||
this.thumbnailOption.yAxis.max = thumbnailYMax
|
||||
this.thumbnailOption.yAxis.min = -thumbnailYMax
|
||||
this.setThumbnailRange(1, bar.length)
|
||||
},
|
||||
|
||||
reset() {
|
||||
|
@ -712,6 +710,8 @@ export default {
|
|||
let nextMin = xAxis - halfDiff
|
||||
chartXAxisOption.max = nextMax > lastChannel ? lastChannel : nextMax
|
||||
chartXAxisOption.min = nextMin < 1 ? 1 : nextMin
|
||||
|
||||
this.setThumbnailRange(chartXAxisOption.min, chartXAxisOption.max)
|
||||
}
|
||||
},
|
||||
|
||||
|
@ -799,6 +799,7 @@ export default {
|
|||
shapeChannelData,
|
||||
shapeEnergyData,
|
||||
peak: table,
|
||||
barChart: this.barChart
|
||||
})
|
||||
|
||||
this.channelPeakChart = channelPeakChart
|
||||
|
@ -888,6 +889,7 @@ export default {
|
|||
shapeChannelData,
|
||||
shapeEnergyData,
|
||||
peak: table,
|
||||
barChart: this.barChart,
|
||||
})
|
||||
|
||||
this.channelPeakChart = channelPeakChart
|
||||
|
@ -911,6 +913,8 @@ export default {
|
|||
this.resetChartOpts()
|
||||
|
||||
this.selectedKeys = []
|
||||
|
||||
this.selectedTableItem = null
|
||||
} else {
|
||||
this.$message.error(message)
|
||||
}
|
||||
|
@ -960,6 +964,8 @@ export default {
|
|||
let nextMin = channel - halfDiff
|
||||
chartXAxisOption.max = nextMax > lastChannel ? lastChannel : nextMax
|
||||
chartXAxisOption.min = nextMin < 1 ? 1 : nextMin
|
||||
|
||||
this.setThumbnailRange(chartXAxisOption.min, chartXAxisOption.max)
|
||||
}
|
||||
|
||||
this.getSelPosNuclide(row)
|
||||
|
@ -1030,12 +1036,7 @@ export default {
|
|||
this.option.yAxis.min = y1
|
||||
this.option.yAxis.max = y2
|
||||
|
||||
const thumbnailYMax = this.getThumbnailYMax(x1 - 1, x2)
|
||||
this.thumbnailOption.xAxis.min = x1
|
||||
this.thumbnailOption.xAxis.max = x2
|
||||
this.thumbnailOption.yAxis.max = thumbnailYMax
|
||||
this.thumbnailOption.yAxis.min = -thumbnailYMax
|
||||
|
||||
this.setThumbnailRange(x1, x2)
|
||||
if (this.btnGroupType == 2) {
|
||||
this.buildRect()
|
||||
}
|
||||
|
@ -1044,12 +1045,17 @@ export default {
|
|||
},
|
||||
|
||||
// 查找barChart范围内的最大值
|
||||
getThumbnailYMax(minIndex, maxIndex) {
|
||||
const slicedArr = this.barChart.slice(minIndex, maxIndex)
|
||||
setThumbnailRange(x1, x2) {
|
||||
const slicedArr = this.barChart.slice(x1 - 1, x2)
|
||||
const yData = slicedArr.map(({ y }) => y)
|
||||
const max = Math.max(...yData)
|
||||
const min = Math.min(...yData)
|
||||
return Math.max(Math.abs(max), Math.abs(min))
|
||||
const thumbnailYMax = Math.max(Math.abs(max), Math.abs(min))
|
||||
|
||||
this.thumbnailOption.xAxis.min = x1
|
||||
this.thumbnailOption.xAxis.max = x2
|
||||
this.thumbnailOption.yAxis.max = thumbnailYMax
|
||||
this.thumbnailOption.yAxis.min = -thumbnailYMax
|
||||
},
|
||||
|
||||
handleResetChart() {
|
||||
|
@ -1058,11 +1064,7 @@ export default {
|
|||
this.option.yAxis.min = 0.1
|
||||
this.option.yAxis.max = 'dataMax'
|
||||
|
||||
const thumbnailYMax = this.getThumbnailYMax(0, this.barChart.length)
|
||||
this.thumbnailOption.xAxis.min = 1
|
||||
this.thumbnailOption.xAxis.max = 'dataMax'
|
||||
this.thumbnailOption.yAxis.max = thumbnailYMax
|
||||
this.thumbnailOption.yAxis.min = -thumbnailYMax
|
||||
this.setThumbnailRange(1, this.barChart.length)
|
||||
|
||||
if (this.btnGroupType == 2) {
|
||||
this.buildRect()
|
||||
|
|
|
@ -114,7 +114,7 @@ export default {
|
|||
return {
|
||||
queryParam: {
|
||||
menuTypes: 'G,B',
|
||||
sampleType: 'P',
|
||||
sampleType: '',
|
||||
startDate: moment().add(-7, 'd').format('YYYY-MM-DD'),
|
||||
endDate: moment().format('YYYY-MM-DD'),
|
||||
dbName: 'auto',
|
||||
|
@ -326,13 +326,19 @@ export default {
|
|||
]
|
||||
if (event == 'B') {
|
||||
this.sampleTypeOption = arr_B
|
||||
this.queryParam.sampleType = 'B'
|
||||
this.$nextTick(() => {
|
||||
this.queryParam.sampleType = 'B'
|
||||
})
|
||||
} else if (event == 'G') {
|
||||
this.sampleTypeOption = arr_G
|
||||
this.queryParam.sampleType = 'P'
|
||||
this.$nextTick(() => {
|
||||
this.queryParam.sampleType = 'P'
|
||||
})
|
||||
} else {
|
||||
this.sampleTypeOption = arr_A
|
||||
this.queryParam.sampleType = 'P'
|
||||
this.$nextTick(() => {
|
||||
this.queryParam.sampleType = ''
|
||||
})
|
||||
}
|
||||
this.getStationAndDetectorList(event)
|
||||
},
|
||||
|
|
|
@ -133,7 +133,7 @@
|
|||
</a-upload>
|
||||
<a-button type="primary" @click="handleReset">Reset</a-button>
|
||||
<a-button :loading="isUploadingZip" type="primary" @click="handleLoad">Load</a-button>
|
||||
<a-button type="primary" @click="handleCancel">Cancel</a-button>
|
||||
<a-button type="warn" @click="handleCancel">Cancel</a-button>
|
||||
</a-space>
|
||||
</template>
|
||||
<!-- 底部按钮结束 -->
|
||||
|
|
|
@ -1368,9 +1368,13 @@ export default {
|
|||
|
||||
// 从分析工具刷新部分数据
|
||||
handleRefresh(data) {
|
||||
data.DetailedInformation = this.detailedInfomation
|
||||
data.QCFlag = this.qcFlags
|
||||
data.BaseCtrls = this.baseCtrls
|
||||
Object.assign(data, {
|
||||
DetailedInformation: this.detailedInfomation,
|
||||
QCFlag: this.qcFlags,
|
||||
BaseCtrls: this.baseCtrls,
|
||||
bAnalyed: this.bAnalyed
|
||||
})
|
||||
|
||||
this.clearCompareLine()
|
||||
this.redrawPeakLine()
|
||||
this.dataProcess(data)
|
||||
|
@ -1378,7 +1382,7 @@ export default {
|
|||
|
||||
// 分析工具Accept时刷新部分数据
|
||||
handleAccept(data) {
|
||||
const { allData, peakSet, shadowChannelChart, shadowEnergyChart, shapeChannelData, shapeEnergyData } = data
|
||||
const { allData, peakSet, shadowChannelChart, shadowEnergyChart, shapeChannelData, shapeEnergyData, barChart } = data
|
||||
|
||||
const result = {
|
||||
DetailedInformation: this.detailedInfomation,
|
||||
|
@ -1386,11 +1390,12 @@ export default {
|
|||
allData,
|
||||
shadowChannelChart,
|
||||
shadowEnergyChart,
|
||||
|
||||
shapeChannelData,
|
||||
shapeEnergyData,
|
||||
peak: peakSet,
|
||||
BaseCtrls: this.baseCtrls,
|
||||
bAnalyed: this.bAnalyed,
|
||||
barChart
|
||||
}
|
||||
this.clearCompareLine()
|
||||
this.redrawPeakLine()
|
||||
|
|
|
@ -49,6 +49,8 @@
|
|||
ref="betaGammaAnalysisRef"
|
||||
@getFiles="getFiles"
|
||||
@sendInfo="getStationName"
|
||||
@reAnalyCurr="getReAnalyCurr"
|
||||
@reAnalyAll="getReAnalyAll"
|
||||
:sample="sampleData"
|
||||
:analyseCurrentSpectrum="analyseCurrentSpectrumData"
|
||||
/>
|
||||
|
@ -376,18 +378,19 @@ export default {
|
|||
resultDisplayFlag: [],
|
||||
params_toDB: {
|
||||
comment: '',
|
||||
savedAnalysisResult: false,
|
||||
stationName: '',
|
||||
dbName: '',
|
||||
sampleFileName: '',
|
||||
gasFileName: '',
|
||||
detFileName: '',
|
||||
qcFileName: '',
|
||||
bGammaEnergyValidSample: false,
|
||||
bBetaEnergyValidSample: false,
|
||||
bGammaEnergyValidGas: false,
|
||||
bBetaEnergyValidGas: false,
|
||||
bGammaEnergyValidDet: false,
|
||||
bBetaEnergyValidDet: false,
|
||||
// bGammaEnergyValidSample: false,
|
||||
// bBetaEnergyValidSample: false,
|
||||
// bGammaEnergyValidGas: false,
|
||||
// bBetaEnergyValidGas: false,
|
||||
// bGammaEnergyValidDet: false,
|
||||
// bBetaEnergyValidDet: false,
|
||||
checkSample: false,
|
||||
checkGas: false,
|
||||
checkDet: false,
|
||||
|
@ -425,6 +428,14 @@ export default {
|
|||
},
|
||||
|
||||
methods: {
|
||||
getReAnalyCurr(flag, val) {
|
||||
this.isReAnalyed_beta = flag
|
||||
this.params_toDB.savedAnalysisResult = true
|
||||
this.resultDisplayFlag = val
|
||||
},
|
||||
getReAnalyAll(val) {
|
||||
this.resultDisplayFlag = val
|
||||
},
|
||||
handleReAnalyed(val) {
|
||||
this.isReAnalyed_gamma = val
|
||||
},
|
||||
|
@ -498,6 +509,7 @@ export default {
|
|||
this.analysisType = ANALYZE_TYPE.GAMMA
|
||||
}
|
||||
this.sampleData = this.newSampleData = sample
|
||||
this.params_toDB.savedAnalysisResult = sample.sampleId ? true : false
|
||||
this.params_toDB.comment = ''
|
||||
},
|
||||
|
||||
|
@ -583,11 +595,8 @@ export default {
|
|||
* @param { 'all' | 'current' } type
|
||||
*/
|
||||
async handleSaveResultsToDB(type) {
|
||||
if (this.isBetaGamma) {
|
||||
if (type === 'current') {
|
||||
this.handleSaveResultsToDB_Cuurrent()
|
||||
}
|
||||
} else if (this.isGamma) {
|
||||
if (this.isReAnalyed_gamma) {
|
||||
this.isSaving = true
|
||||
if (type == 'current') {
|
||||
const hideLoading = this.$message.loading('Saving...', 0)
|
||||
try {
|
||||
|
@ -603,36 +612,46 @@ export default {
|
|||
console.error(error)
|
||||
} finally {
|
||||
hideLoading()
|
||||
this.isSaving = false
|
||||
}
|
||||
}
|
||||
} else {
|
||||
this.$message.warn('Please Analyse Spectrum First')
|
||||
}
|
||||
},
|
||||
handleSaveResultsToDB_Cuurrent() {
|
||||
// xeflag params_toDB
|
||||
if (this.resultDisplayFlag.length > 0) {
|
||||
this.resultDisplayFlag.forEach((item) => {
|
||||
if (item.nuclideName === 'Xe131m') {
|
||||
this.params_toDB.xe131mFlag = item.nidFlag
|
||||
} else if (item.nuclideName === 'Xe133') {
|
||||
this.params_toDB.xe133Flag = item.nidFlag
|
||||
} else if (item.nuclideName === 'Xe133m') {
|
||||
this.params_toDB.xe133mFlag = item.nidFlag
|
||||
} else if (item.nuclideName === 'Xe135') {
|
||||
this.params_toDB.xe135Flag = item.nidFlag
|
||||
}
|
||||
})
|
||||
this.params_toDB.sampleFileName = this.newSampleData.inputFileName
|
||||
this.params_toDB.gasFileName = this.newSampleData.gasFileName
|
||||
this.params_toDB.detFileName = this.newSampleData.detFileName
|
||||
this.params_toDB.qcFileName = this.newSampleData.qcFileName
|
||||
this.params_toDB.dbName = this.newSampleData.dbName
|
||||
postAction('/spectrumAnalysis/saveToDB', this.params_toDB).then((res) => {
|
||||
if (res.success) {
|
||||
this.$message.success('Save Successfully!')
|
||||
} else {
|
||||
this.$message.warning('Fail To Save')
|
||||
}
|
||||
})
|
||||
if (this.params_toDB.savedAnalysisResult) {
|
||||
if (this.resultDisplayFlag.length > 0) {
|
||||
this.resultDisplayFlag.forEach((item) => {
|
||||
if (item.nuclideName === 'Xe131m') {
|
||||
this.params_toDB.xe131mFlag = item.nidFlag
|
||||
} else if (item.nuclideName === 'Xe133') {
|
||||
this.params_toDB.xe133Flag = item.nidFlag
|
||||
} else if (item.nuclideName === 'Xe133m') {
|
||||
this.params_toDB.xe133mFlag = item.nidFlag
|
||||
} else if (item.nuclideName === 'Xe135') {
|
||||
this.params_toDB.xe135Flag = item.nidFlag
|
||||
}
|
||||
})
|
||||
this.params_toDB.sampleFileName = this.newSampleData.inputFileName
|
||||
this.params_toDB.gasFileName = this.newSampleData.gasFileName
|
||||
this.params_toDB.detFileName = this.newSampleData.detFileName
|
||||
this.params_toDB.qcFileName = this.newSampleData.qcFileName
|
||||
this.params_toDB.dbName = this.newSampleData.dbName
|
||||
this.isSaving = true
|
||||
postAction('/spectrumAnalysis/saveToDB', this.params_toDB).then((res) => {
|
||||
if (res.success) {
|
||||
this.$message.success('Save Successfully!')
|
||||
this.isSaving = false
|
||||
} else {
|
||||
this.isSaving = false
|
||||
this.$message.warning(`${res.message}`)
|
||||
}
|
||||
})
|
||||
}
|
||||
} else {
|
||||
this.$message.warn('Please Analyse Spectrum First')
|
||||
}
|
||||
},
|
||||
|
||||
|
@ -712,57 +731,6 @@ export default {
|
|||
handleReanalyse(...data) {
|
||||
this.$refs.betaGammaAnalysisRef.reanalyse(data)
|
||||
},
|
||||
// beta Analyze current spectrum 分析接口
|
||||
getAnalyzeCurrentSpectrum() {
|
||||
let params = {
|
||||
dbNames: [this.newSampleData.dbName],
|
||||
sampleIds: [this.newSampleData.sampleId ? this.newSampleData.sampleId : ''],
|
||||
sampleFileNames: [this.newSampleData.inputFileName],
|
||||
gasFileNames: [this.newSampleData.gasFileName],
|
||||
detFileNames: [this.newSampleData.detFileName],
|
||||
qcFileNames: [this.newSampleData.qcFileName],
|
||||
}
|
||||
postAction('/spectrumAnalysis/analyseCurrentSpectrum', params).then((res) => {
|
||||
if (res.success) {
|
||||
this.isReAnalyed_beta = true
|
||||
this.analyseCurrentSpectrumData = res.result
|
||||
this.resultDisplayFlag = res.result.XeData
|
||||
this.resultDisplayFlag.forEach((item) => {
|
||||
item.conc = parseFloat(item.conc.toPrecision(6))
|
||||
item.concErr = parseFloat(item.concErr.toPrecision(6))
|
||||
item.lc = parseFloat(item.lc.toPrecision(6))
|
||||
item.mdc = parseFloat(item.mdc.toPrecision(6))
|
||||
})
|
||||
} else {
|
||||
this.$message.warning(res.message)
|
||||
}
|
||||
})
|
||||
},
|
||||
getAnalyzeAllSpectrum() {
|
||||
let params = {
|
||||
dbNames: [this.newSampleData.dbName],
|
||||
sampleIds: [this.newSampleData.sampleId ? this.newSampleData.sampleId : ''],
|
||||
sampleFileNames: [this.newSampleData.inputFileName],
|
||||
gasFileNames: [this.newSampleData.gasFileName],
|
||||
detFileNames: [this.newSampleData.detFileName],
|
||||
qcFileNames: [this.newSampleData.qcFileName],
|
||||
currentFileName: this.newSampleData.inputFileName,
|
||||
}
|
||||
postAction('/spectrumAnalysis/analyseAllSpectrum', params).then((res) => {
|
||||
if (res.success) {
|
||||
this.analyseCurrentSpectrumData = res.result
|
||||
this.resultDisplayFlag = res.result.XeData
|
||||
this.resultDisplayFlag.forEach((item) => {
|
||||
item.conc = parseFloat(item.conc.toPrecision(6))
|
||||
item.concErr = parseFloat(item.concErr.toPrecision(6))
|
||||
item.lc = parseFloat(item.lc.toPrecision(6))
|
||||
item.mdc = parseFloat(item.mdc.toPrecision(6))
|
||||
})
|
||||
} else {
|
||||
this.$message.warning(res.message)
|
||||
}
|
||||
})
|
||||
},
|
||||
handleEnergyCalib() {
|
||||
if (this.newSampleData.sampleId) {
|
||||
if (this.newSampleData.qcFileName) {
|
||||
|
@ -897,6 +865,7 @@ export default {
|
|||
show: this.isBetaGamma,
|
||||
},
|
||||
],
|
||||
key: 'resultsToFile',
|
||||
},
|
||||
{
|
||||
title: 'Save Results to DB',
|
||||
|
@ -904,6 +873,7 @@ export default {
|
|||
{
|
||||
title: 'Save Current',
|
||||
key: 'current',
|
||||
show: this.isGamma,
|
||||
},
|
||||
{
|
||||
title: 'Save All',
|
||||
|
@ -932,10 +902,14 @@ export default {
|
|||
width: '170px',
|
||||
},
|
||||
on: {
|
||||
menuClick: () => {
|
||||
if (this.isGamma) {
|
||||
menuClick: (item) => {
|
||||
if (this.isGamma && item.key == 'resultsToFile') {
|
||||
this.saveSettingModalVisible = true
|
||||
}
|
||||
if (this.isBetaGamma && item.key == 'resultsToDB') {
|
||||
// beta save to db
|
||||
this.handleSaveResultsToDB_Cuurrent()
|
||||
}
|
||||
},
|
||||
submenuClick: ({ item, child }) => {
|
||||
if (item.key == 'resultsToDB') {
|
||||
|
@ -1001,7 +975,8 @@ export default {
|
|||
title: 'Analyze current spectrum',
|
||||
show: this.isBetaGamma,
|
||||
handler: () => {
|
||||
this.getAnalyzeCurrentSpectrum()
|
||||
// this.getAnalyzeCurrentSpectrum()
|
||||
this.$refs.betaGammaAnalysisRef.getAnalyzeCurrentSpectrum()
|
||||
},
|
||||
},
|
||||
{
|
||||
|
@ -1009,7 +984,8 @@ export default {
|
|||
title: 'Analyze all spectra',
|
||||
show: this.isBetaGamma,
|
||||
handler: () => {
|
||||
this.getAnalyzeAllSpectrum()
|
||||
// this.getAnalyzeAllSpectrum()
|
||||
this.$refs.betaGammaAnalysisRef.getAnalyzeAllSpectrum()
|
||||
},
|
||||
},
|
||||
],
|
||||
|
|
Loading…
Reference in New Issue
Block a user