瀏覽代碼

处理冲突

CrazyIter_Bin 3 年之前
父節點
當前提交
e2c9dc76a0

+ 66 - 66
TEAMModelOS/ClientApp/public/lang/en-US.js

@@ -442,9 +442,9 @@ const LANG_EN_US = {
         ctFmText20: 'Smarter Classroom',
         ctFmText21: 'Seminar Center',
         ctFmText22: 'Consulting Services',
-        ctFmText23: '電子郵箱',
-        ctFmText24: '請輸入郵箱',
-        ctFmText25: '郵箱格式不正確',
+        ctFmText23: 'Email',
+        ctFmText24: 'Please enter email',
+        ctFmText25: 'Email format is not correct',
     },
     // 班级管理
     classMgmt: {
@@ -570,7 +570,7 @@ const LANG_EN_US = {
         ok: 'OK',
         generatOk: 'Generate successfully',
         generateErr: 'Failed to generate',
-        noStuTip: '未獲取到學生數據',
+        noStuTip: 'Student data not obtained',
     },
     // 课堂管理
     courseManage: {
@@ -867,9 +867,9 @@ const LANG_EN_US = {
         cusTab12: 'Create Poll',
         fullTips1: "School space is full, can't create school course assessment",
         fullTips2: "Personal space is full, can't create personal course evaluation",
-        createPrivCus: '新建個人課程',
-        cusSource: '來源:',
-        moreFn: '更多功能',
+        createPrivCus: 'Create personal course',
+        cusSource: 'Source:',
+        moreFn: 'More Functions',
 
         //ManageClass.vue
         stuMgt: 'Student Management',
@@ -1120,16 +1120,16 @@ const LANG_EN_US = {
             optionCount: 'Option Distribution',
             tPushLabel: 'Push:',
             noAns: 'Not Answered',
-            filter1: '所有',
-            filter2: '推送',
-            filter3: '任務',
-            filter4: '互動',
-            filter5: '測驗',
-            evt1: '搶權:',
-            evt2: '課中評測數據',
-            evt3: '挑人:',
-            evt4: '收集:',
-            evt5: '收集的作品',
+            filter1:'All',
+            filter2:'Push',
+            filter3:'Task',
+            filter4:'Interaction',
+            filter5:'Test',
+            evt1:'Buzz-in:',
+            evt2:'Smarter Classroom Assessment Data',
+            evt3:'Pick-out:',
+            evt4:'Collected:',
+            evt5:'Work Collected',
         }
     },
     // ElementUI相关
@@ -1183,7 +1183,7 @@ const LANG_EN_US = {
         choosePageItems: 'Select all questions in this page',
         completeTip: 'Please complete the subject, grade and semester data for the current school system first!',
         canChoose: 'choice(s)',
-        xkwMode: '學科網組卷',
+        xkwMode: 'Academic Web Design',
         importItems: 'Import Question',
         composePaper: 'Form Exam File',
         syncItems: 'Synchronize questions to the question bank',
@@ -2700,11 +2700,11 @@ const LANG_EN_US = {
     },
     // 课堂记录
     lessonRecord: {
+        noRecordTip: 'No lesson records are available under the current school system!',
         delTip: '課堂記錄已被清理',
-        noRecordTip: '當前學段下未查詢到課堂記錄!',
         overdue: 'expired',
         customSetting: 'Custom Setting',
-        cleaned: '已清理',
+        cleaned: 'Cleaned',
         open: 'Open',
         close: 'Close',
         condTip: 'Lesson records are kept for 7 days only by default (except for collected ones). If you use custom setting, you will need to set a retention period and retention conditions.',
@@ -3343,7 +3343,7 @@ const LANG_EN_US = {
         roomNoErr: 'The classroom ID cannot be empty!',
         roomNoErr1: 'Classroom ID can only be numbers or letters!',
         roomNoErr2: 'The same classroom ID already exists',
-        roomNameRep: '教室名稱重復',
+        roomNameRep: 'The same classroom name already exists',
         classAttr1: 'Regular Classroom(with fixed students)',
         classAttr2: 'Dedicated Subject Classroom (without fixed students)',
         nameWarning: 'Please enter the name',
@@ -3406,7 +3406,7 @@ const LANG_EN_US = {
         updOk: 'Modified successfully',
         updErr: 'Failed to modify',
         warmTips: 'Reminder',
-        mobileTips: 'In order to make better use of the system, it is recommended to use the PC IES5 device!',
+        mobileTips: 'In order to make better use of the system, it is recommended to use the PC IES 5 device!',
         noStuContent: 'The school has not imported any student account, do you want to go to Student Management to import student accounts?',
         setIrsWarning: 'Please set IRS number',
         setNoWarning: 'Please set seat number'
@@ -3511,7 +3511,7 @@ const LANG_EN_US = {
         text40: 'Material(s)',
         text41: 'Shared Course(s)',
         text42: 'Syllabus(s)',
-        text43: 'Resourse Output Distribution (Grade)',
+        text43: 'Resource Output Distribution (Grade)',
         text44: '1st Grade',
         text45: '2nd Grade',
         text46: '3rd Grade',
@@ -3577,7 +3577,7 @@ const LANG_EN_US = {
         cancelAdd: 'Decline to join',
         undoJoin: 'Withdraw request',
         requestJoin: 'Request to join',
-        applyManager: '申請成為管理員',
+        applyManager: 'Apply to be administrator',
         inputSearch: 'Enter the name of the school you want to search for',
         hasManager: 'The school has system administrator',
         hasBaseModule: 'Management Module',
@@ -3655,7 +3655,7 @@ const LANG_EN_US = {
             address: 'School/Institution Address',
             manager: 'Person in charge of School/Institution',
             cellphone: 'School/Institution Contact Information',
-            noContactTip: '聯繫電話與郵箱至少填寫一項',
+            noContactTip: 'At least one of the phone number or email is required',
             content: 'Remark Information',
             place0: 'Please enter the full name (not the abbreviation)',
             place1: 'Please select the area where the school is located',
@@ -3674,7 +3674,7 @@ const LANG_EN_US = {
             rule3: 'Contact information cannot be empty',
             rule4: 'Address cannot be empty',
             applyTip: '*After the application is submitted, it will be reviewed within 5 working days and the applicant will be notified.',
-            applyTip2: '* 提交申請後,將會有工作人員與您取得聯繫。',
+            applyTip2: '* After submitting your application, our staff will contact you.',
             p1: 'Elementary/Primary school',
             p2: 'Middle school',
             p3: 'High school/Vocational High School',
@@ -3728,7 +3728,7 @@ const LANG_EN_US = {
         edit: 'Edit',
         adminClass: 'Admin Class',
         teachClass: 'Customized Class',
-        stuImport: '導入名單',
+        stuImport: 'Import List',
         stuMgt: 'Student Management',
         filterNoClass: 'Filter students who are not linked with any classes',
         updClass: 'Change Class',
@@ -3784,7 +3784,7 @@ const LANG_EN_US = {
         importTips6: 'File:',
         importTips7: 'is not an EXCEL file, please select a .xlsx or .xls file.',
         importTips8: 'Error reading the file',
-        importTips9: '匯入的表格缺少',
+        importTips9: 'Imported form is missing',
         importTips10: ' information, please complete, then import!',
         importTips11: 'File read successfully!',
         importTips12: 'Please check if the form data is correct!',
@@ -3813,23 +3813,23 @@ const LANG_EN_US = {
         classFormatErr: 'Incorrect class format',
         classNameErr: 'Class name abnormal',
         importOk: 'Import successfully',
-        importErr: '導入失敗',
-        sit: '導入學生範本:',
-        sit1: 'id: 必填,學生學號(4-12位數字)',
-        sit2: 'pw: 選填,密碼(若不輸入,默認和學生學號相同)',
-        sit3: 'name: 必填,學生姓名',
-        sit4: 'stuYear: 必填,學生入學年 ex:2020',
-        sit5: 'className: 必填,學生班級ex:一年一班',
-        sit6: 'classYear: 必填,班級年級,通常與學生入學年相同 ex:2020',
-        sit7: 'classId: 必填,班級編號ex:1',
-        sit8: 'id格式錯誤',
-        sit9: '座號格式錯誤',
-        sit10: '班級id格式錯誤',
-        sit11: '班級名稱異常',
-        sit12: '查看學生名單',
-        sit13: 'guardian:選填,監護人與學生關系',
-        sit14: 'gName:選填,監護人姓名',
-        sit15: 'gPhone:選填,監護人手機號',
+        importErr: 'Failed to import',
+        sit: 'Import Student Template:',
+        sit1: 'id: Required. Student ID (4-12 digits number)',
+        sit2: "pw: Optional. Password (if not entered, the default is the same as the student's student ID)",
+        sit3: 'name: Required. Student Name',
+        sit4: 'stuYear: Required. Student Enrollment Year, ex:2020',
+        sit5: "className: Required. Student's Class, ex: 101",
+        sit6: "classYear: Required. Class Year. Usually the same year as the student's enrollment, ex:2020",
+        sit7: 'classId: Required. Class ID, ex:20200101',
+        sit8: 'Incorrect ID format',
+        sit9: 'Incorrect seat number format',
+        sit10: 'Incorrect class ID format',
+        sit11: 'Class name is abnormal.',
+        sit12: 'View Student List',
+        sit13: 'guardian: Optional. Guardian-Student Relationship',
+        sit14: 'gName: Optional. Guardian Name',
+        sit15: 'gPhone: Optional. Guardian Phone Number',
 
         // Authorization.vue
         authTitle: 'Service Authorization Management',
@@ -4205,8 +4205,8 @@ const LANG_EN_US = {
             timeoutHint: 'Polling time has passed, no more voting. Please pay attention to the teacher for the results! ',
             voteResult: 'The result of this poll is:',
             voteDesDefault: 'Please choose a desired plan:',
-            tickets: 'vote(s)',
-            surplusTickets: 'Remaining votes',
+            tickets: ' vote(s)',
+            surplusTickets: 'Remaining votes:',
             submitBVote: 'Submit to vote',
             submitOKVote: 'Voted',
             note: 'Please select at least one option before voting! ',
@@ -5058,8 +5058,8 @@ const LANG_EN_US = {
             platform: 'Resource Platform',
             trainList: 'Seminar List',
             trainCheck: 'Seminar Appraisal',
-            activity: '活動平臺',
-            trainSystem: '研修平臺'
+            activity: 'Activity Platform',
+            trainSystem:'Research Platform'
         },
         compt: {
             cusWare: 'Teaching Material',
@@ -5382,7 +5382,7 @@ const LANG_EN_US = {
             'classroom': 'Classroom Settings',
             'classroom-read': 'View Classroom Information',
             'classroom-upd': 'Change Classroom Settings',
-            'schoolSetting': '基礎設置',
+            'schoolSetting': 'Basic Settings',
             'schoolSetting-read': 'View School Basic Settings',
             'schoolSetting-upd': 'Change School Basic Settings',
             'student': 'Student Management',
@@ -5629,12 +5629,12 @@ const LANG_EN_US = {
     },
     // 学情分析
     totalAnalysis: {
-        backToTop: '返回頂部',
-        noMore: '沒有更多了',
-        reachBottomTip: '我也是有底線的',
-        filterOrigin: '評測來源',
-        examName: '評測名稱',
-        examNameTip: '請輸入評測名稱',
+        backToTop:'Back to top',
+        noMore:'No more',
+        reachBottomTip:'I also have a bottom line',
+        filterOrigin:'Assessment Source',
+        examName:'Assessment Name',
+        examNameTip:'Please enter the assessment name',
         totalIndex: {
             title: 'Learning Status Analysis Dashboard',
             tab1: 'Statistical Data',
@@ -6186,13 +6186,13 @@ const LANG_EN_US = {
         schoolMgt: 'School Management',
         systemSet: 'System Settings',
         updErr: 'Failed to modify',
-        band1: '賬號綁定:',
-        band2: '微信',
-        band3: '已綁定',
-        band4: '未綁定',
-        band5: '解除綁定',
-        band6: '進行綁定',
-        band7: '釘釘',
+        band1: 'Account Binding:',
+        band2: 'WeChat',
+        band3: 'Bound',
+        band4: 'Not bound',
+        band5: 'Unbound',
+        band6: 'Start Binding',
+        band7: 'DingTalk',
     },
     // 工具类
     utils: {
@@ -6246,9 +6246,9 @@ const LANG_EN_US = {
     },
     // 投票活动
     vote: {
-        copyNotice: '復制活動通知',
-        copyLinkUrl: '復制活動鏈接',
-        fullTip: '資源空間已滿,無法創建新活動!',
+        copyNotice:'Copy Activity Notice',
+        copyLinkUrl:'Copy Activity Website',
+        fullTip:'Resource space is full, unable to create new activity!',
         secret: 'Anonymous',
         allTeacher: 'All Teachers',
         noFindVote: 'No current activity found!',

+ 17 - 17
TEAMModelOS/ClientApp/public/lang/zh-CN.js

@@ -3406,7 +3406,7 @@ const LANG_ZH_CN = {
         updOk: '修改成功',
         updErr: '修改失败',
         warmTips: '温馨提示',
-        mobileTips: '为了您更好的使用体验,建议使用PC端访问IES5云平台!',
+        mobileTips: '为了您更好的使用体验,建议使用PC端访问IES 5云平台!',
         noStuContent: '学校暂未导入学生账号,是否前往学生管理汇入学生账号?',
         setIrsWarning: '请设置IRS编号',
         setNoWarning: '请设置座号'
@@ -3817,22 +3817,22 @@ const LANG_ZH_CN = {
         classNameErr: '班级名称异常',
         importOk: '导入成功',
         importErr: '导入失败',
-        sit: '导入学生范本:',
-        sit1: 'id: 必填,学生学号(4-12位数字)',
-        sit2: 'pw: 选填,密码(若不输入,默认和学生学号相同)',
-        sit3: 'name: 必填,学生姓名',
-        sit4: 'stuYear: 必填,学生入学年 ex:2020',
-        sit5: 'className: 必填,学生班级ex:一年一班',
-        sit6: 'classYear: 必填,班级年,通常与学生入学年相同 ex:2020',
-        sit7: 'classId: 必填,班级编号ex:1',
-        sit8: 'id格式错误',
-        sit9: '座号格式错误',
-        sit10: '班级id格式错误',
-        sit11: '班级名称异常',
-        sit12: '查看学生名单',
-        sit13: 'guardian:选填,监护人与学生关系',
-        sit14: 'gName:选填,监护人姓名',
-        sit15: 'gPhone:选填,监护人手机号',
+        sit:'导入学生范本:',
+        sit1:'id: 必填,学生学号(4-12位数字)',
+        sit2:'pw: 选填,密码(若不输入,默认和学生学号相同)',
+        sit3:'name: 必填,学生姓名',
+        sit4:'stuYear: 必填,学生入学年 ex:2020',
+        sit5:'className: 必填,学生班级ex:一年一班',
+        sit6:'classYear: 必填,班级年,通常与学生入学年相同 ex:2020',
+        sit7:'classId: 必填,班级编号ex:20200101',
+        sit8:'id格式错误',
+        sit9:'座号格式错误',
+        sit10:'班级id格式错误',
+        sit11:'班级名称异常',
+        sit12:'查看学生名单',
+        sit13:'guardian: 选填,监护人与学生关系',
+        sit14:'gName: 选填,监护人姓名',
+        sit15:'gPhone: 选填,监护人手机号',
 
         // Authorization.vue
         authTitle: '服务授权管理',

+ 20 - 20
TEAMModelOS/ClientApp/public/lang/zh-TW.js

@@ -442,9 +442,9 @@ const LANG_ZH_TW = {
         ctFmText20: '智慧教室',
         ctFmText21: '研修中心',
         ctFmText22: '顧問服務',
-        ctFmText23: '電子箱',
-        ctFmText24: '請輸入箱',
-        ctFmText25: '箱格式不正確',
+        ctFmText23: '電子箱',
+        ctFmText24: '請輸入箱',
+        ctFmText25: '箱格式不正確',
     },
     // 班级管理
     classMgmt: {
@@ -853,20 +853,20 @@ const LANG_ZH_TW = {
         evRcd: '歷次評量',
         gradeErr: '查詢成績數據失敗',
         rcdExpired: '到期',
-        cusTab1: '評活動',
+        cusTab1: '評活動',
         cusTab2: '作業活動',
         cusTab3: '投票活動',
         cusTab4: '問卷活動',
         cusTab5: '班級公告',
-        cusTab6: '評列表',
+        cusTab6: '評列表',
         cusTab7: '成績統計',
-        cusTab8: '新建評',
+        cusTab8: '新建評',
         cusTab9: '新建作業',
         cusTab10: '新建公告',
         cusTab11: '新建問卷',
         cusTab12: '新建投票',
-        fullTips1: '學校空間已滿,無法創建學校課程評',
-        fullTips2: '個人空間已滿,無法創建個人課程評',
+        fullTips1: '學校空間已滿,無法創建學校課程評',
+        fullTips2: '個人空間已滿,無法創建個人課程評',
         createPrivCus: '新建個人課程',
         cusSource: '來源:',
         moreFn: '更多功能',
@@ -3343,7 +3343,7 @@ const LANG_ZH_TW = {
         roomNoErr: '教室編碼不能為空!',
         roomNoErr1: '教室編碼只能是數字或字母!',
         roomNoErr2: '教室編碼重複',
-        roomNameRep: '教室名稱重',
+        roomNameRep: '教室名稱重',
         classAttr1: '常規教室(有固定學生)',
         classAttr2: '專科教室(無固定學生)',
         nameWarning: '請輸入名稱',
@@ -3406,7 +3406,7 @@ const LANG_ZH_TW = {
         updOk: '修改成功',
         updErr: '修改失敗',
         warmTips: '溫馨提示',
-        mobileTips: '為了您更好的使用體驗,建議使用PC端訪問IES5雲平臺!',
+        mobileTips: '為了您更好的使用體驗,建議使用PC端訪問IES 5雲平臺!',
         noStuContent: '學校暫未匯入學生帳號,是否前往學生管理匯入學生帳號?',
         setIrsWarning: '請設定IRS編號',
         setNoWarning: '請設定座號'
@@ -3596,7 +3596,7 @@ const LANG_ZH_TW = {
         modalTip6: '確認取消加入',
         joinTip1: '感謝您選擇所屬學校',
         joinTip2: '按下申請後,下次登錄就會顯示您的學校名稱!',
-        joinTip3: '注意:加入申請需經過您申請學校的管理員核之後,才能正式取得學校所提供的資源。',
+        joinTip3: '注意:加入申請需經過您申請學校的管理員核之後,才能正式取得學校所提供的資源。',
         submitSucTips: '提交成功',
         submitFailTips: '操作失敗',
         joinSucTips: '加入成功!',
@@ -3655,7 +3655,7 @@ const LANG_ZH_TW = {
             address: '學校/機構地址',
             manager: '學校/機構負責人',
             cellphone: '學校/機構聯繫方式',
-            noContactTip: '聯繫電話與箱至少填寫一項',
+            noContactTip: '聯繫電話與箱至少填寫一項',
             content: '備註資訊',
             place0: '請輸入完整名稱(不能是簡稱)',
             place1: '選擇學校所在地區',
@@ -3820,16 +3820,16 @@ const LANG_ZH_TW = {
         sit3: 'name: 必填,學生姓名',
         sit4: 'stuYear: 必填,學生入學年 ex:2020',
         sit5: 'className: 必填,學生班級ex:一年一班',
-        sit6: 'classYear: 必填,班級年,通常與學生入學年相同 ex:2020',
-        sit7: 'classId: 必填,班級編號ex:1',
+        sit6: 'classYear: 必填,班級年,通常與學生入學年相同 ex:2020',
+        sit7: 'classId: 必填,班級編號ex:20200101',
         sit8: 'id格式錯誤',
         sit9: '座號格式錯誤',
         sit10: '班級id格式錯誤',
         sit11: '班級名稱異常',
         sit12: '查看學生名單',
-        sit13: 'guardian選填,監護人與學生關系',
-        sit14: 'gName選填,監護人姓名',
-        sit15: 'gPhone選填,監護人手機號',
+        sit13: 'guardian: 選填,監護人與學生關系',
+        sit14: 'gName: 選填,監護人姓名',
+        sit15: 'gPhone: 選填,監護人手機號',
 
         //Authorization.vue
         authTitle: '服務授權管理',
@@ -5382,7 +5382,7 @@ const LANG_ZH_TW = {
             'classroom': '教室管理',
             'classroom-read': '檢視教室資料',
             'classroom-upd': '變更教室設定',
-            'schoolSetting': '基礎設',
+            'schoolSetting': '基礎設',
             'schoolSetting-read': '檢視學校基礎設定',
             'schoolSetting-upd': '變更學校基礎設定',
             'student': '學生管理',
@@ -6186,7 +6186,7 @@ const LANG_ZH_TW = {
         schoolMgt: '學校管理',
         systemSet: '系統設定',
         updErr: '修改失敗',
-        band1: '號綁定:',
+        band1: '號綁定:',
         band2: '微信',
         band3: '已綁定',
         band4: '未綁定',
@@ -6247,7 +6247,7 @@ const LANG_ZH_TW = {
     // 投票活动
     vote: {
         copyNotice: '複製活動通知',
-        copyLinkUrl: '複製活動鏈接',
+        copyLinkUrl: '複製活動網址',
         fullTip: '資源空間已滿,無法建立新活動!',
         secret: '匿名',
         allTeacher: '所有老師',

+ 1 - 1
TEAMModelOS/Controllers/Third/Xkw/XkwServiceController.cs

@@ -218,7 +218,7 @@ namespace TEAMModelOS.Controllers.Third.Xkw
                 string rg_qml_sq = "<div[^>]{0,}\\s*qml-sq[^>]{0,}>";
                 //string stem = x.stem.Replace("</table>", "");
                 string[] questiones = Regex.Split(x.stem, rg_qml_sq);
-                string rg_qml_an_sq = "\\d+\\s*\\.\\s*<span[^>]{0,}\\s*qml-an-sq[^>]{0,}" +
+                string rg_qml_an_sq = "\\d+\\s*\\.\\s*<span[^>]{0,}\\s*qml-an-sq[^>]{0,}>" +
                 "|(\\d+\\s*)\\s*<span[^>]{0,}\\s*qml-an-sq[^>]{0,}>" +
                 "|\\d+\\s*<span[^>]{0,}\\s*qml-an-sq[^>]{0,}>" +
                 "|(\\d+\\s*)\\s*<span[^>]{0,}\\s*qml-an-sq[^>]{0,}>";

+ 1 - 1
TEAMModelOS/TEAMModelOS.csproj

@@ -43,7 +43,7 @@
     <AssemblyVersion>5.2206.1.1</AssemblyVersion>
     <FileVersion>5.2206.1.1</FileVersion>
     <Description>TEAMModelOS(IES5)</Description>
-    <PackageReleaseNotes>IES版本说明版本标记5.2206.1.1</PackageReleaseNotes>
+    <PackageReleaseNotes>IES版本说明版本标记5.2206.1.1,rc-切master</PackageReleaseNotes>
     <PackageId>TEAMModelOS</PackageId>
     <Authors>teammodel</Authors>
     <Company>醍摩豆(成都)信息技术有限公司</Company>