Compare commits
No commits in common. "e2eb3b079efa2b9584df15ddda6a115de60ec788" and "2df9611b90de4f383d28d4e366e337542e6c17f1" have entirely different histories.
e2eb3b079e
...
2df9611b90
|
|
@ -166,13 +166,21 @@
|
||||||
: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 class="subjectTagEnableDiv">
|
<div v-if="position.enable === false">
|
||||||
|
<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>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue