diff --git a/public/template/酸雨-县.xlsx b/public/template/酸雨-县.xlsx index 9309c06..e6638dc 100644 Binary files a/public/template/酸雨-县.xlsx and b/public/template/酸雨-县.xlsx differ diff --git a/public/template/酸雨-市.xls b/public/template/酸雨-市.xls deleted file mode 100644 index 9be0a18..0000000 Binary files a/public/template/酸雨-市.xls and /dev/null differ diff --git a/public/template/酸雨-市.xlsx b/public/template/酸雨-市.xlsx new file mode 100644 index 0000000..97fa424 Binary files /dev/null and b/public/template/酸雨-市.xlsx differ diff --git a/src/views/atmosphere/acid-rain/collect/utils.js b/src/views/atmosphere/acid-rain/collect/utils.js index 1f51886..85a74bf 100644 --- a/src/views/atmosphere/acid-rain/collect/utils.js +++ b/src/views/atmosphere/acid-rain/collect/utils.js @@ -37,7 +37,7 @@ export default { }, async toObjData(excelData,monitorYear) { const res = await axios.get(listAllUrl,{params:{year:monitorYear}}) - if(res.data.code !=0){ + if(res.data.code !=0 && res.data.data.length === 0){ return Promise.reject(monitorYear +"点位字典未设置"); } const dict = res.data.data;