diff --git a/src/components/CustomChart/index.vue b/src/components/CustomChart/index.vue index dfd8df0..8c37650 100644 --- a/src/components/CustomChart/index.vue +++ b/src/components/CustomChart/index.vue @@ -13,6 +13,10 @@ export default { type: Object, default: () => ({}) }, + notMerge: { + type: Boolean, + default: false + }, height: { type: Number, default: 0 @@ -59,7 +63,9 @@ export default { option: { handler() { if (this._chart) { - this._chart.setOption(this.option) + this._chart.setOption(this.option, { + notMerge: this.notMerge + }) } }, deep: true diff --git a/src/utils/chartHelper.js b/src/utils/chartHelper.js index 3909f91..684783d 100644 --- a/src/utils/chartHelper.js +++ b/src/utils/chartHelper.js @@ -24,11 +24,11 @@ export function getXAxisAndYAxisByPosition(chart, offsetX, offsetY, seriesIndex * @param {import("echarts").ECharts} chartInstance * @param {'png' | 'jpeg' | 'svg'} type */ -export function exportEchartImg(chartInstance, type = 'png') { +export function exportEchartImg(chartInstance, type = 'png', backgroundColor = '#022024') { const dataURL = chartInstance.getDataURL({ type, pixelRatio: 2, - backgroundColor: '#022024' + backgroundColor }); const link = document.createElement('a') diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index 6103dff..d6ddf65 100644 --- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue +++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue @@ -9,7 +9,7 @@ QC Flags - + Spectra @@ -131,6 +131,8 @@ + + @@ -138,6 +140,7 @@ import { getAction } from '../../api/manage' import BetaGammaChartContainer from './components/BetaGammaChartContainer.vue' import BetaGammaSpectrumChart from './components/BetaGammaSpectrumChart.vue' +import StatisticsParamerHistoryModalForQcFlags from './components/Modals/BetaGammaModals/StatisticsParamerHistoryModalForQCFlags.vue' import ComparisonModal from './components/Modals/ComparisonModal.vue' import ResultDisplay from './components/ResultDisplay.vue' import SpectrumLineChart from './components/SpectrumLineChart.vue' @@ -146,6 +149,13 @@ import BetaGammaQcFlags from './components/SubOperators/BetaGammaQcFlags.vue' import PopOverWithIcon from './components/SubOperators/PopOverWithIcon.vue' import Spectra from './components/SubOperators/Spectra.vue' +const StatisticsType = { + 'Collection Time': 'Colloc_Time', + 'Acq Time': 'Acq_Time', + 'Xe Volume': 'Xe_volumn', + 'Air Volume': 'Sample_Volumn' +} + export default { components: { BetaGammaChartContainer, @@ -157,7 +167,8 @@ export default { PopOverWithIcon, Spectra, BetaGammaQcFlags, - BetaGammaDetailedInfomation + BetaGammaDetailedInfomation, + StatisticsParamerHistoryModalForQcFlags }, props: { sample: { @@ -190,7 +201,10 @@ export default { gammaEnergyData: [], betaEnergyData: [], - comparisonModalVisible: false + comparisonModalVisible: false, + + statisticModalVisible: false, // Qc Flags 点击后的弹窗 + statisticsType: StatisticsType['Collection Time'] } }, methods: { @@ -312,6 +326,15 @@ export default { } this.$refs.betaGammaChartRef.setRange(x1, x2, type) + }, + + // QC Flags 除去GasBg 和 DetBg其他四个点击时 + handleQcFlagClick(item) { + const statisticsType = StatisticsType[item] + if (statisticsType) { + this.statisticsType = statisticsType + this.statisticModalVisible = true + } } }, watch: { diff --git a/src/views/spectrumAnalysis/components/BetaGammaSpectrumChart.vue b/src/views/spectrumAnalysis/components/BetaGammaSpectrumChart.vue index e47e728..2133edc 100644 --- a/src/views/spectrumAnalysis/components/BetaGammaSpectrumChart.vue +++ b/src/views/spectrumAnalysis/components/BetaGammaSpectrumChart.vue @@ -448,7 +448,6 @@ export default { // 通知上层范围改变 emitRangeChange(range) { - console.log('%c [ range ]-452', 'font-size:13px; background:pink; color:#bf2c9f;', range) this.$emit('rangeChange', range) }, diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/AutomaticAnalysisLogModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/AutomaticAnalysisLogModal.vue new file mode 100644 index 0000000..0a6ec90 --- /dev/null +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/AutomaticAnalysisLogModal.vue @@ -0,0 +1,20 @@ + + + + + diff --git a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue index cf51ca6..1b43949 100644 --- a/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/BetaGammaModals/StatisticsParamerHistoryModal.vue @@ -1,5 +1,5 @@