|
@@ -34,7 +34,11 @@
|
|
</p>
|
|
</p>
|
|
</template>
|
|
</template>
|
|
<template v-else>
|
|
<template v-else>
|
|
- <p v-for="item in unsignData" :key="item.className">
|
|
|
|
|
|
+ <p
|
|
|
|
+ v-for="item in unsignData"
|
|
|
|
+ :key="item.className"
|
|
|
|
+ style="white-space: pre-wrap"
|
|
|
|
+ >
|
|
{{ item.content }}
|
|
{{ item.content }}
|
|
</p>
|
|
</p>
|
|
</template>
|
|
</template>
|
|
@@ -108,13 +112,13 @@ export default {
|
|
this.unsignData = this.classList
|
|
this.unsignData = this.classList
|
|
.map((className) => {
|
|
.map((className) => {
|
|
const markIds = this.dataList
|
|
const markIds = this.dataList
|
|
- .filter((row) => row.markerClassList.include(className))
|
|
|
|
- .map((row) => row.mark.id);
|
|
|
|
|
|
+ .filter((row) => row.markerClassList.includes(className))
|
|
|
|
+ .map((row) => row.marker.userId);
|
|
|
|
|
|
const unsignGroups = this.groupInfo
|
|
const unsignGroups = this.groupInfo
|
|
.filter(
|
|
.filter(
|
|
(group) =>
|
|
(group) =>
|
|
- !group.markers.some((marker) => markIds.includes(marker.id))
|
|
|
|
|
|
+ !group.markers.some((marker) => markIds.includes(marker.userId))
|
|
)
|
|
)
|
|
.map((group) => {
|
|
.map((group) => {
|
|
return {
|
|
return {
|
|
@@ -134,8 +138,8 @@ export default {
|
|
if (unsignGroups.length) {
|
|
if (unsignGroups.length) {
|
|
const groupCont = unsignGroups
|
|
const groupCont = unsignGroups
|
|
.map((group) => group.question)
|
|
.map((group) => group.question)
|
|
- .join(" ");
|
|
|
|
- nrow.content = `${className},${groupCont},未分配评卷员`;
|
|
|
|
|
|
+ .join(" ");
|
|
|
|
+ nrow.content = `${className}班级,${groupCont},未分配评卷员`;
|
|
}
|
|
}
|
|
|
|
|
|
return nrow;
|
|
return nrow;
|
|
@@ -143,6 +147,10 @@ export default {
|
|
.filter((item) => item.unsignGroups.length);
|
|
.filter((item) => item.unsignGroups.length);
|
|
},
|
|
},
|
|
async submit() {
|
|
async submit() {
|
|
|
|
+ if (this.unsignData.length) {
|
|
|
|
+ this.$message.error("存在未分配班级,请完成分配!");
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
if (this.loading) return;
|
|
if (this.loading) return;
|
|
|
|
|
|
const unvalid = this.dataList.some(
|
|
const unvalid = this.dataList.some(
|