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

TEAMModelOS/ClientApp/src/common/EmptyData.vue

@@ -20,9 +20,8 @@
 		  },
 		  textContent: {
 			type: String,
-			default: () => {
-				// return this.$t('evaluation.newExercise.newSchoolItem')
-				return '暂无数据'
+			default: function (){
+				return this.$t('evaluation.noData')
 			}
 		  }
 		},

TEAMModelOS/ClientApp/src/components/evaluation/ExerciseList.less

@@ -316,7 +316,7 @@
       }
     }
     span {
-      &:nth-child(5) {
+      &:nth-child(4) {
         border-right-width: 0;
       }
     }

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

@@ -87,7 +87,7 @@
 					<span class="item-tools-info">{{$t('evaluation.filter.diff')}}：{{ exersicesDiff[item.level - 1] }}</span>
 					<span class="item-tools-info">{{$t('evaluation.filter.level')}}：{{ exersicesField[item.field - 1] }}</span>
 					<span class="item-tools-info">{{$t('evaluation.filter.useCount')}}：{{ item.usageCount || 0 }} 次</span>
-					<span class="item-tools-info">{{$t('evaluation.updateTime')}}：{{ $tools.formatTime(item.createTime)  || 0 }} </span>
+					<!-- <span class="item-tools-info">{{$t('evaluation.updateTime')}}：{{ $tools.formatTime(item.createTime)  || 0 }} </span> -->
 					<Button type="info" v-if="!isAnalysis" :style="{backgroundColor:selectList.map(i => i.id).indexOf(item.id) > -1 ? '#bbbbbb' : '#2db7f5'}"
 					 @click.stop="onSelectItem(item,index)">{{ selectList.map(i => i.id).indexOf(item.id) > -1 ? $t('evaluation.remove') : $t('evaluation.choose')}}</Button>
 				</div>

TEAMModelOS/ClientApp/src/components/questionnaire/BaseJudge.vue

@@ -1,11 +1,11 @@
 <template>
 	<div class="question-single">
 		<div class="exersices-content">
-			<IconText :text="'题目'" :color="'#2d8cf0'" :icon="'ios-create'" style="margin-bottom:15px;"></IconText>
+			<IconText :text="$t('survey.question')" :color="'#2d8cf0'" :icon="'ios-create'" style="margin-bottom:15px;"></IconText>
 			<div ref="singleEditor" style="text-align:left"></div>
 		</div>
 		<div class="question-option" style="margin-top:20px">
-			<IconText :text="'判断选项'" :color="'#FF871C'" :icon="'md-reorder'"></IconText>
+			<IconText :text="$t('survey.judgeOption')" :color="'#FF871C'" :icon="'md-reorder'"></IconText>
 			<div v-if="options.length">
 				<div v-for="(item,index) in options" :key="index" :ref="'optionBox' + index" class="option-editor-wrap" style="margin-top:10px;display:flex">
 					<span class="fl-center option-order">{{String.fromCharCode(64 + parseInt(index+1))}}</span>
@@ -137,7 +137,7 @@
 						this.refreshOrder()
 					})
 				} else {
-					this.$Message.warning('最多只有9个选项！')
+					this.$Message.warning(this.$t('survey.optionMaxTip'))
 				}
 			},
 			

TEAMModelOS/ClientApp/src/components/questionnaire/BaseProgress.vue

