Merge branch 'develop5.0-tmd' of http://106.12.23.251:10080/TEAMMODEL/TEAMModelOS into develop5.0-tmd

TEAMModelOS/ClientApp/src/components/evaluation/AnalysisItemTable.vue

@@ -21,17 +21,17 @@
 				tableData: [],
 				dataColumns: [
 					{
-						title: '落点区域',
+						title: this.$t('totalAnalysis.sca_table_text6'),
 						key: 'areaName',
 						align: 'center'
 					},
 					{
-						title: '配分',
+						title: this.$t('totalAnalysis.ta_table_text4'),
 						key: 'score',
 						align: 'center'
 					},
 					{
-						title: '难易度',
+						title: this.$t('totalAnalysis.ta_table_text5'),
 						key: 'diff',
 						align: 'center',
 						render: function(h, params) {
@@ -39,7 +39,7 @@
 						}
 					},
 					{
-						title: '鉴别度',
+						title: this.$t('totalAnalysis.ta_table_text6'),
 						key: 'identify',
 						align: 'center',
 						render: function(h, params) {
@@ -47,12 +47,12 @@
 						}
 					},
 					{
-						title: '正答率',
+						title: this.$t('totalAnalysis.trueAnswerRate'),
 						align: 'center',
 						key: 'classScoreRate'
 					},
 					{
-						title: '高分组正答率',
+						title: this.$t('totalAnalysis.PHAnswerRate'),
 						align: 'center',
 						key: 'PH',
 						render: function(h, params) {
@@ -60,7 +60,7 @@
 						}
 					},
 					{
-						title: '低分组正答率',
+						title: this.$t('totalAnalysis.PLAnswerRate'),
 						align: 'center',
 						key: 'PL',
 						render: function(h, params) {

TEAMModelOS/ClientApp/src/components/evaluation/OptionsTable.vue

@@ -82,7 +82,6 @@
 					if (Object.keys(n).length) {
 						let total = this.$store.state.totalAnalysis.analysisJson.all.total // 取总人数
 						let phCount = Math.floor(total * 0.27) //取高分组人数
-						console.log(n)
 						this.options.forEach(key => {
 							this.optionsData.push({
 								option: key,
@@ -94,6 +93,7 @@
 								PL: n.pl[key] ? Number((n.pl[key] / phCount) * 100).toFixed(1) + '%' : 0,
 							})
 						})
+						console.log(this.optionsData)
 					}
 				},
 				immediate: true,

TEAMModelOS/ClientApp/src/components/student-analysis/total/BaseKnowledgeDetail.vue

@@ -167,6 +167,7 @@
                                     }
                                 },
                             },
+							barMaxWidth:40,
                             emphasis: {
                                 itemStyle: {
                                     color: '#ff9999'

TEAMModelOS/ClientApp/src/components/student-analysis/total/BaseLevelDetail.vue

@@ -167,6 +167,7 @@
                                     }
                                 },
                             },
