成绩管理统计等

master
yujialong 4 years ago
parent 299974f6a3
commit f439bbd3ea
  1. 4
      src/components/page/Experiment.vue
  2. 4
      src/components/page/ExperimentTeach.vue
  3. 4
      src/components/page/ExperimentVir.vue
  4. 26
      src/components/page/ShowExperiment.vue

@ -224,7 +224,6 @@ export default {
xAxis: { xAxis: {
name: '分数', name: '分数',
type: 'category', 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'] data: ['0-10', '11-20', '21-30', '31-40', '41-50', '51-60', '61-70', '71-80','81-90','91-100']
}, },
yAxis: { yAxis: {
@ -233,8 +232,7 @@ export default {
}, },
series: [{ series: [{
data, data,
type: 'line', type: 'bar',
areaStyle: {},
color: ['#8191fd'] color: ['#8191fd']
}] }]
}) })

@ -228,7 +228,6 @@ export default {
xAxis: { xAxis: {
name: '分数', name: '分数',
type: 'category', 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'] data: ['0-10', '11-20', '21-30', '31-40', '41-50', '51-60', '61-70', '71-80','81-90','91-100']
}, },
yAxis: { yAxis: {
@ -237,8 +236,7 @@ export default {
}, },
series: [{ series: [{
data, data,
type: 'line', type: 'bar',
areaStyle: {},
color: ['#8191fd'] color: ['#8191fd']
}] }]
}) })

@ -225,7 +225,6 @@ export default {
xAxis: { xAxis: {
name: '分数', name: '分数',
type: 'category', 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'] data: ['0-10', '11-20', '21-30', '31-40', '41-50', '51-60', '61-70', '71-80','81-90','91-100']
}, },
yAxis: { yAxis: {
@ -234,8 +233,7 @@ export default {
}, },
series: [{ series: [{
data, data,
type: 'line', type: 'bar',
areaStyle: {},
color: ['#8191fd'] color: ['#8191fd']
}] }]
}) })

@ -38,7 +38,10 @@
</el-table-column> </el-table-column>
<el-table-column prop="startTime" label="实验时间" align="center"> <el-table-column prop="startTime" label="实验时间" align="center">
</el-table-column> </el-table-column>
<el-table-column prop="score" label="实验成绩" align="center"> <el-table-column label="实验成绩" align="center">
<template slot-scope="scope">
{{form.score}}
</template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
@ -107,7 +110,7 @@
<el-table-column prop="points" label="分值" width="100" align="center"></el-table-column> <el-table-column prop="points" label="分值" width="100" align="center"></el-table-column>
<el-table-column prop="score" label="得分" width="100" align="center"> <el-table-column prop="score" label="得分" width="100" align="center">
<template slot-scope="scope"> <template slot-scope="scope">
<el-input v-if="edit" type="number" min="0" v-model="scope.row.score"></el-input> <el-input v-if="edit" type="number" min="0" v-model.number="scope.row.score"></el-input>
<template v-else>{{scope.row.score}}</template> <template v-else>{{scope.row.score}}</template>
</template> </template>
</el-table-column> </el-table-column>
@ -270,6 +273,25 @@
futuresLoss: [], 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(){ mounted(){
this.getData() this.getData()
}, },

Loading…
Cancel
Save