From 09e77962d246aea0405d13f37f3e2f6543059214 Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Tue, 11 Jul 2023 09:10:34 +0800 Subject: [PATCH] =?UTF-8?q?WIP:=20=E5=AE=8C=E6=88=90=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=BC=B9=E7=AA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modals/AnalyzeInteractiveToolModal.vue | 273 ++++++++++++++++++ .../components/Modals/AnalyzeSettingModal.vue | 193 +++++++++++++ .../components/Modals/LoadFromDBModal.vue | 34 ++- .../components/Modals/SaveSettingModal.vue | 81 ++++++ .../components/MultiLevelMenu.vue | 64 ++++ .../components/ResultDisplay.vue | 4 + .../components/TitleOverBoarder.vue | 39 +++ src/views/spectrumAnalysis/index.vue | 184 +++++++++--- 8 files changed, 817 insertions(+), 55 deletions(-) create mode 100644 src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal.vue create mode 100644 src/views/spectrumAnalysis/components/Modals/AnalyzeSettingModal.vue create mode 100644 src/views/spectrumAnalysis/components/Modals/SaveSettingModal.vue create mode 100644 src/views/spectrumAnalysis/components/MultiLevelMenu.vue create mode 100644 src/views/spectrumAnalysis/components/TitleOverBoarder.vue diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal.vue new file mode 100644 index 0000000..43c2da6 --- /dev/null +++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeInteractiveToolModal.vue @@ -0,0 +1,273 @@ + + + + + diff --git a/src/views/spectrumAnalysis/components/Modals/AnalyzeSettingModal.vue b/src/views/spectrumAnalysis/components/Modals/AnalyzeSettingModal.vue new file mode 100644 index 0000000..db568f1 --- /dev/null +++ b/src/views/spectrumAnalysis/components/Modals/AnalyzeSettingModal.vue @@ -0,0 +1,193 @@ + + + + + diff --git a/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue b/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue index 5192772..f93e8d6 100644 --- a/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue +++ b/src/views/spectrumAnalysis/components/Modals/LoadFromDBModal.vue @@ -129,7 +129,7 @@ export default { loadData(arg) { const params = this.getQueryParams() //查询条件 const { startDate, endDate, menuTypes } = params - if (!menuTypes || !menuTypes.length) { + if (!menuTypes) { this.$message.warn('Please Select SampleType First') return } @@ -144,8 +144,6 @@ export default { return } - params.menuTypes = menuTypes.join(',') - //加载数据 若传入参数1则加载第一页的内容 if (arg === 1) { this.ipagination.current = 1 @@ -199,13 +197,13 @@ export default { // 获取台站和探测器列表 async getStationAndDetectorList(value) { - if (!value || !value.length) { + if (!value) { return } try { const { success, result, message } = await getAction('/spectrumAnalysis/getDBSearchList', { - menuTypes: value.join(',') + menuTypes: value }) if (success) { this.stationList = result.stationCode.map(item => ({ label: item, value: item })) @@ -243,8 +241,11 @@ export default { type: 'custom-select', name: 'menuTypes', props: { - mode: 'multiple', options: [ + { + label: 'All', + value: 'G,B' + }, { label: 'Gamma', value: 'G' @@ -254,11 +255,10 @@ export default { value: 'B' } ], - maxTagCount: 1, - maxTagPlaceholder: '...' + allowClear: true }, style: { - width: '23%' + width: '18%' }, on: { change: event => { @@ -277,7 +277,7 @@ export default { allowClear: true }, style: { - width: '16%' + width: '19%' } }, { @@ -291,7 +291,7 @@ export default { allowClear: true }, style: { - width: '16%' + width: '19%' } }, { @@ -316,7 +316,7 @@ export default { allowClear: true }, style: { - width: '15%' + width: '14%' } }, { @@ -353,7 +353,7 @@ export default { allowClear: true }, style: { - width: '15%' + width: '14%' } }, { @@ -374,7 +374,8 @@ export default { allowClear: true }, style: { - width: '15%' + width: '16%', + paddingRight: 0 } }, { @@ -385,7 +386,7 @@ export default { allowClear: true }, style: { - width: '20%' + width: '264px' } }, { @@ -400,7 +401,8 @@ export default { ] }, style: { - width: '315px' + width: '305px', + paddingRight: 0 } }, { diff --git a/src/views/spectrumAnalysis/components/Modals/SaveSettingModal.vue b/src/views/spectrumAnalysis/components/Modals/SaveSettingModal.vue new file mode 100644 index 0000000..29570ff --- /dev/null +++ b/src/views/spectrumAnalysis/components/Modals/SaveSettingModal.vue @@ -0,0 +1,81 @@ + + + + + diff --git a/src/views/spectrumAnalysis/components/MultiLevelMenu.vue b/src/views/spectrumAnalysis/components/MultiLevelMenu.vue new file mode 100644 index 0000000..f6d39cd --- /dev/null +++ b/src/views/spectrumAnalysis/components/MultiLevelMenu.vue @@ -0,0 +1,64 @@ + + + + + diff --git a/src/views/spectrumAnalysis/components/ResultDisplay.vue b/src/views/spectrumAnalysis/components/ResultDisplay.vue index 2da7fd7..788d8ff 100644 --- a/src/views/spectrumAnalysis/components/ResultDisplay.vue +++ b/src/views/spectrumAnalysis/components/ResultDisplay.vue @@ -135,6 +135,10 @@ export default { } ::v-deep { + .ant-table { + border: none; + } + .ant-table-thead > tr th { color: #00e9fe; font-family: MicrosoftYaHei; diff --git a/src/views/spectrumAnalysis/components/TitleOverBoarder.vue b/src/views/spectrumAnalysis/components/TitleOverBoarder.vue new file mode 100644 index 0000000..92c24b5 --- /dev/null +++ b/src/views/spectrumAnalysis/components/TitleOverBoarder.vue @@ -0,0 +1,39 @@ + + + + + diff --git a/src/views/spectrumAnalysis/index.vue b/src/views/spectrumAnalysis/index.vue index 81b7a7b..b05e038 100644 --- a/src/views/spectrumAnalysis/index.vue +++ b/src/views/spectrumAnalysis/index.vue @@ -86,6 +86,18 @@ + + + + + + + + + + + +