Merge branch 'iteration-20241107-hoework' into jenkins-dev

src/views/afterSchoolManager/components/textConment.vue

@@ -66,7 +66,7 @@ export default {
       const videoMusic = []
       const txt = []
       child.forEach(c => {
-        if(c === "DESCRIPTION") {
+        if(c.homeworkType === "DESCRIPTION") {
           txt.push(c)
         } else {
           videoMusic.push(c)

src/views/afterSchoolManager/modal/homework-detail.vue

@@ -153,6 +153,11 @@ export default {
     },
     onDetail(row) {
       this.selectItem = row.fileJson && row.fileJson.length > 0 ? row.fileJson[0] : {}
+      console.log(this.selectItem, 'this.selectItem')
+      if(this.selectItem.expireFlag) {
+        this.$message.error('文件已过期')
+        return
+      }
       this.videoVisible = true
     }
   }

src/views/attendanceManager/attendanceList/components/textConment.vue

@@ -66,7 +66,7 @@ export default {
       const videoMusic = []
       const txt = []
       child.forEach(c => {
-        if(c === "DESCRIPTION") {
+        if(c.homeworkType === "DESCRIPTION") {
           txt.push(c)
         } else {
           videoMusic.push(c)

src/views/attendanceManager/modal/homework-detail.vue

@@ -136,6 +136,11 @@ export default {
     },
     onDetail(row) {
       this.selectItem = row.fileJson && row.fileJson.length > 0 ? row.fileJson[0] : {}
+      console.log(this.selectItem, 'this.selectItem')
+      if(this.selectItem.expireFlag) {
+        this.$message.error('文件已过期')
+        return
+      }
       this.videoVisible = true
     }
   }