update

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

 <template>
   <el-card class="box-card">
     <div slot="header" class="clearfix">
-<<<<<<< HEAD
-      <h1 style="font-size: 28px">题型数据</h1>
-=======
       <h1 style="color: #333; font-size: 16px; border-left: 3px solid #aa1941; padding-left: 7px">题型数据</h1>
     </div>
     <div style="height: 350px; width: 90%; margin: 0 auto">
@@ -14,7 +11,6 @@
         </div>
         <div class="dec dec1">主观题正确率：<span class="dec" style="color: #919191">待评价</span></div>
       </div>
->>>>>>> edc1ef78b2519ac72935137e8ed7617de68f4525
     </div>
     <div id="type" style="width: 310px; height: 360px"></div>
     <div>客观题正确率76%</div>