dev #8

Merged
hy merged 45 commits from dev into master 2025-08-26 19:03:29 +08:00
2 changed files with 10 additions and 4 deletions
Showing only changes of commit 5041c554d2 - Show all commits

View File

@ -7,7 +7,7 @@
<el-input v-model="search.searchStr" placeholder="姓名/账号/学号" /> <el-input v-model="search.searchStr" placeholder="姓名/账号/学号" />
</el-form-item> </el-form-item>
<el-form-item v-show="search.schoolId != 0"> <el-form-item>
<el-select <el-select
v-model="search.schoolId" v-model="search.schoolId"
placeholder="学校" placeholder="学校"

View File

@ -447,16 +447,22 @@ function handleImport() {
let res = await importExcel(fileE.files[0]); let res = await importExcel(fileE.files[0]);
if (res.code != undefined) { if (res.code != undefined) {
if (res.code !== 200) return ElMessage.error(res.message); if (res.code !== 200) return ElMessage.error(res.message);
else return ElMessage.success("所有数据录入成功"); else {
loadList();
return ElMessage.success("所有数据录入成功");
}
} else if (res.type === "application/json") { } else if (res.type === "application/json") {
let json = await res.text(); let json = await res.text();
if (json !== undefined && json.Code !== 200) { if (json !== undefined && json.Code !== 200) {
return ElMessage.error(json.Message); return ElMessage.error(json.Message);
} else { } else {
return ElMessage.success("操所有数据录入成功作成功"); loadList();
return ElMessage.success("所有数据录入成功");
} }
} else if (res === undefined || res.size === 0) } else if (res === undefined || res.size === 0) {
loadList();
return ElMessage.success("所有数据录入成功"); return ElMessage.success("所有数据录入成功");
}
const url = res && window.URL.createObjectURL(res); const url = res && window.URL.createObjectURL(res);
const link = document.createElement("a"); const link = document.createElement("a");
link.href = url; link.href = url;