|
@@ -65,7 +65,7 @@
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
<el-table-column
|
|
|
- v-if="!useDifficult || USE_ONLY_DIFFICULT"
|
|
|
+ v-if="(!useDifficult && !useProperty) || USE_ONLY_DIFFICULT"
|
|
|
label="数量"
|
|
|
width="150"
|
|
|
>
|
|
@@ -491,6 +491,15 @@ export default {
|
|
|
},
|
|
|
getDataList() {
|
|
|
let dataList = deepCopy(this.dataList);
|
|
|
+ let structInfo = {
|
|
|
+ classifyIdList: this.useClassify ? this.selectedFolderIds : [],
|
|
|
+ questionDistributeInfo: null,
|
|
|
+ questionCount: this.getTotalQuestionCount(),
|
|
|
+ useClassify: this.useClassify,
|
|
|
+ useDifficult: this.useDifficult,
|
|
|
+ useProperty: this.useProperty,
|
|
|
+ curCoursePropertyId: this.curCoursePropertyId,
|
|
|
+ };
|
|
|
|
|
|
if (this.USE_ONLY_DIFFICULT) {
|
|
|
dataList[0].difficultDistributeInfo = this.tableData.map((item) => {
|
|
@@ -500,10 +509,12 @@ export default {
|
|
|
selectCount: item.selectCount,
|
|
|
};
|
|
|
});
|
|
|
- return dataList;
|
|
|
+ structInfo.propertyDistributeInfo = dataList;
|
|
|
+ return structInfo;
|
|
|
} else if (this.useClassify && !this.useProperty) {
|
|
|
dataList = deepCopy(this.tableData);
|
|
|
- return dataList;
|
|
|
+ structInfo.propertyDistributeInfo = dataList;
|
|
|
+ return structInfo;
|
|
|
} else if (!this.useClassify && this.useProperty) {
|
|
|
dataList[0].propertyDistributeInfo = this.tableData;
|
|
|
}
|
|
@@ -522,15 +533,8 @@ export default {
|
|
|
return item;
|
|
|
});
|
|
|
|
|
|
- return {
|
|
|
- classifyIdList: this.useClassify ? this.selectedFolderIds : [],
|
|
|
- questionDistributeInfo: dataList,
|
|
|
- questionCount: this.getTotalQuestionCount(),
|
|
|
- useClassify: this.useClassify,
|
|
|
- useDifficult: this.useDifficult,
|
|
|
- useProperty: this.useProperty,
|
|
|
- curCoursePropertyId: this.curCoursePropertyId,
|
|
|
- };
|
|
|
+ structInfo.propertyDistributeInfo = dataList;
|
|
|
+ return structInfo;
|
|
|
},
|
|
|
// source relate
|
|
|
gerSourceData(k) {
|