From bd683ea1c2b8025d0087d84d0e01c963cb214732 Mon Sep 17 00:00:00 2001 From: duwenyuan <15600000461@163.com> Date: Mon, 20 Jul 2026 10:15:46 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=88=86=E6=9E=90?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E6=B7=BB=E5=8A=A0=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/sjfx/five/index.vue | 6 +++++- src/pages/sjfx/four/index.vue | 5 ++++- src/pages/sjfx/six/index.vue | 5 +++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/pages/sjfx/five/index.vue b/src/pages/sjfx/five/index.vue index ff66b37b..fc303a98 100644 --- a/src/pages/sjfx/five/index.vue +++ b/src/pages/sjfx/five/index.vue @@ -43,6 +43,7 @@ const form = reactive({ dataSource: '', nuclideName: '', station: '', + stationIds: [] as any[], startDate: '', endDate: '', createTime: [] as string[], @@ -91,6 +92,7 @@ function handleSampleTypeChange() { return; } form.station = ''; + form.stationIds = []; form.nuclideName = ''; // 切换类型时通常也要清空核素 getStation(); getNuclide(); @@ -245,6 +247,7 @@ async function handleSearch() { await formRef.value.validate((valid) => { if (valid) { + form.stationIds = form.station ? [form.station] : []; getList(); } }); @@ -400,7 +403,8 @@ function initCharts() { const exportChartsData = async () => { try { console.log('开始下载...'); - form.type = 'nuclideTime' + form.type = 'nuclideTime'; + form.stationIds = form.station ? [form.station] : []; const { filename, blob } = await exportData(form); // const filename = '模版' console.log('文件信息:', { diff --git a/src/pages/sjfx/four/index.vue b/src/pages/sjfx/four/index.vue index 8c6b63bd..abf58697 100644 --- a/src/pages/sjfx/four/index.vue +++ b/src/pages/sjfx/four/index.vue @@ -93,6 +93,7 @@ function handleSampleTypeChange() { return; } form.value.station = ''; + form.value.stationIds = []; getStation(); getNuclide(); } @@ -106,6 +107,7 @@ function getList() { return; formEl.validate((valid, fields) => { if (valid) { + form.value.stationIds = [form.value.station]; getActConcIntvl(form.value, (res) => { // const data = await fetch('../../../../public/mock/data.json'); // const res = await data.json(); @@ -378,7 +380,8 @@ function renderChart(series) { const exportChartsData = async () => { try { console.log('开始下载...'); - form.value.type = 'sampleRangeFreq' + form.value.type = 'sampleRangeFreq'; + form.value.stationIds = form.value.station ? [form.value.station] : []; const { filename, blob } = await exportData(form.value); // const filename = '模版' console.log('文件信息:', { diff --git a/src/pages/sjfx/six/index.vue b/src/pages/sjfx/six/index.vue index 3b9bbec5..2239b9ed 100644 --- a/src/pages/sjfx/six/index.vue +++ b/src/pages/sjfx/six/index.vue @@ -345,8 +345,9 @@ function renderChart() { const exportChartsData = async () => { try { console.log('开始下载...'); - form.type = 'nuclideCompare' - const { filename, blob } = await exportData(form); + form.value.type = 'nuclideCompare'; + const payload = JSON.parse(JSON.stringify(form.value)); + const { filename, blob } = await exportData(payload); // const filename = '模版' console.log('文件信息:', { filename, From 57a5a2f79e5ade329c0cb753f1a3f077d2857cbd Mon Sep 17 00:00:00 2001 From: duwenyuan <15600000461@163.com> Date: Wed, 22 Jul 2026 17:33:00 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E6=9D=A5=E6=BA=90=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/sjfx/five/index.vue | 4 ++-- src/pages/sjfx/four/index.vue | 4 ++-- src/pages/sjfx/six/index.vue | 4 ++-- src/pages/sjfx/three/index.vue | 4 ++-- src/pages/sjfx/two/index.vue | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/pages/sjfx/five/index.vue b/src/pages/sjfx/five/index.vue index fc303a98..bee6a381 100644 --- a/src/pages/sjfx/five/index.vue +++ b/src/pages/sjfx/five/index.vue @@ -32,8 +32,8 @@ const sampleTypeList = [ { label: '惰性气体', value: 'B' }, ]; const dataSourceList = ref([ - { label: 'MDC自动处理', value: '1' }, - { label: 'MDC交互分析', value: '2' }, + { label: 'NDC自动处理', value: '1' }, + { label: 'NDC交互分析', value: '2' }, { label: 'IDC自动处理', value: '3' }, { label: 'IDC交互分析', value: '4' }, ]); diff --git a/src/pages/sjfx/four/index.vue b/src/pages/sjfx/four/index.vue index abf58697..e3ba83d6 100644 --- a/src/pages/sjfx/four/index.vue +++ b/src/pages/sjfx/four/index.vue @@ -13,8 +13,8 @@ const sampleTypeList = ref([ { label: '惰性气体', value: 'B' }, ]); const dataSourceList = ref([ - { label: 'MDC自动处理', value: '1' }, - { label: 'MDC交互分析', value: '2' }, + { label: 'NDC自动处理', value: '1' }, + { label: 'NDC交互分析', value: '2' }, { label: 'IDC自动处理', value: '3' }, { label: 'IDC交互分析', value: '4' }, ]); diff --git a/src/pages/sjfx/six/index.vue b/src/pages/sjfx/six/index.vue index 2239b9ed..07fcb0b0 100644 --- a/src/pages/sjfx/six/index.vue +++ b/src/pages/sjfx/six/index.vue @@ -14,8 +14,8 @@ const sampleTypeList = ref([ { label: '惰性气体', value: 'B' }, ]); const dataSourceList = ref([ - { label: 'MDC自动处理', value: '1' }, - { label: 'MDC交互分析', value: '2' }, + { label: 'NDC自动处理', value: '1' }, + { label: 'NDC交互分析', value: '2' }, { label: 'IDC自动处理', value: '3' }, { label: 'IDC交互分析', value: '4' }, ]); diff --git a/src/pages/sjfx/three/index.vue b/src/pages/sjfx/three/index.vue index 279e68ca..0ede6cc0 100644 --- a/src/pages/sjfx/three/index.vue +++ b/src/pages/sjfx/three/index.vue @@ -13,8 +13,8 @@ const sampleTypeList = ref([ { label: '惰性气体', value: 'B' }, ]); const dataSourceList = ref([ - { label: 'MDC自动处理', value: '1' }, - { label: 'MDC交互分析', value: '2' }, + { label: 'NDC自动处理', value: '1' }, + { label: 'NDC交互分析', value: '2' }, { label: 'IDC自动处理', value: '3' }, { label: 'IDC交互分析', value: '4' }, ]); diff --git a/src/pages/sjfx/two/index.vue b/src/pages/sjfx/two/index.vue index 840c7051..25718489 100644 --- a/src/pages/sjfx/two/index.vue +++ b/src/pages/sjfx/two/index.vue @@ -13,8 +13,8 @@ const sampleTypeList = ref([ { label: '惰性气体', value: 'B' }, ]); const dataSourceList = ref([ - { label: 'MDC自动处理', value: '1' }, - { label: 'MDC交互分析', value: '2' }, + { label: 'NDC自动处理', value: '1' }, + { label: 'NDC交互分析', value: '2' }, { label: 'IDC自动处理', value: '3' }, { label: 'IDC交互分析', value: '4' }, ]);