diff --git a/src/components/charts/barChart.vue b/src/components/charts/barChart.vue index b37e7be..08628fd 100644 --- a/src/components/charts/barChart.vue +++ b/src/components/charts/barChart.vue @@ -57,8 +57,8 @@ export default { xAxis: { type: "category", axisLine: { show: true, lineStyle: { color: "#e2e2e2" } }, - axisLabel: { color: "#666" }, - axisTick: { show: false }, + axisLabel: { color: "#666", interval: 0,rotate:xAxis.length>6?45:0 ,margin:20}, + axisTick: { show: true }, boundaryGap: true, data: xAxis, }, @@ -85,7 +85,7 @@ export default { top: 60, left: 20, right: 40, - bottom: 30, + bottom: 10, containLabel: true, }, series: params.map((item) => { diff --git a/src/views/standard/analysis/index.vue b/src/views/standard/analysis/index.vue index 74239c1..d7aae05 100644 --- a/src/views/standard/analysis/index.vue +++ b/src/views/standard/analysis/index.vue @@ -359,7 +359,10 @@ export default { if (status === 0) { this.chartData[0].value = []; this.chartData[1].value = []; - this.xAxis = [...this.query.secGraClaSubName]; + this.xAxis = this.query.secGraClaSubName.map(item=>{ + let arr = item.split('/') + return arr[0]+'\n'+ arr.slice(1,arr.length).join('/') + }); data?.list.map((item, index) => { this.chartData[0].value.push(item.periodCount); this.chartData[1].value.push(item.examCount); @@ -414,7 +417,7 @@ export default { }; }); this.gradeList = this.schoolList.map((item) => { - if (this.query.secGraClaSub.length < 6) { + if (this.query.secGraClaSub.length < 10) { this.query.secGraClaSub.push([item.id]); this.query.secGraClaSubName.push(item.schoolName); } @@ -463,7 +466,7 @@ export default { }) || []; this.gradeList.map((sec) => { sec.children.map((items) => { - if (this.query.secGraClaSub.length < 6) { + if (this.query.secGraClaSub.length < 10) { this.query.secGraClaSub.push([sec.value, items.value]); this.query.secGraClaSubName.push( `${sec.label}/${items.label}` diff --git a/src/views/standard/setUp/student.vue b/src/views/standard/setUp/student.vue index 8f3a069..c7c5ff0 100644 --- a/src/views/standard/setUp/student.vue +++ b/src/views/standard/setUp/student.vue @@ -515,17 +515,15 @@ export default { //学生调班弹窗 openChangeClazz(obj) { console.log(obj); - if (this.query.grade == 80) { + if (this.query.grade == 80 || !this.query.grade) { this._QueryClazz(obj.grade); } this.formStuCla.classId = ""; this.formStuCla.studentId = obj.id; - this.formStuCla.className = - obj.classList && obj.classList[0]?.className; + this.formStuCla.className = obj.classList && obj.classList[0]?.className; this.formStuCla.studentName = obj.studentName; this.formStuCla.studentCode = obj.studentCode; - this.formStuCla.oldClassId = - obj.classList && obj.classList[0]?.id; + this.formStuCla.oldClassId = obj.classList && obj.classList[0]?.id; this.diaChangeClass = true; }, //学生调班