From f439bbd3ea99f52532dc77c0ab2f28e7db75134e Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 30 Apr 2021 16:49:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=90=E7=BB=A9=E7=AE=A1=E7=90=86=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/page/Experiment.vue      |  4 +---
 src/components/page/ExperimentTeach.vue |  4 +---
 src/components/page/ExperimentVir.vue   |  4 +---
 src/components/page/ShowExperiment.vue  | 26 +++++++++++++++++++++++--
 4 files changed, 27 insertions(+), 11 deletions(-)

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 @@
                             </el-table-column>
                             <el-table-column prop="startTime" label="实验时间" align="center">
                             </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>
                     </div>
@@ -107,7 +110,7 @@
                             <el-table-column prop="points" label="分值" width="100" align="center"></el-table-column>
                             <el-table-column prop="score" label="得分" width="100" align="center">
                                 <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>
                             </el-table-column>
@@ -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()
         },