jeff 3 年 前
コミット
fbd1cc499a
58 ファイル変更1116 行追加111 行削除
  1. 1 1
      TEAMModelOS/ClientApp/src/locale/lang/en-US/answerSheet.js
  2. 20 1
      TEAMModelOS/ClientApp/src/locale/lang/en-US/cusMgt.js
  3. 3 3
      TEAMModelOS/ClientApp/src/locale/lang/en-US/evaluation.js
  4. 10 10
      TEAMModelOS/ClientApp/src/locale/lang/en-US/global.js
  5. 8 1
      TEAMModelOS/ClientApp/src/locale/lang/en-US/home.js
  6. 2 1
      TEAMModelOS/ClientApp/src/locale/lang/en-US/http.js
  7. 5 1
      TEAMModelOS/ClientApp/src/locale/lang/en-US/index.js
  8. 202 0
      TEAMModelOS/ClientApp/src/locale/lang/en-US/jyzx.js
  9. 12 1
      TEAMModelOS/ClientApp/src/locale/lang/en-US/learnActivity.js
  10. 2 1
      TEAMModelOS/ClientApp/src/locale/lang/en-US/login.js
  11. 36 0
      TEAMModelOS/ClientApp/src/locale/lang/en-US/notify.js
  12. 16 2
      TEAMModelOS/ClientApp/src/locale/lang/en-US/schoolBaseInfo.js
  13. 4 2
      TEAMModelOS/ClientApp/src/locale/lang/en-US/stuAccount.js
  14. 2 2
      TEAMModelOS/ClientApp/src/locale/lang/en-US/studentWeb.js
  15. 4 4
      TEAMModelOS/ClientApp/src/locale/lang/en-US/survey.js
  16. 2 0
      TEAMModelOS/ClientApp/src/locale/lang/en-US/system.js
  17. 5 1
      TEAMModelOS/ClientApp/src/locale/lang/en-US/teachContent.js
  18. 29 4
      TEAMModelOS/ClientApp/src/locale/lang/en-US/teachermgmt.js
  19. 3 3
      TEAMModelOS/ClientApp/src/locale/lang/en-US/totalAnalysis.js
  20. 2 1
      TEAMModelOS/ClientApp/src/locale/lang/en-US/user.js
  21. 7 2
      TEAMModelOS/ClientApp/src/locale/lang/en-US/utils.js
  22. 1 1
      TEAMModelOS/ClientApp/src/locale/lang/en-US/vote.js
  23. 20 1
      TEAMModelOS/ClientApp/src/locale/lang/zh-CN/cusMgt.js
  24. 8 1
      TEAMModelOS/ClientApp/src/locale/lang/zh-CN/home.js
  25. 2 1
      TEAMModelOS/ClientApp/src/locale/lang/zh-CN/http.js
  26. 4 0
      TEAMModelOS/ClientApp/src/locale/lang/zh-CN/index.js
  27. 202 0
      TEAMModelOS/ClientApp/src/locale/lang/zh-CN/jyzx.js
  28. 14 3
      TEAMModelOS/ClientApp/src/locale/lang/zh-CN/learnActivity.js
  29. 3 2
      TEAMModelOS/ClientApp/src/locale/lang/zh-CN/login.js
  30. 36 0
      TEAMModelOS/ClientApp/src/locale/lang/zh-CN/notify.js
  31. 14 0
      TEAMModelOS/ClientApp/src/locale/lang/zh-CN/schoolBaseInfo.js
  32. 36 32
      TEAMModelOS/ClientApp/src/locale/lang/zh-CN/stuAccount.js
  33. 3 3
      TEAMModelOS/ClientApp/src/locale/lang/zh-CN/studentWeb.js
  34. 2 0
      TEAMModelOS/ClientApp/src/locale/lang/zh-CN/system.js
  35. 5 1
      TEAMModelOS/ClientApp/src/locale/lang/zh-CN/teachContent.js
  36. 30 4
      TEAMModelOS/ClientApp/src/locale/lang/zh-CN/teachermgmt.js
  37. 1 0
      TEAMModelOS/ClientApp/src/locale/lang/zh-CN/user.js
  38. 5 0
      TEAMModelOS/ClientApp/src/locale/lang/zh-CN/utils.js
  39. 1 1
      TEAMModelOS/ClientApp/src/locale/lang/zh-CN/vote.js
  40. 21 2
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/cusMgt.js
  41. 8 1
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/home.js
  42. 2 1
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/http.js
  43. 4 0
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/index.js
  44. 202 0
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/jyzx.js
  45. 1 1
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/knowledge.js
  46. 13 2
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/learnActivity.js
  47. 3 2
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/login.js
  48. 36 0
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/notify.js
  49. 14 0
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/schoolBaseInfo.js
  50. 1 1
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/selflearn.js
  51. 2 0
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/stuAccount.js
  52. 1 1
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/studentWeb.js
  53. 2 0
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/system.js
  54. 6 2
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/teachContent.js
  55. 29 4
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/teachermgmt.js
  56. 2 1
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/user.js
  57. 6 1
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/utils.js
  58. 1 1
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/vote.js

+ 1 - 1
TEAMModelOS/ClientApp/src/locale/lang/en-US/answerSheet.js

