diff --git a/src/pages/sjfx/five/index.vue b/src/pages/sjfx/five/index.vue index ff66b37b..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' }, ]); @@ -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..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' }, ]); @@ -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..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' }, ]); @@ -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, 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' }, ]);