From af73845fe99477474ebf7fcdde771b8f495a2172 Mon Sep 17 00:00:00 2001
From: xiaoning <1097449274@qq.com>
Date: Wed, 24 Dec 2025 14:01:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/datacall.jpg                              | Bin 82159 -> 0 bytes
 src/api/columns/teacher.js                    |   6 +
 src/api/oms/aftersale.js                      |  35 -
 src/api/oms/order.js                          |   2 +-
 src/api/school/report/dashboard/index.js      |   2 +-
 src/api/school/sc/school/index.js             |  62 --
 src/api/school/system/dept/index.js           |  56 +-
 src/api/system/dict/data.js                   |   9 +-
 src/api/system/role.js                        |   2 +-
 src/assets/icons/svg/dashboard-cla-time.svg   |   1 +
 src/assets/icons/svg/dashboard-cla.svg        |   1 +
 src/assets/icons/svg/dashboard-course.svg     |   1 +
 src/assets/icons/svg/dashboard-notice.svg     |   1 +
 src/assets/icons/svg/dashboard-order.svg      |   1 +
 src/assets/icons/svg/dashboard-record.svg     |   1 +
 src/assets/icons/svg/dashboard-sign-up.svg    |   1 +
 .../icons/svg/dashboard-student-cnt.svg       |   1 +
 src/assets/icons/svg/dashboard-student.svg    |   1 +
 .../sc/claTime/addClaTimeAttend.vue           |   9 +-
 .../sc/claTime/changeClaTimeAttend.vue        |   9 +-
 src/components/sc/claTime/changeTimeRule.vue  |  60 +-
 .../sc/claTime/claTimeAttendDetailTable.vue   |   3 +-
 src/components/sc/course/addCourse.vue        |  12 +-
 src/components/sc/school/schoolSelect.vue     | 113 ---
 src/components/sc/student/changeStudent.vue   |  32 +-
 .../sc/student/courseStudentChooseCla.vue     |   7 +-
 .../sc/student/courseStudentTable.vue         |   9 +-
 .../sc/student/studentCourseSignUpTable.vue   |  14 +-
 src/components/sc/student/studentTable.vue    |  46 +-
 src/components/system/staff/changeStaff.vue   |   8 +-
 src/main.js                                   |   5 +-
 src/router/index.js                           |   8 +-
 src/store/modules/user.js                     |   6 -
 src/styles/dashboard/index.scss               |  25 +-
 src/styles/sc/order/signUp.scss               |   2 +
 src/utils/request.js                          |   6 +-
 src/views/columns/config/appreciate.vue       |  19 +-
 src/views/columns/config/health.vue           |  27 +-
 src/views/columns/config/inherit.vue          |  15 +-
 src/views/columns/config/practice.vue         |  25 +-
 src/views/columns/config/sense.vue            |  25 +-
 src/views/columns/config/venue.vue            |  23 +-
 src/views/columns/context/index.vue           |  11 +-
 src/views/courseOrder/signUp.vue              |   9 +-
 src/views/index.vue                           | 454 +++++-------
 src/views/login.vue                           |   4 +-
 src/views/oms/aftersale/index.vue             |  48 +-
 src/views/school/course/cla/index.vue         |  20 +-
 src/views/school/course/index.vue             |  45 +-
 src/views/school/order/index.vue              |   7 +-
 src/views/school/order/signUp.vue             |  10 +-
 src/views/school/room/index.vue               |   7 +
 src/views/school/salary/comps/CalTime.vue     |   6 +-
 src/views/school/school/index.vue             | 334 ---------
 .../student/components/studentCourseTable.vue |   5 +-
 .../student/components/studentLogTable.vue    |   3 +-
 .../student/components/studentOrderTable.vue  |   5 +-
 src/views/school/sys/tag/index.vue            | 347 ---------
 src/views/school/system/dept/index.vue        | 347 ---------
 src/views/school/system/dict/data.vue         | 358 ----------
 src/views/school/system/dict/type.vue         | 349 ---------
 src/views/school/system/menu/index.vue        | 359 ----------
 src/views/school/system/role/index.vue        | 354 ----------
 src/views/school/system/staff/index.vue       | 330 ---------
 src/views/school/system/tenant/index.vue      | 317 ---------
 src/views/school/system/user/index.vue        | 666 ------------------
 .../school/system/user/profile/index.vue      |  92 ---
 .../school/system/user/profile/resetPwd.vue   |  88 ---
 .../school/system/user/profile/userAvatar.vue | 144 ----
 .../school/system/user/profile/userInfo.vue   |  77 --
 src/views/system/dept/index.vue               |  27 +-
 src/views/system/role/index.vue               |  22 +-
 src/views/system/role/selectUser.vue          |   6 +-
 src/views/system/user/index.vue               |  92 ++-
 74 files changed, 592 insertions(+), 5042 deletions(-)
 delete mode 100644 doc/datacall.jpg
 delete mode 100644 src/api/school/sc/school/index.js
 create mode 100644 src/assets/icons/svg/dashboard-cla-time.svg
 create mode 100644 src/assets/icons/svg/dashboard-cla.svg
 create mode 100644 src/assets/icons/svg/dashboard-course.svg
 create mode 100644 src/assets/icons/svg/dashboard-notice.svg
 create mode 100644 src/assets/icons/svg/dashboard-order.svg
 create mode 100644 src/assets/icons/svg/dashboard-record.svg
 create mode 100644 src/assets/icons/svg/dashboard-sign-up.svg
 create mode 100644 src/assets/icons/svg/dashboard-student-cnt.svg
 create mode 100644 src/assets/icons/svg/dashboard-student.svg
 delete mode 100644 src/components/sc/school/schoolSelect.vue
 delete mode 100644 src/views/school/school/index.vue
 delete mode 100644 src/views/school/sys/tag/index.vue
 delete mode 100644 src/views/school/system/dept/index.vue
 delete mode 100644 src/views/school/system/dict/data.vue
 delete mode 100644 src/views/school/system/dict/type.vue
 delete mode 100644 src/views/school/system/menu/index.vue
 delete mode 100644 src/views/school/system/role/index.vue
 delete mode 100644 src/views/school/system/staff/index.vue
 delete mode 100644 src/views/school/system/tenant/index.vue
 delete mode 100644 src/views/school/system/user/index.vue
 delete mode 100644 src/views/school/system/user/profile/index.vue
 delete mode 100644 src/views/school/system/user/profile/resetPwd.vue
 delete mode 100644 src/views/school/system/user/profile/userAvatar.vue
 delete mode 100644 src/views/school/system/user/profile/userInfo.vue

diff --git a/doc/datacall.jpg b/doc/datacall.jpg
deleted file mode 100644
index 8a31a980afe31cccf49bbd7a8b5a872b6d157a5c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 82159
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

diff --git a/src/api/columns/teacher.js b/src/api/columns/teacher.js
index 1c0e587..71d5545 100644
--- a/src/api/columns/teacher.js
+++ b/src/api/columns/teacher.js
@@ -7,6 +7,12 @@ export function listTeacher(query) {
     method: 'get',
     params: query
   })
+}export function getUserForTeacher(query) {
+  return request({
+    url: '/system/teacher/getUserForTeacher',
+    method: 'get',
+    params: query
+  })
 }
 
 // 查询员工信息详细
diff --git a/src/api/oms/aftersale.js b/src/api/oms/aftersale.js
index 23bce5e..97a7766 100644
--- a/src/api/oms/aftersale.js
+++ b/src/api/oms/aftersale.js
@@ -18,41 +18,6 @@ export function getOmsAftersale(id) {
   })
 }
 
