diff --git a/element-vue/src/components/dropDownUser.vue b/element-vue/src/components/dropDownUser.vue
index df9f517..144ee0a 100644
--- a/element-vue/src/components/dropDownUser.vue
+++ b/element-vue/src/components/dropDownUser.vue
@@ -7,7 +7,7 @@
     <i class="el-icon-user-solid el-icon--left"></i>{{user}}<i class="el-icon-arrow-down el-icon--right"></i>
   </span>
         <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item @click="alert('我的资料')">我的资料</el-dropdown-item>
+            <el-dropdown-item @click.native="$emit('goPersonal')">我的资料</el-dropdown-item>
             <el-dropdown-item @click.native="$emit('back')">退出登录</el-dropdown-item>
         </el-dropdown-menu>
     </el-dropdown>
@@ -22,27 +22,7 @@
             return{
 
             }
-        },
-        computed: {
-            inputListeners: function () {
-                var vm = this
-                // `Object.assign` 将所有的对象合并为一个新对象
-                return Object.assign({},
-                    // 我们从父级添加所有的监听器
-                    this.$listeners,
-                    // 然后我们添加自定义监听器，
-                    // 或覆写一些监听器的行为
-                    {
-                        // 这里确保组件配合 `v-model` 的工作
-                        click: function (event) {
-                            vm.$emit('back')
-                        }
-                    }
-                )
-            }
-        // mounted() {
-        //     console.log('这是用户下拉组件')
-        // }
+        }
 
     }
 </script>
diff --git a/element-vue/src/components/empty.vue b/element-vue/src/components/empty.vue
new file mode 100644
index 0000000..62148d9
--- /dev/null
+++ b/element-vue/src/components/empty.vue
@@ -0,0 +1,16 @@
+<template>
+    <div>
+        <router-view></router-view>
+    </div>
+
+</template>
+
+<script>
+    export default {
+        name: "empty"
+    }
+</script>
+
+<style scoped>
+
+</style>
diff --git a/element-vue/src/components/home.vue b/element-vue/src/components/home.vue
index e507e5c..3184d42 100644
--- a/element-vue/src/components/home.vue
+++ b/element-vue/src/components/home.vue
@@ -3,7 +3,7 @@
         <el-container>
             <!-- 头部组件-->
             <el-header  style="size: 20px;text-align: right;padding-top: 10px">
-                <drop-down-user :user="user" @back="backLogin"></drop-down-user>
+                <drop-down-user :user="user" @back="backLogin" @goPersonal="goPersonal"></drop-down-user>
             </el-header>
 <!--            body部分-->
            <el-main class="main" >
@@ -53,14 +53,11 @@
 
         },
         methods:{
-            backPersonal:function(){
-                this.$router.push('')
-            },
             backLogin:function () {
                 this.$router.push('/login')
             },
             goPersonal:function () {
-                get('/lb/user/home')
+                this.$router.push('/teacher/personal')
             }
         }
     }
