liqk 3 lat temu
rodzic
commit
f2fa4e0407

+ 3 - 2
TEAMModelOS/ClientApp/src/view/learnactivity/MgtPrivEva.vue

@@ -176,7 +176,7 @@ export default {
             let evName = this.evaListShow[this.curEvaIndex].name
             let evType = this.getModeLabel(this.evaListShow[this.curEvaIndex].source)
             let soc = this.evaListShow[this.curEvaIndex].owner === 'school' ? this.$t('learnActivity.mgtScEv.shareText4') : this.$t('learnActivity.mgtScEv.shareText5')
-            let socName = this.evaListShow[this.curEvaIndex].subjects.map(item=>item.name).join('、')
+            let socName = this.evaListShow[this.curEvaIndex].subjects.map(item => item.name).join('、')
             let shareText = `${this.$t('learnActivity.mgtScEv.shareText1')}\n\n${this.$t('learnActivity.mgtScEv.shareText2')}${evName}\n${this.$t('learnActivity.mgtScEv.shareText3')}${evType}\n${soc}${socName}\n\n${this.$t('learnActivity.mgtScEv.shareText6')}\n${encodeURI(this.shareUrl)}\n\n${this.$t('learnActivity.mgtScEv.shareText7')}\nURL:https://${window.location.host}/login/student`
             this.$copyText(shareText).then(
                 ok => {
@@ -353,10 +353,11 @@ export default {
                 title: this.$t('learnActivity.mgtScEv.stopTitle'),
                 content: `${this.$t('learnActivity.mgtScEv.stopContent')}${this.evaListShow[index].name}?`,
                 onOk: () => {
+                    let code = this.evaListShow[index].code
                     this.$api.learnActivity.FinishEva({
                         id: this.evaListShow[index].id,
                         // code: this.evaListShow[index].code.replace('Exam-', '')
-                        code: this.evaListShow[index].code
+                        code: code.includes('Exam') ? code : `Exam-${code}`
                     }).then(
                         res => {
                             if (!res.error) {

+ 2 - 1
TEAMModelOS/ClientApp/src/view/learnactivity/MgtSchoolEva.vue

@@ -425,9 +425,10 @@ export default {
                 title: this.$t('learnActivity.mgtScEv.stopTitle'),
                 content: `${this.$t('learnActivity.mgtScEv.stopContent')}${this.evaListShow[index].name}?`,
                 onOk: () => {
+                    let code = this.evaListShow[index].code
                     this.$api.learnActivity.FinishEva({
                         id: this.evaListShow[index].id,
-                        code: this.evaListShow[index].code
+                        code: code.includes('Exam') ? code : `Exam-${code}`
                         // code: this.evaListShow[index].code.replace('Exam-', '')
                     }).then(
                         res => {