diff --git a/src/api/manage.js b/src/api/manage.js index 55b591e..e7e422f 100644 --- a/src/api/manage.js +++ b/src/api/manage.js @@ -14,52 +14,67 @@ const api = { export default api //post -export function postAction(url,parameter) { +export function postAction(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()}; + 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' , + method: 'post', data: parameter, 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} -export function httpAction(url,parameter,method) { +export function httpAction(url, parameter, method) { 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()}; + 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:method , + method: method, data: parameter, headers: signHeader }) } //put -export function putAction(url,parameter) { +export function putAction(url, parameter) { return axios({ url: url, - method:'put', + method: 'put', data: parameter }) } //get -export function getAction(url,parameter) { +export function getAction(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()}; + let signHeader = { "X-Sign": sign, "X-TIMESTAMP": signMd5Utils.getTimestamp() }; // update-end--author:taoyan---date:20220421--for: VUEN-410【签名改造】 X-TIMESTAMP牵扯 return axios({ @@ -70,26 +85,26 @@ export function getAction(url,parameter) { }) } -export function getFileAction(url,parameter) { +export function getFileAction(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()}; + 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: 'get', params: parameter, - responseType:"blob", - paramsSerializer: function (params) { - return qs.stringify(params, { arrayFormat: "repeat" }); + responseType: "blob", + paramsSerializer: function (params) { + return qs.stringify(params, { arrayFormat: "repeat" }); }, headers: signHeader }) } //deleteAction -export function deleteAction(url,parameter) { +export function deleteAction(url, parameter) { return axios({ url: url, method: 'delete', @@ -145,15 +160,15 @@ export function saveService(parameter) { * @param parameter * @returns {*} */ -export function downFile(url,parameter, method='get'){ - if(method=='get'){ +export function downFile(url, parameter, method = 'get') { + if (method == 'get') { return axios({ url: url, params: parameter, - method: method , + method: method, responseType: 'blob' }) - }else{ + } else { return axios({ url: url, method: method, @@ -199,11 +214,11 @@ export function downloadFile(url, fileName, parameter, method) { * @param parameter * @returns {*} */ -export function uploadAction(url,parameter){ +export function uploadAction(url, parameter) { return axios({ url: url, data: parameter, - method:'post' , + method: 'post', headers: { 'Content-Type': 'multipart/form-data', // 文件上传 }, @@ -216,17 +231,17 @@ export function uploadAction(url,parameter){ * @param subStr * @returns {*} */ -export function getFileAccessHttpUrl(avatar,subStr) { - if(!subStr) subStr = 'http' +export function getFileAccessHttpUrl(avatar, subStr) { + if (!subStr) subStr = 'http' try { - if(avatar && avatar.startsWith(subStr)){ + if (avatar && avatar.startsWith(subStr)) { return avatar; - }else{ - if(avatar && avatar.length>0 && avatar.indexOf('[')==-1){ + } else { + if (avatar && avatar.length > 0 && avatar.indexOf('[') == -1) { return window._CONFIG['staticDomainURL'] + "/" + avatar; } } - }catch(err){ - return; + } catch (err) { + return; } } diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index 922f554..4cd3b2c 100644 --- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue +++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue @@ -11,7 +11,12 @@ QC Flags - + @@ -20,9 +25,7 @@
- +
- +
- +
- +
- +
- +
@@ -122,7 +115,11 @@ - +
@@ -144,26 +141,26 @@ const StatisticsType = { 'Collection Time': 'Colloc_Time', 'Acq Time': 'Acq_Time', 'Xe Volume': 'Xe_volumn', - 'Air Volume': 'Sample_Volumn' + 'Air Volume': 'Sample_Volumn', } const SampleType = [ { label: 'Sample Data', - value: 'sample' + value: 'sample', }, { label: 'GasBg Data', - value: 'gasBg' + value: 'gasBg', }, { label: 'DetBg Data', - value: 'detBg' + value: 'detBg', }, { label: 'QC Data', - value: 'qc' - } + value: 'qc', + }, ] export default { @@ -179,12 +176,12 @@ export default { BetaGammaQcFlags, BetaGammaDetailedInfomation, StatisticsParamerHistoryModalForQcFlags, - CustomSelect + CustomSelect, }, props: { sample: { - type: Object - } + type: Object, + }, }, data() { this.SampleType = SampleType @@ -217,7 +214,7 @@ export default { comparisonModalVisible: false, statisticModalVisible: false, // Qc Flags 点击后的弹窗 - statisticsType: StatisticsType['Collection Time'] + statisticsType: StatisticsType['Collection Time'], } }, methods: { @@ -229,12 +226,13 @@ export default { this.isLoading = true const { success, result, message } = await getAction('/spectrumAnalysis/getDBSpectrumChart', { dbName, - sampleId + sampleId, }) if (success) { this.sampleDetail = result this.changeChartByType('sample') this.isLoading = false + // this.$emit("getFiles",{detFileName:result.detBg.fileName,gasFileName:result.gasBg.fileName}) } else { this.$message.error(message) } @@ -248,7 +246,7 @@ export default { sampleFileName: this.sample.sampleFileName, gasFileName: this.sample.gasFileName, detFileName: this.sample.detFileName, - qcFileName: this.sample.qcFileStatus?this.sample.qcFileName:"", + qcFileName: this.sample.qcFileStatus ? this.sample.qcFileName : '', } try { this.isLoading = true @@ -266,56 +264,56 @@ export default { }, changeChartByType(val) { - if (val==="qc"&&!this.sample.qcFileStatus) { - this.$message.warning("No qc spectrum file!") + if (val === 'qc' && !this.sample.qcFileStatus) { + this.$message.warning('No qc spectrum file!') } else { const { betaOriginalData, betaProjectedData, betaEnergyData, - + gammaOriginalData, gammaProjectedData, gammaEnergyData, - + histogramDataList, // 左侧 Beta-Gamma Spectrum: Sample 图表 histogramDataDList, // 左侧 Beta-Gamma Spectrum: Sample 图表的3D部分 Boundary, // 左侧2d图表的矩形 - + XeData, // 右下角Result Display spectrumData, - + AcqTimeBtn, // QC Flags 相关 CollectTimeBtn, // QC Flags 相关 SampleVolumeBtn, // QC Flags 相关 XeVolumeBtn, // QC Flags 相关 GasBgBtn, // QC Flags 相关 - DetBgBtn // QC Flags 相关 + DetBgBtn, // QC Flags 相关 } = this.sampleDetail[this.spectraType] - + this.spectrumData = spectrumData - + this.histogramDataList = histogramDataList this.histogramDataDList = histogramDataDList this.boundaryList = Boundary - + this.gammaOriginalData = gammaOriginalData this.gammaProjectedData = gammaProjectedData this.gammaEnergyData = gammaEnergyData - + this.betaOriginalData = betaOriginalData this.betaProjectedData = betaProjectedData this.betaEnergyData = betaEnergyData - + this.resultDisplay = XeData - + this.qcFlags = { AcqTimeBtn, CollectTimeBtn, SampleVolumeBtn, XeVolumeBtn, GasBgBtn, - DetBgBtn + DetBgBtn, } } }, @@ -378,28 +376,27 @@ export default { // 重新分析,设置右侧折线图的Energy reanalyse([type, data]) { - const energy = data.map(item => [item.y]) - if(type == 'gamma') { + const energy = data.map((item) => [item.y]) + if (type == 'gamma') { this.gammaEnergyData = energy } else { this.betaEnergyData = energy } - - } + }, }, watch: { sample: { handler(newVal, oldVal) { - console.log("newValnewVal", newVal); + console.log('newValnewVal', newVal) if (newVal.sampleId) { this.getSampleDetail() } else { this.getSampleDetail_file() } }, - immediate: true - } - } + immediate: true, + }, + }, } diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/AdditionalInfo.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/AdditionalInfo.vue index 4fcdd40..6a73793 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/AdditionalInfo.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/AdditionalInfo.vue @@ -4,37 +4,81 @@ - + - + - + - + - + - + - + - +
diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/Nuclides.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/Nuclides.vue index 01e19b6..bf0b099 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/Nuclides.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/Nuclides.vue @@ -2,7 +2,11 @@
@@ -15,7 +19,7 @@ const columns = [ dataIndex: 'name', align: 'center', width: 80, - fixed: 'left' + fixed: 'left', }, { title: 'Activity [Bq]', @@ -23,8 +27,8 @@ const columns = [ align: 'center', width: 90, scopedSlots: { - customRender: 'activity' - } + customRender: 'activity', + }, }, { title: 'Uncert.Activity [%]', @@ -32,8 +36,8 @@ const columns = [ align: 'center', width: 140, scopedSlots: { - customRender: 'uncertActivity' - } + customRender: 'uncertActivity', + }, }, { title: 'MDA [Bq]', @@ -41,8 +45,8 @@ const columns = [ align: 'center', width: 100, scopedSlots: { - customRender: 'mda' - } + customRender: 'mda', + }, }, { title: 'Concentration [Bq/m3]', @@ -50,8 +54,8 @@ const columns = [ align: 'center', width: 170, scopedSlots: { - customRender: 'concentration' - } + customRender: 'concentration', + }, }, { title: 'Uncert.concentration [%]', @@ -59,8 +63,8 @@ const columns = [ align: 'center', width: 190, scopedSlots: { - customRender: 'uncertConcentration' - } + customRender: 'uncertConcentration', + }, }, { title: 'MDC [Bq/m3]', @@ -68,8 +72,8 @@ const columns = [ align: 'center', width: 120, scopedSlots: { - customRender: 'mdc' - } + customRender: 'mdc', + }, }, { title: 'Lc [Bq/m3]', @@ -77,62 +81,76 @@ const columns = [ align: 'center', width: 100, scopedSlots: { - customRender: 'lc' - } - } + customRender: 'lc', + }, + }, ] const nameMapper = [ { name: 'Xe-131m', mapTo: 'xe131m' }, { name: 'Xe-133m', mapTo: 'xe133m' }, { name: 'Xe-133', mapTo: 'xe133' }, - { name: 'Xe-135', mapTo: 'xe135' } + { name: 'Xe-135', mapTo: 'xe135' }, ] const columnNameMapper = [ { name: 'concentration', - mapTo: 'conc' + mapTo: 'conc', }, { name: 'uncertConcentration', - mapTo: 'uncert_conc' + mapTo: 'uncert_conc', }, { name: 'mdc', - mapTo: 'MDC' + mapTo: 'MDC', }, { name: 'lc', - mapTo: 'LC' - } + mapTo: 'LC', + }, ] export default { props: { detail: { - type: Object - } + type: Object, + }, }, data() { this.columns = columns - - return {} + return { + list: [], + } }, computed: { 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 } - columnNameMapper.forEach(it => { + columnNameMapper.forEach((it) => { const key = `${item.mapTo}_${it.mapTo}` obj[it.name] = this.detail[key] + obj.activity = '' + obj.uncertActivity = '' + obj.mda = '' }) return obj }) - } - } + }, + cellChange(val, record, key) { + record[key] = val + this.$emit('valChange', this.list) + }, + }, } diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/Ratios.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/Ratios.vue index ec03969..df4efd3 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/Ratios.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/Ratios.vue @@ -2,7 +2,11 @@
@@ -17,7 +21,7 @@ const columns = [ width: 100, customRender: (_, __, index) => { return index + 1 - } + }, }, { title: 'Nuclide1', @@ -25,8 +29,8 @@ const columns = [ align: 'center', width: 100, scopedSlots: { - customRender: 'nuclide1' - } + customRender: 'nuclide1', + }, }, { title: 'Nuclide2', @@ -34,8 +38,8 @@ const columns = [ align: 'center', width: 150, scopedSlots: { - customRender: 'nuclide2' - } + customRender: 'nuclide2', + }, }, { title: 'Isotope ratio', @@ -43,8 +47,8 @@ const columns = [ align: 'center', width: 100, scopedSlots: { - customRender: 'isotopeRatio' - } + customRender: 'isotopeRatio', + }, }, { title: 'Uncert.Ratio [%]', @@ -52,36 +56,29 @@ const columns = [ align: 'center', width: 200, scopedSlots: { - customRender: 'uncertRatio' - } - } + customRender: 'uncertRatio', + }, + }, ] export default { data() { this.columns = columns return { - list: [ - { - nuclide1: 'nuclide1', - nuclide2: 'nuclide2', - isotopeRatio: 'isotopeRatio', - uncertRatio: 'uncertRatio' - }, - { - nuclide1: 'nuclide1', - nuclide2: 'nuclide2', - isotopeRatio: 'isotopeRatio', - uncertRatio: 'uncertRatio' - } - ] + list: [], } }, computed: { 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) + }, + }, } diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/TransportInfomation.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/TransportInfomation.vue index 5e39989..c151d57 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/TransportInfomation.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/components/TransportInfomation.vue @@ -1,25 +1,45 @@ \ No newline at end of file diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/index.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/index.vue index 9a52026..5aea811 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/index.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/BetaGammaRLRModal/index.vue @@ -17,25 +17,25 @@