Browse Source

Merge branch 'develop' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop

jeff 1 year ago
parent
commit
5a7a7f1593

+ 2 - 1
TEAMModelOS/ClientApp/public/lang/en-US.js

@@ -1856,7 +1856,8 @@ const LANG_EN_US = {
             choosed: 'Deselect',
             searchPaper: 'Enter exam file name to search...',
             copyTip1: 'Are you sure you want to duplicate ',
-            copyTip2: 'to create a new exam file'
+            copyTip2: 'to create a new exam file',
+            copyTip3: 'Duplicate',
         },
         importFile: {
             uploadSuc: 'Exam file uploaded and parsed successfully!',

+ 2 - 1
TEAMModelOS/ClientApp/public/lang/zh-CN.js

@@ -1855,7 +1855,8 @@ const LANG_ZH_CN = {
             choosed: '取消选择',
             searchPaper: '输入试卷名称进行搜索...',
             copyTip1: '确认以',
-            copyTip2: '创建副本'
+            copyTip2: '创建副本',
+            copyTip3: '创建副本'
         },
         importFile: {
             uploadSuc: '文件上传解析成功!',

+ 2 - 1
TEAMModelOS/ClientApp/public/lang/zh-TW.js

@@ -1858,7 +1858,8 @@ const LANG_ZH_TW = {
             choosed: '取消選擇',
             searchPaper: '輸入試卷名稱進行搜尋…',
             copyTip1: '確認以',
-            copyTip2: '複製建立試卷'
+            copyTip2: '複製建立試卷',
+            copyTip3: '複製建立試卷'
         },
         importFile: {
             uploadSuc: '試卷檔案上傳解析成功!',

+ 1 - 1
TEAMModelOS/ClientApp/src/common/BaseLayout.vue

@@ -365,7 +365,7 @@
 			},
 			// 教师个人跳转赛课活动
 			toPrivActivity() {
-				let url = `${window.location.host === 'localhost:5001' ? 'http://localhost:8081' : window.location.origin}/teammodel/home/homePage?token=${localStorage.getItem("auth_token")}`
+				let url = `${window.location.host === 'localhost:5001' ? 'http://localhost:8081' : 'https://contest-test.teammodel.cn'}/teammodel/home/homePage?token=${localStorage.getItem("auth_token")}`
 				window.open(url, "", "noopener");
 			},
 			//教师个人跳转苏格拉底