解决合并冲突g

src/components/MenuComponent.vue

@@ -1,22 +1,24 @@
 <template>
-  <el-col :span="24" class="mainHeader">
-      <el-col :span="2" class="sishuLogo">
+  <el-col :span="24" class="">
+      <el-col :span="2" :offset="1">
        <img class="logoImg" src="../assets/img/log.png"/>
       </el-col>
-      <el-col :span="3" v-show="roles.indexOf(item.id) >= 0" v-for="(item, index) of menuData" :key="item.id"
-      :class="{active:index == checkindex,menu_item:true}"
-      @click.native="secondNavClick(item,index)">
-        <div class="lineStyle"></div>
-        {{item.name}}
+      <el-col :span="2" v-show="roles.indexOf(item.id) >= 0"  v-for="(item, index) of menuData" :key="item.id"
+      @click.native="secondNavClick(item,index)" style="text-align: center">
+        <span class="lineStyle" :class="{active:index == checkindex,menu_item:true}">{{item.name}}</span>
+
       </el-col>
-       <el-col :span="2" class="userLogo">
-         <div class="">
-            <!-- <div v-html= "'Imgurl' +avatar"></div> -->
+
+      <el-col :span="2"  :offset="13">
+        <div class="">
           <img class="userstyle" src="../assets/img/user.jpg"/>
-            <span>{{name}}</span>
-            <img src="../assets/img/pack.png"/>
-         </div>
+          <span>李老师</span>
+          <i class="el-icon-caret-bottom"></i>
+          <img src="" alt="">
+          <span>退出</span>
+        </div>
       </el-col>
+      <el-col :span="1"></el-col>
   </el-col>
 </template>
 
@@ -29,20 +31,19 @@ export default {
   // },
   data() {
     return {
-      Imgurl:"https://xt.sharingschool.com/sz",
       menuData: [ {
     id: "2",
-    name: "校区管理员",
+    name: "校区群管理员",
     href: "SchoolManager",
   },
   {
     id: "2",
-    name: "批改老师注册审核",
+    name: " 在线批改老师",
     href: "TeacherApporval",
   },
   {
     id: "2",
-    name: "批改老师薪酬表",
+    name: "",
     href: "TeacherPay",
   },
  ],
@@ -65,7 +66,7 @@ export default {
       this.checkindex = index;
     }
   },
-   computed: {
+  computed: {
       ...mapGetters(['name', 'avatar','roles'])
     },
   mounted() {
@@ -74,35 +75,35 @@ export default {
 };
 </script>
 <style scoped>
-/* .mainHeader{
-  width: 960px;
-} */
+/*.mainHeader{*/
+  /*height: 110px;*/
+  /*line-height:110px;*/
+/*}*/
 .menu_item {
   cursor: pointer;
   color:#999999; 
   font-size: 9px;
   font-family: serif;
   box-sizing:border-box;
-  height: 90%;
+  height: 80%;
   text-align:center;
-}
-.userLogo{
-  margin-left:100px;
+  padding-bottom:19px ;
+  /*display: inline-block;*/
 }
 .menu_item:hover {
   color:#52CC60 ;
   border-bottom:2px solid #52cc60;
 }
 .active {
-  color:#52CC60;
+  color:#52CC60 !important;
   border-bottom:2px solid #52cc60;
 }
 .menu_item+.menu_item {
   border-left: 1px solid #ffffff;
 }
 .logoImg{
-  width:80px;
-  height:40px;
+  width:136px;
+  height:52px;
 }
 .sishuLogo{
   margin-left:125px;
@@ -112,4 +113,8 @@ export default {
   height:26px;
   border-radius: 15px;
 }
+  .lineStyle{
+    color: #999999;
+    font-size: 18px;
+  }
 </style>

src/pages/Home.vue

@@ -184,6 +184,9 @@
 </script>
 
 <style scoped>
+  .main_conter{
+    height: 1000px;
+  }
   .out{
     margin-left:10px;
     color:#333333;
@@ -260,7 +263,7 @@
     background-color: #fff;
     box-shadow: 0px 0px 20px #eaeaea;
   }
-  .main_header .el-breadcrumb {
+  .el-breadcrumb {
     line-height: 50px;
   }
   .el-breadcrumb .el-breadcrumb__item {

src/pages/home/SchoolManager.vue

@@ -11,7 +11,7 @@
     <!--</div>-->
 
     <!-- table 表格 -->
-    <el-row :gutter="20" class="main-header" >
+    <el-row :gutter="20" class="main-items" >
       <el-col class="aside" :span="4" :offset="1" style="padding: 0 !important;">
         <div class="table-aside" v-for='(v, k) in ItemList' :key='k' :class="{active:k == checkindex}" @click="selectTitle(k)">{{v.text}}</div>
       </el-col>
@@ -495,12 +495,10 @@
     color: #999999;
     font-size: 18px;
   }
-  .main-header{
+  .main-items{
     color: #393939;
-
     text-align: center;
     line-height: 80px;
-    border-bottom: 1px solid #E5E5E5;
   }
   .main-header-item{
     font-size: 20px;