谢杰标 пре 3 година
родитељ
комит
2943612489

+ 5 - 1
src/views/education/classManageMent/classHoursReview/component/LessonTable.vue

@@ -136,7 +136,7 @@
           <span v-else-if="item.scope === 'aTime'">
             {{ $methodsTools.onlyForma(scope2.row[item.prop]) }}
           </span>
-          <span v-else-if="item.scope === 'durTime'">
+          <span v-else-if="item.scope === 'durTime' && scope2.row.type !== 5">
             {{ $methodsTools.secondToDate(scope2.row[item.prop], false) }}
           </span>
           <div v-else-if="item.scope === 'aTimeSE'">
@@ -209,6 +209,10 @@ export default {
               label: "试卷",
               value: 4,
             },
+            {
+              label: "模块卷",
+              value: 5,
+            },
           ],
         },
         {

+ 2 - 2
src/views/education/classManageMent/classHoursReview/component/StudyTables.vue

@@ -93,7 +93,7 @@
           v-for="key in Object.keys(tablesData)"
           :key="key"
           :tabledata="tablesData[key]"
-          :lable="key == 5 ? '卷' : '章'"
+          :label="key == 5 ? '卷' : '章'"
         ></component>
       </el-checkbox-group>
     </div>
@@ -415,8 +415,8 @@ export default {
     this.keys = {
       1: "ModulTable",
       2: "ChapterTable",
-      3: "LessonTable",
       5: "ChapterTable",
+      6: "LessonTable",
     };
     this.$nextTick(() => {
       this.setBomHeight();

+ 9 - 5
src/views/education/classManageMent/classHoursReview/studyTimes.vue

@@ -194,21 +194,25 @@ export default {
     changeData(data) {
       let obj = {};
       data.forEach((e) => {
-        (obj[e.type] || (obj[e.type] = [])).push(e);
+        if(e.type==5){
+          e.classPeriodSectionList = [JSON.parse(JSON.stringify(e))];
+        }
         // 区分章和模块卷
         if (e.type == 1) {
           e.classPeriods &&
             e.classPeriods.forEach((ele, i) => {
               if (ele.type == 5) {
-                (e.arr || (e.arr = [])).push(ele);
+                ele.classPeriodSectionList = [ele];
+                e.arr = [ele];
                 e.classPeriods.splice(i, 1);
               }
             });
         }
+        (obj[e.type] || (obj[e.type] = [])).push(e);
       });
-      if (obj["2"]) {
-        obj["5"] = obj["2"];
-        delete obj["2"];
+      if (obj["3"]) {
+        obj["6"] = obj["3"];
+        delete obj["3"];
       }
       return obj;
     },