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 +4 -12
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2663daeeeb - Show all commits

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

@ -166,21 +166,13 @@
:key="'Position' + index" :key="'Position' + index"
v-show="index < 3 || (index >= 3 && showAllPosition.includes(scope.row))" v-show="index < 3 || (index >= 3 && showAllPosition.includes(scope.row))"
> >
<div v-if="position.enable === false"> <div class="subjectTagEnableDiv">
<el-tag type="info">{{ position.schoolName || "-" }}</el-tag>
<el-tag type="info">{{
position.graduationYear ? position.graduationYear + "届" : "-"
}}</el-tag>
<el-tag type="info">{{ position.className || "-" }}</el-tag>
<el-tag type="info">{{ position.subjectName || "-" }}</el-tag>
<el-tag type="info">{{ position.name || "-" }}</el-tag>
</div>
<div class="subjectTagEnableDiv" v-else>
<el-tag>{{ position.schoolName || "-" }}</el-tag> <el-tag>{{ position.schoolName || "-" }}</el-tag>
<el-tag type="warning">{{ <el-tag type="warning">{{
position.graduationYear ? position.graduationYear + "届" : "-" position.graduationYear
? position.gradeLevel + position.graduationYear + "届"
: "-"
}}</el-tag> }}</el-tag>
<el-tag type="success">{{ position.grade || "-" }}</el-tag>
<el-tag type="primary" class="classTag">{{ <el-tag type="primary" class="classTag">{{
position.className || "-" position.className || "-"
}}</el-tag> }}</el-tag>