解决合并冲突

src/App.vue

@@ -85,7 +85,9 @@
       </div>
       <el-container style="margin-left: 3px">
         <el-header style="background: #ffffff; height: auto">
-          <div class="logo hidden-xs" v-if="isShow">当前: <span>安徽省</span></div>
+          <div class="logo hidden-xs" v-if="isShow">
+            当前: <span>安徽省</span>
+          </div>
           <el-menu
             :default-active="activeIndex"
             class="el-menu-demo"
@@ -97,7 +99,7 @@
             style="text-align: center"
             router
           >
-          <!-- 头部菜单 -->
+            <!-- 头部菜单 -->
             <el-submenu index="1">
               <template slot="title">
                 <i class="el-icon-bank-card"></i>
@@ -118,7 +120,6 @@
               <el-menu-item index="recruitmentPlan" >招聘计划管理</el-menu-item>
               <el-menu-item index="RecruitmentPeople">招聘人员管理</el-menu-item>
             </el-submenu>
-
             <el-submenu index="3">
               <template slot="title">奖惩合同管理</template>
               <el-menu-item index="3-1">奖励管理</el-menu-item>
@@ -183,16 +184,12 @@
               <el-menu-item index="10-3">代码生成</el-menu-item>
               <el-menu-item index="10-4">系统接口</el-menu-item>
             </el-submenu>
-              <img src="../src/assets/imgs/profile.jpg"
-              style="float: left;
-              width: 27px;
-              height: 27px;
-              border-radius: 50%;
-              margin-right: 2px;
-              margin-top: 10px;"
-              />
+
             <el-submenu index="11">
-              <template slot="title">管理员</template>
+              <template slot="title">
+                <el-avatar size="small" :src="userAvatarUrl"></el-avatar>
+                管理员</template
+              >
               <el-menu-item index="personalCenter">个人中心</el-menu-item>
               <el-menu-item index="11-2">修改密码</el-menu-item>
               <el-menu-item index="11-3">退出</el-menu-item>
@@ -214,7 +211,7 @@
                 </div>
               </div>
             </el-submenu>
-          <!-- 头部菜单 -->
+            <!-- 头部菜单 -->
           </el-menu>
         </el-header>
         <el-main style="background: #ebeffa">
@@ -228,14 +225,16 @@
 
 <script>
 export default {
-  name:"App",
+  name: "App",
   data() {
     return {
+      userAvatarUrl:
+        "https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png",
       activeIndex: "1",
       value: "正常",
       index: 1, //控制缩进
       asideWidth: "300px", //控制缩进
-      isShow:false,
+      isShow: false,
       options: [
         {
           value: "正常",
@@ -260,33 +259,33 @@ export default {
                   id: 9,
                   label: "演示主管部门一",
                   children: [
-                {
-                  id: 11,
-                  label: "演示事业单位一",
-                },
-                {
-                  id: 12,
-                  label: "演示事业单位二",
-                },
-              ],
+                    {
+                      id: 11,
+                      label: "演示事业单位一",
+                    },
+                    {
+                      id: 12,
+                      label: "演示事业单位二",
+                    },
+                  ],
                 },
                 {
                   id: 10,
                   label: "演示主管部门二",
                   children: [
-                {
-                  id: 13,
-                  label: "演示事业单位三",
-                },
-                {
-                  id: 14,
-                  label: "演示事业单位四",
-                },
-                {
-                  id: 15,
-                  label: "演示事业单位五",
-                },
-              ],
+                    {
+                      id: 13,
+                      label: "演示事业单位三",
+                    },
+                    {
+                      id: 14,
+                      label: "演示事业单位四",
+                    },
+                    {
+                      id: 15,
+                      label: "演示事业单位五",
+                    },
+                  ],
                 },
               ],
             },
@@ -343,11 +342,11 @@ export default {
       if (this.index % 2 == 0) {
         this.asideWidth = "0px";
         this.$refs.showOrHideDiv.style.left = "0px";
-        this.isShow=true;
+        this.isShow = true;
       } else {
         this.asideWidth = "300px";
         this.$refs.showOrHideDiv.style.left = "300px";
-        this.isShow=false;
+        this.isShow = false;
       }
     },
   },