update

src/modules/teacher/data/exam/components/ScoreRange.vue

 <template>
   <div class="score-range-box">
     <el-card class="box-card" style="height: 450px">
-    <div slot="header" class="clearfix">
-      <h1 style="color: #333; font-size: 16px; border-left: 3px solid #aa1941; padding-left: 7px">考分区间</h1>
-      <el-button type="text" style="font-size: 16px; color: #aa1941; float: right; margin-top: -35px">设置</el-button>
-    </div>
-    <div style="height: 400px; width: 90%; margin: 0 auto">
-      <div id="score" style="width: 100%; height: 90%"></div>
-    </div>
-  </el-card>
+      <div slot="header" class="clearfix">
+        <h1 style="color: #333; font-size: 16px; border-left: 3px solid #aa1941; padding-left: 7px">考分区间</h1>
+        <el-button type="text" style="font-size: 16px; color: #aa1941; float: right; margin-top: -35px">设置</el-button>
+      </div>
+      <div style="height: 400px; width: 90%; margin: 0 auto">
+        <div id="score" style="width: 100%; height: 90%"></div>
+      </div>
+    </el-card>
     <set-score-range class="pop"></set-score-range>
   </div>
 </template>
@@ -75,7 +75,6 @@ export default {
   }
 }
 </script>
-<<<<<<< HEAD
 
 <style lang="scss" scoped>
 .score-range-box{
@@ -89,5 +88,3 @@ export default {
   }
 }
 </style>
-=======
->>>>>>> 21fd47ec6e436a323257a3f4bb63e4971b1987b1