|
@@ -303,6 +303,7 @@ export default {
|
|
buildDataList() {
|
|
buildDataList() {
|
|
let _this = this;
|
|
let _this = this;
|
|
function buildClassifyData(data) {
|
|
function buildClassifyData(data) {
|
|
|
|
+ let cpreInfo = data.classifyId + "";
|
|
let classifyData = {
|
|
let classifyData = {
|
|
id: data.classifyId,
|
|
id: data.classifyId,
|
|
name: data.classifyName,
|
|
name: data.classifyName,
|
|
@@ -310,7 +311,7 @@ export default {
|
|
classifyName: data.classifyName,
|
|
classifyName: data.classifyName,
|
|
isClassify: true,
|
|
isClassify: true,
|
|
questionCount: data.questionCount,
|
|
questionCount: data.questionCount,
|
|
- selectCount: _this.gerSourceData(data.classifyId),
|
|
|
|
|
|
+ selectCount: _this.gerSourceData(cpreInfo),
|
|
difficultDistributeInfo: [],
|
|
difficultDistributeInfo: [],
|
|
};
|
|
};
|
|
if (
|
|
if (
|
|
@@ -319,7 +320,7 @@ export default {
|
|
) {
|
|
) {
|
|
classifyData.difficultDistributeInfo = parseQuestionDistributeInfo(
|
|
classifyData.difficultDistributeInfo = parseQuestionDistributeInfo(
|
|
data.difficultDistributeInfo,
|
|
data.difficultDistributeInfo,
|
|
- data.classifyId
|
|
|
|
|
|
+ cpreInfo
|
|
);
|
|
);
|
|
}
|
|
}
|
|
if (
|
|
if (
|
|
@@ -337,7 +338,7 @@ export default {
|
|
|
|
|
|
classifyData.propertyDistributeInfo =
|
|
classifyData.propertyDistributeInfo =
|
|
curCourseProp.propertyDistributeInfo.map((item) =>
|
|
curCourseProp.propertyDistributeInfo.map((item) =>
|
|
- parsePropertyData(item, classifyData.id)
|
|
|
|
|
|
+ parsePropertyData(item, `${cpreInfo}_${_this.curCoursePropertyId}`)
|
|
);
|
|
);
|
|
|
|
|
|
classifyData.propertyDistributeInfo = filterPropertyData(
|
|
classifyData.propertyDistributeInfo = filterPropertyData(
|
|
@@ -354,7 +355,12 @@ export default {
|
|
);
|
|
);
|
|
}
|
|
}
|
|
return data.map((item) => {
|
|
return data.map((item) => {
|
|
- return { ...item, selectCount: _this.gerSourceData(preInfo) };
|
|
|
|
|
|
+ return {
|
|
|
|
+ ...item,
|
|
|
|
+ selectCount: _this.gerSourceData(
|
|
|
|
+ `${preInfo}_${item.difficultLevel}`
|
|
|
|
+ ),
|
|
|
|
+ };
|
|
});
|
|
});
|
|
}
|
|
}
|
|
|
|
|
|
@@ -381,7 +387,7 @@ export default {
|
|
|
|
|
|
if (data.propertyDistributeInfo && data.propertyDistributeInfo.length) {
|
|
if (data.propertyDistributeInfo && data.propertyDistributeInfo.length) {
|
|
propData.propertyDistributeInfo = data.propertyDistributeInfo.map(
|
|
propData.propertyDistributeInfo = data.propertyDistributeInfo.map(
|
|
- (item) => parsePropertyData(item, propData.id)
|
|
|
|
|
|
+ (item) => parsePropertyData(item, propId)
|
|
);
|
|
);
|
|
}
|
|
}
|
|
return propData;
|
|
return propData;
|
|
@@ -543,24 +549,35 @@ export default {
|
|
});
|
|
});
|
|
}
|
|
}
|
|
|
|
|
|
- function parsePropertyMap(propertyDistributeInfo) {
|
|
|
|
|
|
+ function parsePropertyMap(propertyDistributeInfo, preInfo) {
|
|
if (!propertyDistributeInfo || !propertyDistributeInfo.length) return;
|
|
if (!propertyDistributeInfo || !propertyDistributeInfo.length) return;
|
|
|
|
|
|
propertyDistributeInfo.forEach((pInfo) => {
|
|
propertyDistributeInfo.forEach((pInfo) => {
|
|
- if (pInfo.selectCount) sourceDataMap[pInfo.id] = pInfo.selectCount;
|
|
|
|
- parseDifficultMap(pInfo.difficultDistributeInfo, pInfo.id);
|
|
|
|
|
|
+ let ppreInfo = `${preInfo}_${pInfo.propertyId}`;
|
|
|
|
+ if (pInfo.selectCount) sourceDataMap[ppreInfo] = pInfo.selectCount;
|
|
|
|
+ parseDifficultMap(pInfo.difficultDistributeInfo, ppreInfo);
|
|
|
|
|
|
- parsePropertyMap(pInfo.propertyDistributeInfo);
|
|
|
|
|
|
+ parsePropertyMap(pInfo.propertyDistributeInfo, ppreInfo);
|
|
});
|
|
});
|
|
}
|
|
}
|
|
|
|
|
|
this.dataSource.questionDistributeInfo.forEach((classifyData) => {
|
|
this.dataSource.questionDistributeInfo.forEach((classifyData) => {
|
|
|
|
+ let cpreInfo = classifyData.classifyId + "";
|
|
if (classifyData.selectCount) {
|
|
if (classifyData.selectCount) {
|
|
- sourceDataMap[classifyData.id] = classifyData.selectCount;
|
|
|
|
|
|
+ sourceDataMap[cpreInfo] = classifyData.selectCount;
|
|
}
|
|
}
|
|
|
|
|
|
- parseDifficultMap(classifyData.difficultDistributeInfo);
|
|
|
|
- parsePropertyMap(classifyData.propertyDistributeInfo);
|
|
|
|
|
|
+ parseDifficultMap(classifyData.difficultDistributeInfo, cpreInfo);
|
|
|
|
+ if (
|
|
|
|
+ classifyData.coursePropertyDistributeInfo &&
|
|
|
|
+ classifyData.coursePropertyDistributeInfo.length
|
|
|
|
+ ) {
|
|
|
|
+ let preInfo = `${cpreInfo}_${classifyData.coursePropertyDistributeInfo[0].coursePropertyId}`;
|
|
|
|
+ parsePropertyMap(
|
|
|
|
+ classifyData.coursePropertyDistributeInfo[0].propertyDistributeInfo,
|
|
|
|
+ preInfo
|
|
|
|
+ );
|
|
|
|
+ }
|
|
});
|
|
});
|
|
this.sourceDataMap = sourceDataMap;
|
|
this.sourceDataMap = sourceDataMap;
|
|
},
|
|
},
|