+
{{ conf.label }}
@@ -31,7 +31,7 @@ const config = [
name: 'DetBgBtn'
},
{
- label: 'Sample Volume',
+ label: 'Air Volume',
name: 'SampleVolumeBtn'
}
]
@@ -45,6 +45,11 @@ export default {
},
created() {
this.config = config
+ },
+ methods: {
+ handleClick(conf) {
+ this.$emit('click', conf.label)
+ }
}
}
@@ -58,6 +63,7 @@ export default {
align-items: center;
width: 150px;
height: 30px;
+ cursor: default;
&:not(:last-child) {
margin-right: 2px;
diff --git a/src/views/spectrumAnalysis/components/TitleOverBorder.vue b/src/views/spectrumAnalysis/components/TitleOverBorder.vue
index 28d29d4..3b55e94 100644
--- a/src/views/spectrumAnalysis/components/TitleOverBorder.vue
+++ b/src/views/spectrumAnalysis/components/TitleOverBorder.vue
@@ -1,6 +1,10 @@
-
{{ title }}
+
+
+ {{ title }}
+
+
@@ -9,11 +13,11 @@
diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue
index 00c04af..10dd571 100644
--- a/src/views/spectrumAnalysis/index.vue
+++ b/src/views/spectrumAnalysis/index.vue
@@ -138,6 +138,8 @@
+
+
-
+
@@ -214,6 +219,7 @@ import StatisticsParamerHistoryModal from './components/Modals/BetaGammaModals/S
import FtransltModal from './components/Modals/FtransltModal/index.vue'
import BetaGammaEnergyCalibrationModal from './components/Modals/BetaGammaModals/BetaGammaEnergyCalibrationModal/index.vue'
import StripModal from './components/Modals/StripModal.vue'
+import AutomaticAnalysisLogModal from './components/Modals/BetaGammaModals/AutomaticAnalysisLogModal.vue'
// 分析类型
const ANALYZE_TYPE = {
@@ -257,7 +263,8 @@ export default {
StatisticsParamerHistoryModal,
FtransltModal,
BetaGammaEnergyCalibrationModal,
- StripModal
+ StripModal,
+ AutomaticAnalysisLogModal
},
data() {
this.ANALYZE_TYPE = ANALYZE_TYPE
@@ -305,6 +312,8 @@ export default {
qcResultsModalVisible: false, // Reports -> Qc Results 弹窗
rlrModalVisible: false, // Reports -> RLR 弹窗
+ autoAnalysisMogModalVisible: false, // Log -> Automatic Analysis Log 弹窗
+
/**
* 以下是beta-gamma跟前面不同的弹窗
**/
@@ -320,6 +329,13 @@ export default {
statisticsParamerHistoryModalVisible: false // beta-gamma Statistics Paramer History 弹窗
}
},
+ created() {
+ this.loadSelectedSample({
+ sampleId: 426120,
+ dbName: 'auto',
+ sampleType: 'B'
+ })
+ },
methods: {
/**
* 从数据库加载-选择完成
@@ -403,11 +419,6 @@ export default {
}
},
- // 查看自动处理日志
- handleAutoAnalysisLog() {
- console.log('%c [ handleAutoAnalysisLog ]-211', 'font-size:13px; background:pink; color:#bf2c9f;')
- },
-
// 查看软件操作帮助文档
handleHelp() {
console.log('%c [ handleHelp ]-221', 'font-size:13px; background:pink; color:#bf2c9f;')
@@ -807,11 +818,19 @@ export default {
{
type: 'a-menu-item',
title: 'Automatic Analysis Log',
- handler: this.handleAutoAnalysisLog
+ show: this.isBetaGamma,
+ handler: () => (this.autoAnalysisMogModalVisible = true)
+ },
+ {
+ type: 'a-menu-item',
+ title: 'BG log viewer',
+ show: this.isBetaGamma,
+ handler: () => {}
},
{
type: 'a-menu-item',
title: 'GammaViewer Log',
+ show: this.isGamma,
handler: () => (this.dataProcessingLogModalVisible = true)
}
]