@@ -33,7 +33,7 @@
 					tooltip: {
 						trigger: 'item',
 						formatter: function(params) {
-							return `问卷完成度:${ (((that.total - that.noAnswerdCount) / that.total) * 100).toFixed(2) }%`
+							return `${ that.$t('survey.questionaire.progress') }:${ (((that.total - that.noAnswerdCount) / that.total) * 100).toFixed(2) }%`
 						}
 					},
 					angleAxis: {

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

@@ -71,7 +71,7 @@
           },
           series: [
             {
-              name: '进线率',
+              name: that.$t('totalAnalysis.echarts_text8'),
               type: 'line',
               color: '#42beda',
               itemStyle: {

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

@@ -24,7 +24,7 @@
                 var option = {
                     tooltip: {
                         formatter: function(params) {
-                            var results = params.marker + '知识点占比情况<br>'
+                            var results = params.marker + that.$t('totalAnalysis.ka_title1') + '<br>'
                             for (var i = 0; i < params.value.length; i++) {
                                 results += indicator[i].name + '：' + params.value[i] + '%<br>'
                             }
@@ -104,7 +104,7 @@
                             data: [
                                 {
                                     value: data,
-                                    name: '知识点占比'
+                                    name: that.$t('totalAnalysis.ka_title1')
                                 }
                             ]
                         }

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

@@ -104,7 +104,7 @@
 						},
 						data: [{
 							value: data,
-							name: '知识点占比'
+							name: that.$t('totalAnalysis.ka_text4')
 						}]
 					}]
 				}

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

@@ -153,29 +153,38 @@
 			
 			// 筛选操作
             onFilterChange(val) {
-                let filterValue = val._filterChecked[0]
-				const ipoint = this.$store.state.totalAnalysis.analysisJson.ipoint
-				const touchScore = this.$store.state.totalAnalysis.analysisJson.touchScore
-                switch (filterValue) {
-                    case 1:
-                        this.originData = this.tableDatas.filter(item => item.score > ipoint)
-                        break
-                    case 2:
-                        this.originData = this.tableDatas.filter(item => item.score > ipoint && item.score < (ipoint + touchScore))
-                        break
-                    case 3:
-                        console.log('进步班级')
-                        break
-                    case 4:
-                        console.log('退步班级')
-                        break
-                    case 5:
-                        console.log('稳定班级')
-                        break
-                    default:
-                        this.originData = this.firstData
-                        break
-                }
+				console.log(val)
+				let filterKey = val.key
+                let filterValue = val._filterChecked.length ? val._filterChecked[0] : null
+				
+				if(filterKey === 'className'){
+					this.originData = filterValue  ? this.tableDatas.filter(item => item.className === filterValue) : this.firstData
+				}else if(filterKey === 'score'){
+					const ipoint = this.$store.state.totalAnalysis.analysisJson.ipoint
+					const touchScore = this.$store.state.totalAnalysis.analysisJson.touchScore
+					switch (filterValue) {
+					    case 1:
+					        this.originData = this.tableDatas.filter(item => item.score > ipoint)
+					        break
+					    case 2:
+					        this.originData = this.tableDatas.filter(item => item.score > ipoint && item.score < (ipoint + touchScore))
+					        break
+					    case 3:
+					        console.log('进步班级')
+					        break
+					    case 4:
+					        console.log('退步班级')
+					        break
+					    case 5:
+					        console.log('稳定班级')
+					        break
+					    default:
+					        this.originData = this.firstData
+					        break
+					}
+				}
+				
+				
                         this.pageChange(1)
             },
 

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

@@ -0,0 +1,210 @@
+<template>
+	<div id="myScoreRateBar"></div>
+</template>
+
+<script>
+	export default {
+		name: 'hello',
+		props: ['echartsData'],
+		data() {
+			return {
+
+			}
+		},
+		created() {
+		},
+
+		methods: {
+
+			// 执行图表渲染工作
+			drawLine(data) {
+				// 基于准备好的dom，初始化echarts实例
+				let myBar = this.$echarts.init(document.getElementById('myScoreRateBar'))
+				let that = this
+
+				// 指定图表的配置项和数据
+				var option = {
+					tooltip: {
+						trigger: 'axis',
+						axisPointer: {
+							type: 'shadow',
+							textStyle: {
+								color: '#fff',
+								fontSize: '26'
+							},
+						}
+					},
+					legend: {
+						top: '5%',
+						right: '20%',
+						data: ['人数'],
+						textStyle: {
+							fontSize: 12,
+							color: '#808080'
+						},
+						icon: 'rect'
+					},
+					grid: {
+						show: false,
+						containLabel: true,
+						height: 300,
+						width: '75%',
+						top:'20%',
+						left: '6%',
+						tooltip: {
+							show: true,
+							trigger: 'axis', // 触发类型
+							textStyle: {
+								color: '#666'
+							}
+						}
+					},
+					dataZoom: [{
+						'show': true,
+						'height': 10,
+						'xAxisIndex': [
+							0
+						],
+						bottom: 40,
+						'start': 0,
+						'end': 100,
+						handleIcon: 'M512 497.821538m-418.264615 0a418.264615 418.264615 0 1 0 836.52923 0 418.264615 418.264615 0 1 0-836.52923 0Z',
+						handleSize: '160%',
+						handleStyle: {
+							color: '#d3dee5'
+					
+						},
+						textStyle: {
+							color: '#fff'
+						},
+						borderColor: '#90979c'
+					}, {
+						'type': 'inside',
+						'show': true,
+						'height': 15,
+						'start': 0,
+						'end': 100
+					}],
+					xAxis: [{
+						type: 'category',
+						axisTick: {
+							show: true
+						},
+						axisLine: {
+							show: true
+						},
+						axisLabel: {
+							color: '#aaaaaa',
+							margin: 10,
+						},
+						splitLine: {
+						    show: true,
+						    lineStyle: {
+						        color: '#4c504a',
+						        width: 0.5,
+						        type: 'solid'
+						    }
+						},
+						data: ['10%', '20%', '30%', '40%','50%', '60%', '70%', '80%','90%', '100%'],
+
+					}],
+					yAxis: [{
+						name: '人数',
+						nameTextStyle: {
+							color: '#808080',
+							fontSize: 12,
+						},
+						type: 'value',
+						axisLine: {
+							show: false
+						},
+						axisLabel: {
+							color: '#afafaf',
+							fontSize: 12,
+						},
+						splitLine: {
+						    show: true,
+						    lineStyle: {
+						        color: '#4c504a',
+						        width: 0.5,
+						        type: 'solid'
+						    }
+						},
+						axisTick: {
+							show: true
+						}
+					}],
+					series: [{
+							name: '人数',
+							type: 'bar',
+							label: {
+								show: true,
+								position: 'top',
+								fontSize: 14,
+								color: '#3DC3F0',
+								fontWeight: 'bold'
+							},
+							barMaxWidth: 40,
+							itemStyle: {
+								color: {
+									type: 'linear',
+									x: 0,
+									y: 0,
+									x2: 0,
+									y2: 1,
+									colorStops: [{
+										offset: 0,
+										color: '#3DC3F0' // 0% 处的颜色
+									}, {
+										offset: 1,
+										color: '#3486b1' // 100% 处的颜色
+									}]
+								}
+							},
+							data: [15,8,6,20,0,14,18,22,34,5]
+						},
+					]
+				};
+				// 绘制图表
+				myBar.setOption(option)
+				window.addEventListener('resize', function() {
+				    myBar.resize()
+				})
+			},
+
+
+			doRender(val) {
+			}
+		},
+		mounted() {
+			this.drawLine()
+			if (this.getBaseBarData) {
+				console.log('BaseBar接收到的vuex', this.getBaseBarData)
+				this.doRender(this.getBaseBarData)
+				this.drawLine()
+			}
+		},
+		computed: {
+			// 获取最新柱状图数据
+			getBaseBarData() {
+				return this.$store.state.totalAnalysis.analysisJson
+			}
+		},
+		watch: {
+			getBaseBarData(val) {
+				if (!val) return
+				this.drawLine()
+				console.log('BaseBar接收到watch的vuex', val)
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	#myScoreRateBar {
+		width: 100%;
+		height: 500px;
+		margin: 0 auto;
+		display: block;
+	}
+</style>

TEAMModelOS/ClientApp/src/components/vote/BaseVoteForm.vue

@@ -3,7 +3,7 @@
 		<Form ref="voteForm" :model="voteForm" label-position="top" :rules="ruleValidate" :disabled="!voteFormEdit"
 		 hide-required-mark>
 			<FormItem :label="$t('vote.form.name')" prop="name">
-				<Input :class="!voteFormEdit ? 'vote-form-disabled':''" v-model="voteForm.name" placeholder="请输入投票名称"></Input>
+				<Input :class="!voteFormEdit ? 'vote-form-disabled':''" v-model="voteForm.name" :placeholder="$t('vote.form.namePlace')"></Input>
 			</FormItem>
 			<FormItem :label="$t('vote.form.target')" prop="classes">
 				<RadioGroup v-model="classType" @on-change="onClassTypeChange" v-if="voteFormEdit">

TEAMModelOS/ClientApp/src/components/vote/BaseVoteTable.vue

@@ -33,7 +33,7 @@
                         title: vm.$t('vote.option'),
                         key: 'option',
                         render: (h, params) => {
-                            return h('span', params.row.option === 'Null' ? '未投票' : params.row.option)
+                            return h('span', params.row.option === 'Null' ? vm.$t('vote.noVote') : params.row.option)
                         },
                     },
                     {

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

@@ -259,5 +259,10 @@ export default {
 		formatErrorTip:'请输入正确格式的网址地址！',
 		noCompleteTip:'请填写完整',
 	},
-	completeCount:'填空数量'
+	completeCount:'填空数量',
+	addTip1:'当前配分超过试卷总分，请重新分配!',
+	addTip2:'最多只有10个选项！',
+	addTip3:'至少保留一个正确答案!',
+	addTip4:'至少保留两个选项!',
+	addTip5:'没有查询到题目!'
 }

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

@@ -4,8 +4,11 @@ export default {
 		tab1:'统计数据',
 		tab2:'评测数据',
 	},
+	noData:'暂无有效数据返回！',
 	allClasses:'所有班级',
 	all:'全部',
+	classBaseInfo:'班级基本数据',
+	scoreRate:'得分率分布图',
     // EvaluationList.vue
     text1: '历次考试汇总',
     text2: '次数',

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

@@ -259,5 +259,10 @@ export default {
 	formatErrorTip:'請輸入正確格式的網址地址！',
 	noCompleteTip:'請填寫完整',
 	},
-	completeCount:'填空數量'
+	completeCount:'填空數量',
+	addTip1:'當前配分超過試卷總分，請重新分配！',
+	addTip2:'最多只有10個選項！',
+	addTip3:'至少保留一個正確答案！',
+	addTip4:'至少保留兩個選項！',
+	addTip5:'沒有査詢到題目！'
 }

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

@@ -3,9 +3,12 @@ export default {
 		title: '學情分析儀錶盤',
 		tab1: '統計資料',
 		tab2: '評測數據',
+		noData:'暫無有效數據返回！'
 	},
 	allClasses:'所有班級',
 	all:'全部',
+	classBaseInfo:'班級基本數據',
+	scoreRate:'得分率分佈圖',
 	// EvaluationList.vue
 	text1: '歷次考試匯總',
 	text2: '次數',

TEAMModelOS/ClientApp/src/service/User.js

@@ -76,6 +76,7 @@ export class User {
           localStorage.removeItem('user_profile')
           localStorage.removeItem('school_profile')
           localStorage.removeItem('student_profile')
+          localStorage.removeItem('filterConditions')
           
           // 重置登录状态
           User.$access.reset();

TEAMModelOS/ClientApp/src/view/evaluation/bank/TestPaperList.vue

@@ -325,7 +325,7 @@
 			 * @param code
 			 */
 			getPeriodName(code) {
-				return this.$store.state.user.schoolProfile.school_base ? this.$store.state.user.schoolProfile.school_base.period.filter(i => i.id === code)[0].name : '暂无'
+				return this.$store.state.user.schoolProfile.school_base ? this.$store.state.user.schoolProfile.school_base.period.filter(i => i.id === code)[0].name : this.$t('evaluation.noData')
 			},
 
 			/**
@@ -334,7 +334,7 @@
 			 */
 			getGradeName(periodId, code) {
 				return this.$store.state.user.schoolProfile.school_base ? this.$store.state.user.schoolProfile.school_base.period.filter(i => i.id === periodId)[0].grades.filter(j =>
-					j.id === code)[0].name : '空'
+					j.id === code)[0].name : this.$t('evaluation.noData')
 			},
 
 			/**

TEAMModelOS/ClientApp/src/view/evaluation/components/BaseCreateChild.vue

@@ -73,7 +73,7 @@
 		</div>
 
 		<!-- 选择知识点弹窗 -->
-		<Modal v-model="selectPointsModal" :title="'选择知识点'" width="600px" class="related-point-modal" style="z-index: 99999">
+		<Modal v-model="selectPointsModal" :title="$t('evaluation.newExercise.choosePoint')" width="600px" class="related-point-modal" style="z-index: 99999">
 			<BasePoints v-if="selectPointsModal" ref="pointRef" :period="schoolInfo.period[curPeriodIndex].id" :subject="schoolInfo.period[curPeriodIndex].subjects[curSubjectIndex].id"
 			 @onCheckChange="onCheckChange" :points="exercisePoints" :scope="curScope"></BasePoints>
 			<!--<CreateNewChild v-if="isLoadModal" ref="newChild" :isChildEdit="isChildEdit" :editItem="editChild"></CreateNewChild>-->

TEAMModelOS/ClientApp/src/view/evaluation/components/BaseEditExercise.vue

@@ -52,7 +52,7 @@
 						<span class="exercise-item-point-close"> 
 							<Icon type="md-close" @click="onDeletePoint(index)" /></span>
 					</span>
-					<span class="exercise-item-point-modify" @click="selectPointsModal = true">修改</span>
+					<span class="exercise-item-point-modify" @click="selectPointsModal = true">{{ this.$t('evaluation.newExercise.modify') }}</span>
 				</div>
 			</div>
 		</div>
@@ -418,10 +418,7 @@
 						// 如果是试卷内编辑试题 则返回编辑好的数据 再统一进行保存
 						this.saveExercise(exerciseItem);
 					}
-				} else if (exerciseItem.level === 0) {
-					this.$Message.warning("题目难度未设置！");
-					this.isLoading = false;
-				} else {
+				} else{
 					this.$Message.warning(this.$t('evaluation.newExercise.unCompleteTip'));
 					this.isLoading = false;
 				}

TEAMModelOS/ClientApp/src/view/evaluation/components/BaseExerciseList.vue

@@ -519,7 +519,7 @@
 				/** 重新计算剩余分配分数 */
 				this.surPlusScore = this.paperInfo.score - this.groupTypeList.reduce((p, e) => parseInt(p) + parseInt(e.score), 0)
 				if (this.surPlusScore < 0) {
-					this.$Message.warning("当前配分超过试卷总分，请重新分配!")
+					this.$Message.warning(this.$t('totalAnalysis.addTip1'))
 				} else {
 					/* 按照题型配分后平均分配给每个子题 */
 					this.groupTypeList.forEach(item => {
@@ -567,7 +567,7 @@
 				
 				this.$refs.paperEdit.isLoading = false
 				this.editExerciseModal = false
-				this.$Message.success("修改成功！")
+				this.$Message.success(this.$t('evaluation.editSuc'))
 				
 				this.exerciseList.splice(this.currentExerciseIndex, 1, item)
 				this.curTypeItems.splice(this.curIndex, 1, item)

TEAMModelOS/ClientApp/src/view/evaluation/components/BasePointPie.vue

@@ -80,7 +80,7 @@
 			})
 			let typeList = this._.groupBy(tempArr, 'knowledge')
 			for (let key in typeList) {
-				let newKey = key === 'undefined' || !key ?  '未绑定知识点' : key
+				let newKey = key === 'undefined' || !key ?  this.$t('evaluation.noPoints') : key
 				let isExistIndex = arr.map(i => i.name).indexOf(newKey)
 				if(arr.length && isExistIndex > -1){
 					arr[isExistIndex].value = arr[isExistIndex].value + typeList[key].length

TEAMModelOS/ClientApp/src/view/evaluation/index/CreatePaper.vue

@@ -901,8 +901,7 @@
 							}
 						})
 					} catch (e) {
-						this.$Message.error('上传失败！')
-						console.log(e)
+						this.$Message.error(this.$t('evaluation.paperList.saveItemsFailTip'))
 						this.isLoading = false
 					}
 				})

