Merge branch 'develop5.0-tmd' of http://106.12.23.251:10000/TEAMMODEL/TEAMModelOS into develop5.0-tmd

TEAMModelOS/ClientApp/src/api/studentWeb.js

@@ -296,5 +296,15 @@ export default {
     } */
     uploadHomework: function (data) {
         return post("/common/homework/interact", data)
+    },
+    
+    // 单个同学的作业
+    getAllComment: function (data) {
+        return post("/common/homework/interact", data)
+    },
+
+    // 点评作业
+    commentAndStar: function(data) {
+        return post("/common/homework/interact", data)
     }
 }

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

@@ -65,6 +65,14 @@
                                 <h2 class="title-rect-name">{{ $t('studentWeb.homework.homeworkShow') }}</h2>
                             </div>
                             <!-- <p style="margin-top: 10px">上传时间：{{ answerList[0].time }}</p> -->
+                            
+                            <!-- 同学作业观摩互评 -->
+                            <div v-if="homeworkInfo.allowComment && answerList && homeworkInfo.progress == 'finish'"
+                                class="uploadBtn" @click="openComment()"
+                            >
+                                <Icon type="ios-eye-outline" class="uploadBtn-icon" />
+                                <span>{{ $t("studentWeb.homework.CommentClassmatesHomeworkBtn") }}</span>
+                            </div>
                             <div class="file-show">
                                 <p>{{ answerList.answer }}</p>
                             </div>
@@ -115,11 +123,7 @@
                                             </Upload>
                                         </div>
                                         
-                                        <!-- 同学作业观摩互评 -->
-                                        <!-- <div class="uploadBtn" @click="openComment()">
-                                            <Icon type="ios-eye-outline" class="uploadBtn-icon" />
-                                            <span>{{ $t("studentWeb.homework.CommentClassmatesHomeworkBtn") }}</span>
-                                        </div> -->
+                                        
                                     </div>
                                     <!-- <div class="file-show">
                                         <div v-for="(item, index) in uploadList" :key="index">
@@ -336,8 +340,14 @@ export default {
                 // 学生id
                 let cont = this.$store.state.userInfo.sub
                 let homeworkId = this.homeworkInfo.id
-                let blobTool = new BlobTool(blobHost, code, "?" + sas.sas, this.homeworkInfo.scope)
                 let path = `homework/${homeworkId}/${cont}`
+                if(this.answerList) {
+                    this.deleteBlobPrefix(code, path).then(re => {
+                        console.log(re);
+                    })
+                }
+
+                let blobTool = new BlobTool(blobHost, code, "?" + sas.sas, this.homeworkInfo.scope)
                 
                 let promiseArr = []
                 this.uploadList.map(item => {
@@ -356,6 +366,26 @@ export default {
             })
             
         },
+        // 删除之前上传的作业Blob
+        deleteBlobPrefix(code, path) {
+            return new Promise((resolve, reject) => {
+                this.$api.blob.deletePrefix({
+                    "cntr": code,
+                    "prefix": path
+                }).then(
+                    (res) => {
+                        if (!res.error) {
+                            resolve(200)
+                        } else {
+                            resolve(500)
+                        }
+                    },
+                    (err) => {
+                        reject(err)
+                    }
+                )
+            })
+        },
         // 提交作业
         async submitHome() {
             /* if(!this.uploadList.length) {
@@ -363,6 +393,7 @@ export default {
             } else { */
                 this.isLoad = true
                 let content = await this.uploadHome()
+                // let content = await this.deleteBlobPrefix("hbcn", "homework/41bce416-19dc-549b-e5b8-f9f79d63883b/2020070606")
                 let params = {
                     opt: "SubmitAnswer",
                     id: this.homeworkInfo.id,
@@ -375,6 +406,7 @@ export default {
                     if(res.msgid == 1) {
                         this.isfinishedUpload = true
                         this.uploadList = []
+                        this.hwText = ""
                         this.$Message.success(this.$t("studentWeb.homework.uploadSuccess"))
                         this.getAnswer(this.homeworkInfo)
                         this.isLoad = false
@@ -395,13 +427,19 @@ export default {
         },
         // 作答记录
         getAnswer(data) {
+            let roles = ""
+            if(this.$store.state.userInfo.scope == "student") {
+                roles = 'student'
+            } else {
+                roles = 'tmdId'
+            }
             let params = {
                 opt: "AnswerRecord",
                 id: data.id,
                 code: data.code.split("-")[1],
                 targetType: data.targetType,
                 userid: this.$store.state.userInfo.sub,
-                userType: "student",
+                userType: roles,
                 userSchool: this.$store.state.userInfo.azp
             }
             this.$api.studentWeb.uploadHomework(params).then(res => {
@@ -432,12 +470,9 @@ export default {
         delUpload(index) {
             this.uploadList.splice(index, 1)
         },
-
-
-
-
+        // 跳转互评
         openComment() {
-            /* this.isHintOpenComment = false
+            this.isHintOpenComment = false
             let theCommentItems = []
             let theCommentID = []
             for (let i = 0; i <= 30; i++) {
@@ -450,7 +485,12 @@ export default {
 
             this.$store.commit("ToggleClassmatesComment", theCommentItems[0])
             this.$store.commit("ChangeClassmatesCommentID", theCommentID[0])
-            this.$router.push({path: "/studentWeb/eventView/homework"}) */
+            this.$router.push({
+                name: "eventView/homework",
+                params: {
+                    homework: this.homeworkInfo,
+                }
+            })
         },
 
 

TEAMModelOS/ClientApp/src/locale/lang/en-US/studentWeb.js

@@ -305,7 +305,7 @@ export default {
         name: 'Name',
         star: 'Star',
         comment: 'Give a comment',
-        preview: 'Assignment Preview: File Name',
+        preview: 'Assignment Preview: ',
         unPreview: 'The format of this file currently does not provide preview',
         download: 'Download File',
         submitted: 'Submit',

TEAMModelOS/ClientApp/src/locale/lang/zh-CN/studentWeb.js

@@ -305,7 +305,7 @@ export default {
         name: '姓名',
         star: '星级',
         comment: '给评',
-        preview: '作业预览：档案名称',
+        preview: '作业预览：',
         unPreview: '这个档案的格式目前不提供预览',
         download: '下载档案',
         submitted: '提交',

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/studentWeb.js

@@ -273,7 +273,7 @@ export default {
     homework: {
         homeworkShow: '作答記錄',
         homeworkUpload: '作業上傳區',
-        homeworkChoice: '选择文件',
+        homeworkChoice: '選擇檔案',
         homeworkUoloadBtn: '上傳作業',
         homeworkReUoloadBtn: '重新上傳',
         CommentClassmatesHomeworkBtn: '同學作業觀摩互評',
@@ -305,7 +305,7 @@ export default {
         name: '姓名',
         star: '星級',
         comment: '給評',
-        preview: '作業預覽：檔案名稱',
+        preview: '作業預覽：',
         unPreview: '這個檔案的格式目前不提供預覽',
         download: '下載檔案',
         submitted: '提交',