Merge branch 'master' of http://121.4.203.192:9000/mingxue/front

src/views/career/components/CollegesLine.vue

@@ -48,7 +48,7 @@
         </el-table-column>
         <!--<el-table-column prop="seatRealTop" label="专业最高分位次" align="center"></el-table-column>-->
         <!--<el-table-column prop="seatRealAverage" label="专业平均分位次" align="center"></el-table-column>-->
-        <el-table-column prop="type" label="批次/段" align="center"></el-table-column>
+        <el-table-column prop="level" label="批次/段" align="center"></el-table-column>
         <el-table-column prop="course" label="选考科目" align="center"></el-table-column>
         <el-table-column prop="score" label="专业最低分" align="center"></el-table-column>
         <el-table-column prop="seat" label="专业最低分位次" align="center"></el-table-column>

src/views/career/zhiyuan/batch.vue

@@ -75,9 +75,9 @@ export default {
         score: {
           label: "控制分数线",
         },
-        pressureRange: {
-          label: "压线分区间",
-        },
+//        pressureRange: {
+//          label: "压线分区间",
+//        },
       }
     };
   },