TEAMModelOS/ClientApp/src/view/evaluation/types/BaseMultiple.vue

@@ -132,7 +132,7 @@
 						this.refreshOrder()
 					})
 				} else {
-					this.$Message.warning('最多只有10个选项！')
+					this.$Message.warning(this.$t('evaluation.addTip2'))
 				}
 			},
 			
@@ -142,7 +142,7 @@
 				this.$nextTick(() => {
 				    if (this.trueArr.indexOf(index) > -1) {
 						if(this.trueArr.length === 1){
-							this.$Message.warning('至少保留一个正确答案!')
+							this.$Message.warning(this.$t('evaluation.addTip3'))
 						}else{
 							this.trueArr.splice(this.trueArr.indexOf(index), 1)
 						}
@@ -197,7 +197,7 @@
 					// 如果删除的是正确答案 则重置正确答案
 					if(this.trueArr.indexOf(index) > -1){
 						if(this.trueArr.length === 1){
-							this.$Message.warning('至少保留一个正确答案!')
+							this.$Message.warning(this.$t('evaluation.addTip3'))
 						}else{
 							this.trueArr.splice(this.trueArr.indexOf(index),1)
 							// 确保当前存在的options保持同步
@@ -223,7 +223,7 @@
 					}
 					
 				} else {
-					this.$Message.warning('至少保留两个选项！')
+					this.$Message.warning(this.$t('evaluation.addTip4'))
 				}
 			},
 

TEAMModelOS/ClientApp/src/view/evaluation/types/BaseSingle.vue

@@ -127,7 +127,7 @@
 						this.refreshOrder()
 					})
 				} else {
-					this.$Message.warning('最多只有10个选项！')
+					this.$Message.warning(this.$t('evaluation.addTip2'))
 				}
 			},
 
