diff --git a/src/assets/images/spectrum/comparation.png b/src/assets/images/spectrum/comparation.png new file mode 100644 index 0000000..1ae9c9c Binary files /dev/null and b/src/assets/images/spectrum/comparation.png differ diff --git a/src/assets/images/spectrum/download.png b/src/assets/images/spectrum/download.png new file mode 100644 index 0000000..ccde799 Binary files /dev/null and b/src/assets/images/spectrum/download.png differ diff --git a/src/style.less b/src/style.less index d86ad85..a117258 100644 --- a/src/style.less +++ b/src/style.less @@ -61,6 +61,8 @@ body { .ant-table { color: #ade6ee; font-size: 16px; + border: 1px solid rgba(65,111,127, .5); + &-thead { > tr { th { @@ -679,6 +681,16 @@ input[type='number']::-webkit-outer-spin-button { background-color: #b98326 !important; } } + + &-grey { + // 自定义warn样式 + background-color: #406979 !important; + color: #fff !important; + border-color: #406979 !important; + &:hover { + background-color: #406979 !important; + } + } } // 空状态 diff --git a/src/views/logManage/index.vue b/src/views/logManage/index.vue index 7a5aa09..8c2742e 100644 --- a/src/views/logManage/index.vue +++ b/src/views/logManage/index.vue @@ -55,7 +55,7 @@ - +
{{ logItem }} diff --git a/src/views/spectrumAnalysis/beta-gamma-analysis.vue b/src/views/spectrumAnalysis/beta-gamma-analysis.vue index 7356775..e80ab8d 100644 --- a/src/views/spectrumAnalysis/beta-gamma-analysis.vue +++ b/src/views/spectrumAnalysis/beta-gamma-analysis.vue @@ -56,19 +56,30 @@
+ + + + - - diff --git a/src/views/spectrumAnalysis/components/LoadFromFileModal.vue b/src/views/spectrumAnalysis/components/LoadFromFileModal.vue deleted file mode 100644 index a770e60..0000000 --- a/src/views/spectrumAnalysis/components/LoadFromFileModal.vue +++ /dev/null @@ -1,128 +0,0 @@ - - - - - diff --git a/src/views/spectrumAnalysis/components/Modals/ComparisonModal.vue b/src/views/spectrumAnalysis/components/Modals/ComparisonModal.vue new file mode 100644 index 0000000..3fe678b --- /dev/null +++ b/src/views/spectrumAnalysis/components/Modals/ComparisonModal.vue @@ -0,0 +1,130 @@ + + + + + diff --git a/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue b/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue new file mode 100644 index 0000000..4c2aa5c --- /dev/null +++ b/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue @@ -0,0 +1,313 @@ + + + + + diff --git a/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue b/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue new file mode 100644 index 0000000..80522ea --- /dev/null +++ b/src/views/spectrumAnalysis/components/Modals/LoadFromFileModal.vue @@ -0,0 +1,172 @@ + + + + + diff --git a/src/views/spectrumAnalysis/components/Modals/NuclideActivityAndMDCModal.vue b/src/views/spectrumAnalysis/components/Modals/NuclideActivityAndMDCModal.vue new file mode 100644 index 0000000..36f4139 --- /dev/null +++ b/src/views/spectrumAnalysis/components/Modals/NuclideActivityAndMDCModal.vue @@ -0,0 +1,239 @@ + + + + + diff --git a/src/views/spectrumAnalysis/components/PHDSelect.vue b/src/views/spectrumAnalysis/components/PHDSelect.vue new file mode 100644 index 0000000..bb003a1 --- /dev/null +++ b/src/views/spectrumAnalysis/components/PHDSelect.vue @@ -0,0 +1,39 @@ + + + + + diff --git a/src/views/spectrumAnalysis/components/PeakInfomation.vue b/src/views/spectrumAnalysis/components/PeakInfomation.vue new file mode 100644 index 0000000..f87f662 --- /dev/null +++ b/src/views/spectrumAnalysis/components/PeakInfomation.vue @@ -0,0 +1,360 @@ + + + + + diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index 373aec2..81b7a7b 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -78,6 +78,14 @@ + + + + + + + +