marking
/
Learn.Archives.Web
19
0
Fork 0
Code Pull Requests Actions Releases Activity

staging #23

Merged
hy merged 38 commits from staging into master 2025-10-14 11:13:16 +08:00
Conversation 0 Commits 38 Files Changed 34 +13 -9
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5cad1c2d2b - Show all commits

12
src/views/student/index.vue
View File

@ -131,8 +131,9 @@
<template #default="scope">
<span v-if="!scope.row.reliefApplication">未申请</span>
<span v-else
>{{ scope.row.reliefSubTime }} {{ scope.row.amountRelief }}
{{ scope.row.reliefType }}
>{{ scope.row.reliefSubTime }}申请{{ scope.row.amountRelief }}元 <br />{{
scope.row.reliefType
}}
</span>
</template>
</el-table-column>
@ -693,9 +694,10 @@ const importData = () => {
if (res.code !== 200) return ElMessage.error(res.message);
else return ElMessage.success("所有数据录入成功");
} else if (res.type === "application/json") {
let json = await res.text();
if (json !== undefined && json.Code !== 200) {
return ElMessage.error(json.Message);
let json = JSON.parse(await res.text());
let code = json.code || json.Code;
if (json !== undefined && code !== 200) {
return ElMessage.error(json.message);
} else {
return ElMessage.success("操所有数据录入成功作成功");
}

5
src/views/teacher/index.vue
View File

@ -704,8 +704,9 @@ const importData = () => {
if (res.code !== 200) return ElMessage.error(res.message);
else return ElMessage.success("所有数据录入成功");
} else if (res.type === "application/json") {
let json = await res.text();
if (json !== undefined && json.Code !== 200) {
let json = JSON.parse(await res.text());
let code = json.code || json.Code;
if (json !== undefined && code !== 200) {
return ElMessage.error(json.Message);
} else {
return ElMessage.success("操所有数据录入成功作成功");

5
src/views/toschoolinfomanage/index.vue
View File

@ -452,8 +452,9 @@ function handleImport() {
return ElMessage.success("所有数据录入成功");
}
} else if (res.type === "application/json") {
let json = await res.text();
if (json !== undefined && json.Code !== 200) {
let json = JSON.parse(await res.text());
let code = json.code || json.Code;
if (json !== undefined && code !== 200) {
return ElMessage.error(json.Message);
} else {
loadList();