@@ -187,7 +187,7 @@
 					// 刷新选项序号显示
 					this.refreshOrder()
 				} else {
-					this.$Message.warning('至少保留两个选项！')
+					this.$Message.warning(this.$t('evaluation.addTip4'))
 				}
 			},
 

TEAMModelOS/ClientApp/src/view/learnactivity/ManualCreate.vue

@@ -117,7 +117,7 @@
                 <!-- <Loading :top="100" v-show="isLoading"></Loading> -->
                 <ExerciseList ref="exList" :selQue="selQue" :propsList="questionList" @pageScroll="doScroll"
 				 @on-question-change="selectQuestion"></ExerciseList>
-                <EmptyData style="margin-top:120px;" v-if="!isLoading && questionList.length == 0" textContent="没有查询到题目"></EmptyData>
+                <EmptyData style="margin-top:120px;" v-if="!isLoading && questionList.length == 0" :textContent="$t('evaluation.addTip5')"></EmptyData>
                 <!-- <div class="page-wrap">
                     <Page :current.sync="pageNum" :total="totalNum" show-total :page-size="pageSize" size="small" show-sizer @on-change="getCurrentPageData" />
                 </div> -->

TEAMModelOS/ClientApp/src/view/questionnaire/ManageQuestionnaire.vue

