Commit 3a9aa32b3fc611ab567b62c1d6a7efec817672f0

Authored by 梁保满
1 parent c0026d5f

学生搜索调班无数据问题,使用分析默认个数,标签样式

src/components/charts/barChart.vue
@@ -57,8 +57,8 @@ export default { @@ -57,8 +57,8 @@ export default {
57 xAxis: { 57 xAxis: {
58 type: "category", 58 type: "category",
59 axisLine: { show: true, lineStyle: { color: "#e2e2e2" } }, 59 axisLine: { show: true, lineStyle: { color: "#e2e2e2" } },
60 - axisLabel: { color: "#666" },  
61 - axisTick: { show: false }, 60 + axisLabel: { color: "#666", interval: 0,rotate:xAxis.length>6?45:0 ,margin:20},
  61 + axisTick: { show: true },
62 boundaryGap: true, 62 boundaryGap: true,
63 data: xAxis, 63 data: xAxis,
64 }, 64 },
@@ -85,7 +85,7 @@ export default { @@ -85,7 +85,7 @@ export default {
85 top: 60, 85 top: 60,
86 left: 20, 86 left: 20,
87 right: 40, 87 right: 40,
88 - bottom: 30, 88 + bottom: 10,
89 containLabel: true, 89 containLabel: true,
90 }, 90 },
91 series: params.map((item) => { 91 series: params.map((item) => {
src/views/standard/analysis/index.vue
@@ -359,7 +359,10 @@ export default { @@ -359,7 +359,10 @@ export default {
359 if (status === 0) { 359 if (status === 0) {
360 this.chartData[0].value = []; 360 this.chartData[0].value = [];
361 this.chartData[1].value = []; 361 this.chartData[1].value = [];
362 - this.xAxis = [...this.query.secGraClaSubName]; 362 + this.xAxis = this.query.secGraClaSubName.map(item=>{
  363 + let arr = item.split('/')
  364 + return arr[0]+'\n'+ arr.slice(1,arr.length).join('/')
  365 + });
363 data?.list.map((item, index) => { 366 data?.list.map((item, index) => {
364 this.chartData[0].value.push(item.periodCount); 367 this.chartData[0].value.push(item.periodCount);
365 this.chartData[1].value.push(item.examCount); 368 this.chartData[1].value.push(item.examCount);
@@ -414,7 +417,7 @@ export default { @@ -414,7 +417,7 @@ export default {
414 }; 417 };
415 }); 418 });
416 this.gradeList = this.schoolList.map((item) => { 419 this.gradeList = this.schoolList.map((item) => {
417 - if (this.query.secGraClaSub.length < 6) { 420 + if (this.query.secGraClaSub.length < 10) {
418 this.query.secGraClaSub.push([item.id]); 421 this.query.secGraClaSub.push([item.id]);
419 this.query.secGraClaSubName.push(item.schoolName); 422 this.query.secGraClaSubName.push(item.schoolName);
420 } 423 }
@@ -463,7 +466,7 @@ export default { @@ -463,7 +466,7 @@ export default {
463 }) || []; 466 }) || [];
464 this.gradeList.map((sec) => { 467 this.gradeList.map((sec) => {
465 sec.children.map((items) => { 468 sec.children.map((items) => {
466 - if (this.query.secGraClaSub.length < 6) { 469 + if (this.query.secGraClaSub.length < 10) {
467 this.query.secGraClaSub.push([sec.value, items.value]); 470 this.query.secGraClaSub.push([sec.value, items.value]);
468 this.query.secGraClaSubName.push( 471 this.query.secGraClaSubName.push(
469 `${sec.label}/${items.label}` 472 `${sec.label}/${items.label}`
src/views/standard/setUp/student.vue
@@ -515,17 +515,15 @@ export default { @@ -515,17 +515,15 @@ export default {
515 //学生调班弹窗 515 //学生调班弹窗
516 openChangeClazz(obj) { 516 openChangeClazz(obj) {
517 console.log(obj); 517 console.log(obj);
518 - if (this.query.grade == 80) { 518 + if (this.query.grade == 80 || !this.query.grade) {
519 this._QueryClazz(obj.grade); 519 this._QueryClazz(obj.grade);
520 } 520 }
521 this.formStuCla.classId = ""; 521 this.formStuCla.classId = "";
522 this.formStuCla.studentId = obj.id; 522 this.formStuCla.studentId = obj.id;
523 - this.formStuCla.className =  
524 - obj.classList && obj.classList[0]?.className; 523 + this.formStuCla.className = obj.classList && obj.classList[0]?.className;
525 this.formStuCla.studentName = obj.studentName; 524 this.formStuCla.studentName = obj.studentName;
526 this.formStuCla.studentCode = obj.studentCode; 525 this.formStuCla.studentCode = obj.studentCode;
527 - this.formStuCla.oldClassId =  
528 - obj.classList && obj.classList[0]?.id; 526 + this.formStuCla.oldClassId = obj.classList && obj.classList[0]?.id;
529 this.diaChangeClass = true; 527 this.diaChangeClass = true;
530 }, 528 },
531 //学生调班 529 //学生调班