@@ -157,7 +157,7 @@ const initialOption = {
right: 10,
left: 40,
top: 20,
- bottom: 60
+ bottom: 60,
},
legend: {
show: false,
@@ -166,62 +166,62 @@ const initialOption = {
right: 20,
z: 999,
textStyle: {
- color: '#fff'
+ color: '#fff',
},
backgroundColor: '#022024',
borderColor: '#0b8c82',
borderWidth: 1,
- itemWidth: 50
+ itemWidth: 50,
},
xAxis: {
type: 'category',
axisLine: {
lineStyle: {
- color: 'rgba(119, 181, 213, .3)'
- }
+ color: 'rgba(119, 181, 213, .3)',
+ },
},
axisLabel: {
color: '#ade6ee',
fontSize: 12,
rotate: 45,
margin: 10,
- formatter: value => {
+ formatter: (value) => {
return moment(value).format('YYYY/MM/DD')
},
- interval: 4
+ interval: 4,
},
splitLine: {
show: true,
lineStyle: {
- color: 'rgba(119, 181, 213, .3)'
- }
+ color: 'rgba(119, 181, 213, .3)',
+ },
},
axisTick: {
- show: false
+ show: false,
},
- data: []
+ data: [],
},
yAxis: {
axisLine: {
lineStyle: {
- color: 'rgba(119, 181, 213, .3)'
- }
+ color: 'rgba(119, 181, 213, .3)',
+ },
},
axisLabel: {
color: '#ade6ee',
- fontSize: 12
+ fontSize: 12,
},
splitLine: {
show: true,
lineStyle: {
- color: 'rgba(119, 181, 213, .3)'
- }
+ color: 'rgba(119, 181, 213, .3)',
+ },
},
axisTick: {
- show: false
- }
+ show: false,
+ },
},
- series: []
+ series: [],
}
// 左侧配置
@@ -244,7 +244,7 @@ const initialFilterOption = {
xeVolumeLine: 0.87,
mdcLine: 0,
concLine: 0,
- nuclidesList: []
+ nuclidesList: [],
}
export default {
components: { TitleOverBorder, CustomChart },
@@ -254,8 +254,10 @@ export default {
option: cloneDeep(initialOption),
initialMDC: {}, // 初始化的信息，用于重置
- queryParams: {},
- detectorList: [] // 探测器列表
+ queryParams: {
+ xeResFlag: false,
+ },
+ detectorList: [], // 探测器列表
}
},
methods: {
@@ -265,7 +267,7 @@ export default {
const { sampleId, inputFileName: sampleFileName } = this.sampleData
const { success, message, result } = await getAction('/spectrumAnalysis/viewMDC', {
sampleId,
- sampleFileName
+ sampleFileName,
})
if (success) {
this.setStationAndDetector(result)
@@ -303,7 +305,7 @@ export default {
this.queryParams.stationName = stationName
this.detectorList = detectorList.map(({ detectorCode, detectorId }) => ({
label: detectorCode,
- value: detectorId || ''
+ value: detectorId || '',
}))
this.queryParams.detectorName = detectorList[0].detectorCode
this.queryParams.detectorId = detectorList[0].detectorId || ''
@@ -315,7 +317,7 @@ export default {
this.queryParams.stationName = this.initialMDC.stationName
this.detectorList = this.initialMDC.detectorList.map(({ detectorCode, detectorId }) => ({
label: detectorCode,
- value: detectorId || ''
+ value: detectorId || '',
}))
},
@@ -327,29 +329,28 @@ export default {
}
try {
- const find = this.detectorList.find(item => item.value == this.queryParams.detectorId)
+ const find = this.detectorList.find((item) => item.value == this.queryParams.detectorId)
const { success, message, result } = await postAction('/spectrumAnalysis/statisticsQuery', {
- detectorCode: find? find.label: '',
- ...this.queryParams
+ detectorCode: find ? find.label : '',
+ ...this.queryParams,
})
if (success) {
if (result) {
-
this.option.xAxis.data = result[0].m_Keys
this.option.legend.show = true
- this.option.series = result.map(item => {
+ this.option.series = result.map((item) => {
return {
type: 'line',
name: item.m_strGraphName,
data: item.m_Values,
itemStyle: {
- color: item.m_GraphPen
+ color: item.m_GraphPen,
},
lineStyle: {
- color: item.m_GraphPen
+ color: item.m_GraphPen,
},
- symbol: 'circle'
+ symbol: 'circle',
}
})
} else {
@@ -375,17 +376,17 @@ export default {
this.queryParams = {
...initialFilterOption,
startTime: moment().format('YYYY-MM-DD'),
- endTime: moment().format('YYYY-MM-DD')
+ endTime: moment().format('YYYY-MM-DD'),
}
this.option = cloneDeep(initialOption)
- }
+ },
},
computed: {
filterDisabled() {
return !this.queryParams.filterGrpbox
- }
- }
+ },
+ },
}
diff --git a/src/views/spectrumAnalysis/components/Modals/ProcessingMonitorModal.vue b/src/views/spectrumAnalysis/components/Modals/ProcessingMonitorModal.vue
new file mode 100644
index 0000000..0ef27d3
--- /dev/null
+++ b/src/views/spectrumAnalysis/components/Modals/ProcessingMonitorModal.vue
@@ -0,0 +1,48 @@
+
+
+
+
+ {{ percent * 100 }}%
+
+
{{ analysedFileName[0] }}
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/spectrumAnalysis/gamma-analysis.vue b/src/views/spectrumAnalysis/gamma-analysis.vue
index 75a3904..5124d0a 100644
--- a/src/views/spectrumAnalysis/gamma-analysis.vue
+++ b/src/views/spectrumAnalysis/gamma-analysis.vue
@@ -1534,9 +1534,10 @@ export default {
try {
this.isLoading = true
+ const str = `&processKey=${userId}_${this.timerStamp}`
const { inputFileName: fileName } = this.sample
const { success, result, message } = await postAction(
- `/gamma/Reprocessing?fileName=${fileName}&processKey=${userId}_${this.timerStamp}`
+ `/gamma/Reprocessing?fileName=${fileName}${showMessage ? str : ''}`
)
if (success) {
this.reprocessingModalVisible = false //如果分析成功了，分析进度的弹窗即便是没有接收到后面的 ws 消息也要关闭弹窗
@@ -1546,6 +1547,7 @@ export default {
this.handleResetState()
result.DetailedInformation = this.detailedInfomation
this.dataProcess(result)
+ return success
} else {
this.isLoading = false
if (showMessage) {
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index 9887550..785ac27 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -93,6 +93,13 @@
@senInfo="getUpdateFlag"
/>
+
+
+
sample.sampleType !== 'B')
+ this.gammaSampleNum = gammaSampleList.length
+ const gammaInputFileNames = gammaSampleList.map((item) => item.inputFileName)
- // 先排除当前的谱
- const otherSampleList = this.sampleList.filter((sample) => sample.inputFileName !== inputFileName)
+ if (gammaInputFileNames.length > 0) {
+ this.fetchReprocessing(gammaInputFileNames, inputFileName, sampleType)
+ }
- const betaSamples = otherSampleList.filter((sample) => sample.sampleType == 'B')
- const gammaSamples = otherSampleList.filter((sample) => sample.sampleType !== 'B')
- gammaSamples.forEach((gammaSample) => {
- postAction(`/gamma/Reprocessing?fileName=${gammaSample.inputFileName}`)
- })
+ // // 先排除当前的谱
+ // const otherSampleList = this.sampleList.filter((sample) => sample.inputFileName !== inputFileName)
- // 处理当前的谱的reprocessing
- if (inputFileName && sampleType !== 'B') {
- this.$refs.gammaAnalysisRef.reProcessing(false)
+ // const betaSamples = otherSampleList.filter((sample) => sample.sampleType == 'B')
+ // const gammaSamples = otherSampleList.filter((sample) => sample.sampleType !== 'B')
+ // gammaSamples.forEach((gammaSample) => {
+ // postAction(`/gamma/Reprocessing?fileName=${gammaSample.inputFileName}`)
+ // })
+
+ // // 处理当前的谱的reprocessing
+ // if (inputFileName && sampleType !== 'B') {
+ // this.$refs.gammaAnalysisRef.reProcessing(false)
+ // }
+ },
+ async fetchReprocessing(fileNames, currFileName, sampleType) {
+ if (fileNames[0] == currFileName && sampleType !== 'B') {
+ this.$refs.gammaAnalysisRef.reProcessing(false).then((res) => {
+ if (res) {
+ this.finishCont++
+ this.percentBar = this.finishCont / this.gammaSampleNum
+ this.analysedFileName = fileNames.splice(0, 1)
+ if (fileNames.length > 0) {
+ this.fetchReprocessing(fileNames, currFileName, sampleType)
+ }
+ }
+ })
+ } else {
+ try {
+ const { success, result, message } = await postAction(`/gamma/Reprocessing?fileName=${fileNames[0]}`)
+ if (success) {
+ this.finishCont++
+ this.percentBar = this.finishCont / this.gammaSampleNum
+ this.analysedFileName = fileNames.splice(0, 1)
+ if (fileNames.length > 0) {
+ this.fetchReprocessing(fileNames, currFileName, sampleType)
+ }
+ }
+ } catch (error) {
+ console.error(error)
+ }
}
},
-
// 查看Comments
handleViewComments() {
// 如果是gamma