@@ -506,7 +506,7 @@
 						let itemJson = JSON.parse(await this.$tools.getFile(blobHost + url + sasString.sas))
 						resolve(itemJson)
 					}catch(e){
-						this.$Message.error('文件获取失败！')
+						this.$Message.error(this.$t('vote.getDataFailTip'))
 						reject(e)
 					}
 				})

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/AchievementAnalysis/EarlyWarning.vue

@@ -11,42 +11,42 @@
             </span>
         </Row> -->
 		<Row>
-			<span class="component-title" style="margin-top:40px">班级基础数据</span>
+			<span class="component-title" style="margin-top:40px">{{ this.$t('totalAnalysis.classBaseInfo') }}</span>
 		</Row>
 		<Row class-name="component-percents">
 			<div class="percent-item warning-info-item">
 				<div class="fl-col-center">
-					<span class="percent-name">总人数</span>
+					<span class="percent-name">{{ this.$t('totalAnalysis.ach_text11') }}</span>
 					<span class="percent-value">{{ currentClass.stuCount || 0 }}</span>
 				</div>
 			</div>
 			<div class="percent-item warning-info-item">
 				<div class="fl-col-center">
-					<span class="percent-name">达标人数</span>
+					<span class="percent-name">{{ this.$t('totalAnalysis.ach_text8') }}</span>
 					<span class="percent-value">{{ currentClass.lineCount || 0 }}</span>
 				</div>
 			</div>
 			<div class="percent-item">
 				<div class="fl-col-center">
-					<span class="percent-name">平均分</span>
-					<span class="percent-value">{{ currentClass.totalAverage.toFixed(1) }}</span>
+					<span class="percent-name">{{ this.$t('totalAnalysis.ach_text9') }}</span>
+					<span class="percent-value">{{ ((currentClass.lineCount / currentClass.stuCount) * 100).toFixed(1) }}%</span>
 				</div>
 			</div>
 			<div class="percent-item">
 				<div class="fl-col-center">
-					<span class="percent-name">达标率</span>
-					<span class="percent-value">{{ ((currentClass.lineCount / currentClass.stuCount) * 100).toFixed(1) }}</span>
+					<span class="percent-name">{{ this.$t('totalAnalysis.ach_table_text3') }}</span>
+					<span class="percent-value">{{ currentClass.totalAverage.toFixed(1) }}</span>
 				</div>
 			</div>
 			<div class="percent-item">
 				<div class="fl-col-center">
-					<span class="percent-name">标准差</span>
+					<span class="percent-name">{{ this.$t('totalAnalysis.ach_table_text4') }}</span>
 					<span class="percent-value">{{ currentClass.standardDeviation.toFixed(1) }}</span>
 				</div>
 			</div>
 			<div class="percent-item">
 				<div class="fl-col-center">
-					<span class="percent-name">得分率</span>
+					<span class="percent-name">{{ this.$t('totalAnalysis.sca_chart_text1') }}</span>
 					<span class="percent-value">64.58%</span>
 				</div>
 			</div>
@@ -54,17 +54,21 @@
 
 		<!-- 班级均分分析 -->
 		<Row class-name="averageBarRow">
-			<span class="component-title">{{$t('totalAnalysis.ach_title8')}}</span>
-			<div class="sort-box">
-				<span
-					style="font-size:14px;margin-right:10px;color: #a9a9a9;">{{$t('totalAnalysis.ach_chart_text1')}}:</span>
-				<Select v-model="sortValue" style="width:120px" @on-change="handleSort">
-					<Option v-for="(item,index) in sortArr" :value="index" :label="item" :key="index"></Option>
-				</Select>
-			</div>
-		</Row>
-		<Row>
-			<div id="stuAverageBar"></div>
+			<Col span="12">
+				<span class="component-title">{{$t('totalAnalysis.ach_title8')}}</span>
+				<div class="sort-box">
+					<!-- <span
+						style="font-size:14px;margin-right:10px;color: #a9a9a9;">{{$t('totalAnalysis.ach_chart_text1')}}:</span> -->
+					<Select v-model="sortValue" style="width:120px" @on-change="handleSort">
+						<Option v-for="(item,index) in sortArr" :value="index" :label="item" :key="index"></Option>
+					</Select>
+				</div>
+				<div id="stuAverageBar"></div>
+			</Col>
+			<Col span="12">
+				<span class="component-title">{{ this.$t('totalAnalysis.scoreRate') }}</span>
+				<BaseScoreRateBar></BaseScoreRateBar>
+			</Col>
 		</Row>
 		<!-- PR排名表格 -->
 		<Row class-name="base-table-row">
@@ -77,9 +81,10 @@
 
 <script>
 	import BaseTable from '@/components/student-analysis/total/BaseMyTable.vue'