-// 新增订单售后
-export function addOmsAftersale(data) {
-  return request({
-    url: '/oms/aftersale',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改订单售后
-export function updateOmsAftersale(data) {
-  return request({
-    url: '/oms/aftersale',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除订单售后
-export function delOmsAftersale(id) {
-  return request({
-    url: '/oms/aftersale/' + id,
-    method: 'delete'
-  })
-}
-
-// 导出订单售后
-export function exportOmsAftersale(query) {
-  return request({
-    url: '/oms/aftersale/export',
-    method: 'get',
-    params: query
-  })
-}
-
 // 售后订单操作
 export function dealWithAftersale(data){
   return request({
diff --git a/src/api/oms/order.js b/src/api/oms/order.js
index 31644ff..f164577 100644
--- a/src/api/oms/order.js
+++ b/src/api/oms/order.js
@@ -76,7 +76,7 @@ export function deliverProduct(data){
     data: data
   })
 }
-
+// 修改收件人信息
 export function updateReceiverAddress(data){
   return request({
     url: '/oms/order/receiver/update',
diff --git a/src/api/school/report/dashboard/index.js b/src/api/school/report/dashboard/index.js
index e601495..5dbe210 100644
--- a/src/api/school/report/dashboard/index.js
+++ b/src/api/school/report/dashboard/index.js
@@ -2,7 +2,7 @@ import request from '@/utils/request'
 
 export function dashboardData(query) {
   return request({
-    url: '/report/dashboard/data',
+    url: '/api/report/dashboard/data',
     method: 'get',
     params: query
   })
diff --git a/src/api/school/sc/school/index.js b/src/api/school/sc/school/index.js
deleted file mode 100644
index 6c04e05..0000000
--- a/src/api/school/sc/school/index.js
+++ /dev/null
@@ -1,62 +0,0 @@
-import request from '@/utils/request'
-
-// 查询列表
-export function listSchool(query) {
-  return request({
-    url: '/api/sc/school/list/searchList',
-    method: 'get',
-    params: query
-  })
-}
-
-// select
-export function listSelect(query) {
-  return request({
-    url: '/api/sc/school/list/select',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询详细
-export function getSchool(schoolId) {
-  return request({
-    url: '/api/sc/school/info/detailById/' + schoolId,
-    method: 'get'
-  })
-}
-
-// 新增
-export function addSchool(data) {
-  return request({
-    url: '/api/sc/school/add/addScSchool',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改
-export function updateSchool(data) {
-  return request({
-    url: '/api/sc/school/update/updateScSchool',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除
-export function delSchool(schoolId) {
-  return request({
-    url: '/api/sc/school/delete/deleteById/' + schoolId,
-    method: 'delete'
-  })
-}
-
-// 导出
-export function exportSchool(query) {
-  return request({
-    url: '/api/sc/school/export',
-    method: 'get',
-    params: query
-  })
-}
diff --git a/src/api/school/system/dept/index.js b/src/api/school/system/dept/index.js
index bb50401..35485cb 100644
--- a/src/api/school/system/dept/index.js
+++ b/src/api/school/system/dept/index.js
@@ -1,21 +1,7 @@
 import request from '@/utils/request'
 
 // 查询部门列表
-export function listDept(query) {
-  return request({
-    url: '/api/system/dept/list/searchList',
-    method: 'get',
-    params: query
-  })
-}
 
-// 查询部门详细
-export function getDept(deptId) {
-  return request({
-    url: '/api/system/dept/info/detailById/' + deptId,
-    method: 'get'
-  })
-}
 
 // 查询部门下拉树结构
 export function treeSelect() {
@@ -25,32 +11,6 @@ export function treeSelect() {
   })
 }
 
-// 新增部门
-export function addDept(data) {
-  return request({
-    url: '/api/system/dept/add/addDept',
-    method: 'post',
-    data: data
-  })
-}
-
-// 修改部门
-export function updateDept(data) {
-  return request({
-    url: '/api/system/dept/update/updateDept',
-    method: 'put',
-    data: data
-  })
-}
-
-// 删除部门
-export function delDept(deptId) {
-  return request({
-    url: '/api/system/dept/delete/deleteById/' + deptId,
-    method: 'delete'
-  })
-}
-
 // 校区列表
 export function campusList() {
   return request({
@@ -59,13 +19,7 @@ export function campusList() {
   })
 }
 
-// 当前用户可选校区列表
-export function campusListLimitByUser() {
-  return request({
-    url: '/api/system/dept/list/campusListLimitByUser',
-    method: 'get'
-  })
-}
+
 
 // 可选校区类型 全部校区/部分校区
 export function campusSelect() {
@@ -74,11 +28,3 @@ export function campusSelect() {
     method: 'get'
   })
 }
-
-// 当前用户 可选校区类型 全部校区/部分校区
-export function campusSelectLimitByUser() {
-  return request({
-    url: '/api/system/dept/list/campusSelectLimitByUser',
-    method: 'get'
-  })
-}
diff --git a/src/api/system/dict/data.js b/src/api/system/dict/data.js
index f0dfc8d..41470c3 100644
--- a/src/api/system/dict/data.js
+++ b/src/api/system/dict/data.js
@@ -50,14 +50,7 @@ export function delData(dictCode) {
     method: 'delete'
   })
 }
-// 删除字典数据
-export function listByTypes(dictTypes) {
-  return request({
-    url: '/system/dict/data/by_types',
-    method: 'POST',
-    data: dictTypes
-  })
-}
+
 
 // 删除字典数据
 export function allByTypes(dictTypes) {
diff --git a/src/api/system/role.js b/src/api/system/role.js
index 4b455e1..888538e 100644
--- a/src/api/system/role.js
+++ b/src/api/system/role.js
@@ -108,4 +108,4 @@ export function authUserSelectAll(data) {
     method: 'put',
     params: data
   })
-}
\ No newline at end of file
+}
diff --git a/src/assets/icons/svg/dashboard-cla-time.svg b/src/assets/icons/svg/dashboard-cla-time.svg
new file mode 100644
index 0000000..cbcb033
--- /dev/null
+++ b/src/assets/icons/svg/dashboard-cla-time.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1602987947451" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7361" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M210.041784 898.610198 139.300626 898.610198 139.300626 105.561198 210.041784 105.561198Z" p-id="7362" fill="#F56C6C"></path><path d="M284.506752 105.561198 284.506752 898.610198 820.653709 898.610198 820.653709 105.561198 742.464929 105.561198 742.464929 503.951697 552.580231 502.08621 552.580231 105.561198Z" p-id="7363" fill="#F56C6C"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/dashboard-cla.svg b/src/assets/icons/svg/dashboard-cla.svg
new file mode 100644
index 0000000..dd06a5e
--- /dev/null
+++ b/src/assets/icons/svg/dashboard-cla.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1603003660672" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="12310" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M380.48256 764.586667h549.495467c20.821333 0 37.701973 19.10272 37.701973 42.666666s-16.878933 42.666667-37.700267 42.666667H370.500267c-5.121707 0-10.006187-1.155413-14.45888-3.2512 15.377067-21.307733 24.439467-47.42144 24.439466-75.651413V764.586667z m0-49.493334v-71.68H846.506667V244.053333H291.05152c-26.036907-23.338667-60.4928-37.546667-98.193067-37.546666-5.758293 0-11.43808 0.329387-17.024 0.971093C187.4944 186.53696 209.85344 172.373333 235.52 172.373333h614.4c37.701973 0 68.266667 30.564693 68.266667 68.266667v406.186667c0 37.701973-30.564693 68.266667-68.266667 68.266666H380.48256z m70.97856-179.698346c-6.882987 12.520107-12.65152 14.056107-16.815787 15.348053-0.529067 0.16384-1.05984 0.3072-1.595733 0.433493l-86.40512 20.3264a22.5024 22.5024 0 0 0-17.36192 21.89312v177.621334c0 43.501227-35.7632 78.902613-79.807147 78.902613H137.833813c-2.67264 0-18.23232-1.385813-22.734506-3.5072a17.179307 17.179307 0 0 0-2.077014-0.8192C81.175893 835.26656 58.026667 806.002347 58.026667 771.01568V573.842773c0-43.501227 35.7632-78.912853 79.807146-78.912853h21.497174c14.359893-0.12288 16.843093 0 27.65312 0 4.29568 0 7.49568 0.075093 12.21632 0h50.425173l15.7952 0.264533c3.464533 0.128 6.935893 0.023893 10.386773-0.310613l120.261974-17.36704a22.53312 22.53312 0 0 0 14.953813-8.9088l83.602773-113.984853c11.328853-15.394133 31.957333-19.684693 46.260907-9.361067l6.36416 4.601173c14.301867 10.1632 16.728747 30.952107 5.399893 46.35648l-92.050773 125.392214c-1.28512 1.706667-7.855787 12.076373-9.1392 13.78304zM192.858453 447.146667C139.98592 447.146667 97.28 404.657493 97.28 352.413013 97.28 300.166827 139.987627 257.706667 192.858453 257.706667 245.521067 257.706667 288.426667 300.214613 288.426667 352.45056 288.426667 404.6848 245.72928 447.146667 192.858453 447.146667zM636.586667 563.2h107.52c15.081813 0 27.306667 12.224853 27.306666 27.306667s-12.224853 27.306667-27.306666 27.306666h-107.52c-15.081813 0-27.306667-12.224853-27.306667-27.306666s12.224853-27.306667 27.306667-27.306667z" p-id="12311" fill="#E6A23C"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/dashboard-course.svg b/src/assets/icons/svg/dashboard-course.svg
new file mode 100644
index 0000000..ad4960b
--- /dev/null
+++ b/src/assets/icons/svg/dashboard-course.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1602948236893" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3304" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 73.142857v292.571429l109.714286-58.514286L731.428571 365.714286V73.142857h73.142858a73.142857 73.142857 0 0 1 73.142857 73.142857v731.428572a73.142857 73.142857 0 0 1-73.142857 73.142857H219.428571a73.142857 73.142857 0 0 1-73.142857-73.142857V146.285714a73.142857 73.142857 0 0 1 73.142857-73.142857h292.571429zM329.142857 658.285714a36.571429 36.571429 0 0 0 0 73.142857h365.714286a36.571429 36.571429 0 0 0 0-73.142857h-365.714286z" p-id="3305" fill="#46a0fc"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/dashboard-notice.svg b/src/assets/icons/svg/dashboard-notice.svg
new file mode 100644
index 0000000..050fbbe
--- /dev/null
+++ b/src/assets/icons/svg/dashboard-notice.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1603005378631" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="20596" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M300.8 150.4L240 89.6C136 166.4 68.8 288 62.4 425.6h86.4c6.4-113.6 64-212.8 152-275.2z m576 275.2h86.4C955.2 288 888 166.4 784 88l-60.8 60.8c88 64 145.6 163.2 153.6 276.8zM792 448c0-131.2-91.2-241.6-214.4-272V147.2c0-35.2-28.8-64-64-64s-64 28.8-64 64V176c-123.2 28.8-214.4 139.2-214.4 272v236.8l-86.4 86.4v43.2H880v-43.2l-86.4-86.4V448zM512 942.4c6.4 0 11.2 0 17.6-1.6 27.2-4.8 51.2-25.6 62.4-51.2 4.8-9.6 6.4-20.8 6.4-33.6H425.6c0 46.4 38.4 86.4 86.4 86.4z m0 0" p-id="20597" fill="#409EFF"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/dashboard-order.svg b/src/assets/icons/svg/dashboard-order.svg
new file mode 100644
index 0000000..cf41d8e
--- /dev/null
+++ b/src/assets/icons/svg/dashboard-order.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1602987052760" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="8207" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M825.7 146H691.3c-6.3-27.5-31.7-48.7-61.4-48.7h-66.6c-8.5-21.2-28.6-34.9-51.8-34.9-23.3 0-43.4 13.8-51.8 34.9H392c-29.6 0-55 21.2-61.4 48.7H196.2c-34.9 0-61.4 28.6-61.4 63.5v683.4c0 34.9 27.5 63.5 61.4 63.5h628.4c34.9 0 64.5-28.6 64.5-63.5V209.5c1.1-34.9-28.5-63.5-63.4-63.5z m-313.2 30.7c28.6 0 50.8 23.3 50.8 50.8 0 28.6-23.3 50.8-50.8 50.8-28.6 0-50.8-23.3-50.8-50.8s22.3-50.8 50.8-50.8z m193.6 525.8c0 12.7-10.6 23.3-23.3 23.3H342.2c-12.7 0-23.3-10.6-23.3-23.3v-21.2c0-12.7 10.6-23.3 23.3-23.3h340.6c12.7 0 23.3 10.6 23.3 23.3v21.2z m0-214.8c0 12.7-10.6 23.3-23.3 23.3H342.2c-12.7 0-23.3-10.6-23.3-23.3v-21.2c0-12.7 10.6-23.3 23.3-23.3h340.6c12.7 0 23.3 10.6 23.3 23.3v21.2z" fill="#F56C6C" p-id="8208"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/dashboard-record.svg b/src/assets/icons/svg/dashboard-record.svg
new file mode 100644
index 0000000..a0488e6
--- /dev/null
+++ b/src/assets/icons/svg/dashboard-record.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1603004755390" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="18362" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M979.316364 719.220364c49.058909 44.311273 64.232727 154.158545 6.516363 223.790545-88.994909 107.147636-359.330909 126.510545-593.92-66.653091-188.043636-154.530909-250.600727-379.345455-114.688-542.999273C494.498909 71.68 688.128 266.24 688.128 266.24c105.472 113.570909 2.327273 206.941091 95.604364 332.706909 71.866182 96.814545 109.474909 42.449455 195.584 120.180364zM64.884364 512a63.860364 63.860364 0 1 1 0 127.720727 63.860364 63.860364 0 0 1 0-127.720727z m0-191.581091a63.860364 63.860364 0 1 1 0 127.720727 63.860364 63.860364 0 0 1 0-127.720727z m221.556363-112.826182a78.848 78.848 0 1 1-157.602909 0 78.848 78.848 0 0 1 157.602909 0z m129.768728-14.894545a95.883636 95.883636 0 1 1 0-191.767273 95.883636 95.883636 0 0 1 0 191.767273z" fill="#E6A23C" p-id="18363"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/dashboard-sign-up.svg b/src/assets/icons/svg/dashboard-sign-up.svg
new file mode 100644
index 0000000..4e28e5f
--- /dev/null
+++ b/src/assets/icons/svg/dashboard-sign-up.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1603004667130" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="17490" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M228.396827 552.427758l136.51621-69.091588c0 0 122.44882 145.778154 141.398404 358.491791l-104.565521 45.064358C401.746944 886.891296 262.036995 725.995839 228.396827 552.427758L228.396827 552.427758zM423.562808 899.748115l89.284489-34.016745-17.004279 76.526931L423.562808 899.748115zM123.855866 82.71998l-3.015683-0.01228c-5.339612 0.638543-10.704806 1.692548-16.138562 3.671623-113.157199 41.001833 55.43045 386.470005 116.76947 447.874517l136.158053-68.719104c0 0-65.850777-261.491573-163.219385-352.453261C163.350368 84.065628 123.855866 82.71998 123.855866 82.71998zM699.286524 266.74318l260.238023 0 0 63.739696L699.286524 330.482877 699.286524 266.74318 699.286524 266.74318zM575.241346 568.763818l382.437156 0 0 61.092403L575.241346 629.856221 575.241346 568.763818 575.241346 568.763818zM572.636009 651.954519M490.14218 880.952027l469.38339 0 0 56.796564L490.14218 937.74859 490.14218 880.952027 490.14218 880.952027z" p-id="17491" fill="#F56C6C"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/dashboard-student-cnt.svg b/src/assets/icons/svg/dashboard-student-cnt.svg
new file mode 100644
index 0000000..beadd81
--- /dev/null
+++ b/src/assets/icons/svg/dashboard-student-cnt.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1602990814151" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="10768" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M246.276105 483.320533s-17.407731 17.407731-37.887414 17.407731-37.887415-17.407731-37.887415-17.407731c0-63.487019 18.943707-139.77384 25.599605-165.373445-6.143905-4.095937-10.239842-10.751834-10.239842-18.431716 0-10.239842 7.167889-18.943707 16.895739-21.503667V235.516361l11.263826 6.655897v35.327455c9.72785 2.55996 16.895739 11.263826 16.895739 21.503667 0 7.679881-4.095937 14.847771-10.239842 18.431716 4.607929 16.383747 13.823786 53.759169 19.967691 95.230528 3.071953 23.039644 5.631913 47.615264 5.631913 70.654909z m495.096351-14.335779c-1.023984-13.311794-9.215858-27.135581-26.111596-27.135581-1.023984 0-1.535976-0.511992-3.071953-1.023984l-1.535976-3.583944s1.023984-11.263826 1.535976-17.407731c1.023984-19.967691 2.55996-39.935383 3.583945-59.903075 0.511992-8.191873 1.535976-16.895739 2.047968-25.087612l-50.687217-13.311795c-2.047968-1.023984-23.551636-4.095937-23.551636-4.095936-11.263826-1.535976-81.406742-8.191873-147.965714-8.703866-52.735185-0.511992-102.91041 5.119921-116.222204 7.167889-4.095937 0.511992-12.799802 2.55996-13.311795 2.559961 0 0-38.399407 8.191873-53.247177 13.823786l-13.823786 5.119921c0.511992 18.943707 2.047968 38.399407 3.071952 57.343114 0.511992 15.359763 2.047968 31.231517 3.583945 46.59128-1.535976 0.511992-2.55996 1.023984-3.071953 1.023985-17.407731 0-25.087612 13.823786-26.111596 27.13558-0.511992 8.703866-1.023984 17.407731 0 26.111597 2.55996 25.087612 10.751834 48.127256 26.111596 68.60694 8.703866 11.263826 15.359763 12.799802 27.647573 8.191873 4.095937 1.023984 13.311794 21.503668 14.847771 25.599605 17.407731 37.375423 45.055304 83.454711 97.278497 102.91041 35.839446 13.311794 75.774829 17.407731 112.63826 7.167889 39.423391-11.263826 70.654908-39.423391 94.718536-71.678892 22.01566-29.695541 29.695541-48.639249 33.279486-56.31913 1.535976-3.583945 1.535976-6.655897 5.119921-7.16789 2.55996-0.511992 6.655897 2.047968 9.72785 1.535977 6.655897-0.511992 11.775818-5.631913 15.871754-10.751834 15.359763-19.967691 23.551636-43.519328 26.111597-68.60694 2.047968-8.703866 2.047968-17.407731 1.535976-26.111597z m-59.391082-53.759169c-2.047968 37.887415-7.679881 88.574632-13.823787 114.686228-7.167889 31.231517-59.391082 156.157587-163.837468 153.597627-16.895739-0.511992-33.279486-4.095937-48.127257-10.239842-52.735185-17.407731-81.406742-66.04698-103.422402-134.65392-10.239842-29.183549-14.847771-62.463035-14.847771-100.862441 0-7.679881-0.511992-15.871755-1.535976-23.551636 7.679881 12.799802 13.823786 12.799802 20.479684 12.799802 43.007336 0 80.89475-3.071953 115.19822-8.703866 11.775818-2.047968 26.111597-4.607929 40.447375-8.191873 43.007336-10.751834 76.286821-26.111597 104.958378-49.151241 14.847771 17.407731 34.815462 30.719525 62.975028 41.983352 1.023984 0.511992 1.535976 0.511992 2.55996 1.023984l-1.023984 11.263826z" p-id="10769" fill="#409EFF"></path><path d="M712.700899 248.316164v-0.511993c-0.511992-13.823786 0.511992-7.167889-3.071952-20.479683-1.535976-7.167889-3.583945-11.775818-9.72785-15.359763-7.167889-4.607929-13.823786-9.215858-21.503668-13.311794-18.943707-9.72785-38.399407-15.871755-59.391082-20.479684-45.055304-9.215858-90.6226-11.263826-136.189896-9.727849-18.943707 0.511992-37.887415 2.047968-56.831122 4.607928-31.74351 4.607929-62.975027 12.28781-91.646584 28.671557-10.751834 6.143905-18.431715 9.72785-21.503668 22.01566-7.167889 29.183549-6.655897 54.783154-7.679881 84.478695v2.55996c17.407731-6.655897 37.375423-11.263826 56.31913-14.84777 12.28781-3.071953 26.623589-5.119921 41.471359-5.631913 10.751834-3.071953 47.103272-4.607929 83.966703-4.607929 34.30347 0.511992 68.094948-0.511992 102.398418 1.535976 25.087612 1.535976 50.175225 5.631913 74.750845 9.215858 5.631913 1.023984 11.263826 1.535976 16.895739 4.095937l33.279485 8.703865v-0.511992c-1.023984-13.823786-1.023984-46.079288-1.535976-60.415066z" p-id="10770" fill="#409EFF"></path><path d="M858.106653 194.556994c-39.935383 23.039644-124.92607 71.678893-124.92607 71.678893s-0.511992-7.679881-0.511992-10.239842c0-10.239842-0.511992-22.527652-3.583945-34.815462-2.55996-10.239842-6.655897-20.479684-18.943707-28.671557 0 0-16.383747-10.751834-24.063628-14.335779-19.455699-9.72785-40.959367-16.895739-65.022996-22.01566-35.327454-7.167889-71.678893-10.751834-112.126268-10.751834-9.72785 0-71.1669 3.071953-88.574631 5.631913-40.447375 6.143905-72.190885 15.871755-100.35045 31.74351-11.263826 6.143905-26.111597 14.335779-31.231517 35.839446-3.583945 13.311794-5.119921 29.695541-6.143905 46.079288 0 0-104.958378-60.415067-123.390094-71.1669 8.191873-5.119921 14.335779-9.215858 20.479684-12.799802C285.187504 122.878102 389.633891 63.999011 494.080277 4.607929c11.263826-6.143905 19.455699-6.143905 31.231517 0C630.782165 65.022995 737.276519 124.92607 843.258882 184.317152c4.607929 2.55996 8.703866 6.143905 14.847771 10.239842z m-12.799803 625.142342c-52.735185-34.815462-180.733208-79.358774-182.781176-79.870766-0.511992 1.023984-31.231517 65.022995-44.031319 91.134592-8.703866 17.919723-23.551636 18.943707-34.815462 3.071952-9.215858-13.311794-32.767494-48.127256-35.327455-51.711201-7.167889-10.239842-14.847771-11.263826-23.551636-2.047968-1.535976 1.535976-12.799802 11.775818-16.383747 11.775818-3.583945 0-15.359763-10.239842-16.383746-11.775818-8.703866-9.215858-14.847771-9.72785-23.551637 2.047968-8.703866 11.775818-25.087612 35.327454-33.791478 46.59128-18.431715 23.551636-36.351438 19.455699-44.543311 0-12.799802-30.207533-34.815462-87.550647-35.839447-88.574631-2.047968 0.511992-130.045991 45.055304-182.781176 79.870766C51.207119 895.474165 54.791064 1023.984179 54.791064 1023.984179h919.537793c0 1.535976 14.847771-109.054315-129.022007-204.284843z" p-id="10771" fill="#409EFF"></path></svg>
\ No newline at end of file
diff --git a/src/assets/icons/svg/dashboard-student.svg b/src/assets/icons/svg/dashboard-student.svg
new file mode 100644
index 0000000..3012662
--- /dev/null
+++ b/src/assets/icons/svg/dashboard-student.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1602987769939" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6457" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M779.7 735.1c14.8-2.3 25-16.3 22.7-31.1l-7.1-45.6c-2-12.5-12.3-21.8-24.4-22.9-1.2-43-2.2-81-2.2-81s-8.3-3.3-32.5-3.3c-15.9 0-31.1 1.4-62.8 6.2-13.1 1.7-25 4.5-35.8 7.4-63.6 15.3-97.1 41.5-97.1 41.5h-56.8s-33.5-26.1-97.1-41.5c-10.8-2.8-22.7-5.7-35.8-7.4-31.5-4.7-46.6-6.2-62.4-6.2-24.1 0-32.4 3.3-32.4 3.3s-1.3 38-2.7 81c-12.2 1.1-22.6 10.3-24.5 22.9l-7.1 45.6c-2.3 14.8 7.9 28.8 22.7 31.1 1.9 0.3 3.8 0.4 5.6 0.3-4.2 85.8-12.1 102.8-12.1 102.8s23.8 0.6 99.3 15.3c2.3 0.6 4 0.6 6.3 1.1 84.1 17 140.3 57.4 140.3 57.4h56.8s14.2-10.2 38.6-22.2c25-12.5 60.2-26.7 101.7-35.2 2.3-0.6 4-0.6 6.3-1.1 75.5-14.8 99.9-15.3 99.9-15.3s-7.9-17-12.5-102.8c1.5 0.1 3.3 0 5.1-0.3z m-99.9 81.8l-0.9 0.2-0.2 0.1h-0.1c-1.3 0.2-3.4 0.5-5.9 1.1-47.4 9.8-86 26.2-110.1 38.2-14.5 7.1-25.7 13.6-33.2 18.3h-34.6c-21.4-13.3-73.6-42.2-143.4-56.5-2.5-0.6-4.6-0.9-5.9-1.1h-0.1l-0.2-0.1-0.9-0.2c-30.2-5.9-46.2-9.6-63.7-12 3.1-26.5 6.5-49.9 8.2-106.7 1-35.6 2.5-80 3.4-109.6 16.6 0.3 29.5 2.2 53.1 5.7l0.4 0.1h0.4c11.4 1.5 22.1 4.1 31.1 6.5l0.4 0.1 0.4 0.1c52.1 12.6 81 33.2 83.1 34.7l9.7 7.8H540.7l12.7 0.4 10.1-8.1c2.1-1.5 30.9-22.1 83.1-34.7l0.4-0.1 0.4-0.1c9-2.4 19.7-5 31.1-6.5h0.6c23.7-3.5 36.7-5.5 53.5-5.7 0.8 29.7 2 74 3.1 109.6v0.2c2 56.7 5.5 80 8.7 106.5-18.1 2.1-34.2 5.9-64.6 11.8z" p-id="6458" fill="#E6A23C"></path><path d="M356.7 514.8c15.5 2.1 29.1 5.3 40.3 8.3 48.9 11.8 82.4 29.4 99.7 40.2h30.6c17.3-10.7 50.8-28.3 99.7-40.2 11.3-3 24.8-6.2 40.3-8.3 17.7-2.6 34-4.5 48.8-5.5-27.7-21.6-58.9-38.9-92.6-50.9 48.4-34.6 79.6-91.1 79.6-155.2C703.1 197.6 617.5 112 512 112s-191.1 85.6-191.1 191.2c0 64 31.2 120.6 79.6 155.2-33.7 12-64.9 29.3-92.6 50.9 14.8 1 31.1 2.8 48.8 5.5z" p-id="6459" fill="#E6A23C"></path></svg>
\ No newline at end of file
diff --git a/src/components/sc/claTime/addClaTimeAttend.vue b/src/components/sc/claTime/addClaTimeAttend.vue
index 0c5db9d..3758a03 100644
--- a/src/components/sc/claTime/addClaTimeAttend.vue
+++ b/src/components/sc/claTime/addClaTimeAttend.vue
@@ -256,6 +256,7 @@
   </el-dialog>
 </template>
 <script>
+import { selectDictLabel } from '@/utils/commonUtils'
 import staffSelect from '@/components/system/staff/staffSelect'
 import claTimeSelect from '@/components/sc/claTime/claTimeSelect'
 import roomSelect from '@/components/sc/base/roomSelect'
@@ -425,7 +426,7 @@ export default {
     this.getDictListByDictType('charge_type').then(response => {
       this.chargeTypeOptions = response.data
     })
-    this.getDictListByDictType('sex').then(response => {
+    this.getDictListByDictType('sys_user_sex').then(response => {
       this.sexOptions = response.data
     })
     this.getDictListByDictType('attend_status').then(response => {
@@ -487,13 +488,13 @@ export default {
       this.msgError('近日无计划排课,无法排课记上课')
     },
     sexFormatter(row, column) {
-      return this.selectDictLabel(this.sexOptions, row.sex)
+      return selectDictLabel(this.sexOptions, row.sex)
     },
     chargeTypeFormatter(row, column) {
-      return this.selectDictLabel(this.chargeTypeOptions, row.chargeType)
+      return selectDictLabel(this.chargeTypeOptions, row.chargeType)
     },
     studentCourseStatusFormatter(row, column) {
-      return this.selectDictLabel(this.studentCourseStatusOptions, row.status)
+      return selectDictLabel(this.studentCourseStatusOptions, row.status)
     },
     getList() {
       searchCourseClaStudent(this.queryParams).then(response => {
diff --git a/src/components/sc/claTime/changeClaTimeAttend.vue b/src/components/sc/claTime/changeClaTimeAttend.vue
index 07269f4..c4e7fa4 100644
--- a/src/components/sc/claTime/changeClaTimeAttend.vue
+++ b/src/components/sc/claTime/changeClaTimeAttend.vue
@@ -171,6 +171,7 @@
   </el-dialog>
 </template>
 <script>
+import { selectDictLabel } from '@/utils/commonUtils'
 import staffSelect from '@/components/system/staff/staffSelect'
 import roomSelect from '@/components/sc/base/roomSelect'
 import { allDetailInfoById } from '@/api/school/sc/cla'
@@ -276,7 +277,7 @@ export default {
     this.getDictListByDictType('charge_type').then(response => {
       this.chargeTypeOptions = response.data
     })
-    this.getDictListByDictType('sex').then(response => {
+    this.getDictListByDictType('sys_user_sex').then(response => {
       this.sexOptions = response.data
     })
     this.getDictListByDictType('attend_status').then(response => {
@@ -335,13 +336,13 @@ export default {
       this.form.classTheme = claTimeInfo.classTheme
     },
     sexFormatter(row, column) {
-      return this.selectDictLabel(this.sexOptions, row.sex)
+      return selectDictLabel(this.sexOptions, row.sex)
     },
     chargeTypeFormatter(row, column) {
-      return this.selectDictLabel(this.chargeTypeOptions, row.chargeType)
+      return selectDictLabel(this.chargeTypeOptions, row.chargeType)
     },
     studentCourseStatusFormatter(row, column) {
-      return this.selectDictLabel(this.studentCourseStatusOptions, row.status)
+      return selectDictLabel(this.studentCourseStatusOptions, row.status)
     },
     // 班级所有学员,及到课状态
     loadCourseClaStudentAndAttendDetail() {
diff --git a/src/components/sc/claTime/changeTimeRule.vue b/src/components/sc/claTime/changeTimeRule.vue
index 031ce29..33cd048 100644
--- a/src/components/sc/claTime/changeTimeRule.vue
+++ b/src/components/sc/claTime/changeTimeRule.vue
@@ -98,30 +98,33 @@
         </div>
         <el-col :span="12">
           <el-form-item label="上课时间:" prop="startTime">
-            <el-time-select
-              v-model="form.startTime"
-              size="small"
-              :picker-options="{
-                start: '08:00',
-                step: '00:30',
-                end: '19:00'
-              }"
-              placeholder="选择上课时间"
-            />
+            <el-input v-model="form.startTime" size="small" placeholder="请输入上课时间" />
+
+<!--            <el-time-select-->
+<!--              v-model="form.startTime"-->
+<!--              size="small"-->
+<!--              :picker-options="{-->
+<!--                start: '08:00',-->
+<!--                step: '00:30',-->
+<!--                end: '19:00'-->
+<!--              }"-->
+<!--              placeholder="选择上课时间"-->
+<!--            />-->
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="下课时间:" prop="endTime">
-            <el-time-select
-              v-model="form.endTime"
-              size="small"
-              :picker-options="{
-                start: '08:00',
-                step: '00:30',
-                end: '20:00'
-              }"
-              placeholder="选择下课时间"
-            />
+            <el-input v-model="form.endTime" size="small" placeholder="请输入下课时间" />
+<!--            <el-time-select-->
+<!--              v-model="form.endTime"-->
+<!--              size="small"-->
+<!--              :picker-options="{-->
+<!--                start: '08:00',-->
+<!--                step: '00:30',-->
+<!--                end: '20:00'-->
+<!--              }"-->
+<!--              placeholder="选择下课时间"-->
+<!--            />-->
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -162,6 +165,7 @@
   </el-dialog>
 </template>
 <script>
+import { selectDictLabel } from '@/utils/commonUtils'
 import claSelect from '@/components/sc/course/cla/claSelect'
 import deptSelect from '@/components/system/dept/deptSelect'
 import staffSelect from '@/components/system/staff/staffSelect'
@@ -246,10 +250,20 @@ export default {
           { required: true, message: '是否过滤节假日', trigger: 'blur' }
         ],
         startTime: [
-          { required: true, message: '上课时间不能为空', trigger: 'blur' }
+          { required: true, message: '上课时间不能为空', trigger: 'blur' },
+          {
+            pattern: /^([01]?[0-9]|2[0-3]):([0-5][0-9])$/,
+            message: "时间格式应为HH:mm",
+            trigger: "blur"
+          }
         ],
         endTime: [
-          { required: true, message: '下课时间不能为空', trigger: 'blur' }
+          { required: true, message: '下课时间不能为空', trigger: 'blur' },
+          {
+            pattern: /^([01]?[0-9]|2[0-3]):([0-5][0-9])$/,
+            message: "时间格式应为HH:mm",
+            trigger: "blur"
+          }
         ],
         teacherId: [
           { required: true, message: '任课教师不能为空', trigger: 'blur' }
@@ -316,7 +330,7 @@ export default {
     },
     // 重复方式
     repeatTypeFormat(row, column) {
-      return this.selectDictLabel(this.repeatTypeOptions, row.repeatType)
+      return selectDictLabel(this.repeatTypeOptions, row.repeatType)
     },
     // 取消按钮
     cancel() {
diff --git a/src/components/sc/claTime/claTimeAttendDetailTable.vue b/src/components/sc/claTime/claTimeAttendDetailTable.vue
index f2f58ab..45c3ced 100644
--- a/src/components/sc/claTime/claTimeAttendDetailTable.vue
+++ b/src/components/sc/claTime/claTimeAttendDetailTable.vue
@@ -48,6 +48,7 @@
   </div>
 </template>
 <script>
+import { selectDictLabel } from '@/utils/commonUtils'
 import { listClaTimeAttend } from '@/api/school/sc/cla/claTimeAttend'
 export default {
   components: {
@@ -99,7 +100,7 @@ export default {
       })
     },
     chargeTypeFormatter(row, column) {
-      return this.selectDictLabel(this.chargeTypeOptions, row.chargeType)
+      return selectDictLabel(this.chargeTypeOptions, row.chargeType)
     }
   }
 }
diff --git a/src/components/sc/course/addCourse.vue b/src/components/sc/course/addCourse.vue
index 5a2c414..76927c2 100644
--- a/src/components/sc/course/addCourse.vue
+++ b/src/components/sc/course/addCourse.vue
@@ -35,14 +35,19 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="24">
+          <el-col :span="12">
             <el-form-item label="上课模式:" prop="teachingMode" class="align-left">
               <el-radio-group v-model="form.teachingMode">
                 <el-radio label="1">班课</el-radio>
-                <el-radio disabled label="2">一对一</el-radio>
+                <el-radio  label="2">一对一</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="教练课时费:" prop="claFee">
+              <el-input v-model="form.claFee" placeholder="请输入课时费金额(元/节)" />
+            </el-form-item>
+          </el-col>
         </el-row>
         <el-row>
           <el-col :span="24">
@@ -112,6 +117,7 @@ export default {
       // 表单参数
       form: {
         courseCampus: undefined,
+        claFee:0.0,
         teachingMode: '1',
         partCampus: [],
         sale:'1',
@@ -300,10 +306,12 @@ export default {
     color: rgba(0,0,0,.85);
     font-weight: 500;
     font-size: 16px;
+    display: flex;
     &.top {
       padding-top: 0px;
     }
     .title-content{
+
       border-left: 3px solid #409EFF;
       padding-left: 10px;
     }
diff --git a/src/components/sc/school/schoolSelect.vue b/src/components/sc/school/schoolSelect.vue
deleted file mode 100644
index 7454b53..0000000
--- a/src/components/sc/school/schoolSelect.vue
+++ /dev/null
@@ -1,113 +0,0 @@
-<template>
-  <el-select
-    v-model="staffId"
-    v-select-load-more="loadStaff"
-    filterable
-    :clearable="clearable"
-    :placeholder="placeholder"
-    default-first-option
-    size="small"
-    @change="handleSelect"
-  >
-    <el-option
-      v-for="item in staffList"
-      :key="item.staffId"
-      :label="item.staffName"
-      :value="item.staffId"
-    >
-      <div>
-        <div class="inline-block item">
-          <span class="title">姓名:</span>
-          <span class="option">{{ item.staffName }}</span>
-        </div>
-        <div class="inline-block item">
-          <span class="title">联系电话:</span>
-          <span class="option">{{ item.phone }}</span>
-        </div>
-      </div>
-    </el-option>
-  </el-select>
-</template>
-<script>
-import { listSchool } from '@/api/school/sc/school'
-export default {
-  props: {
-    clearable: {
-      type: Boolean,
-      default: false
-    },
-    teacher: {
-      type: String,
-      default: undefined
-    },
-    placeholder: {
-      type: String,
-      default: '选择员工'
-    },
-    value: {
-      type: String,
-      default: undefined
-    }
-  },
-  data() {
-    return {
-      staffId: this.value,
-      staffList: [],
-      pageNum: 1,
-      hasMoreData: false
-    }
-  },
-  watch: {
-    value: {
-      handler(newValue, oldValue) {
-        this.staffId = newValue
-      },
-      immediate: true
-    }
-  },
-  created() {
-    this.loadStaff()
-  },
-  methods: {
-    loadStaff: function() {
-      if (this.pageNum === 1) {
-        listSchool({
-          pageNum: this.pageNum,
-          teacher: this.teacher
-        }).then(response => {
-          if (response.respCode === '0000') {
-            this.staffList = response.data.rows
-            this.hasMoreData = response.data.rows.length > 0
-            this.pageNum = this.pageNum + 1
-          } else {
-            this.msgError(response.respMsg)
-          }
-        })
-      } else if (this.hasMoreData) {
-        listSchool({
-          pageNum: this.pageNum
-        }).then(response => {
-          if (response.respCode === '0000') {
-            this.staffList = this.staffList.concat(response.data.rows)
-            this.hasMoreData = response.data.rows.length > 0
-            this.pageNum = this.pageNum + 1
-          } else {
-            this.msgError(response.respMsg)
-          }
-        })
-      }
-    },
-    handleSelect: function(val) {
-      this.$emit('input', val)
-      this.$emit('change', val)
-    }
-  }
-}
-</script>
-<style ref="stylesheet/scss" lang="scss" scoped>
-.option{
-  padding-right: 15px;
-  color: #333;
-  font-weight: normal;
-}
-</style>
diff --git a/src/components/sc/student/changeStudent.vue b/src/components/sc/student/changeStudent.vue
index db920ab..d02df4c 100644
--- a/src/components/sc/student/changeStudent.vue
+++ b/src/components/sc/student/changeStudent.vue
@@ -51,8 +51,8 @@
           <el-col v-for="(item, index) in contactArray" :key="index" :span="24" style="text-align: left;">
             <el-form-item label="联系电话:">
               <el-input v-model="contactArray[index].contactPhone" style="width: 200px;" placeholder="联系电话" />
-              <el-button v-if="index === 0 && contactArray.length > 0" style="padding: 3px 5px;margin-left: 5px;" type="primary" icon="el-icon-plus" size="mini" @click="handleAddContactInfo()" />
-              <el-button v-if="index > 0" style="padding: 3px 5px;margin-left: 5px;" type="danger" icon="el-icon-minus" size="mini" @click="handleDeleteContactInfo(index)" />
+<!--              <el-button v-if="index === 0 && contactArray.length > 0" style="padding: 3px 5px;margin-left: 5px;" type="primary" icon="el-icon-plus" size="mini" @click="handleAddContactInfo()" />-->
+<!--              <el-button v-if="index > 0" style="padding: 3px 5px;margin-left: 5px;" type="danger" icon="el-icon-minus" size="mini" @click="handleDeleteContactInfo(index)" />-->
             </el-form-item>
           </el-col>
         </el-row>
@@ -67,7 +67,6 @@
 
 <script>
 import { addStudent, getStudent, updateStudent } from '@/api/school/sc/student'
-import { listSelect as listSchoolSelect } from '@/api/school/sc/school'
 import moment from 'moment'
 
 export default {
@@ -79,8 +78,6 @@ export default {
       form: {
         sex: '2'
       },
-      // 所属学校数据字典
-      schoolOptions: [],
       // 性别数据字典
       sexOptions: [],
       rules: {
@@ -100,7 +97,7 @@ export default {
       loadingSelect: false,
       // 联系人
       contactArray: [{
-        contactRelation: 'daddy',
+        contactRelation: 'self',
         contactNick: '',
         contactPhone: ''
       }],
@@ -117,7 +114,6 @@ export default {
       this.getDictListByDictType('contact_relation').then(response => {
         this.contactRelationOptions = response.data
       })
-      this.schoolSelect('')
     },
     // 取消按钮
     cancel() {
@@ -136,7 +132,7 @@ export default {
       }
       this.resetForm('form')
       this.contactArray = [{
-        contactRelation: 'daddy',
+        contactRelation: 'self',
         contactNick: '',
         contactPhone: ''
       }]
@@ -200,26 +196,6 @@ export default {
         }
       })
     },
-    schoolSelect(query) {
-      listSchoolSelect({ search: query.trim(), maxRecord: 1000 }).then(response => {
-        if (response.respCode === '0000') {
-          this.schoolOptions = response.data
-        } else {
-          this.schoolOptions = []
-        }
-      })
-    },
-    handleAddContactInfo() {
-      this.$set(this.contactArray, this.contactArray.length, {
-        contactRelation: 'daddy',
-        contactNick: '',
-        contactPhone: ''
-      })
-    },
-    // 删除
-    handleDeleteContactInfo(index) {
-      this.contactArray.splice(index, 1)
-    }
   }
 }
 </script>
diff --git a/src/components/sc/student/courseStudentChooseCla.vue b/src/components/sc/student/courseStudentChooseCla.vue
index 1795455..689afbe 100644
--- a/src/components/sc/student/courseStudentChooseCla.vue
+++ b/src/components/sc/student/courseStudentChooseCla.vue
@@ -65,6 +65,7 @@
   </div>
 </template>
 <script>
+import { selectDictLabel } from '@/utils/commonUtils'
 import { searchCourseClaStudent, studentCourseChooseCla } from '@/api/school/sc/student/course'
 export default {
   props: {
@@ -137,13 +138,13 @@ export default {
   },
   methods: {
     sexFormatter(row, column) {
-      return this.selectDictLabel(this.sexOptions, row.sex)
+      return selectDictLabel(this.sexOptions, row.sex)
     },
     chargeTypeFormatter(row, column) {
-      return this.selectDictLabel(this.chargeTypeOptions, row.chargeType)
+      return selectDictLabel(this.chargeTypeOptions, row.chargeType)
     },
     studentCourseStatusFormatter(row, column) {
-      return this.selectDictLabel(this.studentCourseStatusOptions, row.status)
+      return selectDictLabel(this.studentCourseStatusOptions, row.status)
     },
     handleSelectionChange(selection) {
       this.chooseStudentCourseIds = selection.map(item => item.studentCourseId)
diff --git a/src/components/sc/student/courseStudentTable.vue b/src/components/sc/student/courseStudentTable.vue
index 22e3eac..9443c6e 100644
--- a/src/components/sc/student/courseStudentTable.vue
+++ b/src/components/sc/student/courseStudentTable.vue
@@ -101,6 +101,7 @@
   </div>
 </template>
 <script>
+import { selectDictLabel } from '@/utils/commonUtils'
 import { searchCourseClaStudent, stopStudentCourseStatus, atClaStudentCourseStatus, removeStuFromCla } from '@/api/school/sc/student/course'
 import courseStudentChooseCla from '@/components/sc/student/courseStudentChooseCla'
 import claTimeAttendDetailTable from '@/components/sc/claTime/claTimeAttendDetailTable'
@@ -170,24 +171,24 @@ export default {
     this.getDictListByDictType('charge_type').then(response => {
       this.chargeTypeOptions = response.data
     })
-    this.getDictListByDictType('sex').then(response => {
+    this.getDictListByDictType('sys_user_sex').then(response => {
       this.sexOptions = response.data
     })
   },
   methods: {
     sexFormatter(row, column) {
-      return this.selectDictLabel(this.sexOptions, row.sex)
+      return selectDictLabel(this.sexOptions, row.sex)
     },
     chargeTypeFormatter(row, column) {
       if (row.chargeType === 'date' && row.effect === false && row.balanceDays > 0) {
         // 即将生效 未生效 并且 剩余课时 > 0。
         return '按课时(未生效)'
       } else {
-        return this.selectDictLabel(this.chargeTypeOptions, row.chargeType)
+        return selectDictLabel(this.chargeTypeOptions, row.chargeType)
       }
     },
     studentCourseStatusFormatter(row, column) {
-      return this.selectDictLabel(this.studentCourseStatusOptions, row.status)
+      return selectDictLabel(this.studentCourseStatusOptions, row.status)
     },
     // 总课时/天
     totalCount(row) {
diff --git a/src/components/sc/student/studentCourseSignUpTable.vue b/src/components/sc/student/studentCourseSignUpTable.vue
index e83cf1a..6ead9dc 100644
--- a/src/components/sc/student/studentCourseSignUpTable.vue
+++ b/src/components/sc/student/studentCourseSignUpTable.vue
@@ -25,9 +25,9 @@
     <el-table v-loading="loading" :data="dataList">
       <el-table-column align="center" prop="studentName" label="学生" fixed="left">
         <template slot-scope="scope">
-          <router-link :to="'/edu/student/detail/' + scope.row.studentId" class="link-type">
+<!--          <router-link :to="'/edu/student/detail/' + scope.row.studentId" class="link-type">-->
             <span>{{ scope.row.studentName }}</span>
-          </router-link>
+<!--          </router-link>-->
         </template>
       </el-table-column>
       <el-table-column align="center" width="120" prop="phone" label="联系电话">
@@ -131,6 +131,7 @@
   </div>
 </template>
 <script>
+import { selectDictLabel } from '@/utils/commonUtils'
 import { searchStuCourseSignUpList, stopStudentCourseStatus, atClaStudentCourseStatus } from '@/api/school/sc/student/course'
 import claTimeAttendDetailTable from '@/components/sc/claTime/claTimeAttendDetailTable'
 import deptSelect from '@/components/system/dept/deptSelect'
@@ -185,11 +186,11 @@ export default {
         // 即将生效 未生效 并且 剩余课时 > 0。
         return '按时间(未生效)'
       } else {
-        return this.selectDictLabel(this.chargeTypeOptions, row.chargeType)
+        return selectDictLabel(this.chargeTypeOptions, row.chargeType)
       }
     },
     studentCourseStatusFormatter(row, column) {
-      return this.selectDictLabel(this.studentCourseStatusOptions, row.status)
+      return selectDictLabel(this.studentCourseStatusOptions, row.status)
     },
     getList() {
       this.loading = true
@@ -213,7 +214,7 @@ export default {
     },
     handleStopStudentCourseStatus(studentCourseId) {
       const that = this
-      this.confirm('确定将本学员停课?', function() {
+      this.$confirm('确定将本学员停课?', '提示',{}).then(()=>{
         stopStudentCourseStatus(studentCourseId).then(response => {
           if (response.respCode === '0000') {
             that.msgSuccess('操作成功')
@@ -227,7 +228,8 @@ export default {
     // 在读
     handleAtClaStudentCourseStatus(studentCourseId) {
       const that = this
-      this.confirm('确定将本学员状态设置为在读?', function() {
+      // this.confirm('确定将本学员状态设置为在读?', function() {
+     this.$confirm('确定将本学员状态设置为在读?', '提示',{}).then(()=>{
         atClaStudentCourseStatus(studentCourseId).then(response => {
           if (response.respCode === '0000') {
             that.msgSuccess('操作成功')
diff --git a/src/components/sc/student/studentTable.vue b/src/components/sc/student/studentTable.vue
index 261ce05..456b5b8 100644
--- a/src/components/sc/student/studentTable.vue
+++ b/src/components/sc/student/studentTable.vue
@@ -2,26 +2,7 @@
 <template>
   <div>
     <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="80px">
-      <el-form-item label="所属学校:" prop="schoolId">
-        <el-select
-          v-model="queryParams.schoolId"
-          placeholder="请选择所属学校"
-          clearable
-          size="small"
-          filterable
-          default-first-option
-          remote
-          :remote-method="schoolSelect"
-          :loading="loadingSelect"
-        >
-          <el-option
-            v-for="item in schoolOptions"
-            :key="item.schoolId"
-            :label="item.schoolName"
-            :value="item.schoolId"
-          />
-        </el-select>
-      </el-form-item>
+
       <el-form-item label="学生姓名:" prop="studentName">
         <el-input
           v-model="queryParams.studentName"
@@ -102,12 +83,12 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column prop="studentName" label="学生姓名">
         <template slot-scope="scope">
-          <router-link :to="'/edu/student/detail/' + scope.row.studentId" class="link-type">
+<!--          <router-link :to="'/edu/student/detail/' + scope.row.studentId" class="link-type">-->
             <span>{{ scope.row.studentName }}</span>
-          </router-link>
+<!--          </router-link>-->
         </template>
       </el-table-column>
-      <el-table-column prop="schoolName" label="所属学校" />
+<!--      <el-table-column prop="schoolName" label="所属学校" />-->
       <el-table-column prop="birthDay" label="生日">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.birthDay, '{y}-{m}-{d}') }}</span>
@@ -214,8 +195,8 @@
 </template>
 
 <script>
+import { selectDictLabel } from '@/utils/commonUtils'
 import { listStudent, delStudent } from '@/api/school/sc/student'
-import { listSelect as listSchoolSelect } from '@/api/school/sc/school'
 import changeStudent from '@/components/sc/student/changeStudent'
 import uploadCheckImportExcel from '@/components/tool/impt/uploadCheckImportExcel'
 
@@ -243,8 +224,7 @@ export default {
       title: '',
       // 是否显示弹出层
       open: false,
-      // 所属学校数据字典
-      schoolOptions: [],
+
       // 性别数据字典
       sexOptions: [],
       // 查询参数
@@ -261,10 +241,9 @@ export default {
   },
   created() {
     this.getList()
-    this.getDictListByDictType('sex').then(response => {
+    this.getDictListByDictType('sys_user_sex').then(response => {
       this.sexOptions = response.data
     })
-    this.schoolSelect('')
   },
   methods: {
     /** 查询列表 */
@@ -278,7 +257,7 @@ export default {
     },
     // 性别字典翻译
     sexFormat(row, column) {
-      return this.selectDictLabel(this.sexOptions, row.sex)
+      return selectDictLabel(this.sexOptions, row.sex)
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -322,15 +301,6 @@ export default {
         }
       }).catch(function() {})
     },
-    schoolSelect(query) {
-      listSchoolSelect({ search: query.trim(), maxRecord: 1000 }).then(response => {
-        if (response.respCode === '0000') {
-          this.schoolOptions = response.data
-        } else {
-          this.schoolOptions = []
-        }
-      })
-    },
     handleImport() {
       this.$refs.uploadCheckImportExcel.openImport()
     }
diff --git a/src/components/system/staff/changeStaff.vue b/src/components/system/staff/changeStaff.vue
index 49a20de..b74ee9c 100644
--- a/src/components/system/staff/changeStaff.vue
+++ b/src/components/system/staff/changeStaff.vue
@@ -92,7 +92,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="用户名" prop="username">
+          <el-form-item label="登录账号" prop="username">
             <el-input v-model="form.username" :readonly="form.userId !== undefined" :disabled="form.userId !== undefined" placeholder="请输入用户名" />
           </el-form-item>
         </el-col>
@@ -169,7 +169,7 @@ export default {
         checkUsernameUnique(value).then(response => {
           const unique = response.data
           if (!unique) {
-            callback(new Error('该用户名已被注册,请更换'))
+            callback(new Error('该账号已被注册,请更换'))
           } else {
             callback()
           }
@@ -267,7 +267,7 @@ export default {
           return
         }
         if (value === undefined || value === '') {
-          callback(new Error('请输入用户名'))
+          callback(new Error('请输入账号'))
         } else if (!isUsername(value)) {
           callback(new Error('4到16位(字母，数字，下划线)'))
         } else {
@@ -298,7 +298,7 @@ export default {
   mounted() {
     this.getDeptTreeSelect()
     this.getRoleTreeSelect()
-    this.getDictListByDictType('sex').then(response => {
+    this.getDictListByDictType('sys_user_sex').then(response => {
       this.sexOptions = response.data
     })
     this.getDictListByDictType('personnel_status').then(response => {
diff --git a/src/main.js b/src/main.js
index 2ec13de..0c27bbe 100644
--- a/src/main.js
+++ b/src/main.js
@@ -6,7 +6,6 @@ import Element from 'element-ui'
 import './assets/styles/element-variables.scss'
 
 import '@/assets/styles/index.scss' // global css
-import '@/styles/index.scss' // global css
 import '@/assets/styles/ruoyi.scss' // ruoyi css
 
 
@@ -20,8 +19,10 @@ import plugins from './plugins' // plugins
 import { download } from '@/utils/request'
 import VCharts from 'v-charts'
 
+import '@/styles/index.scss' // global css
 import './assets/icons' // icon
-import './permission' // permission control
+import '@/permission' // permission control
+
 import { getDicts } from "@/api/system/dict/data";
 import { getConfigKey } from "@/api/system/config";
 import { parseTime, resetForm, addDateRange, addDateRange2, addDateRange3, selectDictLabel, selectDictLabels, handleTree } from "@/utils/ruoyi";
diff --git a/src/router/index.js b/src/router/index.js
index 4787fbf..68b66da 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -68,7 +68,7 @@ export const constantRoutes = [
     children: [
       {
         path: 'index',
-        component: () => import('@/views/index'),
+        component: () => import('@/views/index.vue'),
         name: 'Index',
         meta: { title: '首页', icon: 'dashboard', affix: true }
       },
@@ -216,12 +216,6 @@ export const dynamicRoutes = [
         name: 'signUp',
         meta: { title: '新报' }
       },
-      {
-        path: 'orderPrint',
-        component: () => import('@/views/courseOrder/orderPrint'),
-        name: 'orderPrint',
-        meta: { title: '新报' }
-      },
     ]
   }
 ]
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index c157332..76091b8 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -33,9 +33,6 @@ const user = {
     SET_PERMISSIONS: (state, permissions) => {
       state.permissions = permissions
     },
-    SET_MENU: (state, menuList) => {
-      Vue.set(state, 'menuList', menuList)
-    },
   },
 
   actions: {
@@ -77,9 +74,6 @@ const user = {
         }).catch(error => {
           reject(error)
         })
-        listMenu().then(response=>{
-          commit('SET_MENU', response.data)
-        })
       })
     },
 
diff --git a/src/styles/dashboard/index.scss b/src/styles/dashboard/index.scss
index 423570e..63e6760 100644
--- a/src/styles/dashboard/index.scss
+++ b/src/styles/dashboard/index.scss
@@ -8,10 +8,12 @@
     border-radius: 8px;
     background: #fff;
     .header{
-      font-size: 16px;
+      font-size: 20px;
       padding: 20px 0 7px 24px;
+
       .title{
-        font-weight: 500;
+        display: flex;
+        font-weight: 550;
         color: #000;
       }
     }
@@ -29,7 +31,8 @@
         align-content: center;
 
         .icon{
-
+          height: 48px;
+          width: 28px;
         }
         .txt{
           padding-left: 16px;
@@ -57,10 +60,11 @@
     margin-bottom: 16px;
 
     .header{
-      font-size: 16px;
+      font-size: 20px;
       padding: 20px 0 7px 24px;
       .title{
-        font-weight: 500;
+        display: flex;
+        font-weight: 550;
         color: #000;
       }
     }
@@ -88,11 +92,12 @@
     margin-bottom: 16px;
 
     .header{
-      font-size: 16px;
+      font-size: 20px;
       padding: 20px 0 7px 24px;
       overflow: hidden;
       .title{
-        font-weight: 500;
+        display: flex;
+        font-weight: 550;
         color: #000;
       }
     }
@@ -104,6 +109,7 @@
       background: #fff;
 
       .content-container {
+
         padding: 8px 16px;
         position: relative;
         height: 600px;
@@ -117,7 +123,7 @@
       }
     }
     .right-container{
-      width: 350px;
+      width: 400px;
 
       .content-item{
         padding: 8px 10px 8px 8px;
@@ -128,7 +134,8 @@
         cursor: pointer;
 
         .icon{
-
+          height: 48px;
+          width: 28px;
         }
         .txt{
           padding-left: 8px;
diff --git a/src/styles/sc/order/signUp.scss b/src/styles/sc/order/signUp.scss
index dadba35..fff1fcc 100644
--- a/src/styles/sc/order/signUp.scss
+++ b/src/styles/sc/order/signUp.scss
@@ -8,12 +8,14 @@
     color: rgba(0, 0, 0, .85);
     font-weight: 500;
     font-size: 16px;
+    display: flex;
 
     &.top {
       padding-top: 0px;
     }
 
     .title-content {
+
       border-left: 3px solid #409EFF;
       padding-left: 10px;
     }
diff --git a/src/utils/request.js b/src/utils/request.js
index da319ba..a77f441 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -51,9 +51,9 @@ service.interceptors.request.use(config => {
       const s_time = sessionObj.time;                // 请求时间
       const interval = 1000;                         // 间隔时间(ms)，小于此时间视为重复提交
       if (s_data === requestObj.data && requestObj.time - s_time < interval && s_url === requestObj.url) {
-        const message = '数据正在处理，请勿重复提交';
-        console.warn(`[${s_url}]: ` + message)
-        return Promise.reject(new Error(message))
+        // const message = '数据正在处理，请勿重复提交';
+        // console.warn(`[${s_url}]: ` + message)
+        // return Promise.reject(new Error())
       } else {
         cache.session.setJSON('sessionObj', requestObj)
       }
diff --git a/src/views/columns/config/appreciate.vue b/src/views/columns/config/appreciate.vue
index 1aab16d..67d9d2f 100644
--- a/src/views/columns/config/appreciate.vue
+++ b/src/views/columns/config/appreciate.vue
@@ -172,10 +172,10 @@
 
 
         <!-- 在“标题”表单项后添加 -->
-        <el-form-item label="门店/校区" prop="deptId">
+        <el-form-item label="门店" prop="deptId">
           <el-select
             v-model="form.deptId"
-            placeholder="请选择门店/校区"
+            placeholder="请选择门店"
             clearable
             style="width: 100%"
           >
@@ -224,9 +224,9 @@
           </el-upload>
         </el-form-item>
 
-        <el-form-item label="阅读量" prop="readNum">
-          <el-input v-model.number="form.readNum" placeholder="请输入阅读量" />
-        </el-form-item>
+<!--        <el-form-item label="阅读量" prop="readNum">-->
+<!--          <el-input v-model.number="form.readNum" placeholder="请输入阅读量" />-->
+<!--        </el-form-item>-->
 
         <el-form-item label="内容" prop="content">
           <div class="editor-container">
@@ -327,6 +327,9 @@ export default {
       },
       // 表单校验
       rules: {
+        deptId: [
+          { required: true, message: "请选择门店", trigger: "change" }
+        ],
         title: [
           { required: true, message: "请输入标题", trigger: "blur" }
         ],
@@ -549,7 +552,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加瑜伽传承";
+      this.title = "添加瑜伽欣赏";
     },
 
     /** 修改按钮操作 */
@@ -578,7 +581,7 @@ export default {
         });
 
         this.open = true;
-        this.title = "修改瑜伽传承";
+        this.title = "修改瑜伽欣赏";
       }).catch(() => {
         this.$message.error('获取数据失败');
       });
@@ -628,7 +631,7 @@ export default {
         return;
       }
 
-      this.$modal.confirm('是否确认删除瑜伽传承编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除瑜伽欣赏编号为"' + ids + '"的数据项？').then(function() {
         return delAppreciate(ids);
       }).then(() => {
         this.getList();
diff --git a/src/views/columns/config/health.vue b/src/views/columns/config/health.vue
index acb7162..300c1f0 100644
--- a/src/views/columns/config/health.vue
+++ b/src/views/columns/config/health.vue
@@ -88,7 +88,7 @@
 
 
       <!-- 门店/校区名称（标签形式） -->
-      <el-table-column label="门店/校区名称" align="center">
+      <el-table-column label="门店名称" align="center">
         <template #default="scope">
           <!-- 调用方法获取名称，用span或el-tag展示 -->
           <el-tag type="info">{{ getDeptName(scope.row.deptId) }}</el-tag>
@@ -166,16 +166,16 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改瑜伽传承对话框 -->
+    <!-- 添加或修改健康饮食对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="onDialogOpened">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 
 
         <!-- 在“标题”表单项后添加 -->
-        <el-form-item label="门店/校区" prop="deptId">
+        <el-form-item label="门店" prop="deptId">
           <el-select
             v-model="form.deptId"
-            placeholder="请选择门店/校区"
+            placeholder="请选择门店"
             clearable
             style="width: 100%"
           >
@@ -224,9 +224,9 @@
           </el-upload>
         </el-form-item>
 
-        <el-form-item label="阅读量" prop="readNum">
-          <el-input v-model.number="form.readNum" placeholder="请输入阅读量" />
-        </el-form-item>
+<!--        <el-form-item label="阅读量" prop="readNum">-->
+<!--          <el-input v-model.number="form.readNum" placeholder="请输入阅读量" />-->
+<!--        </el-form-item>-->
 
         <el-form-item label="内容" prop="content">
           <div class="editor-container">
@@ -290,7 +290,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 瑜伽传承表格数据
+      // 健康饮食表格数据
       inheritList: [],
       deptList:[],
       // 弹出层标题
@@ -328,6 +328,9 @@ export default {
       },
       // 表单校验
       rules: {
+        deptId: [
+          { required: true, message: "请选择门店", trigger: "change" }
+        ],
         title: [
           { required: true, message: "请输入标题", trigger: "blur" }
         ],
@@ -439,7 +442,7 @@ export default {
         this.deptList=res.data
       })
     },
-    /** 查询瑜伽传承列表 */
+    /** 查询健康饮食列表 */
     getList() {
       this.loading = true;
       listHealthy(this.queryParams).then(response => {
@@ -550,7 +553,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加瑜伽传承";
+      this.title = "添加健康饮食";
     },
 
     /** 修改按钮操作 */
@@ -579,7 +582,7 @@ export default {
         });
 
         this.open = true;
-        this.title = "修改瑜伽传承";
+        this.title = "修改健康饮食";
       }).catch(() => {
         this.$message.error('获取数据失败');
       });
@@ -629,7 +632,7 @@ export default {
         return;
       }
 
-      this.$modal.confirm('是否确认删除瑜伽传承编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除健康饮食编号为"' + ids + '"的数据项？').then(function() {
         return delHealthy(ids);
       }).then(() => {
         this.getList();
diff --git a/src/views/columns/config/inherit.vue b/src/views/columns/config/inherit.vue
index 07b9cff..5a01444 100644
--- a/src/views/columns/config/inherit.vue
+++ b/src/views/columns/config/inherit.vue
@@ -169,13 +169,11 @@
     <!-- 添加或修改瑜伽传承对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="onDialogOpened">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-
-
         <!-- 在“标题”表单项后添加 -->
-        <el-form-item label="门店/校区" prop="deptId">
+        <el-form-item label="门店" prop="deptId">
           <el-select
             v-model="form.deptId"
-            placeholder="请选择门店/校区"
+            placeholder="请选择门店"
             clearable
             style="width: 100%"
           >
@@ -224,9 +222,9 @@
           </el-upload>
         </el-form-item>
 
-        <el-form-item label="阅读量" prop="readNum">
-          <el-input v-model.number="form.readNum" placeholder="请输入阅读量" />
-        </el-form-item>
+<!--        <el-form-item label="阅读量" prop="readNum">-->
+<!--          <el-input v-model.number="form.readNum" placeholder="请输入阅读量" />-->
+<!--        </el-form-item>-->
 
         <el-form-item label="内容" prop="content">
           <div class="editor-container">
@@ -325,6 +323,9 @@ export default {
       },
       // 表单校验
       rules: {
+        deptId: [
+          { required: true, message: "请选择门店", trigger: "change" }
+        ],
         title: [
           { required: true, message: "请输入标题", trigger: "blur" }
         ],
diff --git a/src/views/columns/config/practice.vue b/src/views/columns/config/practice.vue
index e73cfe7..6f017d6 100644
--- a/src/views/columns/config/practice.vue
+++ b/src/views/columns/config/practice.vue
@@ -166,16 +166,16 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改瑜伽传承对话框 -->
+    <!-- 添加或修改练习瞬间对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="onDialogOpened">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 
 
         <!-- 在“标题”表单项后添加 -->
-        <el-form-item label="门店/校区" prop="deptId">
+        <el-form-item label="门店" prop="deptId">
           <el-select
             v-model="form.deptId"
-            placeholder="请选择门店/校区"
+            placeholder="请选择门店"
             clearable
             style="width: 100%"
           >
@@ -224,9 +224,9 @@
           </el-upload>
         </el-form-item>
 
-        <el-form-item label="阅读量" prop="readNum">
-          <el-input v-model.number="form.readNum" placeholder="请输入阅读量" />
-        </el-form-item>
+<!--        <el-form-item label="阅读量" prop="readNum">-->
+<!--          <el-input v-model.number="form.readNum" placeholder="请输入阅读量" />-->
+<!--        </el-form-item>-->
 
         <el-form-item label="内容" prop="content">
           <div class="editor-container">
@@ -289,7 +289,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 瑜伽传承表格数据
+      // 练习瞬间表格数据
       inheritList: [],
       deptList:[],
       // 弹出层标题
@@ -327,6 +327,9 @@ export default {
       },
       // 表单校验
       rules: {
+        deptId: [
+          { required: true, message: "请选择门店", trigger: "change" }
+        ],
         title: [
           { required: true, message: "请输入标题", trigger: "blur" }
         ],
@@ -438,7 +441,7 @@ export default {
         this.deptList=res.data
       })
     },
-    /** 查询瑜伽传承列表 */
+    /** 查询练习瞬间列表 */
     getList() {
       this.loading = true;
       listMoments(this.queryParams).then(response => {
@@ -549,7 +552,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加瑜伽传承";
+      this.title = "添加练习瞬间";
     },
 
     /** 修改按钮操作 */
@@ -578,7 +581,7 @@ export default {
         });
 
         this.open = true;
-        this.title = "修改瑜伽传承";
+        this.title = "修改练习瞬间";
       }).catch(() => {
         this.$message.error('获取数据失败');
       });
@@ -628,7 +631,7 @@ export default {
         return;
       }
 
-      this.$modal.confirm('是否确认删除瑜伽传承编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除练习瞬间编号为"' + ids + '"的数据项？').then(function() {
         return delMoments(ids);
       }).then(() => {
         this.getList();
diff --git a/src/views/columns/config/sense.vue b/src/views/columns/config/sense.vue
index 301f186..ead4c1a 100644
--- a/src/views/columns/config/sense.vue
+++ b/src/views/columns/config/sense.vue
@@ -166,16 +166,16 @@
       @pagination="getList"
     />
 
-    <!-- 添加或修改瑜伽传承对话框 -->
+    <!-- 添加或修改瑜伽常识对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body @opened="onDialogOpened">
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
 
 
         <!-- 在“标题”表单项后添加 -->
-        <el-form-item label="门店/校区" prop="deptId">
+        <el-form-item label="门店" prop="deptId">
           <el-select
             v-model="form.deptId"
-            placeholder="请选择门店/校区"
+            placeholder="请选择门店"
             clearable
             style="width: 100%"
           >
@@ -224,9 +224,9 @@
           </el-upload>
         </el-form-item>
 
-        <el-form-item label="阅读量" prop="readNum">
-          <el-input v-model.number="form.readNum" placeholder="请输入阅读量" />
-        </el-form-item>
+<!--        <el-form-item label="阅读量" prop="readNum">-->
+<!--          <el-input v-model.number="form.readNum" placeholder="请输入阅读量" />-->
+<!--        </el-form-item>-->
 
         <el-form-item label="内容" prop="content">
           <div class="editor-container">
@@ -289,7 +289,7 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
-      // 瑜伽传承表格数据
+      // 瑜伽常识表格数据
       inheritList: [],
       deptList:[],
       // 弹出层标题
@@ -327,6 +327,9 @@ export default {
       },
       // 表单校验
       rules: {
+        deptId: [
+          { required: true, message: "请选择门店", trigger: "change" }
+        ],
         title: [
           { required: true, message: "请输入标题", trigger: "blur" }
         ],
@@ -438,7 +441,7 @@ export default {
         this.deptList=res.data
       })
     },
-    /** 查询瑜伽传承列表 */
+    /** 查询瑜伽常识列表 */
     getList() {
       this.loading = true;
       listSense(this.queryParams).then(response => {
@@ -549,7 +552,7 @@ export default {
     handleAdd() {
       this.reset();
       this.open = true;
-      this.title = "添加瑜伽传承";
+      this.title = "添加瑜伽常识";
     },
 
     /** 修改按钮操作 */
@@ -578,7 +581,7 @@ export default {
         });
 
         this.open = true;
-        this.title = "修改瑜伽传承";
+        this.title = "修改瑜伽常识";
       }).catch(() => {
         this.$message.error('获取数据失败');
       });
@@ -628,7 +631,7 @@ export default {
         return;
       }
 
-      this.$modal.confirm('是否确认删除瑜伽传承编号为"' + ids + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除瑜伽常识编号为"' + ids + '"的数据项？').then(function() {
         return delSense(ids);
       }).then(() => {
         this.getList();
diff --git a/src/views/columns/config/venue.vue b/src/views/columns/config/venue.vue
index 8146cb4..04d92dd 100644
--- a/src/views/columns/config/venue.vue
+++ b/src/views/columns/config/venue.vue
@@ -127,7 +127,17 @@
           >查看内容</el-button>
         </template>
       </el-table-column>
-      <el-table-column label="部门ID" align="center" prop="deptName" />
+      <el-table-column label="所属部门" align="center" prop="deptName" />
+      <el-table-column label="是否展示" align="center" width="100">
+        <template slot-scope="scope">
+          <el-switch
+            v-model="scope.row.display"
+            active-value="1"
+            inactive-value="0"
+            @change="handleStatusChange(scope.row)"
+          ></el-switch>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button
@@ -311,6 +321,17 @@ export default {
     this.getList();
   },
   methods: {
+    // 角色状态修改
+    handleStatusChange(row) {
+      let text = row.display === "0" ? "不展示" : "展示";
+      this.$modal.confirm('确认要' + text + '"' + row.storeName + '"门店吗？').then(function() {
+        return updateStore({deptId:row.deptId, display:row.display});
+      }).then(() => {
+        this.$modal.msgSuccess(text + "成功");
+      }).catch(function() {
+        row.display = row.display === "0" ? "1" : "0";
+      });
+    },
     /** 对话框打开后初始化富文本编辑器 */
     onDialogOpened() {
       if (!this.founderEditor) {
diff --git a/src/views/columns/context/index.vue b/src/views/columns/context/index.vue
index 4ee850c..415e486 100644
--- a/src/views/columns/context/index.vue
+++ b/src/views/columns/context/index.vue
@@ -68,6 +68,7 @@
     <el-table v-loading="loading" :data="teacherList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="员工id" align="center" prop="userId" width="80" />
+      <el-table-column label="员工昵称" align="center" prop="nickName" width="80" />
       <el-table-column label="老师名称" align="center" prop="teacherName" />
       <el-table-column label="头像" align="center" prop="avatarImg" width="100">
         <template slot-scope="scope">
@@ -154,6 +155,8 @@
             clearable
             filterable
             style="width: 100%"
+            @change="selectUser"
+            :disabled="title === '修改教练信息' ?true:false"
           >
             <el-option
               v-for="emp in employeeList"
@@ -249,7 +252,7 @@
 </template>
 
 <script>
-import { listTeacher, getTeacher, delTeacher, addTeacher, updateTeacher } from "@/api/columns/teacher";
+import { listTeacher, getTeacher, delTeacher, addTeacher, updateTeacher,getUserForTeacher } from "@/api/columns/teacher";
 import { listAll } from "@/api/system/user";
 import WangEditor from 'wangeditor';
 import { getToken } from '@/utils/auth';
@@ -397,7 +400,7 @@ export default {
       this.loading = true;
       listTeacher(this.queryParams).then(response => {
         this.teacherList = response.rows || [];
-        this.total = response.total || 0;
+        this.total = response.total? Number(response.total):0;
         this.loading = false;
       }).catch(() => {
         this.loading = false;
@@ -408,8 +411,8 @@ export default {
     /** 获取员工列表 */
     getBase() {
       this.loading = true;
-      listAll().then(res => {
-        this.employeeList = res.rows || [];
+      getUserForTeacher().then(res => {
+        this.employeeList = res.data || [];
         this.loading = false;
       }).catch(() => {
         this.loading = false;
diff --git a/src/views/courseOrder/signUp.vue b/src/views/courseOrder/signUp.vue
index 6aac39c..f9470e9 100644
--- a/src/views/courseOrder/signUp.vue
+++ b/src/views/courseOrder/signUp.vue
@@ -38,7 +38,7 @@
       </div>
       <div class="choose-btn">
         <el-button type="primary" icon="el-icon-notebook-2" size="mini" @click="chooseCourse">选择课程</el-button>
-        <!-- <el-button type="success" disabled icon="el-icon-s-grid" size="mini">选择班级</el-button>-->
+<!--         <el-button type="success" disabled icon="el-icon-s-grid" size="mini">选择班级</el-button>-->
       </div>
       <div class="choose-course-container">
         <el-row>
@@ -1025,7 +1025,10 @@ export default {
         if (item.courseId === undefined) {
           this.msgError('第' + (i + 1) + '个报读课程无课程Id')
           return
-        } else if (item.chargeId === undefined) {
+        }  else if (item.claId === undefined) {
+          this.msgError('第' + (i + 1) + '个报读课程无班级Id')
+          return
+        }else if (item.chargeId === undefined) {
           this.msgError('第' + (i + 1) + '个报读课程未选择收费方式')
           return
         } else if (item.buyCount === undefined) {
@@ -1054,7 +1057,7 @@ export default {
       } else if (reqParam.handleDepartId === undefined) {
         this.msgError('请选择经办校区')
         return
-      } else if (reqParam.useBalancePay === true && (reqParam.balancePayValue === undefined || reqParam.balancePayValue === '')) {
+      }  else if (reqParam.useBalancePay === true && (reqParam.balancePayValue === undefined || reqParam.balancePayValue === '')) {
         this.msgError('请填写使用余额支付金额')
         return
       } else if (reqParam.handleDate === undefined) {
diff --git a/src/views/index.vue b/src/views/index.vue
index 56513ad..20282f4 100644
--- a/src/views/index.vue
+++ b/src/views/index.vue
@@ -1,283 +1,215 @@
-<template>
-  <div class="home-wrapper">
-    <el-card style="margin: 20px 20px; font-size: 14px">
-      <div class="first"><img alt="" :src="avatar" style="width: 50px; height: 50px; float:left; margin-right:10px;border-radius:50%" />
-        <p style="font-size:16px;margin-bottom:8px">{{name}}，{{hello}}</p>
-        <p style="font-size:12px;color:rgb(185, 181, 189)">今天是：{{nowTime}}</p>
-      </div>
-      <div class="first">
-
-      </div>
-    </el-card>
-    <el-row class="pl20 pr20" :gutter="10">
-      <el-col :span="9">
-        <el-card shadow="always" style="padding-bottom: 30px">
-          <div slot="header"><span>售后</span></div>
-          <ul style="margin-top: 10px">
-            <li class="li" style="width: 50%">待处理
-            </li>
-            <li class="li" style="width: 50%">处理中
-            </li>
-          </ul>
-          <ul>
-            <li class="da" style="width: 50%">
-              <router-link :to="{path:'/order/aftersale', query:{status:0}}">{{ orderAndAftersaleStatisticsObj.pendingAftersaleCount }}</router-link>
-            </li>
-            <li class="da" style="width: 50%">
-              <router-link :to="{path:'/order/aftersale', query:{status:1}}">{{ orderAndAftersaleStatisticsObj.processingAftersaleCount }}</router-link>
-            </li>
-          </ul>
-        </el-card>
-      </el-col>
-      <el-col :span="15">
-        <el-card shadow="always" style="padding-bottom: 30px">
-          <div slot="header"><span>订单</span></div>
-          <div>
-            <ul style="margin-top: 10px">
-              <li class="li">未发订单数
-              </li>
-              <li class="li">今日订单数
-              </li>
-              <li class="li">今日成交额
-              </li>
-              <li class="li">今日发货数
-              </li>
-            </ul>
-            <ul>
-              <li class="da">
-                <router-link :to="{path:'/order/order',query:{status:1}}">{{ orderAndAftersaleStatisticsObj.waitDeliveredCount }}</router-link>
-              </li>
-              <li class="da">
-                 <router-link :to="{path:'/order/order',query:{today:true}}">{{ orderAndAftersaleStatisticsObj.todayOrderCount }}</router-link>
-              </li>
-              <li class="da">
-                 <router-link :to="{path:'/order/order',query:{today:true,status:1}}">{{ orderAndAftersaleStatisticsObj.todayTransactionAmount }}</router-link>
-              </li>
-              <li class="da">
-                 <router-link :to="{path:'/order/order',query:{today:true, status: 2}}">{{ orderAndAftersaleStatisticsObj.todayHasDeliveredCount }}</router-link>
-              </li>
-            </ul>
+  <template>
+  <div class="dashboard-container">
+    <div class="top-container">
+      <el-row v-loading="loading">
+        <div class="header" >
+          <div class="title">总览</div>
+        </div>
+        <div class="content-container">
+          <router-link to="/eduCla/claTimeRule?activeTab=calendar">
+            <div class="content-item">
+              <div class="icon" style="height: 48px;width: 28px;">
+                <svg-icon icon-class="dashboard-course" style="height: 48px;width: 28px;" />
+              </div>
+              <div class="txt">
+                <div class="value">{{ dashboardData.completeTodayClaTimeCnt }}/{{ dashboardData.todayClaTimeCnt }}节</div>
+                <div class="name">已上课/今日排课</div>
+              </div>
+            </div>
+          </router-link>
+          <router-link to="/order/handle/index?handleDate=thisMonth">
+            <div class="content-item">
+              <div class="icon">
+                <svg-icon icon-class="dashboard-order" style="height: 48px;width: 28px;" />
+              </div>
+              <div class="txt">
+                <div class="value">{{ dashboardData.todayOrderCnt }}/{{ dashboardData.thisMonthOrderCnt }}笔</div>
+                <div class="name">今日报名/本月报名</div>
+              </div>
+            </div>
+          </router-link>
+          <div class="content-item">
+            <div class="icon">
+              <svg-icon icon-class="dashboard-student" style="height: 48px;width: 36px;" />
+            </div>
+            <div class="txt" style="padding-left: 8px;">
+              <div class="value">{{ dashboardData.todayRealAttendCnt }}/{{ dashboardData.todayNeedAttendCnt }}人</div>
+              <div class="name">实到/今日应到人次</div>
+            </div>
+          </div>
+          <div class="content-item">
+            <div class="icon">
+              <svg-icon icon-class="dashboard-cla-time" style="height: 48px;width: 32px;" />
+            </div>
+            <div class="txt" style="padding-left: 12px;">
+              <div class="value">{{ dashboardData.todayRealCostHour }}/{{ dashboardData.todayNeedCostHour }}课时</div>
+              <div class="name">实消/今日应消课时</div>
+            </div>
           </div>
-        </el-card>
-      </el-col>
-    </el-row>
-    <el-row class="pl20 pr20" :gutter="10">
-      <el-col :span="24">
-        <order-line-chart></order-line-chart>
-        <div class="card transform">
-          <top-product></top-product>
+          <router-link to="/stu/student">
+            <div class="content-item">
+              <div class="icon">
+                <svg-icon icon-class="dashboard-student-cnt" style="height: 48px;width: 28px;" />
+              </div>
+              <div class="txt">
+                <div class="value">{{ dashboardData.studentCnt }}人</div>
+                <div class="name">总学员人数</div>
+              </div>
+            </div>
+          </router-link>
+        </div>
+      </el-row>
+    </div>
+<!--  <div class="center-container">-->
+<!--      <div class="left-container">-->
+<!--        <div class="header">-->
+<!--          <div class="title">常用功能</div>-->
+<!--        </div>-->
+<!--        <div class="content-container">-->
+<!--        </div>-->
+<!--      </div>-->
+<!--      <div class="right-container">-->
+<!--        <div class="header">-->
+<!--          <div class="title">通知提醒</div>-->
+<!--        </div>-->
+<!--        <div class="content-container">-->
+<!--        </div>-->
+<!--      </div>-->
+<!--    </div>-->
+    <div class="calendar-container">
+      <div class="left-container">
+        <div class="header">
+          <div class="title">课表</div>
         </div>
-      </el-col>
-    </el-row>
+        <div class="content-container">
+          <cla-time-calendar ref="claTimeCalendar" readonly can-cla-time-attend class="calendar" />
+        </div>
+      </div>
+      <div class="right-container">
+        <el-row v-loading="loading">
+          <div class="top">
+            <div class="header">
+              <div class="title">快捷入口</div>
+            </div>
+            <div class="content-container">
+              <router-link to="/edu/cla">
+                <div class="content-item">
+                  <div class="icon">
+                    <svg-icon icon-class="dashboard-cla" style="height: 33px;width: 28px;" />
+                  </div>
+                  <div class="txt">
+                    <div class="value">班级</div>
+                    <div class="name">班级数 <span class="cnt">{{ dashboardData.claCnt }}</span></div>
+                  </div>
+                </div>
+              </router-link>
+              <router-link to="/edu/course">
+                <div class="content-item">
+                  <div class="icon">
+                    <svg-icon icon-class="dashboard-course" style="height: 33px;width: 28px;" />
+                  </div>
+                  <div class="txt">
+                    <div class="value">课程</div>
+                    <div class="name">课程数 <span class="cnt">{{ dashboardData.courseCnt }}</span></div>
+                  </div>
+                </div>
+              </router-link>
+              <router-link to="/order/handle/index">
+                <div class="content-item">
+                  <div class="icon">
+                    <svg-icon icon-class="dashboard-sign-up" style="height: 33px;width: 28px;" />
+                  </div>
+                  <div class="txt">
+                    <div class="value single">报名</div>
+                  </div>
+                </div>
+              </router-link>
+              <router-link :to="{name: 'ClaTime',params: {activeTab: 'attendClaTime'}}">
+                <div class="content-item">
+                  <div class="icon">
+                    <svg-icon icon-class="dashboard-record" style="height: 33px;width: 28px;" />
+                  </div>
+                  <div class="txt">
+                    <div class="value single">记上课</div>
+                  </div>
+                </div>
+              </router-link>
+              <router-link to="/stu/student">
+                <div class="content-item">
+                  <div class="icon">
+                    <svg-icon icon-class="dashboard-student-cnt" style="height: 33px;width: 28px;" />
+                  </div>
+                  <div class="txt">
+                    <div class="value">学员</div>
+                    <div class="name">学员 <span class="cnt">{{ dashboardData.studentCnt }}</span>人</div>
+                  </div>
+                </div>
+              </router-link>
+            </div>
+          </div>
+          <div class="bottom">
+            <div class="header">
+              <div class="title">通知提醒</div>
+            </div>
+            <div class="content-container">
+              <div class="content-item">
+                <div class="icon">
+                  <svg-icon icon-class="dashboard-notice" style="height: 65px;width: 35px;" />
+                </div>
+                <div class="txt item-circle" style="line-height: 20px;">
+                  <router-link :to="{name: 'Student',params: {activeTab: 'studentSignUpList', minBalanceDay: 10}}">
+                    <div class="name">10日内即将到期 <span class="cnt">{{ dashboardData.dateWillExpireCnt }}</span>人</div>
+                  </router-link>
+                  <router-link :to="{name: 'Student',params: {activeTab: 'studentSignUpList', minBalanceHour: 5}}">
+                    <div class="name">剩余课时小于5课时 <span class="cnt">{{ dashboardData.hourWillExpireCnt }}</span>人</div>
+                  </router-link>
+                  <div class="name">欠费学员 <span class="cnt">{{ dashboardData.arrearsStudentCnt }}</span>人</div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </el-row>
+      </div>
+    </div>
   </div>
 </template>
-<script>
-import {str2Date} from '@/utils/date';
-import PanelGroup from '@/views/components/PanelGroup'
-import {mapGetters} from 'vuex'
-import OrderLineChart from "@/views/dashboard/OrderLineChart.vue";
-import TopProduct from "@/views/components/IndexOrderPanelGroup/TopProduct.vue";
-import {orderAndAftersaleStatistics} from "@/api/statistics";
 
-const DATA_FROM_BACKEND = {
-    columns: ['date', 'orderCount','orderAmount'],
-    rows: [
-      {date: '2018-11-01', orderCount: 10, orderAmount: 1093},
-      {date: '2018-11-02', orderCount: 20, orderAmount: 2230},
-      {date: '2018-11-03', orderCount: 33, orderAmount: 3623},
-      {date: '2018-11-04', orderCount: 50, orderAmount: 6423},
-      {date: '2018-11-05', orderCount: 80, orderAmount: 8492},
-      {date: '2018-11-06', orderCount: 60, orderAmount: 6293},
-      {date: '2018-11-07', orderCount: 20, orderAmount: 2293},
-      {date: '2018-11-08', orderCount: 60, orderAmount: 6293},
-      {date: '2018-11-09', orderCount: 50, orderAmount: 5293},
-      {date: '2018-11-10', orderCount: 30, orderAmount: 3293},
-      {date: '2018-11-11', orderCount: 20, orderAmount: 2293},
-      {date: '2018-11-12', orderCount: 80, orderAmount: 8293},
-      {date: '2018-11-13', orderCount: 100, orderAmount: 10293},
-      {date: '2018-11-14', orderCount: 10, orderAmount: 1293},
-      {date: '2018-11-15', orderCount: 40, orderAmount: 4293}
-    ]
-  };
+<script>
+import { mapGetters } from 'vuex'
+import claTimeCalendar from '@/components/sc/claTime/claTimeCalendar'
+import { dashboardData } from '@/api/school/report/dashboard'
 
 export default {
+  name: 'Dashboard',
   components: {
-    PanelGroup,
-    OrderLineChart,
-    TopProduct
+    claTimeCalendar
   },
   data() {
     return {
-      pickerOptions: {
-          shortcuts: [{
-            text: '最近一周',
-            onClick(picker) {
-              const end = new Date();
-              let start = new Date();
-              start.setFullYear(2018);
-              start.setMonth(10);
-              start.setDate(1);
-              end.setTime(start.getTime() + 3600 * 1000 * 24 * 7);
-              picker.$emit('pick', [start, end]);
-            }
-          }, {
-            text: '最近一月',
-            onClick(picker) {
-              const end = new Date();
-              let start = new Date();
-              start.setFullYear(2018);
-              start.setMonth(10);
-              start.setDate(1);
-              end.setTime(start.getTime() + 3600 * 1000 * 24 * 30);
-              picker.$emit('pick', [start, end]);
-            }
-          }]
-        },
-        orderCountDate: '',
-        chartSettings: {
-          xAxisType: 'time',
-          area:true,
-          axisSite: { right: ['orderAmount']},
-        labelMap: {'orderCount': '订单数量', 'orderAmount': '订单金额'}},
-        chartData: {
-          columns: [],
-          rows: []
-        },
-      loading: false,
-      dataEmpty: false,
-      nowTime: '',
-      hello: '',
-      orderAndAftersaleStatisticsObj: {
-        pendingAftersaleCount: 0,
-        processingAftersaleCount: 0,
-        waitDeliveredCount: 0,
-        todayHasDeliveredCount: 0,
-        todayOrderCount: 0,
-        todayTransactionAmount: 0
-      }
+      dashboardData: {},
+      loading: false
     }
   },
   computed: {
-    ...mapGetters(['avatar', 'name'])
+    ...mapGetters([
+      'name'
+    ])
   },
   created() {
-    this.showTimes()
-    this.helloTimes()
-    this.orderAndAftersaleStat()
-    this.initOrderCountDate()
-    this.getData()
+    this.$nextTick(() => {
+      this.$refs.claTimeCalendar.loadData()
+    })
+    this.loading = true
+    dashboardData().then(response => {
+      this.loading = false
+      this.dashboardData = response.data
+    }).catch(() => {
+      this.loading = false
+    })
   },
   methods: {
-    handleDateChange() {
-      this.getData();
-    },
-    initOrderCountDate() {
-      let start = new Date();
-      start.setFullYear(2018, 10, 1);
-      const end = new Date();
-      end.setTime(start.getTime() + 1000 * 60 * 60 * 24 * 7);
-      this.orderCountDate = [start, end];
-    },
-      getData(){
-        setTimeout(() => {
-          this.chartData = {
-            columns: ['date', 'orderCount','orderAmount'],
-            rows: []
-          };
-          for(let i=0;i<DATA_FROM_BACKEND.rows.length;i++){
-            let item=DATA_FROM_BACKEND.rows[i];
-            let currDate=str2Date(item.date);
-            let start=this.orderCountDate[0];
-            let end=this.orderCountDate[1];
-            if(currDate.getTime()>=start.getTime()&&currDate.getTime()<=end.getTime()){
-              this.chartData.rows.push(item);
-            }
-          }
-          this.dataEmpty = false;
-          this.loading = false
-        }, 1000)
-      },
-    timeFormate(timeStamp) {
-      let year = new Date(timeStamp).getFullYear()
-      let month =
-        new Date(timeStamp).getMonth() + 1 < 10
-          ? '0' + (new Date(timeStamp).getMonth() + 1)
-          : new Date(timeStamp).getMonth() + 1
-      let date =
-        new Date(timeStamp).getDate() < 10
-          ? '0' + new Date(timeStamp).getDate()
-          : new Date(timeStamp).getDate()
-      let hh =
-        new Date(timeStamp).getHours() < 10
-          ? '0' + new Date(timeStamp).getHours()
-          : new Date(timeStamp).getHours()
-      let mm =
-        new Date(timeStamp).getMinutes() < 10
-          ? '0' + new Date(timeStamp).getMinutes()
-          : new Date(timeStamp).getMinutes()
-      let ss =
-        new Date(timeStamp).getSeconds() < 10
-          ? '0' + new Date(timeStamp).getSeconds()
-          : new Date(timeStamp).getSeconds()
-      let week = new Date(timeStamp).getDay()
-      let weeks = ['日', '一', '二', '三', '四', '五', '六']
-      let getWeek = '星期' + weeks[week]
-      this.nowTime =
-        year +
-        '年' +
-        month +
-        '月' +
-        date +
-        '日' +
-        ' ' +
-
-        getWeek
-    },
-    showTimes() {
-      this.timeFormate(new Date())
-    },
-    helloTimes() {
-      let hh = new Date().getHours()
-      if (0 < hh < 12) {
-        this.hello = '上午好'
-      } else if (hh < 18) {
-        this.hello = '下午好'
-      } else {
-        this.hello = '晚上好'
-      }
-    },
-    orderAndAftersaleStat(){
-      orderAndAftersaleStatistics().then((response) => {
-        this.orderAndAftersaleStatisticsObj = response
-      })
-    }
   }
 }
 </script>
 
-<style scoped lang="stylus">
-.home-wrapper
-
-  .li {
-    float: left;
-    width: 25%;
-    font-size: 12px;
-    color: rgb(185, 181, 189);
-  }
-
-  .da {
-    float: left;
-    width: 25%;
-    font-size: 20px;
-  }
-
-  .first {
-    float: left;
-    width: 50%;
-    margin-bottom: 20px;
-  }
-
-  .el-table .warning-row {
-    background: rgb(39, 138, 230);
-  }
-</style>
+<style lang="scss" scoped src="@/styles/dashboard/index.scss"></style>
diff --git a/src/views/login.vue b/src/views/login.vue
index a37b2b3..926405d 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -67,8 +67,8 @@ export default {
       dialogVisible:false,
       codeUrl: "",
       loginForm: {
-        username: "admin",
-        password: "123",
+        username: "",
+        password: "",
         rememberMe: false,
         code: "",
         uuid: ""
diff --git a/src/views/oms/aftersale/index.vue b/src/views/oms/aftersale/index.vue
index 2ce08c7..edc806b 100644
--- a/src/views/oms/aftersale/index.vue
+++ b/src/views/oms/aftersale/index.vue
@@ -142,13 +142,11 @@
 
 <script>
 import {
-  addOmsAftersale,
+
   dealWithAftersale,
-  delOmsAftersale,
-  exportOmsAftersale,
+
   getOmsAftersale,
   listOmsAftersale,
-  updateOmsAftersale,
   viewLog
 } from "@/api/oms/aftersale";
 import dateUtil from '@/utils/DateUtil';
@@ -315,47 +313,7 @@ export default {
         this.title = "修改订单售后";
       });
     },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateOmsAftersale(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addOmsAftersale(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除订单售后编号为"' + ids + '"的数据项？').then(function() {
-        return delOmsAftersale(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams;
-      this.$modal.confirm('是否确认导出所有订单售后数据项？').then(() => {
-        this.exportLoading = true;
-        return exportOmsAftersale(queryParams);
-      }).then(response => {
-        this.$download.download(response);
-        this.exportLoading = false;
-      }).catch(() => {});
-    },
+
     /** 售后详情 */
     handleDetail(orderId){
       const id = orderId
diff --git a/src/views/school/course/cla/index.vue b/src/views/school/course/cla/index.vue
index c216945..01e94d4 100644
--- a/src/views/school/course/cla/index.vue
+++ b/src/views/school/course/cla/index.vue
@@ -98,16 +98,16 @@
           @click="handleDelete"
         >取消班级</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['sc:course:list']"
-          type="primary"
-          icon="el-icon-upload"
-          size="mini"
-          @click="handleImport"
-        >批量导入
-        </el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          v-hasPermi="['sc:course:list']"-->
+<!--          type="primary"-->
+<!--          icon="el-icon-upload"-->
+<!--          size="mini"-->
+<!--          @click="handleImport"-->
+<!--        >批量导入-->
+<!--        </el-button>-->
+<!--      </el-col>-->
     </el-row>
 
     <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
diff --git a/src/views/school/course/index.vue b/src/views/school/course/index.vue
index 56f293b..3bde3b6 100644
--- a/src/views/school/course/index.vue
+++ b/src/views/school/course/index.vue
@@ -129,26 +129,26 @@
         >删除课程
         </el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['sc:course:list']"
-          type="primary"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出当前结果
-        </el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['sc:course:list']"
-          type="primary"
-          icon="el-icon-upload"
-          size="mini"
-          @click="handleImport"
-        >批量导入
-        </el-button>
-      </el-col>
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          v-hasPermi="['sc:course:list']"-->
+<!--          type="primary"-->
+<!--          icon="el-icon-download"-->
+<!--          size="mini"-->
+<!--          @click="handleExport"-->
+<!--        >导出当前结果-->
+<!--        </el-button>-->
+<!--      </el-col>-->
+<!--      <el-col :span="1.5">-->
+<!--        <el-button-->
+<!--          v-hasPermi="['sc:course:list']"-->
+<!--          type="primary"-->
+<!--          icon="el-icon-upload"-->
+<!--          size="mini"-->
+<!--          @click="handleImport"-->
+<!--        >批量导入-->
+<!--        </el-button>-->
+<!--      </el-col>-->
     </el-row>
 
     <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
@@ -175,6 +175,11 @@
           {{ chargeNameByCodes(scope.row.chargeNames) }}
         </template>
       </el-table-column>
+      <el-table-column prop="claFee" align="center" label="教练课时费/节" >
+        <template slot-scope="scope">
+          {{ scope.row.claFee }} ￥
+        </template>
+      </el-table-column>
       <el-table-column prop="campusIds" align="center" label="开课校区">
         <template slot-scope="scope">
           <div v-if="scope.row.campusIds">
diff --git a/src/views/school/order/index.vue b/src/views/school/order/index.vue
index b7c233a..dc548e6 100644
--- a/src/views/school/order/index.vue
+++ b/src/views/school/order/index.vue
@@ -134,6 +134,7 @@
 </template>
 
 <script>
+import { selectDictLabel } from '@/utils/commonUtils'
 import { listOrder, invalidById } from '@/api/school/sc/order'
 import orderDetail from '@/components/sc/order/orderDetail'
 import deptSelect from '@/components/system/dept/deptSelect'
@@ -196,10 +197,10 @@ export default {
       this.handleDateArray = [startDate, endDate]
     }
     this.getList()
-    this.getDictListByDictType('order_type').then(response => {
+    this.getDictListByDictType('course_order_type').then(response => {
       this.orderTypeOptions = response.data
     })
-    this.getDictListByDictType('order_status').then(response => {
+    this.getDictListByDictType('course_order_status').then(response => {
       this.orderStatusOptions = response.data
     })
   },
@@ -251,7 +252,7 @@ export default {
       })
     },
     orderTypeFormat(row, column) {
-      return this.selectDictLabel(this.orderTypeOptions, row.orderType)
+      return selectDictLabel(this.orderTypeOptions, row.orderType)
     },
     // 作废订单
     invalidOrder(row) {
diff --git a/src/views/school/order/signUp.vue b/src/views/school/order/signUp.vue
index 4a223b9..94f124b 100644
--- a/src/views/school/order/signUp.vue
+++ b/src/views/school/order/signUp.vue
@@ -790,11 +790,11 @@ export default {
         return
       }
       // 获取账户余额
-      studentAccountBalance(studentId).then(response => {
-        if (response.respCode === '0000') {
-          this.studentAccountBalance = response.data
-        }
-      })
+      // studentAccountBalance(studentId).then(response => {
+      //   if (response.respCode === '0000') {
+      //     this.studentAccountBalance = response.data
+      //   }
+      // })
       // 获取学生报课详细信息
       studentCourseInfo(studentId).then(response => {
         if (response.respCode === '0000') {
diff --git a/src/views/school/room/index.vue b/src/views/school/room/index.vue
index 4fbe123..c17f9d6 100644
--- a/src/views/school/room/index.vue
+++ b/src/views/school/room/index.vue
@@ -64,6 +64,7 @@
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column prop="deptName" label="所属校区" />
       <el-table-column prop="roomName" label="教室名" />
+      <el-table-column prop="venueFee" label="场地费/小时(元)" />
       <el-table-column prop="memo" label="备注" />
       <el-table-column width="150" label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
@@ -107,6 +108,11 @@
               <dept-select v-model="form.deptId" placeholder="请选择所属校区" />
             </el-form-item>
           </el-col>
+          <el-col :span="12 ">
+            <el-form-item label="场地费:" prop="venueFee" >
+              <el-input v-model="form.venueFee" placeholder="请输入场地费(元/小时)" />
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="备注:" prop="memo">
               <el-input v-model="form.memo" type="textarea" placeholder="请输入备注" />
@@ -189,6 +195,7 @@ export default {
       this.form = {
         deptId: undefined,
         roomName: undefined,
+        venueFee: undefined,
         memo: undefined
       }
       this.resetForm('form')
diff --git a/src/views/school/salary/comps/CalTime.vue b/src/views/school/salary/comps/CalTime.vue
index 9be4133..e9ca64f 100644
--- a/src/views/school/salary/comps/CalTime.vue
+++ b/src/views/school/salary/comps/CalTime.vue
@@ -2,7 +2,7 @@
   <div>
     <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="80px">
       <el-form-item label="开课校区:" prop="name">
-        <SchoolSelect v-model="queryParams.schoolId" placeholder="请选择校区"/>
+        <dept-select v-model="queryParams.deptId" :dept-id="queryParams.deptId" placeholder="请输入所属校区" />
       </el-form-item>
       <el-form-item label="课程:" prop="name">
         <course-select v-model="courseIdArray" :dept-id="queryParams.deptId" clearable multiple mounted-load-all />
@@ -43,12 +43,12 @@
 
 import ChangeSalaryBase from "@/views/school/salary/comps/ChangeSalaryBase.vue";
 import {delSalaryBase, list} from "@/api/school/salary";
-import SchoolSelect from "@/components/sc/school/schoolSelect.vue";
+import deptSelect from '@/components/system/dept/deptSelect'
 import courseSelect from "@/components/sc/course/courseSelect.vue";
 
 export default {
   name: 'CalTime',
-  components: {courseSelect, SchoolSelect, ChangeSalaryBase},
+  components: {courseSelect, deptSelect, ChangeSalaryBase},
   data(){
     return{
       loading: true,
diff --git a/src/views/school/school/index.vue b/src/views/school/school/index.vue
deleted file mode 100644
index 33f90e3..0000000
--- a/src/views/school/school/index.vue
+++ /dev/null
@@ -1,334 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
-      <el-form-item label="省份编码" prop="provinceCode">
-        <el-select v-model="queryParams.provinceCode" placeholder="请选择省份编码" clearable size="small">
-          <el-option
-            v-for="item in provinceCodeOptions"
-            :key="item.id"
-            :label="item.name"
-            :value="item.code"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="区号" prop="cityCode">
-        <el-select v-model="queryParams.cityCode" placeholder="请选择区号" clearable size="small">
-          <el-option
-            v-for="dict in cityCodeOptions"
-            :key="dict.id"
-            :label="dict.name"
-            :value="dict.code"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="学校名称" prop="schoolName">
-        <el-input
-          v-model="queryParams.schoolName"
-          placeholder="请输入"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['sc:school:add']"
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['sc:school:update']"
-          type="primary"
-          icon="el-icon-edit-outline"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['sc:school:delete']"
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button>
-      </el-col>
-    </el-row>
-
-    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column align="center" prop="provinceCode" label="省份编码" :formatter="provinceCodeFormat" />
-      <el-table-column align="center" prop="cityCode" label="区号" :formatter="cityCodeFormat" />
-      <el-table-column prop="schoolName" label="学校名称" />
-      <el-table-column width="150" label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            v-hasPermi="['sc:school:update']"
-            size="mini"
-            type="text"
-            icon="el-icon-edit-outline"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            v-hasPermi="['sc:school:delete']"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="省分">
-              <el-select
-                v-model="form.provinceCode"
-                clearable
-                filterable
-                default-first-option
-                placeholder="请选择省份"
-              >
-                <el-option
-                  v-for="dict in provinceCodeOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="地市">
-              <el-select
-                v-model="form.cityCode"
-                clearable
-                filterable
-                default-first-option
-                placeholder="请选择地市"
-              >
-                <el-option
-                  v-for="dict in cityCodeOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="学校名称" prop="schoolName">
-              <el-input v-model="form.schoolName" placeholder="请输入" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listSchool, getSchool, delSchool, addSchool, updateSchool } from '@/api/school/sc/school'
-import {listAddress} from "@/api/school/sc/address";
-export default {
-  name: 'School',
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 总条数
-      total: 0,
-      // 表格树数据
-      dataList: [],
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
-      // 省份编码数据字典
-      provinceCodeOptions: [],
-      // 区号数据字典
-      cityCodeOptions: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        level:0,
-        provinceCode: undefined,
-        cityCode: undefined,
-        schoolName: undefined
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        schoolName: [
-          { required: true, message: '不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  watch: {
-    'form.provinceCode': {
-      handler(newValue, oldValue) {
-        if (newValue) {
-          this.form.cityCode = undefined
-          this.listAddress({parentCode:newValue}).then(response => {
-            this.cityCodeOptions = response.data
-          })
-        }
-      }
-    }
-  },
-  created() {
-    this.getList()
-    listAddress({level:this.queryParams.level}).then(response => {
-      this.provinceCodeOptions = response.data
-    })
-  },
-  methods: {
-    /** 查询部门列表 */
-    getList() {
-      this.loading = true
-      listSchool(this.queryParams).then(response => {
-        this.dataList = response.data.rows
-        this.total = response.data.total
-        this.loading = false
-      })
-    },
-    // 省份编码字典翻译
-    provinceCodeFormat(row, column) {
-      return this.selectDictLabel(this.provinceCodeOptions, row.provinceCode)
-    },
-    // 区号字典翻译
-    cityCodeFormat(row, column) {
-      return this.selectDictLabel(this.cityCodeOptions, row.cityCode)
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        provinceCode: undefined,
-        cityCode: undefined,
-        schoolName: undefined
-      }
-      this.resetForm('form')
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm('queryForm')
-      this.handleQuery()
-    },
-    /** 新增按钮操作 */
-    handleAdd(row) {
-      this.reset()
-      this.open = true
-      this.title = '添加学校信息'
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.schoolId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset()
-      getSchool(row.schoolId || this.ids).then(response => {
-        this.form = response.data
-        this.open = true
-        this.title = '修改学校信息'
-      })
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          if (this.form.schoolId !== undefined) {
-            updateSchool(this.form).then(response => {
-              if (response.respCode === '0000') {
-                this.msgSuccess('修改成功')
-                this.open = false
-                this.getList()
-              } else {
-                this.msgError(response.respMsg)
-              }
-            })
-          } else {
-            addSchool(this.form).then(response => {
-              if (response.respCode === '0000') {
-                this.msgSuccess('新增成功')
-                this.open = false
-                this.getList()
-              } else {
-                this.msgError(response.respMsg)
-              }
-            })
-          }
-        }
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const id = row.schoolId || this.ids
-      this.$confirm('是否确认删除?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        return delSchool(id)
-      }).then((response) => {
-        if (response.respCode === '0000') {
-          this.getList()
-          this.msgSuccess('删除成功')
-        } else {
-          this.msgError(response.respMsg)
-        }
-      }).catch(function() {})
-    }
-  }
-}
-</script>
diff --git a/src/views/school/student/components/studentCourseTable.vue b/src/views/school/student/components/studentCourseTable.vue
index 0e4137b..f1c456d 100644
--- a/src/views/school/student/components/studentCourseTable.vue
+++ b/src/views/school/student/components/studentCourseTable.vue
@@ -72,6 +72,7 @@
   </div>
 </template>
 <script>
+import { selectDictLabel } from '@/utils/commonUtils'
 import { atClaStudentCourseStatus, searchStudentCourse, stopStudentCourseStatus } from '@/api/school/sc/student/course'
 import claTimeAttendDetailTable from '@/components/sc/claTime/claTimeAttendDetailTable'
 export default {
@@ -107,11 +108,11 @@ export default {
         // 即将生效 未生效 并且 剩余课时 > 0。
         return '按时间(未生效)'
       } else {
-        return this.selectDictLabel(this.chargeTypeOptions, row.chargeType)
+        return selectDictLabel(this.chargeTypeOptions, row.chargeType)
       }
     },
     studentCourseStatusFormatter(row, column) {
-      return this.selectDictLabel(this.studentCourseStatusOptions, row.status)
+      return selectDictLabel(this.studentCourseStatusOptions, row.status)
     },
     getList() {
       this.loading = true
diff --git a/src/views/school/student/components/studentLogTable.vue b/src/views/school/student/components/studentLogTable.vue
index 9d2afd5..6754d5b 100644
--- a/src/views/school/student/components/studentLogTable.vue
+++ b/src/views/school/student/components/studentLogTable.vue
@@ -55,6 +55,7 @@
   </div>
 </template>
 <script>
+import { selectDictLabel } from '@/utils/commonUtils'
 import { listStudentCourseLog } from '@/api/school/sc/log/studentLog'
 import deptSelect from '@/components/system/dept/deptSelect'
 import claSelect from '@/components/sc/course/cla/claSelect'
@@ -135,7 +136,7 @@ export default {
       })
     },
     orderTypeFormat(row, column) {
-      return this.selectDictLabel(this.logTypeOptions, row.orderType)
+      return selectDictLabel(this.logTypeOptions, row.orderType)
     }
   }
 }
diff --git a/src/views/school/student/components/studentOrderTable.vue b/src/views/school/student/components/studentOrderTable.vue
index 893fa08..c9095e9 100644
--- a/src/views/school/student/components/studentOrderTable.vue
+++ b/src/views/school/student/components/studentOrderTable.vue
@@ -49,6 +49,7 @@
   </div>
 </template>
 <script>
+import { selectDictLabel } from '@/utils/commonUtils'
 import { listOrder } from '@/api/school/sc/order'
 import orderDetail from '@/components/sc/order/orderDetail'
 export default {
@@ -83,7 +84,7 @@ export default {
     }
   },
   created() {
-    this.getDictListByDictType('order_type').then(response => {
+    this.getDictListByDictType('course_order_type').then(response => {
       this.orderTypeOptions = response.data
     })
   },
@@ -99,7 +100,7 @@ export default {
       })
     },
     orderTypeFormat(row, column) {
-      return this.selectDictLabel(this.orderTypeOptions, row.orderType)
+      return selectDictLabel(this.orderTypeOptions, row.orderType)
     },
     // 订单详情
     handleOrderDetail(row) {
diff --git a/src/views/school/sys/tag/index.vue b/src/views/school/sys/tag/index.vue
deleted file mode 100644
index 2ae4cc3..0000000
--- a/src/views/school/sys/tag/index.vue
+++ /dev/null
@@ -1,347 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
-      <el-form-item label="所属租户" prop="tenantId">
-        <el-input
-          v-model="queryParams.tenantId"
-          placeholder="请输入所属租户"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="标签名称" prop="tagName">
-        <el-input
-          v-model="queryParams.tagName"
-          placeholder="请输入标签名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="标签类型" prop="tagType">
-        <el-select v-model="queryParams.tagType" placeholder="请选择标签类型" clearable size="small">
-          <el-option
-            v-for="dict in tagTypeOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['sys:tag:add']"
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['sys:tag:update']"
-          type="primary"
-          icon="el-icon-edit-outline"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['sys:tag:delete']"
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['::export']"
-          type="primary"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button>
-      </el-col>
-    </el-row>
-
-    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column prop="tagName" label="标签名称" />
-      <el-table-column align="center" prop="tagType" label="标签类型" :formatter="tagTypeFormat" />
-      <el-table-column width="150" label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            v-hasPermi="['sys:tag:update']"
-            size="mini"
-            type="text"
-            icon="el-icon-edit-outline"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            v-hasPermi="['sys:tag:delete']"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px">
-      <el-form ref="form" v-loading="loadingChange" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="标签名称" prop="tagName">
-              <el-input v-model="form.tagName" placeholder="请输入标签名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="标签类型">
-              <el-select v-model="form.tagType" placeholder="请选择标签类型">
-                <el-option
-                  v-for="dict in tagTypeOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictLabel"
-                  :value="dict.dictValue"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="创建者" prop="createUser">
-              <el-input v-model="form.createUser" placeholder="请输入创建者" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="创建时间" prop="createTime">
-              <el-date-picker
-                v-model="form.createTime"
-                clearable
-                size="small"
-                style="width: 200px"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择创建时间"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="更新者" prop="lastUpdateUser">
-              <el-input v-model="form.lastUpdateUser" placeholder="请输入更新者" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="更新时间" prop="lastUpdateTime">
-              <el-date-picker
-                v-model="form.lastUpdateTime"
-                clearable
-                size="small"
-                style="width: 200px"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="选择更新时间"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button :loading="loadingChange" type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listTag, getTag, delTag, addTag, updateTag } from '@/api/school/system/tag'
-
-export default {
-  name: 'Tag',
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      loadingChange: false,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 总条数
-      total: 0,
-      // 表格树数据
-      dataList: [],
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
-      // 标签类型数据字典
-      tagTypeOptions: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        tenantId: undefined,
-        tagName: undefined,
-        tagType: undefined
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        tagName: [
-          { required: true, message: '标签名称不能为空', trigger: 'blur' }
-        ],
-        tagType: [
-          { required: true, message: '标签类型不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  created() {
-    this.getList()
-    this.getDictListByDictType('tag_type').then(response => {
-      this.tagTypeOptions = response.data
-    })
-  },
-  methods: {
-    getList() {
-      this.loading = true
-      listTag(this.queryParams).then(response => {
-        this.dataList = response.data.rows
-        this.total = response.data.total
-        this.loading = false
-      })
-    },
-    // 标签类型字典翻译
-    tagTypeFormat(row, column) {
-      return this.selectDictLabel(this.tagTypeOptions, row.tagType)
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        tagName: undefined,
-        tagType: undefined,
-        createUser: undefined,
-        createTime: undefined,
-        lastUpdateUser: undefined,
-        lastUpdateTime: undefined
-      }
-      this.resetForm('form')
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm('queryForm')
-      this.handleQuery()
-    },
-    /** 新增按钮操作 */
-    handleAdd(row) {
-      this.reset()
-      this.open = true
-      this.title = '添加标签'
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.tagId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset()
-      getTag(row.tagId || this.ids).then(response => {
-        this.form = response.data
-        this.open = true
-        this.title = '修改标签'
-      })
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          this.loadingChange = true
-          if (this.form.tagId !== undefined) {
-            updateTag(this.form).then(response => {
-              this.loadingChange = false
-              if (response.respCode === '0000') {
-                this.msgSuccess('修改成功')
-                this.open = false
-                this.getList()
-              } else {
-                this.msgError(response.respMsg)
-              }
-            }).catch(() => {
-              this.loadingChange = false
-            })
-          } else {
-            addTag(this.form).then(response => {
-              this.loadingChange = false
-              if (response.respCode === '0000') {
-                this.msgSuccess('新增成功')
-                this.open = false
-                this.getList()
-              } else {
-                this.msgError(response.respMsg)
-              }
-            }).catch(() => {
-              this.loadingChange = false
-            })
-          }
-        }
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const id = row.tagId || this.ids
-      this.$confirm('是否确认删除?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        return delTag(id)
-      }).then((response) => {
-        if (response.respCode === '0000') {
-          this.getList()
-          this.msgSuccess('删除成功')
-        } else {
-          this.msgError(response.respMsg)
-        }
-      }).catch(function() {})
-    }
-  }
-}
-</script>
diff --git a/src/views/school/system/dept/index.vue b/src/views/school/system/dept/index.vue
deleted file mode 100644
index c59f7ec..0000000
--- a/src/views/school/system/dept/index.vue
+++ /dev/null
@@ -1,347 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :inline="true">
-      <el-form-item label="部门名称:">
-        <el-input
-          v-model="queryParams.deptName"
-          placeholder="请输入部门名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态:">
-        <el-select v-model="queryParams.inUse" placeholder="部门状态" clearable size="small">
-          <el-option
-            v-for="dict in inUseOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button
-          class="filter-item"
-          type="primary"
-          icon="el-icon-search"
-          size="mini"
-          @click="handleQuery"
-        >搜索</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['system:dept:add']"
-          class="filter-item"
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button>
-      </el-col>
-    </el-row>
-
-    <el-table
-      v-loading="loading"
-      :data="deptList"
-      row-key="deptId"
-      default-expand-all
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-    >
-      <el-table-column prop="deptName" label="部门/校区名称" width="200">
-        <template slot-scope="scope">
-          <el-tag :type="scope.row.deptType === '1'?'info':'' ">{{ scope.row.deptType === '1'?'部门':'校区' }}</el-tag>
-          <span>{{ scope.row.deptName }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="sort" label="排序" width="200" />
-      <el-table-column prop="inUse" label="状态" :formatter="inUseFormat" width="100" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="200">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            v-hasPermi="['system:dept:update']"
-            size="mini"
-            type="text"
-            icon="el-icon-edit-outline"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            v-hasPermi="['system:dept:add']"
-            size="mini"
-            type="text"
-            icon="el-icon-plus"
-            @click="handleAdd(scope.row)"
-          >新增</el-button>
-          <el-button
-            v-if="scope.row.parentId !== -1"
-            v-hasPermi="['system:dept:delete']"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 添加或修改部门对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px">
-      <el-form ref="form" :model="form" :rules="rules" label-width="100px">
-        <el-row>
-          <el-col v-if="form.parentId !== 0" :span="24">
-            <el-form-item label="上级部门:" prop="parentId">
-              <treeselect v-model="form.parentId" :options="deptOptions" placeholder="选择上级部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="部门名称:" prop="deptName">
-              <el-input v-model="form.deptName" placeholder="请输入部门名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="部门类型:">
-              <el-radio-group v-model="form.deptType">
-                <el-radio
-                  v-for="dict in deptTypeOptions"
-                  :key="dict.deptType"
-                  :label="dict.deptType"
-                >{{ dict.deptTypeName }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <!--<el-col :span="12">
-            <el-form-item label="显示排序" prop="sort">
-              <el-input-number v-model="form.sort" controls-position="right" :min="0" />
-            </el-form-item>
-          </el-col>-->
-          <el-col :span="12">
-            <el-form-item label="负责人:" prop="leader">
-              <el-input v-model="form.leader" placeholder="请输入负责人" maxlength="20" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="联系电话:" prop="phone">
-              <el-input v-model="form.phone" placeholder="请输入联系电话" maxlength="11" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="邮箱:" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="部门状态:">
-              <el-radio-group v-model="form.inUse">
-                <el-radio
-                  v-for="dict in inUseOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictValue"
-                >{{ dict.dictLabel }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listDept, getDept, treeSelect, delDept, addDept, updateDept } from '@/api/school/system/dept'
-import Treeselect from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-
-export default {
-  name: 'Dept',
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 表格树数据
-      deptList: [],
-      // 部门部门树选项
-      deptOptions: undefined,
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
-      // 状态数据字典
-      inUseOptions: [],
-      // 类型
-      deptTypeOptions: [{
-        deptType: '1',
-        deptTypeName: '部门'
-      }, {
-        deptType: '2',
-        deptTypeName: '校区'
-      }],
-      // 查询参数
-      queryParams: {
-        deptName: undefined,
-        inUse: undefined
-      },
-      // 表单参数
-      form: {
-        deptType: '1'
-      },
-      // 表单校验
-      rules: {
-        parentId: [
-          { required: true, message: '上级部门不能为空', trigger: 'blur' }
-        ],
-        deptName: [
-          { required: true, message: '部门名称不能为空', trigger: 'blur' }
-        ],
-        deptType: [
-          { required: true, message: '请选择部门类型', trigger: 'blur' }
-        ],
-        email: [
-          {
-            type: 'email',
-            message: "'请输入正确的邮箱地址",
-            trigger: ['blur', 'change']
-          }
-        ],
-        phone: [
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: '请输入正确的手机号码',
-            trigger: 'blur'
-          }
-        ]
-      }
-    }
-  },
-  created() {
-    this.getList()
-    this.getDictListByDictType('in_use').then(response => {
-      this.inUseOptions = response.data
-    })
-  },
-  methods: {
-    /** 查询部门列表 */
-    getList() {
-      this.loading = true
-      listDept(this.queryParams).then(response => {
-        this.deptList = response.data
-        this.loading = false
-      })
-    },
-    /** 查询部门下拉树结构 */
-    getTreeSelect() {
-      treeSelect().then(response => {
-        this.deptOptions = []
-        const dept = { id: -1, label: '根目录', children: [] }
-        dept.children = response.data
-        this.deptOptions.push(dept)
-      })
-    },
-    // 字典状态字典翻译
-    inUseFormat(row, column) {
-      return this.selectDictLabel(this.inUseOptions, row.inUse)
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        deptId: undefined,
-        parentId: undefined,
-        deptName: undefined,
-        sort: undefined,
-        leader: undefined,
-        phone: undefined,
-        email: undefined,
-        deptType: '1',
-        inUse: '1'
-      }
-      this.resetForm('form')
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.getList()
-    },
-    /** 新增按钮操作 */
-    handleAdd(row) {
-      this.reset()
-      this.getTreeSelect()
-      if (row !== undefined) {
-        this.form.parentId = row.deptId
-      }
-      this.open = true
-      this.title = '添加部门'
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset()
-      this.getTreeSelect()
-      getDept(row.deptId).then(response => {
-        this.form = response.data
-        this.open = true
-        this.title = '修改部门'
-      })
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          if (this.form.deptId !== undefined) {
-            updateDept(this.form).then(response => {
-              if (response.respCode === '0000') {
-                this.msgSuccess('修改成功')
-                this.open = false
-                this.getList()
-              } else {
-                this.msgError(response.respMsg)
-              }
-            })
-          } else {
-            addDept(this.form).then(response => {
-              if (response.respCode === '0000') {
-                this.msgSuccess('新增成功')
-                this.open = false
-                this.getList()
-              } else {
-                this.msgError(response.respMsg)
-              }
-            })
-          }
-        }
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      this.$confirm('是否确认删除名称为"' + row.deptName + '"的数据项?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        return delDept(row.deptId)
-      }).then((response) => {
-        if (response.respCode === '0000') {
-          this.getList()
-          this.msgSuccess('删除成功')
-        } else {
-          this.msgError(response.respMsg)
-        }
-      }).catch(function() {})
-    }
-  }
-}
-</script>
diff --git a/src/views/school/system/dict/data.vue b/src/views/school/system/dict/data.vue
deleted file mode 100644
index ad6efef..0000000
--- a/src/views/school/system/dict/data.vue
+++ /dev/null
@@ -1,358 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form ref="queryForm" :model="queryParams" :inline="true">
-      <el-form-item label="字典名称" prop="dictType">
-        <el-select v-model="queryParams.dictType" size="small">
-          <el-option
-            v-for="item in typeOptions"
-            :key="item.dictTypeId"
-            :label="item.dictName"
-            :value="item.dictType"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="字典标签" prop="dictLabel">
-        <el-input
-          v-model="queryParams.dictLabel"
-          placeholder="请输入字典标签"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="inUse">
-        <el-select v-model="queryParams.inUse" placeholder="数据状态" clearable size="small">
-          <el-option
-            v-for="dict in inUseOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['system:dict:add']"
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['system:dict:edit']"
-          type="primary"
-          icon="el-icon-edit-outline"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['system:dict:remove']"
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button>
-      </el-col>
-    </el-row>
-
-    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="字典标签" align="center" prop="dictLabel" />
-      <el-table-column label="字典键值" align="center" prop="dictValue" />
-      <el-table-column label="字典排序" align="center" prop="dictSort" />
-      <el-table-column label="状态" align="center" prop="inUse" :formatter="inUseFormat" />
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            v-hasPermi="['system:dict:update']"
-            size="mini"
-            type="text"
-            icon="el-icon-edit-outline"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            v-hasPermi="['system:dict:delete']"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="字典类型">
-          <el-input v-model="form.dictType" :disabled="true" />
-        </el-form-item>
-        <el-form-item label="数据标签" prop="dictLabel">
-          <el-input v-model="form.dictLabel" placeholder="请输入数据标签" />
-        </el-form-item>
-        <el-form-item label="数据键值" prop="dictValue">
-          <el-input v-model="form.dictValue" placeholder="请输入数据键值" />
-        </el-form-item>
-        <el-form-item label="显示排序" prop="dictSort">
-          <el-input-number v-model="form.dictSort" controls-position="right" :min="0" />
-        </el-form-item>
-        <el-form-item label="状态" prop="inUse">
-          <el-radio-group v-model="form.inUse">
-            <el-radio
-              v-for="dict in inUseOptions"
-              :key="dict.dictValue"
-              :label="dict.dictValue"
-            >{{ dict.dictLabel }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listData, getData, delData, addData, updateData, exportData } from '@/api/school/system/dict/data'
-import { listType, getType } from '@/api/school/system/dict/type'
-
-export default {
-  name: 'Data',
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 总条数
-      total: 0,
-      // 字典表格数据
-      dataList: [],
-      // 默认字典类型
-      defaultDictType: '',
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
-      // 状态数据字典
-      inUseOptions: [],
-      // 类型数据字典
-      typeOptions: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        dictName: undefined,
-        dictType: undefined,
-        inUse: undefined
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        dictLabel: [
-          { required: true, message: '数据标签不能为空', trigger: 'blur' }
-        ],
-        dictValue: [
-          { required: true, message: '数据键值不能为空', trigger: 'blur' }
-        ],
-        dictSort: [
-          { required: true, message: '数据顺序不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  created() {
-    const dictTypeId = this.$route.params && this.$route.params.dictTypeId
-    if (dictTypeId !== undefined) {
-      this.getType(dictTypeId)
-    } else {
-      this.getList()
-    }
-    this.getTypeList()
-    this.getDictListByDictType('in_use').then(response => {
-      this.inUseOptions = response.data
-    })
-  },
-  methods: {
-    /** 查询字典类型详细 */
-    getType(dictTypeId) {
-      getType(dictTypeId).then(response => {
-        this.queryParams.dictType = response.data.dictType
-        this.defaultDictType = response.data.dictType
-        this.getList()
-      })
-    },
-    /** 查询字典类型列表 */
-    getTypeList() {
-      const dictTypeId = this.$route.params && this.$route.params.dictTypeId
-      listType().then(response => {
-        this.typeOptions = response.data.rows
-        if (dictTypeId === undefined) {
-          if (this.typeOptions.length > 0) {
-            this.queryParams.dictType = this.typeOptions[0].dictType
-            this.defaultDictType = this.typeOptions[0].dictType
-          } else {
-            this.msgInfo('请先设置字典类型,再设置字典数据')
-          }
-        }
-      })
-    },
-    /** 查询字典数据列表 */
-    getList() {
-      this.loading = true
-      listData(this.queryParams).then(response => {
-        this.dataList = response.data.rows
-        this.total = response.data.total
-        this.loading = false
-      })
-    },
-    // 数据状态字典翻译
-    inUseFormat(row, column) {
-      return this.selectDictLabel(this.inUseOptions, row.inUse)
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        dictDataId: undefined,
-        dictLabel: undefined,
-        dictValue: undefined,
-        dictSort: 0,
-        inUse: '1',
-        remark: undefined
-      }
-      this.resetForm('form')
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm('queryForm')
-      this.queryParams.dictType = this.defaultDictType
-      this.handleQuery()
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset()
-      this.open = true
-      this.title = '添加字典数据'
-      this.form.dictType = this.queryParams.dictType
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.dictDataId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset()
-      const dictDataId = row.dictDataId || this.ids
-      getData(dictDataId).then(response => {
-        this.form = response.data
-        this.open = true
-        this.title = '修改字典数据'
-      })
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          if (this.form.dictDataId !== undefined) {
-            updateData(this.form).then(response => {
-              if (response.respCode === '0000') {
-                this.msgSuccess('修改成功')
-                this.open = false
-                this.getList()
-              } else {
-                this.msgError(response.respMsg)
-              }
-            })
-          } else {
-            addData(this.form).then(response => {
-              if (response.respCode === '0000') {
-                this.msgSuccess('新增成功')
-                this.open = false
-                this.getList()
-              } else {
-                this.msgError(response.respMsg)
-              }
-            })
-          }
-        }
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const dictDataIds = row.dictDataId || this.ids
-      this.$confirm('是否确认删除?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        return delData(dictDataIds)
-      }).then(() => {
-        this.getList()
-        this.msgSuccess('删除成功')
-      }).catch(function() {})
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams
-      this.$confirm('是否确认导出所有数据项?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        return exportData(queryParams)
-      }).then(response => {
-        this.download(response.respMsg)
-      }).catch(function() {})
-    }
-  }
-}
-</script>
diff --git a/src/views/school/system/dict/type.vue b/src/views/school/system/dict/type.vue
deleted file mode 100644
index b84868c..0000000
--- a/src/views/school/system/dict/type.vue
+++ /dev/null
@@ -1,349 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
-      <el-form-item label="字典名称" prop="dictName">
-        <el-input
-          v-model="queryParams.dictName"
-          placeholder="请输入字典名称"
-          clearable
-          size="small"
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="字典类型" prop="dictType">
-        <el-input
-          v-model="queryParams.dictType"
-          placeholder="请输入字典类型"
-          clearable
-          size="small"
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="inUse">
-        <el-select
-          v-model="queryParams.inUse"
-          placeholder="字典状态"
-          clearable
-          size="small"
-          style="width: 240px"
-        >
-          <el-option
-            v-for="dict in inUseOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="创建时间">
-        <el-date-picker
-          v-model="dateRange"
-          size="small"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['system:dict:add']"
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['system:dict:update']"
-          type="primary"
-          icon="el-icon-edit-outline"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['system:dict:delete']"
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['system:dict:export']"
-          type="primary"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button>
-      </el-col>
-    </el-row>
-
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
-      <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-          <router-link :to="'/system/dict/data/' + scope.row.dictTypeId" class="link-type">
-            <span>{{ scope.row.dictType }}</span>
-          </router-link>
-        </template>
-      </el-table-column>
-      <el-table-column label="状态" align="center" prop="inUse" :formatter="inUseFormat" />
-      <el-table-column label="备注" align="center" prop="remark" :show-overflow-tooltip="true" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            v-hasPermi="['system:dict:update']"
-            size="mini"
-            type="text"
-            icon="el-icon-edit-outline"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            v-hasPermi="['system:dict:delete']"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <!-- 添加或修改参数配置对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-form-item label="字典名称" prop="dictName">
-          <el-input v-model="form.dictName" placeholder="请输入字典名称" />
-        </el-form-item>
-        <el-form-item label="字典类型" prop="dictType">
-          <el-input v-model="form.dictType" placeholder="请输入字典类型" />
-        </el-form-item>
-        <el-form-item label="状态" prop="inUse">
-          <el-radio-group v-model="form.inUse">
-            <el-radio
-              v-for="dict in inUseOptions"
-              :key="dict.dictValue"
-              :label="dict.dictValue"
-            >{{ dict.dictLabel }}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="备注" prop="remark">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listType, getType, delType, addType, updateType, exportType } from '@/api/school/system/dict/type'
-
-export default {
-  name: 'Dict',
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 总条数
-      total: 0,
-      // 字典表格数据
-      typeList: [],
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
-      // 状态数据字典
-      inUseOptions: [],
-      // 日期范围
-      dateRange: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        dictName: undefined,
-        dictType: undefined,
-        inUse: undefined
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        dictName: [
-          { required: true, message: '字典名称不能为空', trigger: 'blur' }
-        ],
-        dictType: [
-          { required: true, message: '字典类型不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  created() {
-    this.getList()
-    this.getDictListByDictType('in_use').then(response => {
-      this.inUseOptions = response.data
-    })
-  },
-  methods: {
-    /** 查询字典类型列表 */
-    getList() {
-      this.loading = true
-      listType(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-        this.typeList = response.data.rows
-        this.total = response.data.total
-        this.loading = false
-      }
-      )
-    },
-    // 字典状态字典翻译
-    inUseFormat(row, column) {
-      return this.selectDictLabel(this.inUseOptions, row.inUse)
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        dictTypeId: undefined,
-        dictName: undefined,
-        dictType: undefined,
-        inUse: '1',
-        remark: undefined
-      }
-      this.resetForm('form')
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = []
-      this.resetForm('queryForm')
-      this.handleQuery()
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.reset()
-      this.open = true
-      this.title = '添加字典类型'
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.dictTypeId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset()
-      const dictTypeId = row.dictTypeId || this.ids
-      getType(dictTypeId).then(response => {
-        this.form = response.data
-        this.open = true
-        this.title = '修改字典类型'
-      })
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          if (this.form.dictTypeId !== undefined) {
-            updateType(this.form).then(response => {
-              if (response.respCode === '0000') {
-                this.msgSuccess('修改成功')
-                this.open = false
-                this.getList()
-              } else {
-                this.msgError(response.respMsg)
-              }
-            })
-          } else {
-            addType(this.form).then(response => {
-              if (response.respCode === '0000') {
-                this.msgSuccess('新增成功')
-                this.open = false
-                this.getList()
-              } else {
-                this.msgError(response.respMsg)
-              }
-            })
-          }
-        }
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const dictTypeIds = row.dictTypeId || this.ids
-      this.$confirm('是否确认删除?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        return delType(dictTypeIds)
-      }).then(() => {
-        this.getList()
-        this.msgSuccess('删除成功')
-      }).catch(function() {})
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams
-      this.$confirm('是否确认导出所有类型数据项?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        return exportType(queryParams)
-      }).then(response => {
-        this.download(response.respMsg)
-      }).catch(function() {})
-    }
-  }
-}
-</script>
diff --git a/src/views/school/system/menu/index.vue b/src/views/school/system/menu/index.vue
deleted file mode 100644
index a145bbb..0000000
--- a/src/views/school/system/menu/index.vue
+++ /dev/null
@@ -1,359 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form :inline="true">
-      <el-form-item label="菜单名称">
-        <el-input
-          v-model="queryParams.menuName"
-          placeholder="请输入菜单名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态">
-        <el-select v-model="queryParams.visible" placeholder="菜单状态" clearable size="small">
-          <el-option
-            v-for="dict in visibleOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button v-hasPermi="['system:menu:add']" type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">
-          新增
-        </el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-table
-      v-loading="loading"
-      :data="menuList"
-      row-key="menuId"
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-    >
-      <el-table-column prop="menuName" label="菜单名称" :show-overflow-tooltip="true" width="130px" />
-      <el-table-column prop="icon" label="图标" align="center" width="100px">
-        <template slot-scope="scope">
-          <svg-icon :icon-class="scope.row.icon" />
-        </template>
-      </el-table-column>
-      <el-table-column prop="sort" label="排序" width="60px" />
-      <el-table-column prop="permissionMeta" label="权限标识" width="130px" :show-overflow-tooltip="true" />
-      <el-table-column prop="component" label="组件路径" width="180px" :show-overflow-tooltip="true" />
-      <el-table-column prop="isShow" label="可见" :formatter="visibleFormat" width="80px" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column fixed="right" label="操作" align="center" width="180" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            v-hasPermi="['system:menu:update']"
-            size="mini"
-            type="text"
-            icon="el-icon-edit-outline"
-            @click="handleUpdate(scope.row)"
-          >修改
-          </el-button>
-          <el-button
-            v-hasPermi="['system:menu:add']"
-            size="mini"
-            type="text"
-            icon="el-icon-plus"
-            @click="handleAdd(scope.row)"
-          >新增
-          </el-button>
-          <el-button
-            v-hasPermi="['system:menu:delete']"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除
-          </el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 添加或修改菜单对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="上级菜单">
-              <treeselect
-                v-model="form.parentId"
-                :options="menuOptions"
-                :show-count="true"
-                placeholder="选择上级菜单"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="菜单类型" prop="menuType">
-              <el-radio-group v-model="form.menuType">
-                <el-radio label="dir">目录</el-radio>
-                <el-radio label="menu">菜单</el-radio>
-                <el-radio label="button">按钮</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item v-if="form.menuType !== 'button'" label="菜单图标">
-              <el-popover
-                placement="bottom-start"
-                width="460"
-                trigger="click"
-                @show="$refs['iconSelect'].reset()"
-              >
-                <IconSelect ref="iconSelect" @selected="selected" />
-                <el-input slot="reference" v-model="form.icon" placeholder="点击选择图标" readonly>
-                  <svg-icon
-                    v-if="form.icon"
-                    slot="prefix"
-                    :icon-class="form.icon"
-                    class="el-input__icon"
-                    style="height: 32px;width: 16px;"
-                  />
-                  <i v-else slot="prefix" class="el-icon-search el-input__icon" />
-                </el-input>
-              </el-popover>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="菜单名称" prop="menuName">
-              <el-input v-model="form.menuName" placeholder="请输入菜单名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="显示排序" prop="sort">
-              <el-input-number v-model="form.sort" controls-position="right" :min="0" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item v-if="form.menuType !== 'button'" label="是否外链">
-              <el-radio-group v-model="form.outUrl">
-                <el-radio label="1">是</el-radio>
-                <el-radio label="0">否</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item v-if="form.menuType !== 'button'" label="是否在用">
-              <el-radio-group v-model="form.enable">
-                <el-radio label="1">是</el-radio>
-                <el-radio label="0">否</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item v-if="form.menuType !== 'button'" label="路由地址" prop="routerPath">
-              <el-input v-model="form.routerPath" placeholder="路由地址 如 menu" />
-            </el-form-item>
-          </el-col>
-          <el-col v-if="form.menuType === 'menu'" :span="12">
-            <el-form-item label="组件路径" prop="component">
-              <el-input v-model="form.component" placeholder="组件路径 如 system/menu/index" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item v-if="form.menuType !== 'dir'" label="权限标识">
-              <el-input v-model="form.permissionMeta" placeholder="权限标识 如 system:menu:list" maxlength="50" />
-            </el-form-item>
-          </el-col>
-          <el-col v-if="form.menuType !== 'dir'" :span="12">
-            <el-form-item label="请求路径" prop="requestUrl">
-              <el-input v-model="form.requestUrl" placeholder="请输入请求路径" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item v-if="form.menuType !== 'F'" label="是否展示">
-              <el-radio-group v-model="form.isShow">
-                <el-radio
-                  v-for="dict in visibleOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictValue"
-                >{{ dict.dictLabel }}
-                </el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listMenu, getMenu, treeSelect, delMenu, addMenu, updateMenu } from '@/api/school/system/menu'
-import Treeselect from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import IconSelect from '@/components/IconSelect'
-
-export default {
-  name: 'Menu',
-  components: { Treeselect, IconSelect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 菜单表格树数据
-      menuList: [],
-      // 菜单树选项
-      menuOptions: [],
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
-      // 菜单状态数据字典
-      visibleOptions: [],
-      // 查询参数
-      queryParams: {
-        menuName: undefined,
-        visible: undefined
-      },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        menuName: [
-          { required: true, message: '菜单名称不能为空', trigger: 'blur' }
-        ],
-        sort: [
-          { required: true, message: '菜单顺序不能为空', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  created() {
-    this.getList()
-    this.getDictListByDictType('is_show').then(response => {
-      this.visibleOptions = response.data
-    })
-  },
-  methods: {
-    // 选择图标
-    selected(name) {
-      this.form.icon = name
-    },
-    /** 查询菜单列表 */
-    getList() {
-      this.loading = true
-      listMenu(this.queryParams).then(response => {
-        this.menuList = response.data
-        this.loading = false
-      })
-    },
-    /** 查询菜单下拉树结构 */
-    getTreeSelect() {
-      treeSelect().then(response => {
-        this.menuOptions = []
-        const menu = { id: -1, label: '根目录', children: [] }
-        menu.children = response.data
-        this.menuOptions.push(menu)
-      })
-    },
-    // 菜单显示状态字典翻译
-    visibleFormat(row, column) {
-      if (row.menuType === 'button') {
-        return ''
-      }
-      return this.selectDictLabel(this.visibleOptions, row.isShow)
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        menuId: undefined,
-        parentId: 0,
-        menuName: undefined,
-        icon: undefined,
-        menuType: 'menu',
-        orderNum: undefined,
-        outUrl: '0',
-        enable: '1',
-        isShow: '1'
-      }
-      this.resetForm('form')
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.getList()
-    },
-    /** 新增按钮操作 */
-    handleAdd(row) {
-      this.reset()
-      this.getTreeSelect()
-      if (row != null) {
-        this.form.parentId = row.menuId
-      }
-      this.open = true
-      this.title = '添加菜单'
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset()
-      this.getTreeSelect()
-      getMenu(row.menuId).then(response => {
-        this.form = response.data
-        this.open = true
-        this.title = '修改菜单'
-      })
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          if (this.form.menuId !== undefined) {
-            updateMenu(this.form).then(response => {
-              if (response.respCode === '0000') {
-                this.msgSuccess('修改成功')
-                this.open = false
-                this.getList()
-              } else {
-                this.msgError(response.respMsg)
-              }
-            })
-          } else {
-            addMenu(this.form).then(response => {
-              if (response.respCode === '0000') {
-                this.msgSuccess('新增成功')
-                this.open = false
-                this.getList()
-              } else {
-                this.msgError(response.respMsg)
-              }
-            })
-          }
-        }
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      this.$confirm('是否确认删除名称为"' + row.menuName + '"的菜单?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        return delMenu(row.menuId)
-      }).then(() => {
-        this.getList()
-        this.msgSuccess('删除成功')
-      }).catch(function() {
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/school/system/role/index.vue b/src/views/school/system/role/index.vue
deleted file mode 100644
index 1ace4f5..0000000
--- a/src/views/school/system/role/index.vue
+++ /dev/null
@@ -1,354 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
-      <el-form-item label="角色名称" prop="roleName">
-        <el-input
-          v-model="queryParams.roleName"
-          placeholder="请输入角色名称"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="inUse">
-        <el-select v-model="queryParams.inUse" placeholder="请选择状态" clearable size="small">
-          <el-option
-            v-for="dict in inUseOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['system:role:add']"
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >新增</el-button>
-      </el-col>
-    </el-row>
-
-    <el-table
-      v-loading="loading"
-      :data="role"
-      row-key="roleId"
-      default-expand-all
-      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
-    >
-      <el-table-column prop="roleName" label="角色名称" />
-      <el-table-column prop="roleCode" label="角色编码" />
-      <el-table-column prop="sort" label="显示顺序" />
-      <el-table-column align="center" prop="inUse" label="状态" :formatter="inUseFormat" />
-      <el-table-column label="创建时间" align="center" prop="createTime" width="200">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            v-hasPermi="['system:role:update']"
-            size="mini"
-            type="text"
-            icon="el-icon-edit-outline"
-            @click="handleUpdate(scope.row)"
-          >修改</el-button>
-          <el-button
-            v-hasPermi="['system:role:add']"
-            size="mini"
-            type="text"
-            icon="el-icon-plus"
-            @click="handleAdd(scope.row)"
-          >新增</el-button>
-          <el-button
-            v-if="scope.row.parentId !== -1"
-            v-hasPermi="['system:role:delete']"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 添加或修改对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="上级角色" prop="parentId">
-              <treeselect v-model="form.parentId" :options="parentOptions" placeholder="选择上级角色" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="角色编码" prop="roleCode">
-              <el-input v-model="form.roleCode" placeholder="请输入角色编码" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="角色名称" prop="roleName">
-              <el-input v-model="form.roleName" placeholder="请输入角色名称" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="显示顺序" prop="sort">
-              <el-input-number v-model="form.sort" controls-position="right" :min="0" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="状态">
-              <el-radio-group v-model="form.inUse">
-                <el-radio
-                  v-for="dict in inUseOptions"
-                  :key="dict.dictValue"
-                  :label="dict.dictValue"
-                >{{ dict.dictLabel }}</el-radio>
-              </el-radio-group>
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="菜单权限">
-              <el-tree
-                ref="menu"
-                :data="menuOptions"
-                show-checkbox
-                node-key="id"
-                empty-text="加载中，请稍后"
-                :props="defaultProps"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listRole, getRole, treeSelect, delRole, addRole, updateRole } from '@/api/school/system/role'
-import { treeSelectIncludeHide, roleMenuTreeIdList } from '@/api/school/system/menu'
-import Treeselect from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-
-export default {
-  name: 'Role',
-  components: { Treeselect },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 表格树数据
-      role: [],
-      // 树选项
-      parentOptions: undefined,
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
-      // 状态数据字典
-      inUseOptions: [],
-      // 查询参数
-      queryParams: {
-        roleName: undefined,
-        inUse: undefined
-      },
-      // 角色菜单
-      menuOptions: [],
-      // 表单参数
-      form: {},
-      defaultProps: {
-        children: 'children',
-        label: 'label'
-      },
-      // 表单校验
-      rules: {
-        parentId: [
-          { required: true, message: '上级不能为空', trigger: 'blur' }
-        ],
-        roleCode: [
-          { required: true, message: '请输入角色编码', trigger: 'blur' }
-        ],
-        roleName: [
-          { required: true, message: '请输入角色名称', trigger: 'blur' }
-        ],
-        sort: [
-          { required: true, message: '请输入顺序', trigger: 'blur' }
-        ],
-        inUse: [
-          { required: true, message: '请选择是否在用', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  created() {
-    this.getList()
-    this.getDictListByDictType('in_use').then(response => {
-      this.inUseOptions = response.data
-    })
-  },
-  methods: {
-    /** 查询列表 */
-    getList() {
-      this.loading = true
-      listRole(this.queryParams).then(response => {
-        this.role = response.data
-        this.loading = false
-      })
-    },
-    /** 查询下拉树结构 */
-    getTreeSelect() {
-      treeSelect().then(response => {
-        this.parentOptions = []
-        const role = { id: -1, label: '根目录', children: [] }
-        role.children = response.data
-        this.parentOptions.push(role)
-      })
-    },
-    /** 查询菜单树结构 */
-    getMenuTreeSelect() {
-      treeSelectIncludeHide().then(response => {
-        this.menuOptions = response.data
-        this.$refs.menu.setCheckedKeys([])
-      })
-    },
-    /** 根据角色ID查询菜单树结构 */
-    getRoleMenuTreeSelect(roleId) {
-      treeSelectIncludeHide().then(response => {
-        this.menuOptions = response.data
-        roleMenuTreeIdList(roleId).then(roleMenuTreeIdResponse => {
-          this.$refs.menu.setCheckedKeys(roleMenuTreeIdResponse.data)
-        })
-      })
-    },
-    // 所有菜单节点数据
-    getMenuAllCheckedKeys() {
-      // 半选中的菜单节点
-      const halfCheckedKeys = this.$refs.menu.getHalfCheckedKeys()
-      // 目前被选中的菜单节点
-      const checkedKeys = this.$refs.menu.getCheckedKeys()
-      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys)
-      return checkedKeys
-    },
-    // 状态字典翻译
-    inUseFormat(row, column) {
-      return this.selectDictLabel(this.inUseOptions, row.inUse)
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        roleCode: undefined,
-        roleName: undefined,
-        sort: undefined,
-        inUse: '1',
-        deleteFlag: undefined,
-        createUser: undefined,
-        createTime: undefined,
-        lastUpdateUser: undefined,
-        lastUpdateTime: undefined,
-        parentId: -1
-      }
-      this.resetForm('form')
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm('queryForm')
-      this.handleQuery()
-    },
-    /** 新增按钮操作 */
-    handleAdd(row) {
-      this.reset()
-      this.getTreeSelect()
-      this.getMenuTreeSelect()
-      if (row !== undefined) {
-        this.form.parentId = row.roleId
-      }
-      this.open = true
-      this.title = '添加'
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset()
-      this.getTreeSelect()
-      this.$nextTick(() => {
-        this.getRoleMenuTreeSelect(row.roleId)
-      })
-      getRole(row.roleId).then(response => {
-        this.form = response.data
-        this.open = true
-        this.title = '修改'
-      })
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          if (this.form.roleId !== undefined) {
-            this.form.menuIds = this.getMenuAllCheckedKeys()
-            updateRole(this.form).then(response => {
-              if (response.respCode === '0000') {
-                this.msgSuccess('修改成功')
-                this.open = false
-                this.getList()
-              } else {
-                this.msgError(response.respMsg)
-              }
-            })
-          } else {
-            this.form.menuIds = this.getMenuAllCheckedKeys()
-            addRole(this.form).then(response => {
-              if (response.respCode === '0000') {
-                this.msgSuccess('新增成功')
-                this.open = false
-                this.getList()
-              } else {
-                this.msgError(response.respMsg)
-              }
-            })
-          }
-        }
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      this.$confirm('是否确认删除?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        return delRole(row.roleId)
-      }).then((response) => {
-        if (response.respCode === '0000') {
-          this.getList()
-          this.msgSuccess('删除成功')
-        } else {
-          this.msgError(response.respMsg)
-        }
-      }).catch(function() {})
-    }
-  }
-}
-</script>
diff --git a/src/views/school/system/staff/index.vue b/src/views/school/system/staff/index.vue
deleted file mode 100644
index f465713..0000000
--- a/src/views/school/system/staff/index.vue
+++ /dev/null
@@ -1,330 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-row :gutter="20">
-      <!--部门数据-->
-      <el-col :span="4" :xs="24">
-        <div class="head-container">
-          <el-input
-            v-model="deptName"
-            placeholder="请输入部门名称"
-            clearable
-            size="small"
-            prefix-icon="el-icon-search"
-            style="margin-bottom: 20px"
-          />
-        </div>
-        <div class="head-container">
-          <el-tree
-            ref="tree"
-            :data="deptOptions"
-            :props="defaultProps"
-            :expand-on-click-node="false"
-            :filter-node-method="filterNode"
-            default-expand-all
-            @node-click="handleNodeClick"
-          />
-        </div>
-      </el-col>
-      <!--员工数据-->
-      <el-col :span="20" :xs="24">
-        <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px" class="align-left">
-          <el-form-item label="员工姓名" prop="staffName">
-            <el-input
-              v-model="queryParams.staffName"
-              placeholder="请输入员工姓名"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="任课教师" prop="teacher">
-            <el-select v-model="queryParams.teacher" placeholder="是否为任课教师" clearable size="small">
-              <el-option label="是" value="1" />
-              <el-option label="否" value="0" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="人事状态" prop="personnelStatus">
-            <el-select v-model="queryParams.personnelStatus" placeholder="人事状态" clearable size="small">
-              <el-option
-                v-for="dict in personnelStatusOptions"
-                :key="dict.dictValue"
-                :label="dict.dictLabel"
-                :value="dict.dictValue"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="性别" prop="sex">
-            <el-select v-model="queryParams.sex" placeholder="请选择性别" clearable size="small">
-              <el-option
-                v-for="dict in sexOptions"
-                :key="dict.dictValue"
-                :label="dict.dictLabel"
-                :value="dict.dictValue"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button
-              v-hasPermi="['system:staff:add']"
-              type="primary"
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd"
-            >新增
-            </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              v-hasPermi="['system:staff:update']"
-              type="primary"
-              icon="el-icon-edit-outline"
-              size="mini"
-              :disabled="single"
-              @click="handleUpdate"
-            >修改
-            </el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button
-              v-hasPermi="['system:staff:delete']"
-              type="danger"
-              icon="el-icon-delete"
-              :disabled="multiple"
-              size="mini"
-              @click="handleDelete"
-            >删除</el-button>
-          </el-col>
-        </el-row>
-
-        <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" align="center" />
-          <el-table-column align="center" width="110" prop="staffName" label="员工姓名" fixed="left" />
-          <el-table-column align="center" prop="phone" label="联系电话" :show-overflow-tooltip="true" />
-          <el-table-column align="center" prop="sex" label="性别" :formatter="sexFormat" />
-          <el-table-column align="center" prop="personnelStatusName" label="人事状态" />
-          <el-table-column label="入职日期" align="center" prop="entryDate" width="110">
-            <template slot-scope="scope">
-              <span>{{ parseTime(scope.row.entryDate, '{y}-{m}-{d}') }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="deptName" label="所属部门" :show-overflow-tooltip="true" />
-          <el-table-column align="center" prop="teacher" label="任课教师">
-            <template slot-scope="scope">
-              <el-tag v-if="scope.row.teacher">是</el-tag>
-              <el-tag v-else type="info">否</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="locked" label="登录系统">
-            <template slot-scope="scope">
-              <el-tag v-if="scope.row.locked === '0'">允许</el-tag>
-              <el-tag v-else-if="scope.row.locked === '1'" type="danger">不允许</el-tag>
-              <el-tag v-else type="info">无账号</el-tag>
-            </template>
-          </el-table-column>
-          <el-table-column align="center" prop="username" label="用户名" :show-overflow-tooltip="true">
-            <template slot-scope="scope">
-              <span v-if="scope.row.username">{{ scope.row.username }}</span>
-              <span v-else>-</span>
-            </template>
-          </el-table-column>
-          <el-table-column width="150" label="操作" align="center" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
-              <el-button
-                v-hasPermi="['system:staff:update']"
-                size="mini"
-                type="text"
-                icon="el-icon-edit-outline"
-                @click="handleUpdate(scope.row)"
-              >修改
-              </el-button>
-              <el-button
-                v-hasPermi="['system:staff:delete']"
-                size="mini"
-                type="text"
-                icon="el-icon-delete"
-                @click="handleDelete(scope.row)"
-              >删除</el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-
-        <pagination
-          v-show="total>0"
-          :total="total"
-          :page.sync="queryParams.pageNum"
-          :limit.sync="queryParams.pageSize"
-          @pagination="getList"
-        />
-      </el-col>
-    </el-row>
-    <change-staff ref="changeStaff" @ok="getList" />
-  </div>
-</template>
-
-<script>
-import { listStaff, getStaff, delStaff } from '@/api/school/system/staff'
-import { treeSelect } from '@/api/school/system/dept'
-import changeStaff from '@/components/system/staff/changeStaff'
-export default {
-  components: {
-    changeStaff
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 总条数
-      total: 0,
-      // 表格树数据
-      dataList: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        teacherName: undefined,
-        sex: undefined,
-        deptId: undefined
-      },
-      // 性别 M男 F女数据字典
-      sexOptions: [],
-      // 人事状态
-      personnelStatusOptions: [],
-      // 部门名称
-      deptName: undefined,
-      deptOptions: [],
-      defaultProps: {
-        children: 'children',
-        label: 'label'
-      }
-    }
-  },
-  watch: {
-    // 根据名称筛选部门树
-    deptName(val) {
-      this.$refs.tree.filter(val)
-    }
-  },
-  created() {
-    this.getList()
-    this.getDeptTreeSelect()
-    this.getDictListByDictType('sex').then(response => {
-      this.sexOptions = response.data
-    })
-    this.getDictListByDictType('personnel_status').then(response => {
-      this.personnelStatusOptions = response.data
-    })
-  },
-  methods: {
-    /** 查询部门列表 */
-    getList() {
-      this.loading = true
-      listStaff(this.queryParams).then(response => {
-        this.dataList = response.data.rows
-        this.total = response.data.total
-        this.loading = false
-      })
-    },
-    /** 查询部门下拉树结构 */
-    getDeptTreeSelect() {
-      treeSelect().then(response => {
-        this.deptOptions = response.data
-      })
-    },
-    // 性别 M男 F女字典翻译
-    sexFormat(row, column) {
-      return this.selectDictLabel(this.sexOptions, row.sex)
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm('queryForm')
-      this.queryParams.deptId = undefined
-      this.handleQuery()
-    },
-    /** 新增按钮操作 */
-    handleAdd(row) {
-      this.$refs.changeStaff.reset()
-      this.$refs.changeStaff.title = '添加员工信息'
-      this.$refs.changeStaff.getRoleTreeSelect()
-      this.$refs.changeStaff.open = true
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.staffId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      getStaff(row.staffId || this.ids).then(response => {
-        this.$refs.changeStaff.reset()
-        const staffInfo = response.data.staffInfo
-        const checkRoleIds = response.data.roleTreeIdList
-        const userInfo = response.data.userInfo
-        if (userInfo !== undefined) {
-          staffInfo.loginUser = true
-          staffInfo.username = userInfo.username
-          staffInfo.locked = userInfo.locked
-        } else {
-          staffInfo.loginUser = false
-          staffInfo.locked = '0'
-        }
-        staffInfo.belongCampus = response.data.belongCampus
-        staffInfo.partCampus = response.data.partCampus
-
-        this.$refs.changeStaff.form = staffInfo
-        this.$refs.changeStaff.checkRoleIds = checkRoleIds
-        this.$refs.changeStaff.title = '修改员工信息'
-        this.$refs.changeStaff.getRoleTreeSelect()
-        this.$refs.changeStaff.open = true
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const id = row.staffId || this.ids
-      this.$confirm('是否确认删除?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        return delStaff(id)
-      }).then((response) => {
-        if (response.respCode === '0000') {
-          this.getList()
-          this.msgSuccess('删除成功')
-        } else {
-          this.msgError(response.respMsg)
-        }
-      }).catch(function() {
-      })
-    },
-    // 筛选节点
-    filterNode(value, data) {
-      if (!value) return true
-      return data.label.indexOf(value) !== -1
-    },
-    // 节点单击事件
-    handleNodeClick(data) {
-      this.queryParams.deptId = data.id
-      this.getList()
-    }
-  }
-}
-</script>
diff --git a/src/views/school/system/tenant/index.vue b/src/views/school/system/tenant/index.vue
deleted file mode 100644
index eca0b95..0000000
--- a/src/views/school/system/tenant/index.vue
+++ /dev/null
@@ -1,317 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
-      <el-form-item label="租户名称" prop="tenantName">
-        <el-input
-          v-model="queryParams.tenantName"
-          placeholder="请输入租户名称"
-          clearable
-          size="small"
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="联系人" prop="contactName">
-        <el-input
-          v-model="queryParams.contactName"
-          placeholder="请输入联系人"
-          clearable
-          size="small"
-          style="width: 240px"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="状态" prop="inUse">
-        <el-select
-          v-model="queryParams.inUse"
-          placeholder="租户状态"
-          clearable
-          size="small"
-          style="width: 240px"
-        >
-          <el-option
-            v-for="dict in inUseOptions"
-            :key="dict.dictValue"
-            :label="dict.dictLabel"
-            :value="dict.dictValue"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="到期日期">
-        <el-date-picker
-          v-model="dateRange"
-          size="small"
-          style="width: 240px"
-          value-format="yyyy-MM-dd"
-          type="daterange"
-          range-separator="-"
-          start-placeholder="开始日期"
-          end-placeholder="结束日期"
-          :picker-options="useEndRangeOptions"
-        />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
-    </el-form>
-
-    <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['system:tenant:add']"
-          type="primary"
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-        >租户入驻</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['system:tenant:update']"
-          type="primary"
-          icon="el-icon-edit-outline"
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-        >信息变更</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['system:tenant:delete']"
-          type="danger"
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDelete"
-        >删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button
-          v-hasPermi="['system:tenant:export']"
-          type="primary"
-          icon="el-icon-download"
-          size="mini"
-          @click="handleExport"
-        >导出</el-button>
-      </el-col>
-    </el-row>
-
-    <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="租户名称" align="center" prop="tenantName" :show-overflow-tooltip="true" />
-      <el-table-column label="联系人" align="center" prop="contactName" :show-overflow-tooltip="true" />
-      <el-table-column label="联系电话" align="center" prop="contactPhone" :show-overflow-tooltip="true" />
-      <el-table-column label="状态" align="center" prop="inUse" :formatter="inUseFormat">
-        <template slot-scope="scope">
-          <el-tag v-if="scope.row.endTime < new Date().getTime()" size="medium" type="danger">过期</el-tag>
-          <el-tag v-else-if="scope.row.inUse === '1'" size="medium">在用</el-tag>
-          <el-tag v-else-if="scope.row.inUse === '0'" size="medium" type="warning">停用</el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="入驻时间" align="center" prop="createTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="生效时间" align="center" prop="beginTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.beginTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="失效时间" align="center" prop="endTime" width="180">
-        <template slot-scope="scope">
-          <span>{{ parseTime(scope.row.endTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="备注" align="center" prop="memo" :show-overflow-tooltip="true" />
-      <el-table-column fixed="right" width="150" label="操作" align="center" class-name="small-padding fixed-width">
-        <template slot-scope="scope">
-          <el-button
-            v-hasPermi="['system:tenant:update']"
-            size="mini"
-            type="text"
-            icon="el-icon-edit-outline"
-            @click="handleUpdate(scope.row)"
-          >信息变更</el-button>
-          <el-button
-            v-hasPermi="['system:tenant:delete']"
-            size="mini"
-            type="text"
-            icon="el-icon-delete"
-            @click="handleDelete(scope.row)"
-          >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <pagination
-      v-show="total>0"
-      :total="total"
-      :page.sync="queryParams.pageNum"
-      :limit.sync="queryParams.pageSize"
-      @pagination="getList"
-    />
-
-    <change-tenant ref="changeTenant" @ok="getList" />
-  </div>
-</template>
-
-<script>
-import { listTenant, getTenant, delTenant, exportTenant } from '@/api/school/system/tenant'
-import changeTenant from '@/components/system/tenant/changeTenant'
-
-export default {
-  components: {
-    changeTenant
-  },
-  data() {
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 总条数
-      total: 0,
-      // 租户表格数据
-      dataList: [],
-      // 状态数据租户
-      inUseOptions: [],
-      // 日期范围
-      dateRange: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        tenantName: undefined,
-        contactName: undefined,
-        inUse: undefined
-      },
-      useEndRangeOptions: {
-        shortcuts: [{
-          text: '7天',
-          onClick(picker) {
-            const start = new Date()
-            const end = new Date()
-            end.setTime(start.getTime() + 3600 * 1000 * 24 * 7)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '15天',
-          onClick(picker) {
-            const start = new Date()
-            const end = new Date()
-            end.setTime(start.getTime() + 3600 * 1000 * 24 * 15)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '1个月',
-          onClick(picker) {
-            const start = new Date()
-            const end = new Date()
-            end.setTime(start.getTime() + 3600 * 1000 * 24 * 30)
-            picker.$emit('pick', [start, end])
-          }
-        }, {
-          text: '3个月',
-          onClick(picker) {
-            const start = new Date()
-            const end = new Date()
-            end.setTime(start.getTime() + 3600 * 1000 * 24 * 90)
-            picker.$emit('pick', [start, end])
-          }
-        }]
-      }
-    }
-  },
-  created() {
-    this.getList()
-    this.getDictListByDictType('in_use').then(response => {
-      this.inUseOptions = response.data
-    })
-  },
-  methods: {
-    /** 查询租户类型列表 */
-    getList() {
-      this.loading = true
-      listTenant(this.addDateRange(this.queryParams, this.dateRange)).then(response => {
-        this.dataList = response.data.rows
-        this.total = response.data.total
-        this.loading = false
-      })
-    },
-    // 租户状态租户翻译
-    inUseFormat(row, column) {
-      return this.selectDictLabel(this.inUseOptions, row.inUse)
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.dateRange = []
-      this.resetForm('queryForm')
-      this.handleQuery()
-    },
-    /** 新增按钮操作 */
-    handleAdd() {
-      this.$refs.changeTenant.reset()
-      this.$refs.changeTenant.title = '添加租户信息'
-      this.$refs.changeTenant.open = true
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.tenantId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      const tenantId = row.tenantId || this.ids
-      getTenant(tenantId).then(response => {
-        this.$refs.changeTenant.reset()
-        this.$refs.changeTenant.form = response.data
-        this.$refs.changeTenant.title = '修改租户信息'
-        this.$refs.changeTenant.open = true
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const tenantIds = row.tenantId || this.ids
-      this.$confirm('是否确认删除?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        return delTenant(tenantIds)
-      }).then((response) => {
-        if (response.respCode === '0000') {
-          this.getList()
-          this.msgSuccess('删除成功')
-        } else {
-          this.msgError(response.respMsg)
-        }
-      }).catch(function() {})
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-      const queryParams = this.queryParams
-      this.$confirm('是否确认导出所有数据项?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        return exportTenant(queryParams)
-      }).then(response => {
-        this.download(response.respMsg)
-      }).catch(function() {})
-    }
-  }
-}
-</script>
diff --git a/src/views/school/system/user/index.vue b/src/views/school/system/user/index.vue
deleted file mode 100644
index a21d2c6..0000000
--- a/src/views/school/system/user/index.vue
+++ /dev/null
@@ -1,666 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-row :gutter="20">
-      <!--部门数据-->
-      <el-col :span="4" :xs="24">
-        <div class="head-container">
-          <el-input
-            v-model="deptName"
-            placeholder="请输入部门名称"
-            clearable
-            size="small"
-            prefix-icon="el-icon-search"
-            style="margin-bottom: 20px"
-          />
-        </div>
-        <div class="head-container">
-          <el-tree
-            ref="tree"
-            :data="deptOptions"
-            :props="defaultProps"
-            :expand-on-click-node="false"
-            :filter-node-method="filterNode"
-            default-expand-all
-            @node-click="handleNodeClick"
-          />
-        </div>
-      </el-col>
-      <!--用户数据-->
-      <el-col :span="20" :xs="24">
-        <el-form ref="queryForm" :model="queryParams" :inline="true" label-width="68px">
-          <el-form-item label="用户名:" prop="username">
-            <el-input
-              v-model="queryParams.username"
-              placeholder="请输入用户名"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="姓名:" prop="name">
-            <el-input
-              v-model="queryParams.name"
-              placeholder="请输入姓名"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item label="联系电话" prop="phone">
-            <el-input
-              v-model="queryParams.phone"
-              placeholder="请输入联系电话"
-              clearable
-              size="small"
-              @keyup.enter.native="handleQuery"
-            />
-          </el-form-item>
-          <el-form-item>
-            <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
-            <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-          </el-form-item>
-        </el-form>
-
-        <el-row :gutter="10" class="mb8">
-          <el-col :span="1.5">
-            <el-button
-              v-hasPermi="['system:user:add']"
-              type="primary"
-              icon="el-icon-plus"
-              size="mini"
-              @click="handleAdd"
-            >新增</el-button>
-          </el-col>
-        </el-row>
-
-        <el-table v-loading="loading" :data="dataList" @selection-change="handleSelectionChange">
-          <el-table-column type="selection" width="55" align="center" />
-          <el-table-column prop="username" width="100" label="用户名" show-overflow-tooltip fixed="left" />
-          <el-table-column prop="tenantNames" width="100" label="所属租户" show-overflow-tooltip />
-          <el-table-column prop="name" label="姓名" show-overflow-tooltip />
-          <el-table-column prop="phone" label="联系电话" width="130" :show-overflow-tooltip="true" />
-          <el-table-column prop="emailAddress" label="邮箱" width="130" :show-overflow-tooltip="true" />
-          <el-table-column prop="deptName" label="部门" width="130" />
-          <el-table-column label="状态" align="center">
-            <template slot-scope="scope">
-              <el-switch
-                v-model="scope.row.enable"
-                active-value="1"
-                inactive-value="0"
-                @change="handleEnableChange(scope.row)"
-              />
-            </template>
-          </el-table-column>
-          <el-table-column fixed="right" width="150" label="操作" align="center" class-name="small-padding fixed-width">
-            <template slot-scope="scope">
-              <el-dropdown trigger="click">
-                <span style="cursor: pointer;color: #409EFF;outline: none;">
-                  操作<i class="el-icon-arrow-down el-icon--right" style="font-size: 12px;" />
-                </span>
-                <el-dropdown-menu slot="dropdown">
-                  <el-dropdown-item v-if="scope.row.username !== 'superManXluobo'" v-hasPermi="['system:user:update']" icon="el-icon-edit-outline" @click.native="handleUpdate(scope.row)">修改</el-dropdown-item>
-                  <el-dropdown-item v-hasPermi="['system:user:resetPwd']" icon="el-icon-key" @click.native="handleResetPwd(scope.row)">重置密码</el-dropdown-item>
-                  <el-dropdown-item v-hasPermi="['system:user:updateTenant']" icon="el-icon-s-shop" @click.native="handleUpdateTenant(scope.row)">分配租户</el-dropdown-item>
-                  <el-dropdown-item v-hasPermi="['system:user:updateRole']" icon="el-icon-paperclip" @click.native="handleUpdateRole(scope.row)">分配角色</el-dropdown-item>
-                  <el-dropdown-item v-if="scope.row.username !== 'superManXluobo'" v-hasPermi="['system:user:delete']" icon="el-icon-delete" @click.native="handleDelete(scope.row)">删除</el-dropdown-item>
-                </el-dropdown-menu>
-              </el-dropdown>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-    </el-row>
-
-    <!-- 添加 -->
-    <el-dialog :title="title" :visible.sync="open" width="600px">
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="用户名" prop="username">
-              <el-input v-model="form.username" placeholder="请输入用户名" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="所属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" placeholder="请选择归属部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入密码" show-password />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="确认密码" prop="checkPass" show-password>
-              <el-input v-model="form.checkPass" placeholder="请输入密码" show-password />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="姓名" prop="name">
-              <el-input v-model="form.name" placeholder="请输入姓名" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="联系电话" prop="phone">
-              <el-input v-model="form.phone" placeholder="请输入联系电话" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="邮箱" prop="emailAddress">
-              <el-input v-model="form.emailAddress" placeholder="请输入邮箱" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitForm">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-    <!-- 修改 -->
-    <el-dialog :title="title" :visible.sync="openUpdate" width="600px">
-      <el-form ref="updateForm" :model="updateForm" :rules="updateRules" label-width="80px">
-        <el-row>
-          <el-col :span="12">
-            <el-form-item label="用户名" prop="username">
-              <el-input v-model="updateForm.username" placeholder="请输入用户名" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="所属部门" prop="deptId">
-              <treeselect v-model="updateForm.deptId" :options="deptOptions" placeholder="请选择归属部门" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="姓名" prop="name">
-              <el-input v-model="updateForm.name" placeholder="请输入姓名" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="联系电话" prop="phone">
-              <el-input v-model="updateForm.phone" placeholder="请输入联系电话" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="邮箱" prop="emailAddress">
-              <el-input v-model="updateForm.emailAddress" placeholder="请输入邮箱" />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="primary" @click="submitFormForUpdate">确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-    <!--变更用户角色-->
-    <el-dialog title="修改用户角色" :visible.sync="openUpdateRole" width="300px">
-      <el-form ref="updateRoleForm" :model="updateRoleForm" label-width="40px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="租户" prop="tenantId">
-              <el-select v-model="updateRoleForm.tenantId" filterable placeholder="请选择租户" @change="tenantChange">
-                <el-option
-                  v-for="item in tenantOptions"
-                  :key="item.tenantId"
-                  :label="item.tenantName"
-                  :value="item.tenantId"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-          <el-col v-if="updateRoleForm.tenantId !== undefined" :span="24">
-            <el-form-item label="角色">
-              <el-tree
-                ref="role"
-                :data="roleOptions"
-                show-checkbox
-                node-key="id"
-                empty-text="加载中，请稍后"
-                :props="defaultProps"
-              />
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button
-          :disabled="updateRoleForm.userId === undefined || updateRoleForm.tenantId === undefined"
-          type="primary"
-          @click="submitFormForRoleUpdate"
-        >确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-    <!--变更用户租户-->
-    <el-dialog title="修改用户租户" :visible.sync="openUpdateTenant" width="300px">
-      <el-form ref="updateTenantForm" :model="updateTenantForm" label-width="40px">
-        <el-row>
-          <el-col :span="24">
-            <el-form-item label="租户" prop="tenantId">
-              <el-select v-model="updateTenantForm.tenantIds" multiple filterable placeholder="请选择租户">
-                <el-option
-                  v-for="item in allTenantOptions"
-                  :key="item.tenantId"
-                  :label="item.tenantName"
-                  :value="item.tenantId"
-                />
-              </el-select>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button
-          :disabled="updateTenantForm.userId === undefined || updateTenantForm.tenantIds === undefined"
-          type="primary"
-          @click="submitFormForTenantUpdate"
-        >确 定</el-button>
-        <el-button @click="cancel">取 消</el-button>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import { listUser, getUser, delUser, addUser, updateUser, changeUserEnable, resetUserPwd, changeUserRole, changeUserTenant } from '@/api/school/system/user'
-import { treeSelect as roleTreeSelect, userRoleIdList } from '@/api/school/system/role/index'
-import { userTenantSelectLimitSelf, treeSelect as tenantTreeSelect, userTenantSelect } from '@/api/school/system/tenant/index'
-import { treeSelect } from '@/api/school/system/dept'
-import Treeselect from '@riophae/vue-treeselect'
-import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-import { isUsername, isPass, isSerialNumber } from '@/utils/validate'
-
-export default {
-  name: 'User',
-  components: { Treeselect },
-  data() {
-    const validatePass = (rule, value, callback) => {
-      if (value === undefined || value === '') {
-        callback(new Error('请输入密码'))
-      } else if (!isPass(value)) {
-        callback(new Error('最少6位,包含大小写字母和特殊字符'))
-      } else {
-        if (this.form.checkPass !== '' && this.form.checkPass !== undefined) {
-          this.$refs.form.validateField('checkPass')
-        }
-        callback()
-      }
-    }
-    const validateCheckPass = (rule, value, callback) => {
-      if (value === undefined || value === '') {
-        callback(new Error('请再次输入密码'))
-      } else if (value !== this.form.password) {
-        callback(new Error('两次输入密码不一致!'))
-      } else {
-        callback()
-      }
-    }
-    const validateNumber = (rule, value, callback) => {
-      if (!isSerialNumber(value)) {
-        callback(new Error('请输入正确的手机号码'))
-      } else {
-        callback()
-      }
-    }
-    const validateUsername = (rule, value, callback) => {
-      if (!isUsername(value)) {
-        callback(new Error('4到16位(字母，数字，下划线)'))
-      } else {
-        callback()
-      }
-    }
-    return {
-      // 遮罩层
-      loading: true,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-      // 总条数
-      total: 0,
-      // 表格树数据
-      dataList: [],
-      // 弹出层标题
-      title: '',
-      // 是否显示弹出层
-      open: false,
-      openUpdate: false,
-      openUpdateRole: false,
-      openUpdateTenant: false,
-      // 部门名称
-      deptName: undefined,
-      // 部门树选项
-      deptOptions: undefined,
-      roleOptions: undefined,
-      tenantOptions: undefined,
-      allTenantOptions: undefined,
-      defaultProps: {
-        children: 'children',
-        label: 'label'
-      },
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 10,
-        username: undefined,
-        name: undefined,
-        phone: undefined
-      },
-      // 表单参数
-      form: {},
-      updateForm: {},
-      updateRoleForm: {},
-      updateTenantForm: {},
-      // 表单校验
-      rules: {
-        username: [
-          { required: true, message: '不能为空', trigger: 'blur' },
-          { validator: validateUsername, trigger: 'blur' }
-        ],
-        password: [
-          { validator: validatePass, trigger: 'blur' }
-        ],
-        checkPass: [
-          { validator: validateCheckPass, trigger: 'blur' }
-        ],
-        name: [
-          { required: true, message: '姓名不能为空', trigger: 'blur' }
-        ],
-        phone: [
-          { required: true, message: '联系电话不能为空', trigger: 'blur' },
-          { validator: validateNumber, trigger: 'blur' }
-        ],
-        emailAddress: [
-          { required: true, message: '邮箱不能为空', trigger: 'blur' },
-          { type: 'email', message: '请输入正确的邮箱', trigger: 'blur' }
-        ]
-      },
-      updateRules: {
-        username: [
-          { required: true, message: '不能为空', trigger: 'blur' },
-          { validator: validateUsername, trigger: 'blur' }
-        ],
-        name: [
-          { required: true, message: '姓名不能为空', trigger: 'blur' }
-        ],
-        phone: [
-          { required: true, message: '联系电话不能为空', trigger: 'blur' },
-          { validator: validateNumber, trigger: 'blur' }
-        ],
-        emailAddress: [
-          { required: true, message: '邮箱不能为空', trigger: 'blur' },
-          { type: 'email', message: '请输入正确的邮箱', trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  watch: {
-    // 根据名称筛选部门树
-    deptName(val) {
-      this.$refs.tree.filter(val)
-    }
-  },
-  created() {
-    this.getList()
-    this.getDeptTreeSelect()
-  },
-  methods: {
-    /** 查询部门列表 */
-    getList() {
-      this.loading = true
-      listUser(this.queryParams).then(response => {
-        this.dataList = response.data.rows
-        this.total = response.data.total
-        this.loading = false
-      })
-    },
-    /** 查询部门下拉树结构 */
-    getDeptTreeSelect() {
-      treeSelect().then(response => {
-        this.deptOptions = response.data
-      })
-    },
-    // 筛选节点
-    filterNode(value, data) {
-      if (!value) return true
-      return data.label.indexOf(value) !== -1
-    },
-    // 节点单击事件
-    handleNodeClick(data) {
-      this.queryParams.deptId = data.id
-      this.getList()
-    },
-    // 用户状态修改
-    handleEnableChange(row) {
-      const text = row.enable === '1' ? '启用' : '停用'
-      this.$confirm('确认要"' + text + '""' + row.username + '"用户吗?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        return changeUserEnable(row.userId, row.enable)
-      }).then(() => {
-        this.msgSuccess(text + '成功')
-      }).catch(function() {
-        row.enable = row.enable === '0' ? '1' : '0'
-      })
-    },
-    // 取消按钮
-    cancel() {
-      this.open = false
-      this.openUpdate = false
-      this.openUpdateRole = false
-      this.openUpdateTenant = false
-      this.reset()
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        username: undefined,
-        password: undefined,
-        name: undefined,
-        phone: undefined,
-        emailAddress: undefined
-      }
-      this.updateForm = {
-        username: undefined,
-        name: undefined,
-        phone: undefined,
-        emailAddress: undefined
-      }
-      this.updateRoleForm = {
-        tenantId: undefined,
-        userId: undefined,
-        roleIds: undefined
-      }
-      this.updateTenantForm = {
-        tenantIds: undefined,
-        userId: undefined
-      }
-      this.resetForm('form')
-      this.resetForm('updateForm')
-      this.resetForm('updateRoleForm')
-      this.resetForm('updateTenantForm')
-    },
-    /** 搜索按钮操作 */
-    handleQuery() {
-      this.queryParams.pageNum = 1
-      this.getList()
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm('queryForm')
-      this.handleQuery()
-    },
-    /** 新增按钮操作 */
-    handleAdd(row) {
-      this.reset()
-      this.open = true
-      this.title = '添加用户'
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.userId)
-      this.single = selection.length !== 1
-      this.multiple = !selection.length
-    },
-    /** 修改按钮操作 */
-    handleUpdate(row) {
-      this.reset()
-      getUser(row.userId || this.ids).then(response => {
-        this.updateForm = response.data
-        this.openUpdate = true
-        this.title = '修改用户'
-      })
-    },
-    /** 提交按钮 */
-    submitForm: function() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          addUser(this.form).then(response => {
-            if (response.respCode === '0000') {
-              this.msgSuccess('新增成功')
-              this.open = false
-              this.getList()
-            } else {
-              this.msgError(response.respMsg)
-            }
-          })
-        }
-      })
-    },
-    submitFormForUpdate: function() {
-      this.$refs['updateForm'].validate(valid => {
-        if (valid) {
-          updateUser(this.updateForm).then(response => {
-            if (response.respCode === '0000') {
-              this.msgSuccess('修改成功')
-              this.openUpdate = false
-              this.getList()
-            } else {
-              this.msgError(response.respMsg)
-            }
-          })
-        }
-      })
-    },
-    /** 删除按钮操作 */
-    handleDelete(row) {
-      const id = row.userId || this.ids
-      this.$confirm('是否确认删除?', '警告', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(function() {
-        return delUser(id)
-      }).then((response) => {
-        if (response.respCode === '0000') {
-          this.getList()
-          this.msgSuccess('删除成功')
-        } else {
-          this.msgError(response.respMsg)
-        }
-      }).catch(function() {})
-    },
-    handleResetPwd(row) {
-      this.$prompt('请输入"' + row.username + '"的新密码', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        inputPattern: /^.*(?=.{6,16})(?=.*\d)(?=.*[A-Z]{1,})(?=.*[a-z]{1,})(?=.*[!@#$%^&*?\(\)]).*$/,
-        inputErrorMessage: '密码最少6位,包含大小写字母和特殊字符'
-      }).then(({ value }) => {
-        resetUserPwd(row.userId, value).then(response => {
-          if (response.respCode === '0000') {
-            this.msgSuccess('修改成功，新密码是：' + value)
-          } else {
-            this.msgError(response.msg)
-          }
-        })
-      }).catch(() => {})
-    },
-    /**
-       * 变更角色
-       * @param row
-       */
-    handleUpdateRole(row) {
-      this.reset()
-      this.updateRoleForm.userId = row.userId
-      userTenantSelectLimitSelf(row.userId).then(response => {
-        this.tenantOptions = response.data
-        this.openUpdateRole = true
-        this.title = '修改用户角色'
-        this.$nextTick(() => {
-          if (this.tenantOptions.length > 0) {
-            this.updateRoleForm.tenantId = this.tenantOptions[0].tenantId
-            this.tenantChange(this.updateRoleForm.tenantId)
-          }
-        })
-      })
-    },
-    tenantChange(tenant) {
-      roleTreeSelect().then(response => {
-        this.roleOptions = response.data
-        userRoleIdList(this.updateRoleForm.userId, tenant).then(res => {
-          this.$refs.role.setCheckedKeys(res.data)
-        })
-      })
-    },
-    // 所有菜单节点数据
-    getRoleAllCheckedKeys() {
-      // 半选中的菜单节点
-      const halfCheckedKeys = this.$refs.role.getHalfCheckedKeys()
-      // 目前被选中的菜单节点
-      const checkedKeys = this.$refs.role.getCheckedKeys()
-      checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys)
-      return checkedKeys
-    },
-    submitFormForRoleUpdate() {
-      this.updateRoleForm.roleIds = this.getRoleAllCheckedKeys()
-      changeUserRole(this.updateRoleForm).then(response => {
-        if (response.respCode === '0000') {
-          this.msgSuccess('操作成功')
-          if (this.tenantOptions.length === 1) {
-            this.openUpdateRole = false
-          }
-        } else {
-          this.msgError(response.msg)
-        }
-      })
-    },
-    /**
-     * 变更租户
-     * @param row
-     */
-    handleUpdateTenant(row) {
-      this.reset()
-      this.updateTenantForm.userId = row.userId
-      tenantTreeSelect().then(response => {
-        this.allTenantOptions = response.data
-        this.title = '修改用户角色'
-        this.openUpdateTenant = true
-      })
-      userTenantSelect(row.userId).then(res => {
-        const userTenant = res.data
-        const tenantIds = []
-        for (let i = 0; i < userTenant.length; i++) {
-          tenantIds.push(userTenant[i].tenantId)
-        }
-        this.updateTenantForm.tenantIds = tenantIds
-      })
-    },
-    submitFormForTenantUpdate() {
-      changeUserTenant(this.updateTenantForm).then(res => {
-        if (res.respCode === '0000') {
-          this.msgSuccess('操作成功')
-          this.openUpdateTenant = false
-        } else {
-          this.msgError(res.msg)
-        }
-      })
-    }
-  }
-}
-</script>
diff --git a/src/views/school/system/user/profile/index.vue b/src/views/school/system/user/profile/index.vue
deleted file mode 100644
index 5e6ddca..0000000
--- a/src/views/school/system/user/profile/index.vue
+++ /dev/null
@@ -1,92 +0,0 @@
-<template>
-  <div class="app-container bg-grey">
-    <el-row :gutter="20">
-      <el-col :span="7" :xs="24">
-        <el-card class="box-card">
-          <div slot="header" class="clearfix">
-            <span>个人信息</span>
-          </div>
-          <div>
-            <div class="text-center">
-              <userAvatar :user="user" />
-            </div>
-            <ul class="list-group list-group-striped">
-              <li class="list-group-item">
-                <svg-icon icon-class="user" /> 用户名称
-                <div class="pull-right">{{ user.username }}</div>
-              </li>
-              <li class="list-group-item">
-                <svg-icon icon-class="user" /> 姓名
-                <div class="pull-right">{{ user.name }}</div>
-              </li>
-              <li class="list-group-item">
-                <svg-icon icon-class="phone" /> 手机号码
-                <div class="pull-right">{{ user.phone }}</div>
-              </li>
-              <li class="list-group-item">
-                <svg-icon icon-class="email" /> 邮箱
-                <div class="pull-right">{{ user.emailAddress }}</div>
-              </li>
-              <li class="list-group-item">
-                <svg-icon icon-class="tree" /> 所属部门
-                <div v-if="user.deptName" class="pull-right">{{ user.deptName }}</div>
-              </li>
-              <li class="list-group-item">
-                <svg-icon icon-class="date" /> 创建日期
-                <div class="pull-right">{{ parseTime(user.createDate) }}</div>
-              </li>
-            </ul>
-          </div>
-        </el-card>
-      </el-col>
-      <el-col :span="17" :xs="24">
-        <el-card>
-          <div slot="header" class="clearfix">
-            <span>基本资料</span>
-          </div>
-          <el-tabs v-model="activeTab">
-            <el-tab-pane label="基本资料" name="userInfo">
-              <userInfo :user="user" />
-            </el-tab-pane>
-            <el-tab-pane label="修改密码" name="resetPwd">
-              <resetPwd :user="user" />
-            </el-tab-pane>
-          </el-tabs>
-        </el-card>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script>
-import userAvatar from './userAvatar'
-import userInfo from './userInfo'
-import resetPwd from './resetPwd'
-import { getUserProfile } from '@/api/school/system/user'
-
-export default {
-  name: 'Profile',
-  components: { userAvatar, userInfo, resetPwd },
-  data() {
-    return {
-      user: {},
-      activeTab: 'userInfo'
-    }
-  },
-  created() {
-    this.getUser()
-  },
-  methods: {
-    getUser() {
-      getUserProfile().then(response => {
-        this.user = response.data
-      })
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-  .app-container{
-    padding: 0px;
-  }
-</style>
diff --git a/src/views/school/system/user/profile/resetPwd.vue b/src/views/school/system/user/profile/resetPwd.vue
deleted file mode 100644
index 63eda28..0000000
--- a/src/views/school/system/user/profile/resetPwd.vue
+++ /dev/null
@@ -1,88 +0,0 @@
-<template>
-  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
-    <el-form-item label="旧密码" prop="oldPassword">
-      <el-input v-model="user.oldPassword" placeholder="请输入旧密码" type="password" show-password />
-    </el-form-item>
-    <el-form-item label="新密码" prop="newPassword">
-      <el-input v-model="user.newPassword" placeholder="请输入新密码" type="password" show-password />
-    </el-form-item>
-    <el-form-item label="确认密码" prop="confirmPassword">
-      <el-input v-model="user.confirmPassword" placeholder="请确认密码" type="password" show-password />
-    </el-form-item>
-    <el-form-item>
-      <el-button type="primary" size="mini" @click="submit">保存</el-button>
-      <el-button type="danger" size="mini" @click="close">关闭</el-button>
-    </el-form-item>
-  </el-form>
-</template>
-
-<script>
-import { updateUserPwd } from '@/api/school/system/user'
-
-export default {
-  data() {
-    const validatePass = (rule, value, callback) => {
-      const pattern = /^.*(?=.{6,16})(?=.*\d)(?=.*[A-Z]{1,})(?=.*[a-z]{1,})(?=.*[!@#$%^&*?\(\)]).*$/
-      if (value === undefined || value === '') {
-        callback(new Error('请输入密码'))
-      } else if (!pattern.test(value)) {
-        callback(new Error('最少6位,包含大小写字母和特殊字符'))
-      } else {
-        if (this.user.confirmPassword !== '' && this.user.confirmPassword !== undefined) {
-          this.$refs.form.validateField('confirmPassword')
-        }
-        callback()
-      }
-    }
-    const validateCheckPass = (rule, value, callback) => {
-      if (value === undefined || value === '') {
-        callback(new Error('请再次输入密码'))
-      } else if (value !== this.user.newPassword) {
-        callback(new Error('两次输入密码不一致!'))
-      } else {
-        callback()
-      }
-    }
-    return {
-      user: {
-        oldPassword: undefined,
-        newPassword: undefined,
-        confirmPassword: undefined
-      },
-      // 表单校验
-      rules: {
-        oldPassword: [
-          { required: true, message: '旧密码不能为空', trigger: 'blur' }
-        ],
-        newPassword: [
-          { validator: validatePass, trigger: 'blur' }
-        ],
-        confirmPassword: [
-          { validator: validateCheckPass, trigger: 'blur' }
-        ]
-      }
-    }
-  },
-  methods: {
-    submit() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          updateUserPwd(this.user).then(
-            response => {
-              if (response.respCode === '0000') {
-                this.msgSuccess('修改成功,请牢记您的新密码:' + this.user.newPassword)
-              } else {
-                this.msgError(response.respMsg)
-              }
-            }
-          )
-        }
-      })
-    },
-    close() {
-      this.$store.dispatch('tagsView/delView', this.$route)
-      this.$router.push({ path: '/' })
-    }
-  }
-}
-</script>
diff --git a/src/views/school/system/user/profile/userAvatar.vue b/src/views/school/system/user/profile/userAvatar.vue
deleted file mode 100644
index 6173e23..0000000
--- a/src/views/school/system/user/profile/userAvatar.vue
+++ /dev/null
@@ -1,144 +0,0 @@
-<template>
-  <div>
-    <img :src="options.img" title="点击上传头像" class="img-circle img-lg" @click="editCropper()">
-    <el-dialog :title="title" :visible.sync="open" width="800px">
-      <el-row>
-        <el-col :xs="24" :md="12" :style="{height: '350px'}">
-          <vue-cropper
-            ref="cropper"
-            :img="options.img"
-            :info="true"
-            :auto-crop="options.autoCrop"
-            :auto-crop-width="options.autoCropWidth"
-            :auto-crop-height="options.autoCropHeight"
-            :fixed-box="options.fixedBox"
-            @realTime="realTime"
-          />
-        </el-col>
-        <el-col :xs="24" :md="12" :style="{height: '350px'}">
-          <div class="avatar-upload-preview">
-            <img :src="previews.url" :style="previews.img">
-          </div>
-        </el-col>
-      </el-row>
-      <br>
-      <el-row>
-        <el-col :lg="2" :md="2">
-          <el-upload action="#" :http-request="requestUpload" :show-file-list="false" :before-upload="beforeUpload">
-            <el-button size="small">
-              上传
-              <i class="el-icon-upload el-icon--right" />
-            </el-button>
-          </el-upload>
-        </el-col>
-        <el-col :lg="{span: 1, offset: 2}" :md="2">
-          <el-button icon="el-icon-plus" size="small" @click="changeScale(1)" />
-        </el-col>
-        <el-col :lg="{span: 1, offset: 1}" :md="2">
-          <el-button icon="el-icon-minus" size="small" @click="changeScale(-1)" />
-        </el-col>
-        <el-col :lg="{span: 1, offset: 1}" :md="2">
-          <el-button icon="el-icon-refresh-left" size="small" @click="rotateLeft()" />
-        </el-col>
-        <el-col :lg="{span: 1, offset: 1}" :md="2">
-          <el-button icon="el-icon-refresh-right" size="small" @click="rotateRight()" />
-        </el-col>
-        <el-col :lg="{span: 2, offset: 6}" :md="2">
-          <el-button type="primary" size="small" @click="uploadImg()">提 交</el-button>
-        </el-col>
-      </el-row>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-import store from '@/store'
-import { VueCropper } from 'vue-cropper'
-import { uploadAvatar } from '@/api/school/system/user'
-
-export default {
-  components: { VueCropper },
-  props: {
-    user: {
-      type: Object,
-      default: function() {
-        return {}
-      }
-    }
-  },
-  data() {
-    return {
-      // 是否显示弹出层
-      open: false,
-      // 弹出层标题
-      title: '修改头像',
-      options: {
-        img: store.getters.avatar, // 裁剪图片的地址
-        autoCrop: true, // 是否默认生成截图框
-        autoCropWidth: 200, // 默认生成截图框宽度
-        autoCropHeight: 200, // 默认生成截图框高度
-        fixedBox: true // 固定截图框大小 不允许改变
-      },
-      previews: {}
-    }
-  },
-  methods: {
-    // 编辑头像
-    editCropper() {
-      // this.msgWarning('暂不支持修改头像')
-      this.open = true
-    },
-    // 覆盖默认的上传行为
-    requestUpload() {
-    },
-    // 向左旋转
-    rotateLeft() {
-      this.$refs.cropper.rotateLeft()
-    },
-    // 向右旋转
-    rotateRight() {
-      this.$refs.cropper.rotateRight()
-    },
-    // 图片缩放
-    changeScale(num) {
-      num = num || 1
-      this.$refs.cropper.changeScale(num)
-    },
-    // 上传预处理
-    beforeUpload(file) {
-      if (file.type.indexOf('image/') === -1) {
-        this.msgError('文件格式错误，请上传图片类型,如：JPG，PNG后缀的文件。')
-      } else {
-        const reader = new FileReader()
-        reader.readAsDataURL(file)
-        reader.onload = () => {
-          this.options.img = reader.result
-        }
-      }
-    },
-    // 上传图片
-    uploadImg() {
-      this.$refs.cropper.getCropBlob(data => {
-        const formData = new FormData()
-        formData.append('file', data)
-        formData.append('fileType', 'avatar')
-        formData.append('fileIndex', '1')
-        uploadAvatar(formData).then(response => {
-          if (response.respCode === '0000') {
-            this.open = false
-            this.options.img = process.env.VUE_APP_RESOURCE_API + response.data.prePath + response.data.fileName
-            this.msgSuccess('修改头像成功')
-          } else {
-            this.msgError(response.respMsg)
-          }
-          this.$refs.cropper.clearCrop()
-        })
-      })
-    },
-    // 实时预览
-    realTime(data) {
-      this.previews = data
-    }
-  }
-}
-</script>
diff --git a/src/views/school/system/user/profile/userInfo.vue b/src/views/school/system/user/profile/userInfo.vue
deleted file mode 100644
index 2dd2eb1..0000000
--- a/src/views/school/system/user/profile/userInfo.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-<template>
-  <el-form ref="form" :model="user" :rules="rules" label-width="80px">
-    <el-form-item label="用户昵称" prop="name">
-      <el-input v-model="user.name" />
-    </el-form-item>
-    <el-form-item label="手机号码" prop="phone">
-      <el-input v-model="user.phone" maxlength="11" />
-    </el-form-item>
-    <el-form-item label="邮箱" prop="emailAddress">
-      <el-input v-model="user.emailAddress" maxlength="50" />
-    </el-form-item>
-    <el-form-item>
-      <el-button type="primary" size="mini" @click="submit">保存</el-button>
-      <el-button type="danger" size="mini" @click="close">关闭</el-button>
-    </el-form-item>
-  </el-form>
-</template>
-
-<script>
-import { updateUserProfile } from '@/api/school/system/user'
-
-export default {
-  props: {
-    user: {
-      type: Object,
-      default: function() {
-        return {}
-      }
-    }
-  },
-  data() {
-    return {
-      // 表单校验
-      rules: {
-        name: [
-          { required: true, message: '名称不能为空', trigger: 'blur' }
-        ],
-        emailAddress: [
-          { required: true, message: '邮箱地址不能为空', trigger: 'blur' },
-          {
-            type: 'email',
-            message: "'请输入正确的邮箱地址",
-            trigger: ['blur', 'change']
-          }
-        ],
-        phone: [
-          { required: true, message: '手机号码不能为空', trigger: 'blur' },
-          {
-            pattern: /^[1][3,4,5,6,7,8,9][0-9]{9}$/,
-            message: '请输入正确的手机号码',
-            trigger: 'blur'
-          }
-        ]
-      }
-    }
-  },
-  methods: {
-    submit() {
-      this.$refs['form'].validate(valid => {
-        if (valid) {
-          updateUserProfile(this.user).then(response => {
-            if (response.respCode === '0000') {
-              this.msgSuccess('修改成功')
-            } else {
-              this.msgError(response.respMsg)
-            }
-          })
-        }
-      })
-    },
-    close() {
-      this.$store.dispatch('tagsView/delView', this.$route)
-      this.$router.push({ path: '/' })
-    }
-  }
-}
-</script>
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index 3377641..daf869c 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -59,7 +59,7 @@
       <el-table-column prop="deptName" label="部门/校区名称" width="260">
         <template slot-scope="scope">
           <el-tag :type="scope.row.deptType === '1'?'info':'' ">{{ scope.row.deptType === '1'?'部门':'校区' }}</el-tag>
-          <span>{{ scope.row.deptName }}</span>
+          <span>{{ scope.row.deptName }}{{scope.row.parentId==0?'(总店)':''}}</span>
         </template>
       </el-table-column>
       <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
@@ -105,9 +105,9 @@
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-row>
-          <el-col :span="24" v-if="form.parentId !== 0">
+          <el-col :span="24" v-if="form.parentId !== '0'">
             <el-form-item label="上级部门" prop="parentId">
-              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门" />
+              <treeselect v-model="form.parentId" :options="deptOptions" :normalizer="normalizer" placeholder="选择上级部门"  />
             </el-form-item>
           </el-col>
         </el-row>
@@ -117,9 +117,9 @@
               <el-input v-model="form.deptName" placeholder="请输入部门名称" />
             </el-form-item>
           </el-col>
-          <el-col :span="12">
+          <el-col :span="12" v-if="form.parentId !== '0'">
             <el-form-item label="部门类型:">
-              <el-radio-group v-model="form.deptType">
+              <el-radio-group v-model="form.deptType" @change="changeDeptType" >
                 <el-radio
                   v-for="dict in deptTypeOptions"
                   :key="dict.deptType"
@@ -201,6 +201,7 @@ export default {
   components: { Treeselect },
   data() {
     return {
+      oldType:'0',
       // 遮罩层
       loading: true,
       // 显示搜索条件
@@ -266,6 +267,15 @@ export default {
     this.getList();
   },
   methods: {
+    changeDeptType(deptType){
+      if (deptType==='1' && this.oldType==='2'){
+        this.$modal.confirm
+        ('须知：将校区改为部门时，"' + this.form.deptName + '"相关门店介绍信息将会被清除！').then(function() {
+        }).then(() => {
+        }).catch(() => {});
+      }
+
+    },
     /****/
     changeLeader(value){
 
@@ -312,12 +322,14 @@ export default {
         deptId: undefined,
         parentId: undefined,
         deptName: undefined,
+        deptType:'2',
         orderNum: undefined,
         leader: undefined,
         phone: undefined,
         email: undefined,
-        status: "0"
+        status:'0'
       };
+      this.oldType='0'
       this.resetForm("form");
     },
     /** 搜索按钮操作 */
@@ -358,6 +370,7 @@ export default {
       this.reset();
       getDept(row.deptId).then(response => {
         this.form = response.data;
+        this.oldType=response.data.deptType
         this.open = true;
         this.title = "修改部门";
       });
@@ -387,7 +400,7 @@ export default {
     },
     /** 删除按钮操作 */
     handleDelete(row) {
-      this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项？').then(function() {
+      this.$modal.confirm('是否确认删除名称为"' + row.deptName + '"的数据项，并且删除相关门店介绍信息？').then(function() {
         return delDept(row.deptId);
       }).then(() => {
         this.getList();
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 302e0cd..b3c3b4d 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -111,15 +111,16 @@
       </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope" >
-         <template v-if="(userId==1 &&scope.row.roleId !== 1) ||(userId!==1 && scope.row.roleId>108)">
-           <el-button
+         <template v-if="scope.row.roleId !== 1">
+           <el-button v-if="!(scope.row.roleId == 100 && userId !==1) "
              size="mini"
              type="text"
              icon="el-icon-edit"
              @click="handleUpdate(scope.row)"
              v-hasPermi="['system:role:edit']"
            >修改</el-button>
-           <el-button
+
+           <el-button v-if="userId==1 ||(userId!==1 && scope.row.roleId>108)"
              size="mini"
              type="text"
              icon="el-icon-delete"
@@ -156,7 +157,7 @@
     <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="100px">
         <el-form-item label="角色名称" prop="roleName">
-          <el-input v-model="form.roleName" placeholder="请输入角色名称" />
+          <el-input v-model="form.roleName" placeholder="请输入角色名称" :disabled="disabledFlag"/>
         </el-form-item>
         <el-form-item prop="roleKey">
           <span slot="label">
@@ -165,13 +166,13 @@
             </el-tooltip>
             权限字符
           </span>
-          <el-input v-model="form.roleKey" placeholder="请输入权限字符" />
+          <el-input v-model="form.roleKey" placeholder="请输入权限字符" :disabled="disabledFlag" />
         </el-form-item>
         <el-form-item label="角色顺序" prop="roleSort">
-          <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
+          <el-input-number v-model="form.roleSort" controls-position="right" :min="0" :disabled="disabledFlag" />
         </el-form-item>
         <el-form-item label="状态">
-          <el-radio-group v-model="form.status">
+          <el-radio-group v-model="form.status" :disabled="disabledFlag">
             <el-radio
               v-for="dict in dict.type.sys_normal_disable"
               :key="dict.value"
@@ -195,7 +196,7 @@
           ></el-tree>
         </el-form-item>
         <el-form-item label="备注">
-          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容"></el-input>
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" :disabled="disabledFlag"></el-input>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -258,6 +259,7 @@ export default {
   dicts: ['sys_normal_disable'],
   data() {
     return {
+      disabledFlag:false,
       userId:this.$store.getters.userId,
       // 遮罩层
       loading: true,
@@ -504,6 +506,7 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd() {
+      this.disabledFlag=false;
       this.reset();
       this.getMenuTreeselect();
       this.open = true;
@@ -514,6 +517,9 @@ export default {
       this.reset();
       const roleId = row.roleId || this.ids
       const roleMenu = this.getRoleMenuTreeselect(roleId);
+      if (roleId<=108 && this.userId!==1 ){
+        this.disabledFlag=true;
+      }
       getRole(roleId).then(response => {
         this.form = response.data;
         this.open = true;
diff --git a/src/views/system/role/selectUser.vue b/src/views/system/role/selectUser.vue
index b2b072f..50c88ea 100644
--- a/src/views/system/role/selectUser.vue
+++ b/src/views/system/role/selectUser.vue
@@ -2,10 +2,10 @@
   <!-- 授权用户 -->
   <el-dialog title="选择用户" :visible.sync="visible" width="800px" top="5vh" append-to-body>
     <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
-      <el-form-item label="用户名称" prop="userName">
+      <el-form-item label="登录账号" prop="userName">
         <el-input
           v-model="queryParams.userName"
-          placeholder="请输入用户名称"
+          placeholder="请输入账号"
           clearable
           @keyup.enter.native="handleQuery"
         />
@@ -26,7 +26,7 @@
     <el-row>
       <el-table @row-click="clickRow" ref="table" :data="userList" @selection-change="handleSelectionChange" height="260px">
         <el-table-column type="selection" width="55"></el-table-column>
-        <el-table-column label="用户名称" prop="userName" :show-overflow-tooltip="true" />
+        <el-table-column label="登录账号" prop="userName" :show-overflow-tooltip="true" />
         <el-table-column label="用户昵称" prop="nickName" :show-overflow-tooltip="true" />
         <el-table-column label="邮箱" prop="email" :show-overflow-tooltip="true" />
         <el-table-column label="手机" prop="phonenumber" :show-overflow-tooltip="true" />
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index 30d101f..9e5cf7d 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -29,10 +29,10 @@
       <!--用户数据-->
       <el-col :span="20" :xs="24">
         <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
-          <el-form-item label="用户名称" prop="userName">
+          <el-form-item label="登录账号" prop="userName">
             <el-input
               v-model="queryParams.userName"
-              placeholder="请输入用户名称"
+              placeholder="请输入账号"
               clearable
               style="width: 240px"
               @keyup.enter.native="handleQuery"
@@ -88,11 +88,16 @@
         <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
-          <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
+          <el-table-column label="登录账号" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
           <el-table-column label="用户昵称" align="center" key="nickName" prop="nickName" v-if="columns[2].visible" :show-overflow-tooltip="true" />
           <el-table-column label="部门" align="center" key="deptName" prop="dept.deptName" v-if="columns[3].visible" :show-overflow-tooltip="true" />
           <el-table-column label="手机号码" align="center" key="phonenumber" prop="phonenumber" v-if="columns[4].visible" width="120" />
-          <el-table-column label="状态" align="center" key="status" v-if="columns[5].visible">
+          <el-table-column prop="teacher"  align="center" label="教练角色" v-if="columns[5].visible" width="120">
+            <template slot-scope="scope">
+              <span style="text-decoration: underline;cursor: pointer;" >{{ scope.row.teacher==1?'是':'否' }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="状态" align="center" key="status" v-if="columns[6].visible">
             <template slot-scope="scope">
               <el-switch
                 v-model="scope.row.status"
@@ -103,7 +108,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[6].visible" width="160">
+          <el-table-column label="创建时间" align="center" prop="createTime" v-if="columns[7].visible" width="160">
             <template slot-scope="scope">
               <span>{{ parseTime(scope.row.createTime) }}</span>
             </template>
@@ -156,7 +161,7 @@
 
     <!-- 添加或修改用户配置对话框 -->
     <el-dialog :title="title" :visible.sync="open" width="600px" append-to-body>
-      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px" >
         <el-row>
           <el-col :span="12">
             <el-form-item label="用户昵称" prop="nickName">
@@ -165,7 +170,12 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="归属部门" prop="deptId">
-              <treeselect v-model="form.deptId" :options="deptOptions" :show-count="true" placeholder="请选择归属部门" />
+              <treeselect
+                v-model="form.deptId"
+                :options="deptOptions"
+                :show-count="true"
+                @input="handleTreeSelectChange"
+                placeholder="请选择归属部门" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -183,8 +193,8 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
+            <el-form-item v-if="form.userId == undefined" label="登录账号" prop="userName">
+              <el-input v-model="form.userName" placeholder="保存后无法修改" maxlength="30" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
@@ -219,19 +229,19 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="12">
-            <el-form-item label="岗位">
-              <el-select v-model="form.postIds" multiple placeholder="请选择岗位">
-                <el-option
-                  v-for="item in postOptions"
-                  :key="item.postId"
-                  :label="item.postName"
-                  :value="item.postId"
-                  :disabled="item.status == 1"
-                ></el-option>
-              </el-select>
-            </el-form-item>
-          </el-col>
+<!--          <el-col :span="12">-->
+<!--            <el-form-item label="岗位">-->
+<!--              <el-select v-model="form.postIds" multiple placeholder="请选择岗位">-->
+<!--                <el-option-->
+<!--                  v-for="item in postOptions"-->
+<!--                  :key="item.postId"-->
+<!--                  :label="item.postName"-->
+<!--                  :value="item.postId"-->
+<!--                  :disabled="item.status == 1"-->
+<!--                ></el-option>-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
+<!--          </el-col>-->
           <el-col :span="12">
             <el-form-item label="角色">
               <el-select v-model="form.roleIds" multiple placeholder="请选择角色">
@@ -368,18 +378,24 @@ export default {
       // 列信息
       columns: [
         { key: 0, label: `用户编号`, visible: true },
-        { key: 1, label: `用户名称`, visible: true },
+        { key: 1, label: `登录账号`, visible: true },
         { key: 2, label: `用户昵称`, visible: true },
         { key: 3, label: `部门`, visible: true },
         { key: 4, label: `手机号码`, visible: true },
-        { key: 5, label: `状态`, visible: true },
-        { key: 6, label: `创建时间`, visible: true }
+        { key: 5, label: `教练角色`, visible: true },
+        { key: 6, label: `状态`, visible: true },
+        { key: 7, label: `创建时间`, visible: true }
       ],
       // 表单校验
       rules: {
         userName: [
-          { required: true, message: "用户名称不能为空", trigger: "blur" },
-          { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
+          { required: true, message: "登录账号不能为空", trigger: "blur" },
+          { min: 5, max: 16, message: '登录账号长度必须介于 5 和 20 之间', trigger: 'blur' },
+          {
+            pattern: /\w+/,
+            message: "仅支持字母、数字、下划线",
+            trigger: "blur"
+          }
         ],
         nickName: [
           { required: true, message: "用户昵称不能为空", trigger: "blur" }
@@ -396,12 +412,16 @@ export default {
           }
         ],
         phonenumber: [
+          { required: true, message: "手机号码不能为空", trigger: "blur" },
           {
             pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
             message: "请输入正确的手机号码",
             trigger: "blur"
           }
-        ]
+        ],
+        deptId: [
+          { required: true, message: "请归属部门", trigger: "change" }
+        ],
       }
     };
   },
@@ -419,6 +439,10 @@ export default {
     });
   },
   methods: {
+    handleTreeSelectChange() {
+      // 手动触发表单验证 validateField
+      this.$refs.form.validateField('deptId')
+    },
     /** 查询用户列表 */
     getList() {
       this.loading = true;
@@ -448,7 +472,7 @@ export default {
     // 用户状态修改
     handleStatusChange(row) {
       let text = row.status === "0" ? "启用" : "停用";
-      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"用户吗？').then(function() {
+      this.$modal.confirm('确认要"' + text + '""' + row.userName + '"账号吗？').then(function() {
         return changeUserStatus(row.userId, row.status);
       }).then(() => {
         this.$modal.msgSuccess(text + "成功");
@@ -558,6 +582,8 @@ export default {
     },
     /** 提交按钮 */
     submitForm: function() {
+
+
       this.$refs["form"].validate(valid => {
         if (valid) {
           if (this.form.userId != undefined) {
@@ -567,11 +593,15 @@ export default {
               this.getList();
             });
           } else {
-            addUser(this.form).then(response => {
+            const form = this.form;
+            this.$modal.confirm('请确认手机号"' + this.form.phonenumber + '"是否正确！').then(function() {
+              return   addUser(form);
+            }).then(() => {
               this.$modal.msgSuccess("新增成功");
               this.open = false;
               this.getList();
-            });
+            }).catch(() => {});
+
           }
         }
       });