zhangjie 1 год назад
Родитель
Сommit
79cea62dc0

+ 8 - 4
src/modules/base/components/course-simple/CourseWeightManage.vue

@@ -197,9 +197,11 @@ export default {
     transformData(data) {
       if (!data || !data.length) return [];
 
-      this.evaluationList = data[0].evaluationList.slice(0, -1).map((item) => {
-        return { ...item };
-      });
+      this.evaluationList = data[0].evaluationList
+        .filter((evaluation) => evaluation.evaluationType !== "DEFAULT")
+        .map((evaluation) => {
+          return { ...evaluation };
+        });
 
       this.tableSetData = data;
       this.tableSetData.push({
@@ -235,11 +237,13 @@ export default {
       data.forEach((item) => {
         valDict[item.evaluationId] = item.weight;
       });
+      console.log(data, valDict);
       this.curTarget.evaluationList.forEach((evaluation, index) => {
-        if (index === this.lastNo) return;
+        if (evaluation.evaluationType === "DEFAULT") return;
         evaluation.enable = valDict[evaluation.evaluationId] !== undefined;
         evaluation.weight = valDict[evaluation.evaluationId] || null;
       });
+      console.log(this.curTarget);
     },
     getEvaluationSumScore(evaluationList) {
       return calcSum(

+ 1 - 2
src/modules/base/components/course-simple/ModifyTargetEvaluation.vue

@@ -93,8 +93,7 @@ export default {
   methods: {
     visibleChange() {
       this.dataList = this.target.evaluationList
-        .slice(0, -1)
-        .filter((item) => item.enable)
+        .filter((item) => item.enable && item.evaluationType !== "DEFAULT")
         .map((item) => {
           return { ...item };
         });