+	import BaseScoreRateBar from '@/components/student-analysis/total/BaseScoreRateBar.vue'
 	export default {
 		components: {
-			BaseTable
+			BaseTable,BaseScoreRateBar
 		},
 		data() {
 			return {
@@ -179,9 +184,6 @@
 				}, {
 					tableRef: 'entryRateTable',
 					tableName: '进线率统计'
-				}, {
-					tableRef: 'achievementTable',
-					tableName: '预警统计表格'
 				}])
 				this.$router.back(-1)
 				this.$parent.isShowQuestions = false
@@ -198,19 +200,19 @@
 				let curClassItem = analysisJson.classes.filter(i => i.className === this.className)[0]
 				let studentIds = curClassItem.studentIds
 				this.currentClass = curClassItem
-				this.classAverage = curClassItem.subjects[subjectIndex].average
+				this.classAverage = subjectIndex === 0 ? curClassItem.totalAverage.toFixed(1) : curClassItem.subjects[subjectIndex - 1].average
+				// 判断当前选择科目是全科还是单科 赋予不同的值
 				studentIds.forEach((stuId, stuIndex) => {
 					let stuItem = analysisJson.students.filter(i => i.id === stuId)[0]
-					let stuSubjectItem = analysisJson.students.filter(i => i.id === stuId)[0].subjects[
-						subjectIndex]
+					let stuSubjectItem = subjectIndex === 0 ? null : analysisJson.students.filter(i => i.id === stuId)[0].subjects[subjectIndex - 1]
 					result.push({
 						name: stuItem.name,
 						setNo: stuItem.no,
-						score: stuSubjectItem.score,
-						classPR: stuSubjectItem.cpr,
-						classRank: stuSubjectItem.csort,
-						gradePR: stuSubjectItem.gpr,
-						gradeRank: stuSubjectItem.gsort,
+						score: subjectIndex === 0 ? stuItem.total : stuSubjectItem.score,
+						classPR: subjectIndex === 0 ? stuItem.cpr : stuSubjectItem.cpr,
+						classRank: subjectIndex === 0 ? stuItem.csort : stuSubjectItem.csort,
+						gradePR: subjectIndex === 0 ? stuItem.gpr : stuSubjectItem.gpr,
+						gradeRank: subjectIndex === 0 ? stuItem.gsort : stuSubjectItem.gsort,
 						areaPR: 0,
 						areaRank: 0
 					})
@@ -228,6 +230,7 @@
 				let myBar = this.$echarts.init(document.getElementById('stuAverageBar'))
 				var option = {
 					legend: {
+						top: 40,
 						data: [{
 								name: this.$t('totalAnalysis.ach_table_text2'),
 								textStyle: {
@@ -286,10 +289,10 @@
 					grid: {
 						show: false,
 						containLabel: true,
-						height: 480,
-						width: '90%',
-						x2: '5%',
-						left: '3%',
+						height: 300,
+						width: '80%',
+						top:'20%',
+						left: '8%',
 						tooltip: {
 							show: true,
 							trigger: 'axis', // 触发类型
@@ -348,7 +351,11 @@
 						data: echartData.map(item => item.setNo)
 					},
 					yAxis: {
+						name: this.$t('totalAnalysis.ach_table_text2'),
 						show: true,
+						nameTextStyle: {
+							color: '#a2a2a2'
+						},
 						type: 'value',
 						axisLabel: {
 							show: true,
@@ -373,7 +380,7 @@
 							type: 'bar',
 							itemStyle: {
 								normal: { // 渐变色
-									color: 'rgb(102,204,204)'
+									color: '#07cdd8'
 								},
 							},
 							barMaxWidth: 40,
@@ -420,52 +427,6 @@
 							},
 							data: echartData.map(item => Number(this.classAverage))
 						},
-						// {
-						//     name: this.$t('totalAnalysis.ach_text5'),
-						//     type: 'line',
-						//     itemStyle: {
-						//         color: '#ff33cc',
-						//         width: 0
-						//     },
-						//     symbol: 'none',
-						//     lineStyle: {
-						//         type: 'dashed',
-						//         width: 0
-						//     },
-						//     markLine: {
-						//         data: [
-						//             { type: 'average' }
-						//         ],
-						//         lineStyle: {
-						//             color: '#ff33cc',
-						//             type: 'dashed'
-						//         }
-						//     },
-						//     data: echartData.map(item => Number(this.gradeAverage))
-						// },
-						// {
-						//     name: this.$t('totalAnalysis.ach_text6'),
-						//     type: 'line',
-						//     itemStyle: {
-						//         color: '#66ff99',
-						//         width: 0
-						//     },
-						//     symbol: 'none',
-						//     lineStyle: {
-						//         type: 'dashed',
-						//         width: 0
-						//     },
-						//     markLine: {
-						//         data: [
-						//             { type: 'average' }
-						//         ],
-						//         lineStyle: {
-						//             color: '#66ff99',
-						//             type: 'dashed'
-						//         }
-						//     },
-						//     data: echartData.map(item => Number(this.areaAverage))
-						// }
 					]
 				}
 
@@ -550,7 +511,7 @@
 	}
 
 	#stuAverageBar {
-		height: 600px;
+		height: 500px;
 	}
 
 	.averageBarRow {
@@ -559,8 +520,11 @@
 
 	.sort-box {
 		position: absolute;
-		right: 50px;
-		top: 20px;
+		right: 100px;
+		top: 50px;
+		font-size: 12px;
+		z-index: 999;
+		
 	}
 </style>
 
@@ -570,24 +534,33 @@
 	}
 
 	.sort-box .ivu-select {
-		margin: 5px 0;
-		height: 34px;
+		height: 25px;
+		line-height: 25px;
+		font-size: 12px;
 	}
 
 	.sort-box .ivu-select-single .ivu-select-selection {
-		height: 30px;
+		height: 25px;
+		line-height: 25px;
 		background: transparent;
 		border: 1px solid #a9a9a9;
 		box-shadow: none;
 	}
+	
+	.sort-box .ivu-select-selected-value{
+		line-height: 25px !important;
+		height: 25px !important;
+		font-size: 12px !important;
+	}
 
 	.sort-box .ivu-select-single .ivu-select-dropdown {
 		/*background: #595959;*/
+		font-size: 12px;
 	}
 
 	.sort-box .ivu-select-single .ivu-select-placeholder {
-		height: 30px;
-		line-height: 26px;
+		height: 25px;
+		line-height: 25px;
 		font-size: 16px;
 	}
 

TEAMModelOS/ClientApp/src/view/student-analysis/total-analysis/AchievementAnalysis/EntryTables.vue

@@ -49,7 +49,11 @@
                     },
                     {
                         title: this.$t('totalAnalysis.base_class'),
-                        key: 'className'
+                        key: 'className',
+						filters: [],
+						filterMultiple: false,
+						filterRemote(value, row) {
+						}
                     },
                     {
                         title: this.$t('totalAnalysis.ach_table_text1'),
@@ -84,11 +88,15 @@
                     },
                     {
                         title: this.$t('totalAnalysis.base_class'),
-                        key: 'name'
+                        key: 'className',
+						filters: [],
+						filterMultiple: false,
+						filterRemote(value, row) {
+				 		}
                     },
 					{
 					    title: this.$t('totalAnalysis.sca_chart_text1'),
-					    key: 'name',
+					    key: 'scoreRate',
 					    sortable: 'custom',
 					    minWidth: 50
 					},
@@ -183,7 +191,7 @@
 				analysisJson.classes.forEach((classItem,classIndex) => {
 					result.push({
 						gradeRank:0,
-						name:classItem.className,
+						className:classItem.className,
 						entryNum:classItem.lineCount,
 						totalNum:classItem.stuCount,
 						overAverageRate:classItem.stuCount > 0 ? ((classItem.lineCount / classItem.stuCount) * 100).toFixed(2) : 0.00,
@@ -194,7 +202,7 @@
 				/* 根据超均率 来对班级进行年级排名 */
 				let rateRanks = result.sort((a, b) => { return Number(b.average) - Number(a.average) })
 				result.forEach(item => {
-					item.gradeRank = rateRanks.map(i => i.name).indexOf(item.name) + 1
+					item.gradeRank = rateRanks.map(i => i.className).indexOf(item.className) + 1
 				})
 				return result
 			}
@@ -207,6 +215,16 @@
 				this.renderColumns(this.getAnalysisJson) // 渲染科目表头
 				this.entryTableData = this.getTableDatas(this.getAnalysisJson)
 				this.entryBarData = this.getEntryBarData(this.getAnalysisJson)
+				
+				let filterArr = []
+				this.getAnalysisJson.classes.forEach(i => {
+					filterArr.push({
+						label:i.className,
+						value:i.className
+					})
+				})
+				this.entryRateColumns[1].filters = filterArr
+				this.entryNumberColumns[1].filters = filterArr
             }
         },
         computed: {

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

@@ -146,7 +146,7 @@
 								</span>
 								<span>{{ $t("totalAnalysis.sca_chart_text1") }}：
 									<!-- 得分率数据 -->
-									{{ item.score.toFixed(2) + '%' }}
+									<!-- {{ item.score.toFixed(2) + '%' }} -->
 								</span>
 								<!-- <span>{{ $t("totalAnalysis.echarts_text15") }}：
 										</span> -->
@@ -245,6 +245,7 @@
 			};
 		},
 		created() {
+			
 			this.getSchoolInfo();
 			// this.getHomePageData();
 			this.getExamList();
@@ -257,17 +258,7 @@
 					let schoolBaseInfo = res.school_base;
 					if (schoolBaseInfo) {
 						this.schoolData = schoolBaseInfo;
-						//默认选中第一个学段
-						if (this.schoolData.period && this.schoolData.period.length) {
-							this.filterPeriod = this.schoolData.period[0].name
-							this.filterPeriodChange()
-						}
-						//年级和学科默认选中全部
-						// if (this.filterConditions.period && this.schoolData.period[0].grades.length) {
-						//     this.filterGrade = this.schoolData.period[0].grades[0].name
-						//     this.filterGradeChange()
-						// }
-						console.log(this.filterConditions)
+						
 						if (schoolBaseInfo.period.length) {
 							this.filterData.periodList = [this.defaultAll].concat(schoolBaseInfo.period);
 							this.filterData.gradeList = [this.defaultAll].concat(schoolBaseInfo.period[0].grades);
@@ -277,6 +268,21 @@
 							.semesters);
 							this.filterData.typeList = this.typeList;
 						}
+						
+						if(localStorage.getItem('filterConditions')){
+							this.filterConditions = JSON.parse(localStorage.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')
+							this.filterType = this.evType[this.filterConditions.type] || this.$t('totalAnalysis.all')
+							this.filterTerm = this.filterConditions.term || this.$t('totalAnalysis.all')
+						}
+						console.log(this.filterConditions)
+						//默认选中第一个学段
+						if (this.schoolData.period && this.schoolData.period.length && !localStorage.getItem('filterConditions')) {
+								this.filterPeriod = this.schoolData.period[0].name
+								this.filterPeriodChange()
+						}
 					}
 				});
 			},
@@ -294,7 +300,7 @@
 							this.gradeList = res.result.data;
 							this.geniusLineData = res.result.data[0];
 						} else {
-							this.$Message.warning("暂无有效数据返回");
+							this.$Message.warning(this.$t('totalAnalysis.noData'));
 						}
 						this.isLoadingList = false;
 						// this.$refs.geniusLine.dataLoading = false
