完善单班级排名统计每题得分排序后的数据处理

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

@@ -130,8 +130,6 @@
 
 			// 排序操作
 			onSortChange(data) {
-				console.log(JSON.stringify(this.tableDatas[0]))
-				console.log(data)
 				let order = data.order // 当前排序方式 升序、降序、正常
 				let key = data.key // 当前排序依据
 				switch (order) {
@@ -151,7 +149,6 @@
 					default:
 						break
 				}
-				console.log(this.propsData[0].standardDeviation)
 				this.pageChange(1)
 			},
 
@@ -185,6 +182,7 @@
 							break
 					}
 				}
+				// this.tableDatas = this.originData
 				this.pageChange(1)
 			},
 
@@ -477,12 +475,12 @@
 		watch: {
 			tableDatas:{
 				handler(data,oldData){
+					let earlyFlag = data.length && oldData.length && Object.keys(data[0]).length > Object.keys(oldData[0]).length
 					this.originData = JSON.parse(JSON.stringify(data))
 					this.firstData = JSON.parse(JSON.stringify(data))
-					if (this.isFirst) this.propsData = JSON.parse(JSON.stringify(data))
+					if (this.isFirst || earlyFlag) this.propsData = JSON.parse(JSON.stringify(data))
 					// 获取当前测评班级数据
 					this.subjectList = this.$store.state.totalAnalysis.subjectList
-					// this.subjectList = ['全部'].concat(this.$store.state.totalAnalysis.subjectList)
 					this.pageChange(1)
 					this.isFirst = false
 				},

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

@@ -118,6 +118,15 @@
 						key: 'score',
 						minWidth:100
 					},
+					{
+						title: this.$t('totalAnalysis.sca_chart_text1'),
+						sortable: 'custom',
+						key: 'sRate',
+						minWidth:100,
+						renderType: function(h, params) {
+						    return h('span', (Number(params.row.sRate)).toFixed(2) + '%')
+						},
+					},
 					{
 						title: this.$t('totalAnalysis.ach_table_text8'),
 						key: 'classRank',
@@ -233,9 +242,9 @@
 							minWidth:100
 						})
 					})
-					this.earlyPercentColumns.splice(5,this.earlyPercentColumns.length - 5,...itemsColumns)
+					this.earlyPercentColumns.splice(6,this.earlyPercentColumns.length - 6,...itemsColumns)
 				}else{
-					this.earlyPercentColumns.splice(5,this.earlyPercentColumns.length - 5)
+					this.earlyPercentColumns.splice(6,this.earlyPercentColumns.length - 6)
 				}
 				return result
 			},

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

@@ -111,7 +111,7 @@
 					    sortable: 'custom',
 					    minWidth: 50,
 						renderType: function(h, params) {
-						    return h('span', (Number(params.row.sRate) * 100).toFixed(2) + '%')
+						    return h('span', (Number(params.row.sRate)).toFixed(2) + '%')
 						},
 					},
 					{