Merge remote-tracking branch 'origin/master'

This commit is contained in:
pengjunchao 2026-07-27 10:18:31 +08:00
commit a24c02c10d
5 changed files with 22 additions and 14 deletions

View File

@ -32,8 +32,8 @@ const sampleTypeList = [
{ label: '惰性气体', value: 'B' },
];
const dataSourceList = ref<any>([
{ 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('文件信息:', {

View File

@ -13,8 +13,8 @@ const sampleTypeList = ref<any>([
{ label: '惰性气体', value: 'B' },
]);
const dataSourceList = ref<any>([
{ 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('文件信息:', {

View File

@ -14,8 +14,8 @@ const sampleTypeList = ref<any>([
{ label: '惰性气体', value: 'B' },
]);
const dataSourceList = ref<any>([
{ 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,

View File

@ -13,8 +13,8 @@ const sampleTypeList = ref<any>([
{ label: '惰性气体', value: 'B' },
]);
const dataSourceList = ref<any>([
{ label: 'MDC自动处理', value: '1' },
{ label: 'MDC交互分析', value: '2' },
{ label: 'NDC自动处理', value: '1' },
{ label: 'NDC交互分析', value: '2' },
{ label: 'IDC自动处理', value: '3' },
{ label: 'IDC交互分析', value: '4' },
]);

View File

@ -13,8 +13,8 @@ const sampleTypeList = ref<any>([
{ label: '惰性气体', value: 'B' },
]);
const dataSourceList = ref<any>([
{ label: 'MDC自动处理', value: '1' },
{ label: 'MDC交互分析', value: '2' },
{ label: 'NDC自动处理', value: '1' },
{ label: 'NDC交互分析', value: '2' },
{ label: 'IDC自动处理', value: '3' },
{ label: 'IDC交互分析', value: '4' },
]);