@@ -302,7 +308,7 @@
 					.catch((err) => {
 						console.log(err);
 						this.isLoadingList = false;
-						this.$Message.error("服务器繁忙，请稍后重试！");
+						this.$Message.error(this.$t('http.error500'));
 					});
 			},
 
@@ -323,9 +329,7 @@
 							this.searchList = this.examList.length ? this.examList.map((item) => item.name) : []
 							this.$store.commit("updateExamList", res.examInfo);
 							this.isLoadingList = false;
-							// setTimeout(() => {
-							//     this.doFilter()
-							// }, 2000);
+							
 							this.doFilter()
 						} else {
 							this$Message.error('API ERROR!')
@@ -444,6 +448,7 @@
 			},
 
 			doFilter() {
+				localStorage.setItem('filterConditions',JSON.stringify(this.filterConditions))
 				// 将条件转换成数组便于渲染
 				this.filterList = this.objToArr(this.filterConditions);
 				// 根据条件过滤所有的测验数据
@@ -482,22 +487,28 @@
 
 			async handleChooseExam(item, index) {
 				this.isLoadingList = true
-				let examSummary = await this.getExamSummary(item)
-				this.$store.commit('clearAnalysis', null)
-				this.$store.dispatch('getAnalysisJson', {
-					code: item.code.replace('Exam-', ''),
-					id: item.id
-				}).then(res => {
-					console.log(res)
-					localStorage.setItem('curExam', JSON.stringify(examSummary))
-					this.isLoadingList = false
-					this.$router.push({
-						path: "/total"
-					});
-				}).catch(err => {
-					this.$Message.error('该评测班级数据获取异常，请稍后再试！')
+				try{
+					let examSummary = await this.getExamSummary(item)
+					this.$store.commit('clearAnalysis', null)
+					this.$store.dispatch('getAnalysisJson', {
+						code: item.code.replace('Exam-', ''),
+						id: item.id
+					}).then(res => {
+						console.log(res)
+						localStorage.setItem('curExam', JSON.stringify(examSummary))
+						this.isLoadingList = false
+						this.$router.push({
+							path: "/total"
+						});
+					}).catch(err => {
+						this.$Message.error(this.$t('totalAnalysis.noData'))
+						this.isLoadingList = false
+					})
+				}catch(e){
 					this.isLoadingList = false
-				})
+					this.$Message.error('API ERROR!')
+				}
+				
 			},
 
 			/* 获取当前点击评测的详情数据 */
@@ -516,7 +527,6 @@
 							},
 							err => {
 								j(err)
-								this.$Message.error('API ERROR!')
 							}
 					)
 				})
