diff --git a/src/mixins/ModalMixin.js b/src/mixins/ModalMixin.js new file mode 100644 index 0000000..899068d --- /dev/null +++ b/src/mixins/ModalMixin.js @@ -0,0 +1,17 @@ +export default { + props: { + value: { + type: Boolean + } + }, + computed: { + visible: { + get() { + return this.value + }, + set(val) { + this.$emit('input', val) + } + } + } +} \ No newline at end of file diff --git a/src/style.less b/src/style.less index ce41a9e..ae83659 100644 --- a/src/style.less +++ b/src/style.less @@ -308,6 +308,41 @@ body { } } +// 时间选择器 +@time-picker-selected-bg: @primary-color; +@item-hover-bg: @primary-color; +.ant-time-picker { + &-input { + background: @modalBg; + border-radius: 0; + &::placeholder { + color: #fff; + } + } + + &-clear, + &-clock-icon { + background-color: @modalBg !important; + color: #01B6E3 !important; + } + + &-panel { + &-input { + background-color: transparent; + } + + &-inner { + background-color: @modalBg; + border: 1px solid @formInputBorderColor; + border-radius: 0; + } + + &-select li:focus { + color: #fff; + } + } +} + // 输入框样式 .ant-input { background-color: @formInputBgColor !important; diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/NuclideReviewChart.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/NuclideReviewChart.vue index 881c0d2..2d3339f 100644 --- a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/NuclideReviewChart.vue +++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal/components/NuclideReviewChart.vue @@ -2,38 +2,123 @@ + + diff --git a/src/views/spectrumAnalysis/components/Modals/KorsumModal.vue b/src/views/spectrumAnalysis/components/Modals/KorsumModal.vue new file mode 100644 index 0000000..a446510 --- /dev/null +++ b/src/views/spectrumAnalysis/components/Modals/KorsumModal.vue @@ -0,0 +1,465 @@ + + + + + diff --git a/src/views/spectrumAnalysis/components/Modals/ReProcessingModal/components/status.vue b/src/views/spectrumAnalysis/components/Modals/ReProcessingModal/components/status.vue new file mode 100644 index 0000000..b07f04e --- /dev/null +++ b/src/views/spectrumAnalysis/components/Modals/ReProcessingModal/components/status.vue @@ -0,0 +1,40 @@ + + + + + diff --git a/src/views/spectrumAnalysis/components/Modals/ReProcessingModal/index.vue b/src/views/spectrumAnalysis/components/Modals/ReProcessingModal/index.vue new file mode 100644 index 0000000..23904cb --- /dev/null +++ b/src/views/spectrumAnalysis/components/Modals/ReProcessingModal/index.vue @@ -0,0 +1,108 @@ + + + + + diff --git a/src/views/spectrumAnalysis/components/Modals/ZeroTimeModal.vue b/src/views/spectrumAnalysis/components/Modals/ZeroTimeModal.vue new file mode 100644 index 0000000..8a24079 --- /dev/null +++ b/src/views/spectrumAnalysis/components/Modals/ZeroTimeModal.vue @@ -0,0 +1,250 @@ + + + + + diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index 326ea42..c202606 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -62,6 +62,22 @@ + + + + + + + + + + + + + + + +