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

beta 模块的RLR 弹窗查询接口调整

Browse Source 
beta 模块的RLR 弹窗save下载文件接口联调
This commit is contained in:
任珮宇 2023-09-13 19:01:21 +08:00
parent c2fde1336e
commit e4732fbb55
11 changed files with 803 additions and 495 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/api/manage.js
View File

@ -28,6 +28,21 @@ export function postAction(url,parameter) {
headers: signHeader headers: signHeader
}) })
} }
export function postFileAction(url, parameter) {
let sign = signMd5Utils.getSign(url, parameter);
//将签名和时间戳，添加在请求接口 Header
// update-begin--author:taoyan---date:20220421--for: VUEN-410【签名改造】 X-TIMESTAMP牵扯
let signHeader = { "X-Sign": sign, "X-TIMESTAMP": signMd5Utils.getTimestamp() };
// update-end--author:taoyan---date:20220421--for: VUEN-410【签名改造】 X-TIMESTAMP牵扯
return axios({
url: url,
method: 'post',
data: parameter,
responseType: "blob",
headers: signHeader
})
}
//post method= {post | put} //post method= {post | put}
export function httpAction(url, parameter, method) { export function httpAction(url, parameter, method) {
@ -222,7 +237,7 @@ export function getFileAccessHttpUrl(avatar,subStr) {
if (avatar && avatar.startsWith(subStr)) { if (avatar && avatar.startsWith(subStr)) {
return avatar; return avatar;
} else { } else {
if(avatar &&　avatar.length>0 && avatar.indexOf('[')==-1){ if (avatar && avatar.length > 0 && avatar.indexOf('[') == -1) {
return window._CONFIG['staticDomainURL'] + "/" + avatar; return window._CONFIG['staticDomainURL'] + "/" + avatar;
} }
} }

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

@ -11,7 +11,12 @@
QC Flags QC Flags
<beta-gamma-qc-flags slot="content" :data="qcFlags" @click="handleQcFlagClick" /> <beta-gamma-qc-flags slot="content" :data="qcFlags" @click="handleQcFlagClick" />
</pop-over-with-icon> </pop-over-with-icon>
<custom-select v-model="spectraType" :options="SampleType" @change="changeChartByType" style="width: 246px;"></custom-select> <custom-select
v-model="spectraType"
:options="SampleType"
@change="changeChartByType"
style="width: 246px"
></custom-select>
</div> </div>
<!-- 二级交互栏结束 --> <!-- 二级交互栏结束 -->
@ -20,9 +25,7 @@
<!-- 左侧图表 --> <!-- 左侧图表 -->
<div class="beta-gamma-spectrum-sample"> <div class="beta-gamma-spectrum-sample">
<beta-gamma-chart-container> <beta-gamma-chart-container>
<template slot="title"> <template slot="title"> Beta-Gamma Spectrum: Sample </template>
Beta-Gamma Spectrum: Sample
</template>
<beta-gamma-spectrum-chart <beta-gamma-spectrum-chart
ref="betaGammaChartRef" ref="betaGammaChartRef"
:histogramDataList="histogramDataList" :histogramDataList="histogramDataList"
@ -42,9 +45,7 @@
<div class="gamma-spectrum"> <div class="gamma-spectrum">
<div class="gamma-spectrum-item"> <div class="gamma-spectrum-item">
<beta-gamma-chart-container> <beta-gamma-chart-container>
<template slot="title"> <template slot="title"> Gamma Spectrum: Original </template>
Gamma Spectrum: Original
</template>
<spectrum-line-chart <spectrum-line-chart
ref="lineChart1Ref" ref="lineChart1Ref"
:data="gammaOriginalData" :data="gammaOriginalData"
@ -55,9 +56,7 @@
</div> </div>
<div class="gamma-spectrum-item"> <div class="gamma-spectrum-item">
<beta-gamma-chart-container> <beta-gamma-chart-container>
<template slot="title"> <template slot="title"> Gamma Spectrum: Projected </template>
Gamma Spectrum: Projected
</template>
<spectrum-line-chart <spectrum-line-chart
ref="lineChart2Ref" ref="lineChart2Ref"
:data="gammaProjectedData" :data="gammaProjectedData"
@ -70,9 +69,7 @@
<div class="gamma-spectrum"> <div class="gamma-spectrum">
<div class="gamma-spectrum-item"> <div class="gamma-spectrum-item">
<beta-gamma-chart-container> <beta-gamma-chart-container>
<template slot="title"> <template slot="title"> Beta Spectrum: Original </template>
Beta Spectrum: Original
</template>
<spectrum-line-chart <spectrum-line-chart
ref="lineChart3Ref" ref="lineChart3Ref"
:data="betaOriginalData" :data="betaOriginalData"
@ -85,9 +82,7 @@
</div> </div>
<div class="gamma-spectrum-item"> <div class="gamma-spectrum-item">
<beta-gamma-chart-container> <beta-gamma-chart-container>
<template slot="title"> <template slot="title"> Beta Spectrum: Projected </template>
Beta Spectrum: Projected
</template>
<spectrum-line-chart <spectrum-line-chart
ref="lineChart4Ref" ref="lineChart4Ref"
:data="betaProjectedData" :data="betaProjectedData"
@ -105,9 +100,7 @@
<!-- 结果显示开始 --> <!-- 结果显示开始 -->
<div class="result-display"> <div class="result-display">
<beta-gamma-chart-container> <beta-gamma-chart-container>
<template slot="title"> <template slot="title"> Result display </template>
Result display
</template>
<result-display :data="resultDisplay"></result-display> <result-display :data="resultDisplay"></result-display>
</beta-gamma-chart-container> </beta-gamma-chart-container>
</div> </div>
@ -122,7 +115,11 @@
<!-- 主体部分结束 --> <!-- 主体部分结束 -->
</a-spin> </a-spin>
<statistics-paramer-history-modal-for-qc-flags v-model="statisticModalVisible" :sampleId="sample.sampleId" :statisticsType="statisticsType" /> <statistics-paramer-history-modal-for-qc-flags
v-model="statisticModalVisible"
:sampleId="sample.sampleId"
:statisticsType="statisticsType"
/>
</div> </div>
</template> </template>
@ -144,26 +141,26 @@ const StatisticsType = {
'Collection Time': 'Colloc_Time', 'Collection Time': 'Colloc_Time',
'Acq Time': 'Acq_Time', 'Acq Time': 'Acq_Time',
'Xe Volume': 'Xe_volumn', 'Xe Volume': 'Xe_volumn',
'Air Volume': 'Sample_Volumn' 'Air Volume': 'Sample_Volumn',
} }
const SampleType = [ const SampleType = [
{ {
label: 'Sample Data', label: 'Sample Data',
value: 'sample' value: 'sample',
}, },
{ {
label: 'GasBg Data', label: 'GasBg Data',
value: 'gasBg' value: 'gasBg',
}, },
{ {
label: 'DetBg Data', label: 'DetBg Data',
value: 'detBg' value: 'detBg',
}, },
{ {
label: 'QC Data', label: 'QC Data',
value: 'qc' value: 'qc',
} },
] ]
export default { export default {
@ -179,12 +176,12 @@ export default {
BetaGammaQcFlags, BetaGammaQcFlags,
BetaGammaDetailedInfomation, BetaGammaDetailedInfomation,
StatisticsParamerHistoryModalForQcFlags, StatisticsParamerHistoryModalForQcFlags,
CustomSelect CustomSelect,
}, },
props: { props: {
sample: { sample: {
type: Object type: Object,
} },
}, },
data() { data() {
this.SampleType = SampleType this.SampleType = SampleType
@ -217,7 +214,7 @@ export default {
comparisonModalVisible: false, comparisonModalVisible: false,
statisticModalVisible: false, // Qc Flags 点击后的弹窗 statisticModalVisible: false, // Qc Flags 点击后的弹窗
statisticsType: StatisticsType['Collection Time'] statisticsType: StatisticsType['Collection Time'],
} }
}, },
methods: { methods: {
@ -229,12 +226,13 @@ export default {
this.isLoading = true this.isLoading = true
const { success, result, message } = await getAction('/spectrumAnalysis/getDBSpectrumChart', { const { success, result, message } = await getAction('/spectrumAnalysis/getDBSpectrumChart', {
dbName, dbName,
sampleId sampleId,
}) })
if (success) { if (success) {
this.sampleDetail = result this.sampleDetail = result
this.changeChartByType('sample') this.changeChartByType('sample')
this.isLoading = false this.isLoading = false
// this.$emit("getFiles",{detFileName:result.detBg.fileName,gasFileName:result.gasBg.fileName})
} else { } else {
this.$message.error(message) this.$message.error(message)
} }
@ -248,7 +246,7 @@ export default {
sampleFileName: this.sample.sampleFileName, sampleFileName: this.sample.sampleFileName,
gasFileName: this.sample.gasFileName, gasFileName: this.sample.gasFileName,
detFileName: this.sample.detFileName, detFileName: this.sample.detFileName,
qcFileName: this.sample.qcFileStatus?this.sample.qcFileName:"", qcFileName: this.sample.qcFileStatus ? this.sample.qcFileName : '',
} }
try { try {
this.isLoading = true this.isLoading = true
@ -266,8 +264,8 @@ export default {
}, },
changeChartByType(val) { changeChartByType(val) {
if (val==="qc"&&!this.sample.qcFileStatus) { if (val === 'qc' && !this.sample.qcFileStatus) {
this.$message.warning("No qc spectrum file!") this.$message.warning('No qc spectrum file!')
} else { } else {
const { const {
betaOriginalData, betaOriginalData,
@ -290,7 +288,7 @@ export default {
SampleVolumeBtn, // QC Flags 相关 SampleVolumeBtn, // QC Flags 相关
XeVolumeBtn, // QC Flags 相关 XeVolumeBtn, // QC Flags 相关
GasBgBtn, // QC Flags 相关 GasBgBtn, // QC Flags 相关
DetBgBtn // QC Flags 相关 DetBgBtn, // QC Flags 相关
} = this.sampleDetail[this.spectraType] } = this.sampleDetail[this.spectraType]
this.spectrumData = spectrumData this.spectrumData = spectrumData
@ -315,7 +313,7 @@ export default {
SampleVolumeBtn, SampleVolumeBtn,
XeVolumeBtn, XeVolumeBtn,
GasBgBtn, GasBgBtn,
DetBgBtn DetBgBtn,
} }
} }
}, },
@ -378,28 +376,27 @@ export default {
// 重新分析，设置右侧折线图的Energy // 重新分析，设置右侧折线图的Energy
reanalyse([type, data]) { reanalyse([type, data]) {
const energy = data.map(item => [item.y]) const energy = data.map((item) => [item.y])
if (type == 'gamma') { if (type == 'gamma') {
this.gammaEnergyData = energy this.gammaEnergyData = energy
} else { } else {
this.betaEnergyData = energy this.betaEnergyData = energy
} }
},
}
}, },
watch: { watch: {
sample: { sample: {
handler(newVal, oldVal) { handler(newVal, oldVal) {
console.log("newValnewVal", newVal); console.log('newValnewVal', newVal)
if (newVal.sampleId) { if (newVal.sampleId) {
this.getSampleDetail() this.getSampleDetail()
} else { } else {
this.getSampleDetail_file() this.getSampleDetail_file()
} }
}, },
immediate: true immediate: true,
} },
} },
} }
</script> </script>

62
src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/AdditionalInfo.vue
View File

@ -4,37 +4,81 @@
<a-form-model-item <a-form-model-item
label="(rel.) Xe transfer efficiency (Xe Volume in the measurement cell/Xe colume in the archive bottle) a description, how this is calculated shall be provided in the Comment section" label="(rel.) Xe transfer efficiency (Xe Volume in the measurement cell/Xe colume in the archive bottle) a description, how this is calculated shall be provided in the Comment section"
> >
<a-textarea :rows="4"></a-textarea> <a-textarea
:rows="4"
v-model="addInfo.xeTransfer"
@change="(e) => handleValueChange(e.target.value)"
></a-textarea>
</a-form-model-item> </a-form-model-item>
<a-form-model-item label="uncertainty of the Xe transfer efficiency [%]"> <a-form-model-item label="uncertainty of the Xe transfer efficiency [%]">
<a-input></a-input> <a-input v-model="addInfo.uncertaintyOfXe" @change="(e) => handleValueChange(e.target.value)"></a-input>
</a-form-model-item> </a-form-model-item>
<a-form-model-item label="Comments"> <a-form-model-item label="Comments">
<a-textarea :rows="4"></a-textarea> <a-textarea
:rows="4"
v-model="addInfo.commentsInfo"
@change="(e) => handleValueChange(e.target.value)"
></a-textarea>
</a-form-model-item> </a-form-model-item>
<a-form-model-item label="Detailed description of the measurement system"> <a-form-model-item label="Detailed description of the measurement system">
<a-textarea :rows="4"></a-textarea> <a-textarea
:rows="4"
v-model="addInfo.detailedDescriptionM"
@change="(e) => handleValueChange(e.target.value)"
></a-textarea>
</a-form-model-item> </a-form-model-item>
<a-form-model-item label="Detailed description of the sample analysis process"> <a-form-model-item label="Detailed description of the sample analysis process">
<a-textarea :rows="4"></a-textarea> <a-textarea
:rows="4"
v-model="addInfo.detailedDescriptionS"
@change="(e) => handleValueChange(e.target.value)"
></a-textarea>
</a-form-model-item> </a-form-model-item>
<a-form-model-item label="Uncertainty budget"> <a-form-model-item label="Uncertainty budget">
<a-textarea :rows="4"></a-textarea> <a-textarea
:rows="4"
v-model="addInfo.uncertaintyBudget"
@change="(e) => handleValueChange(e.target.value)"
></a-textarea>
</a-form-model-item> </a-form-model-item>
<a-form-model-item <a-form-model-item
label="Information on any changes to the system and/or the process (including recalibrations] since the time of the previous exercise " label="Information on any changes to the system and/or the process (including recalibrations] since the time of the previous exercise "
> >
<a-textarea :rows="4"></a-textarea> <a-textarea
:rows="4"
v-model="addInfo.informationOn"
@change="(e) => handleValueChange(e.target.value)"
></a-textarea>
</a-form-model-item> </a-form-model-item>
<a-form-model-item label="ysical Constants used (branching ratios, half lifes,..)"> <a-form-model-item label="ysical Constants used (branching ratios, half lifes,..)">
<a-textarea :rows="4"></a-textarea> <a-textarea :rows="4" v-model="addInfo.ysical" @change="(e) => handleValueChange(e.target.value)"></a-textarea>
</a-form-model-item> </a-form-model-item>
</a-form-model> </a-form-model>
</div> </div>
</template> </template>
<script> <script>
export default {} export default {
data() {
return {
addInfo: {
xeTransfer: '',
uncertaintyOfXe: '',
commentsInfo: '',
detailedDescriptionM: '',
detailedDescriptionS: '',
uncertaintyBudget: '',
informationOn: '',
ysical: '',
},
}
},
methods: {
handleValueChange() {
this.$emit('valChange', this.transInfo)
},
},
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>

103
src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/AnalysisResults.vue
View File

@ -4,7 +4,13 @@
<a-row v-for="(column, index) in columns" :key="index"> <a-row v-for="(column, index) in columns" :key="index">
<a-col class="label" :span="12"> {{ column.label }} </a-col> <a-col class="label" :span="12"> {{ column.label }} </a-col>
<a-col :span="12"> <a-col :span="12">
<component :is="column.type" v-bind="column.attrs" v-model="detail[column.dataIndex]" :disabled="column.disabled" /> <component
:is="column.type"
v-bind="column.attrs"
v-model="detail[column.dataIndex]"
:disabled="column.disabled"
v-on="column.on"
/>
</a-col> </a-col>
</a-row> </a-row>
</div> </div>
@ -12,29 +18,47 @@
</template> </template>
<script> <script>
const columns = [ export default {
computed: {
columns() {
return [
{ {
label: 'Pressure in the archive bottle [Pa] at STP corrected', label: 'Pressure in the archive bottle [Pa] at STP corrected',
type: 'a-input', type: 'a-input',
dataIndex: 'pressureInTheArchiveBottle' dataIndex: 'pressureInTheArchiveBottle',
on: {
change: (e) => this.handleValChange(e.target.value),
},
}, },
{ {
label: 'Volume of Archive bottle [m3]', label: 'Volume of Archive bottle [m3]',
type: 'a-input', type: 'a-input',
dataIndex: 'volumeOfArchiveBottle' dataIndex: 'volumeOfArchiveBottle',
on: {
change: (e) => this.handleValChange(e.target.value),
},
}, },
{ {
label: 'Gas composition [%]', label: 'Gas composition [%]',
type: 'a-input', type: 'a-input',
dataIndex: 'gasComposition' dataIndex: 'gasComposition',
on: {
change: (e) => this.handleValChange(e.target.value),
},
}, },
{ {
label: 'Stable Xe meas. start date [YYYY/MM/DD]', label: 'Stable Xe meas. start date [YYYY/MM/DD]',
type: 'a-date-picker', type: 'a-date-picker',
dataIndex: 'stableXeMeasStartDate', dataIndex: 'stableXeMeasStartDate',
attrs: { attrs: {
format: 'YYYY/MM/DD' format: 'YYYY/MM/DD',
} },
on: {
change: (mont, date) => {
this.detail.receiptDate = date
this.handleValChange(date)
},
},
}, },
{ {
label: 'Stable Xe meas. start time [HH:MM:SS.S]', label: 'Stable Xe meas. start time [HH:MM:SS.S]',
@ -42,60 +66,91 @@ const columns = [
dataIndex: 'stableXeMeasStartTime', dataIndex: 'stableXeMeasStartTime',
attrs: { attrs: {
format: 'HH:mm:ss', format: 'HH:mm:ss',
valueFormat: 'HH:mm:ss' valueFormat: 'HH:mm:ss',
} },
on: {
change: (mont, date) => {
this.detail.receiptTime = date
this.handleValChange(date)
},
},
}, },
{ {
label: 'Stable Xenon volume in the archive bottle [cm3] STP corrected', label: 'Stable Xenon volume in the archive bottle [cm3] STP corrected',
type: 'a-input', type: 'a-input',
dataIndex: 'stableXenonVolumeInTheArchiveBottle' dataIndex: 'stableXenonVolumeInTheArchiveBottle',
on: {
change: (e) => this.handleValChange(e.target.value),
},
}, },
{ {
label: 'Uncertainty of stable Xenon volume (%)', label: 'Uncertainty of stable Xenon volume (%)',
type: 'a-input', type: 'a-input',
dataIndex: 'uncertaintyOfStableXenonVolume' dataIndex: 'uncertaintyOfStableXenonVolume',
on: {
change: (e) => this.handleValChange(e.target.value),
},
}, },
{ {
label: 'Stable Xenon volume in the measurement cell [cm3] STP corrected', label: 'Stable Xenon volume in the measurement cell [cm3] STP corrected',
type: 'a-input', type: 'a-input',
dataIndex: 'stableXenonVolumeInTheMeasurementCell' dataIndex: 'stableXenonVolumeInTheMeasurementCell',
on: {
change: (e) => this.handleValChange(e.target.value),
},
}, },
{ {
label: 'Uncertainty of stable Xenon volume [%]', label: 'Uncertainty of stable Xenon volume [%]',
type: 'a-input', type: 'a-input',
dataIndex: 'uncertaintyOfStableXenonVolume2' dataIndex: 'uncertaintyOfStableXenonVolume2',
on: {
change: (e) => this.handleValChange(e.target.value),
},
}, },
{ {
label: 'Radioactive Xe meas. start date [YYYY/MM/DD]', label: 'Radioactive Xe meas. start date [YYYY/MM/DD]',
type: 'a-input', type: 'a-input',
dataIndex: 'acq_start_date', dataIndex: 'acq_start_date',
disabled: true disabled: true,
on: {
change: (e) => this.handleValChange(e.target.value),
},
}, },
{ {
label: 'Radioactive Xe meas. start time [HH:MM:SS.S]', label: 'Radioactive Xe meas. start time [HH:MM:SS.S]',
type: 'a-input', type: 'a-input',
dataIndex: 'acq_start_time', dataIndex: 'acq_start_time',
disabled: true disabled: true,
on: {
change: (e) => this.handleValChange(e.target.value),
},
}, },
{ {
label: 'Acquisition live time [s]', label: 'Acquisition live time [s]',
type: 'a-input', type: 'a-input',
dataIndex: 'acq_live_time', dataIndex: 'acq_live_time',
disabled: true disabled: true,
} on: {
change: (e) => this.handleValChange(e.target.value),
},
},
] ]
},
export default { },
props: { props: {
detail: { detail: {
type: Object type: Object,
} },
}, },
data() { data() {
this.columns = columns
return {} return {}
} },
methods: {
handleValChange(val) {
console.log('valval', val)
this.$emit('valChange', this.detail)
},
},
} }
</script> </script>

92
src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/GeneralInfomation.vue
View File

@ -10,6 +10,7 @@
v-bind="column.attrs" v-bind="column.attrs"
v-model="detail[column.dataIndex]" v-model="detail[column.dataIndex]"
:disabled="column.disabled" :disabled="column.disabled"
v-on="column.on"
/> />
</a-col> </a-col>
</a-row> </a-row>
@ -18,49 +19,73 @@
</template> </template>
<script> <script>
const columns = [ export default {
computed: {
columns() {
return [
{ {
label: 'Laboratory (CTBTO code)', label: 'Laboratory (CTBTO code)',
type: 'a-input', type: 'a-input',
dataIndex: 'laboratory' dataIndex: 'laboratory',
on: {
change: (e) => this.handleValChange(e.target.value),
},
}, },
{ {
label: 'Sample ID (SRID or other)', label: 'Sample ID (SRID or other)',
type: 'a-input', type: 'a-input',
dataIndex: 'srid', dataIndex: 'srid',
disabled: true disabled: true,
on: {
change: (e) => this.handleValChange(e.target.value),
},
}, },
{ {
label: 'Collection start date or reference date [YYYY/MM/DD]', label: 'Collection start date or reference date [YYYY/MM/DD]',
type: 'a-input', type: 'a-input',
dataIndex: 'colloct_start_date', dataIndex: 'colloct_start_date',
disabled: true disabled: true,
on: {
change: (e) => this.handleValChange(e.target.value),
},
}, },
{ {
label: 'Collection start time or reference time [HH:mm:ss.S]', label: 'Collection start time or reference time [HH:mm:ss.S]',
type: 'a-input', type: 'a-input',
dataIndex: 'colloct_start_time', dataIndex: 'colloct_start_time',
disabled: true disabled: true,
on: {
change: (e) => this.handleValChange(e.target.value),
},
}, },
{ {
label: 'Collection stop date [YYYY/MM/DD]', label: 'Collection stop date [YYYY/MM/DD]',
type: 'a-input', type: 'a-input',
dataIndex: 'colloct_stop_date', dataIndex: 'colloct_stop_date',
disabled: true disabled: true,
}, },
{ {
label: 'Collection stop time [HH:mm:ss.S]', label: 'Collection stop time [HH:mm:ss.S]',
type: 'a-input', type: 'a-input',
dataIndex: 'colloct_stop_time', dataIndex: 'colloct_stop_time',
disabled: true disabled: true,
on: {
change: (e) => this.handleValChange(e.target.value),
},
}, },
{ {
label: 'Receipt date [YYYY/MM/DD]', label: 'Receipt date [YYYY/MM/DD]',
type: 'a-date-picker', type: 'a-date-picker',
dataIndex: 'receiptDate', dataIndex: 'receiptDate',
attrs: { attrs: {
format: 'YYYY/MM/DD' format: 'YYYY/MM/DD',
} },
on: {
change: (mont, date) => {
this.detail.receiptDate = date
this.handleValChange(date)
},
},
}, },
{ {
label: 'Receipt time [HH:mm:ss.S]', label: 'Receipt time [HH:mm:ss.S]',
@ -68,16 +93,28 @@ const columns = [
dataIndex: 'receiptTime', dataIndex: 'receiptTime',
attrs: { attrs: {
format: 'HH:mm:ss', format: 'HH:mm:ss',
valueFormat: 'HH:mm:ss' valueFormat: 'HH:mm:ss',
} },
on: {
change: (mont, date) => {
this.detail.receiptTime = date
this.handleValChange(date)
},
},
}, },
{ {
label: 'Report transmission date [YYYY/MM/DD]', label: 'Report transmission date [YYYY/MM/DD]',
type: 'a-date-picker', type: 'a-date-picker',
dataIndex: 'reportTransmissionDate', dataIndex: 'reportTransmissionDate',
attrs: { attrs: {
format: 'YYYY/MM/DD' format: 'YYYY/MM/DD',
} },
on: {
change: (mont, date) => {
this.detail.reportTransmissionDate = date
this.handleValChange(date)
},
},
}, },
{ {
label: 'Report transmission time [HH:mm:ss.S]', label: 'Report transmission time [HH:mm:ss.S]',
@ -85,21 +122,32 @@ const columns = [
dataIndex: 'reportTransmissionTime', dataIndex: 'reportTransmissionTime',
attrs: { attrs: {
format: 'HH:mm:ss', format: 'HH:mm:ss',
valueFormat: 'HH:mm:ss' valueFormat: 'HH:mm:ss',
} },
} on: {
change: (mont, date) => {
this.detail.reportTransmissionTime = date
this.handleValChange(date)
},
},
},
] ]
export default { },
},
props: { props: {
detail: { detail: {
type: Object type: Object,
} },
}, },
data() { data() {
this.columns = columns
return {} return {}
} },
methods: {
handleValChange(val) {
console.log('valval', val)
this.$emit('valChange', this.detail)
},
},
} }
</script> </script>

23
src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/Methods.vue
View File

@ -2,20 +2,35 @@
<div class="methods"> <div class="methods">
<a-form-model layout="vertical"> <a-form-model layout="vertical">
<a-form-model-item label="Sampling handling"> <a-form-model-item label="Sampling handling">
<a-input></a-input> <a-input v-model="methodsInfo.samplingHandling" @change="(e) => handleValueChange(e.target.value)"></a-input>
</a-form-model-item> </a-form-model-item>
<a-form-model-item label="Equipment used"> <a-form-model-item label="Equipment used">
<a-input></a-input> <a-input v-model="methodsInfo.equipmentUsed" @change="(e) => handleValueChange(e.target.value)"></a-input>
</a-form-model-item> </a-form-model-item>
<a-form-model-item label="Software used"> <a-form-model-item label="Software used">
<a-input></a-input> <a-input v-model="methodsInfo.softwareUsed" @change="(e) => handleValueChange(e.target.value)"></a-input>
</a-form-model-item> </a-form-model-item>
</a-form-model> </a-form-model>
</div> </div>
</template> </template>
<script> <script>
export default {} export default {
data() {
return {
methodsInfo: {
samplingHandling: '',
equipmentUsed: '',
softwareUsed: '',
},
}
},
methods: {
handleValueChange() {
this.$emit('valChange', this.transInfo)
},
},
}
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>

84
src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/Nuclides.vue
View File

@ -2,7 +2,11 @@
<div> <div>
<a-table size="small" :columns="columns" :dataSource="list" :pagination="false" :scroll="{ x: true }"> <a-table size="small" :columns="columns" :dataSource="list" :pagination="false" :scroll="{ x: true }">
<template v-for="slotName in slots" :slot="slotName" slot-scope="text, record"> <template v-for="slotName in slots" :slot="slotName" slot-scope="text, record">
<a-input v-model="record[slotName]" :key="slotName"></a-input> <a-input
v-model="record[slotName]"
:key="slotName"
@change="(e) => cellChange(e.target.value, record, slotName)"
></a-input>
</template> </template>
</a-table> </a-table>
</div> </div>
@ -15,7 +19,7 @@ const columns = [
dataIndex: 'name', dataIndex: 'name',
align: 'center', align: 'center',
width: 80, width: 80,
fixed: 'left' fixed: 'left',
}, },
{ {
title: 'Activity [Bq]', title: 'Activity [Bq]',
@ -23,8 +27,8 @@ const columns = [
align: 'center', align: 'center',
width: 90, width: 90,
scopedSlots: { scopedSlots: {
customRender: 'activity' customRender: 'activity',
} },
}, },
{ {
title: 'Uncert.Activity [%]', title: 'Uncert.Activity [%]',
@ -32,8 +36,8 @@ const columns = [
align: 'center', align: 'center',
width: 140, width: 140,
scopedSlots: { scopedSlots: {
customRender: 'uncertActivity' customRender: 'uncertActivity',
} },
}, },
{ {
title: 'MDA [Bq]', title: 'MDA [Bq]',
@ -41,8 +45,8 @@ const columns = [
align: 'center', align: 'center',
width: 100, width: 100,
scopedSlots: { scopedSlots: {
customRender: 'mda' customRender: 'mda',
} },
}, },
{ {
title: 'Concentration [Bq/m3]', title: 'Concentration [Bq/m3]',
@ -50,8 +54,8 @@ const columns = [
align: 'center', align: 'center',
width: 170, width: 170,
scopedSlots: { scopedSlots: {
customRender: 'concentration' customRender: 'concentration',
} },
}, },
{ {
title: 'Uncert.concentration [%]', title: 'Uncert.concentration [%]',
@ -59,8 +63,8 @@ const columns = [
align: 'center', align: 'center',
width: 190, width: 190,
scopedSlots: { scopedSlots: {
customRender: 'uncertConcentration' customRender: 'uncertConcentration',
} },
}, },
{ {
title: 'MDC [Bq/m3]', title: 'MDC [Bq/m3]',
@ -68,8 +72,8 @@ const columns = [
align: 'center', align: 'center',
width: 120, width: 120,
scopedSlots: { scopedSlots: {
customRender: 'mdc' customRender: 'mdc',
} },
}, },
{ {
title: 'Lc [Bq/m3]', title: 'Lc [Bq/m3]',
@ -77,62 +81,76 @@ const columns = [
align: 'center', align: 'center',
width: 100, width: 100,
scopedSlots: { scopedSlots: {
customRender: 'lc' customRender: 'lc',
} },
} },
] ]
const nameMapper = [ const nameMapper = [
{ name: 'Xe-131m', mapTo: 'xe131m' }, { name: 'Xe-131m', mapTo: 'xe131m' },
{ name: 'Xe-133m', mapTo: 'xe133m' }, { name: 'Xe-133m', mapTo: 'xe133m' },
{ name: 'Xe-133', mapTo: 'xe133' }, { name: 'Xe-133', mapTo: 'xe133' },
{ name: 'Xe-135', mapTo: 'xe135' } { name: 'Xe-135', mapTo: 'xe135' },
] ]
const columnNameMapper = [ const columnNameMapper = [
{ {
name: 'concentration', name: 'concentration',
mapTo: 'conc' mapTo: 'conc',
}, },
{ {
name: 'uncertConcentration', name: 'uncertConcentration',
mapTo: 'uncert_conc' mapTo: 'uncert_conc',
}, },
{ {
name: 'mdc', name: 'mdc',
mapTo: 'MDC' mapTo: 'MDC',
}, },
{ {
name: 'lc', name: 'lc',
mapTo: 'LC' mapTo: 'LC',
} },
] ]
export default { export default {
props: { props: {
detail: { detail: {
type: Object type: Object,
} },
}, },
data() { data() {
this.columns = columns this.columns = columns
return {
return {} list: [],
}
}, },
computed: { computed: {
slots() { slots() {
return columns.filter(item => item.scopedSlots).map(item => item.scopedSlots.customRender) return columns.filter((item) => item.scopedSlots).map((item) => item.scopedSlots.customRender)
}, },
list() { },
return nameMapper.map(item => { mounted() {
this.list = this.getList()
this.$emit('valChange', this.list)
},
methods: {
getList() {
return nameMapper.map((item) => {
const obj = { name: item.name } const obj = { name: item.name }
columnNameMapper.forEach(it => { columnNameMapper.forEach((it) => {
const key = `${item.mapTo}_${it.mapTo}` const key = `${item.mapTo}_${it.mapTo}`
obj[it.name] = this.detail[key] obj[it.name] = this.detail[key]
obj.activity = ''
obj.uncertActivity = ''
obj.mda = ''
}) })
return obj return obj
}) })
} },
} cellChange(val, record, key) {
record[key] = val
this.$emit('valChange', this.list)
},
},
} }
</script> </script>

53
src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/Ratios.vue
View File

@ -2,7 +2,11 @@
<div> <div>
<a-table :columns="columns" :dataSource="list" :pagination="false"> <a-table :columns="columns" :dataSource="list" :pagination="false">
<template v-for="slotName in slots" :slot="slotName" slot-scope="text, record"> <template v-for="slotName in slots" :slot="slotName" slot-scope="text, record">
<a-input v-model="record[slotName]" :key="slotName"></a-input> <a-input
v-model="record[slotName]"
:key="slotName"
@change="(e) => cellChange(e.target.value, record, slotName)"
></a-input>
</template> </template>
</a-table> </a-table>
</div> </div>
@ -17,7 +21,7 @@ const columns = [
width: 100, width: 100,
customRender: (_, __, index) => { customRender: (_, __, index) => {
return index + 1 return index + 1
} },
}, },
{ {
title: 'Nuclide1', title: 'Nuclide1',
@ -25,8 +29,8 @@ const columns = [
align: 'center', align: 'center',
width: 100, width: 100,
scopedSlots: { scopedSlots: {
customRender: 'nuclide1' customRender: 'nuclide1',
} },
}, },
{ {
title: 'Nuclide2', title: 'Nuclide2',
@ -34,8 +38,8 @@ const columns = [
align: 'center', align: 'center',
width: 150, width: 150,
scopedSlots: { scopedSlots: {
customRender: 'nuclide2' customRender: 'nuclide2',
} },
}, },
{ {
title: 'Isotope ratio', title: 'Isotope ratio',
@ -43,8 +47,8 @@ const columns = [
align: 'center', align: 'center',
width: 100, width: 100,
scopedSlots: { scopedSlots: {
customRender: 'isotopeRatio' customRender: 'isotopeRatio',
} },
}, },
{ {
title: 'Uncert.Ratio [%]', title: 'Uncert.Ratio [%]',
@ -52,36 +56,29 @@ const columns = [
align: 'center', align: 'center',
width: 200, width: 200,
scopedSlots: { scopedSlots: {
customRender: 'uncertRatio' customRender: 'uncertRatio',
} },
} },
] ]
export default { export default {
data() { data() {
this.columns = columns this.columns = columns
return { return {
list: [ list: [],
{
nuclide1: 'nuclide1',
nuclide2: 'nuclide2',
isotopeRatio: 'isotopeRatio',
uncertRatio: 'uncertRatio'
},
{
nuclide1: 'nuclide1',
nuclide2: 'nuclide2',
isotopeRatio: 'isotopeRatio',
uncertRatio: 'uncertRatio'
}
]
} }
}, },
computed: { computed: {
slots() { slots() {
return columns.filter(item => item.scopedSlots).map(item => item.scopedSlots.customRender) return columns.filter((item) => item.scopedSlots).map((item) => item.scopedSlots.customRender)
} },
} },
methods: {
cellChange(val, record, key) {
record[key] = val
this.$emit('valChange', this.list)
},
},
} }
</script> </script>

26
src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/TransportInfomation.vue
View File

@ -2,10 +2,18 @@
<div class="transport-infomation"> <div class="transport-infomation">
<a-form-model layout="vertical"> <a-form-model layout="vertical">
<a-form-model-item label="Comments on transport"> <a-form-model-item label="Comments on transport">
<a-textarea :rows="12"></a-textarea> <a-textarea
:rows="12"
v-model="transInfo.comments"
@change="(e) => handleValueChange(e.target.value)"
></a-textarea>
</a-form-model-item> </a-form-model-item>
<a-form-model-item label="Other comments, e.g. on sample container conditions"> <a-form-model-item label="Other comments, e.g. on sample container conditions">
<a-textarea :rows="12"></a-textarea> <a-textarea
:rows="12"
v-model="transInfo.otherComments"
@change="(e) => handleValueChange(e.target.value)"
></a-textarea>
</a-form-model-item> </a-form-model-item>
</a-form-model> </a-form-model>
</div> </div>
@ -13,7 +21,19 @@
<script> <script>
export default { export default {
data() {
return {
transInfo: {
comments: '',
otherComments: '',
},
}
},
methods: {
handleValueChange() {
this.$emit('valChange', this.transInfo)
},
},
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>

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

@ -17,25 +17,25 @@
<a-spin :spinning="isLoading"> <a-spin :spinning="isLoading">
<div class="rlr-content-detail"> <div class="rlr-content-detail">
<template v-if="activeKey == 0"> <template v-if="activeKey == 0">
<general-infomation :detail="detail" /> <general-infomation :detail="detail" @valChange="getNewVal_generalInfo" />
</template> </template>
<template v-if="activeKey == 1"> <template v-if="activeKey == 1">
<transport-infomation :detail="detail" /> <transport-infomation :detail="detail" @valChange="getNewVal_transInfo" />
</template> </template>
<template v-if="activeKey == 2"> <template v-if="activeKey == 2">
<analysis-results :detail="detail" /> <analysis-results :detail="detail" @valChange="getNewVal_analysisResults" />
</template> </template>
<template v-if="activeKey == 3"> <template v-if="activeKey == 3">
<nuclides :detail="detail" /> <nuclides :detail="detail" @valChange="getNewVal_nuclidesList" />
</template> </template>
<template v-if="activeKey == 4"> <template v-if="activeKey == 4">
<ratios :detail="detail" /> <ratios :detail="detail" @valChange="getNewVal_rationsList" />
</template> </template>
<template v-if="activeKey == 5"> <template v-if="activeKey == 5">
<methods :detail="detail" /> <methods :detail="detail" @valChange="getNewVal_methodsInfo" />
</template> </template>
<template v-if="activeKey == 6"> <template v-if="activeKey == 6">
<additional-info :detail="detail" /> <additional-info :detail="detail" @valChange="getNewVal_addInfo" />
</template> </template>
<template v-if="activeKey == 7"> <template v-if="activeKey == 7">
<notes :detail="detail" /> <notes :detail="detail" />
@ -57,7 +57,8 @@ import Ratios from './components/Ratios.vue'
import Methods from './components/Methods.vue' import Methods from './components/Methods.vue'
import AdditionalInfo from './components/AdditionalInfo.vue' import AdditionalInfo from './components/AdditionalInfo.vue'
import Notes from './components/Notes.vue' import Notes from './components/Notes.vue'
import { getAction } from '@/api/manage' import { getAction, postFileAction } from '@/api/manage'
import { saveAs } from 'file-saver'
import { TagsInputCell } from '@/components/jeecg/JVxeTable/components/cells/JVxeTagsCell' import { TagsInputCell } from '@/components/jeecg/JVxeTable/components/cells/JVxeTagsCell'
const tabs = [ const tabs = [
@ -68,7 +69,7 @@ const tabs = [
'Ratios', 'Ratios',
'Methods', 'Methods',
'Additional Info', 'Additional Info',
'Notes' 'Notes',
] ]
export default { export default {
@ -81,12 +82,12 @@ export default {
Ratios, Ratios,
Methods, Methods,
AdditionalInfo, AdditionalInfo,
Notes Notes,
}, },
props: { props: {
sampleData: { sampleData: {
type: Object type: Object,
} },
}, },
data() { data() {
this.tabs = tabs this.tabs = tabs
@ -94,18 +95,27 @@ export default {
activeKey: 0, activeKey: 0,
detail: {}, detail: {},
isLoading: false, isLoading: false,
text: "- All dates and times shall be given in UTC \n"+ newDetail: {},
"- If a Xe isotope is not detected, i.e., below Lc, then leave the related activity and activity concentration fields for this isotope empty. \n"+ transInfo: {},
"- Activity shall be decay corrected to radioactive Xe measuring start \n"+ methodsInfo: {},
"- Activity concentrations shall be decay corrected to sampling period, under the assumption of a constant concentration during sampling; or a reference time if provided (see also Notes below) \n"+ addInfo: {},
"- MDAs shall be decay corrected to radioactive Xe measuring start \n"+ nuclidesList: [],
"- MDCs shall be decay corrected to the sampling period, under the assumption of a constant concentration during sampling; or a reference time if provided \n"+ rationsList: [],
"- LC shall be decay corrected to the sampling period, under the assumption of a constant concentration during sampling; or a reference time if provided \n"+ fileName: '',
"- Isotopic ratios shall be decay corrected to sampling period, under the assumption of a constant concentration during sampling; or a reference time if provided (see also Notes below) \n"+ text:
"- Uncertainties values shall be reported as relative standard uncertainties (k=1) and shall include associated combined uncertainties \n" '- All dates and times shall be given in UTC \n' +
'- If a Xe isotope is not detected, i.e., below Lc, then leave the related activity and activity concentration fields for this isotope empty. \n' +
'- Activity shall be decay corrected to radioactive Xe measuring start \n' +
'- Activity concentrations shall be decay corrected to sampling period, under the assumption of a constant concentration during sampling; or a reference time if provided (see also Notes below) \n' +
'- MDAs shall be decay corrected to radioactive Xe measuring start \n' +
'- MDCs shall be decay corrected to the sampling period, under the assumption of a constant concentration during sampling; or a reference time if provided \n' +
'- LC shall be decay corrected to the sampling period, under the assumption of a constant concentration during sampling; or a reference time if provided \n' +
'- Isotopic ratios shall be decay corrected to sampling period, under the assumption of a constant concentration during sampling; or a reference time if provided (see also Notes below) \n' +
'- Uncertainties values shall be reported as relative standard uncertainties (k=1) and shall include associated combined uncertainties \n',
} }
}, },
mounted() { mounted() {
console.log('this.sampleData23334', this.sampleData)
this.getInfo() this.getInfo()
}, },
methods: { methods: {
@ -115,14 +125,21 @@ export default {
}, },
async getInfo() { async getInfo() {
console.log('this.sampleData23334', this.sampleData)
try { try {
this.isLoading = true this.isLoading = true
let param = { let param = {
sampleId: this.sampleData.sampleId, sampleId: this.sampleData.sampleId,
sampleFileName: this.sampleData.sampleFileName, sampleFileName: this.sampleData.inputFileName,
gasFileName: this.sampleData.gasFileName, gasFileName: this.sampleData.gasFileName,
detFileName: this.sampleData.detFileName detFileName: this.sampleData.detFileName,
} }
// let param = {
// sampleId: 470725,
// sampleFileName: 'AUX04_005-20230907_1404_S_FULL_40184.PHD',
// gasFileName: 'AUX04_005-20230907_0204_G_FULL_40189.4.PHD',
// detFileName: 'AUX04_005-20220422_1327_D_FULL_259525.PHD',
// }
const { success, result, message } = await getAction('/spectrumAnalysis/viewRLR', param) const { success, result, message } = await getAction('/spectrumAnalysis/viewRLR', param)
if (success) { if (success) {
this.detail = result this.detail = result
@ -135,11 +152,97 @@ export default {
console.error(error) console.error(error)
} }
}, },
getNewVal_generalInfo(val) {
console.log('新的val', val)
this.newDetail = val
},
getNewVal_transInfo(val) {
console.log('新的val', val)
this.transInfo = val
},
getNewVal_analysisResults(val) {
console.log('新的val', val)
this.newDetail = val
},
getNewVal_nuclidesList(val) {
console.log('新的val', val)
this.nuclidesList = val
},
getNewVal_rationsList(val) {
console.log('新的val', val)
this.rationsList = val
},
getNewVal_methodsInfo(val) {
console.log('新的val', val)
this.methodsInfo = val
},
getNewVal_addInfo(val) {
console.log('新的val', val)
this.addInfo = val
},
handleOk() { handleOk() {
console.log('%c [ ]-62', 'font-size:13px; background:pink; color:#bf2c9f;') let params = {
laboratory: this.newDetail.laboratory || '',
srid: this.newDetail.srid || this.detail.srid,
colloct_start_date: this.newDetail.colloct_start_date || this.detail.colloct_start_date,
colloct_start_time: this.newDetail.colloct_start_time || this.detail.colloct_start_time,
colloct_stop_date: this.newDetail.colloct_stop_date || this.detail.colloct_stop_date,
colloct_stop_time: this.newDetail.colloct_stop_time || this.detail.colloct_stop_time,
receiptDate: this.newDetail.receiptDate || '',
receiptTime: this.newDetail.receiptTime || '',
reportTransmissionDate: this.newDetail.reportTransmissionDate || '',
reportTransmissionTime: this.newDetail.reportTransmissionTime || '',
comments: this.transInfo.comments || '',
otherComments: this.transInfo.otherComments || '',
pressureInTheArchiveBottle: this.newDetail.pressureInTheArchiveBottle || '',
volumeOfArchiveBottle: this.newDetail.volumeOfArchiveBottle || '',
gasComposition: this.newDetail.gasComposition || '',
stableXeMeasStartDate: this.newDetail.stableXeMeasStartDate || this.detail.stableXeMeasStartDate,
stableXeMeasStartTime: this.newDetail.stableXeMeasStartTime || this.detail.stableXeMeasStartTime,
stableXenonVolumeInTheArchiveBottle: this.newDetail.stableXenonVolumeInTheArchiveBottle || '',
uncertaintyOfStableXenonVolume: this.newDetail.uncertaintyOfStableXenonVolume || '',
stableXenonVolumeInTheMeasurementCell: this.newDetail.stableXenonVolumeInTheMeasurementCell || '',
uncertaintyOfStableXenonVolume2: this.newDetail.uncertaintyOfStableXenonVolume2 || '',
acq_start_date: this.newDetail.acq_start_date || this.detail.acq_start_date,
acq_start_time: this.newDetail.acq_start_time || this.detail.acq_start_time,
acq_live_time: this.newDetail.acq_live_time || this.detail.acq_live_time,
nuclides: this.nuclidesList,
rations: this.rationsList,
samplingHandling: this.methodsInfo.samplingHandling || '',
equipmentUsed: this.methodsInfo.equipmentUsed || '',
softwareUsed: this.methodsInfo.softwareUsed || '',
xeTransfer: this.addInfo.xeTransfer || '',
uncertaintyOfXe: this.addInfo.uncertaintyOfXe || '',
commentsInfo: this.addInfo.commentsInfo || '',
detailedDescriptionM: this.addInfo.detailedDescriptionM || '',
detailedDescriptionS: this.addInfo.detailedDescriptionS || '',
uncertaintyBudget: this.addInfo.uncertaintyBudget || '',
informationOn: this.addInfo.informationOn || '',
ysical: this.addInfo.ysical || '',
} }
postFileAction('/spectrumAnalysis/exportRLR', params).then((res) => {
const blob = new Blob([res], { type: 'application/vnd.ms-excel' })
let _this = this
this.$confirm({
title: 'Please enter file name',
content: (h) => <a-input v-model={_this.fileName} />,
okText: 'Cancle',
cancelText: 'Save',
okButtonProps: { style: { backgroundColor: '#b98326', color: '#fff', borderColor: 'transparent' } },
cancelButtonProps: { style: { color: '#fff', backgroundColor: '#31aab0', borderColor: 'transparent' } },
onOk() {
console.log('Cancel')
},
onCancel() {
if (_this.fileName) {
saveAs(blob, `${_this.fileName}`)
} }
},
})
})
},
},
} }
</script> </script>

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

@ -35,10 +35,9 @@
<!-- Beta-Gamma 分析 --> <!-- Beta-Gamma 分析 -->
<beta-gamma-analysis v-else-if="isBetaGamma" ref="betaGammaAnalysisRef" :sample="sampleData" /> <beta-gamma-analysis v-else-if="isBetaGamma" ref="betaGammaAnalysisRef" :sample="sampleData" />
<!-- <beta-gamma-analysis v-else-if="isBetaGamma" ref="betaGammaAnalysisRef" @getFiles="getFiles" :sample="sampleData" /> -->
<!-- Beta-Gamma 分析 --> <!-- Beta-Gamma 分析 -->
<div v-else class="empty"> <div v-else class="empty">Please Select a Sample</div>
Please Select a Sample
</div>
<resize-observer @notify="handleResize" /> <resize-observer @notify="handleResize" />
</div> </div>
<!-- 频谱分析部分结束 --> <!-- 频谱分析部分结束 -->
@ -76,7 +75,11 @@
<!-- 分析-设置弹窗结束 --> <!-- 分析-设置弹窗结束 -->
<!-- 分析工具弹窗开始 --> <!-- 分析工具弹窗开始 -->
<analyze-interactive-tool-modal v-model="analyzeInteractiveToolModalVisible" :sampleId="sampleData.sampleId" @refresh="handleRefreshGamma" /> <analyze-interactive-tool-modal
v-model="analyzeInteractiveToolModalVisible"
:sampleId="sampleData.sampleId"
@refresh="handleRefreshGamma"
/>
<!-- 分析工具弹窗结束 --> <!-- 分析工具弹窗结束 -->
<!-- Korsum 弹窗开始 --> <!-- Korsum 弹窗开始 -->
@ -104,10 +107,7 @@
<!-- Resolution Calibration 弹窗结束 --> <!-- Resolution Calibration 弹窗结束 -->
<!-- SpectrumComments 弹窗开始 --> <!-- SpectrumComments 弹窗开始 -->
<spectrum-comments-modal <spectrum-comments-modal v-model="gammaCommentsModalVisible" :isAdd="isGammaCommentsAdd" />
v-model="gammaCommentsModalVisible"
:isAdd="isGammaCommentsAdd"
/>
<!-- SpectrumComments 弹窗结束 --> <!-- SpectrumComments 弹窗结束 -->
<!-- Color Config 弹窗开始 --> <!-- Color Config 弹窗开始 -->
@ -127,11 +127,7 @@
<!-- Nuclide Library 弹窗结束 --> <!-- Nuclide Library 弹窗结束 -->
<!-- Arr 和 RRR 弹窗开始 --> <!-- Arr 和 RRR 弹窗开始 -->
<arr-rrr-modal <arr-rrr-modal v-model="arrOrRRRModalVisible" :type="arrOrRRRModalType" :extraData="this.arrOrRRRModalExtraData" />
v-model="arrOrRRRModalVisible"
:type="arrOrRRRModalType"
:extraData="this.arrOrRRRModalExtraData"
/>
<!-- Arr 弹窗结束 --> <!-- Arr 弹窗结束 -->
<!-- Spectrum 弹窗开始 --> <!-- Spectrum 弹窗开始 -->
@ -153,10 +149,7 @@
<automatic-analysis-log-modal v-model="autoAnalysisMogModalVisible" :type="autoAnalysisMogModalType" /> <automatic-analysis-log-modal v-model="autoAnalysisMogModalVisible" :type="autoAnalysisMogModalType" />
<!-- Beta-Gamma 的Comments 弹窗 --> <!-- Beta-Gamma 的Comments 弹窗 -->
<beta-gamma-comments-modal <beta-gamma-comments-modal v-model="betaGammaCommentsModalVisible" :isAdd="isBetaGammaCommentsAdd" />
v-model="betaGammaCommentsModalVisible"
:isAdd="isBetaGammaCommentsAdd"
/>
<!-- Beta-Gamma 的Comments 结束 --> <!-- Beta-Gamma 的Comments 结束 -->
<!-- Beta-Gamma 的Energy Calibration开始 --> <!-- Beta-Gamma 的Energy Calibration开始 -->
@ -240,7 +233,7 @@ import BetaGammaExtrapolationModal from './components/Modals/BetaGammaModals/Bet
// 分析类型 // 分析类型
const ANALYZE_TYPE = { const ANALYZE_TYPE = {
GAMMA: 'gammaAnalysis', GAMMA: 'gammaAnalysis',
BETA_GAMMA: 'betaGammaAnalysis' BETA_GAMMA: 'betaGammaAnalysis',
} }
export default { export default {
components: { components: {
@ -281,14 +274,14 @@ export default {
BetaGammaEnergyCalibrationModal, BetaGammaEnergyCalibrationModal,
StripModal, StripModal,
AutomaticAnalysisLogModal, AutomaticAnalysisLogModal,
BetaGammaExtrapolationModal BetaGammaExtrapolationModal,
}, },
provide() { provide() {
return { return {
sample: () => { sample: () => {
return this.sampleData return this.sampleData
} },
} }
}, },
@ -355,8 +348,8 @@ export default {
betaGammaSpectrumModalVisible: false, // beta-gamma spectrum 弹窗 betaGammaSpectrumModalVisible: false, // beta-gamma spectrum 弹窗
betaGammaSampleInfomationModalVisible: false, // beta-gamma sample infomation 弹窗 betaGammaSampleInfomationModalVisible: false, // beta-gamma sample infomation 弹窗
betaGammaQCResultsModalVisible: false, // beta-gamma QC Result 弹窗 betaGammaQCResultsModalVisible: false, // beta-gamma QC Result 弹窗
betaGammaRlrModalVisible: true, // beta-gamma RLR 弹窗 betaGammaRlrModalVisible: false, // beta-gamma RLR 弹窗
statisticsParamerHistoryModalVisible: false // beta-gamma Statistics Paramer History 弹窗 statisticsParamerHistoryModalVisible: false, // beta-gamma Statistics Paramer History 弹窗
} }
}, },
created() { created() {
@ -365,7 +358,7 @@ export default {
sampleId: 426530, sampleId: 426530,
sampleType: 'G', sampleType: 'G',
dbName: 'auto', dbName: 'auto',
inputFileName: 'CAX05_001-20230731_1528_S_FULL_37563.6.PHD' inputFileName: 'CAX05_001-20230731_1528_S_FULL_37563.6.PHD',
}) })
}, },
@ -374,18 +367,21 @@ export default {
}, },
methods: { methods: {
// getFiles(val){
// this.sampleData={...this.sampleData,...val}
// },
/** /**
* 从数据库加载-选择完成 * 从数据库加载-选择完成
* @param {any[]} sampleList * @param {any[]} sampleList
*/ */
handleLoadSampleFromDB(sampleList) { handleLoadSampleFromDB(sampleList) {
const ids = this.sampleList.map(item => item.sampleId) // 当前Sample列表中的所有id const ids = this.sampleList.map((item) => item.sampleId) // 当前Sample列表中的所有id
const willAddList = sampleList.filter(item => !ids.includes(item.sampleId)) const willAddList = sampleList.filter((item) => !ids.includes(item.sampleId))
this.sampleList = this.sampleList.concat(willAddList) this.sampleList = this.sampleList.concat(willAddList)
}, },
handleLoadSampleFromFile(sampleList) { handleLoadSampleFromFile(sampleList) {
console.log("sampleListsampleListsampleListsampleListsampleList",sampleList); console.log('sampleListsampleListsampleListsampleListsampleList', sampleList)
let arr = sampleList.filter(item => { let arr = sampleList.filter((item) => {
if (Object.keys(item).length > 4) { if (Object.keys(item).length > 4) {
if (item.gasFileName && item.detFileName && item.qcFileName && item.gasFileStatus && item.detFileStatus) { if (item.gasFileName && item.detFileName && item.qcFileName && item.gasFileStatus && item.detFileStatus) {
return item return item
@ -394,14 +390,14 @@ export default {
} }
} }
}) })
console.log("sampleListsampleList",arr); console.log('sampleListsampleList', arr)
arr.forEach(item => { arr.forEach((item) => {
item.sampleId = "" item.sampleId = ''
item.inputFileName = item.sampleFileName item.inputFileName = item.sampleFileName
item.sampleType = item.sampleSystemType item.sampleType = item.sampleSystemType
}) })
const names = this.sampleList.map(item => item.inputFileName) // 当前Sample列表中的所有id const names = this.sampleList.map((item) => item.inputFileName) // 当前Sample列表中的所有id
const willAddList = arr.filter(item => !names.includes(item.inputFileName)) const willAddList = arr.filter((item) => !names.includes(item.inputFileName))
this.sampleList = this.sampleList.concat(willAddList) this.sampleList = this.sampleList.concat(willAddList)
}, },
@ -496,7 +492,7 @@ export default {
// Beta-Gamma Energy Calibration 的重新分析 // Beta-Gamma Energy Calibration 的重新分析
handleReanalyse(...data) { handleReanalyse(...data) {
this.$refs.betaGammaAnalysisRef.reanalyse(data) this.$refs.betaGammaAnalysisRef.reanalyse(data)
} },
}, },
computed: { computed: {
// 顶部菜单栏配置 // 顶部菜单栏配置
@ -511,31 +507,31 @@ export default {
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Load From DB', title: 'Load From DB',
handler: () => (this.loadFromDbModalVisible = true) handler: () => (this.loadFromDbModalVisible = true),
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Load From File', title: 'Load From File',
handler: () => (this.loadFromFileModalVisible = true) handler: () => (this.loadFromFileModalVisible = true),
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Clean All', title: 'Clean All',
handler: this.handleCleanAll handler: this.handleCleanAll,
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Strip', title: 'Strip',
show: this.isGamma, show: this.isGamma,
handler: () => (this.stripModalVisible = true) handler: () => (this.stripModalVisible = true),
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Ftransit', title: 'Ftransit',
show: this.isGamma, show: this.isGamma,
handler: () => (this.ftransltModalVisible = true) handler: () => (this.ftransltModalVisible = true),
} },
] ],
}, },
{ {
type: 'a-divider', type: 'a-divider',
@ -543,27 +539,27 @@ export default {
style: { style: {
marginTop: '5px', marginTop: '5px',
marginBottom: '5px', marginBottom: '5px',
display: this.sampleList.length ? '' : 'none' display: this.sampleList.length ? '' : 'none',
} },
} },
}, },
{ {
type: 'SpectraListInMenu', type: 'SpectraListInMenu',
attrs: { attrs: {
list: this.sampleList list: this.sampleList,
}, },
on: { on: {
change: spectra => { change: (spectra) => {
if (spectra) { if (spectra) {
this.loadSelectedSample(spectra) this.loadSelectedSample(spectra)
} else { } else {
this.analysisType = undefined this.analysisType = undefined
this.sampleData = {} this.sampleData = {}
} }
} },
} },
} },
] ],
}, },
{ {
title: 'SAVE', title: 'SAVE',
@ -573,36 +569,36 @@ export default {
attrs: { attrs: {
children: [ children: [
{ {
title: 'Save Results to File' title: 'Save Results to File',
}, },
{ {
title: 'Save Results to DB', title: 'Save Results to DB',
children: [ children: [
{ {
title: 'Save Current', title: 'Save Current',
key: 'current' key: 'current',
}, },
{ {
title: 'Save All', title: 'Save All',
key: 'all' key: 'all',
} },
] ],
}, },
{ {
title: 'Save PHD to File', title: 'Save PHD to File',
children: [ children: [
{ {
title: 'Save Current', title: 'Save Current',
key: 'current' key: 'current',
}, },
{ {
title: 'Save All', title: 'Save All',
key: 'all' key: 'all',
} },
]
}
], ],
width: '170px' },
],
width: '170px',
}, },
on: { on: {
menuClick: () => { menuClick: () => {
@ -614,10 +610,10 @@ export default {
} else if (item.title == 'Save PHD to File') { } else if (item.title == 'Save PHD to File') {
this.handleSavePHDToFile(child.key) this.handleSavePHDToFile(child.key)
} }
} },
} },
} },
] ],
}, },
{ {
title: 'ANALYZE', title: 'ANALYZE',
@ -629,53 +625,53 @@ export default {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Configure', title: 'Configure',
show: this.isGamma, show: this.isGamma,
handler: () => (this.analyzeConfigureModalVisible = true) handler: () => (this.analyzeConfigureModalVisible = true),
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'ReProcessing', title: 'ReProcessing',
show: this.isGamma, show: this.isGamma,
handler: () => (this.reprocessingModalVisible = true) handler: () => (this.reprocessingModalVisible = true),
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Reprocess All', title: 'Reprocess All',
show: this.isGamma, show: this.isGamma,
handler: this.handleReprocessAll handler: this.handleReprocessAll,
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Interactive Tool', title: 'Interactive Tool',
show: this.isGamma, show: this.isGamma,
handler: () => (this.analyzeInteractiveToolModalVisible = true) handler: () => (this.analyzeInteractiveToolModalVisible = true),
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Zero Time', title: 'Zero Time',
show: this.isGamma, show: this.isGamma,
handler: () => (this.zeroTimeModalVisible = true) handler: () => (this.zeroTimeModalVisible = true),
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Korsum', title: 'Korsum',
show: this.isGamma, show: this.isGamma,
handler: () => (this.korsumModalShow = true) handler: () => (this.korsumModalShow = true),
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Analyze current spectrum', title: 'Analyze current spectrum',
show: this.isBetaGamma, show: this.isBetaGamma,
handler: () => {} handler: () => {},
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Analyze all spectra', title: 'Analyze all spectra',
show: this.isBetaGamma, show: this.isBetaGamma,
handler: () => {} handler: () => {},
} },
] ],
} },
] ],
}, },
{ {
title: 'CALIBRATION', title: 'CALIBRATION',
@ -687,35 +683,35 @@ export default {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Energy', title: 'Energy',
show: this.isGamma, show: this.isGamma,
handler: () => (this.energyCalibrationModalShow = true) handler: () => (this.energyCalibrationModalShow = true),
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Resolution', title: 'Resolution',
show: this.isGamma, show: this.isGamma,
handler: () => (this.resolutionCalibrationModalShow = true) handler: () => (this.resolutionCalibrationModalShow = true),
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Efficiency', title: 'Efficiency',
show: this.isGamma, show: this.isGamma,
handler: () => (this.efficiencyCalibrationModalShow = true) handler: () => (this.efficiencyCalibrationModalShow = true),
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Energy Calibration', title: 'Energy Calibration',
show: this.isBetaGamma, show: this.isBetaGamma,
handler: () => (this.betaGammaEnergyCalibrationModalVisible = true) handler: () => (this.betaGammaEnergyCalibrationModalVisible = true),
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Extrapolation', title: 'Extrapolation',
show: this.isBetaGamma, show: this.isBetaGamma,
handler: () => (this.betaGammaExtrapolationModalVisible = true) handler: () => (this.betaGammaExtrapolationModalVisible = true),
} },
] ],
} },
] ],
}, },
{ {
title: 'NUCLIDELIBRARY', title: 'NUCLIDELIBRARY',
@ -727,16 +723,16 @@ export default {
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Nuclide Library', title: 'Nuclide Library',
handler: () => (this.nuclideLibraryModalVisible = true) handler: () => (this.nuclideLibraryModalVisible = true),
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Config User Library', title: 'Config User Library',
handler: () => (this.configUserLibModalVisible = true) handler: () => (this.configUserLibModalVisible = true),
} },
] ],
} },
] ],
}, },
{ {
title: 'STATISTIC', title: 'STATISTIC',
@ -748,11 +744,11 @@ export default {
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'MDC & Activity Concentration', title: 'MDC & Activity Concentration',
handler: () => (this.statisticsParamerHistoryModalVisible = true) handler: () => (this.statisticsParamerHistoryModalVisible = true),
} },
] ],
} },
] ],
}, },
{ {
title: 'COMMENTS', title: 'COMMENTS',
@ -764,29 +760,29 @@ export default {
type: 'a-menu-item', type: 'a-menu-item',
title: 'View Comments', title: 'View Comments',
show: this.isBetaGamma, show: this.isBetaGamma,
handler: this.handleViewComments handler: this.handleViewComments,
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Add Comments', title: 'Add Comments',
show: this.isBetaGamma, show: this.isBetaGamma,
handler: this.handleAddComments handler: this.handleAddComments,
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'View', title: 'View',
show: this.isGamma, show: this.isGamma,
handler: this.handleViewComments handler: this.handleViewComments,
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Add', title: 'Add',
show: this.isGamma, show: this.isGamma,
handler: this.handleAddComments handler: this.handleAddComments,
} },
] ],
} },
] ],
}, },
{ {
title: 'REPORTS', title: 'REPORTS',
@ -798,7 +794,7 @@ export default {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Peak Infomation', title: 'Peak Infomation',
handler: () => (this.peakInfomationModalVisible = true), handler: () => (this.peakInfomationModalVisible = true),
show: this.isGamma show: this.isGamma,
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
@ -808,7 +804,7 @@ export default {
this.arrOrRRRModalExtraData = {} this.arrOrRRRModalExtraData = {}
this.arrOrRRRModalType = 1 this.arrOrRRRModalType = 1
}, },
show: this.isGamma show: this.isGamma,
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
@ -818,39 +814,39 @@ export default {
this.arrOrRRRModalExtraData = {} this.arrOrRRRModalExtraData = {}
this.arrOrRRRModalType = 2 this.arrOrRRRModalType = 2
}, },
show: this.isGamma show: this.isGamma,
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Radionuclide Activity', title: 'Radionuclide Activity',
handler: () => (this.nuclideActivityAndMDCModalVisible = true), handler: () => (this.nuclideActivityAndMDCModalVisible = true),
show: this.isGamma show: this.isGamma,
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Spectrum', title: 'Spectrum',
handler: () => (this.spectrumModalVisible = true), handler: () => (this.spectrumModalVisible = true),
show: this.isGamma show: this.isGamma,
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Sample Infomation', title: 'Sample Infomation',
handler: () => (this.sampleInfomationModalVisible = true), handler: () => (this.sampleInfomationModalVisible = true),
show: this.isGamma show: this.isGamma,
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'QC Results', title: 'QC Results',
handler: () => (this.qcResultsModalVisible = true), handler: () => (this.qcResultsModalVisible = true),
show: this.isGamma show: this.isGamma,
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'RLR', title: 'RLR',
handler: () => (this.rlrModalVisible = true), handler: () => (this.rlrModalVisible = true),
show: this.isGamma show: this.isGamma,
}, },
// 以下是beta-gamma的下拉 // 以下是beta-gamma的下拉
@ -862,7 +858,7 @@ export default {
this.arrOrRRRModalExtraData = {} this.arrOrRRRModalExtraData = {}
this.arrOrRRRModalType = 3 this.arrOrRRRModalType = 3
}, },
show: this.isBetaGamma show: this.isBetaGamma,
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
@ -876,39 +872,39 @@ export default {
DetBgData: false, DetBgData: false,
QCData: false, QCData: false,
bGammaEnergyValid: false, bGammaEnergyValid: false,
bBetaEnergyValid: false bBetaEnergyValid: false,
} }
this.arrOrRRRModalType = 4 this.arrOrRRRModalType = 4
}, },
show: this.isBetaGamma show: this.isBetaGamma,
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'View spectrum', title: 'View spectrum',
handler: () => (this.betaGammaSpectrumModalVisible = true), handler: () => (this.betaGammaSpectrumModalVisible = true),
show: this.isBetaGamma show: this.isBetaGamma,
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'View Sample Infomation', title: 'View Sample Infomation',
handler: () => (this.betaGammaSampleInfomationModalVisible = true), handler: () => (this.betaGammaSampleInfomationModalVisible = true),
show: this.isBetaGamma show: this.isBetaGamma,
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'QC results', title: 'QC results',
handler: () => (this.betaGammaQCResultsModalVisible = true), handler: () => (this.betaGammaQCResultsModalVisible = true),
show: this.isBetaGamma show: this.isBetaGamma,
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'RLR', title: 'RLR',
handler: () => (this.betaGammaRlrModalVisible = true), handler: () => (this.betaGammaRlrModalVisible = true),
show: this.isBetaGamma show: this.isBetaGamma,
} },
] ],
} },
] ],
}, },
{ {
title: 'LOG', title: 'LOG',
@ -922,23 +918,23 @@ export default {
handler: () => { handler: () => {
this.autoAnalysisMogModalType = this.isGamma ? 1 : this.isBetaGamma ? 2 : 1 this.autoAnalysisMogModalType = this.isGamma ? 1 : this.isBetaGamma ? 2 : 1
this.autoAnalysisMogModalVisible = true this.autoAnalysisMogModalVisible = true
} },
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'BG log viewer', title: 'BG log viewer',
show: this.isBetaGamma, show: this.isBetaGamma,
handler: () => {} handler: () => {},
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'GammaViewer Log', title: 'GammaViewer Log',
show: this.isGamma, show: this.isGamma,
handler: () => (this.dataProcessingLogModalVisible = true) handler: () => (this.dataProcessingLogModalVisible = true),
} },
] ],
} },
] ],
}, },
{ {
title: 'HELP', title: 'HELP',
@ -949,17 +945,17 @@ export default {
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Help', title: 'Help',
handler: this.handleHelp handler: this.handleHelp,
}, },
{ {
type: 'a-menu-item', type: 'a-menu-item',
title: 'Color Config', title: 'Color Config',
handler: () => (this.colorConfigModalVisible = true) handler: () => (this.colorConfigModalVisible = true),
} },
] ],
} },
] ],
} },
] ]
}, },
@ -971,8 +967,8 @@ export default {
// 当前类型是否是Beta-Gamma // 当前类型是否是Beta-Gamma
isBetaGamma() { isBetaGamma() {
return this.analysisType == ANALYZE_TYPE.BETA_GAMMA return this.analysisType == ANALYZE_TYPE.BETA_GAMMA
} },
} },
} }
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>