From 930c66126ddc02289f8f0180976a8b1101718316 Mon Sep 17 00:00:00 2001
From: unknown <1275919414@qq.com>
Date: Sun, 10 Mar 2019 18:32:55 +0800
Subject: [PATCH 1/6] error edit

---
 package-lock.json                             | 13 ++++++++----
 src/router/stuPath.js                         |  2 +-
 src/views/common/buss.js                      |  2 +-
 .../evaluation/components/bodybase.vue        |  8 ++++----
 .../evaluation/components/moralitybase.vue    |  7 +++----
 .../evaluation/components/moralityimprove.vue | 10 +++++-----
 .../components/professionalcomprehensive.vue  |  6 +++---
 .../evaluation/components/societypractice.vue |  8 ++++----
 .../evaluation/components/techinovation.vue   |  8 ++++----
 src/views/students/evaluation/sself.vue       | 20 +++++++++----------
 10 files changed, 44 insertions(+), 40 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 5f92c17..da46e9c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4212,7 +4212,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -4627,7 +4628,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -4683,6 +4685,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -4726,12 +4729,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
diff --git a/src/router/stuPath.js b/src/router/stuPath.js
index 4f8cb3b..21a1dfe 100644
--- a/src/router/stuPath.js
+++ b/src/router/stuPath.js
@@ -86,7 +86,7 @@ export default [
               auth: false
             },
             component: () => import('@/views/students/evaluation/components/techinovation.vue')
-          },
+          }
         ]
       },
       {
diff --git a/src/views/common/buss.js b/src/views/common/buss.js
index f9ef51b..b0230b5 100644
--- a/src/views/common/buss.js
+++ b/src/views/common/buss.js
@@ -1,2 +1,2 @@
 import Vue from 'vue'
-export default new Vue()
\ No newline at end of file
+export default new Vue()
diff --git a/src/views/students/evaluation/components/bodybase.vue b/src/views/students/evaluation/components/bodybase.vue
index fb7aaaf..4c05f5e 100644
--- a/src/views/students/evaluation/components/bodybase.vue
+++ b/src/views/students/evaluation/components/bodybase.vue
@@ -53,14 +53,14 @@ export default {
   methods: {
     prevent () {
       Bus.$emit('val', this.active - 2)
-      if (this.active > 6) this.active = 0;
-      this.$router.push({ path: 'moralitybase'})
+      if (this.active > 6) this.active = 0
+      this.$router.push({ path: 'moralitybase' })
     },
     next () {
       Bus.$emit('val', this.active)
       Bus.$emit('finishAct', this.active)
-      if (this.active > 6) this.active = 0;
-      this.$router.push({ path: 'moralityimprove'})
+      if (this.active > 6) this.active = 0
+      this.$router.push({ path: 'moralityimprove' })
     }
   }
 }
diff --git a/src/views/students/evaluation/components/moralitybase.vue b/src/views/students/evaluation/components/moralitybase.vue
index 27a28ab..fddcb15 100644
--- a/src/views/students/evaluation/components/moralitybase.vue
+++ b/src/views/students/evaluation/components/moralitybase.vue
@@ -38,15 +38,15 @@ export default {
   data () {
     return {
       moralityBbaseForm: {},
-      active: 1,
+      active: 1
     }
   },
   methods: {
     next () {
       Bus.$emit('val', this.active)
       Bus.$emit('finishAct', this.active)
-      if (this.active > 6) this.active = 0;
-      this.$router.push({ path: 'bodybase'})
+      if (this.active > 6) this.active = 0
+      this.$router.push({ path: 'bodybase' })
     }
   }
 }
@@ -55,4 +55,3 @@ export default {
 .el-input
   max-width 72px
 </style>
-
diff --git a/src/views/students/evaluation/components/moralityimprove.vue b/src/views/students/evaluation/components/moralityimprove.vue
index 57da4fc..f35a3b8 100644
--- a/src/views/students/evaluation/components/moralityimprove.vue
+++ b/src/views/students/evaluation/components/moralityimprove.vue
@@ -43,15 +43,15 @@ export default {
   methods: {
     prevent () {
       Bus.$emit('val', this.active - 2)
-      if (this.active > 6) this.active = 0;
-      this.$router.push({ path: 'bodybase'})
+      if (this.active > 6) this.active = 0
+      this.$router.push({ path: 'bodybase' })
     },
     next () {
       Bus.$emit('val', this.active)
       Bus.$emit('finishAct', this.active)
-      if (this.active > 6) this.active = 0;
-      this.$router.push({ path: 'societypractice'})
+      if (this.active > 6) this.active = 0
+      this.$router.push({ path: 'societypractice' })
     }
   }
 }
-</script>
\ No newline at end of file
+</script>
diff --git a/src/views/students/evaluation/components/professionalcomprehensive.vue b/src/views/students/evaluation/components/professionalcomprehensive.vue
index e176d63..309d5f6 100644
--- a/src/views/students/evaluation/components/professionalcomprehensive.vue
+++ b/src/views/students/evaluation/components/professionalcomprehensive.vue
@@ -53,8 +53,8 @@ export default {
   methods: {
     prevent () {
       Bus.$emit('val', this.active - 2)
-      if (this.active > 7) this.active = 0;
-      this.$router.push({ path: 'techinovation'})
+      if (this.active > 7) this.active = 0
+      this.$router.push({ path: 'techinovation' })
     },
     next () {
       Bus.$emit('val', this.active)
@@ -64,7 +64,7 @@ export default {
         cancelButtonText: '关闭',
         type: 'success'
       }).then(() => {
-        this.$router.push({ path: '/student/evaluation/evaluationresult'})
+        this.$router.push({ path: '/student/evaluation/evaluationresult' })
       }).catch(() => {})
     }
   }
diff --git a/src/views/students/evaluation/components/societypractice.vue b/src/views/students/evaluation/components/societypractice.vue
index 393ca81..b888467 100644
--- a/src/views/students/evaluation/components/societypractice.vue
+++ b/src/views/students/evaluation/components/societypractice.vue
@@ -41,14 +41,14 @@ export default {
   methods: {
     prevent () {
       Bus.$emit('val', this.active - 2)
-      if (this.active > 6) this.active = 0;
-      this.$router.push({ path: 'moralityimprove'})
+      if (this.active > 6) this.active = 0
+      this.$router.push({ path: 'moralityimprove' })
     },
     next () {
       Bus.$emit('val', this.active)
       Bus.$emit('finishAct', this.active)
-      if (this.active > 6) this.active = 0;
-      this.$router.push({ path: 'techinovation'})
+      if (this.active > 6) this.active = 0
+      this.$router.push({ path: 'techinovation' })
     }
   }
 }
diff --git a/src/views/students/evaluation/components/techinovation.vue b/src/views/students/evaluation/components/techinovation.vue
index 8852b3d..364abf9 100644
--- a/src/views/students/evaluation/components/techinovation.vue
+++ b/src/views/students/evaluation/components/techinovation.vue
@@ -49,14 +49,14 @@ export default {
   methods: {
     prevent () {
       Bus.$emit('val', this.active - 2)
-      if (this.active > 6) this.active = 0;
-      this.$router.push({ path: 'societypractice'})
+      if (this.active > 6) this.active = 0
+      this.$router.push({ path: 'societypractice' })
     },
     next () {
       Bus.$emit('val', this.active)
       Bus.$emit('finishAct', this.active)
-      if (this.active > 6) this.active = 0;
-      this.$router.push({ path: 'professionalcomprehensive'})
+      if (this.active > 6) this.active = 0
+      this.$router.push({ path: 'professionalcomprehensive' })
     }
   }
 }
diff --git a/src/views/students/evaluation/sself.vue b/src/views/students/evaluation/sself.vue
index e85cfcf..eb51431 100644
--- a/src/views/students/evaluation/sself.vue
+++ b/src/views/students/evaluation/sself.vue
@@ -28,22 +28,22 @@ export default {
   },
   methods: {
     clickSteps (index) {
-      if (index == this.active) {
+      if (index === this.active) {
         this.$message({
           message: '警告，已经在当前步骤，不需要跳转!',
           type: 'warning'
-        });
+        })
       } else if (index <= this.finashiActive) {
         switch (index) {
-          case 0: Bus.$emit('val', index); this.$router.push({ path: 'moralitybase'}); break;
-          case 1: Bus.$emit('val', index); this.$router.push({ path: 'bodybase'}); break;
-          case 2: Bus.$emit('val', index); this.$router.push({ path: 'moralityimprove'}); break;
-          case 3: Bus.$emit('val', index); this.$router.push({ path: 'societypractice'}); break;
-          case 4: Bus.$emit('val', index); this.$router.push({ path: 'techinovation'}); break;
-          case 5: Bus.$emit('val', index); this.$router.push({ path: 'professionalcomprehensive'}); break;
+          case 0: Bus.$emit('val', index); this.$router.push({ path: 'moralitybase' }); break
+          case 1: Bus.$emit('val', index); this.$router.push({ path: 'bodybase' }); break
+          case 2: Bus.$emit('val', index); this.$router.push({ path: 'moralityimprove' }); break
+          case 3: Bus.$emit('val', index); this.$router.push({ path: 'societypractice' }); break
+          case 4: Bus.$emit('val', index); this.$router.push({ path: 'techinovation' }); break
+          case 5: Bus.$emit('val', index); this.$router.push({ path: 'professionalcomprehensive' }); break
         }
       } else {
-        this.$message.error('错误，当前点击步骤之前有没完成的步骤!');
+        this.$message.error('错误，当前点击步骤之前有没完成的步骤!')
       }
     }
   },
@@ -56,7 +56,7 @@ export default {
         this.finashiActive = res
       }
     })
-    this.$router.push({ path: 'moralitybase'})
+    this.$router.push({ path: 'moralitybase' })
   }
 }
 </script>

From 2b8714a39e522ff96550566f3eb41129a73de7f4 Mon Sep 17 00:00:00 2001
From: Blank <zilisheng1996@gmail.com>
Date: Sun, 10 Mar 2019 19:01:57 +0800
Subject: [PATCH 2/6] router change

---
 config/index.js       | 2 +-
 src/router/stuPath.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/index.js b/config/index.js
