Merge branch 'develop' of http://163.228.141.122:3000/TEAMMODEL/TEAMModelOS into develop

TEAMModelOS/ClientApp/src/components/student-web/EventView/EventContentTypeTemplate/Homework.vue

@@ -276,6 +276,7 @@ export default {
             isUpload: false, //是否上传
             isfinishedUpload: false, //上传成功
             maxSize: 1024*1024*1024, //文件最大
+            fileSize: 0,
             fileCol: [
                 {
                     title: this.$t("studentWeb.homework.table1"),
@@ -421,8 +422,10 @@ export default {
                     return false
                 }
             }
-            if(this.maxSize < file.size) {
+            this.fileSize +=  file.size
+            if(this.maxSize < this.fileSize) {
                 this.$Message.warning(this.$t("studentWeb.homework.sizeOver"))
+                this.fileSize -=  file.size
                 return false
             }
             let newFile = {

TEAMModelOS/ClientApp/src/view/evaluation/index/CreatePaper.vue

@@ -1280,7 +1280,7 @@ export default {
                     let curNoSaveArr = JSON.parse(localStorage.getItem('noSave'))
                     srcList.forEach(src => {
                       curNoSaveArr.push({
-                        path: item.blob.includes('paper/') ? `/paper/${item.paperName}/${src}` : `/syllabus/${item.nodeId}/${item.id}/${src}`, //旧文件的相对地址
+                        path: item.blob.includes('paper/') ? `/paper/${item.paperName || this.evaluationInfo.name}/${src}` : `/syllabus/${item.nodeId}/${item.id}/${src}`, //旧文件的相对地址
                         scope: item.scope
                       })
                     })