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

Compare commits

base: marking:5041c554d25000ce1187d8530d2f67c83642e093
Branches Tags
marking:master
marking:dev
marking:staging
..
compare: marking:9f844d2c1bb486a23f37afd2cb23acc70de88a8f
Branches Tags
marking:master
marking:dev
marking:staging

No commits in common. "5041c554d25000ce1187d8530d2f67c83642e093" and "9f844d2c1bb486a23f37afd2cb23acc70de88a8f" have entirely different histories.
5041c554d2 ... 9f844d2c1b

5 changed files with 40 additions and 21 deletions
Show Stats Expand all files Collapse all files

2
.env.production
View File

@ -14,6 +14,6 @@ VITE_COMPRESSION = "none"
# 接口地址
VITE_API_BASEURL = "https://learn-archives-admin.23544.com/api"
VITE_API_BASEURL = "http://localhost:5199/api"
#数据中心后台地址
VITE_API_USERCENTER_URL = "https://dcb.23544.com/api"

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

@ -6,6 +6,35 @@
<el-form-item>
<el-input v-model="search.searchStr" placeholder="姓名/账号/学号" />
</el-form-item>
<!-- <el-form-item style="width: 100px">
<el-select
v-model="search.userType"
placeholder="用户类型"
clearable
filterable
@change="userTypeChange"
>
<el-option
v-for="item in userTypeList"
:key="item.value"
:label="item.text"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item> -->
<el-form-item v-show="search.userType === 1" style="width: 100px">
<el-select v-model="search.level" placeholder="学生层次" clearable filterable>
<el-option
v-for="item in userLevelList"
:key="item.value"
:label="item.text"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item>
<el-select
@ -25,7 +54,7 @@
</el-select>
</el-form-item>
<el-form-item v-show="search.schoolId != 0" style="width: 100px">
<el-form-item style="width: 100px">
<el-select
v-model="search.grade"
placeholder="年级"
@ -43,7 +72,7 @@
</el-select>
</el-form-item>
<el-form-item style="width: 100px" v-show="search.schoolId != 0">
<el-form-item style="width: 100px">
<el-select v-model="search.classId" placeholder="班级" clearable filterable>
<el-option
v-for="item in classList"

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

@ -54,7 +54,7 @@
</el-select>
</el-form-item>
<el-form-item v-show="search.schoolId != 0" style="width: 100px">
<el-form-item style="width: 100px">
<el-select
v-model="search.grade"
placeholder="年级"
@ -72,7 +72,7 @@
</el-select>
</el-form-item>
<el-form-item v-show="search.schoolId != 0" style="width: 100px">
<el-form-item style="width: 100px">
<el-select v-model="search.classId" placeholder="班级" clearable filterable>
<el-option
v-for="item in classList"
@ -84,7 +84,7 @@
</el-select>
</el-form-item>
<el-form-item v-show="search.schoolId != 0" style="width: 100px">
<el-form-item style="width: 100px">
<el-select v-model="search.subjectId" placeholder="科目" clearable filterable>
<el-option
v-for="item in subjectList"

8
src/views/toschoolinfomanage/editModal.vue
View File

@ -53,9 +53,7 @@
>
{{ safeDetail.isDiscussion ? "已开展" : "未开展" }}
</el-tag>
<span class="inline-block max-w-[500px]!">{{
safeDetail.discussion || "-"
}}</span>
<span>{{ safeDetail.discussion || "-" }}</span>
</el-descriptions-item>
<el-descriptions-item label="班会">
<el-tag
@ -64,9 +62,7 @@
>
{{ safeDetail.isClassMeeting ? "已开展" : "未开展" }}
</el-tag>
<span class="inline-block max-w-[500px]!">{{
safeDetail.classMeeting || "-"
}}</span>
<span>{{ safeDetail.classMeeting || "-" }}</span>
</el-descriptions-item>
</el-descriptions>
<el-divider />

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

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