index 542ca57..7c8d836 100644
--- a/config/index.js
+++ b/config/index.js
@@ -12,7 +12,7 @@ module.exports = {
     assetsPublicPath: '/',
     proxyTable: {
       '/api': {
-        target: 'http://10.10.18.131:7007',
+        target: 'http://127.0.0.1:7007',
         pathRewrite: {
           '^/api': '/api'
         }
diff --git a/src/router/stuPath.js b/src/router/stuPath.js
index 4f8cb3b..21a1dfe 100644
--- a/src/router/stuPath.js
+++ b/src/router/stuPath.js
@@ -86,7 +86,7 @@ export default [
               auth: false
             },
             component: () => import('@/views/students/evaluation/components/techinovation.vue')
-          },
+          }
         ]
       },
       {

From 98f405dd122880ce5534d8e716d4410c594123d8 Mon Sep 17 00:00:00 2001
From: Blank <zilisheng1996@gmail.com>
Date: Sun, 10 Mar 2019 19:17:38 +0800
Subject: [PATCH 3/6] fix code style

---
 src/main.js                                   |  3 +--
 src/router/siderPath.js                       |  2 +-
 src/views/admin/layout/components/aside.vue   |  6 ++---
 src/views/admin/layout/components/user.vue    | 14 +++++------
 src/views/login/login.vue                     |  4 +---
 .../evaluation/components/moralitybase.vue    |  7 ++----
 src/views/students/layout/components/user.vue | 23 ++++++++++---------
 7 files changed, 27 insertions(+), 32 deletions(-)

diff --git a/src/main.js b/src/main.js
index 5ca3a46..03bcabc 100644
--- a/src/main.js
+++ b/src/main.js
@@ -5,7 +5,6 @@ import store from './store'
 import App from './App'
 import router from './router'
 import echarts from 'echarts'
-import axios from 'axios'
 import Vuex from 'vuex'
 import './utils/Axios'
 import 'element-ui/lib/theme-chalk/index.css'
@@ -23,7 +22,7 @@ Vue.config.productionTip = false
 
 // 路由拦截器
 router.beforeEach(({meta, path}, from, next) => {
-  if(!localStorage.getItem('token') && path !== '/login') {
+  if (!localStorage.getItem('token') && path !== '/login') {
     return next({ path: '/login' })
   } else {
     next()
diff --git a/src/router/siderPath.js b/src/router/siderPath.js
index 99fb0e2..4e45b60 100644
--- a/src/router/siderPath.js
+++ b/src/router/siderPath.js
@@ -290,4 +290,4 @@ export default [
 //   }
 //   return hidden
 //   console.log(hidden)
-// }
\ No newline at end of file
+// }
diff --git a/src/views/admin/layout/components/aside.vue b/src/views/admin/layout/components/aside.vue
index f7e617d..dea6c51 100644
--- a/src/views/admin/layout/components/aside.vue
+++ b/src/views/admin/layout/components/aside.vue
@@ -40,11 +40,11 @@ export default {
       let hidden = null
       let level = null
       if (scope < 5) {
-        if(scope == 1 || scope == 4) {
+        if (scope === 1 || scope === 4) {
           level = 1
-        } else if (scope == 2) {
+        } else if (scope === 2) {
           level = 2
-        } else if (scope == 3) {
+        } else if (scope === 3) {
           level = 3
         }
         if (level > num) {
diff --git a/src/views/admin/layout/components/user.vue b/src/views/admin/layout/components/user.vue
index e7a9fbc..c6ed83c 100644
--- a/src/views/admin/layout/components/user.vue
+++ b/src/views/admin/layout/components/user.vue
@@ -23,13 +23,13 @@ export default {
   methods: {
     teaLogout () {
       this.$axios
-      .post('/api/zongce/admin/loginout', {
-        Authorization: this.Authorization
-      })
-      .then(res => {
-        this.$router.push({ path: '/login' })
-      })
-      .catch(res => {})
+        .post('/api/zongce/admin/loginout', {
+          Authorization: this.Authorization
+        })
+        .then(res => {
+          this.$router.push({ path: '/login' })
+        })
+        .catch(res => {})
     }
   }
 }
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index c27ec56..0c3d338 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -40,8 +40,6 @@
   </div>
 </template>
 <script>
-import axios from 'axios'
-import { mapMutations } from 'vuex'
 export default {
   data () {
     let validateName = (rule, value, callback) => {
@@ -54,7 +52,7 @@ export default {
     return {
       stuLoginForm: {
         name: '1443103000244',
-        pwd: '104943',
+        pwd: '104943'
       },
       teaLoginForm: {
         name: '',
diff --git a/src/views/students/evaluation/components/moralitybase.vue b/src/views/students/evaluation/components/moralitybase.vue
index be175c5..bf5ffbb 100644
--- a/src/views/students/evaluation/components/moralitybase.vue
+++ b/src/views/students/evaluation/components/moralitybase.vue
@@ -42,15 +42,12 @@
             <div class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
           </el-upload>
         </el-form>
-        <!-- 
-        
-        证明材料
+        <!-- 证明材料
         <el-upload drag action="https://jsonplaceholder.typicode.com/posts/" multiple>
           <i class="el-icon-upload"></i>
           <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
           <div class="el-upload__tip" slot="tip">只能上传jpg/png文件，且不超过500kb</div>
-        </el-upload>
-         -->
+        </el-upload>-->
          <span slot="footer" class="dialog-footer">
           <el-button @click="MoreData = false">取 消</el-button>
           <el-button type="primary" @click="submitData">确 定</el-button>
diff --git a/src/views/students/layout/components/user.vue b/src/views/students/layout/components/user.vue
index 22a4c29..d27bf33 100644
--- a/src/views/students/layout/components/user.vue
+++ b/src/views/students/layout/components/user.vue
@@ -13,6 +13,7 @@
   </div>
 </template>
 <script>
+import { Message } from 'element-ui'
 export default {
   data () {
     return {
@@ -23,18 +24,18 @@ export default {
   methods: {
     stuLoginout () {
       this.$axios
-      .post('/api/zongce/student/loginout', {
-        Authorization: this.Authorization
-      })
-      .then(res => {
-        Message({
-          showClose: true,
-          message: res.message,
-          type: 'warning'
+        .post('/api/zongce/student/loginout', {
+          Authorization: this.Authorization
         })
-        this.$router.push({ path: '/login' })
-      })
-      .catch(res => {})
+        .then(res => {
+          Message({
+            showClose: true,
+            message: res.message,
+            type: 'warning'
+          })
+          this.$router.push({ path: '/login' })
+        })
+        .catch(res => {})
     }
   }
 }

From 2deae5e248b5ff933b1d1e4c3b6316ab0dcb21e0 Mon Sep 17 00:00:00 2001
From: unknown <1275919414@qq.com>
Date: Sun, 10 Mar 2019 19:29:51 +0800
Subject: [PATCH 4/6] add

---
 src/assets/css/elementUI.css                  |  33 +++
 src/assets/css/reset.css                      |  10 +-
 src/main.js                                   | 125 ++++++++++-
 src/router/index.js                           |   8 +
 src/router/siderPath.js                       |  65 +++++-
 src/utils/Axios.js                            |  86 ++++++++
 src/views/admin/layout/components/aside.vue   |  35 ++-
 src/views/admin/layout/components/user.vue    |  62 ++++++
 src/views/admin/layout/layout.vue             |   2 +-
 src/views/admin/manager/mclass/mclass.vue     | 200 ++++++++++++++++++
 src/views/admin/manager/mfaculty/mfaculty.vue | 154 ++++++++++++++
 src/views/admin/manager/mmember/mmember.vue   |   3 +
 src/views/admin/manager/mschool/mschool.vue   | 154 ++++++++++++++
 src/views/admin/manager/msystem/msystem.vue   |   3 +
 src/views/login/login.vue                     | 151 +++++++------
 src/views/login/login2.vue                    |  20 ++
 .../evaluation/components/bodybase.vue        | 130 ++++++++++--
 .../evaluation/components/moralitybase.vue    | 111 ++++++++--
 .../students/evaluation/evaluationresult.vue  |   2 +-
 src/views/students/evaluation/sevidence.vue   |   2 +-
 src/views/students/evaluation/sself.vue       |   2 +-
 src/views/students/info/sinfo.vue             |   2 +-
 src/views/students/layout/components/user.vue |  62 ++++++
 src/views/students/layout/slayout.vue         |   4 +-
 24 files changed, 1291 insertions(+), 135 deletions(-)
 create mode 100644 src/utils/Axios.js
 create mode 100644 src/views/admin/layout/components/user.vue
 create mode 100644 src/views/admin/manager/mclass/mclass.vue
 create mode 100644 src/views/admin/manager/mfaculty/mfaculty.vue
 create mode 100644 src/views/admin/manager/mmember/mmember.vue
 create mode 100644 src/views/admin/manager/mschool/mschool.vue
 create mode 100644 src/views/admin/manager/msystem/msystem.vue
 create mode 100644 src/views/login/login2.vue
 create mode 100644 src/views/students/layout/components/user.vue

diff --git a/src/assets/css/elementUI.css b/src/assets/css/elementUI.css
index 3d207af..8272425 100644
--- a/src/assets/css/elementUI.css
+++ b/src/assets/css/elementUI.css
@@ -51,4 +51,37 @@ padding: 0;
 .el-step__icon,
 .el-step__title {
   cursor: pointer;
+}
+.el-dialog {
+  min-width: 500px;
+}
+.el-textarea__inner {
+  min-height: 80px !important;
+  resize: none;
+}
+.el-upload,
+.el-upload-dragger {
+  width: 100%;
+}
+.el-table td,
+.el-table th {
+  padding: 0;
+  height: 40px;
+}
+.el-tabs__item {
+  width: 180px;
+  text-align: center
+}
+
+.addMoreData {
+  margin: 20px 0;
+}
+.tooltip {
+  font-size: 18px;
+  cursor: pointer;
+  color: #409eff;
+}
+
+.addBtn {
+  margin-bottom: 20px;  
 }
\ No newline at end of file
diff --git a/src/assets/css/reset.css b/src/assets/css/reset.css
index 8d66cc4..d24d1ff 100644
--- a/src/assets/css/reset.css
+++ b/src/assets/css/reset.css
@@ -68,6 +68,14 @@ table {
 	margin-right: 10px;
 	cursor: pointer;
 }
-.el-upload-dragger {
+.upload-dragger {
 	width: 960px;
+}
+.all-page {
+	height: 100%;
+}
+
+.FormType {
+	font-weight: bold;
+	color: #409eff;
 }
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 612ca13..2b4187f 100644
--- a/src/main.js
+++ b/src/main.js
@@ -5,6 +5,8 @@ import store from './store'
 import App from './App'
 import router from './router'
 import echarts from 'echarts'
+import Vuex from 'vuex'
+import './utils/Axios'
 import 'element-ui/lib/theme-chalk/index.css'
 import 'css/reset.css'
 import 'css/table.css'
@@ -12,23 +14,136 @@ import 'css/elementUI.css'
 
 Vue.use(VueRouter)
 Vue.use(ElementUI)
+Vue.use(Vuex)
 
 Vue.prototype.$echarts = echarts
 
 Vue.config.productionTip = false
 
 // 路由拦截器
-router.beforeEach(({meta, path}, from, next) => {
-  let { auth = true } = meta // 该路由是否需要登录
-  let $user = JSON.parse(sessionStorage.getItem('$user')) || {}
-  let isLogin = Boolean($user.auth) // true 用户已登录 false 用户未登录
-  if (!auth && !isLogin && path !== '/login') {
+router.beforeEach((to, from, next) => {
+  // 白名单成员，直接通过, 一定要先加这个
+  // if (whiteList.indexOf(to.path) !== -1) {
+  //   next()
+  // }
+  // 未登录账户，直接跳转到登录页面
+  if (!localStorage.getItem('token') && to.path !== '/login') {
     return next({ path: '/login' })
   } else {
+    if(localStorage.getItem('token') && to.path === '/login') {
+      // 登录了跳转 login
+      if (localStorage.getItem('scope') == 6) {
+        // student
+        next({ path: '/student' })
+      } else if (localStorage.getItem('scope') != 6) {
+        // admin
+        next({ path: '/admin' })
+      }
+    } else if (localStorage.getItem('token')) {
+      const Path = to.path
+      let scope = localStorage.getItem('scope')
+      const routePath = Path.split('/')
+      if(scope) {
+        let count = 0 // 存储  用来判断是否有字符串 !0 -> 跳转student
+        let count2 = 0 // 存储  用来判断是否有字符串  !0 -> 跳转了admin
+        for (let i = 0; i < routePath.length; i++) {
+          if (routePath[i] == 'student') {
+            count++
+          }
+          if (routePath[i] == 'admin') {
+            count2++
+          }
+        }
+        if (count == 0 && scope == 6 && count2 != 0) {
+          next({ path: '/student' })
+        } else if (count != 0 && scope == 6 && count2 != 0) {
+          next()
+        } else if (count != 0 && scope != 6 && count2 == 0) {
+          next({ path: '/admin' })
+        } else if (count == 0 && scope != 6 && count2 != 0) {
+          next()
+        }
+        
+        else {
+          next()
+        }
+      }
+    }
+    // 已经登录
+    // student还是admin
+    
     next()
+    // console.log(from.path)
+    // console.log(to.path)
+    // if (to.path === '/login') {
+    //   if (localStorage.getItem('scope') != 6) {
+    //     next({ path: '/admin' })
+    //   } else {
+    //     next({ path: '/student' })
+    //   }
+    // } else {
+    //   next()
+    // }
   }
 })
 
+
+
+// router.beforeEach((to, from, next) => {
+//   if (!localStorage.getItem('token') && to.path !== '/login') {
+//     return next({ path: '/login' })
+//   } else {
+//     next()
+//     if (localStorage.getItem('scope') === 6) {
+//       // student
+//       let count = 0 //用来判断是否有 student  0 表示没有
+//       let routePath = this.$route.path //获取路由 如果没有student 则 跳转回student
+//       // 将路由分割 \\
+//       console.log(routePath)
+//       routePath = routePath.split('\\')
+//       for (let i = 0; i < routePath.length; i++) {
+//         if (routePath[i] == 'student') {
+//           count++ 
+//         }
+//       }
+//       if ( count == 0) {
+//         return next({ path: '/student' })
+//       }
+//     } else if (localStorage.getItem('scope') !== 6){
+//       let count = 0 //用来判断是否有 student  0 表示没有
+//       let routePath = this.$route.path //获取路由 如果没有student 则 跳转回student
+//       // 将路由分割 \\
+//       routePath = routePath.split('\\')
+//       for (let i = 0; i < routePath.length; i++) {
+//         if (routePath[i] == 'admin') {
+//           count++ 
+//         }
+//       }
+//       if ( count == 0) {
+//         return next({ path: '/admin' })
+//       }
+//       // admin
+//     }
+//   }
+
+
+
+  // else if (localStorage.getItem('scope') === 6) {
+
+  // } else if (localStorage.getItem('scope') !== 6) {
+
+  // } 
+  
+  // let { auth = true } = meta // 该路由是否需要登录
+  // let $user = JSON.parse(sessionStorage.getItem('$user')) || {}
+  // let isLogin = Boolean($user.auth) // true 用户已登录 false 用户未登录
+  // if (!auth && !isLogin && path !== '/login') {
+  //   return next({ path: '/login' })
+  // } else {
+  //   next()
+  // }
+// })
+
 let vm = new Vue({
   el: '#app',
   router,
diff --git a/src/router/index.js b/src/router/index.js
index 3e6c05a..c7ca8f4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -19,6 +19,14 @@ export default new Router({
       },
       component: () => import('@/views/login/login.vue')
     },
+    {
+      path: '/login2',
+      name: 'login2',
+      meta: {
+        name: '登录'
+      },
+      component: () => import('@/views/login/login2.vue')
+    },
     {
       path: '/admin',
       name: 'admin',
diff --git a/src/router/siderPath.js b/src/router/siderPath.js
index 6be8695..d3a8f7f 100644
--- a/src/router/siderPath.js
+++ b/src/router/siderPath.js
@@ -12,11 +12,22 @@ export default [
     component: Main,
     redirect: 'charts/index',
     children: [
+      {
+        path: 'index',
+        name: 'index',
+        meta: {
+          name: '学校信息统计',
+          level: 1,
+          auth: false
+        },
+        component: () => import('@/views/admin/info/index.vue')
+      },
       {
         path: 'index',
         name: 'index',
         meta: {
           name: '学院信息统计',
+          level: 2,
           auth: false
         },
         component: () => import('@/views/admin/info/index.vue')
@@ -26,6 +37,7 @@ export default [
         name: 'cmajor',
         meta: {
           name: '专业信息统计',
+          level: 2,
           auth: false
         },
         component: () => import('@/views/admin/info/index.vue')
@@ -35,6 +47,7 @@ export default [
         name: 'cedit',
         meta: {
           name: '基本信息管理',
+          level: 3,
           auth: false
         },
         component: () => import('@/views/admin/info/index.vue')
@@ -57,6 +70,7 @@ export default [
         name: 'icollege',
         meta: {
           name: '学院信息',
+          level: 2,
           auth: false
         },
         component: () => import('@/views/admin/info/index.vue')
@@ -66,6 +80,7 @@ export default [
         name: 'imajor',
         meta: {
           name: '专业信息',
+          level: 2,
           auth: false
         },
         component: () => import('@/views/admin/info/index.vue')
@@ -75,6 +90,7 @@ export default [
         name: 'iclass',
         meta: {
           name: '班级信息',
+          level: 3,
           auth: false
         },
         component: () => import('@/views/admin/info/index.vue')
@@ -84,6 +100,7 @@ export default [
         name: 'istudents',
         meta: {
           name: '学生信息',
+          level: 3,
           auth: false
         },
         component: () => import('@/views/admin/info/index.vue')
@@ -135,6 +152,7 @@ export default [
         name: 'vschool',
         meta: {
           name: '学校审核',
+          level: 1,
           auth: false
         },
         component: () => import('@/views/admin/info/index.vue')
@@ -144,6 +162,7 @@ export default [
         name: 'vcollege',
         meta: {
           name: '学院审核',
+          level: 2,
           auth: false
         },
         component: () => import('@/views/admin/info/index.vue')
@@ -153,6 +172,7 @@ export default [
         name: 'vclass',
         meta: {
           name: '班级审核',
+          level: 3,
           auth: false
         },
         component: () => import('@/views/admin/info/index.vue')
@@ -174,6 +194,27 @@ export default [
         name: 'rall',
         meta: {
           name: '全校综测成绩',
+          level: 1,
+          auth: false
+        },
+        component: () => import('@/views/admin/info/index.vue')
+      },
+      {
+        path: 'rall',
+        name: 'rall',
+        meta: {
+          name: '学院综测成绩',
+          level: 2,
+          auth: false
+        },
+        component: () => import('@/views/admin/info/index.vue')
+      },
+      {
+        path: 'rall',
+        name: 'rall',
+        meta: {
+          name: '班级综测成绩',
+          level: 3,
           auth: false
         },
         component: () => import('@/views/admin/info/index.vue')
@@ -188,6 +229,7 @@ export default [
       icon: 'iconfont icon-manager',
       auth: false
     },
+    redirect: '/admin',
     component: Main,
     children: [
       {
@@ -195,45 +237,50 @@ export default [
         name: 'mschool',
         meta: {
           name: '学校管理员',
+          level: 1,
           auth: false
         },
-        component: () => import('@/views/admin/info/index.vue')
+        component: () => import('@/views/admin/manager/mschool/mschool.vue')
       },
       {
-        path: 'mcollege',
-        name: 'mcollege',
+        path: 'mfaculty',
+        name: 'mfaculty',
         meta: {
           name: '学院管理员',
+          level: 2,
           auth: false
         },
-        component: () => import('@/views/admin/info/index.vue')
+        component: () => import('@/views/admin/manager/mfaculty/mfaculty.vue')
       },
       {
         path: 'mclass',
         name: 'mclass',
         meta: {
           name: '班级管理员',
+          level: 3,
           auth: false
         },
-        component: () => import('@/views/admin/info/index.vue')
+        component: () => import('@/views/admin/manager/mclass/mclass.vue')
       },
       {
-        path: 'mevaluator',
-        name: 'mevaluator',
+        path: 'mmember',
+        name: 'mmember',
         meta: {
           name: '审议评分小组成员',
+          level: 3,
           auth: false
         },
-        component: () => import('@/views/admin/info/index.vue')
+        component: () => import('@/views/admin/manager/mmember/mmember.vue')
       },
       {
         path: 'msystem',
         name: 'msystem',
         meta: {
           name: '系统管理员',
+          level: 1,
           auth: false
         },
-        component: () => import('@/views/admin/info/index.vue')
+        component: () => import('@/views/admin/manager/msystem/msystem.vue')
       }
     ]
   }
diff --git a/src/utils/Axios.js b/src/utils/Axios.js
new file mode 100644
index 0000000..bba4a9e
--- /dev/null
+++ b/src/utils/Axios.js
@@ -0,0 +1,86 @@
+import Vue from 'vue'
+import axios from 'axios'
+import { Message } from 'element-ui'
+
+Vue.prototype.$axios = axios
+
+// 全局请求拦截
+axios.interceptors.request.use(config => {
+  if (localStorage.getItem('token')) {
+    config.headers.Authorization = localStorage.getItem('token')
+  }
+  if (config.method === 'post') {
+    let formData = new FormData()
+    for (let key in config.data) {
+      formData.append(key, config.data[key])
+    }
+    config.data = formData
+  }
+  return config
+},
+error => {
+  return Promise.reject(error)
+})
+
+// 全局回复拦截
+axios.interceptors.response.use(res => {
+  if (res.status === 200 && res.data.code === 2000) {
+    Message({
+      showClose: true,
+      message: res.data.messages,
+      type: 'success'
+    })
+    return res.data
+  } else if (res.dsata && res.data.code !== 2000) {
+    Message({
+      showClose: true,
+      message: res.data.message,
+      type: 'warning'
+    })
+    return Promise.reject(res.data)
+  }
+},
+error => {
+  let status = error.response.status
+  if (status === 401) {
+    error.response.data.messages.forEach(element => {
+      Message({
+        duration: 0,
+        showClose: true,
+        message: element,
+        type: 'error'
+      })
+    })
+    localStorage.clear()
+    this.$router.push({ path: '/login' })
+  } else if (status === 404) {
+    this.$router.push('/error/404')
+  } else if (status === 500) {
+    error.response.data.messages.forEach(element => {
+      Message({
+        duration: 0,
+        showClose: true,
+        message: element,
+        type: 'error'
+      })
+    })
+    this.$router.push('/error/500')
+  } else if (status === 402) {
+    Message({
+      showClose: true,
+      message: '已登录，请不要重复操作',
+      type: 'error'
+    })
+  } else {
+  /*
+   * status不在指定内容中时，将服务器端返回信息通过element-ui的错误信息提示进行提示
+   * 同时通过promise返回data数据
+   */
+    Message({
+      showClose: true,
+      message: error.response.data.message,
+      type: 'error'
+    })
+  }
+  return Promise.reject(error.response.data)
+})
diff --git a/src/views/admin/layout/components/aside.vue b/src/views/admin/layout/components/aside.vue
index ec10b4b..e2ceb26 100644
--- a/src/views/admin/layout/components/aside.vue
+++ b/src/views/admin/layout/components/aside.vue
@@ -3,13 +3,15 @@
     <el-menu :collapse="collapse" :router="true">
       <template v-for="(items, index) in Routers">
         <el-submenu v-if="items.children" :index="items.name" :key="index">
-          <template slot="title" >
+          <template slot="title" v-if="getBoolean(items.meta.level)">
             <i :class="items.meta.icon"></i>
             <span>{{items.meta.name}}</span>
           </template>
-          <el-menu-item v-for="(child, i) in items.children" :key="i" :route="child" :index="child.path">
-            {{child.meta.name}}
-          </el-menu-item>
+          <span v-for="(child, i) in items.children" :key="i">
+            <el-menu-item v-if="getBoolean(child.meta.level)" :route="child" :index="child.path" >
+              {{child.meta.name}}
+            </el-menu-item>
+          </span>
         </el-submenu>
         <template v-else>
           <el-menu-item :index="items.path" :key="items.path">
@@ -26,9 +28,34 @@ import SiderPath from '@/router/siderPath.js'
 export default {
   data () {
     return {
+      scope: localStorage.getItem('scope'),
       Routers: SiderPath
     }
   },
+  methods: {
+    getBoolean (num) {
+      let scope = parseInt(this.scope)
+      let hidden = null
+      let level = null
+      if (scope < 5) {
+        if (scope === 1 || scope === 4) {
+          level = 1
+        } else if (parseInt(scope) === 2) {
+          level = 2
+        } else if (parseInt(scope) === 3) {
+          level = 3
+        }
+        if (level > num) {
+          hidden = false // 隐藏
+        } else {
+          hidden = true
+        }
+      } else {
+        hidden = false
+      }
+      return hidden
+    }
+  },
   props: {
     collapse: Boolean
   }
diff --git a/src/views/admin/layout/components/user.vue b/src/views/admin/layout/components/user.vue
new file mode 100644
index 0000000..8f75f5d
--- /dev/null
+++ b/src/views/admin/layout/components/user.vue
@@ -0,0 +1,62 @@
+<template>
+  <div>
+    <el-dropdown trigger="click">
+      <div>
+        <img src="@/assets/img/user.jpg" class="user-img">
+        <i class="el-icon-caret-bottom el-icon--right dropdown-icon"></i>
+      </div>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item>个人信息</el-dropdown-item>
+        <el-dropdown-item @click.native="teaLogout">注 销</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+  </div>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      Authorization: localStorage.getItem('token'),
+      user: {}
+    }
+  },
+  methods: {
+    teaLogout () {
+      this.$confirm('是否要注销登录?', '警告', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      })
+      .then(() => {
+        this.$axios
+          .post('/api/zongce/admin/loginout')
+          .then(res => {
+            localStorage.clear()
+            this.$router.push({ path: '/login' })
+          })
+          .catch(res => {})
+        })
+        .catch(() => {
+          this.$message({
+            message: '取消注销',
+            type: 'warning'
+          })
+        })
+    }
+  }
+}
+</script>
+<style lang="stylus" scoped>
+.el-dropdown
+  width 80px
+  margin-right 10px
+  cursor pointer
+  .user-img
+    float left
+    height 36px
+    width 36px
+    margin 7px 0
+    border-radius 50%
+  .dropdown-icon
+    display inline-block
+</style>
diff --git a/src/views/admin/layout/layout.vue b/src/views/admin/layout/layout.vue
index ec66dc2..2501814 100644
--- a/src/views/admin/layout/layout.vue
+++ b/src/views/admin/layout/layout.vue
@@ -18,7 +18,7 @@
 import HomeAside from './components/aside'
 import BreadCrumb from './components/breadcrumb'
 import FullPage from '@/views/common/fullpage'
-import HomeUser from '@/views/common/user'
+import HomeUser from './components/user'
 import HomeMain from '@/views/common/main'
 export default {
   name: 'Layout',
diff --git a/src/views/admin/manager/mclass/mclass.vue b/src/views/admin/manager/mclass/mclass.vue
new file mode 100644
index 0000000..542d397
--- /dev/null
+++ b/src/views/admin/manager/mclass/mclass.vue
@@ -0,0 +1,200 @@
+<template>
+  <el-card>
+    <el-form :inline="true" ref="form" :model="filterClassForm" label-width="50px" size="small">
+      <el-form-item>
+        <el-button type="primary" plain @click="addMclassInfo" class="addBtn">添加班级管理员</el-button>
+      </el-form-item>
+      <el-form-item label="年份">
+        <el-select v-model="filterClassForm.region" placeholder="全部">
+          <el-option :label="item" :value="item" v-for="item in nowDateArr" :key="item"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="学院">
+        <el-select v-model="filterClassForm.region" :placeholder="fplaceholder" :disabled="fdisabled">
+          <el-option label="区域一" value="shanghai" v-for="item in facultyList" :key="item"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="班级">
+        <el-select v-model="filterClassForm.region" :placeholder="cplaceholder" :disabled="cdisabled">
+          <el-option label="区域一" value="shanghai"></el-option>
+          <el-option label="区域二" value="beijing"></el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="filterSubmit">查询</el-button>
+      </el-form-item>
+    </el-form>
+    <el-table :data="mfacultyTable" border :height="tableHeight" v-loading="loading">
+      <el-table-column type="index" width="50" align="center"></el-table-column>
+      <el-table-column prop="id" label="id" width="80" align="center"></el-table-column>
+      <el-table-column prop="scope" label="权限" align="center"></el-table-column>
+      <el-table-column prop="ynnu_id" label="账号" width="180" align="center"></el-table-column>
+      <el-table-column prop="password" label="密码" width="150" align="center"></el-table-column>
+      <el-table-column prop="faculty_id" label="学院" align="center"></el-table-column>
+      <el-table-column prop="class_id" label="班级" align="center"></el-table-column>
+      <el-table-column fixed="right" label="操作" width="220" align="center">
+        <template slot-scope="scope">
+          <!-- <el-button @click="handleClick(scope.row)" type="text" size="small">查看</el-button> -->
+          <el-button type="primary" size="mini">查看</el-button>
+          <el-button type="warning" size="mini">编辑</el-button>
+          <el-button type="danger" size="mini">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-dialog :visible.sync="showAddMclassDialog" title="添加学校管理员" width="30%">
+      <el-form ref="form" :model="addMachoolForm" label-width="60px">
+        <el-form-item label="类型">
+          <span class="FormType">学校管理员</span>
+        </el-form-item>
+        <el-form-item label="账号">
+          <el-input v-model="addMachoolForm.ynnu_id"></el-input>
+        </el-form-item>
+        <el-form-item label="密码">
+          <el-input v-model="addMachoolForm.password"></el-input>
+        </el-form-item>
+        <el-form-item label="学院">
+          <el-input v-model="addMachoolForm.faculty_id"></el-input>
+        </el-form-item>
+        <!-- <el-form-item label="班级">
+          <el-input v-model="addMachoolForm.class_id"></el-input>
+        </el-form-item> -->
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="showAddMclassDialog = false">取 消</el-button>
+        <el-button type="primary" @click="addMclassSubmit">确 定</el-button>
+      </span>
+    </el-dialog>
+  </el-card>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      scope: localStorage.getItem('scope'),
+      nowDateArr: [],
+      fplaceholder: '全部',
+      fdisabled: false,
+      cplaceholder: '全部',
+      cdisabled: false,
+      facultyList: [
+        { name: '信息学院', id: 1}
+      ], // 全部学院列表
+      classList: [], // 所属学院的班级列表 数据联动
+      tableHeight: window.innerHeight - 200, // 设置table固定高度为浏览器窗口高度减去导航部分高度
+      showAddMclassDialog: false,
+      loading: false,
+      // mschoolTable: [], // 管理员列表
+      // 存储学校管理员信息table数据
+      mfacultyTable: [{
+        id: '1',
+        scope: '1',
+        ynnu_id: '1643205000118',
+        password: '5',
+        faculty_id: '6',
+        class_id: '7'
+        
+      },{
+        id: '23',
+        scope: '1',
+        ynnu_id: '1643205000118',
+        password: '5',
+        faculty_id: '6',
+        class_id: '7'
+        
+      },{
+        id: '61',
+        scope: '1',
+        ynnu_id: '1643205000118',
+        password: '5',
+        faculty_id: '6',
+        class_id: '7'
+      }],
+      addMachoolForm: {
+        scope: '1',
+        ynnu_id: '',
+        password: ''
+        // faculty_id: '',
+        // class_id: ''
+      },
+      filterClassForm: {
+
+      }
+    }
+  },
+  methods: {
+    getNowYear () {
+      // 获取当前年份并赋值数组
+      const date = new Date()
+      let year = date.getFullYear()
+      for(let i = 2019; i <= year; i++) {
+        this.nowDateArr.push(i)
+      }
+    },
+    getScopeDis () {
+      if (this.scope == 2) {
+        // 学院管理员
+        this.fdisabled = true
+        this.fplaceholder = '' //当前用户所著学院
+        this.cdisabled = false
+         // 班级列表
+      } else if (this.scope == 3 || this.scope == 5) {
+        // 班级或自评小组
+        this.fdisabled = true
+        this.fplaceholder = '' //当前用户所著学院
+        this.cdisabled = true
+        this.cplaceholder = '' // 当前用户所在班级
+      }
+      // else {
+      //   this.fdisabled = false
+      //   this.fplaceholder = '' //全部学院列表
+      //   this.cdisabled = false
+      //   this.cplaceholder = '' // 全部班级列表
+      // }
+      console.log(this.scope)
+    },
+    // 请求管理员列表数据
+    getMschoolTable () {
+      this.$axios
+      .get('/api/zongce/admin/1')
+        .then(res => {
+          this.MschoolTable = res.data
+          this.loading = false
+        })
+        .catch(err => {
+          console.log(err)
+        })
+    },
+    addMclassInfo () {
+      this.showAddMclassDialog = true
+    },
+    addMclassSubmit () {
+      this.$axios
+        .post('', {
+          scope: this.addMachoolForm.scope,
+          ynnu_id: this.addMachoolForm.ynnu_id,
+          password: this.addMachoolForm.password
+          // faculty_id: this.addMachoolForm.faculty_id,
+          // class_id: this.addMachoolForm.class_id
+        })
+        .then(res => {
+          this.showAddMschoolDialog = false
+          this.$message({
+            message: '添加成功',
+            type: 'success'
+          })
+        })
+        .catch(res => {})
+    },
+    filterSubmit () {
+      // 查询按钮
+    }
+  },
+  mounted () {
+    this.getMschoolTable()
+    this.getNowYear()
+    this.getScopeDis()
+  }
+}
+</script>
+<style lang="stylus" scoped>
+</style>
diff --git a/src/views/admin/manager/mfaculty/mfaculty.vue b/src/views/admin/manager/mfaculty/mfaculty.vue
new file mode 100644
index 0000000..db160bc
--- /dev/null
+++ b/src/views/admin/manager/mfaculty/mfaculty.vue
@@ -0,0 +1,154 @@
+<template>
+  <el-card>
+    <el-button type="primary" plain size="small" @click="addMschoolInfo" class="addBtn">添加学院管理员</el-button>
+    <el-table :data="mfacultyTable" border :height="tableHeight" v-loading="loading">
+      <el-table-column type="index" width="50" align="center"></el-table-column>
+      <el-table-column prop="id" label="id" width="80" align="center"></el-table-column>
+      <el-table-column prop="scope" label="权限" align="center"></el-table-column>
+      <el-table-column prop="ynnu_id" label="账号" width="180" align="center"></el-table-column>
+      <el-table-column prop="password" label="密码" width="150" align="center"></el-table-column>
+      <el-table-column prop="faculty_id" label="学院" align="center"></el-table-column>
+      <el-table-column prop="class_id" label="班级" align="center"></el-table-column>
+      <el-table-column fixed="right" label="操作" width="220" align="center">
+        <template slot-scope="scope">
+          <!-- <el-button @click="handleClick(scope.row)" type="text" size="small">查看</el-button> -->
+          <el-button type="primary" size="mini">查看</el-button>
+          <el-button type="warning" size="mini">编辑</el-button>
+          <el-button type="danger" size="mini">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-dialog :visible.sync="showAddMfacultyDialog" title="添加学校管理员" width="30%">
+      <el-form ref="form" :model="addMachoolForm" label-width="60px">
+        <el-form-item label="类型">
+          <span class="FormType">学校管理员</span>
+        </el-form-item>
+        <el-form-item label="账号">
+          <el-input v-model="addMachoolForm.ynnu_id"></el-input>
+        </el-form-item>
+        <el-form-item label="密码">
+          <el-input v-model="addMachoolForm.password"></el-input>
+        </el-form-item>
+        <el-form-item label="学院">
+          <el-input v-model="addMachoolForm.faculty_id"></el-input>
+        </el-form-item>
+        <!-- <el-form-item label="班级">
+          <el-input v-model="addMachoolForm.class_id"></el-input>
+        </el-form-item> -->
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="showAddMfacultyDialog = false">取 消</el-button>
+        <el-button type="primary" @click="sddMschoolSubmit">确 定</el-button>
+      </span>
+    </el-dialog>
+  </el-card>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      tableHeight: window.innerHeight - 200, // 设置table固定高度为浏览器窗口高度减去导航部分高度
+      showAddMfacultyDialog: false,
+      loading: false,
+      // mschoolTable: [], // 管理员列表
+      // 存储学校管理员信息table数据
+      mfacultyTable: [{
+        id: '1',
+        scope: '1',
+        ynnu_id: '1643205000118',
+        password: '5',
+        faculty_id: '6',
+        class_id: '7'
+        
+      },{
+        id: '23',
+        scope: '1',
+        ynnu_id: '1643205000118',
+        password: '5',
+        faculty_id: '6',
+        class_id: '7'
+        
+      },{
+        id: '25',
+        scope: '1',
+        ynnu_id: '1643205000118',
+        password: '5',
+        faculty_id: '6',
+        class_id: '7'
+        
+      },{
+        id: '32',
+        scope: '1',
+        ynnu_id: '1643205000118',
+        password: '5',
+        faculty_id: '6',
+        class_id: '7'
+        
+      },{
+        id: '35',
+        scope: '1',
+        ynnu_id: '1643205000118',
+        password: '5',
+        faculty_id: '6',
+        class_id: '7'
+        
+      },{
+        id: '61',
+        scope: '1',
+        ynnu_id: '1643205000118',
+        password: '5',
+        faculty_id: '6',
+        class_id: '7'
+        
+      }],
+      addMachoolForm: {
+        scope: '1',
+        ynnu_id: '',
+        password: ''
+        // faculty_id: '',
+        // class_id: ''
+      }
+    }
+  },
+  methods: {
+    // 请求管理员列表数据
+    getMschoolTable () {
+      this.$axios
+      .get('/api/nation/index')
+        .then(res => {
+          this.MschoolTable = res.data
+          this.loading = false
+        })
+        .catch(err => {
+          console.log(err)
+        })
+    },
+    addMschoolInfo () {
+      this.showAddMschoolDialog = true
+    },
+    sddMschoolSubmit () {
+      this.$axios
+        .post('', {
+          scope: this.addMachoolForm.scope,
+          ynnu_id: this.addMachoolForm.ynnu_id,
+          password: this.addMachoolForm.password
+          // faculty_id: this.addMachoolForm.faculty_id,
+          // class_id: this.addMachoolForm.class_id
+        })
+        .then(res => {
+          this.showAddMschoolDialog = false
+          this.$message({
+            message: '添加成功',
+            type: 'success'
+          })
+        })
+        .catch(res => {})
+    }
+  },
+  mounted () {
+    this.getMschoolTable()
+  }
+}
+</script>
+<style lang="stylus" scoped>
+</style>
diff --git a/src/views/admin/manager/mmember/mmember.vue b/src/views/admin/manager/mmember/mmember.vue
new file mode 100644
index 0000000..9b9af24
--- /dev/null
+++ b/src/views/admin/manager/mmember/mmember.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>测评单元成员</div>
+</template>
diff --git a/src/views/admin/manager/mschool/mschool.vue b/src/views/admin/manager/mschool/mschool.vue
new file mode 100644
index 0000000..d274bf7
--- /dev/null
+++ b/src/views/admin/manager/mschool/mschool.vue
@@ -0,0 +1,154 @@
+<template>
+  <el-card>
+    <el-button type="primary" plain size="small" @click="addMschoolInfo" class="addBtn">添加学校管理员</el-button>
+    <el-table :data="mschoolTable" border :height="tableHeight" v-loading="loading">
+      <el-table-column type="index" width="50" align="center"></el-table-column>
+      <el-table-column prop="id" label="id" width="80" align="center"></el-table-column>
+      <el-table-column prop="scope" label="权限" align="center"></el-table-column>
+      <el-table-column prop="ynnu_id" label="账号" width="180" align="center"></el-table-column>
+      <el-table-column prop="password" label="密码" width="150" align="center"></el-table-column>
+      <el-table-column prop="faculty_id" label="学院" align="center"></el-table-column>
+      <el-table-column prop="class_id" label="班级" align="center"></el-table-column>
+      <el-table-column fixed="right" label="操作" width="220" align="center">
+        <template slot-scope="scope">
+          <!-- <el-button @click="handleClick(scope.row)" type="text" size="small">查看</el-button> -->
+          <el-button type="primary" size="mini">查看</el-button>
+          <el-button type="warning" size="mini">编辑</el-button>
+          <el-button type="danger" size="mini">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <el-dialog :visible.sync="showAddMschoolDialog" title="添加学校管理员" width="30%">
+      <el-form ref="form" :model="addMachoolForm" label-width="60px">
+        <el-form-item label="类型">
+          <span class="FormType">学校管理员</span>
+        </el-form-item>
+        <el-form-item label="账号">
+          <el-input v-model="addMachoolForm.ynnu_id"></el-input>
+        </el-form-item>
+        <el-form-item label="密码">
+          <el-input v-model="addMachoolForm.password"></el-input>
+        </el-form-item>
+        <!-- <el-form-item label="学院">
+          <el-input v-model="addMachoolForm.faculty_id"></el-input>
+        </el-form-item>
+        <el-form-item label="班级">
+          <el-input v-model="addMachoolForm.class_id"></el-input>
+        </el-form-item> -->
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="showAddMschoolDialog = false">取 消</el-button>
+        <el-button type="primary" @click="sddMschoolSubmit">确 定</el-button>
+      </span>
+    </el-dialog>
+  </el-card>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      tableHeight: window.innerHeight - 200, // 设置table固定高度为浏览器窗口高度减去导航部分高度
+      showAddMschoolDialog: false,
+      loading: false,
+      // mschoolTable: [], // 管理员列表
+      // 存储学校管理员信息table数据
+      mschoolTable: [{
+        id: '1',
+        scope: '1',
+        ynnu_id: '1643205000118',
+        password: '5',
+        faculty_id: '6',
+        class_id: '7'
+        
+      },{
+        id: '23',
+        scope: '1',
+        ynnu_id: '1643205000118',
+        password: '5',
+        faculty_id: '6',
+        class_id: '7'
+        
+      },{
+        id: '25',
+        scope: '1',
+        ynnu_id: '1643205000118',
+        password: '5',
+        faculty_id: '6',
+        class_id: '7'
+        
+      },{
+        id: '32',
+        scope: '1',
+        ynnu_id: '1643205000118',
+        password: '5',
+        faculty_id: '6',
+        class_id: '7'
+        
+      },{
+        id: '35',
+        scope: '1',
+        ynnu_id: '1643205000118',
+        password: '5',
+        faculty_id: '6',
+        class_id: '7'
+        
+      },{
+        id: '61',
+        scope: '1',
+        ynnu_id: '1643205000118',
+        password: '5',
+        faculty_id: '6',
+        class_id: '7'
+        
+      }],
+      addMachoolForm: {
+        scope: '1',
+        ynnu_id: '',
+        password: ''
+        // faculty_id: '',
+        // class_id: ''
+      }
+    }
+  },
+  methods: {
+    // 请求管理员列表数据
+    getMschoolTable () {
+      this.$axios
+      .get('/api/nation/index')
+        .then(res => {
+          this.MschoolTable = res.data
+          this.loading = false
+        })
+        .catch(err => {
+          console.log(err)
+        })
+    },
+    addMschoolInfo () {
+      this.showAddMschoolDialog = true
+    },
+    sddMschoolSubmit () {
+      this.$axios
+        .post('', {
+          scope: this.addMachoolForm.scope,
+          ynnu_id: this.addMachoolForm.ynnu_id,
+          password: this.addMachoolForm.password
+          // faculty_id: this.addMachoolForm.faculty_id,
+          // class_id: this.addMachoolForm.class_id
+        })
+        .then(res => {
+          this.showAddMschoolDialog = false
+          this.$message({
+            message: '添加成功',
+            type: 'success'
+          })
+        })
+        .catch(res => {})
+    }
+  },
+  mounted () {
+    this.getMschoolTable()
+  }
+}
+</script>
+<style lang="stylus" scoped>
+</style>
diff --git a/src/views/admin/manager/msystem/msystem.vue b/src/views/admin/manager/msystem/msystem.vue
new file mode 100644
index 0000000..b6ee614
--- /dev/null
+++ b/src/views/admin/manager/msystem/msystem.vue
@@ -0,0 +1,3 @@
+<template>
+  <div>系统管理员</div>
+</template>
diff --git a/src/views/login/login.vue b/src/views/login/login.vue
index d5502f3..3924445 100644
--- a/src/views/login/login.vue
+++ b/src/views/login/login.vue
@@ -5,30 +5,41 @@
         <div class="ynnu-img"></div>
         <div class="sys-name">大学生综合素质测评系统</div>
       </div>
-      <div class="right-login">
-        <el-form :model="ruleForm" :rules="rules" status-icon ref="ruleForm" class="demo-ruleForm">
-          <el-form-item prop="type">
-            <el-select v-model="ruleForm.userType" class="select" placeholder="请选择用户类型">
-              <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item prop="name">
-            <el-input type="text" v-model="ruleForm.name" auto-complete="off" placeholder="请输入用户名"></el-input>
-          </el-form-item>
-          <el-form-item prop="pass">
-            <el-input type="password" v-model="ruleForm.pass" auto-complete="off" placeholder="请输入密码"></el-input>
-          </el-form-item>
-          <el-form-item>
-            <el-button class="login-btn" type="primary" @click="submitForm('ruleForm')">登录</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
+      <el-tabs type="card" class="right-login">
+        <el-tab-pane>
+          <span slot="label"><i class="iconfont icon-student"></i>&nbsp;&nbsp;学生登录</span>
+          <el-form :model="stuLoginForm" :rules="rules" status-icon ref="ruleForm" class="demo-ruleForm">
+            <el-form-item prop="name">
+              <el-input type="text" v-model="stuLoginForm.name" auto-complete="off" placeholder="请输入学生用户账号"></el-input>
+            </el-form-item>
+            <el-form-item prop="pwd">
+              <el-input type="password" v-model="stuLoginForm.pwd" auto-complete="off" placeholder="请输入学生用户密码"></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button class="login-btn" type="primary" @click="stuLoginSubmit">登录</el-button>
+            </el-form-item>
+          </el-form>
+        </el-tab-pane>
+        <el-tab-pane>
+          <span slot="label"><i class="iconfont icon-teacher"></i>&nbsp;&nbsp;管理员登录</span>
+          <el-form :model="teaLoginForm" :rules="rules" status-icon ref="ruleForm" class="demo-ruleForm">
+            <el-form-item prop="name">
+              <el-input type="text" v-model="teaLoginForm.name" auto-complete="off" placeholder="请输入管理员账号"></el-input>
+            </el-form-item>
+            <el-form-item prop="pwd">
+              <el-input type="password" v-model="teaLoginForm.pwd" auto-complete="off" placeholder="请输入管理员密码"></el-input>
+            </el-form-item>
+            <el-form-item>
+              <el-button class="login-btn" type="primary" @click="teaLoginSubmit">登录</el-button>
+            </el-form-item>
+          </el-form>
+        </el-tab-pane>
+      </el-tabs>
     </div>
-    <div class="copyright">云南师范大学 &copy; 2018 - 极客范技术支持</div>
+    <div class="copyright">云南师范大学 &copy; 2018 - <span ref="YearDate"></span> 极客范技术支持</div>
   </div>
 </template>
 <script>
-import { mapMutations } from 'vuex'
 export default {
   data () {
     let validateName = (rule, value, callback) => {
@@ -39,61 +50,63 @@ export default {
       }
     }
     return {
-      options: [
-        {
-          value: 'teacher',
-          label: '教师'
-        }, {
-          value: 'member',
-          label: '评议员'
-        }, {
-          value: 'student',
-          label: '学生'
-        }, {
-          value: 'manager',
-          label: '管理员'
-        }
-      ],
-      ruleForm: {
-        userType: '',
-        name: '',
-        pass: ''
+      stuLoginForm: {
+        name: '1443103000244',
+        pwd: '104943'
+      },
+      teaLoginForm: {
+        name: '1643205000167',
+        pwd: '0707'
       },
       rules: {
-        // type: [
-        //   { required: true, message: '请选择用户类型', trigger: 'blur' },
-        //   { validator: true, trigger: 'blur' }
-        // ],
         name: [
-          { required: true, message: '请输入用户名', trigger: 'blur' },
-          { validator: validateName, trigger: 'blur' }
+          { required: true, message: '请输入6-13账号', trigger: 'blur' },
+          { min: 6, max: 13, validator: validateName, trigger: 'blur' }
         ],
-        pass: [
+        pwd: [
           { required: true, message: '请输入密码', trigger: 'blur' },
-          { min: 6, max: 12, message: '请输入6-12位密码', trigger: 'blur' }
+          { min: 4, max: 6, message: '请输入6位密码', trigger: 'blur' }
         ]
       }
     }
   },
   methods: {
-    ...mapMutations(['setUser']),
-    submitForm (formName) {
-      this.$refs[formName].validate((valid) => {
-        if (valid) {
-          // alert('submit')
-          let user = {
-            name: 'jsp',
-            pawd: '1234567',
-            auth: 'edit'
-          }
-          this.setUser(user)
-          this.$router.push({path: '/'})
-        } else {
-          console.log('error submit!!!')
-          return false
-        }
-      })
+    getNowYear () {
+      const date = new Date()
+      const year = date.getFullYear()
+      this.$refs.YearDate.innerHTML = year
+    },
+    stuLoginSubmit () {
+      this.$axios
+        .post('/api/zongce/student/login', {
+          ynnu_id: this.stuLoginForm.name,
+          password: this.stuLoginForm.pwd
+        })
+        .then(res => {
+          localStorage.token = res.data
+          localStorage.scope = 6
+          this.$router.push({ path: '/student' })
+        })
+        .catch(res => {})
+    },
+    teaLoginSubmit () {
+      this.$axios
+        .post('/api/zongce/admin/login', {
+          ynnu_id: this.teaLoginForm.name,
+          password: this.teaLoginForm.pwd
+        })
+        .then(res => {
+          localStorage.token = res.data.token
+          localStorage.scope = res.data.scope
+          // localStorage.setItem('token', res.data.token)
+          // localStorage.setItem('scope', res.data.scope)
+          this.$router.push({ path: '/admin' })
+        })
+        .catch(res => {})
     }
+  },
+  mounted () {
+    this.getNowYear()
   }
 }
 </script>
@@ -124,16 +137,14 @@ export default {
         font-family STKaiti
         text-align center
     .right-login
-      width 250px
       border-radius 10px
       margin-top 150px
       margin-left 60px
-      padding 60px 30px 20px 30px
       background rgba(255,255,255,.4)
-      .select
-        width 250px
-      .login-btn
-        width 100%
+      .demo-ruleForm
+        padding 30px
+        .login-btn
+          width 100%
   .copyright
     position absolute
     width 100%
diff --git a/src/views/login/login2.vue b/src/views/login/login2.vue
new file mode 100644
index 0000000..11d232a
--- /dev/null
+++ b/src/views/login/login2.vue
@@ -0,0 +1,20 @@
+<template>
+  <div>login</div>
+</template>
+<script>
+export default {
+  data () {
+    return {
+
+    }
+  },
+  methods: {
+
+  }
+}
+</script>
+<style lang="stylus" scoped>
+.login
+  
+</style>
+
diff --git a/src/views/students/evaluation/components/bodybase.vue b/src/views/students/evaluation/components/bodybase.vue
index 4c05f5e..c45b3b3 100644
--- a/src/views/students/evaluation/components/bodybase.vue
+++ b/src/views/students/evaluation/components/bodybase.vue
@@ -12,31 +12,101 @@
         <th colspan="2">出勤情况</th>
         <th colspan="3">体育锻炼态度</th>
         <th rowspan="2">军训</th>
-        <th rowspan="2">扣分</th>
-        <th rowspan="2" colspan="2">扣分原因</th>
+        <!-- <th rowspan="2">扣分</th>
+        <th rowspan="2" colspan="2">扣分原因</th> -->
       </tr>
       <tr>
         <th>体育课出勤</th>
         <th>体育活动出勤</th>
-        <th>①</th><th>②</th><th>③</th>
+        <th>
+          <el-tooltip class="item" effect="dark" content="长期自觉坚持体育锻炼" placement="top">
+            <span class="tooltip">①</span>
+          </el-tooltip>
+        </th>
+        <th>
+          <el-tooltip class="item" effect="dark" content="积极参加院系班级体育训练" placement="top">
+            <span class="tooltip">②</span>
+          </el-tooltip>
+        </th>
+        <th>
+          <el-tooltip class="item" effect="dark" content="参加校级体育活动团体项目" placement="top">
+            <span class="tooltip">③</span>
+          </el-tooltip>
+        </th>
       </tr>
       <tr>
-        <td>1</td>
-        <td>2</td>
-        <td>3</td>
-        <td>4</td>
-        <td>5</td>
-        <td>6</td>
-        <td>7</td>
-        <td>8</td>
-        <td>9</td>
-        <td>10</td>
-        <td colspan="2">11</td>
+        <td>
+          <el-select v-model="bodyBaseForm.political">
+            <el-option :label="item" :value="item" v-for="(item, index) in number1" :key='index'></el-option>
+          </el-select>
+        </td>
+        <td>
+          <el-select v-model="bodyBaseForm.political">
+            <el-option :label="item" :value="item" v-for="(item, index) in number2" :key='index'></el-option>
+          </el-select>
+        </td>
+        <td>
+          <el-select v-model="bodyBaseForm.political">
+            <el-option :label="item" :value="item" v-for="(item, index) in number2" :key='index'></el-option>
+          </el-select>
+        </td>
+        <td>
+          <el-select v-model="bodyBaseForm.political">
+            <el-option :label="item" :value="item" v-for="(item, index) in number2" :key='index'></el-option>
+          </el-select>
+        </td>
+        <td>
+          <el-select v-model="bodyBaseForm.political">
+            <el-option :label="item" :value="item" v-for="(item, index) in number2" :key='index'></el-option>
+          </el-select>
+        </td>
+        <td>
+          <el-select v-model="bodyBaseForm.political">
+            <el-option :label="item" :value="item" v-for="(item, index) in number4" :key='index'></el-option>
+          </el-select>
+        </td>
+        <td>
+          <el-select v-model="bodyBaseForm.political">
+            <el-option :label="item" :value="item" v-for="(item, index) in number4" :key='index'></el-option>
+          </el-select>
+        </td>
+        <td>
+          <el-select v-model="bodyBaseForm.political">
+            <el-option :label="item" :value="item" v-for="(item, index) in number4" :key='index'></el-option>
+          </el-select>
+        </td>
+        <td>
+          <el-select v-model="bodyBaseForm.political">
+            <el-option :label="item" :value="item" v-for="(item, index) in number3" :key='index'></el-option>
+          </el-select>
+        </td>
       </tr>
     </table>
+    <el-button type="primary" @click="showMoreData" class="addMoreData"><i class="el-icon-upload el-icon--right"></i>&nbsp;添加定量考评数据</el-button>
+    <el-dialog :visible.sync="MoreData" width="40%" title="提示" class="Formdialog">
+      <el-form ref="form" :model="moreDataUpdate" label-width="80px">
+        <el-form-item label="类型">
+          <el-select placeholder="请选择定量考评类型">
+            <el-option label="扣分" value="扣分"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="原因说明">
+          <el-input  type="textarea" class="textarea"></el-input>
+        </el-form-item>
+        <el-upload drag action="https://jsonplaceholder.typicode.com/posts/" multiple :show-file-list="true" :before-upload="beforeupload">
+          <i class="el-icon-upload"></i>
+          <div class="el-upload__text">将<em>证明文件</em>拖到此处，或<em>点击上传</em></div>
+          <div class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
+        </el-upload>
+      </el-form>
+        <span slot="footer" class="dialog-footer">
+        <el-button @click="MoreData = false">取 消</el-button>
+        <el-button type="primary" @click="submitData">确 定</el-button>
+      </span>
+    </el-dialog>
     <el-row :gutter="20">
         <el-col :span="8"><el-button plain type="info" @click="prevent" class="table-btn">返回上一步</el-button></el-col>
-        <el-col :span="16"><el-button plain type="primary" @click="next" class="table-btn">提交并下一步</el-button></el-col>
+        <el-col :span="16"><el-button plain type="primary" @click="nextStep" class="table-btn">提交并下一步</el-button></el-col>
       </el-row>
   </el-form>
 </template>
@@ -46,7 +116,23 @@ export default {
   name: 'StudentBodyBase',
   data () {
     return {
-      bodyBaseForm: {},
+      number1: [20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0],
+      number2: [15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0],
+      number3: [10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0],
+      number4: [5, 4, 3, 2, 1, 0],
+      bodyBaseForm: {
+        1: '',
+        2: '',
+        3: '',
+        4: '',
+        5: '',
+        6: '',
+        7: '',
+        8: '',
+        9: ''
+      },
+      MoreData: false,
+      moreDataUpdate: {},
       active: 2
     }
   },
@@ -56,11 +142,21 @@ export default {
       if (this.active > 6) this.active = 0
       this.$router.push({ path: 'moralitybase' })
     },
-    next () {
+    nextStep () {
       Bus.$emit('val', this.active)
       Bus.$emit('finishAct', this.active)
       if (this.active > 6) this.active = 0
       this.$router.push({ path: 'moralityimprove' })
+    },
+    showMoreData () {
+      this.MoreData = true
+    },
+    beforeupload (file) {
+      console.log(file)
+      console.log(file.name)
+    },
+    submitData () {
+      this.MoreData = false
     }
   }
 }
diff --git a/src/views/students/evaluation/components/moralitybase.vue b/src/views/students/evaluation/components/moralitybase.vue
index fddcb15..1d6a76e 100644
--- a/src/views/students/evaluation/components/moralitybase.vue
+++ b/src/views/students/evaluation/components/moralitybase.vue
@@ -1,33 +1,75 @@
 <template>
-    <el-form ref="" :model="moralityBbaseForm">
+    <el-form ref="" :model="baseDataForm">
       <table class="table table-bordered">
         <tr>
           <th rowspan="3" class="table-left-title">基础性素质</th>
-          <th colspan="12" class="table-small-title">(一)品德基础素质</th>
+          <th colspan="12" class="table-small-title">品德基础素质(定性考评，必填)</th>
         </tr>
         <tr>
-          <th>政治表现</th>
-          <th>遵纪守法</th>
-          <th>社会公德</th>
-          <th>个人品质</th>
-          <th>人际关系</th>
-          <th>劳动表现</th>
-          <th>扣分</th>
-          <th colspan="5">扣分原因</th>
+          <th colspan="2">政治表现</th>
+          <th colspan="2">遵纪守法</th>
+          <th colspan="2">社会公德</th>
+          <th colspan="2">个人品质</th>
+          <th colspan="2">人际关系</th>
+          <th colspan="2">劳动表现</th>
         </tr>
         <tr>
-          <td>1</td>
-          <td>2</td>
-          <td>3</td>
-          <td>4</td>
-          <td>5</td>
-          <td>6</td>
-          <td>7</td>
-          <td colspan="5">8</td>
+          <td colspan="2">
+            <el-select v-model="baseDataForm.political">
+              <el-option :label="item" :value="item" v-for="(item, index) in number1" :key='index'></el-option>
+            </el-select>
+          </td>
+          <td colspan="2">
+            <el-select v-model="baseDataForm.compliance">
+              <el-option :label="item" :value="item" v-for="(item, index) in number2" :key='index'></el-option>
+            </el-select>
+          </td>
+          <td colspan="2">
+            <el-select v-model="baseDataForm.morality">
+              <el-option :label="item" :value="item" v-for="(item, index) in number2" :key='index'></el-option>
+            </el-select>
+          </td>
+          <td colspan="2">
+            <el-select v-model="baseDataForm.quality">
+              <el-option :label="item" :value="item" v-for="(item, index) in number1" :key='index'></el-option>
+            </el-select>
+          </td>
+          <td colspan="2">
+            <el-select v-model="baseDataForm.relationship">
+              <el-option :label="item" :value="item" v-for="(item, index) in number1" :key='index'></el-option>
+            </el-select>
+          </td>
+          <td colspan="2">
+            <el-select v-model="baseDataForm.performance">
+              <el-option :label="item" :value="item" v-for="(item, index) in number1" :key='index'></el-option>
+            </el-select>
+          </td>
         </tr>
       </table>
+      <el-button type="primary" @click="showMoreData" class="addMoreData"><i class="el-icon-upload el-icon--right"></i>&nbsp;添加定量考评数据</el-button>
+      <el-dialog :visible.sync="MoreData" width="40%" title="提示" class="Formdialog">
+        <el-form ref="form" :model="moreDataUpdate" label-width="80px">
+          <el-form-item label="类型">
+            <el-select placeholder="请选择定量考评类型">
+              <el-option label="扣分" value="扣分"></el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="原因说明">
+            <el-input  type="textarea" class="textarea"></el-input>
+          </el-form-item>
+          <el-upload drag action="https://jsonplaceholder.typicode.com/posts/" multiple :show-file-list="true" :before-upload="beforeupload">
+            <i class="el-icon-upload"></i>
+            <div class="el-upload__text">将<em>证明文件</em>拖到此处，或<em>点击上传</em></div>
+            <div class="el-upload__tip">只能上传jpg/png文件，且不超过500kb</div>
+          </el-upload>
+        </el-form>
+         <span slot="footer" class="dialog-footer">
+          <el-button @click="MoreData = false">取 消</el-button>
+          <el-button type="primary" @click="submitData">确 定</el-button>
+        </span>
+      </el-dialog>
       <el-row :gutter="20">
-        <el-col :span="24"><el-button plain type="primary" @click="next" class="table-btn">提交并下一步</el-button></el-col>
+        <el-col :span="24"><el-button plain type="primary" @click="nextStep" class="table-btn">提交并下一步</el-button></el-col>
       </el-row>
     </el-form>
 </template>
@@ -37,16 +79,38 @@ export default {
   name: 'StudentMoralityBase',
   data () {
     return {
-      moralityBbaseForm: {},
-      active: 1
+      number1: [15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0],
+      number2: [20, 19, 18, 17, 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0],
+      baseDataForm: {
+        political: '0',
+        compliance: '0',
+        morality: '0',
+        quality: '0',
+        relationship: '0',
+        performance: '0'
+      },
+      moreDataUpdate: {},
+      active: 1,
+      MoreData: false
     }
   },
   methods: {
-    next () {
+    nextStep () {
       Bus.$emit('val', this.active)
       Bus.$emit('finishAct', this.active)
       if (this.active > 6) this.active = 0
       this.$router.push({ path: 'bodybase' })
+      console.log(this.baseDataForm)
+    },
+    showMoreData () {
+      this.MoreData = true
+    },
+    submitData () {
+      this.MoreData = false
+    },
+    beforeupload (file) {
+      console.log(file)
+      console.log(file.name)
     }
   }
 }
@@ -54,4 +118,7 @@ export default {
 <style lang="stylus" scoped>
 .el-input
   max-width 72px
+.el-dialog
+  .el-select
+    width 100%
 </style>
diff --git a/src/views/students/evaluation/evaluationresult.vue b/src/views/students/evaluation/evaluationresult.vue
index 498064f..58666ce 100644
--- a/src/views/students/evaluation/evaluationresult.vue
+++ b/src/views/students/evaluation/evaluationresult.vue
@@ -1,3 +1,3 @@
 <template>
-  <div>评估结果</div>
+  <div>预览评估结果</div>
 </template>
diff --git a/src/views/students/evaluation/sevidence.vue b/src/views/students/evaluation/sevidence.vue
index c98f1ed..6779219 100644
--- a/src/views/students/evaluation/sevidence.vue
+++ b/src/views/students/evaluation/sevidence.vue
@@ -1,6 +1,6 @@
 <template>
   <el-card>
-    <el-upload multiple drag action="https://jsonplaceholder.typicode.com/posts/" list-type="picture" show-file-list="true" accept=".jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP">
+    <el-upload class="upload-dragger" multiple drag action="https://jsonplaceholder.typicode.com/posts/" list-type="picture" show-file-list="true" accept=".jpg,.jpeg,.png,.gif,.bmp,.JPG,.JPEG,.PBG,.GIF,.BMP">
       <i class="el-icon-upload"></i>
       <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
       <div class="el-upload__tip" slot="tip">只能上传jpg/jpeg/png/gif/bmp文件，且不超过500kb</div>
diff --git a/src/views/students/evaluation/sself.vue b/src/views/students/evaluation/sself.vue
index eb51431..d4cc98a 100644
--- a/src/views/students/evaluation/sself.vue
+++ b/src/views/students/evaluation/sself.vue
@@ -11,7 +11,7 @@
       </el-steps>
     </div>
     <el-card>
-      <router-view/>
+      <router-view class="all-page"></router-view>
     </el-card>
   </div>
 </template>
diff --git a/src/views/students/info/sinfo.vue b/src/views/students/info/sinfo.vue
index 1091eae..0723d7b 100644
--- a/src/views/students/info/sinfo.vue
+++ b/src/views/students/info/sinfo.vue
@@ -1,6 +1,6 @@
 <template>
   <el-card>
-    <div class="title">学生基本个人信息</div>
+    <div class="title">学生个人基本信息</div>
     <table class="table table-bordered">
       <tr>
         <th>姓名</th>
diff --git a/src/views/students/layout/components/user.vue b/src/views/students/layout/components/user.vue
new file mode 100644
index 0000000..6e1fef7
--- /dev/null
+++ b/src/views/students/layout/components/user.vue
@@ -0,0 +1,62 @@
+<template>
+  <div>
+    <el-dropdown trigger="click">
+      <div>
+        <img src="@/assets/img/user.jpg" class="user-img">
+        <i class="el-icon-caret-bottom el-icon--right dropdown-icon"></i>
+      </div>
+      <el-dropdown-menu slot="dropdown">
+        <el-dropdown-item>个人信息</el-dropdown-item>
+        <el-dropdown-item @click.native="stuLoginout">注 销</el-dropdown-item>
+      </el-dropdown-menu>
+    </el-dropdown>
+  </div>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      Authorization: localStorage.getItem('token'),
+      user: {}
+    }
+  },
+  methods: {
+    stuLoginout () {
+      this.$confirm('是否要注销登录?', '警告', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        })
+        .then(() => {
+          this.$axios
+            .post('/api/zongce/student/loginout')
+            .then(res => {
+              localStorage.clear()
+              this.$router.push({ path: '/login' })
+            })
+            .catch(res => {})
+        })
+        .catch(() => {
+          this.$message({
+            message: '取消注销',
+            type: 'warning'
+          })
+        })
+    }
+  }
+}
+</script>
+<style lang="stylus" scoped>
+.el-dropdown
+  width 80px
+  margin-right 10px
+  cursor pointer
+  .user-img
+    float left
+    height 36px
+    width 36px
+    margin 7px 0
+    border-radius 50%
+  .dropdown-icon
+    display inline-block
+</style>
diff --git a/src/views/students/layout/slayout.vue b/src/views/students/layout/slayout.vue
index 72bd87b..bbd9c89 100644
--- a/src/views/students/layout/slayout.vue
+++ b/src/views/students/layout/slayout.vue
@@ -20,13 +20,13 @@
       <home-user/>
     </el-header>
     <el-main>
-      <router-view style="height: 100%;"/>
+      <router-view class="all-page"></router-view>
     </el-main>
   </el-container>
 </template>
 <script>
 import FullPage from '@/views/common/fullpage'
-import HomeUser from '@/views/common/user'
+import HomeUser from './components/user'
 export default {
   name: 'Slayout',
   components: {

From d7af3558de085bef39f06cae08e2801e487ab8d3 Mon Sep 17 00:00:00 2001
From: Blank <zilisheng1996@gmail.com>
Date: Sun, 10 Mar 2019 19:34:35 +0800
Subject: [PATCH 5/6] dd

---
 src/router/index.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/router/index.js b/src/router/index.js
index 3e6c05a..ef8abcf 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,6 +11,11 @@ Vue.use(Router)
 export default new Router({
   mode: 'history',
   routes: [
+    {
+      path: '/',
+      name: 'home',
+      redirect: '/admin'
+    },
     {
       path: '/login',
       name: 'login',

From e9a19b5837bc569f69512c0db843bb2be694ae67 Mon Sep 17 00:00:00 2001
From: Blank <zilisheng1996@gmail.com>
Date: Sun, 10 Mar 2019 22:30:55 +0800
Subject: [PATCH 6/6] delete unuse file in project

---
 cockpit/charts.js                             | 363 ------------------
 cockpit/show.html                             |  93 -----
 cockpit/show.js                               |  55 ---
 home/TrafficMonitoring.echt                   |  66 ----
 home/console.html                             | 192 ---------
 home/console.js                               | 126 ------
 home/filesystem.echt                          | 101 -----
 .../components/user.vue~upstream_master       |  62 ---
 src/views/admin/manager/mclass/mclass.vue     |   5 +-
 src/views/common/buss.js                      |   1 +
 10 files changed, 2 insertions(+), 1062 deletions(-)
 delete mode 100644 cockpit/charts.js
 delete mode 100644 cockpit/show.html
 delete mode 100644 cockpit/show.js
 delete mode 100644 home/TrafficMonitoring.echt
 delete mode 100644 home/console.html
 delete mode 100644 home/console.js
 delete mode 100644 home/filesystem.echt
 delete mode 100644 src/views/admin/layout/components/user.vue~upstream_master

diff --git a/cockpit/charts.js b/cockpit/charts.js
deleted file mode 100644
index 5084897..0000000
--- a/cockpit/charts.js
+++ /dev/null
@@ -1,363 +0,0 @@
-$(document).ready(function(){
-	function loadFilesystemInfo(){
-		$("#filesystemchart").removeAttr("_echarts_instance_");
-		var myChart = echarts.init(document.getElementById("filesystemchart"), "dark");
-		$.get('getFileSystemUsageAction', function (data) {
-			 data = data.data;
-			 if(typeof data.data == "string"){
-			 	data = window.eval("("+data.data+")");
-			 }
-			 var source1 = ['product'];
-			 var source2 = ['未使用(GB)'];
-			 var source3 = ['已使用(GB)'];
-			 var seriesS = [];
-			 var left = 21, top = 30;
-			 for(var m = 0; m < data.length; m++){
-			 	var fser = data[m];
-			 	source1.push(fser.devName);
-			 	source2.push(fser.Free);
-			 	source3.push(fser.Used);
-			 	seriesS.push({
-		        name: fser.devName,
-		        type: 'pie',
-		        radius: 20,
-		        center: [left+'%', top+'%'],
-		         encode: {
-		            itemName: 'product',
-		            value: fser.devName
-		        }
-		    });
-		    if(m!=0 && m % 2 == 0){
-		    	left = 21;
-		    }else{
-		    	left += 30;
-		    }
-		    if(m!=0 && m % 2 == 0){
-		    	top += 45;
-		    }
-			}
-			 myChart.setOption({
-				backgroundColor:"",
-				color: ['#009688','#1E9FFF'],
-				legend: {},
-			    tooltip: {},
-			 	dataset: {
-			        source: [source1,source2,source3]
-			    },
-			    series: seriesS
-		    });
-			delete data;
-			setTimeout(loadFilesystemInfo, 60 * 60 * 1000);
-		});
-	}
-	loadFilesystemInfo();
-	function loadserverNetInfo(){
-		$("#netInfochart").removeAttr("_echarts_instance_");
-		var myChart = echarts.init(document.getElementById("netInfochart"), "dark");
-		var netoption = {
-			backgroundColor:"",
-			color: ['#2acff9'],
-		    title: {
-		    	textStyle: {
-		        	fontWeight: 'normal',
-			        color: '#666'
-			    },
-		    	x: 'center',
-		        text: '',
-		        subtext: '收发数据包'
-	    	},
-	    	tooltip: {
-		        trigger: 'axis',
-		        axisPointer: {
-		            type: 'shadow'
-		        }
-		    },
-		    grid: {
-		        left: '3%',
-		        right: '4%',
-		        bottom: '3%',
-		        containLabel: true
-		    },
-		    xAxis: {
-		        type: 'value',
-		        boundaryGap: [0, 0.01]
-		    },
-		    yAxis: {
-		        type: 'category',
-		        data: ['接收','发送']
-		    },
-		    series: [
-		        {
-		            name: '总字包数',
-		            type: 'bar',
-		            data: [0, 0]
-		        }
-		    ]
-		};
-		myChart.setOption(netoption);
-		$.get('getNetInterfaceStatAction', function (data) {
- 			 data = data.data;
- 			 if(typeof data.data == "string"){
- 			 	data = window.eval("("+data.data+")");
- 			 }
- 			 myChart.setOption({
-		        series: [{
-		            data: [data.rxPackets,data.txPackets]
-		        }]
-		    });
-		    delete data;
-		    setTimeout(loadserverNetInfo, 60 * 1000);
- 		});
-	}
-	loadserverNetInfo();
-	var cpuUpxChart,cpuLineChart,memLineChart;
-	var cpudata = {x:[],y:[]}, memdata = {x:[],y:[]};
-	function initCPUMemCharts(){
-		$("#CPUuxpInfochart").removeAttr("_echarts_instance_");
-		cpuUpxChart = echarts.init(document.getElementById("CPUuxpInfochart"), "dark");
-		$("#CPUlineInfochart").removeAttr("_echarts_instance_");
-		cpuLineChart = echarts.init(document.getElementById("CPUlineInfochart"), "dark");
-		$("#MemlineInfochart").removeAttr("_echarts_instance_");
-		memLineChart = echarts.init(document.getElementById("MemlineInfochart"), "dark");
-	}
-	initCPUMemCharts();
-	function refreshMonitorInfo(){
-		 var cpuusxp,memusxp;
-		  $.ajax({
-				type : "post",
-				async : false,
-				url : "getCPUPercAction",
-				success : function(data, textStatus) {
-					try {
-						if (data.data) {
-							data = window["eval"]("(" + data.data.data + ")");
-						} else {
-							data = {};
-						}
-						var usedpex = data.usedpex||0;
-						var now = new Date();
-						if(cpudata.x.length>60){
-							cpudata.x.shift();
-							cpudata.y.shift();
-						}
-						cpudata.x.push(now.getMinutes()+"′"+now.getSeconds()+"″");
-						cpudata.y.push(usedpex);
-						cpuLineChart.setOption({
-							backgroundColor:"",
-							color: ['#1E9FFF'],
-						    tooltip: {
-						          trigger: 'axis',
-						          axisPointer: {
-						              animation: false
-						          }
-						    },
-						    xAxis: {
-						        type: 'category',
-						        boundaryGap: false,
-						        data: cpudata.x
-						    },
-						    yAxis: {
-						        type: 'value',
-						        boundaryGap: [0, '100%'],
-						        splitLine: {
-						            show: false
-						        }
-						    },
-						    series: [{
-						        data: cpudata.y,
-						        type: 'line',
-						        smooth: true,
-						        showSymbol: false,
-						        hoverAnimation: true,
-						        areaStyle: {}
-						    }]
-						});
-						cpuusxp = usedpex;
-					} catch (e) {
-					}
-					delete data;
-				}
-			});
-		  $.ajax({
-				type : "post",
-				async : false,
-				url : "getMemoryInfoAction",
-				success : function(data, textStatus) {
-					try {
-						if (data.data) {
-							data = window["eval"]("(" + data.data.data + ")");
-						} else {
-							data = {};
-						}
-						var usedpex = data.usedpex||0;
-						var now = new Date();
-						if(memdata.x.length>10){
-							memdata.x.shift();
-							memdata.y.shift();
-						}
-						memdata.x.push(now.getMinutes()+"′"+now.getSeconds()+"″");
-						memdata.y.push(usedpex);
-						memLineChart.setOption({
-							backgroundColor:"",
-							color: ['#009688'],
-						    tooltip: {
-						          trigger: 'axis',
-						          axisPointer: {
-						              animation: false
-						          }
-						    },
-						    xAxis: {
-						        type: 'category',
-						        boundaryGap: false,
-						        data: memdata.x
-						    },
-						    yAxis: {
-						        type: 'value',
-						        boundaryGap: [0, '100%'],
-						        splitLine: {
-						            show: false
-						        }
-						    },
-						    series: [{
-						        data: memdata.y,
-						        type: 'line',
-						        smooth: true,
-						        showSymbol: false,
-						        hoverAnimation: true,
-						        areaStyle: {}
-						    }]
-						});
-						memusxp = usedpex;
-					} catch (e) {
-					}
-					delete data;
-				}
-			});
-		  cpuUpxChart.setOption({
-				backgroundColor:"",
-			    tooltip : {
-			        formatter: "{a} <br/>{b} : {c}%"
-			    },
-			    series: [
-			        {
-			            name: '当前使用率',
-			            type: 'gauge',
-			            center : ['50%', '35%'],    // 默认全局居中
-			            radius: '50%',
-			            axisLine: {            // 坐标轴线
-			                lineStyle: {       // 属性lineStyle控制线条样式
-			                    color: [[0.09, 'lime'],[0.82, '#1e90ff'],[1, '#ff4500']],
-			                    width: 3,
-			                    shadowColor : '#fff', //默认透明
-			                    shadowBlur: 10
-			                }
-			            },
-			            axisLabel: {            // 坐标轴小标记
-			                textStyle: {       // 属性lineStyle控制线条样式
-			                    fontWeight: 'bolder',
-			                    color: '#fff',
-			                    shadowColor : '#fff', //默认透明
-			                    shadowBlur: 10
-			                }
-			            },
-			            axisTick: {            // 坐标轴小标记
-			                length :15,        // 属性length控制线长
-			                lineStyle: {       // 属性lineStyle控制线条样式
-			                    color: 'auto',
-			                    shadowColor : '#fff', //默认透明
-			                    shadowBlur: 10
-			                }
-			            },
-			            splitLine: {           // 分隔线
-			                length :25,         // 属性length控制线长
-			                lineStyle: {       // 属性lineStyle（详见lineStyle）控制线条样式
-			                    width:3,
-			                    color: '#fff',
-			                    shadowColor : '#fff', //默认透明
-			                    shadowBlur: 10
-			                }
-			            },
-			            pointer: {           // 分隔线
-			                shadowColor : '#fff', //默认透明
-			                shadowBlur: 5
-			            },
-			            title : {
-			                textStyle: {       // 其余属性默认使用全局文本样式，详见TEXTSTYLE
-			                    fontWeight: 'bolder',
-			                    fontSize: 20,
-			                    fontStyle: 'italic',
-			                    color: '#fff',
-			                    shadowColor : '#fff', //默认透明
-			                    shadowBlur: 10
-			                }
-			            },
-			            detail: {formatter:'{value}%'},
-			            data: [{value: cpuusxp, name: 'CPU使用率'}]
-			        },
-					{
-			            name:'当前使用率',
-			            type:'gauge',
-			            center : ['50%', '75%'],    // 默认全局居中
-			            radius : '40%',
-			            axisLine: {            // 坐标轴线
-			                lineStyle: {       // 属性lineStyle控制线条样式
-			                    color: [[0.29, 'lime'],[0.86, '#1e90ff'],[1, '#ff4500']],
-			                    width: 2,
-			                    shadowColor : '#fff', //默认透明
-			                    shadowBlur: 10
-			                }
-			            },
-			            axisLabel: {            // 坐标轴小标记
-			                textStyle: {       // 属性lineStyle控制线条样式
-			                    fontWeight: 'bolder',
-			                    color: '#fff',
-			                    shadowColor : '#fff', //默认透明
-			                    shadowBlur: 10
-			                }
-			            },
-			            axisTick: {            // 坐标轴小标记
-			                length :12,        // 属性length控制线长
-			                lineStyle: {       // 属性lineStyle控制线条样式
-			                    color: 'auto',
-			                    shadowColor : '#fff', //默认透明
-			                    shadowBlur: 10
-			                }
-			            },
-			            splitLine: {           // 分隔线
-			                length :20,         // 属性length控制线长
-			                lineStyle: {       // 属性lineStyle（详见lineStyle）控制线条样式
-			                    width:3,
-			                    color: '#fff',
-			                    shadowColor : '#fff', //默认透明
-			                    shadowBlur: 10
-			                }
-			            },
-			            pointer: {
-			                width:5,
-			                shadowColor : '#fff', //默认透明
-			                shadowBlur: 5
-			            },
-			            title : {
-			                offsetCenter: [0, '-30%'],       // x, y，单位px
-			                textStyle: {       // 其余属性默认使用全局文本样式，详见TEXTSTYLE
-			                    fontWeight: 'bolder',
-			                    fontStyle: 'italic',
-			                    color: '#fff',
-			                    shadowColor : '#fff', //默认透明
-			                    shadowBlur: 10
-			                }
-			            },
-			            detail: {formatter:'{value}%'},
-			            data:[{value: memusxp, name: '内存使用率'}]
-			        }
-			    ]
-			});
-		  setTimeout(refreshMonitorInfo,1000);
-	}
-	refreshMonitorInfo();
-	$(window).resize(function(){
-		loadFilesystemInfo();
-		loadserverNetInfo();
-		initCPUMemCharts();
-	});
-});
\ No newline at end of file
diff --git a/cockpit/show.html b/cockpit/show.html
deleted file mode 100644
index f0966bd..0000000
--- a/cockpit/show.html
+++ /dev/null
@@ -1,93 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>监控舱</title>
-  <meta name="renderer" content="webkit">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-  <link rel="stylesheet" href="../../resources/layui/layuiadmin/layui/css/layui.css" media="all">
-  <link rel="stylesheet" href="../../resources/layui/layuiadmin/style/admin.css" media="all">
-  <link rel="stylesheet" href="../../resources/Cockpit/css/cockpitui.css" media="all">
-  <script type="text/javascript" src="../../comon/js/jquery/jquery.min.js"></script>
-  <script type="text/javascript" src="../../resources/echarts/js/echarts.min.js"></script>
-  <script type="text/javascript" src="../../resources/echarts/js/echarts-gl.min.js"></script>
-  <script type="text/javascript" src="../../resources/echarts/js/ecStat.min.js"></script>
-  <script type="text/javascript" src="../../resources/echarts/js/dataTool.min.js"></script>
-  <script type="text/javascript" src="show.js"></script>
-</head>
-<body class="layui-layout-body">
-	<div id="top" style="width: 100%; height: 15%;">
-		<div class="top-title-line">
-			<div class="top-left"></div>
-			<div class="top-center">服务器实时监控舱</div>
-			<div class="top-right"></div>
-		</div>
-		<div id="screenbar" style="width:100%; height: 18px; position: absolute; right: 0px; top: 0px; z-index:2; padding: 2px; background: #ddd; opacity:0.6;">
-		 <a href="javascript:;" onclick="togofullScreen(this)" style="float: right; margin-right: 5px;">
-           <i class="layui-icon layui-icon-screen-full"></i>
-         </a>
-		</div>
-	</div>
-	<div id="center" style="width: 100%; height: 85%; position: relative;">
-		<div style="width: 30%; height: 45%; position: absolute; left: 8px; top: 1px;">
-			<div class="quick-border-layout-title">
-				<table>
-					<tr>
-						<td class="fh" style="width: 28px;"></td>
-						<td class="fh p15">服务器存储信息</td>
-					</tr>
-				</table>
-			</div>
-			<div class="quick-border-layout">
-				<div id="filesystemchart" style="height:100%; border:0; overflow: hidden;"></div>
-			</div>
-		</div>
-		<div style="width: 30%; height: 45%; position: absolute; right: 10px; top: 1px;">
-			<div class="quick-border-layout-title">
-				<table>
-					<tr>
-						<td class="fh" style="width: 28px;"></td>
-						<td class="fh p15">CPU使用记录</td>
-					</tr>
-				</table>
-			</div>
-			<div class="quick-border-layout">
-				<div id="CPUlineInfochart" style="height:100%; border:0; overflow: hidden;"></div>
-			</div>
-		</div>
-		<div style="height: 80%; position: absolute; left: 31%; right: 32%; top: 10%;">
-			<div class="quick-border-layout-square" style="width: 100%; height: 100%; padding: 3px;">
-				<div id="CPUuxpInfochart" style="height:100%; border:0; overflow: hidden;"></div>
-			</div>
-		</div>
-		<div style="width: 30%; height: 45%; position: absolute; left: 8px; top: 50%;">
-			<div class="quick-border-layout-title">
-				<table>
-					<tr>
-						<td class="fh" style="width: 28px;"></td>
-						<td class="fh p15">服务器网络流量</td>
-					</tr>
-				</table>
-			</div>
-			<div class="quick-border-layout">
-				<div id="netInfochart" style="height:100%; border:0; overflow: hidden;"></div>
-			</div>
-		</div>
-		<div style="width: 30%; height: 45%; position: absolute; right: 10px; top: 50%;">
-			<div class="quick-border-layout-title">
-				<table>
-					<tr>
-						<td class="fh" style="width: 28px;"></td>
-						<td class="fh p15">内存使用记录</td>
-					</tr>
-				</table>
-			</div>
-			<div class="quick-border-layout">
-				<div id="MemlineInfochart" style="height:100%; border:0; overflow: hidden;"></div>
-			</div>
-		</div>
-	</div>
-</body>
-<script type="text/javascript" src="charts.js"></script>
-</html>
\ No newline at end of file
diff --git a/cockpit/show.js b/cockpit/show.js
deleted file mode 100644
index e8aa00e..0000000
--- a/cockpit/show.js
+++ /dev/null
@@ -1,55 +0,0 @@
-var togofullScreen = function(othis) {
-	var SCREEN_FULL = 'layui-icon-screen-full', SCREEN_REST = 'layui-icon-screen-restore', iconElem = $(
-			othis).children("i");
-
-	if (iconElem.hasClass(SCREEN_FULL)) {
-		fullScreen();
-		iconElem.addClass(SCREEN_REST).removeClass(SCREEN_FULL);
-	} else {
-		exitScreen();
-		iconElem.addClass(SCREEN_FULL).removeClass(SCREEN_REST);
-	}
-};
-function fullScreen() {
-	var ele = document.documentElement, reqFullScreen = ele.requestFullScreen
-			|| ele.webkitRequestFullScreen || ele.mozRequestFullScreen
-			|| ele.msRequestFullscreen;
-	if (typeof reqFullScreen !== 'undefined' && reqFullScreen) {
-		reqFullScreen.call(ele);
-	}
-	;
-}
-function exitScreen() {
-	var ele = document.documentElement
-	if (document.exitFullscreen) {
-		document.exitFullscreen();
-	} else if (document.mozCancelFullScreen) {
-		document.mozCancelFullScreen();
-	} else if (document.webkitCancelFullScreen) {
-		document.webkitCancelFullScreen();
-	} else if (document.msExitFullscreen) {
-		document.msExitFullscreen();
-	}
-}
-$(document).ready(function() {
-	$("#top").bind("mouseout", function() {
-		$("#screenbar").hide();
-	});
-	$("#top").bind("mouseover", function() {
-		$("#screenbar").show();
-	});
-	$("#screenbar").hide();
-	$("iframe").each(function() {
-		var win = this.contentWindow;
-		$(win.document).css("overflow", "hidden");
-	});
-	$(window).resize(function() {
-		var tpcenter = $(".top-center");
-		var lheight = tpcenter.parent().height();
-		tpcenter.css("line-height", lheight + "px");
-		tpcenter.css("font-size", (lheight * 36 / 60) + "px");
-		$(".p15").each(function() {
-			$(this).css("font-size", ($(this).height() * 15 / 46) + "px");
-		});
-	});
-});
\ No newline at end of file
diff --git a/home/TrafficMonitoring.echt b/home/TrafficMonitoring.echt
deleted file mode 100644
index 30395e5..0000000
--- a/home/TrafficMonitoring.echt
+++ /dev/null
@@ -1,66 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-  <data>
-  </data>
-  <chart type="Bar" modle="barycategory" theme="light">
-    {
-	    title: {
-	    	textStyle: {
-	        	fontWeight: 'normal',
-		        color: '#666'
-		    },
-	    	x: 'center',
-	        text: '服务器网络信息',
-	        subtext: '收发数据包'
-    	},
-    	tooltip: {
-	        trigger: 'axis',
-	        axisPointer: {
-	            type: 'shadow'
-	        }
-	    },
-	    grid: {
-	        left: '3%',
-	        right: '4%',
-	        bottom: '3%',
-	        containLabel: true
-	    },
-	    xAxis: {
-	        type: 'value',
-	        boundaryGap: [0, 0.01]
-	    },
-	    yAxis: {
-	        type: 'category',
-	        data: ['接收','发送']
-	    },
-	    series: [
-	        {
-	            name: '总字包数',
-	            type: 'bar',
-	            data: [0, 0]
-	        }
-	    ]
-	}
-  </chart>
-  <script>
-  	function loadNetstateInfo(){
-  		$.get('getNetInterfaceStatAction', function (data) {
-  			 data = data.data;
-  			 if(typeof data.data == "string"){
-  			 	data = window.eval("("+data.data+")");
-  			 }
-  			 myChart.setOption({
-		        series: [{
-		            data: [data.rxPackets,data.txPackets]
-		        }]
-		    });
-		    delete data;
-		    setTimeout(loadNetstateInfo, 60 * 1000);
-  		});
-  	}
-  	loadNetstateInfo();
-  	$(window).resize(function() {
-  		window.location.reload();
-  	});
-  </script>
-</root>
\ No newline at end of file
diff --git a/home/console.html b/home/console.html
deleted file mode 100644
index 4df89a9..0000000
--- a/home/console.html
+++ /dev/null
@@ -1,192 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta charset="utf-8">
-  <title>layuiAdmin 控制台主页一</title>
-  <meta name="renderer" content="webkit">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
-  <link rel="stylesheet" href="../../resources/layui/layuiadmin/layui/css/layui.css" media="all">
-  <link rel="stylesheet" href="../../resources/layui/layuiadmin/style/admin.css" media="all">
-  <script type="text/javascript" src="../../comon/js/jquery/jquery.min.js"></script>
-</head>
-<body>
-  
-  <div class="layui-fluid">
-    <div class="layui-row layui-col-space15">
-      <div class="layui-col-md8">
-        <div class="layui-row layui-col-space15">
-          <div class="layui-col-md6">
-            <div class="layui-card">
-              <div class="layui-card-header">快捷方式</div>
-              <div class="layui-card-body">
-                
-                <div class="layui-carousel layadmin-carousel layadmin-shortcut">
-                  <div carousel-item>
-                    <ul class="layui-row layui-col-space10">
-                      <li class="layui-col-xs3">
-                        <a lay-href="/JBIZ/SA/personal/schedule/mainActivity.html">
-                          <i class="layui-icon layui-icon-console"></i>
-                          <cite>日程安排</cite>
-                        </a>
-                      </li>
-                      <li class="layui-col-xs3">
-                        <a lay-href="/JBIZ/SA/docnode/PersonalDocNode.html">
-                          <i class="layui-icon layui-icon-file"></i>
-                          <cite>个人文件柜</cite>
-                        </a>
-                      </li>
-                      <li class="layui-col-xs3">
-                        <a lay-href="/JBIZ/SA/docnode/PersonaList.html">
-                          <i class="layui-icon layui-icon-template-1"></i>
-                          <cite>文件列表</cite>
-                        </a>
-                      </li>
-                      <li class="layui-col-xs3">
-                        <a lay-href="/JBIZ/oa/PersonUse/MYGROUP/listActivity.html">
-                          <i class="layui-icon layui-icon-chat"></i>
-                          <cite>我的群组</cite>
-                        </a>
-                      </li>
-                      <li class="layui-col-xs3">
-                        <a lay-href="/JBIZ/oa/report/DayReport/reportList.html">
-                          <i class="layui-icon layui-icon-find-fill"></i>
-                          <cite>个人日报</cite>
-                        </a>
-                      </li>
-                      <li class="layui-col-xs3">
-                        <a lay-href="/JBIZ/system/workLog/WorkLog.html">
-                          <i class="layui-icon layui-icon-survey"></i>
-                          <cite>写日志</cite>
-                        </a>
-                      </li>
-                      <li class="layui-col-xs3">
-                        <a lay-href="/JBIZ/SA/personal/personInfo/mainActivity.html">
-                          <i class="layui-icon layui-icon-user"></i>
-                          <cite>人事自助</cite>
-                        </a>
-                      </li>
-                      <li class="layui-col-xs3">
-                        <a lay-href="/JBIZ/oa/flowset/myOpinion/mainActivity.html">
-                          <i class="layui-icon layui-icon-set"></i>
-                          <cite>审批意见设置</cite>
-                        </a>
-                      </li>
-                    </ul>
-                  </div>
-                </div>
-                
-              </div>
-            </div>
-          </div>
-          <div class="layui-col-md6">
-            <div class="layui-card">
-              <div class="layui-card-header">待办事项</div>
-              <div class="layui-card-body">
-				
-				<div class="layui-carousel layadmin-carousel layadmin-backlog">
-                  <div carousel-item>
-                    <ul class="layui-row layui-col-space10">
-                      <li class="layui-col-xs6">
-                        <a lay-href="/JBIZ/SA/task/taskCenter/mainActivity.html?opation=waitting" class="layadmin-backlog-body">
-                          <h3>代办任务</h3>
-                          <p><cite id="taskCount">0</cite></p>
-                        </a>
-                      </li>
-                      <li class="layui-col-xs6">
-                        <a lay-href="/JBIZ/oa/notice/publicnotice/looknoticepushlist.html" class="layadmin-backlog-body">
-                          <h3>通知</h3>
-                          <p><cite id="notesCount">0</cite></p>
-                        </a>
-                      </li>
-                      <li class="layui-col-xs6">
-                        <a lay-href="/JBIZ/system/News/informationRelase/newsManageLists.html" class="layadmin-backlog-body">
-                          <h3>新闻</h3>
-                          <p><cite id="newsCount">0</cite></p>
-                        </a>
-                      </li>
-                      <li class="layui-col-xs6">
-                        <a lay-href="/JBIZ/system/News/forum/BO_talkl.html" class="layadmin-backlog-body">
-                          <h3>讨论区</h3>
-                          <p><cite id="topicCount">0</cite></p>
-                        </a>
-                      </li>
-                    </ul>
-                  </div>
-                </div>
-                
-              </div>
-            </div>
-          </div>
-          <div class="layui-col-md12">
-            <div class="layui-card">
-              <div class="layui-card-header">数据概览</div>
-              <div class="layui-card-body">
-                
-                <div class="layui-carousel layadmin-carousel layadmin-dataview" data-anim="fade" lay-filter="LAY-index-dataview">
-                  <div carousel-item id="LAY-index-dataview">
-                    <div><i class="layui-icon layui-icon-loading1 layadmin-loading"></i></div>
-                    <div>
-                    	<iframe id="filesystemchart" src="filesystem.echt" frameborder="0" style="width: 90%; height:332px; border:0; overflow: hidden;"></iframe>
-                    </div>
-                    <div></div>
-                  </div>
-                </div>
-                
-              </div>
-            </div>
-            
-          </div>
-        </div>
-      </div>
-      
-      <div class="layui-col-md4">
-        <div class="layui-card">
-          <div class="layui-card-header">邮件提醒</div>
-          <div class="layui-card-body layui-text">
-            <iframe src="/JBIZ/oa/email/portalShow/Show.html?PortalLetId=DAYREMAND" frameborder="0" style="width: 100%; height: 180px; border:0;"></iframe>
-          </div>
-        </div>
-        
-        <div class="layui-card">
-          <div class="layui-card-header">实时监控</div>
-          <div class="layui-card-body layadmin-takerates">
-            <div class="layui-progress" lay-showPercent="yes" lay-filter="progress-cpuprs">
-              <h3>CPU使用率</h3>
-              <div class="layui-progress-bar" lay-percent="0%" id="cpuprs"></div>
-            </div>
-            <div class="layui-progress" lay-showPercent="yes" lay-filter="progress-memprs">
-              <h3>内存占用率</h3>
-              <div class="layui-progress-bar" lay-percent="0%" id="memprs"></div>
-            </div>
-          </div>
-        </div>
-        
-        <div class="layui-card">
-          <div class="layui-card-header">流量监控</div>
-          <div class="layui-card-body layadmin-takerates">
-            <iframe src="TrafficMonitoring.echt" frameborder="0" style="width: 100%; height:124px; border:0;"></iframe>
-          </div>
-        </div>
-
-      </div>
-      
-    </div>
-  </div>
-
-  <script src="../../resources/layui/layuiadmin/layui/layui.js"></script>  
-  <script>
-	  layui.config({
-	    base: '../../resources/layui/layuiadmin/' //静态资源所在路径
-	  }).extend({
-	    index: 'lib/index' //主入口模块
-	  }).use(['index', 'console']);
-	  $("#filesystemchart").width($("#LAY-index-dataview").width());
-	  $(window).resize(function(){
-	  	$("#filesystemchart").width($("#LAY-index-dataview").width());
-	  });
-  </script>
-  <script src="console.js"></script>
-</body>
-</html>
-
diff --git a/home/console.js b/home/console.js
deleted file mode 100644
index d8aee77..0000000
--- a/home/console.js
+++ /dev/null
@@ -1,126 +0,0 @@
-//待办事项
-function loadTopTip() {
-	$.ajax({
-		type : "post",
-		async : true,
-		url : "getWaitTaskAction",//待办任务
-		success : function(result, textStatus) {
-			if (result.count) {
-				$("#taskCount").text(result.count);
-			}
-			delete result;
-		},
-		error : function() {
-			// 请求出错处理
-		}
-	});
-	$.ajax({
-		type : "post",
-		async : true,
-		url : "getPortalNotesAction",//通知
-		success : function(result, textStatus) {
-			var news = result.data;
-			if (typeof news.data == "string") {
-				news.data = window.eval("(" + news.data + ")");
-			}
-			$("#notesCount").text(news.data.length);
-			delete news;
-			delete result;
-		},
-		error : function() {
-			// 请求出错处理
-		}
-	});
-	$.ajax({
-		type : "post",
-		async : true,
-		url : "loadNewsAction",//新闻
-		success : function(result, textStatus) {
-			var news = result.data;
-			if (typeof news.data == "string") {
-				news.data = window.eval("(" + news.data + ")");
-			}
-			$("#newsCount").text(news.data.length);
-			delete news;
-			delete result;
-		},
-		error : function() {
-			// 请求出错处理
-		}
-	});
-	$.ajax({
-		type : "post",
-		async : true,
-		url : "getPortalBofoAction",//发帖
-		success : function(result, textStatus) {
-			var news = result.data;
-			if (typeof news.data == "string") {
-				news.data = window.eval("(" + news.data + ")");
-			}
-			$("#topicCount").text(news.data.length);
-			delete news;
-			delete result;
-		},
-		error : function() {
-			// 请求出错处理
-		}
-	});
-	setTimeout(loadTopTip, 60 * 1000);
-}
-loadTopTip();
-
-//实时监控
-function refreshMonitorInfo(){
-	  $.ajax({
-			type : "post",
-			async : true,
-			url : "getCPUPercAction",
-			success : function(data, textStatus) {
-				try {
-					if (data.data) {
-						data = window["eval"]("(" + data.data.data + ")");
-					} else {
-						data = {};
-					}
-					var usedpex = data.usedpex||0;
-					if(usedpex<30){
-						$("#cpuprs").attr("class","layui-progress-bar");
-					}else if(usedpex<80){
-						$("#cpuprs").attr("class","layui-progress-bar layui-bg-blue");
-					}else{
-						$("#cpuprs").attr("class","layui-progress-bar layui-bg-red");
-					}
-					layui.element.progress("progress-cpuprs",usedpex+"%");
-				} catch (e) {
-				}
-				delete data;
-			}
-		});
-	  $.ajax({
-			type : "post",
-			async : true,
-			url : "getMemoryInfoAction",
-			success : function(data, textStatus) {
-				try {
-					if (data.data) {
-						data = window["eval"]("(" + data.data.data + ")");
-					} else {
-						data = {};
-					}
-					var usedpex = data.usedpex||0;
-					if(usedpex<50){
-						$("#memprs").attr("class","layui-progress-bar");
-					}else if(usedpex<80){
-						$("#memprs").attr("class","layui-progress-bar layui-bg-blue");
-					}else{
-						$("#memprs").attr("class","layui-progress-bar layui-bg-red");
-					}
-					layui.element.progress("progress-memprs",usedpex+"%");
-				} catch (e) {
-				}
-				delete data;
-			}
-		});
-	  setTimeout(refreshMonitorInfo,1000);
-}
-refreshMonitorInfo();
\ No newline at end of file
diff --git a/home/filesystem.echt b/home/filesystem.echt
deleted file mode 100644
index c67f4a7..0000000
--- a/home/filesystem.echt
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<root>
-  <data>
-  </data>
-  <chart type="Dataset" modle="datasetdefault" theme="light">
-    {
-     // 默认色板
-    color: [
-      '#009688','#1E9FFF','#5FB878','#FFB980','#D87A80',
-      '#8d98b3','#e5cf0d','#97b552','#95706d','#dc69aa',
-      '#07a2a4','#9a7fd1','#588dd5','#f5994e','#c05050',
-      '#59678c','#c9ab00','#7eb00a','#6f5553','#c14089'
-    ],
-    title:{
-    	 textStyle: {
-	        fontWeight: 'normal',
-	        color: '#666'      // 主标题文字颜色
-	     },
-    	 text: '服务器存储信息',
-    	 x: 'left'
-    },
-    legend: {},
-    tooltip: {},
-    dataset: {
-        source: [
-            ['product', 'disk1', 'disk2'],
-            ['未使用(GB)', 41.1, 30.4],
-            ['已使用(GB)', 86.5, 92.1]
-        ]
-    },
-    series: [{
-        name: 'C:',
-        type: 'pie',
-        radius: 60,
-        center: ['15%', '30%'],
-         encode: {
-            itemName: 'product',
-            value: 'disk1'
-        }
-    }, {
-        name: 'D:',
-        type: 'pie',
-        radius: 60,
-        center: ['45%', '30%'],
-        encode: {
-            itemName: 'product',
-            value: 'disk2'
-        }
-    }]
-}
-  </chart>
-  <script>
-  <![CDATA[
-  	function loadFilesystemInfo(){
-  		$.get('getFileSystemUsageAction', function (data) {
-  			 data = data.data;
-  			 if(typeof data.data == "string"){
-  			 	data = window.eval("("+data.data+")");
-  			 }
-  			 var source1 = ['product'];
-  			 var source2 = ['未使用(GB)'];
-  			 var source3 = ['已使用(GB)'];
-  			 var seriesS = [];
-  			 var left = 15, top = 30;
-  			 for(var m = 0; m < data.length; m++){
-  			 	var fser = data[m];
-  			 	source1.push(fser.devName);
-  			 	source2.push(fser.Free);
-  			 	source3.push(fser.Used);
-  			 	seriesS.push({
-			        name: fser.devName,
-			        type: 'pie',
-			        radius: 60,
-			        center: [left+'%', top+'%'],
-			         encode: {
-			            itemName: 'product',
-			            value: fser.devName
-			        }
-			    });
-			    if(m!=0 && m % 2 == 0){
-			    	left = 15;
-			    }else{
-			    	left += 30;
-			    }
-			    if(m!=0 && m % 2 == 0){
-			    	top += 45;
-			    }
-  			 }
-  			 myChart.setOption({
- 			 	dataset: {
-			        source: [source1,source2,source3]
-			    },
-			    series: seriesS
-		    });
-		    delete data;
-  		});
-  	}
-  	loadFilesystemInfo();
-  ]]>
-  </script>
-</root>
\ No newline at end of file
diff --git a/src/views/admin/layout/components/user.vue~upstream_master b/src/views/admin/layout/components/user.vue~upstream_master
deleted file mode 100644
index 8f75f5d..0000000
--- a/src/views/admin/layout/components/user.vue~upstream_master
+++ /dev/null
@@ -1,62 +0,0 @@
-<template>
-  <div>
-    <el-dropdown trigger="click">
-      <div>
-        <img src="@/assets/img/user.jpg" class="user-img">
-        <i class="el-icon-caret-bottom el-icon--right dropdown-icon"></i>
-      </div>
-      <el-dropdown-menu slot="dropdown">
-        <el-dropdown-item>个人信息</el-dropdown-item>
-        <el-dropdown-item @click.native="teaLogout">注 销</el-dropdown-item>
-      </el-dropdown-menu>
-    </el-dropdown>
-  </div>
-</template>
-<script>
-export default {
-  data () {
-    return {
-      Authorization: localStorage.getItem('token'),
-      user: {}
-    }
-  },
-  methods: {
-    teaLogout () {
-      this.$confirm('是否要注销登录?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      })
-      .then(() => {
-        this.$axios
-          .post('/api/zongce/admin/loginout')
-          .then(res => {
-            localStorage.clear()
-            this.$router.push({ path: '/login' })
-          })
-          .catch(res => {})
-        })
-        .catch(() => {
-          this.$message({
-            message: '取消注销',
-            type: 'warning'
-          })
-        })
-    }
-  }
-}
-</script>
-<style lang="stylus" scoped>
-.el-dropdown
-  width 80px
-  margin-right 10px
-  cursor pointer
-  .user-img
-    float left
-    height 36px
-    width 36px
-    margin 7px 0
-    border-radius 50%
-  .dropdown-icon
-    display inline-block
-</style>
diff --git a/src/views/admin/manager/mclass/mclass.vue b/src/views/admin/manager/mclass/mclass.vue
index bdc54c6..40d2a33 100644
--- a/src/views/admin/manager/mclass/mclass.vue
+++ b/src/views/admin/manager/mclass/mclass.vue
@@ -33,7 +33,7 @@
       <el-table-column prop="faculty_id" label="学院" align="center"></el-table-column>
       <el-table-column prop="class_id" label="班级" align="center"></el-table-column>
       <el-table-column fixed="right" label="操作" width="220" align="center">
-        <template slot-scope="scope">
+        <template>
           <!-- <el-button @click="handleClick(scope.row)" type="text" size="small">查看</el-button> -->
           <el-button type="primary" size="mini">查看</el-button>
           <el-button type="warning" size="mini">编辑</el-button>
@@ -55,9 +55,6 @@
         <el-form-item label="学院">
           <el-input v-model="addMachoolForm.faculty_id"></el-input>
         </el-form-item>
-        <!-- <el-form-item label="班级">
-          <el-input v-model="addMachoolForm.class_id"></el-input>
-        </el-form-item> -->
       </el-form>
       <span slot="footer" class="dialog-footer">
         <el-button @click="showAddMclassDialog = false">取 消</el-button>
diff --git a/src/views/common/buss.js b/src/views/common/buss.js
index b0230b5..8853b4d 100644
--- a/src/views/common/buss.js
+++ b/src/views/common/buss.js
@@ -1,2 +1,3 @@
 import Vue from 'vue'
+
 export default new Vue()