首頁 探索 說明
註冊 登入
TEAMMODEL
/
TEAMModelOS
5
4
複刻 0
Files 問題管理 172 合併請求 0 Wiki
瀏覽代碼

Merge branch 'develop6.0-tmd' of http://52.130.252.100:10000/TEAMMODEL/TEAMModelOS into develop6.0-tmd

Li 3 年之前
父節點
2c3ae1369a 92e3e661e5
當前提交
2a9dd0ad6a
共有 50 個文件被更改，包括 417 次插入 和 268 次删除
分割檢視 顯示文件統計
  1. 2 0
      TEAMModelOS/ClientApp/public/index.html
  2. 198 0
      TEAMModelOS/ClientApp/public/theme/e_theme_macarons.js
  3. 12 12
      TEAMModelOS/ClientApp/src/locale/lang/en-US/cusMgt.js
  4. 5 5
      TEAMModelOS/ClientApp/src/locale/lang/en-US/evaluation.js
  5. 13 13
      TEAMModelOS/ClientApp/src/locale/lang/en-US/homework.js
  6. 2 2
      TEAMModelOS/ClientApp/src/locale/lang/en-US/learnActivity.js
  7. 3 3
      TEAMModelOS/ClientApp/src/locale/lang/en-US/researchCenter.js
  8. 5 5
      TEAMModelOS/ClientApp/src/locale/lang/en-US/studentWeb.js
  9. 2 2
      TEAMModelOS/ClientApp/src/locale/lang/en-US/survey.js
  10. 10 10
      TEAMModelOS/ClientApp/src/locale/lang/en-US/syllabus.js
  11. 1 1
      TEAMModelOS/ClientApp/src/locale/lang/en-US/vote.js
  12. 2 2
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/classMgmt.js
  13. 4 4
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/cusMgt.js
  14. 2 2
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/global.js
  15. 1 1
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/home.js
  16. 2 2
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/homework.js
  17. 4 4
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/jyzx.js
  18. 16 16
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/learnActivity.js
  19. 1 1
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/notify.js
  20. 2 2
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/platform.js
  21. 1 1
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/schoolMgmt.js
  22. 2 2
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/stuAccount.js
  23. 6 6
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/studentWeb.js
  24. 5 5
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/survey.js
  25. 2 2
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/syllabus.js
  26. 1 1
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/system.js
  27. 1 1
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/teachermgmt.js
  28. 7 7
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/totalAnalysis.js
  29. 1 1
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/updModal.js
  30. 1 1
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/utils.js
  31. 2 2
      TEAMModelOS/ClientApp/src/locale/lang/zh-TW/vote.js
  32. 1 2
      TEAMModelOS/ClientApp/src/view/homepage/HomePage.vue
  33. 2 2
      TEAMModelOS/ClientApp/src/view/learnactivity/ExamMgt.less
  34. 3 17
      TEAMModelOS/ClientApp/src/view/learnactivity/echarts/AvgCompare.vue
  35. 1 11
      TEAMModelOS/ClientApp/src/view/learnactivity/echarts/CognitineLevel.vue
  36. 2 20
      TEAMModelOS/ClientApp/src/view/learnactivity/echarts/Comply.vue
  37. 3 7
      TEAMModelOS/ClientApp/src/view/learnactivity/echarts/CorrectRate.vue
  38. 1 3
      TEAMModelOS/ClientApp/src/view/learnactivity/echarts/KngPoint.vue
  39. 5 17
      TEAMModelOS/ClientApp/src/view/learnactivity/echarts/QuCount.vue
  40. 3 28
      TEAMModelOS/ClientApp/src/view/learnactivity/echarts/ScoreMatrix.vue
  41. 3 1
      TEAMModelOS/ClientApp/src/view/learnactivity/tabs/AnswerTable.less
  42. 1 2
      TEAMModelOS/ClientApp/src/view/learnactivity/tabs/AnswerTable.vue
  43. 20 5
      TEAMModelOS/ClientApp/src/view/learnactivity/tabs/DataView.less
  44. 3 3
      TEAMModelOS/ClientApp/src/view/learnactivity/tabs/DataView.vue
  45. 3 1
      TEAMModelOS/ClientApp/src/view/learnactivity/tabs/ExamPaper.less
  46. 1 2
      TEAMModelOS/ClientApp/src/view/learnactivity/tabs/ExamPaper.vue
  47. 25 18
      TEAMModelOS/ClientApp/src/view/teachcontent/ResBelong.vue
  48. 21 12
      TEAMModelOS/ClientApp/src/view/teachcontent/UploadModal.vue
  49. 2 0
      TEAMModelOS/Controllers/Client/HiTeachController.cs
  50. 1 1
      TEAMModelOS/Controllers/System/BlobController.cs

+ 2 - 0
TEAMModelOS/ClientApp/public/index.html
查看文件 

@@ -7,6 +7,7 @@
 
 		<link rel="icon" href="<%= BASE_URL %>favicon.ico">
 
 		<link id="theme" type="text/css" rel="stylesheet" href="<%= BASE_URL %>theme/dark-theme.css">
 
 		<title></title>
 