+							barMaxWidth:40,
                             emphasis: {
                                 itemStyle: {
                                     color: '#ff9999'

TEAMModelOS/ClientApp/src/components/student-analysis/total/BaseLevelPie.vue

@@ -30,8 +30,8 @@
 					series: {
 						name: that.$t('totalAnalysis.le_title1'),
 						type: 'pie',
-						radius: [40, 150],
-						center: ['45%', '60%'],
+						radius: [40, 140],
+						center: ['45%', '55%'],
 						max: 100, // for funnel
 						sort: 'ascending', // for funnel
 						data: data

TEAMModelOS/ClientApp/src/components/student-analysis/total/BasePie.vue

@@ -30,7 +30,7 @@
                     series: {
                         name: that.$t('totalAnalysis.ka_title1'),
                         type: 'pie',
-                        radius: [40, 150],
+                        radius: [40, 140],
                         center: ['45%', '50%'],
                         max: 100, // for funnel
                         sort: 'ascending', // for funnel

TEAMModelOS/ClientApp/src/components/student-analysis/total/BaseRadar.vue

@@ -45,7 +45,7 @@
                             }
                         },
                         center: ['50%', '45%'],
-						radius:'60%',
+						radius:'55%',
                         tooltip: {
                             trigger: 'item'
                         },
@@ -117,6 +117,9 @@
 
                 // 绘制图表
                 myRadar.setOption(option)
+				window.addEventListener('resize', function() {
+				    myRadar.resize()
+				})
             },
 
             doRender(data,classIndexs) {

TEAMModelOS/ClientApp/src/locale/lang/zh-CN/totalAnalysis.js

@@ -5,7 +5,11 @@ export default {
 		tab2:'评测数据',
 	},
 	rateLineTitle:'选项选答率分析',
+	trueAnswerRate:'正答率',
+	PHAnswerRate:'高分组正答率',
+	PLAnswerRate:'低分组正答率',
 	R1R6LineTitle:'R1-R6作答曲线',
+	noKnowPointTip:'该科目下未收集到知识点数据',
 	lostStu:'缺考人数',
 	showAnalysis:'数据分析',
 	allSubjects:'全科',

TEAMModelOS/ClientApp/src/locale/lang/zh-TW/totalAnalysis.js

@@ -6,7 +6,11 @@ export default {
 		noData: '暫無有效數據返回！'
 	},
 	rateLineTitle:'選項選答率分析',
+	trueAnswerRate:'正答率',
+	PHAnswerRate:'高分組正答率',
+	PLAnswerRate:'低分組正答率',
 	R1R6LineTitle:'R1-R6作答曲線',
+	noKnowPointTip:'該科目下未收集到知識點數據',
 	lostStu: '缺考人數',
 	showAnalysis: '資料分析',
 	allSubjects: '全科',

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/EvaluationList/TotalIndex.vue

@@ -273,8 +273,8 @@
 							this.filterData.typeList = this.typeList;
 						}
 						
-						if(localStorage.getItem('filterConditions')){
-							this.filterConditions = JSON.parse(localStorage.getItem('filterConditions'))
+						if(sessionStorage.getItem('filterConditions')){
+							this.filterConditions = JSON.parse(sessionStorage.getItem('filterConditions'))
 							this.filterPeriod = this.filterConditions.period || this.$t('totalAnalysis.all')
 							this.filterGrade = this.filterConditions.grade || this.$t('totalAnalysis.all')
 							this.filterSubject = this.filterConditions.subject || this.$t('totalAnalysis.all')
@@ -283,7 +283,7 @@
 						}
 						console.log(this.filterConditions)
 						//默认选中第一个学段
-						if (this.schoolData.period && this.schoolData.period.length && !localStorage.getItem('filterConditions')) {
+						if (this.schoolData.period && this.schoolData.period.length && !sessionStorage.getItem('filterConditions')) {
 								this.filterPeriod = this.schoolData.period[0].name
 								this.filterPeriodChange()
 						}
@@ -452,7 +452,7 @@
 			},
 
 			doFilter() {
-				localStorage.setItem('filterConditions',JSON.stringify(this.filterConditions))
+				sessionStorage.setItem('filterConditions',JSON.stringify(this.filterConditions))
 				// 将条件转换成数组便于渲染
 				this.filterList = this.objToArr(this.filterConditions);
 				// 根据条件过滤所有的测验数据

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/KnowledgeAnalysis/KnowledgeAnalysis.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="scatter-container">
 		<div v-show="!hasKnowledge" class="analysis-no-data">
-			<EmptyData :top="200" textContent="本次考试未收集到知识点数据"></EmptyData>
+			<EmptyData :top="200" :textContent="$t('totalAnalysis.noKnowPointTip')"></EmptyData>
 		</div>
 		<div v-show='hasKnowledge'>
 			<Row>

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/LevelAnalysis/LevelAnalysis.vue

@@ -74,7 +74,7 @@
             	        sortable: 'custom',
             	        key: item.className,
             	        renderType: (h, params) => {
-            	            return h('span', (isNaN(origin[params.row.name][index]) ? 0 : (Number(origin[params.row.name][index]))).toFixed(2) + '%')
+            	            return h('span', ((Number(origin[params.row.name][index]))).toFixed(2) + '%')
             	        },
             	        minWidth: 150
             	    }

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/ScatterAnalysis/ScatterAnalysis.vue

@@ -93,7 +93,6 @@
                     {
                         title: this.$t('totalAnalysis.base_class'),
                         key: 'className',
-						sortable:'custom',
                         minWidth: 60
                     },
                     {

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/index.less

@@ -1,7 +1,7 @@
 body, html, .total-container {
   width: 100%;
   height: 100%;
-  min-width: 1266px;
+  // min-width: 1266px;
   user-select: none !important;
 }
 .total-container {