diff --git a/element-vue/src/pages/login.vue b/element-vue/src/pages/login.vue
new file mode 100644
index 0000000..c071183
--- /dev/null
+++ b/element-vue/src/pages/login.vue
@@ -0,0 +1,138 @@
+<template>
+    <div id="demo1">
+        <div id="login">
+            <el-card class="card" style="background-color: lavender;">
+                <div slot="header" class="clearfix">
+                    <h2>登录</h2>
+                </div>
+                <el-form ref="ruleForm" :rules="rules" :model="ruleForm" label-position="left" label-width="70px">
+                    <el-form-item label="身份：" align="left" prop="identity" style="width: 100%">
+                        <el-select v-model="ruleForm.identity" placeholder="请选择您的身份" style="width:100% ">
+                            <el-option
+                                    v-for="item in character"
+                                    :key="item.value"
+                                    :label="item.label"
+                                    :value="item.value">
+                            </el-option>
+                        </el-select>
+                    </el-form-item>
+                    <el-form-item label="账号：" required prop="account">
+                        <el-input type="text" v-model="ruleForm.account" placeholder="请输入您的账号"
+                                  prefix-icon="el-icon-user-solid" class="required"></el-input>
+                    </el-form-item>
+                    <el-form-item label="密码：" required prop="psw">
+                        <el-input type="password" v-model="ruleForm.psw" placeholder="请输入您的密码"
+                                  prefix-icon="el-icon-s-goods"></el-input>
+                    </el-form-item>
+                    <el-link class="phoneMessage link">手机短信登陆</el-link>
+                    <el-link class="forgetPsw link" @click="dialogVisible = true">忘记密码</el-link>
+                    <el-divider></el-divider>
+                </el-form>
+                <el-button type="primary" @click="submitForm('ruleForm')" style="width: 100%">登录</el-button>
+
+            </el-card>
+        </div>
+
+        <div id="forgetPsw">
+            <el-dialog
+                    title="提示"
+                    :visible.sync="dialogVisible"
+                    width="30%">
+                <span>请联系超级管理员重置密码</span>
+                <span slot="footer" class="dialog-footer">
+                <el-button type="primary" @click="dialogVisible = false">确 定</el-button>
+                </span>
+            </el-dialog>
+        </div>
+    </div>
+</template>
+
+<script>
+    import {get, post} from "~/utils";
+
+    export default {
+        name: "login",
+        data() {
+            return {
+                ruleForm: {
+                    identity: '',
+                    account: '',
+                    psw: '',
+                },
+                character: [{
+                    label: '超级管理员',
+                    value: '3'
+                },
+                    {
+                        label: '管理员',
+                        value: '2'
+                    },
+                    {
+                        label: '老师',
+                        value: '1'
+                    }
+                ],
+                rules: {
+                    account: [{
+                        required: true, message: '请输入您的账号', trigger: 'blur'
+                    }],
+                    psw: [
+                        {
+                            required: true, message: '请输入您的密码', trigger: 'blur'
+                        }
+                    ],
+                    identity: [{
+                        required: true, message: '请选择您的身份', trigger: 'change'
+                    }]
+                },
+                dialogVisible: false
+            }
+        },
+        methods: {
+            submitForm (formName) {
+                this.$refs[formName].validate(async (valid) => {
+                    if (valid) {
+                        await post('lb/user/login', {
+                            auth: this.ruleForm.identity,
+                            username: this.ruleForm.account,
+                            password: this.ruleForm.psw
+                        })
+                        // 跳转页面
+                        await this.$router.push('/teacher')
+                    } else {
+                        console.log('error submit!!');
+                        return false;
+                    }
+                });
+            },
+        }
+    }
+</script>
+
+<style scoped>
+    #demo1 {
+        background-color: aquamarine;
+    }
+
+    #login {
+        width: 400px;
+        /*z-index:2*/
+    }
+
+    .card {
+        position: absolute;
+        top: 25%;
+        right: 10%;
+        width: 30%;
+    }
+
+    .forgetPsw {
+        position: relative;
+        left: 28%;
+    }
+
+    .phoneMessage {
+        position: relative;
+        left: 25%;
+    }
+</style>
diff --git a/element-vue/src/router.js b/element-vue/src/router.js
index fcaf59c..de407c6 100644
--- a/element-vue/src/router.js
+++ b/element-vue/src/router.js
@@ -8,7 +8,7 @@ import manager from "~/pages/manager/index";
 import supManager from "~/pages/supManager/index";
 import personal from "~/pages/teacher/personal";
 import login from "~/pages/login";
-import home from "~/components/home";
+import empty from "~/components/empty";
 
 // 要告诉 vue 使用 vueRouter
 Vue.use(VueRouter);
@@ -24,11 +24,12 @@ const routes = [
     },
     {
         path: "/teacher",
-        component: teacher,
+        component: empty,
         children: [
             {
                 path: '',
-                component: test
+                name:'teacher',
+                component: teacher
             },
             {
                 path: 'personal',
@@ -51,10 +52,6 @@ const routes = [
     {
         path:"/login",
         component:login
-    },
-    {
-        path:"/home",
-        component:home
     }
 ]