+		
 		<script>
 
 			MathJax = {
 
 				loader: {
 
@@ -46,6 +47,7 @@
 
 			document.write('<script id="echarts"  src="' + blobHost + '/0-public/js/echarts.js"><\/script>')
 
 			document.write('<script id="jspdf"  src="' + blobHost + '/0-public/js/jspdf.umd.min.js"><\/script>')
 
 			document.write('<script id="mathjax"  src="' + blobHost + '/0-public/js/tex-mml-svg.js"><\/script>')
 
+			document.write('<script id="e_theme_macarons"  src="<%= BASE_URL %>theme/e_theme_macarons.js"><\/script>')
 
 		</script>
 
 	</head>
 
 	<body>

+ 198 - 0
TEAMModelOS/ClientApp/public/theme/e_theme_macarons.js
查看文件 

@@ -0,0 +1,198 @@
 
+(function (root, factory) {
 
+    if (typeof define === 'function' && define.amd) {
 
+        // AMD. Register as an anonymous module.
 
+        define(['exports', 'echarts'], factory);
 
+    } else if (typeof exports === 'object' && typeof exports.nodeName !== 'string') {
 
+        // CommonJS
 
+        factory(exports, require('echarts'));
 
+    } else {
 
+        // Browser globals
 
+        factory({}, root.echarts);
 
+    }
 
+}(this, function (exports, echarts) {
 
+    var log = function (msg) {
 
+        if (typeof console !== 'undefined') {
 
+            console && console.error && console.error(msg);
 
+        }
 
+    };
 
+    if (!echarts) {
 
+        log('ECharts is not Loaded');
 
+        return;
 
+    }
 
+
 
+    var colorPalette = [
 
+        '#2ec7c9','#b6a2de','#5ab1ef','#ffb980','#d87a80',
 
+        '#8d98b3','#e5cf0d','#97b552','#95706d','#dc69aa',
 
+        '#07a2a4','#9a7fd1','#588dd5','#f5994e','#c05050',
 
+        '#59678c','#c9ab00','#7eb00a','#6f5553','#c14089'
 
+    ];
 
+
 
+
 
+    var theme = {
 
+        color: colorPalette,
 
+
 
+        title: {
 
+            textStyle: {
 
+                fontWeight: 'normal',
 
+                color: '#008acd'
 
+            }
 
+        },
 
+
 
+        visualMap: {
 
+            itemWidth: 15,
 
+            color: ['#5ab1ef','#e0ffff']
 
+        },
 
+
 
+        toolbox: {
 
+            iconStyle: {
 
+                normal: {
 
+                    borderColor: colorPalette[0]
 
+                }
 
+            }
 
+        },
 
+
 
+        tooltip: {
 
+            backgroundColor: 'rgba(50,50,50,0.5)',
 
+            axisPointer : {
 
+                type : 'line',
 
+                lineStyle : {
 
+                    color: '#008acd'
 
+                },
 
+                crossStyle: {
 
+                    color: '#008acd'
 
+                },
 
+                shadowStyle : {
 
+                    color: 'rgba(200,200,200,0.2)'
 
+                }
 
+            }
 
+        },
 
+
 
+        dataZoom: {
 
+            dataBackgroundColor: '#efefff',
 
+            fillerColor: 'rgba(182,162,222,0.2)',
 
+            handleColor: '#008acd'
 
+        },
 
+
 
+        grid: {
 
+            borderColor: '#eee'
 
+        },
 
+
 
+        categoryAxis: {
 
+            axisLine: {
 
+                lineStyle: {
 
+                    color: '#008acd'
 
+                }
 
+            },
 
+            splitLine: {
 
+                lineStyle: {
 
+                    color: ['#eee']
 
+                }
 
+            }
 
+        },
 
+
 
+        valueAxis: {
 
+            axisLine: {
 
+                lineStyle: {
 
+                    color: '#008acd'
 
+                }
 
+            },
 
+            splitArea : {
 
+                show : true,
 
+                areaStyle : {
 
+                    color: ['rgba(250,250,250,0.1)','rgba(200,200,200,0.1)']
 
+                }
 
+            },
 
+            splitLine: {
 
+                lineStyle: {
 
+                    color: ['#eee']
 
+                }
 
+            }
 
+        },
 
+
 
+        timeline : {
 
+            lineStyle : {
 
+                color : '#008acd'
 
+            },
 
+            controlStyle : {
 
+                normal : { color : '#008acd'},
 
+                emphasis : { color : '#008acd'}
 
+            },
 
+            symbol : 'emptyCircle',
 
+            symbolSize : 3
 
+        },
 
+
 
+        line: {
 
+            smooth : true,
 
+            symbol: 'emptyCircle',
 
+            symbolSize: 3
 
+        },
 
+
 
+        candlestick: {
 
+            itemStyle: {
 
+                normal: {
 
+                    color: '#d87a80',
 
+                    color0: '#2ec7c9',
 
+                    lineStyle: {
 
+                        color: '#d87a80',
 
+                        color0: '#2ec7c9'
 
+                    }
 
+                }
 
+            }
 
+        },
 
+
 
+        scatter: {
 
+            symbol: 'circle',
 
+            symbolSize: 4
 
+        },
 
+
 
+        map: {
 
+            label: {
 
+                normal: {
 
+                    textStyle: {
 
+                        color: '#d87a80'
 
+                    }
 
+                }
 
+            },
 
+            itemStyle: {
 
+                normal: {
 
+                    borderColor: '#eee',
 
+                    areaColor: '#ddd'
 
+                },
 
+                emphasis: {
 
+                    areaColor: '#fe994e'
 
+                }
 
+            }
 
+        },
 
+
 
+        graph: {
 
+            color: colorPalette
 
+        },
 
+
 
+        gauge : {
 
+            axisLine: {
 
+                lineStyle: {
 
+                    color: [[0.2, '#2ec7c9'],[0.8, '#5ab1ef'],[1, '#d87a80']],
 
+                    width: 10
 
+                }
 
+            },
 
+            axisTick: {
 
+                splitNumber: 10,
 
+                length :15,
 
+                lineStyle: {
 
+                    color: 'auto'
 
+                }
 
+            },
 
+            splitLine: {
 
+                length :22,
 
+                lineStyle: {
 
+                    color: 'auto'
 
+                }
 
+            },
 
+            pointer : {
 
+                width : 5
 
+            }
 
+        }
 
+    };
 
+
 
+    echarts.registerTheme('macarons', theme);
 
+}));

+ 12 - 12
TEAMModelOS/ClientApp/src/locale/lang/en-US/cusMgt.js
查看文件 

@@ -114,10 +114,10 @@ export default {
 
     inviteInfo2: 'Course Name：',
 
     inviteInfo3: 'Course List：',
 
     inviteInfo4: 'Teacher：',
 
-    inviteInfo5: 'If you are already logged in to AClass ONE, quickly join the course at：',
 
+    inviteInfo5: 'Quickly join the course at：',
 
     inviteInfo6: 'Or log in to AClass ONE first here：',
 
-    inviteInfo7: 'Enter the course invitation code to join the course：',
 
-    inviteInfo8: '教師：',
 
+    inviteInfo7: 'And enter the course invitation code to join the course：',
 
+    inviteInfo8: 'Teacher：',
 
     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',
 
@@ -147,10 +147,10 @@ export default {
 
     listSchoolTips1: 'This list has students of ',
 
     listSchoolTips2: ', personal list cannot have cross-school students.',
 
     listSchoolTips3: 'Other',
 
-    qrcodeErr:'二維碼生成失敗',
 
-    edRdName:'修改課堂記錄名稱',
 
-    delAcTitle:'刪除活動記錄',
 
-    delAcContent:'活動記錄數據刪除後將無法找回，確認刪除當前活動記錄嗎？',
 
+    qrcodeErr: 'Failed to generate QR code',
 
+    edRdName: 'Change class record name',
 
+    delAcTitle: '刪除活動記錄',
 
+    delAcContent: '活動記錄數據刪除後將無法找回，確認刪除當前活動記錄嗎？',
 
     fvt:'收藏',
 
     unfvt:'取消收藏',
 
     fvtOk:'已添加到我的收藏',
 
@@ -372,10 +372,10 @@ export default {
 
         rcdLabel: 'Interaction Records',
 
         enote: 'E-Note',
 
         sokrateRpt: 'Sokrates Report',
 
-        dataCount: 'Data Statistics',
 
-        videoData:'視頻數據',
 
-        exportData:'導出數據',
 
-        noVideo:'當前課堂記錄沒有視頻數據',
 
+        dataCount: 'Statistical Data',
 
+        videoData: 'Video Data',
 
+        exportData: 'Export Data',
 
+        noVideo: 'No video data for this lesson record',
 
         allRcd: 'All Records',
 
         qustion: 'Pop Quiz',
 
         message: 'HiMessage',
 
@@ -404,6 +404,6 @@ export default {
 
         intUnit: 'time/person',
 
         optionCount: 'Option Distribution',
 
         tPushLabel: 'The teacher pushed a picture：',
 
-        noAns:'未答',
 
+        noAns: 'Not Answered',
 
     }
 
 }

+ 5 - 5
TEAMModelOS/ClientApp/src/locale/lang/en-US/evaluation.js
查看文件 

@@ -1,8 +1,8 @@
 
 export default {
 
-	fixTip1:'補充解析',
 
-	fixTip2:'是否將改動同步更新到試卷庫？',
 
-	currentItem:'當前試題',
 
-	emptyTip1:'為空，是否繼續保存？',
 
+	fixTip1: 'Supplement Explanation',
 
+	fixTip2: 'Are the changes updated to the exam file bank simultaneously？',
 
+	currentItem: "This question's",
 
+	emptyTip1: ' is empty, do you want to continue saving？',
 
 	noFilePaste: 'Pasting files is not supported',
 
 	saving: 'The exam file is being saved...',
 
 	choosePageItems: 'Select all questions in this page',
 
@@ -186,7 +186,7 @@ export default {
 
 		scoreTable: 'Exam File Point Allocation',
 
 		usePeriod: 'Applicable School System',
 
 		useGrade: 'Applicable Grade',
 
-		itemCount: 'Question Number',
 
+		itemCount: 'Question No.',
 
 		paperAnalysis: 'Exam File Analysis',
 
 		totalScore: 'Total Points',
 
 		score: '',

+ 13 - 13
TEAMModelOS/ClientApp/src/locale/lang/en-US/homework.js
查看文件 

@@ -1,16 +1,16 @@
 
 export default {
 
-	notPreview:'該文件暫不支持預覽，請保存活動後重試！',
 
-	chooseContent:'從站內資源挑選',
 
-	notFoundData:'未查詢到作答數據',
 
-	copyAc:'復製活動',
 
-	modifyAcName:'修改活動名稱',
 
-	modifyAcTime:'修改活動結束時間',
 
-	modifyAcNameTip:'請輸入活動名稱',
 
-	modifyAcTimeTip:'請選擇活動結束時間',
 
-	noEndTimeTip:'請選擇活動結束時間！',
 
-	endTitle:'結束活動',
 
-	endTip:'是否立即結束活動',
 
-	endSuc:'活動已結束',
 
+	notPreview: '該文件暫不支持預覽，請保存活動後重試！',
 
+	chooseContent: '從站內資源挑選',
 
+	notFoundData: '未查詢到作答數據',
 
+	copyAc: '復製活動',
 
+	modifyAcName: 'Change Name',
 
+	modifyAcTime: 'Modify Ending Time',
 
+	modifyAcNameTip: 'Please enter the name',
 
+	modifyAcTimeTip: 'Please select the ending time',
 
+	noEndTimeTip: 'Please select the ending time！',
 
+	endTitle: '結束活動',
 
+	endTip: 'Do you want to end this activity now?',
 
+	endSuc: 'The activity has ended',
 
 	noAttachments:'No attachments uploaded',
 
 	noSaveTip:'The current activity is not saved, leaving will automatically remove the activity, do you want to continue?',
 
 	noFindTip:'No current activity found！',
 
@@ -63,7 +63,7 @@ export default {
 
 		allowFix: 'Allow supplement homework',
 
 		allowComment: 'Open student mutual evaluation',
 
 		allowFileType: 'Limit homework submission format',
 
-		mustSubmit:'必須上傳作業',
 
+		mustSubmit: 'Must upload a homework',
 
 		once: 'Once',
 
 		day: 'Daily',
 
 		week: 'Weekly',

+ 2 - 2
TEAMModelOS/ClientApp/src/locale/lang/en-US/learnActivity.js
查看文件 

@@ -29,7 +29,7 @@ export default {
 
         autoTips2: 'This function is only used to show the scenario and quickly simulate teacher grading data. Teacher grading are randomly generated for reference only!',
 
         autoScore: 'One Click Grading',
 
         autoAnswer: 'One Click Answering',
 
-        evSubject: '評量學科：',
 
+        evSubject: 'Assessing Subject：',
 
         returnTop: 'Back to the top',
 
         mockOk: 'Simulate successfully',
 
         mockErr: 'Failed to simulate',
 
@@ -151,7 +151,7 @@ export default {
 
         gradeLabel: 'Grade：',
 
         fitPd: 'Applicable School System',
 
         fitSubject: 'Applicable Subjects：',
 
-        quCount: 'Question Number：',
 
+        quCount: 'Question No.：',
 
         useCount: 'Number of Uses：',
 
         stdPaper: 'Selected Exam Files',
 
         stPaper: 'Select Exam Files',

+ 3 - 3
TEAMModelOS/ClientApp/src/locale/lang/en-US/researchCenter.js
查看文件 

@@ -5,9 +5,9 @@ export default{
 
 		block2: '教室物聯',
 
 		block3: '德育評價',
 
 		block4: '學情分析',
 
-		comingSoon: '即將上線',
 
-		loading: '加載中',
 
-		quit: '退出',
 
+		comingSoon: 'Coming Soon',
 
+		loading: 'Loading',
 
+		quit: 'Exit',
 
 		title2: '教學大數據',
 
 	},
 
     // 播放视频

+ 5 - 5
TEAMModelOS/ClientApp/src/locale/lang/en-US/studentWeb.js
查看文件 

@@ -184,8 +184,8 @@ export default {
 
     defaultClassTime: 'Wednesday 13:30-16:30 (Sections 7-9)',
 
     defaultClassPlace: 'F504 classroom in the fifth teaching building',
 
     todaydeadlineList: 'Ends Today',
 
-    endsToday: "Today",
 
-    endsTodayTime: 'ends today at 23:59',
 
+    endsToday: "Ends today at ",
 
+    endsTodayTime: '',
 
     addCourse: "Enter the course invitation code to join it",
 
     courseType: {
 
         success: "Join the course successfully",
 
@@ -381,7 +381,7 @@ export default {
 
         uploadSuccess: 'Upload successfully',
 
         uploadError: 'Failed to upload',
 
         uploadDes: 'After the activity is over, you can view the homework score and comments',
 
-        timeoutHint: 'The uploading time for assessment has ended. Thus, the score will be calculated as 0, or wait for the teacher to allow make-ups.',
 
+        timeoutHint: 'The homework has ended. Thus, the score will be calculated as 0, or wait for the teacher to allow make-ups.',
 
         timeoutApply: 'Teacher has issued late homework pass, so please upload them as soon as possible',
 
         contentPage: 'Homework Content',
 
         classComment: "Classmate Mutual Evaluation",
 
@@ -437,7 +437,7 @@ export default {
 
         previous: 'Previous',
 
         next: 'Next',
 
         submitBtn: 'Submit',
 
-        recentComments: "最近評語",
 
+        recentComments: "Recent Comment",
 
     },
 
     exam: {
 
         info: {
 
@@ -646,7 +646,7 @@ export default {
 
         message: {
 
             noWrong: "This assessment does not have incorrectly answered questions!",
 
             noStar: "This assessment does not have starred questions!",
 
-            nojoin: "您沒有加入該活動",
 
+            nojoin: "You did not join this activity",
 
         }
 
     },
 
     queNaire: {

+ 2 - 2
TEAMModelOS/ClientApp/src/locale/lang/en-US/survey.js
查看文件 

@@ -1,5 +1,5 @@
 
 export default {
 
-	noItemTip:'問卷內容不能為空',
 
+	noItemTip:'The content of the survey cannot be empty',
 
     list:'Survey Activity List',
 
 	pending:'Scheduled',
 
 	going:'In progress',
 
@@ -91,7 +91,7 @@ export default {
 
 		submit:'Submit Survey',
 
 		already:'You have successfully submitted the response record for this activity',
 
 		overtime:'This activity has ended',
 
-		noanswer: "該活動已結束，無法提交作答資訊",
 
+		noanswer: "The activity has ended and no response data can be submitted",
 
 	},
 
 	optionLimitTip:'Keep at least two options',
 
 	optionMaxTip:'Maximum of 9 options',

+ 10 - 10
TEAMModelOS/ClientApp/src/locale/lang/en-US/syllabus.js
查看文件 

@@ -1,12 +1,12 @@
 
 export default {
 
-	shareContentText1:'課綱分享',
 
-	shareContentText2:'分享者',
 
-	shareContentText3:'課綱名稱',
 
-	shareContentText4:'快速登入醍摩豆雲平臺IES接收分享',
 
-	receivedSuc1:'接收成功，可前往',
 
-	receivedSuc2:'IES5-個人課綱',
 
-	receivedSuc3:'進行查看',
 
-	receiveBtn:'確認接收',
 
+	shareContentText1: '課綱分享',
 
+	shareContentText2: '分享者',
 
+	shareContentText3: '課綱名稱',
 
+	shareContentText4: '快速登入醍摩豆雲平臺IES接收分享',
 
+	receivedSuc1: 'Received successfully, you can go to ',
 
+	receivedSuc2: ' IES 5 - Personal Syllabus ',
 
+	receivedSuc3: ' to view',
 
+	receiveBtn: 'Confirm Receive',
 
 	noMatchTerm:'No Match Semester',
 
 	emptyTip: 'Empty books are not available for sharing！',
 
 	chooseChapterTip: 'Please select the topic you want to save first！',
 
@@ -150,6 +150,6 @@ export default {
 
 	cancelShare: 'Cancel Share',
 
 	cancelTip1: 'Are you sure to cancel share with',
 
 	cancelTip2: '？',
 
-	getSyllabusErr: '獲取册別失敗',
 
-	getSyllabusErr1: '獲取課綱失敗'
 
+	getSyllabusErr: 'Failed to obtain book',
 
+	getSyllabusErr1: 'Failed to obtain syllabus'
 
 }

+ 1 - 1
TEAMModelOS/ClientApp/src/locale/lang/en-US/vote.js
查看文件 

@@ -1,5 +1,5 @@
 
 export default {
 
-	secret:'匿名',
 
+	secret: 'Anonymous',
 
 	allTeacher:'All Teachers',
 
 	noFindVote:'No current activity found！',
 
     noVoteData:'No polling data yet',

+ 2 - 2
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/classMgmt.js
查看文件 

@@ -70,7 +70,7 @@ export default {
 
     grade12: '十二年級',
 
     smartClass: '智慧教室',
 
     sokratesClass: '議課教室',
 
-    selfpace: '測驗模式',
 
+    selfpace: '評量模式',
 
     blankPageAdd: '新增檔案',
 
     pptImport: '匯入.pptx',
 
     powerclick: 'Power Click',
 
@@ -80,7 +80,7 @@ export default {
 
     ActIrsMode: '互動模式',
 
     edit: '編輯模式',
 
     ActPowerClickMode: 'Power Click',
 
-    ActSelfPaceMode: '測驗模式',
 
+    ActSelfPaceMode: '評量模式',
 
     ActDscMode: '遠距模式',
 
     ActElimitedMode: '挑戰賽模式',

+ 4 - 4
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/cusMgt.js
查看文件 

@@ -145,7 +145,7 @@ export default {
 
     cusInfoErr:'査詢課程資訊失敗',
 
     classList:'班級名單',
 
     listSchoolTips1:'當前名單已有',
 
-    listSchoolTips2:'學校學生，個人名單不能添加跨校學生。',
 
+    listSchoolTips2:'學校學生，個人名單不能增加跨校學生。',
 
     listSchoolTips3:'其他',
 
     qrcodeErr:'二維碼生成失敗',
 
     edRdName:'修改課堂記錄名稱',
 
@@ -373,9 +373,9 @@ export default {
 
         enote: '電子筆記',
 
         sokrateRpt: '蘇格拉底報告',
 
         dataCount: '數據統計',
 
-        videoData:'視頻數據',
 
-        exportData:'導出數據',
 
-        noVideo:'當前課堂記錄沒有視頻數據',
 
+        videoData: '影片數據',
 
+        exportData: '導出數據',
 
+        noVideo: '當前課堂記錄沒有影片數據',
 
         allRcd: '所有記錄',
 
         qustion: '即問即答',
 
         message: '飛訊',

+ 2 - 2
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/global.js
查看文件 

@@ -8,8 +8,8 @@ export default {
 
     evMode1: '線上自主評量',
 
     evMode2: '智慧教室評量',
 
     evMode3: '卷卡合一評量',
 
-    publishType1: '立即發佈',
 
-    publishType2: '定時發佈',
 
+    publishType1: '立即發布',
 
+    publishType2: '定時發布',
 
     testType: [
 
         {
 
             label: "選擇",

+ 1 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/home.js
查看文件 

@@ -14,7 +14,7 @@ export default {
 
     col4: '生本決策',
 
     col5: '全班互動',
 
     col6: '全班測驗',
 
-    ac1: '評量測驗',
 
+    ac1: '評量活動',
 
     ac2: '自主學習',
 
     ac3: '作業活動',
 
     ac4: '投票活動',

+ 2 - 2
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/homework.js
查看文件 

@@ -25,7 +25,7 @@ export default {
 
 	scoreHw:'批改作業',
 
 	noDes: '活動描述不能為空！',
 
 	list: '作業活動清單',
 
-	pending: '待發佈',
 
+	pending: '待發布',
 
 	going: '進行中',
 
 	finish: '已結束',
 
 	voteDetails: '作業詳情',
 
@@ -51,7 +51,7 @@ export default {
 
 		target: '作業對象',
 
 		privateClass: '個人班級',
 
 		schoolClass: '學校班級',
 
-		targetPlace: '請選擇作業發佈對象',
 
+		targetPlace: '請選擇作業發布對象',
 
 		noFoundText: '暫未建立班級',
 
 		time: '開始時間',
 
 		endTimePlace: '請選擇作業結束時間',

+ 4 - 4
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/jyzx.js
查看文件 

@@ -48,8 +48,8 @@ export default{
 
         message2: "已學完本章節",
 
         message3: "該能力點已學完",
 
         placeholder1: "發起新的話題",
 
-        release: "發佈",
 
-        relSucess: "話題發佈成功",
 
+        release: "發布",
 
+        relSucess: "話題發布成功",
 
         timeStudy: "學習時間",
 
         minute: "分鐘",
 
         lastStudy: "上次學習",
 
@@ -145,7 +145,7 @@ export default{
 
         score: "前往評分",
 
         againScore: "重新評分",
 
         evaName: "評估人",
 
-        evaType: "評測類型",
 
+        evaType: "評量類型",
 
         evaResult: "評價結果",
 
         evaContent: "評估內容",
 
         evaTime: "評估時間",
 
@@ -171,7 +171,7 @@ export default{
 
         size: "大小",
 
         see: "查看課程及評估",
 
         evaName: "評估人",
 
-        evaType: "評測類型",
 
+        evaType: "評量類型",
 
         evaResult: "評價結果",
 
         evaContent: "評估內容",
 
         evaTime: "評估時間",

+ 16 - 16
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/learnActivity.js
查看文件 

@@ -14,7 +14,7 @@ export default {
 
         delete: '刪除',
 
         edit: '編輯',
 
         createTime: '施測時間：',
 
-        pending: '待發佈',
 
+        pending: '待發布',
 
         going: '進行中',
 
         finish: '已結束',
 
         endTime: '結束時間：',
 
@@ -41,8 +41,8 @@ export default {
 
         deleteOk: '刪除成功',
 
         deleteErr: '刪除失敗',
 
         noJoin: '此帳號暫未加入任何學校！',
 
-        myEv: '我發佈的評量',
 
-        teaEv: '任課老師發佈的評量',
 
+        myEv: '我發布的評量',
 
+        teaEv: '任課老師發布的評量',
 
         markSetting: '閱卷助手',
 
         markData: '閱卷數據',
 
         ftStatus: '狀態：',
 
@@ -61,10 +61,10 @@ export default {
 
         hasDel: '此活動已被刪除',
 
         actionErr: '操作失敗',
 
         classInfoErr: '査詢班級資訊失敗',
 
-        evListErr: '査詢評測清單失敗',
 
-        exInfoErr: '査詢評測詳情失敗',
 
-        tst1:'當前評測使用',
 
-        tst2:'學校的名單，請切換到對應學校查看評測數據。',
 
+        evListErr: '査詢評量清單失敗',
 
+        exInfoErr: '査詢評量詳情失敗',
 
+        tst1: '當前評量使用',
 
+        tst2: '學校的名單，請切換到對應學校查看評量數據。',
 
         tst3:'切換學校',
 
         shareText1:'請登入醍摩豆雲平臺IES學習主頁，完成線上活動。',
 
         shareText2:'活動名稱：',
 
@@ -75,15 +75,15 @@ export default {
 
         shareText7:'或登入醍摩豆雲平臺IES學習主頁，進行線上活動：',
 
         shareText8:'掃碼進行線上活動',
 
         copy:'複製',
 
-        copyTitle:'複製評測',
 
-        copyContent:'確認複製當前評測嗎？',
 
-        copyContent1:'課中評測不能進行復製操作。'
 
+        copyTitle: '複製評量',
 
+        copyContent: '確認複製當前評量嗎？',
 
+        copyContent1: '課中評量不能進行復製操作。'
 
     },
 
 
     //建立評量學校/個人
 
     createEv: {
 
         createLabel: '建立評量',
 
-        publishEv: '發佈評量',
 
+        publishEv: '發布評量',
 
         return: '取消發布',
 
         baseInfo: '基礎資訊',
 
         evName: '評量名稱',
 
@@ -95,7 +95,7 @@ export default {
 
         cusLabel1: '學校課程',
 
         cusLabel2: '個人課程',
 
         evTarget: '施測對象',
 
-        publishType: '發佈方式',
 
+        publishType: '發布方式',
 
         startTime: '開始時間',
 
         sTimeHolder: '請選擇開始時間',
 
         endTime: '結束時間',
 
@@ -113,8 +113,8 @@ export default {
 
         errTips4: '請設定類別！',
 
         errTips5: '請設定施測類型！',
 
         errTips6: '請設定施測對象！',
 
-        errTips7: '請設定發佈方式！',
 
-        errTips8: '請設定發佈時間！',
 
+        errTips7: '請設定發布方式！',
 
+        errTips8: '請設定發布時間！',
 
         errTips9: '請設定結束時間！',
 
         errTips10: '請設定施測學制！',
 
         errTips11: '請設置進線生比例',
 
@@ -126,7 +126,7 @@ export default {
 
         paperWarning: '請挑選或匯入試卷！',
 
         paperWarning1: '還沒有試卷，請挑選或匯入試卷！',
 
         pdWarning: '請加入施測學科！',
 
-        publishOk: '評量發佈成功！',
 
+        publishOk: '評量發布成功！',
 
         togglePeriod: '切換學制',
 
         togglePdTip1: '您已加入',
 
         togglePdTip2: '的施測學科，如果現在切換學制會清空已選學科，確定切換學制嗎？',
 
@@ -290,7 +290,7 @@ export default {
 
         unanswer: '未作答',
 
         scored: '已評分',
 
         unscore: '未評分',
 
-        noPublish: '評量尚未發佈，暫無統計資料',
 
+        noPublish: '評量尚未發布，暫無統計資料',
 
         calcing: '成績數據結算中，',
 
         clickFresh: '點此重整',
 
         inCalc: '數據結算中，請稍後查看',

+ 1 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/notify.js
查看文件 

@@ -5,7 +5,7 @@ export default {
 
     notifyTime:'時間',
 
     notifyContent:'內容',
 
     saveText:'保存公告',
 
-    publishText:'發佈公告',
 
+    publishText:'發布公告',
 
     cancelEdit:'取消編輯',
 
     cancelPublish:'取消發布',
 
     timeTips:'請設置公告時間',

+ 2 - 2
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/platform.js
查看文件 

@@ -1,7 +1,7 @@
 
 export default {
 
     platform:'平台：',
 
-    addPlatform:'添加資源平台',
 
-    noPlatform:'暫未添加資源平台',
 
+    addPlatform:'新增資源平台',
 
+    noPlatform:'暫未新增資源平台',
 
     updAgain:'重新上傳',
 
     name:'名稱',
 
     nameHolder:'請輸入資源平台名稱',

+ 1 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/schoolMgmt.js
查看文件 

@@ -62,7 +62,7 @@ export default {
 
   text28: '地理',
 
   text29: '體育',
 
   text30: '舞蹈',
 
-  text31: '模擬測驗',
 
+  text31: '模擬評量',
 
   text32: '成績登錄',
 
   text33: '線上自主評量',
 
   text34: '合併活動',

+ 2 - 2
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/stuAccount.js
查看文件 

@@ -75,9 +75,9 @@ export default {
 
 	setNoErr1: '請設置學生班級',
 
 	setNoErr2: '座號在班級中重複',
 
 	sltStuTips: '請先選擇學生',
 
-	addOk: '添加成功',
 
+	addOk: '增加成功',
 
 	updOk: '修改成功',
 
-	addErr: '添加失敗',
 
+	addErr: '增加失敗',
 
 	updErr: '修改失敗',
 
 	sltClassTips: '請設置班級',
 
 	setNoErr: '學生座位號不能為空',

+ 6 - 6
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/studentWeb.js
查看文件 

@@ -280,7 +280,7 @@ export default {
 
         ]
 
     },
 
     latestNotification: '最新通知',
 
-    postAt: '發佈於',
 
+    postAt: '發布於',
 
     '______________': '______________',
 
     'eventView-title': '活動任務',
 
     nextTask: '下個活動',
 
@@ -329,8 +329,8 @@ export default {
 
         tryAgain: '詳讀教材，再試一次',
 
         nextUnit: '下一單元',
 
         goHome: '回到首頁',
 
-        quizRetries: '測驗重試次數',
 
-        crossUnitHint: '上個單元測驗尚未完成，請先完成方可進行本單元測驗',
 
+        quizRetries: '評量重試次數',
 
+        crossUnitHint: '上個單元評量尚未完成，請先完成方可進行本單元評量',
 
         timeoutHint: '課前預習活動時間已結束，仍可進行教材閱讀與練習，如於結束時間前未完成，相關成績可能受到影響。 '
 
     },
 
     vote: {
 
@@ -409,7 +409,7 @@ export default {
 
         placeholder1: "作業作答...",
 
         scoreNum: '分',
 
         grade: "評分",
 
-        time: "發佈時間",
 
+        time: "發布時間",
 
         tips1: "老師還未開始打分",
 
         tips2: "同學們還沒給你打分",
 
         content: "內容",
 
@@ -483,11 +483,11 @@ export default {
 
             previous: '上一題',
 
             next: '下一題',
 
             myAnswerSheet: '我的答題卡',
 
-            exitQuizhint: '離開測驗提示',
 
+            exitQuizhint: '離開評量提示',
 
             exitQuizhintD: "離開頁面，您已作答的數據不會保存，是否確認退出？",
 
             exitQuizhintD1: "離開頁面，系統將預設交卷，且無法再次作答，是否退出？",
 
             exitQuizhintDe: '系統檢測您尚未「交卷」，如您選擇「確定」,',
 
-            exitQuizhintDes: '則目前作答將不保留，下次需重新測驗',
 
+            exitQuizhintDes: '則目前作答將不保留，下次需重新作答',
 
             exitQuizhint1: "系統將預設交卷，且",
 
             exitQuizhint2: "無法再次作答",
 
             cancel: '取消',

+ 5 - 5
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/survey.js
查看文件 

@@ -1,11 +1,11 @@
 
 export default {
 
 	noItemTip:'問卷內容不能為空',
 
 	list: '問卷活動清單',
 
-	pending: '待發佈',
 
+	pending: '待發布',
 
 	going: '進行中',
 
 	finish: '已結束',
 
 	surveyDetails: '問卷詳情',
 
-	undo: '撤銷發佈',
 
+	undo: '撤銷發布',
 
 	edit: '編輯問卷',
 
 	save: '儲存問卷',
 
 	cancelEdit: '取消編輯',
 
@@ -21,8 +21,8 @@ export default {
 
 	getDataFailTip: '資料取得失敗！',
 
 	deletesurvey: '刪除問卷',
 
 	deleteConfirmTip: '確認刪除該問卷活動？',
 
-	cancelSurvey: '取消發佈',
 
-	cancelConfirmTip: '確認取消發佈該問卷活動？',
 
+	cancelSurvey: '取消發布',
 
+	cancelConfirmTip: '確認取消發布該問卷活動？',
 
 	deleteSuc: '刪除成功',
 
 	deleteFail: '刪除失敗',
 
 	doSuc: '操作成功',
 
@@ -34,7 +34,7 @@ export default {
 
 		target: '問卷對象',
 
 		privateClass: '個人班級',
 
 		schoolClass: '學校班級',
 
-		targetPlace: '請選擇問卷發佈對象',
 
+		targetPlace: '請選擇問卷發布對象',
 
 		noFoundText: '暫未建立班級',
 
 		time: '開始時間',
 
 		endTimePlace: '請選擇問卷結束時間',

+ 2 - 2
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/syllabus.js
查看文件 

@@ -4,7 +4,7 @@ export default {
 
 	shareContentText3:'課綱名稱',
 
 	shareContentText4:'快速登入醍摩豆雲平臺IES接收分享',
 
 	receivedSuc1:'接收成功，可前往',
 
-	receivedSuc2:'IES5-個人課綱',
 
+	receivedSuc2:'IES 5-個人課綱',
 
 	receivedSuc3:'進行查看',
 
 	receiveBtn:'確認接收',
 
 	noMatchTerm: '無匹配學期',
 
@@ -150,6 +150,6 @@ export default {
 
 	cancelShare: '取消分享',
 
 	cancelTip1: '確認取消對',
 
 	cancelTip2: '的分享？',
 
-	getSyllabusErr: '獲取册別失敗',
 
+	getSyllabusErr: '獲取冊別失敗',
 
 	getSyllabusErr1: '獲取課綱失敗'
 
 }

+ 1 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/system.js
查看文件 

@@ -34,7 +34,7 @@ export default {
 
         evAna: '學情分析',
 
         scAna: '統計數據',
 
         scAc: '學校活動',
 
-        scEv: '評量測驗',
 
+        scEv: '評量活動',
 
         scVote: '投票活動',
 
         scQu: '問卷調查',
 
         classCus: '班級課程',

+ 1 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/teachermgmt.js
查看文件 

@@ -110,7 +110,7 @@ export default {
 
         'scboard': '查看統計數據',
 
         'schoolAc': '學校活動',
 
         'schoolAc-read': '查看學校活動',
 
-        'schoolAc-upd': '發佈學校活動',
 
+        'schoolAc-upd': '發布學校活動',
 
         'trainAll': '研修中心',
 
         'train-read': '查看研修中心數據',
 
         'train-upd': '管理研修中心數據'

+ 7 - 7
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/totalAnalysis.js
查看文件 

@@ -29,14 +29,14 @@ export default {
 
 	text7: '參與人數',
 
 	text8: '考試日期',
 
 	text9: '無',
 
-	condition1: '關注學制',
 
-	condition2: '關注年級',
 
-	condition3: '學年期',
 
+	condition1: '學制',
 
+	condition2: '年級',
 
+	condition3: '學期',
 
 	condition4: '評量類型',
 
 	condition5: '評量範圍',
 
 	condition6: '評量模式',
 
 	condition7: '評量學科',
 
-	condition8: '發佈年份',
 
+	condition8: '發布年份',
 
 	// totalIndex.vue
 
 	ti_title1: '基本資料統計',
 
 	ti_title2: '學情分析',
 
@@ -53,8 +53,8 @@ export default {
 
 	ti_text7: '模擬考',
 
 	ti_text8: '小考',
 
 	ti_text9: '其它',
 
-	ti_text10: '模擬測驗',
 
-	ti_text11: '診斷測驗',
 
+	ti_text10: '模擬評量',
 
+	ti_text11: '診斷評量',
 
 	echarts_text1: '最高值',
 
 	echarts_text2: '最低值',
 
 	echarts_text3: '平均值',
 
@@ -81,7 +81,7 @@ export default {
 
 	base_score: '分數',
 
 
 	// ExamList.vue
 
-	newest: '最新測驗',
 
+	newest: '最新評量',
 
 	more: '查看更多',
 
 
 	// index.vue

+ 1 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/updModal.js
查看文件 

@@ -27,6 +27,6 @@
 
     posterErr:'影片封面上傳失敗',
 
     hasExist:'雲端已存在',
 
     sltPeriod:'請至少選擇一個學段',
 
-    sltFile:'請添加文件後上傳',
 
+    sltFile:'請選擇文件後再上傳',
 
     formatWarning:'不支持截取封面和在線播放'
 
 }

+ 1 - 1
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/utils.js
查看文件 

@@ -32,7 +32,7 @@ export default {
 
 	student: '學生',
 
 	accountManage: '帳號管理',
 
 	courseNum: '任教課程數',
 
-	activityNum: '發佈活動數',
 
+	activityNum: '發布活動數',
 
 	classNum: '任教班級數',
 
 	full: '已滿',
 
 	spaceStatus: '個人空間狀態',

+ 2 - 2
TEAMModelOS/ClientApp/src/locale/lang/zh-TW/vote.js
查看文件 

@@ -4,7 +4,7 @@ export default {
 
 	noFindVote:'未查詢到當前活動！',
 
 	noVoteData:'暫無投票數據',
 
 	list: '投票活動清單',
 
-	pending: '待發佈',
 
+	pending: '待發布',
 
 	going: '進行中',
 
 	finish: '已結束',
 
 	voteDetails: '投票詳情',
 
@@ -30,7 +30,7 @@ export default {
 
 		target: '投票對象',
 
 		privateClass: '個人班級',
 
 		schoolClass: '學校班級',
 
-		targetPlace: '請選擇投票發佈對象',
 
+		targetPlace: '請選擇投票發布對象',
 
 		noFoundText: '暫未建立班級',
 
 		time: '開始時間',
 
 		endTimePlace: '請選擇投票結束時間',

+ 1 - 2
TEAMModelOS/ClientApp/src/view/homepage/HomePage.vue
查看文件 

@@ -280,8 +280,7 @@ export default {
 
             noticeList: [],
 
             viewNoticeStatus: false,
 
             noticeIndex: 0,
 
-            strokeColor: ['#3381E8', '#19be6b',],
 
-            strokeColor1: ['#00ffa0', '#19be6b'],
 
+            strokeColor: '#2ec7c9',
 
             onlineInfo: {
 
                 name: this.$t("jyzx.homePage.online"),
 
                 total: 20,

+ 2 - 2
TEAMModelOS/ClientApp/src/view/learnactivity/ExamMgt.less
查看文件 

@@ -119,9 +119,9 @@
 
     height: 45px;
 
     line-height: 45px;
 
     box-shadow: 0 2px 5px #e9e9e9;
 
-    margin-bottom: 5px;
 
     padding-left: 10px;
 
     color: @second-textColor;
 
+    position: relative;
 
 
     .edit-evaluation {
 
         float: right;
 
@@ -150,7 +150,7 @@
 
 .evaluation-base-info {
 
     width: 100%;
 
     height: ~"calc(100% - 55px)";
 
-    padding-left: 10px;
 
+    // padding-left: 10px;
 
     background: #f6f6f6;
 
 }
 
 .tags-wrap{

+ 3 - 17
TEAMModelOS/ClientApp/src/view/learnactivity/echarts/AvgCompare.vue
查看文件 

@@ -40,20 +40,6 @@ export default {
 
                 data: []
 
             },
 
             defOption: {
 
-                color: [
 
-                    "#4ECDC4",
 
-                    "#F72459",
 
-                    "#F99406",
 
-                    "#075CD0",
 
-                    "#03C9A8",
 
-                    "#F7CA17",
 
-                    "#F2774B",
 
-                    "#67809F",
 
-                    "#BF55ED",
 
-                    "#1cc0f3",
 
-                    "#19be6b",
 
-                    "#9A1294",
 
-                ],
 
                 legend: {
 
                     right: 0,
 
                     top: 0,
 
@@ -64,7 +50,7 @@ export default {
 
                     "left": 'left',
 
                     "top": 0,
 
                     "textStyle": {
 
-                        "color": "#303030",
 
+                        // "color": "#303030",
 
                         fontSize: 15
 
                     }
 
                 },
 
@@ -109,7 +95,7 @@ export default {
 
         }
 
     },
 
     mounted() {
 
-        this.progressPie = this.$echarts.init(document.getElementById('ev-avg-compare'))
 
+        this.progressPie = this.$echarts.init(document.getElementById('ev-avg-compare'), 'macarons')
 
         // this.progressPie.setOption(this.newOption,true)
 
         let erd11 = elementResizeDetectorMaker()
 
         erd11.listenTo(document.getElementById("ev-avg-compare"), () => {
 
@@ -144,7 +130,7 @@ export default {
 
                 this.$nextTick(() => {
 
                     this.newOption = this._.cloneDeep(this.defOption)
 
                     if (!this.progressPie) {
 
-                        this.progressPie = this.$echarts.init(document.getElementById('ev-avg-compare'))
 
+                        this.progressPie = this.$echarts.init(document.getElementById('ev-avg-compare'), 'macarons')
 
                     }
 
                     //处理
 
                     this.pieData.forEach(item => {

+ 1 - 11
TEAMModelOS/ClientApp/src/view/learnactivity/echarts/CognitineLevel.vue
查看文件 

@@ -103,9 +103,8 @@ export default {
 
     },
 
     methods: {
 
         setMap() {
 
-            let myChart = this.$echarts.init(document.getElementById("filed" + this.id))
 
+            let myChart = this.$echarts.init(document.getElementById("filed" + this.id), 'macarons')
 
             let option = {
 
-                color: ["#5470C6", "#91CC75"],
 
                 title: {
 
                     text: this.$t('studentWeb.exam.chart.recognizePerformance'),
 
                     left: 'center',
 
@@ -114,10 +113,6 @@ export default {
 
                         fontSize: "14",
 
                     }
 
                 },
 
-                // legend: {
 
-                //     data: [this.$t("studentWeb.exam.chart.me"), this.$t("studentWeb.exam.chart.participantClass")],
 
-                //     bottom: 0,
 
-                // },
 
                 grid: {
 
                     left: '100px',
 
                     right: '0px',
 
@@ -129,7 +124,6 @@ export default {
 
                     padding: [4, 12],
 
                 },
 
                 radar: {
 
-                    // shape: 'circle',
 
                     indicator: this.categories,
 
                     radius: '50%',
 
                     center: ['50%', '54%']
 
@@ -139,10 +133,6 @@ export default {
 
                         name: 'Budget vs spending',
 
                         type: 'radar',
 
                         data: [
 
-                            // {
 
-                            //     value: this.fps,
 
-                            //     name: this.$t("studentWeb.exam.chart.me")
 
-                            // },
 
                             {
 
                                 value: this.cfps,
 
                                 name: this.$t("studentWeb.exam.chart.participantClass")

+ 2 - 20
TEAMModelOS/ClientApp/src/view/learnactivity/echarts/Comply.vue
查看文件 

@@ -74,23 +74,6 @@ export default {
 
             },
 
             // 多科
 
             multOption: {
 
-                color: [
 
-                    "#00A769",
 
-                    "#FB5C47",
 
-                    // "#DC6C6C",
 
-                    // "#4ECDC4",
 
-                    // "#F72459",
 
-                    "#F99406",
 
-                    "#075CD0",
 
-                    "#03C9A8",
 
-                    "#F7CA17",
 
-                    "#F2774B",
 
-                    "#67809F",
 
-                    "#BF55ED",
 
-                    "#1cc0f3",
 
-                    "#19be6b",
 
-                    "#9A1294",
 
-                ],
 
                 legend: {
 
                     right: 0,
 
                     top: 0,
 
@@ -101,7 +84,6 @@ export default {
 
                     "left": 0,
 
                     "top": 0,
 
                     "textStyle": {
 
-                        "color": "#303030",
 
                         fontSize: 15
 
                     }
 
                 },
 
@@ -145,7 +127,7 @@ export default {
 
         }
 
     },
 
     mounted() {
 
-        this.progressPie = this.$echarts.init(document.getElementById('comply-data'))
 
+        this.progressPie = this.$echarts.init(document.getElementById('comply-data'), 'macarons')
 
         this.progressPie.setOption(this.singleOption)
 
         let erd11 = elementResizeDetectorMaker()
 
         erd11.listenTo(document.getElementById("comply-data"), () => {
 
@@ -181,7 +163,7 @@ export default {
 
                 })
 
                 this.$nextTick(() => {
 
                     if (!this.progressPie) {
 
-                        this.progressPie = this.$echarts.init(document.getElementById('comply-data'))
 
+                        this.progressPie = this.$echarts.init(document.getElementById('comply-data'), 'macarons')
 
                     }
 
                     this.progressPie.setOption(this.multOption, true)
 
                 })

+ 3 - 7
TEAMModelOS/ClientApp/src/view/learnactivity/echarts/CorrectRate.vue
查看文件 

@@ -29,10 +29,6 @@ export default {
 
                         fontSize: 14
 
                     }
 
                 },
 
-                color: [
 
-                    "#1ebe83",
 
-                    "#DC6C6C"
 
-                ],
 
                 series: [
 
                     {
 
                         hoverOffset: 5,
 
@@ -68,7 +64,7 @@ export default {
 
         }
 
     },
 
     mounted() {
 
-        this.progressPie = this.$echarts.init(document.getElementById('correct-rate'))
 
+        this.progressPie = this.$echarts.init(document.getElementById('correct-rate'), 'macarons')
 
         this.progressPie.setOption(this.options)
 
         let erd11 = elementResizeDetectorMaker()
 
         erd11.listenTo(document.getElementById("correct-rate"), () => {
 
@@ -94,7 +90,7 @@ export default {
 
                     ]
 
                     this.$nextTick(() => {
 
                         if (!this.progressPie) {
 
-                            this.progressPie = this.$echarts.init(document.getElementById('correct-rate'))
 
+                            this.progressPie = this.$echarts.init(document.getElementById('correct-rate'), 'macarons')
 
                         }
 
                         this.options.series[0].data = singleData
 
                         this.progressPie.setOption(this.options, true)
 
@@ -110,7 +106,7 @@ export default {
 
 <style scoped lang="less">
 
 #correct-rate {
 
     width: 400px;
 
-    height: 200px;
 
+    height: 160px;
 
 }
 
 </style>
 
 <style>

+ 1 - 3
TEAMModelOS/ClientApp/src/view/learnactivity/echarts/KngPoint.vue
查看文件 

@@ -187,15 +187,13 @@ export default {
 
                     name: item
 
                 })
 
             })
 
-            let myChart = this.$echarts.init(document.getElementById("knowledge" + this.id))
 
+            let myChart = this.$echarts.init(document.getElementById("knowledge" + this.id), 'macarons')
 
             let option = {
 
-                color: ["#5470C6", "#91CC75"],
 
                 title: {
 
                     text: this.$t('studentWeb.exam.chart.keyPointPerformance'),
 
                     left: 'center',
 
                     top: 10,
 
                     textStyle: {
 
-                        // fontWeight: "normal",
 
                         fontSize: "15",
 
                     }
 
                 },

+ 5 - 17
TEAMModelOS/ClientApp/src/view/learnactivity/echarts/QuCount.vue
查看文件 

@@ -22,11 +22,10 @@ export default {
 
                     formatter: '{b} : {c}' + this.$t('unit.text7')
 
                 },
 
                 title: {
 
-                    "text": '错题人数统计',
 
+                    "text": '题目正确率统计',
 
                     "left": "center",
 
                     "top": 0,
 
                     "textStyle": {
 
-                        "color": "#303030",
 
                         fontSize: 15
 
                     }
 
                 },
 
@@ -57,18 +56,6 @@ export default {
 
                         'start': 0
 
                     }
 
                 ],
 
-                color: [
 
-                    "#ff9090",
 
-                    "#F2774B",
 
-                    "#ba8ade",
 
-                    "#5D80CF",
 
-                    "#10b6e7",
 
-                    "#009FDC",
 
-                    "#4ECDC4",
 
-                    "#44E5AC",
 
-                    "#03C9A8",
 
-                    "#19be6b",
 
-                ],
 
                 grid: {
 
                     // width: "90%"
 
                     left: 20,
 
@@ -104,7 +91,7 @@ export default {
 
         this.id = this.$jsFn.getBtwRandom(0, 100000000)
 
     },
 
     mounted() {
 
-        this.progressPie = this.$echarts.init(document.getElementById('qu-score-count' + this.id))
 
+        this.progressPie = this.$echarts.init(document.getElementById('qu-score-count' + this.id), 'macarons')
 
         this.progressPie.setOption(this.option)
 
         let erd11 = elementResizeDetectorMaker()
 
         erd11.listenTo(document.getElementById("qu-score-count" + this.id), () => {
 
@@ -119,10 +106,11 @@ export default {
 
             handler(n, o) {
 
                 this.$nextTick(() => {
 
                     if (!this.progressPie) {
 
-                        this.progressPie = this.$echarts.init(document.getElementById('qu-score-count' + this.id))
 
+                        this.progressPie = this.$echarts.init(document.getElementById('qu-score-count' + this.id), 'macarons')
 
                     }
 
-                    this.option.series[0].data = this.quData.map(item => item.wrong)
 
+                    this.option.series[0].data = this.quData.map(item => item.correct)
 
                     this.option.xAxis.data = this.quData.map(item => item.quLabel)
 
+                    if(this.quData.length) this.option.yAxis.max = this.quData[0].correct + this.quData[0].wrong
 
                     if (this.quData.length > 20) {
 
                         this.option.dataZoom = [
 
                             {

+ 3 - 28
TEAMModelOS/ClientApp/src/view/learnactivity/echarts/ScoreMatrix.vue
查看文件 

@@ -23,38 +23,13 @@ export default {
 
                 title: {
 
                     "text": this.$t('learnActivity.simple.scoreMat'),
 
                     "left": "center",
 
-                    // "left": 30,
 
                     "top": 10,
 
                     "textStyle": {
 
-                        "color": "#303030",
 
+                        // "color": "#303030",
 
                         fontSize: 15
 
                     }
 
                 },
 
-                color: [
 
-                    "#F2774B",
 
-                    // "#e74c5a",
 
-                    "#ff9090",
 
-
 
-                    "#ba8ade",
 
-                    "#5D80CF",
 
-                    "#10b6e7",
 
-                    "#009FDC",
 
-                    "#4ECDC4",
 
-                    "#44E5AC",
 
-                    "#03C9A8",
 
-                    // "#4ec4a4",
 
-                    "#19be6b",
 
-
 
-                    // "#A0EE94",
 
-                    // "#F7CA17",
 
-                    // "#F2774B",
 
-                    // "#67809F",
 
-                    // "#BF55ED",
 
-                    // "#19be6b",
 
-                ],
 
                 xAxis: {
 
-                    // type: 'category',
 
-                    // data: []
 
                     show: true,
 
                     type: 'category',
 
                     data: [],
 
@@ -81,7 +56,7 @@ export default {
 
         }
 
     },
 
     mounted() {
 
-        this.progressPie = this.$echarts.init(document.getElementById('ev-score-matrix'))
 
+        this.progressPie = this.$echarts.init(document.getElementById('ev-score-matrix'), 'macarons')
 
         this.progressPie.setOption(this.option)
 
         let erd11 = elementResizeDetectorMaker()
 
         erd11.listenTo(document.getElementById("ev-score-matrix"), () => {
 
@@ -96,7 +71,7 @@ export default {
 
             handler(n, o) {
 
                 this.$nextTick(() => {
 
                     if (!this.progressPie) {
 
-                        this.progressPie = this.$echarts.init(document.getElementById('ev-score-matrix'))
 
+                        this.progressPie = this.$echarts.init(document.getElementById('ev-score-matrix'), 'macarons')
 
                     }
 
                     // this.option.series[0].data = this.pieData.filter(item => {
 
                     //     return item.value > 0

+ 3 - 1
TEAMModelOS/ClientApp/src/view/learnactivity/tabs/AnswerTable.less
查看文件 

@@ -3,6 +3,7 @@
 
     display: flex;
 
     background: white;
 
     justify-content: space-between;
 
+    box-shadow: 0 0 10px 2px var(--card-shadow);
 
 }
 
 .data-count-item{
 
     width: 150px;
 
@@ -15,7 +16,8 @@
 
 }
 
 .table-data-wrap{
 
     width: 100%;
 
-    margin-top: 6px;
 
+    box-shadow: 0 0 10px 2px var(--card-shadow);
 
+    margin-top: 10px;
 
     min-height: 600px;
 
     background: white;
 
     padding: 10px 10px 60px 10px;

+ 1 - 2
TEAMModelOS/ClientApp/src/view/learnactivity/tabs/AnswerTable.vue
查看文件 

@@ -1163,8 +1163,7 @@ export default {
 
 </style>
 
 <style lang="less">
 
 .answer-table-container .__view {
 
-    padding-top: 5px;
 
-    padding-right: 15px;
 
+    padding: 10px;
 
 }
 
 .table-qu-no {
 
     background: #2db7f5;

+ 20 - 5
TEAMModelOS/ClientApp/src/view/learnactivity/tabs/DataView.less
查看文件 

@@ -7,6 +7,7 @@
 
     display: flex;
 
     background: white;
 
     justify-content: space-between;
 
+    box-shadow: 0 0 10px 2px var(--card-shadow);
 
 }
 
 .data-count-item{
 
     width: 150px;
 
@@ -18,10 +19,14 @@
 
     }
 
 }
 
 .chart-wrap{
 
-    padding-top: 15px;
 
+    position: relative;
 
+    padding-top: 50px;
 
     display: flex;
 
     justify-content: space-between;
 
     flex-wrap: wrap;
 
+    background: white;
 
+    box-shadow: 0 0 10px 2px var(--card-shadow);
 
+    margin-top: 10px;
 
 }
 
 .score-dist-box{
 
     min-width: 330px;
 
@@ -39,15 +44,25 @@
 
     font-weight: 500;
 
     color: var(--primary-text-color);
 
     display: block;
 
-    padding: 5px 0;
 
-    border-left: 5px solid var(--tabs-bottom-color);
 
+    padding: 0px 0;
 
+    border-left: 2px solid var(--tabs-bottom-color);
 
     padding-left: 10px;
 
     background-color: white;
 
-    // background-color: var(--active-item-start);
 
+    position: absolute;
 
+    z-index: 99;
 
+    top: 10px;
 
+    font-weight: 600;
 
+    left: 5px;
 
+}
 
+.subject-wrap{
 
+    position: relative;
 
+    background: white;
 
+    margin-top: 10px;
 
+    padding-top: 50px;
 
+    box-shadow: 0 0 10px 2px var(--card-shadow);
 
 }
 
 .subject-chart-box{
 
     width: 100%;
 
     display: flex;
 
     justify-content: space-between;
 
-    margin-top: 10px;
 
 }

+ 3 - 3
TEAMModelOS/ClientApp/src/view/learnactivity/tabs/DataView.vue
查看文件 

@@ -59,9 +59,10 @@
 
                     </p>
 
                 </div>
 
             </div>
 
-            <p class="subject-name" v-show="examInfo.subjects && examInfo.subjects.length > 1" style="margin-top:15px">总览</p>
 
+            
             <!-- 单科或多科都会呈现 -->
 
             <div class="chart-wrap">
 
+                <p class="subject-name" v-show="examInfo.subjects && examInfo.subjects.length > 1">总览</p>
 
                 <!-- 成绩分布图 -->
 
                 <div class="score-dist-box">
 
                     <ScoreMatrix :pieData="scoreSegment"></ScoreMatrix>
 
@@ -255,7 +256,6 @@ export default {
 
 </style>
 
 <style lang="less">
 
 .data-view-container .__view {
 
-    padding-top: 5px;
 
-    padding-right: 10px;
 
+    padding: 10px;
 
 }
 
 </style>

+ 3 - 1
TEAMModelOS/ClientApp/src/view/learnactivity/tabs/ExamPaper.less
查看文件 

@@ -5,10 +5,12 @@
 
     position: sticky;
 
     top: 0px;
 
     z-index: 9;
 
-    margin-bottom: 6px;
 
+    box-shadow: 0 0 10px 2px var(--card-shadow);
 
 }
 
 .paper-wrap{
 
     width: 100%;
 
     height: 800px;
 
     background: white;
 
+    margin-top: 10px;
 
+    box-shadow: 0 0 10px 2px var(--card-shadow);
 
 }

+ 1 - 2
TEAMModelOS/ClientApp/src/view/learnactivity/tabs/ExamPaper.vue
查看文件 

@@ -53,8 +53,7 @@ export default {
 
 </style>
 
 <style lang="less">
 
 .exam-paper-container .__view {
 
-    padding-top: 5px;
 
-    padding-right: 15px;
 
+    padding: 10px;
 
 }
 
 .exam-paper-container .paper-main-wrap{
 
     margin-top: 0px;

+ 25 - 18
TEAMModelOS/ClientApp/src/view/teachcontent/ResBelong.vue
查看文件 

@@ -26,10 +26,10 @@ import { mapGetters } from 'vuex'
 
 export default {
 
     name: 'BasePdSelect',
 
     props: {
 
-        pdId: {
 
-            type: String,
 
-            default: ''
 
-        },
 
+        // pdId: {
 
+        //     type: String,
 
+        //     default: ''
 
+        // },
 
         showLabel: {
 
             type: Boolean,
 
             default: false
 
@@ -54,11 +54,12 @@ export default {
 
             (res) => {
 
                 if (res) {
 
                     this.schoolBase = res.school_base
 
-                    if (this.periods && !this.pdId) {
 
-                        this.filterPeriod = this.periods[0].id
 
-                    } else {
 
-                        this.filterPeriod = this.pdId
 
-                    }
 
+                    // if (this.periods && !this.pdId) {
 
+                    //     this.filterPeriod = this.periods[0].id
 
+                    // } 
+                    // else {
 
+                    //     this.filterPeriod = this.pdId
 
+                    // }
 
                 }
 
             },
 
             (err) => {
 
@@ -75,7 +76,7 @@ export default {
 
             //     this.filterPeriod = []
 
             // }
 
             console.log(this.filterPeriod)
 
-            if(!data.length){
 
+            if (!data.length) {
 
                 this.$Message.warning(this.$t('teachContent.sltPeriod'))
 
             }
 
             this.$emit('tag-change', {
 
@@ -126,11 +127,20 @@ export default {
 
         }
 
     },
 
     watch: {
 
-        pdId: {
 
-            handler() {
 
-                this.filterPeriod = [this.pdId]
 
-            },
 
-            immediate: true
 
+        // pdId: {
 
+        //     handler() {
 
+        //         this.filterPeriod = [this.pdId]
 
+        //     },
 
+        //     immediate: true
 
+        // }
 
+        '$store.state.user.curPeriod': {
 
+            deep: true,
 
+            immediate: true,
 
+            handler(n, o) {
 
+                if (n) {
 
+                    this.filterPeriod = [n.id]
 
+                }
 
+            }
 
         }
 
     }
 
 }
 
@@ -146,12 +156,9 @@ export default {
 
         font-size: 14px;
 
     }
 
     .ivu-select-dropdown {
 
-        // background-color: #2d2d2d;
 
         border-radius: 2px;
 
-        // border: 1px #464646 solid;
 
         .ivu-dropdown-menu {
 
             li {
 
-                // color: #ccc;
 
                 font-size: 12px !important;
 
                 &:hover {
 
                     color: #2d2d2d;

+ 21 - 12
TEAMModelOS/ClientApp/src/view/teachcontent/UploadModal.vue
查看文件 

@@ -1,7 +1,7 @@
 
 <template>
 
     <Modal v-model="uploadStatus" :ok-text="textLoading ? $t('updModal.uploading') : isComplete ? $t('updModal.complete'):$t('updModal.comfirmUpd')" :cancel-text="$t('updModal.cancelUpd')" :title="$t('teachContent.btnUpload')" class="upload-modal" width="1000" :mask-closable="false" :closable="false" @on-ok="modalOk" @on-cancel="modalCancel" :loading="modalLoading">
 
         <div class="upload-file-box">
 
-            <ResBelong v-if="$store.state.userInfo.hasSchool" @tag-change="getResTags" v-show="routerScope == 'school'" showLabel class="upd-to-pd" :pdId="pdId"></ResBelong>
 
+            <ResBelong v-if="$store.state.userInfo.hasSchool" @tag-change="getResTags" v-show="routerScope == 'school'" showLabel class="upd-to-pd"></ResBelong>
 
             <Upload type="drag" action="" :show-upload-list="false" multiple :before-upload="customUpload" class="upload-wrap" :disabled="textLoading">
 
                 <Icon class="upload-icon" custom="iconfont icon-upload" v-show="!uploadedList.length" />
 
                 <p class="upload-text" :style="{marginTop: uploadedList.length ? '25px':'0px'}">
 
@@ -116,10 +116,10 @@ export default {
 
             type: Array
 
         },
 
         //资源所属学段
 
-        pdId: {
 
-            default: '',
 
-            type: String
 
-        }
 
+        // pdId: {
 
+        //     default: '',
 
+        //     type: String
 
+        // }
 
     },
 
     methods: {
 
         //资源标签：学段、学科、年级
 
@@ -422,7 +422,7 @@ export default {
 
                                     let filename = res.name.substring(0, res.name.lastIndexOf('.'))
 
                                     this.containerClient.deleteBlob(delBlob, res.size)
 
                                     this.uploadedList[index].blob = `/res/${filename}/index.json`
 
-                                    this.uploadedList[index].url = this.uploadedList[index].url.replace('.pptx','/index.json').replace('.PPTX','/index.json')
 
+                                    this.uploadedList[index].url = this.uploadedList[index].url.replace('.pptx', '/index.json').replace('.PPTX', '/index.json')
 
                                     this.uploadedList[index].extension = 'HTEX'
 
                                     this.uploadedList[index].name = filename + '.HTEX'
 
                                     this.uploadedList[index].type = 'res'
 
@@ -512,10 +512,10 @@ export default {
 
         async uploadPoster(file) {
 
             let n = file.name.substring(0, file.name.lastIndexOf('.'))
 
             try {
 
-				const fileSas = await this.$tools.getFileSas(file.url)
 
+                const fileSas = await this.$tools.getFileSas(file.url)
 
                 let dataUrl = await this.$jsFn.createVideoPoster(fileSas.url, file.name, 0.1)
 
                 // let dataUrl = await this.$tools.getVideoBase64(file.url + this.sasString)
 
-				console.log(dataUrl)
 
+                console.log(dataUrl)
 
                 let f = this.$jsFn.dataURLtoFile(dataUrl, n + '.png')
 
                 this.containerClient.upload(f, {
 
                     path: 'thum'
 
@@ -553,11 +553,20 @@ export default {
 
         this.containerClient = BlobTool.CreateBlobTool(this.routerScope)
 
     },
 
     watch: {
 
-        pdId: {
 
+        // pdId: {
 
+        //     handler(n, o) {
 
+        //         this.tags.period = this.pdId
 
+        //     },
 
+        //     immediate: true
 
+        // }
 
+        '$store.state.user.curPeriod': {
 
+            deep: true,
 
+            immediate: true,
 
             handler(n, o) {
 
-                this.tags.period = this.pdId
 
-            },
 
-            immediate: true
 
+                if (n) {
 
+                    this.tags.period = n.id
 
+                }
 
+            }
 
         }
 
     }
 
 }

+ 2 - 0
TEAMModelOS/Controllers/Client/HiTeachController.cs
查看文件 

@@ -1144,6 +1144,7 @@ namespace TEAMModelOS.Controllers.Client
 
                     strdentRow.groupId = member.groupId;
 
                     strdentRow.groupName = member.groupName;
 
                     strdentRow.irs = member.irs;
 
+                    strdentRow.type = member.type;
 
                     students.Add(strdentRow);
 
                 }
 
             }
 
@@ -1692,6 +1693,7 @@ namespace TEAMModelOS.Controllers.Client
 
             public string groupId { get; set; }
 
             public string groupName { get; set; }
 
             public string irs { get; set; }
 
+            public int type { get; set; } //类型 1 tmdid,2 student
 
             public string nickname { get; set; }
 
         }
 
         public class ClassGroups

+ 1 - 1
TEAMModelOS/Controllers/System/BlobController.cs
查看文件 

@@ -278,7 +278,7 @@ namespace TEAMModelOS.Controllers
 
         /// <param name="request"></param>
 
         /// <returns></returns>
 
         [HttpPost("bloblog-list")]
 
-        [Authorize(Roles = "IES")]
 
+        [Authorize(Roles = "IES,HiTeach")]
 
         public async Task<ActionResult> BloblogList(JsonElement request)
 
         {
 
             List<Bloblog> bloblogs = new List<Bloblog>();