From 0f82695eed5eedb5c5b6f73814ecd6bb3c65711d Mon Sep 17 00:00:00 2001
From: aiyadc <565548447@qq.com>
Date: Wed, 6 May 2020 16:58:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E6=89=80=E6=9C=89=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E7=BB=9F=E4=B8=80=E6=96=87=E6=A1=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 element-vue/src/components/dropDownUser.vue    |  2 +-
 element-vue/src/components/home.vue            |  2 +-
 element-vue/src/components/personalMessage.vue |  6 ------
 element-vue/src/components/teacher/navBar.vue  | 14 ++++++++++++--
 element-vue/src/pages/teacher/index.vue        | 11 ++++++++---
 element-vue/src/pages/teacher/personal.vue     |  6 +++++-
 element-vue/src/pages/test.vue                 |  4 +++-
 element-vue/src/router.js                      | 10 ++++++++++
 8 files changed, 40 insertions(+), 15 deletions(-)

diff --git a/element-vue/src/components/dropDownUser.vue b/element-vue/src/components/dropDownUser.vue
index 144ee0a..0364974 100644
--- a/element-vue/src/components/dropDownUser.vue
+++ b/element-vue/src/components/dropDownUser.vue
@@ -2,7 +2,7 @@
 <!---->
 <template>
     <div >
-    <el-dropdown >
+    <el-dropdown style="padding: 20px;float: right;cursor: pointer" trigger="click">
   <span class="el-dropdown-link">
     <i class="el-icon-user-solid el-icon--left"></i>{{user}}<i class="el-icon-arrow-down el-icon--right"></i>
   </span>
diff --git a/element-vue/src/components/home.vue b/element-vue/src/components/home.vue
index 410ab95..8ecfead 100644
--- a/element-vue/src/components/home.vue
+++ b/element-vue/src/components/home.vue
@@ -14,7 +14,7 @@
                 </el-row>
 <!--               用一个循环把所有的功能模块加载出来 -->
                 <el-row :gutter="40" justify="center"  type="flex" align="bottom">
-                    <el-col :span="6" v-for="item in names">
+                    <el-col :span="6" v-for="item in names" :key="item">
                         <block  :name="item" :style="bodyStyle" ></block>
                     </el-col>
                 </el-row>
diff --git a/element-vue/src/components/personalMessage.vue b/element-vue/src/components/personalMessage.vue
index d168857..c48e708 100644
--- a/element-vue/src/components/personalMessage.vue
+++ b/element-vue/src/components/personalMessage.vue
@@ -32,13 +32,7 @@
 
 <script>
     import {get, post} from "~/utils";
-<<<<<<< HEAD
-    import {showDialog, showSuccess} from "~/utils/dialog";
-=======
-    import axios from "axios"
     import {closeLoading, showDialog, showLoading, showSuccess} from "~/utils/dialog";
->>>>>>> e51d44ad1213257fbd60443a010ff4ba74fd6927
-
     export default {
         data() {
             return {
diff --git a/element-vue/src/components/teacher/navBar.vue b/element-vue/src/components/teacher/navBar.vue
index 2cd6ed0..d9168de 100644
--- a/element-vue/src/components/teacher/navBar.vue
+++ b/element-vue/src/components/teacher/navBar.vue
@@ -15,13 +15,14 @@
                 <el-menu-item index="2-2" route="myBooking">我的申请记录</el-menu-item>
             </el-submenu>
             <el-menu-item index="3" route="course">课程管理</el-menu-item>
-            <el-menu-item index="4" route="schedule">我的课表</el-menu-item>
-            <el-menu-item index="5" route="personal">个人中心</el-menu-item>
+            <el-menu-item index="4" route="schedule" @click="$router.push('/teacher/myCourse')">我的课表</el-menu-item>
+            <drop-down-user user="个人中心" @back="backLogin" @goPersonal="goPersonal"></drop-down-user>
         </el-menu>
     </div>
 </template>
 
 <script>
+    import dropDownUser from "~/components/dropDownUser";
     export default {
         data() {
             return {
@@ -31,7 +32,16 @@
         methods: {
             handleSelect(key, keyPath) {
                 console.log(key, keyPath);
+            },
+            backLogin:function () {
+                this.$router.push('/login')
+            },
+            goPersonal:function () {
+                this.$router.push('/teacher/personal')
             }
+        },
+        components:{
+            dropDownUser
         }
     }
 </script>
diff --git a/element-vue/src/pages/teacher/index.vue b/element-vue/src/pages/teacher/index.vue
index 240c3e3..74e68fb 100644
--- a/element-vue/src/pages/teacher/index.vue
+++ b/element-vue/src/pages/teacher/index.vue
@@ -6,15 +6,20 @@
 
 <script>
     import home from "~/components/home";
+    import {get} from "~/utils";
+    import {showSuccess} from "~/utils/dialog";
 
     export default {
         components: {
             home
         },
         methods:{
-            backLogin:function () {
-                this.$router.push('/login')
-                console.log('已退出')
+            async backLogin() {
+                await get('lb/user/logout')
+                await showSuccess('退出成功',this)
+                setTimeout(()=>{
+                    this.$router.push('/login')
+                },1000)
             }
         }
     }
diff --git a/element-vue/src/pages/teacher/personal.vue b/element-vue/src/pages/teacher/personal.vue
index 8923ef6..42ee1ae 100644
--- a/element-vue/src/pages/teacher/personal.vue
+++ b/element-vue/src/pages/teacher/personal.vue
@@ -1,5 +1,8 @@
 <template>
     <div>
+        <el-container>
+            <el-header><nav-bar ></nav-bar></el-header>
+        </el-container>
         <el-container>
             <el-aside width="300px">
                 <el-row class="tac" style="margin-top: 30px">
@@ -38,10 +41,11 @@
 </template>
 
 <script>
+    import navBar from "~/components/teacher/navBar";
     import personalMessage from "~/components/personalMessage";
 
     export default {
-        components: {personalMessage},
+        components: {personalMessage,navBar},
         methods: {
             handleOpen(key, keyPath) {
                 console.log(key, keyPath);
diff --git a/element-vue/src/pages/test.vue b/element-vue/src/pages/test.vue
index 30f5d51..e4beb22 100644
--- a/element-vue/src/pages/test.vue
+++ b/element-vue/src/pages/test.vue
@@ -21,7 +21,9 @@
                 })
                 await post('lb/lab/test', {
                     data: 'data'
-                })
+                }
+                //        这里直接写then的内容就好了
+                )
             }
         }
     }
diff --git a/element-vue/src/router.js b/element-vue/src/router.js
index de407c6..c4dad6b 100644
--- a/element-vue/src/router.js
+++ b/element-vue/src/router.js
@@ -9,6 +9,8 @@ import supManager from "~/pages/supManager/index";
 import personal from "~/pages/teacher/personal";
 import login from "~/pages/login";
 import empty from "~/components/empty";
+import myCourse from "~/pages/teacher/myCourse";
+import tb_course from "~/components/tb_course";
 
 // 要告诉 vue 使用 vueRouter
 Vue.use(VueRouter);
@@ -34,6 +36,10 @@ const routes = [
             {
                 path: 'personal',
                 component: personal
+            },
+            {
+                path:'myCourse',
+                component:myCourse
             }
         ]
     },
@@ -52,6 +58,10 @@ const routes = [
     {
         path:"/login",
         component:login
+    },
+    {
+        path:'/tbCourse',
+        component:tb_course
     }
 ]