diff --git a/src/components/page/Experiment.vue b/src/components/page/Experiment.vue index 4b5f594..cf2b819 100644 --- a/src/components/page/Experiment.vue +++ b/src/components/page/Experiment.vue @@ -224,7 +224,6 @@ export default { xAxis: { name: '分数', type: 'category', - boundaryGap: false, data: ['0-10', '11-20', '21-30', '31-40', '41-50', '51-60', '61-70', '71-80','81-90','91-100'] }, yAxis: { @@ -233,8 +232,7 @@ export default { }, series: [{ data, - type: 'line', - areaStyle: {}, + type: 'bar', color: ['#8191fd'] }] }) diff --git a/src/components/page/ExperimentTeach.vue b/src/components/page/ExperimentTeach.vue index 1fada57..87f3dae 100644 --- a/src/components/page/ExperimentTeach.vue +++ b/src/components/page/ExperimentTeach.vue @@ -228,7 +228,6 @@ export default { xAxis: { name: '分数', type: 'category', - boundaryGap: false, data: ['0-10', '11-20', '21-30', '31-40', '41-50', '51-60', '61-70', '71-80','81-90','91-100'] }, yAxis: { @@ -237,8 +236,7 @@ export default { }, series: [{ data, - type: 'line', - areaStyle: {}, + type: 'bar', color: ['#8191fd'] }] }) diff --git a/src/components/page/ExperimentVir.vue b/src/components/page/ExperimentVir.vue index 17648b5..cb75bd1 100644 --- a/src/components/page/ExperimentVir.vue +++ b/src/components/page/ExperimentVir.vue @@ -225,7 +225,6 @@ export default { xAxis: { name: '分数', type: 'category', - boundaryGap: false, data: ['0-10', '11-20', '21-30', '31-40', '41-50', '51-60', '61-70', '71-80','81-90','91-100'] }, yAxis: { @@ -234,8 +233,7 @@ export default { }, series: [{ data, - type: 'line', - areaStyle: {}, + type: 'bar', color: ['#8191fd'] }] }) diff --git a/src/components/page/ShowExperiment.vue b/src/components/page/ShowExperiment.vue index e8ddd85..5e4f7ac 100644 --- a/src/components/page/ShowExperiment.vue +++ b/src/components/page/ShowExperiment.vue @@ -38,7 +38,10 @@ - + + @@ -107,7 +110,7 @@ @@ -270,6 +273,25 @@ futuresLoss: [], } }, + watch: { + sjData: { + handler (newName, oldName) { + let score = 0 + let data = this.sjData + let over = false + data.map(n => { + if(n.points < n.score){ + over || this.$message.error('得分不得大于该考核点分值') + over = true + } + score += n.score + }) + over = false + this.form.score = score + }, + deep: true + } + }, mounted(){ this.getData() },