@@ -9,7 +9,7 @@ export default {
 	isShowLines: 'Sealing line',
 	objective: 'Objective Question',
 	complete: 'Cloze Question',
-	subjective: 'Short Answer Question',
+	subjective: 'Writing Question',
 	compositionZh: 'Essay(Language)',
 	compositionEn: 'Essay(English)',
 	tip1: 'Question Number',

+ 20 - 1
TEAMModelOS/ClientApp/src/locale/lang/en-US/cusMgt.js

@@ -10,6 +10,8 @@ export default {
     cNameHolder:'Please enter course name',
     cusCode:'Course ID',
     codeHolder:'Please enter course ID',
+    cusDesc:'Course Description',
+    descHolder:'Please enter course description',
     cusPd:"School System",
     pdHolder:'Please choose school system',
     cusSubject:"School System",
@@ -19,7 +21,7 @@ export default {
     delContent:'Are you sure to delete ',
     codeErr1:'Course ID cannot be empty',
     codeErr2:'Course ID can only consist of English letters and numbers',
-    tableCol1:'Serial number',
+    tableCol1:'Seat No.',
     tableCol2:'Course Name',
     tableCol3:'Course ID',
     tableCol4:'School system',
@@ -110,6 +112,9 @@ export default {
     createTips1:'Note: You (have joined a school) can select students from your school to join the course, or allow students to join the course by entering the course invitation code, scanning the course QR code, or using the invitation link.',
     createTips2:'Note: You (not yet a member of a school) can allow students to join the course by entering the course invitation code, scanning the course QR code, or using the invitation link.',
     renameListTitle:'Edit List Name',
+    selectListTips:'Please select a list',
+    alreadyExist:' already existed',
+    listAPIErr:'Failed to get the list',
     //ManageClass.vue
     classLabel:'Class:',
     stuCount:'Student Number: ',
@@ -146,6 +151,14 @@ export default {
     groupUnit:'Group',
     stuNameList:'Student List',
     saveGroup:'Save',
+    setAvatar:'Set Profile Picture',
+    stuNameLabel:'Name:',
+    reupload:'Re-upload',
+    uploadAvatar:'Upload Profile Picture',
+    uploadTips:'Please upload profile picture',
+    setOk:'Set up successfully',
+    setErr:'Failed to set up',
+    uploadErr:'Failed to upload profile picture',
     
     //NewCusMgt.vue
     schdTable:'Schedule Mode',
@@ -157,6 +170,10 @@ export default {
     cusTime:'Course Schedule',
     saveLabel:'Save changes',
     addStuList:'Add List',
+    addListType:'Method',
+    addListType1:'Add a new list',
+    addListType2:'Select an existing list',
+    listLabel:'List',
     removeList:'Remove List',
     addrLabel:'Classroom:',
     nameLabel:'Class List:',
@@ -197,6 +214,8 @@ export default {
     remvTeaTitle:'Remove Instructor',
     remvTeaContent:'Are you sure to remove ',
     gradeLabel:'Grade',
+    cusNoRepeat:'The same course ID already exists',
+    cusNameRepeat:'The same course name already exists',
 
     //MgtStuList.vue
     nameList:'Name list',

+ 3 - 3
TEAMModelOS/ClientApp/src/locale/lang/en-US/evaluation.js

@@ -35,9 +35,9 @@ export default {
 	typeScoreTip:'Using this allocation method, the original allocation will be reset! Do you want to continue?',
 	single:'Single Answer',
 	multiple:'Multiple Answers',
-	judge:'True-false',
+	judge:'True-False',
 	complete:'Cloze',
-	subjective:'Short Answer',
+	subjective:'Writing',
 	connector:'Matching',
 	correct:'Correcting',
 	compose:'Question Set',
@@ -207,7 +207,7 @@ export default {
 		importTips:'Import Notice',
 		tips1:' Click on the upload icon above to select a file',
 		tips2:' Only support ".docx, .xlsx, .xls" format file import, please refer to the template format to import',
-		tips3:' For now, only single answer, multiple answers, true-false, cloze, short answer, matching, correcting, and question set are supported for import',
+		tips3:' For now, only single answer, multiple answers, true-false, cloze, writing, matching, correcting, and question set are supported for import',
 		tips4:' Please keep the template language the same as the current browser language',
 		tips5:' For more details, please refer to the template making instruction',
 		warningTips1:'The upload format only supports docx/xlsx/xls , please re-upload!',

+ 10 - 10
TEAMModelOS/ClientApp/src/locale/lang/en-US/global.js

@@ -13,35 +13,35 @@ export default {
     testType: [
         {
             label: "Single Answer",
-            value: "single Answer"
+            value: "single"
         },
         {
             label: "Multiple Answers",
-            value: "multiple Answers"
+            value: "multiple"
         },
         {
-            label: "True-false",
-            value: "True-false"
+            label: "True-False",
+            value: "judge"
         },
         {
             label: "Cloze",
-            value: "Cloze"
+            value: "complete"
         },
         {
-            label: "Short answer",
-            value: "Short answer"
+            label: "Writing",
+            value: "subjective"
         },
         {
             label: "Question Set",
-            value: "Question Set"
+            value: "compose"
         },
         {
             label: "Correcting",
-            value: "correcting"
+            value: "correct"
         },
         {
             label: "Matching",
-            value: "Matching"
+            value: "connector"
         },
     ],
 }

+ 8 - 1
TEAMModelOS/ClientApp/src/locale/lang/en-US/home.js

@@ -45,5 +45,12 @@ export default{
     noNotice:'No announcement yet',
     noInfo:'No message yet',
     schoolLabel:'School',
-    privateLabel:'Personal'
+    privateLabel:'Personal',
+    mon:'Mon',
+    tues:'Tue',
+    wed:'Wed',
+    thur:'Thu',
+    fri:'Fri',
+    sat:'Sat',
+    sun:'Sun'
 }

+ 2 - 1
TEAMModelOS/ClientApp/src/locale/lang/en-US/http.js

@@ -1,8 +1,9 @@
 export default{
     error500:'Server error!',
     error401:'Login status has expired! Please log in again!',
+	error400:'API ERROR',
     error404:'API address not accessed!',
-	error:'API error!',
+	error:'Network Error! please try again later!',
 	loading:'Loading...',
 	error403:'Authorization expired or authorization abnormal, please try again later!'
 }

+ 5 - 1
TEAMModelOS/ClientApp/src/locale/lang/en-US/index.js

@@ -38,6 +38,8 @@ import notice from './notice'
 import answerSheet from './answerSheet'
 import tip from './tip'
 import selflearn from './selflearn'
+import notify from './notify'
+import jyzx from './jyzx';
 export default {
   schoolBaseInfo,
   classMgmt,
@@ -79,7 +81,9 @@ export default {
   answerSheet,
   tip,
   selflearn,
-  test: '测试',
+  notify,
+  jyzx,
+  test: 'Testing',
   formConfigP: {
     input: 'Please Enter ',
     select: 'Please Select',

+ 202 - 0
TEAMModelOS/ClientApp/src/locale/lang/en-US/jyzx.js

@@ -0,0 +1,202 @@
+export default{
+    common: {
+        theme: "话题",
+        content: "内容",
+        reply: "回复",
+        comment: "评论回复",
+        report: "举报",
+        sure: "确定",
+        cancel: "取消",
+        delete: "删除",
+        complete: "已完成",
+        loadTime: "上传时间",
+        action: "操作",
+        seeEvaluate: "查看评价",
+        school: "校",
+        area: "区",
+        typeSch: "校级",
+        typeArea: "区级",
+        point: "能力点",
+        pointName: "能力点名称",
+        dimension: "维度",
+        message: "请选择举报类型:",
+        success1: "回复成功",
+        success2: "举报成功",
+        success3: "删除成功",
+        error: "删除失败",
+    },
+    // 线上研修
+    online: {
+        checkedPoint: "已选能力点",
+        addPoint: "增加能力点",
+        compulsory: "必修",
+        elective: "选修",
+        studyTime: "学时",
+        chapter: "章节",
+        resources: "有关联资源",
+        relResources: "关联资源",
+        relTopic: "关联话题",
+        study: "您已学习:",
+        time: "/20学时",
+        tips: "必修能力点已为您默认勾选!点击确定后就可开始学习",
+        type: "状态",
+        no: "标号",
+        environment: "所属环境",
+        message1: "增加能力点成功",
+        message2: "已学完本章节",
+        message3: "该能力点已学完",
+        placeholder1: "发起新的话题",
+        release: "发布",
+        relSucess: "话题发布成功",
+    },
+    // 校本研修
+    offline: {
+        activity: "研修活动",
+        info: "详细信息",
+        creator: "创建者",
+        noPeople: "无",
+        joinNum: "参与人数",
+        actTime: "活动时间",
+        target: "学习对象",
+        basicInfo: "基础信息",
+        studyTar: "研修目标",
+        address: "培训地点",
+        speaker: "主讲人",
+        type: "类型",
+        studyTime: "学时",
+        homework: "作业",
+        hwName: "作业名称",
+        hwDes: "作业描述",
+        hwUpload: "上传作业",
+        againLoad: "重新上传",
+        question: "问卷",
+        queName: "问卷名称",
+        queDes: "问卷描述",
+        queAnswer: "作答问卷",
+        feedback: "问卷反馈",
+        answered: "已作答",
+        exam: "评测",
+        examName: "评测名称",
+        examDes: "评测描述",
+        examAnswer: "作答评测",
+        answerExam: "评测作答",
+        right: "答对",
+        error: "答错",
+        topic: "题",
+        success1: "保存成功",
+        success2: "上传成功",
+        error1: "保存失败",
+        error1: "上传失败",
+        message1: "问卷未填写完,请继续填写",
+        message2: "评测未作答完,请继续作答",
+        placeholder1: "输入您的回答内容...",
+    },
+    // 应用考核
+    application: {
+        list: "成果列表",
+        discuss: "成果互评",
+        disNum: "互评次数",
+        disByMe: "自评结果",
+        disBySchool: "校评结果",
+        spotCheck: "专家抽查",
+        testByMe: "自我检测结果",
+        fine: "优秀",
+        qualified: "合格",
+        unqualified: "不合格",
+        noEvaluate: "未评价",
+        pass: "通过",
+        noPass: "未通过",
+        load: "上传文件",
+        againTest: "重新检测",
+        meTest: "自我检测",
+        score: "前往评分",
+        againScore: "重新评分",
+        evaName: "评价人",
+        evaType: "评测类型",
+        evaResult: "评价结果",
+        evaContent: "评价内容",
+        evaTime: "评价时间",
+        evaSchool: "校评",
+        evaOther: "互评",
+        evaMe: "自评",
+        admin: "管理员",
+        teacher: "老师",
+        noCheck: "未抽查",
+        teacherName: "教师姓名",
+    },
+    // 课堂实录
+    classRecord: {
+        myRecod: "我的课堂实录",
+        groupRecord: "同组课堂实录",
+        loadOK: "确认上传",
+        videoName: "视频名称",
+        fileSize: "文件大小",
+        loadDes: "选择或者拖拽文件到该区域进行上传",
+        loadAuth: "上传作者",
+        size: "大小",
+        see: "查看课程及评价",
+        evaName: "评价人",
+        evaType: "评测类型",
+        evaResult: "评价结果",
+        evaContent: "评价内容",
+        evaTime: "评价时间",
+        message1: "您确实要删除这条视频吗?",
+        message2: "上传失败",
+        message3: "上传成功",
+        message4: "删除成功",
+        message5: "删除失败",
+        message6: "暂无同组课堂实录",
+    },
+    // 讨论中心
+    discuss: {
+        addTopic: "新增话题",
+        topicType: "话题类型",
+        normal: "普通话题",
+        point: "能力点话题",
+        allTopic: "所有话题",
+        myTopic: "我的话题",
+        replyMe: "回复我的",
+        placeholder1: "请输入关键字",
+        placeholder2: "新的话题",
+        placeholder3: "请选择",
+        placeholder4: "请输入正文",
+        success1: "发表成功",
+        error1: "发表失败",
+        message1: "切换至我的话题",
+        message2: "切换至回复我的",
+    },
+    // 活动
+    activity: {
+        des: "描述",
+        voteArea: "投票区",
+        haveVoteNum: "可投票数",
+        submit: "提交投票",
+        startTime: "发起时间",
+        numExce: "投票数已超出",
+        incomplete: "未完成",
+        success1: "投票成功",
+        success2: "提交成功!",
+        message1: "您还未投票",
+        message2: "存在未作答的题目!",
+        message3: "已作答的问卷无法修改!",
+    },
+    homePage: {
+        totalTime: '总学时',
+        online: "线上研修",
+        offline: "线下研修",
+        application: "应用考核",
+        classRecord: "课堂实录",
+        studyPoint: "已学能力点",
+        okPoint: "检测合格能力点",
+        achievements: "成果提交",
+        area: "区级研修",
+        areaQue: "区级问卷",
+        areaVote: "区级投票",
+        school: "校本研修",
+        schoolQue: "校本问卷",
+        schoolVote: "校本投票",
+        time: "学时",
+        remarks1: "总学时:线上研修 + 校本研修 + 应用考核 + 课堂实录",
+        remarks2: "注:各指标达到要求后,多余学时不再计入总学时",
+    }
+}

+ 12 - 1
TEAMModelOS/ClientApp/src/locale/lang/en-US/learnActivity.js

@@ -191,7 +191,16 @@ export default {
         nextQu: 'Next Question',
         view: 'View',
         requesting: 'Data request in progress, please wait ...',
-        dataError: 'Data request abnormal, please refresh the page and try again'
+        dataError: 'Data request abnormal, please refresh the page and try again',
+        byStuMark:'Mark By People',
+        byQuMark:'Mark By Question',
+        noStuAnswer:"Students didn't answer yet",
+        toggleQu:'Switch Question',
+        viewMark:'View Annotation',
+        markLabel:'Annotation',
+        saveScoreTitle:'Save Score',
+        saveScoreContent:'The scores you modified have not been saved yet, do you want to save them?',
+
     },
 
     //SimpleAnalysis.vue
@@ -309,6 +318,8 @@ export default {
         selectTeaTips:'請設置當前題塊的閱卷老師',
         lastQu:'題目尚未完全分配',
         reapQu:'題目劃塊設置存在重復題目',
+        objectiveLabel:'(Objective)',
+        alreadyLabel:'(Already)',
         //ByqU.vue & ByStu.vue
         quit: '退出閱卷',
         examName: '考試名稱:',

+ 2 - 1
TEAMModelOS/ClientApp/src/locale/lang/en-US/login.js

@@ -82,5 +82,6 @@ export default {
     stuCli:'For Student',
     beian1:'',
     beian2:'',
-    copyright:'2021 HABOOK Group TEAM Model'
+    copyright:'2021 HABOOK Group TEAM Model',
+    loginErr:'Login information is abnormal, please log in again'
 }

+ 36 - 0
TEAMModelOS/ClientApp/src/locale/lang/en-US/notify.js

@@ -0,0 +1,36 @@
+export default {
+    createTitle:'Create School Announcement',
+    title:'Title',
+    titleHolder:'Please enter title',
+    notifyTime:'Time',
+    notifyContent:'Content',
+    saveText:'Save Announcement',
+    publishText:'Release Announcement',
+    cancelEdit:'Cancel Editing',
+    cancelPublish:'Cancel Announcement',
+    timeTips:'Please set the announcement time',
+    contentTips:'Please enter the announcement content',
+    titleTips:'Please enter the announcement title',
+    reserveContent:'Do you want to keep this edit?',
+    reserveOk:'Keep',
+    reserveCancel:"Don't keep",
+    fullInfoTips:'Please complete the announcement information!',
+    search:'Search',
+    draft:'Draft Box',
+    toCreate:'Create Announcement',
+    pending:'Scheduled',
+    going:'Announcing',
+    finish:'Ended',
+    ntTime:'Announcement Time:',
+    delete:'Delete',
+    view:'View',
+    edit:'Edit',
+    noNotify:'No Announcement Yet',
+    notifyDetail:'Announcement Detail',
+    delNotifyTitle:'Delete Announcement',
+    delNotifyContent:'Are you sure you want to delete',
+    ok:'Yes',
+    no:'No',
+    delOk:'Delete Successfully',
+    delErr:'Failed to delete'
+}

+ 16 - 2
TEAMModelOS/ClientApp/src/locale/lang/en-US/schoolBaseInfo.js

@@ -99,6 +99,18 @@ export default {
   semesterName: 'Name',
   semStartAt: 'Started on',
   admission: 'Enrollment Semester',
+  setStartSem:'Please set the enrollment semester',
+  semTimeTips:'Please set the semester start date',
+  semNameTips:'Semester name cannot be empty',
+  semStartTips:'Please set whether it is the enrollment semester',
+  gradeNameTips:'Please set the grade name',
+  examNameTips:'Please set the exam type',
+  profNameTips:'Please set the professional subject name',
+  anaNameTips:'Please complete the learning status analysis setting',
+  campNameTips:'Please enter the school district name',
+  subjectNameTips:'Please enter the subject/professional subject name',
+  delTimeTitle:'Delete Schedule',
+  delTimeContent:'Are you sure you want to delete the current schedule?',
 
   // ClassroomSetting.vue
   classroomList: 'Classroom List',
@@ -114,6 +126,7 @@ export default {
   setGrade: "Set classroom's grade",
   setHiteachCode: 'HiTeach Serial Number',
   addClassroom: 'Add Classroom',
+  editClassroom: 'Edit Classroom',
   schoolPlan: 'School floor plan and classroom location settings',
   uploadPlan: 'Upload Floor Plan',
   hiteachList: 'HiTeach Serial Number List',
@@ -173,7 +186,7 @@ export default {
   classNoErr1: 'Class ID can only contain numbers!',
   roomNoErr: 'The classroom ID cannot be empty!',
   roomNoErr1: 'Classroom ID can only be numbers or letters!',
-  roomNoErr2: 'This Classroom ID repeated',
+  roomNoErr2: 'The same classroom ID already exists',
   classAttr1: 'Regular Classroom(with fixed students)',
   classAttr2: 'Dedicated Subject Classroom (without fixed students)',
   nameWarning: 'Please enter the name',
@@ -202,6 +215,7 @@ export default {
   addErr: 'Failed to add',
   cusTabel: 'Class Schedule',
   setCusTable: 'Set Class Schedule',
+  fullRoomInfo:'Please complete the classroom information first!',
 
   //ClassMgt.vue
   className:'Name',
@@ -215,7 +229,7 @@ export default {
   noSet:'Not set',
   newClass:'Create Class',
   gradeWarning1: 'Please set grade/academic year',
-  classRep: 'Same class name already exists',
+  classRep: 'The same class name already exists',
   updOk:'Modified successfully',
   updErr:'Failed to modify'
 }

+ 4 - 2
TEAMModelOS/ClientApp/src/locale/lang/en-US/stuAccount.js

@@ -40,7 +40,8 @@ export default {
   adminClass:'Admin Class',
   teachClass:'Customized Class',
   stuMgt:'Student Management',
-
+  filterNoClass:'Filter students who are not associated with any classes',
+  
   // AddStudent.vue
   accountInfo: 'Account Information',
   accountHolder: 'Please enter account information',
@@ -99,8 +100,9 @@ export default {
   setNoErr:"Error: Seat number has been repeated within the school",
   downloadText:'(Download List Sample)',
   idRepErr:'Account already exists, will overwrite the original account',
-  stuYearErr:"Student's academic year Data is incorrect",
+  stuYearErr:"Student's academic year data is incorrect",
   classYearErr:"Class's grade level is incorrect",
+  importOk: 'Import successfully',
 
   // Authorization.vue
   authTitle: 'Service Authorization Management',

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

@@ -303,9 +303,9 @@ export default {
         queType: {
             single: 'Single Answer Question',
             multiply: 'Multiple Answers Question',
-            judge: 'True-false Question',
+            judge: 'True-False Question',
             complete: 'Cloze Question',
-            subjective: 'Short Answer Question',
+            subjective: 'Writing Question',
             compose: 'Question Set',
             correct: 'Correcting Question',
             connector: 'Matching Question'

+ 4 - 4
TEAMModelOS/ClientApp/src/locale/lang/en-US/survey.js

@@ -13,8 +13,8 @@ export default {
 	addItem:'Add Question',
 	single:'Single Answer Question',
 	multiple:'Multiple Answers Question',
-	judge:'True-false Question',
-	subjective:'Short Answer Question',
+	judge:'True-False Question',
+	subjective:'Writing Question',
 	defaultName:'Default Survey Name',
 	isExistTip:'Unsaved survey activity already exists!',
 	getDataFailTip:'Failed to obtain data!',
@@ -69,8 +69,8 @@ export default {
 		confirm:'Confirm',
 		single:'Single Answer',
 		multiple:'Multiple Answers',
-		judge:'True-false',
-		subjective:'Short Answer',
+		judge:'True-False',
+		subjective:'Writing',
 		noCompleteTip:'Please fill in completely',
 		confirmTitle:'Friendly Reminder',
 		confirmText:'Are you sure to delete this question?',

+ 2 - 0
TEAMModelOS/ClientApp/src/locale/lang/en-US/system.js

@@ -4,6 +4,8 @@ export default {
     loading:'Loading',
     authErr:'Insufficient authorization!',
     development:'Features are under development, stay tuned!',
+	goHome:'Return To Home Page',
+    changePlat:'Switch Platform',
     menu:{
         school:'School',
         private:'Personal',

+ 5 - 1
TEAMModelOS/ClientApp/src/locale/lang/en-US/teachContent.js

@@ -60,5 +60,9 @@ export default {
   public: 'Public Resources',
   startDown: 'Start Downloading',
   videoTips:'Friendly reminder: Only MP4 format is supported for online video playing! ',
-  spaceTips: 'School Available Space = Total School Space - Space Allocated To Teachers'
+  spaceTips: 'School Available Space = Total School Space - Space Allocated To Teachers',
+  common:'General',
+  renameTitle:'Rename',
+  fileName:'File Name:'
+  
 }

+ 29 - 4
TEAMModelOS/ClientApp/src/locale/lang/en-US/teachermgmt.js

@@ -1,17 +1,20 @@
 export default {
     page:{
-        text1: 'Teacher Account Management',
-        text2: 'Add New Teacher Account'
+        text1: 'Teacher Management',
+        text2: 'Add New Teacher',
+        text3: 'Pedagogical Research Team',
     },
     blurryFilter: 'Please enter ID or Name to search',
     mulitSet: 'Batch Authorization Management',
     table:{
         text1: 'Basic',
         text2: 'Advance',
+        text3: 'System Administrator',
         th1: 'ID',
         th2: 'Name',
         th3: 'Title',
-        th4: 'Authorization Status'
+        th4: 'Authorization Status',
+        th5: 'Pedagogical Research Team',
     },
     authSet:{
         title:'Authorization Settings',
@@ -139,6 +142,7 @@ export default {
             text3: 'Successfully Imported Account:',
             text4: 'Repeated Account:',
             text5: 'Failed Import Account:',
+            text6: 'ID Format Error',
             unit: '',
             error1: 'Found repeated accounts',
             error2: 'Duplicate invitations or account not found'
@@ -152,5 +156,26 @@ export default {
     },
     saveWarning:'Reminder',
     warningCnt:'The the current space data is not yet saved. If you leave, the modified data will not be retained!',
-    leaveText:'Exit'
+    leaveText:'Exit',
+    transferTitle:'Transfer Administratort Status',
+    transferTo:'Transfer to:',
+    transferTips1:'Please select the teacher to whom you want to transfer your administrator status?',
+    transferTips2:'You cannot transfer your administrator status to yourself',
+    trOk:'Transfer successfully',
+    trErr:'Failed to transfer',
+    trOkContent:'Your administrator status will expire after you log out',
+    peopleNum:'No. Of People:',
+    peopleUnit:'',
+    addMember:'Add Member',
+    noTeacher:'No teacher yet',
+    rmvTch:'Remove Teacher',
+    rmvTchContent:'Do you confirm remove ',
+    yes:'Yes',
+    no:'No',
+    addOk:'Add successfully',
+    addErr:'Failed to add',
+    rmvOk:'Remove successfully',
+    rmvErr:'Failed to remove',
+    groupInfoErr:'Failed to search for the group',
+    delGroup:'Delete Pedagogical Research Team',
 }

+ 3 - 3
TEAMModelOS/ClientApp/src/locale/lang/en-US/totalAnalysis.js

@@ -90,7 +90,7 @@ export default {
     module3: 'Question Analysis',
     module4: 'Key Concept Mastery',
     module5: 'Cognitive Level Mastery',
-    exportTable: 'Export Table',
+    exportTable: 'Export',
     currentSubject: 'Current Subject',
     goExamList: 'View More Assessments',
 
@@ -252,9 +252,9 @@ export default {
     ql_text1: 'Total Score',
     ql_text2: 'Single Answer Question',
     ql_text3: 'Multiple Answers Question',
-    ql_text4: 'True-false Question',
+    ql_text4: 'True-False Question',
     ql_text5: 'Cloze Question',
-    ql_text6: 'Short Answer Question',
+    ql_text6: 'Writing Question',
     ql_text7: 'Question Set',
     ql_text8: ' points',
     ql_text9: 'View Answer and Explanation',

+ 2 - 1
TEAMModelOS/ClientApp/src/locale/lang/en-US/user.js

@@ -4,7 +4,7 @@ export default{
     noSet:'Not set',
     edit:'Edit',
     setting:'Set',
-    psw:'Password',
+    psw:'Password',
     mobile:'Phone',
     email:'Email',
     pswErr1:'The passwords you entered do not match',
@@ -36,6 +36,7 @@ export default{
     cancel:'Cancel',
     toStudent:'Switching to Student',
     toArea:'Go To District Platform',
+	toSchool:'Go To School Platform',
     schoolMgt:'School Management',
     systemSet:'System Settings',
 }

+ 7 - 2
TEAMModelOS/ClientApp/src/locale/lang/en-US/utils.js

@@ -5,8 +5,13 @@ export default {
 	fileReadFail:'There is test data reading failure!',
 	uploadLoading:'Uploading...',
 	choose:"Select",
-	draw:'Mark',
-	text:'Text input',
+	draw:'Draw',
+	arrow:'Arrow',
+	circle:'Circle',
+	rect:'Quadrilateral',
+	star:'Star',
+	upload:'Upload Image',
+	text:'Text Input',
 	clear:'Clear',
 	undo:'Undo',
 	close:'Close',

+ 1 - 1
TEAMModelOS/ClientApp/src/locale/lang/en-US/vote.js

@@ -49,7 +49,7 @@ export default {
 		editSuc:'Edit successfully',
 		addSuc:'Add successfully',
 		noCompleteTip:'Please fill in the information completely',
-		noOptionTip:'The number of voting options cannot be zero!',
+		noOptionTip:'Voting options cannot be empty!',
 		attachmentMaxTip:'Maximum of 5 attachments can be uploaded',
 		optionNumsTip:'Maximum of 10 options only',
 		noMatchDataTip:'No matching data',

+ 20 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-CN/cusMgt.js

@@ -10,6 +10,8 @@ export default {
     cNameHolder:'请输入课程名称',
     cusCode:'课程编码',
     codeHolder:'请输入课程编码',
+    cusDesc:'课程描述',
+    descHolder:'请输入课程描述',
     cusPd:'课程学段',
     pdHolder:'请选择学段',
     cusSubject:'课程学科',
@@ -32,7 +34,7 @@ export default {
     addErr:'添加成功!',
     editOk:'修改成功!',
     editErr:'修改失败!',
-    formTips:'请先完善信息,再保存!',
+    formTips:'请检查课程信息!',
     noSchool:'尚未加入学校,没有学校数据',
     sltCusTips:'请选择课程',
 
@@ -110,6 +112,9 @@ export default {
     createTips1:'温馨提示:您(已加入学校)可以挑选学校学生加入课程或让学生通过输入课程邀请码、扫描课程二维码、课程链接方式主动加入课程。',
     createTips2:'温馨提示:您(暂未加入学校)可让学生通过输入课程邀请码、扫描课程二维码、课程链接方式主动加入课程。',
     renameListTitle:'修改名称',
+    selectListTips:'请选择名单',
+    alreadyExist:'已在课程名单',
+    listAPIErr:'名单列表获取失败',
     //ManageClass.vue
     classLabel:'班级:',
     stuCount:'学生人数:',
@@ -146,6 +151,14 @@ export default {
     groupUnit:'组',
     stuNameList:'学生名单',
     saveGroup:'保存分组',
+    setAvatar:'设置头像',
+    stuNameLabel:'姓名:',
+    reupload:'重新上传',
+    uploadAvatar:'上传头像',
+    uploadTips:'请上传头像',
+    setOk:'设置成功',
+    setErr:'设置失败',
+    uploadErr:'头像上传失败',
     
     //NewCusMgt.vue
     schdTable:'课表模式',
@@ -157,6 +170,10 @@ export default {
     cusTime:'课程时段',
     saveLabel:'保存变更',
     addStuList:'添加名单',
+    addListType:'方式',
+    addListType1:'新建名单',
+    addListType2:'选择已有名单',
+    listLabel:'名单',
     removeList:'移除名单',
     addrLabel:'上课教室:',
     nameLabel:'班级名单:',
@@ -197,6 +214,8 @@ export default {
     remvTeaTitle:'移除授课老师',
     remvTeaContent:'是否确认移除',
     gradeLabel:'年级',
+    cusNoRepeat:'课程编码重复',
+    cusNameRepeat:'课程名称重复',
 
     //MgtStuList.vue
     nameList:'名单',

+ 8 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-CN/home.js

@@ -45,5 +45,12 @@ export default{
     noNotice:'暂无公告',
     noInfo:'暂无推送',
     schoolLabel:'校本',
-    privateLabel:'个人'
+    privateLabel:'个人',
+    mon:'一',
+    tues:'二',
+    wed:'三',
+    thur:'四',
+    fri:'五',
+    sat:'六',
+    sun:'日'
 }

+ 2 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-CN/http.js

@@ -2,7 +2,8 @@ export default{
     error500:'服务器错误!',
     error401:'登录状态已过期!请重新登录!',
     error404:'未访问到API地址!',
-	error:'API异常!',
+	error400:'请求异常,请稍后重试!',
+	error:'网络异常,请稍后重试!',
 	loading:'加载中',
 	error403:'授权过期或授权异常,请稍后重试!'
 }

+ 4 - 0
TEAMModelOS/ClientApp/src/locale/lang/zh-CN/index.js

@@ -38,6 +38,8 @@ import notice from './notice'
 import answerSheet from './answerSheet'
 import tip from './tip'
 import selflearn from './selflearn'
+import notify from './notify'
+import jyzx from './jyzx';
 export default {
   schoolBaseInfo,
   classMgmt,
@@ -79,6 +81,8 @@ export default {
   answerSheet,
   tip,
   selflearn,
+  notify,
+  jyzx,
   test: '测试',
   formConfigP: {
     input: '请输入',

+ 202 - 0
TEAMModelOS/ClientApp/src/locale/lang/zh-CN/jyzx.js

@@ -0,0 +1,202 @@
+export default{
+    common: {
+        theme: "话题",
+        content: "内容",
+        reply: "回复",
+        comment: "评论回复",
+        report: "举报",
+        sure: "确定",
+        cancel: "取消",
+        delete: "删除",
+        complete: "已完成",
+        loadTime: "上传时间",
+        action: "操作",
+        seeEvaluate: "查看评价",
+        school: "校",
+        area: "区",
+        typeSch: "校级",
+        typeArea: "区级",
+        point: "能力点",
+        pointName: "能力点名称",
+        dimension: "维度",
+        message: "请选择举报类型:",
+        success1: "回复成功",
+        success2: "举报成功",
+        success3: "删除成功",
+        error: "删除失败",
+    },
+    // 线上研修
+    online: {
+        checkedPoint: "已选能力点",
+        addPoint: "增加能力点",
+        compulsory: "必修",
+        elective: "选修",
+        studyTime: "学时",
+        chapter: "章节",
+        resources: "有关联资源",
+        relResources: "关联资源",
+        relTopic: "关联话题",
+        study: "您已学习:",
+        time: "/20学时",
+        tips: "必修能力点已为您默认勾选!点击确定后就可开始学习",
+        type: "状态",
+        no: "标号",
+        environment: "所属环境",
+        message1: "增加能力点成功",
+        message2: "已学完本章节",
+        message3: "该能力点已学完",
+        placeholder1: "发起新的话题",
+        release: "发布",
+        relSucess: "话题发布成功",
+    },
+    // 校本研修
+    offline: {
+        activity: "研修活动",
+        info: "详细信息",
+        creator: "创建者",
+        noPeople: "无",
+        joinNum: "参与人数",
+        actTime: "活动时间",
+        target: "学习对象",
+        basicInfo: "基础信息",
+        studyTar: "研修目标",
+        address: "培训地点",
+        speaker: "主讲人",
+        type: "类型",
+        studyTime: "学时",
+        homework: "作业",
+        hwName: "作业名称",
+        hwDes: "作业描述",
+        hwUpload: "上传作业",
+        againLoad: "重新上传",
+        question: "问卷",
+        queName: "问卷名称",
+        queDes: "问卷描述",
+        queAnswer: "作答问卷",
+        feedback: "问卷反馈",
+        answered: "已作答",
+        exam: "评测",
+        examName: "评测名称",
+        examDes: "评测描述",
+        examAnswer: "作答评测",
+        answerExam: "评测作答",
+        right: "答对",
+        error: "答错",
+        topic: "题",
+        success1: "保存成功",
+        success2: "上传成功",
+        error1: "保存失败",
+        error1: "上传失败",
+        message1: "问卷未填写完,请继续填写",
+        message2: "评测未作答完,请继续作答",
+        placeholder1: "输入您的回答内容...",
+    },
+    // 应用考核
+    application: {
+        list: "成果列表",
+        discuss: "成果互评",
+        disNum: "互评次数",
+        disByMe: "自评结果",
+        disBySchool: "校评结果",
+        spotCheck: "专家抽查",
+        testByMe: "自我检测结果",
+        fine: "优秀",
+        qualified: "合格",
+        unqualified: "不合格",
+        noEvaluate: "未评价",
+        pass: "通过",
+        noPass: "未通过",
+        load: "上传文件",
+        againTest: "重新检测",
+        meTest: "自我检测",
+        score: "前往评分",
+        againScore: "重新评分",
+        evaName: "评价人",
+        evaType: "评测类型",
+        evaResult: "评价结果",
+        evaContent: "评价内容",
+        evaTime: "评价时间",
+        evaSchool: "校评",
+        evaOther: "互评",
+        evaMe: "自评",
+        admin: "管理员",
+        teacher: "老师",
+        noCheck: "未抽查",
+        teacherName: "教师姓名",
+    },
+    // 课堂实录
+    classRecord: {
+        myRecod: "我的课堂实录",
+        groupRecord: "同组课堂实录",
+        loadOK: "确认上传",
+        videoName: "视频名称",
+        fileSize: "文件大小",
+        loadDes: "选择或者拖拽文件到该区域进行上传",
+        loadAuth: "上传作者",
+        size: "大小",
+        see: "查看课程及评价",
+        evaName: "评价人",
+        evaType: "评测类型",
+        evaResult: "评价结果",
+        evaContent: "评价内容",
+        evaTime: "评价时间",
+        message1: "您确实要删除这条视频吗?",
+        message2: "上传失败",
+        message3: "上传成功",
+        message4: "删除成功",
+        message5: "删除失败",
+        message6: "暂无同组课堂实录",
+    },
+    // 讨论中心
+    discuss: {
+        addTopic: "新增话题",
+        topicType: "话题类型",
+        normal: "普通话题",
+        point: "能力点话题",
+        allTopic: "所有话题",
+        myTopic: "我的话题",
+        replyMe: "回复我的",
+        placeholder1: "请输入关键字",
+        placeholder2: "新的话题",
+        placeholder3: "请选择",
+        placeholder4: "请输入正文",
+        success1: "发表成功",
+        error1: "发表失败",
+        message1: "切换至我的话题",
+        message2: "切换至回复我的",
+    },
+    // 活动
+    activity: {
+        des: "描述",
+        voteArea: "投票区",
+        haveVoteNum: "可投票数",
+        submit: "提交投票",
+        startTime: "发起时间",
+        numExce: "投票数已超出",
+        incomplete: "未完成",
+        success1: "投票成功",
+        success2: "提交成功!",
+        message1: "您还未投票",
+        message2: "存在未作答的题目!",
+        message3: "已作答的问卷无法修改!",
+    },
+    homePage: {
+        totalTime: '总学时',
+        online: "线上研修",
+        offline: "线下研修",
+        application: "应用考核",
+        classRecord: "课堂实录",
+        studyPoint: "已学能力点",
+        okPoint: "检测合格能力点",
+        achievements: "成果提交",
+        area: "区级研修",
+        areaQue: "区级问卷",
+        areaVote: "区级投票",
+        school: "校本研修",
+        schoolQue: "校本问卷",
+        schoolVote: "校本投票",
+        time: "学时",
+        remarks1: "总学时:线上研修 + 校本研修 + 应用考核 + 课堂实录",
+        remarks2: "注:各指标达到要求后,多余学时不再计入总学时",
+    }
+}

+ 14 - 3
TEAMModelOS/ClientApp/src/locale/lang/zh-CN/learnActivity.js

@@ -22,7 +22,7 @@ export default{
         autoTips2:'此功能仅用于展示情景快速模拟教师评分数据,且分数为随机生成,仅供参考!',
         autoScore:'一键评分',
         autoAnswer:'一键作答',
-        evSubject:'测试学科:',
+        evSubject:'学科:',
         returnTop:'返回顶部',
         mockOk:'模拟成功',
         mockErr:'模拟失败',
@@ -97,7 +97,7 @@ export default{
         delPdContent:'是否确认删除',
         delOk:'删除成功',
         pdTips:'请先选择测试学段!',
-        defaultPaper:'(请先挑选或导入试卷)',
+        defaultPaper:'请先挑选试卷',
     },
     // ManualPaper.vue
     manual:{
@@ -191,7 +191,16 @@ export default{
         nextQu: '下一题',
         view:'查看',
         requesting:'数据请求中,请稍后......',
-        dataError:'数据请求异常,请刷新页面再试'
+        dataError:'数据请求异常,请刷新页面再试',
+        byStuMark:'按人批阅',
+        byQuMark:'按题批阅',
+        noStuAnswer:'学生暂未作答',
+        toggleQu:'切换题目',
+        viewMark:'查看批注',
+        markLabel:'批注',
+        saveScoreTitle:'保存分数',
+        saveScoreContent:'您修改的分数尚未保存,是否需要保存?',
+
     },
 
     //SimpleAnalysis.vue
@@ -309,6 +318,8 @@ export default{
         selectTeaTips:'请设置当前题块的阅卷老师',
         lastQu:'题目尚未完全分配',
         reapQu:'题目划块设置存在重复题目',
+        objectiveLabel:'(客)',
+        alreadyLabel:'(已)',
         //ByqU.vue & ByStu.vue
         quit:'退出阅卷',
         examName:'考试名称:',

+ 3 - 2
TEAMModelOS/ClientApp/src/locale/lang/zh-CN/login.js

@@ -7,7 +7,7 @@ export default {
         ies5: '醍摩豆云平台'
     },
     subTitle: {
-        IDLogin: '系统管理者、教师、学生与家长登入口',
+        IDLogin: '系统管理者或教师登入口',
         QRLogin: '使用HiTA或AClassONE扫描进行登入',
         schoolLogin: '由学校统一分配给学生使用的帐号登入口',
         selectType: '请选择您的身份进行登入',
@@ -82,5 +82,6 @@ export default {
     stuCli:'学生端',
     beian1:'蜀ICP备18027363号-1',
     beian2:'川公网安备 51010402000615',
-    copyright:'2021 HABOOK Group 醍摩豆'
+    copyright:'2021 HABOOK Group 醍摩豆',
+    loginErr:'登录信息异常,请重新登录'
 }

+ 36 - 0
TEAMModelOS/ClientApp/src/locale/lang/zh-CN/notify.js

@@ -0,0 +1,36 @@
+export default {
+    createTitle:'创建学校公告',
+    title:'标题',
+    titleHolder:'请输入标题',
+    notifyTime:'时间',
+    notifyContent:'内容',
+    saveText:'保存公告',
+    publishText:'发布公告',
+    cancelEdit:'取消编辑',
+    cancelPublish:'取消发布',
+    timeTips:'请设置公告时间',
+    contentTips:'请输入公告内容',
+    titleTips:'请输入公告标题',
+    reserveContent:'是否保留此次编辑?',
+    reserveOk:'保留',
+    reserveCancel:'不保留',
+    fullInfoTips:'请完善公告信息!',
+    search:'搜索',
+    draft:'草稿箱',
+    toCreate:'创建公告',
+    pending:'待发布',
+    going:'公告中',
+    finish:'已公告',
+    ntTime:'公告时间:',
+    delete:'删除',
+    view:'查看',
+    edit:'编辑',
+    noNotify:'暂无公告',
+    notifyDetail:'公告详情',
+    delNotifyTitle:'删除公告',
+    delNotifyContent:'是否确认删除',
+    yes:'是',
+    no:'否',
+    delOk:'删除成功',
+    delErr:'删除失败'
+}

+ 14 - 0
TEAMModelOS/ClientApp/src/locale/lang/zh-CN/schoolBaseInfo.js

@@ -99,6 +99,18 @@ export default {
   semesterName: '名称',
   semStartAt: '开始于',
   admission: '入学期',
+  setStartSem:'请设置入学期',
+  semTimeTips:'请设置学期开始日期',
+  semNameTips:'学期名称不能为空',
+  semStartTips:'请设置是否为入学期',
+  gradeNameTips:'请设置年级名称',
+  examNameTips:'请设置考试类型',
+  profNameTips:'请设置专业名称',
+  anaNameTips:'请完善学情设置',
+  campNameTips:'请输入校区名称',
+  subjectNameTips:'请输入学科/专业名称',
+  delTimeTitle:'删除时段',
+  delTimeContent:'是否确认删除当前时段?',
 
   // ClassroomSetting.vue
   classroomList: '教室列表',
@@ -114,6 +126,7 @@ export default {
   setGrade: '设置教室年级',
   setHiteachCode: 'HiTeach软件序号',
   addClassroom: '新增教室',
+  editClassroom: '修改教室',
   schoolPlan: '学校平面图与教室位置设置',
   uploadPlan: '上传平面图',
   hiteachList: 'HiTeach序号列表',
@@ -202,6 +215,7 @@ export default {
   addErr: '添加失败',
   cusTabel: '课程表',
   setCusTable: '设置课表',
+  fullRoomInfo:'请先完善教室信息!',
 
   //ClassMgt.vue
   className: '名称',

+ 36 - 32
TEAMModelOS/ClientApp/src/locale/lang/zh-CN/stuAccount.js

@@ -28,18 +28,19 @@ export default {
   tips2Content3: '确认批量删除',
   tips2Content4: '个学生',
   tips3: '请选择需要删除的学生!',
-  sltPdFirst:'请先选择学段',
-  sltGdFirst:'请先选择年级',
-  noClass:'此年级暂无班级',
-  noRelClass:'未关联班级',
-  resetPw:'重置密码',
-  semYear:'学年度:',
-  delOk:'删除成功',
-  isBottom:'已经到底了',
-  edit:'修改',
-  adminClass:'行政班',
-  teachClass:'教学班',
-  stuMgt:'学生管理',
+  sltPdFirst: '请先选择学段',
+  sltGdFirst: '请先选择年级',
+  noClass: '此年级暂无班级',
+  noRelClass: '未关联班级',
+  resetPw: '重置密码',
+  semYear: '学年度:',
+  delOk: '删除成功',
+  isBottom: '已经到底了',
+  edit: '修改',
+  adminClass: '行政班',
+  teachClass: '教学班',
+  stuMgt: '学生管理',
+  filterNoClass: '筛选未关联班级学生',
 
   // AddStudent.vue
   accountInfo: '账号资讯',
@@ -62,9 +63,9 @@ export default {
   chooseNum: '总计:',
   numUnit: '条',
   academicYear: '学级',
-  noMatch:'暂无匹配数据',
-  stuIdErr:'学生账号不能为空',
-  stuIdErr1:'学生账号只能包含数字',
+  noMatch: '暂无匹配数据',
+  stuIdErr: '学生账号不能为空',
+  stuIdErr1: '学生账号只能包含数字',
 
   // ImportStudent.vue
   importTitle: '导入学生名单',
@@ -88,20 +89,23 @@ export default {
   importInfo6: '可导入:',
   passwordTips: '未导入密码的学生将默认密码与账号相同',
   submitList: '建立账号',
-  lackAttr:'Excel栏位有缺:',
-  noSetNo:'沒有座号:',
-  gradeErr:'年级错误:',
-  attrWarning:'警告:Excel 內栏位不完整!',
-  setNoWarning:'警告:Excel 內的座位号重覆!',
-  idWarning:'警告:Excel 內账号重复!',
-  idFormatWarning:'错误:学生账号只能包含数字',
-  gradeWarning:'警告:年级错误',
-  setNoErr:"错误:座位号已在校內重复",
-  downloadText:'(下载名单模板)',
-  idRepErr:'账号已存在,将覆盖原有账号',
-  stuYearErr:'学生学级数据错误',
-  classYearErr:'班级年级错误',
-
+  lackAttr: 'Excel栏位有缺:',
+  noSetNo: '沒有座号:',
+  gradeErr: '年级错误:',
+  attrWarning: '警告:Excel 內栏位不完整!',
+  setNoWarning: '警告:Excel 內的座位号重覆!',
+  idWarning: '警告:Excel 內账号重复!',
+  idFormatWarning: '错误:学生账号只能包含数字',
+  gradeWarning: '警告:年级错误',
+  setNoErr: "错误:座位号已在校內重复",
+  downloadText: '(下载名单模板)',
+  idRepErr: '账号已存在,将覆盖原有账号',
+  stuYearErr: '学生学级数据错误',
+  classYearErr: '班级年级错误',
+  noFormatErr: '座号格式错误',
+  classFormatErr: '班级格式错误',
+  importOk: '导入成功',
+  
   // Authorization.vue
   authTitle: '服务授权管理',
   authTitle1: 'AClassOne智慧学伴服务授权',
@@ -112,7 +116,7 @@ export default {
   authNum: '各学段授权使用状态',
 
   //StudentList.vue
-  filterLabel:'筛选条件:',
-  noSchool:'暂未归属学校',
-  isBottom:'已经到底了'
+  filterLabel: '筛选条件:',
+  noSchool: '暂未归属学校',
+  isBottom: '已经到底了'
 }

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

@@ -5,7 +5,7 @@ export default {
         setting: '个人设定',
         logout: '登出',
         joinClass: '加入课程',
-        classPla: "请输入课程代码",
+        classPla: "请输入邀请码",
         exam: '评量',
         vote: '投票',
         survey: '问卷'
@@ -93,11 +93,11 @@ export default {
     todaydeadlineList: '今日截止活动提醒 ',
     endsToday: "今日",
     endsTodayTime: '截止',
-    addCourse: "输入课程代码,加入课程",
+    addCourse: "输入邀请码,加入课程",
     courseType: {
         success: "课程加入成功",
         warning: "重复加入课程!",
-        error: "课程代码不存在,请重新输入",
+        error: "邀请码不存在,请重新输入",
         api: "API错误",
     },
     coursesCardTitle: '我的课程清单',

+ 2 - 0
TEAMModelOS/ClientApp/src/locale/lang/zh-CN/system.js

@@ -4,6 +4,8 @@ export default {
     loading:'加载中',
     authErr:'权限不足!',
     development:'功能正在开发中',
+	goHome:'返回主页',
+	changePlat:'切换平台',
     menu:{
         school:'学校',
         private:'个人',

+ 5 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-CN/teachContent.js

@@ -60,5 +60,9 @@ export default {
   public: '公共资源',
   startDown: '开始下载',
   videoTips: '温馨提示:视频只支持MP4格式在线播放!',
-  spaceTips: '学校可用空间 = 学校总空间 - 分配给教师的空间'
+  spaceTips: '学校可用空间 = 学校总空间 - 分配给教师的空间',
+  common:'通用(未关联学段资源)',
+  renameTitle:'重命名',
+  fileName:'文件名:'
+
 }

+ 30 - 4
TEAMModelOS/ClientApp/src/locale/lang/zh-CN/teachermgmt.js

@@ -1,17 +1,20 @@
 export default {
     page:{
-        text1: '教师账号管理',
-        text2: '添加教师账号'
+        text1: '教师管理',
+        text2: '添加教师',
+        text3: '教研组'
     },
     blurryFilter: '通过关键字或账号资讯搜索',
     mulitSet: '批量权限管理',
     table: {
         text1: '基本',
         text2: '进阶',
+        text3: '系统管理员',
         th1: '醍摩豆ID',
         th2: '姓名',
         th3: '职称',
-        th4: '权限状态'
+        th4: '权限状态',
+        th5: '教研组',
     },
     authSet:{
         title:'权限设定',
@@ -139,6 +142,7 @@ export default {
             text3: '成功导入账号数',
             text4: '重复账号资料数',
             text5: '导入失败账号数',
+            text6: 'ID格式错误',
             unit: '笔',
             error1: '检索到相同账号',
             error2: '重复邀请或找不到账号'
@@ -152,5 +156,27 @@ export default {
     },
     saveWarning:'保存提醒',
     warningCnt:'当前空間数据尚未保存。如果离开,修改的数据将不会保存!',
-    leaveText:'离开'
+    leaveText:'离开',
+    transferTitle:'转让管理员',
+    transferTo:'转让给:',
+    transferTips1:'请选择需要将管理员身份转让给哪位老师?',
+    transferTips2:'不能将管理员身份转让给自己',
+    trOk:'转让成功',
+    trErr:'转让失败',
+    trOkContent:'您的管理员身份将在退出登录后失效',
+    peopleNum:'人数:',
+    peopleUnit:'人',
+    addMember:'添加成员',
+    noTeacher:'暂无老师',
+    rmvTch:'移除教师',
+    rmvTchContent:'是否确认移除',
+    yes:'是',
+    no:'否',
+    addOk:'添加成功',
+    addErr:'添加失败',
+    rmvOk:'移除成功',
+    rmvErr:'移除失败',
+    groupInfoErr:'教研组查询失败',
+    delGroup:'删除教研组',
+
 }

+ 1 - 0
TEAMModelOS/ClientApp/src/locale/lang/zh-CN/user.js

@@ -36,6 +36,7 @@ export default{
     cancel:'取消',
     toStudent:'切换为学生',
     toArea:'前往区级平台',
+	toSchool:'前往校级平台',
     schoolMgt:'学校管理',
     systemSet:'系统设置'
 }

+ 5 - 0
TEAMModelOS/ClientApp/src/locale/lang/zh-CN/utils.js

@@ -6,6 +6,11 @@ export default {
 	uploadLoading:'上传中...',
 	choose:"选择",
 	draw:'绘制',
+	arrow:'画箭头',
+	circle:'画圆',
+	rect:'画矩形',
+	star:'画五角星',
+	upload:'从文件选择图片上传',
 	text:'文本输入',
 	clear:'清屏',
 	undo:'撤销',

+ 1 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-CN/vote.js

@@ -49,7 +49,7 @@ export default {
 		editSuc:'修改成功',
 		addSuc:'添加成功',
 		noCompleteTip:'请将信息填写完整',
-		noOptionTip:'投票选项个数不能为空!',
+		noOptionTip:'投票选项不能为空!',
 		attachmentMaxTip:'最多只能上传5个附件',
 		optionNumsTip:'最多只能有10个选项',
 		noMatchDataTip:'未匹配数据',

+ 21 - 2
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/cusMgt.js

@@ -10,6 +10,8 @@ export default {
     cNameHolder: '請輸入課程名稱',
     cusCode: '課程編碼',
     codeHolder: '請輸入課程編碼',
+    cusDesc:'課程描述',
+    descHolder:'請輸入課程描述',
     cusPd: '課程學制',
     pdHolder: '請選擇學制',
     cusSubject: '課程學科',
@@ -19,7 +21,7 @@ export default {
     delContent: '是否確認刪除',
     codeErr1: '課程編碼不能為空',
     codeErr2: '課程編碼只能由字母和數位組成',
-    tableCol1: '號',
+    tableCol1: '號',
     tableCol2: '課程名稱',
     tableCol3: '課程編碼',
     tableCol4: '學制',
@@ -32,7 +34,7 @@ export default {
     addErr: '新增失敗!',
     editOk: '修改成功!',
     editErr: '修改失敗!',
-    formTips: '請先完善資訊,再儲存!',
+    formTips: '請檢查課程資訊!',
     noSchool: '尚未加入學校,沒有學校數據',
     sltCusTips: '請選擇課程',
 
@@ -110,6 +112,9 @@ export default {
     createTips1:'溫馨提示:您(已加入學校)可以挑選學校學生加入課程或讓學生通過輸入課程邀請碼、掃描課程二維碼、課程鏈接方式主動加入課程。 ',
     createTips2:'溫馨提示:您(暫未加入學校)可讓學生通過輸入課程邀請碼、掃描課程二維碼、課程鏈接方式主動加入課程。 ',
     renameListTitle:'修改名稱',
+    selectListTips:'請選擇名單',
+    alreadyExist:'已在課程名單',
+    listAPIErr:'名單列表獲取失敗',
     //ManageClass.vue
     classLabel: '班級:',
     stuCount: '學生人數:',
@@ -146,6 +151,14 @@ export default {
     groupUnit: '組',
     stuNameList: '學生名單',
     saveGroup: '儲存分組',
+    setAvatar:'設置頭像',
+    stuNameLabel:'姓名:',
+    reupload:'重新上傳',
+    uploadAvatar:'上傳頭像',
+    uploadTips:'請上傳頭像',
+    setOk:'設置成功',
+    setErr:'設置失敗',
+    uploadErr:'頭像上傳失敗',
 
     //NewCusMgt.vue
     schdTable: '課表模式',
@@ -157,6 +170,10 @@ export default {
     cusTime: '課程時段',
     saveLabel: '儲存變更',
     addStuList: '新增名單',
+    addListType:'方式',
+    addListType1:'新建名單',
+    addListType2:'選擇已有名單',
+    listLabel:'名單',
     removeList: '移除名單',
     addrLabel:'上課教室:',
     nameLabel:'班級名單:',
@@ -197,6 +214,8 @@ export default {
     remvTeaTitle: '移除授課老師',
     remvTeaContent: '是否確認移除',
     gradeLabel: '年級',
+    cusNoRepeat:'課程編碼重複',
+    cusNameRepeat:'課程名稱重複',
 
     //MgtStuList.vue
     nameList: '名單',

+ 8 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/home.js

@@ -45,5 +45,12 @@ export default {
     noNotice:'暫無公告',
     noInfo:'暫無推送',
     schoolLabel:'校本',
-    privateLabel:'個人'
+    privateLabel:'個人',
+    mon:'一',
+    tues:'二',
+    wed:'三',
+    thur:'四',
+    fri:'五',
+    sat:'六',
+    sun:'日'
 }

+ 2 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/http.js

@@ -2,7 +2,8 @@ export default {
 	error500: '伺務器錯誤!',
 	error401: '登入狀態已過期!請重新登入!',
 	error404: '未呼叫到API地址!',
-	error: 'API異常!',
+	error400:'請求異常,請稍後重試!',
+	error: '網絡異常,請稍後重試!',
 	loading: '處理中',
 	error403: '授權過期或授權异常,請稍後重試!'
 }

+ 4 - 0
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/index.js

@@ -38,6 +38,8 @@ import notice from './notice'
 import answerSheet from './answerSheet'
 import tip from './tip'
 import selflearn from './selflearn'
+import notify from './notify'
+import jyzx from './jyzx';
 export default {
   schoolBaseInfo,
   classMgmt,
@@ -79,6 +81,8 @@ export default {
   answerSheet,
   tip,
   selflearn,
+  notify,
+  jyzx,
   test: '測試',
   formConfigP: {
     input: '請輸入',

+ 202 - 0
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/jyzx.js

@@ -0,0 +1,202 @@
+export default{
+    common: {
+        theme: "話題",
+        content: "内容",
+        reply: "回覆",
+        comment: "評論回覆",
+        report: "舉報",
+        sure: "確定",
+        cancel: "取消",
+        delete: "刪除",
+        complete: "已完成",
+        loadTime: "上傳時間",
+        action: "操作",
+        seeEvaluate: "查看評價",
+        school: "校",
+        area: "區",
+        typeSch: "校級",
+        typeArea: "區級",
+        point: "能力點",
+        pointName: "能力點名稱",
+        dimension: "維度",
+        message: "請選擇舉報類型:",
+        success1: "回覆成功",
+        success2: "舉報成功",
+        success3: "刪除成功",
+        error: "刪除失敗",
+    },
+    // 线上研修
+    online: {
+        checkedPoint: "已選能力點",
+        addPoint: "增加能力點",
+        compulsory: "必修",
+        elective: "選修",
+        studyTime: "學時",
+        chapter: "章節",
+        resources: "有關聯資源",
+        relResources: "關聯資源",
+        relTopic: "關聯話題",
+        study: "您已學習:",
+        time: "/20學時",
+        tips: "必修能力點已為您默認勾選!點擊確定後就可開始學習",
+        type: "狀態",
+        no: "標號",
+        environment: "所屬環境",
+        message1: "增加能力點成功",
+        message2: "已學完本章節",
+        message3: "該能力點已學完",
+        placeholder1: "發起新的話題",
+        release: "發佈",
+        relSucess: "話題發佈成功",
+    },
+    // 校本研修
+    offline: {
+        activity: "研修活動",
+        info: "詳細資訊",
+        creator: "創建者",
+        noPeople: "無",
+        joinNum: "參與人數",
+        actTime: "活動時間",
+        target: "學習對象",
+        basicInfo: "基礎資訊",
+        studyTar: "研修目標",
+        address: "培訓地點",
+        speaker: "主講人",
+        type: "類型",
+        studyTime: "學時",
+        homework: "作業",
+        hwName: "作業名稱",
+        hwDes: "作業描述",
+        hwUpload: "上傳作業",
+        againLoad: "重新上傳",
+        question: "問卷",
+        queName: "問卷名稱",
+        queDes: "問卷描述",
+        queAnswer: "作答問卷",
+        feedback: "問卷迴響",
+        answered: "已作答",
+        exam: "評測",
+        examName: "評測名稱",
+        examDes: "評測描述",
+        examAnswer: "作答評測",
+        answerExam: "評測作答",
+        right: "答對",
+        error: "答錯",
+        topic: "題",
+        success1: "保存成功",
+        success2: "上傳成功",
+        error1: "保存失敗",
+        error1: "上傳失敗",
+        message1: "問卷未填寫完,請繼續填寫",
+        message2: "評測未作答完,請繼續作答",
+        placeholder1: "輸入您的回答内容...",
+    },
+    // 应用考核
+    application: {
+        list: "成果清單",
+        discuss: "成果互評",
+        disNum: "互評次數",
+        disByMe: "自評結果",
+        disBySchool: "校評結果",
+        spotCheck: "專家抽查",
+        testByMe: "自我檢測結果",
+        fine: "優秀",
+        qualified: "合格",
+        unqualified: "不合格",
+        noEvaluate: "未評估",
+        pass: "通過",
+        noPass: "未通過",
+        load: "上傳文件",
+        againTest: "重新檢測",
+        meTest: "自我檢測",
+        score: "前往評分",
+        againScore: "重新評分",
+        evaName: "評估人",
+        evaType: "評測類型",
+        evaResult: "評價結果",
+        evaContent: "評估內容",
+        evaTime: "評估時間",
+        evaSchool: "校評",
+        evaOther: "互評",
+        evaMe: "自評",
+        admin: "管理員",
+        teacher: "老師",
+        noCheck: "未抽查",
+        teacherName: "教師姓名",
+    },
+    // 课堂实录
+    classRecord: {
+        myRecod: "我的課堂實錄",
+        groupRecord: "同組課堂實錄",
+        loadOK: "確認上傳",
+        videoName: "影片名稱",
+        fileSize: "文件大小",
+        loadDes: "選擇或者拖拽檔案到該區域進行上傳",
+        loadAuth: "上傳作者",
+        size: "大小",
+        see: "查看課程及評估",
+        evaName: "評估人",
+        evaType: "評測類型",
+        evaResult: "評價結果",
+        evaContent: "評估內容",
+        evaTime: "評估時間",
+        message1: "您確實要刪除這條影片嗎?",
+        message2: "上傳失敗",
+        message3: "上傳成功",
+        message4: "刪除成功",
+        message5: "刪除失敗",
+        message6: "暫無同組課堂實錄",
+    },
+    // 讨论中心
+    discuss: {
+        addTopic: "新增話題",
+        topicType: "話題類型",
+        normal: "普通話題",
+        point: "能力點話題",
+        allTopic: "所有話題",
+        myTopic: "我的話題",
+        replyMe: "回覆我的",
+        placeholder1: "請輸入關鍵字",
+        placeholder2: "新的話題",
+        placeholder3: "請選擇",
+        placeholder4: "請輸入正文",
+        success1: "發表成功",
+        error1: "發表失敗",
+        message1: "切換至我的話題",
+        message2: "切換至回覆我的",
+    },
+    // 活动
+    activity: {
+        des: "描述",
+        voteArea: "投票區",
+        haveVoteNum: "可投票數",
+        submit: "提交投票",
+        startTime: "發起時間",
+        numExce: "投票數已超出",
+        incomplete: "未完成",
+        success1: "投票成功",
+        success2: "提交成功!",
+        message1: "您還未投票",
+        message2: "存在未作答的題目!",
+        message3: "已作答的問卷無法修改!",
+    },
+    homePage: {
+        totalTime: '總學時',
+        online: "線上研修",
+        offline: "線下研修",
+        application: "應用考核",
+        classRecord: "課堂實錄",
+        studyPoint: "已學能力點",
+        okPoint: "檢測合格能力點",
+        achievements: "成果提交",
+        area: "區級研修",
+        areaQue: "區級問卷",
+        areaVote: "區級投票",
+        school: "校本研修",
+        schoolQue: "校本問卷",
+        schoolVote: "校本投票",
+        time: "學時",
+        remarks1: "總學時:線上研修 + 校本研修 + 應用考核 + 課堂實錄",
+        remarks2: "注:各指標達到要求後,多餘學時不再計入總學時",
+    }
+}

+ 1 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/knowledge.js

@@ -8,7 +8,7 @@ export default {
 	block: '知識塊',
 	knowledgeP: '請輸入知識點名稱,必填項',
 	knowledgeWarning: '知識點名稱不能為空! ',
-	knowledgeRepeat: '已存在相同名稱知識點,請勿重覆添加!',
+	knowledgeRepeat: '已存在相同名稱知識點,請勿重覆新增!',
 	newBlock: '新增知識塊',
 	addBlock: '新增知識塊',
 	inputBlock: '輸入知識塊名稱',

+ 13 - 2
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/learnActivity.js

@@ -191,7 +191,16 @@ export default {
         nextQu: '下一題',
         view: '查看',
         requesting: '數據請求中,請稍後……',
-        dataError: '數據請求异常,請刷新頁面再試'
+        dataError: '數據請求異常,請刷新頁面再試',
+        byStuMark:'按人批閱',
+        byQuMark:'按題批閱',
+        noStuAnswer:'學生暫未作答',
+        toggleQu:'切換題目',
+        viewMark:'查看批註',
+        markLabel:'批註',
+        saveScoreTitle:'保存分數',
+        saveScoreContent:'您修改的分數尚未保存,是否需要保存? ',
+
     },
 
     //SimpleAnalysis.vue
@@ -309,6 +318,8 @@ export default {
         selectTeaTips: '請設置當前題塊的閱卷老師',
         lastQu: '題目尚未完全分配',
         reapQu: '題目劃塊設置存在重復題目',
+        objectiveLabel:'(客)',
+        alreadyLabel:'(已)',
         //ByqU.vue & ByStu.vue
         quit: '退出閱卷',
         examName: '考試名稱:',
@@ -344,7 +355,7 @@ export default {
         completeQu: '當前題目已閱完,請切換題目',
         completeStu: '當前完成當前學生評分,如果繼續評分,請切換學生',
         noAnswer: '未作答',
-        stuInfoErr: '學生信息異常',
+        stuInfoErr: '學生資訊異常',
         ummarkQu: '未閱題目',
         unmarkContent: '題目尚未評分,是否跳轉到對應題目繼續評分? ',
         finished: '已閱完',

+ 3 - 2
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/login.js

@@ -49,7 +49,7 @@ export default {
         error:{
             text1: '快速登入code 無效'
         },
-        text1: 'IES5智慧服務平台'
+        text1: 'IES 5智慧服務平台'
     },
     modal: {
         title: '選擇身份',
@@ -82,5 +82,6 @@ export default {
     stuCli:'學生端',
     beian1:'',
     beian2:'',
-    copyright:'2021 HABOOK Group 醍摩豆'
+    copyright:'2021 HABOOK Group 醍摩豆',
+    loginErr:'登錄資訊異常,請重新登錄'
 }

+ 36 - 0
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/notify.js

@@ -0,0 +1,36 @@
+export default {
+    createTitle:'創建學校公告',
+    title:'標題',
+    titleHolder:'請輸入標題',
+    notifyTime:'時間',
+    notifyContent:'內容',
+    saveText:'保存公告',
+    publishText:'發佈公告',
+    cancelEdit:'取消編輯',
+    cancelPublish:'取消發布',
+    timeTips:'請設置公告時間',
+    contentTips:'請輸入公告內容',
+    titleTips:'請輸入公告標題',
+    reserveContent:'是否保留此次編輯? ',
+    reserveOk:'保留',
+    reserveCancel:'不保留',
+    fullInfoTips:'請完善公告資訊! ',
+    search:'搜尋',
+    draft:'草稿箱',
+    toCreate:'創建公告',
+    pending:'待發布',
+    going:'公告中',
+    finish:'已公告',
+    ntTime:'公告時間:',
+    delete:'刪除',
+    view:'查看',
+    edit:'編輯',
+    noNotify:'暫無公告',
+    notifyDetail:'公告詳情',
+    delNotifyTitle:'刪除公告',
+    delNotifyContent:'是否確認刪除',
+    yes:'是',
+    no:'否',
+    delOk:'刪除成功',
+    delErr:'刪除失敗'
+}

+ 14 - 0
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/schoolBaseInfo.js

@@ -99,6 +99,18 @@ export default {
   semesterName: '名稱',
   semStartAt: '開始於',
   admission: '入學期',
+  setStartSem:'請設置入學期',
+  semTimeTips:'請設置學期開始日期',
+  semNameTips:'學期名稱不能為空',
+  semStartTips:'請設置是否為入學期',
+  gradeNameTips:'請設置年級名稱',
+  examNameTips:'請設置考試類型',
+  profNameTips:'請設置專業名稱',
+  anaNameTips:'請完善學情設置',
+  campNameTips:'請輸入校區名稱',
+  subjectNameTips:'請輸入學科/專業名稱',
+  delTimeTitle:'刪除時段',
+  delTimeContent:'是否確認刪除當前時段? ',
 
   // ClassroomSetting.vue
   classroomList: '教室清單',
@@ -114,6 +126,7 @@ export default {
   setGrade: '設定教室年級',
   setHiteachCode: 'HiTeach序號',
   addClassroom: '新增教室',
+  editClassroom: '修改教室',
   schoolPlan: '學校平面圖與教室位置設定',
   uploadPlan: '上傳平面圖',
   hiteachList: 'HiTeach序號清單',
@@ -202,6 +215,7 @@ export default {
   addErr: '新增失敗',
   cusTabel: '課程表',
   setCusTable: '設置課表',
+  fullRoomInfo:'請先完善教室資訊!',
 
   //ClassMgt.vue
   className: '名稱',

+ 1 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/selflearn.js

@@ -16,7 +16,7 @@ export default{
         privateContent:'個人資源',
         schoolContent:'校本資源',
         type:'類型:',
-        searchHolder:'搜',
+        searchHolder:'搜',
         quLabel:'題庫',
         testLabel:'試卷庫',
     }

+ 2 - 0
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/stuAccount.js

@@ -40,6 +40,7 @@ export default {
   adminClass:'編制班',
   teachClass:'選課班',
   stuMgt:'學生管理',
+  filterNoClass:'篩選未關聯班級學生',
 
   //AddStudent.vue
   accountInfo: '帳號資訊',
@@ -101,6 +102,7 @@ export default {
   idRepErr:'帳號已存在,將覆蓋原有帳號',
   stuYearErr:'學生學級數據錯誤',
   classYearErr:'班級年級錯誤',
+  importOk: '導入成功',
 
   //Authorization.vue
   authTitle: '服務授權管理',

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

@@ -243,7 +243,7 @@ export default {
         submitBVote: '提交投票',
         submitOKVote: '已投票',
         note: '請至少選擇一個選項,再進行投票! ',
-        warning: '投票失敗,請檢查投票信息! ',
+        warning: '投票失敗,請檢查投票資訊! ',
         warning2: '已超出最大投票數! ',
         voteRes: '投票結果',
         voteRecord: '投票記錄',

+ 2 - 0
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/system.js

@@ -4,6 +4,8 @@ export default {
     loading: '載入中',
     authErr:'權限不足! ',
     development:'功能正在開發中',
+	goHome:'返回主頁',
+	changePlat:'切換平臺',
     menu: {
         school: '學校',
         private: '個人',

+ 6 - 2
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/teachContent.js

@@ -59,6 +59,10 @@ export default {
   applyGrade:'適用年級',
   public:'公共資源',
   startDown:'開始下載',
-  videoTips:'溫馨提示:視頻只支持MP4格式在線播放! ',
-  spaceTips: '學校可用空間 = 學校總空間 - 分配給教師的空間'
+  videoTips:'溫馨提示:影片只支持MP4格式在線播放! ',
+  spaceTips: '學校可用空間 = 學校總空間 - 分配給教師的空間',
+  common:'通用(未關聯學段資源)',
+  renameTitle:'重命名',
+  fileName:'文件名:'
+
 }

+ 29 - 4
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/teachermgmt.js

@@ -1,17 +1,20 @@
 export default {
     page:{
-        text1: '教師帳號管理',
-        text2: '新增教師帳號'
+        text1: '教師管理',
+        text2: '新增教師',
+        text3: '教研組'
     },
     blurryFilter: '請輸入關鍵字或帳號資訊...',
     mulitSet: '批量權限管理',
     table: {
         text1: '基本',
         text2: '進階',
+        text3: '系統管理員',
         th1: '用戶編號',
         th2: '姓名',
         th3: '職稱',
-        th4: '權限狀態'
+        th4: '權限狀態',
+        th5: '教研組',
     },
     authSet:{
         title:'權限設定',
@@ -139,6 +142,7 @@ export default {
             text3: '成功匯入帳號數',
             text4: '重複帳號資料數',
             text5: '匯入失敗帳號數',
+            text6: 'ID格式錯誤',
             unit: '筆',
             error1: '搜尋到相同帳號',
             error2: '重複邀請或找不到帳號'
@@ -152,5 +156,26 @@ export default {
     },
     saveWarning:'儲存提醒',
     warningCnt:'當前空間資料尚未儲存。如果離開,所修改的資料將不會保留!',
-    leaveText:'離開'
+    leaveText:'離開',
+    transferTitle:'轉讓管理員',
+    transferTo:'轉讓給:',
+    transferTips1:'請選擇需要將管理員身份轉讓給哪位老師?',
+    transferTips2:'不能將管理員身份轉讓給自己',
+    trOk:'轉讓成功',
+    trErr:'轉讓失敗',
+    trOkContent:'您的管理員身份將在退出登錄後失效',
+    peopleNum:'人數:',
+    peopleUnit:'人',
+    addMember:'新增成員',
+    noTeacher:'暫無老師',
+    rmvTch:'移除教師',
+    rmvTchContent:'是否確認移除',
+    yes:'是',
+    no:'否',
+    addOk:'新增成功',
+    addErr:'新增失敗',
+    rmvOk:'移除成功',
+    rmvErr:'移除失敗',
+    groupInfoErr:'教研組查詢失敗',
+    delGroup:'刪除教研組',
 }

+ 2 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/user.js

@@ -22,7 +22,7 @@ export default{
     emailOk:'郵件發送成功',
     emailHasReg:'此郵箱已被註冊',
     emailErr:'郵件發送失敗',
-    checkTips:'請檢查信息是否正確',
+    checkTips:'請檢查資訊是否正確',
     updOk:'更新成功',
     codeErr:'驗證碼錯誤',
     nameWarning:'姓名不能為空',
@@ -36,6 +36,7 @@ export default{
     cancel:'取消',
     toStudent:'切換為學生',
     toArea:'前往區級平台',
+	toSchool:'前往校級平臺',
     schoolMgt:'學校管理',
     systemSet:'系統設置'
 }

+ 6 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/utils.js

@@ -5,7 +5,12 @@ export default {
 	fileReadFail: '有試題資料讀取失敗!',
 	uploadLoading: '上傳中…',
 	choose:"選擇",
-	draw: '畫記',
+	draw:'繪製',
+	arrow:'畫箭頭',
+	circle:'畫圓',
+	rect:'畫矩形',
+	star:'畫五角星',
+	upload:'從文件選擇圖片上傳',
 	text: '文字輸入',
 	clear: '清除',
 	undo: '還原',

+ 1 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/vote.js

@@ -49,7 +49,7 @@ export default {
 		editSuc: '修改成功',
 		addSuc: '加入成功',
 		noCompleteTip: '請將資訊填寫完整',
-		noOptionTip: '投票選項個數不能為空!',
+		noOptionTip: '投票選項不能為空!',
 		attachmentMaxTip: '最多只能上傳5個附件',
 		optionNumsTip: '最多只能有10個選項',
 		noMatchDataTip: '未匹配數據',