@@ -526,6 +536,8 @@
 			if (this.$route.params.tabName) {
 				this.tabName = this.$route.params.tabName;
 			}
+			
+			
 		},
 		computed: {
 			getJoinRate() {

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

@@ -104,7 +104,7 @@
                     },
 					{
 					    title: this.$t('totalAnalysis.sca_chart_text1'),
-					    key: 'no',
+					    key: 'scoreRate',
 					    sortable: 'custom',
 					    minWidth: 50
 					},
@@ -121,12 +121,12 @@
 						},
 					    minWidth: 60
 					},
-                    {
-                        title: this.$t('totalAnalysis.base_score'),
-                        sortable: 'custom',
-                        key: 'score',
-                        minWidth: 60
-                    },
+                    // {
+                    //     title: this.$t('totalAnalysis.base_score'),
+                    //     sortable: 'custom',
+                    //     key: 'score',
+                    //     minWidth: 60
+                    // },
                     {
                         title: this.$t('totalAnalysis.sca_table_text1'),
                         key: 'trueNum',
@@ -214,7 +214,7 @@
                 this.tableData = this.renderData(this.getAnalysisJson)
 				console.log(this.tableData)
 				this.originTableData = JSON.parse(JSON.stringify(this.tableData)) 
-                this.classList = ['全部'].concat([...new Set(this.getAnalysisJson.classes.map(item => item.className))]) // 获取班级列表
+                this.classList = [this.$t('totalAnalysis.allClasses')].concat([...new Set(this.getAnalysisJson.classes.map(item => item.className))]) // 获取班级列表
             }
 			
 			this.$EventBus.$off('onSubjectChange')
@@ -226,6 +226,8 @@
 			
 			this.$EventBus.$off('changeClassName')
 			this.$EventBus.$on('changeClassName',val => {
+				console.log('落点选择的班级',val)
+				console.log(this.classList)
 				 this.onClassSelect(this.classList.indexOf(val))
 			})
         },
@@ -243,7 +245,7 @@
                     if (val) {
                         this.tableData = this.renderData(JSON.parse(JSON.stringify(val)) )
 						this.originTableData = JSON.parse(JSON.stringify(this.tableData)) 
-                        this.classList = ['全部'].concat([...new Set(val.classes.map(item => item.className))])
+                        this.classList = [this.$t('totalAnalysis.allClasses')].concat([...new Set(val.classes.map(item => item.className))])
                     }
                 }
 

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

@@ -185,9 +185,6 @@
 					}, {
 						tableRef: 'entryRateTable',
 						tableName: '进线率统计'
-					}, {
-						tableRef: 'achievementTable',
-						tableName: '预警统计表格'
 					}])
 					this.$router.push({
 						path: '/total'