From 8ee53be060938cb92ae7766c8c825d99ce59ec23 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 5 Feb 2024 17:02:30 +0800
Subject: [PATCH] fix

---
 public/index.html                             |    2 +-
 src/pages/achievement/info/course.vue         |    2 +-
 src/pages/achievement/info/project.vue        |    6 +-
 src/pages/achievement/list/course.vue         |    5 +-
 src/pages/achievement/list/project.vue        |    3 +-
 src/pages/activity/details/index.vue          |    2 +-
 src/pages/assessment/list/index.vue           |    1 +
 .../course/list/courseManagement/index.vue    |  483 ++++---
 src/pages/match/add/step1.vue                 |    2 +-
 src/pages/match/add/step2.vue                 |   11 +-
 src/pages/match/manage/matchInfo.vue          |    1 -
 src/pages/product/show/index.vue              |    1 +
 src/pages/screen/index.vue                    |    5 +-
 src/pages/system/list/index.vue               |   92 +-
 src/pages/system/list/staff.vue               | 1152 +++++++++--------
 src/pages/system/list/staffSide.vue           |  559 ++++----
 16 files changed, 1251 insertions(+), 1076 deletions(-)

diff --git a/public/index.html b/public/index.html
index 7b9845e..2a0608a 100644
--- a/public/index.html
+++ b/public/index.html
@@ -10,7 +10,7 @@
             var _hmt = _hmt || [];
             (function() {
                 var hm = document.createElement('script');
-                hm.src = 'https://hm.baidu.com/hm.js?72fbad6ebf1d6c705117fe8fe0686a0e';
+                hm.src = 'https://hm.baidu.com/hm.js?e4d7deeca2d6ea71d2bd5fa2365bc654';
                 var s = document.getElementsByTagName('script')[0];
                 s.parentNode.insertBefore(hm, s);
             })();
diff --git a/src/pages/achievement/info/course.vue b/src/pages/achievement/info/course.vue
index 88cf2fc..825730d 100644
--- a/src/pages/achievement/info/course.vue
+++ b/src/pages/achievement/info/course.vue
@@ -3,7 +3,7 @@
     <el-card shadow="hover"
              class="m-b-20 head-card">
       <div class="flex-between m-b-20">
-        <el-page-header @back="$router.push('list?tab=tab1')"
+        <el-page-header @back="$router.back()"
                         :content="goodsName"></el-page-header>
       </div>
     </el-card>
diff --git a/src/pages/achievement/info/project.vue b/src/pages/achievement/info/project.vue
index c478c81..559768e 100644
--- a/src/pages/achievement/info/project.vue
+++ b/src/pages/achievement/info/project.vue
@@ -320,7 +320,8 @@ export default {
       pageActivation: 1,
       pageSizeActivation: 10,
       totalActivation: 0,
-      loadIns: null
+      loadIns: null,
+      scores: {}
     };
   },
   components: {
@@ -378,6 +379,7 @@ export default {
         this.errorAnalysis = res.errorAnalysis || {}
         this.max = res.highestErrorRate || {}
         this.min = res.minimumErrorRate || {}
+        this.scores = res.getFractionalSegmentNum
         this.getChart()
         this.errorChart()
       } catch (e) {
@@ -531,7 +533,7 @@ export default {
     getChart () { // 初始化折线图
       const xData = Array.from({ length: 101 }, (v, k) => k)
       const yData = Array.from({ length: 101 }, (v, k) => 0)
-      const list = this.listDataAll
+      const list = this.listData
       list.map(n => {
         yData[n.score]++
       })
diff --git a/src/pages/achievement/list/course.vue b/src/pages/achievement/list/course.vue
index 73b13bc..ccf3fd8 100644
--- a/src/pages/achievement/list/course.vue
+++ b/src/pages/achievement/list/course.vue
@@ -166,7 +166,8 @@ export default {
           path: 'list',
           query: {
             ...this.$route.query,
-            keyword: val
+            keyword: val,
+            page: 1
           }
         })
         this.initData();
@@ -182,7 +183,7 @@ export default {
     async getCourse () {
       const { data } = await this.$get(this.api.getSchoolEffectiveCourse)
       this.curs = data
-      this.initData();
+      this.getData();
     },
     // 课程选择回调
     curChange (id) {
diff --git a/src/pages/achievement/list/project.vue b/src/pages/achievement/list/project.vue
index 6e3e6c2..bd4db5f 100644
--- a/src/pages/achievement/list/project.vue
+++ b/src/pages/achievement/list/project.vue
@@ -232,7 +232,8 @@ export default {
           path: 'list',
           query: {
             ...this.$route.query,
-            keyword: val
+            keyword: val,
+            page: 1
           }
         })
         this.initData();
diff --git a/src/pages/activity/details/index.vue b/src/pages/activity/details/index.vue
index 2fb0318..1273fa9 100644
--- a/src/pages/activity/details/index.vue
+++ b/src/pages/activity/details/index.vue
@@ -447,7 +447,7 @@ export default {
     .tool {
         z-index: 100;
         position: sticky;
-        top: 64px;
+        top: 0;
         margin-bottom: 20px;
         background-color: #fff;
     }
diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue
index e13c940..1ee6a36 100644
--- a/src/pages/assessment/list/index.vue
+++ b/src/pages/assessment/list/index.vue
@@ -291,6 +291,7 @@ export default {
         month: "",
 
       },
+      mallId: '',
       pageNum: +this.$route.query.page || 1, // 当前页数
       pageSize: 10, // 每页10条
       total: 0, // 总数
diff --git a/src/pages/course/list/courseManagement/index.vue b/src/pages/course/list/courseManagement/index.vue
index 3d218fa..de5bb93 100644
--- a/src/pages/course/list/courseManagement/index.vue
+++ b/src/pages/course/list/courseManagement/index.vue
@@ -1,233 +1,290 @@
 <template>
-    <!--   课程管理     -->
-    <div style="padding-top: 24px">
-        <div class="tool">
-            <ul class="filter" style="align-items: flex-start">
-                <li>
-                    <label>课程分类：</label>
-                    <el-select v-model="categoryId" clearable placeholder="请选择课程分类" @change="initData">
-                        <el-option label="不限" value=""></el-option>
-                        <el-option v-for="(item,index) in classificationList" :key="index" :label="item.classificationName" :value="item.id"></el-option>
-                    </el-select>
-                </li>
-                <li>
-                    <label>搜索：</label>
-                    <el-input placeholder="请输入课程名称/创建人" suffix-icon="el-icon-search" v-model="keyword" clearable size="small"></el-input>
-                </li>
-            </ul>
-            <div>
-                <el-button v-auth="'课程管理:新增'" type="info" round @click="addCourse">新增</el-button>
-                <el-button v-auth="'课程管理:批量删除'" type="primary" round @click="delAllData">批量删除</el-button>
-            </div>
-        </div>
+  <!--   课程管理     -->
+  <div style="padding-top: 24px">
+    <div class="tool">
+      <ul class="filter"
+          style="align-items: flex-start">
+        <li>
+          <label>课程分类：</label>
+          <el-select v-model="categoryId"
+                     clearable
+                     placeholder="请选择课程分类"
+                     @change="initData">
+            <el-option label="不限"
+                       value=""></el-option>
+            <el-option v-for="(item,index) in classificationList"
+                       :key="index"
+                       :label="item.classificationName"
+                       :value="item.id"></el-option>
+          </el-select>
+        </li>
+        <li>
+          <label>搜索：</label>
+          <el-input placeholder="请输入课程名称/创建人"
+                    suffix-icon="el-icon-search"
+                    v-model="keyword"
+                    clearable
+                    size="small"></el-input>
+        </li>
+      </ul>
+      <div>
+        <el-button v-auth="'课程管理:新增'"
+                   type="info"
+                   round
+                   @click="addCourse">新增</el-button>
+        <el-button v-auth="'课程管理:批量删除'"
+                   type="primary"
+                   round
+                   @click="delAllData">批量删除</el-button>
+      </div>
+    </div>
 
-        <el-table :data="list" class="table" ref="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="id">
-            <el-table-column type="selection" width="80" align="center" :reserve-selection="true"></el-table-column>
-            <el-table-column type="index" width="100" label="序号" align="center">
-                <template slot-scope="scope">
-                    {{ scope.$index + (page - 1) * pageSize + 1 }}
-                </template>
-            </el-table-column>
-            <el-table-column prop="courseName" label="课程名称" align="center">
-            </el-table-column>
-            <el-table-column prop="courseClassification" label="课程分类" align="center" show-overflow-tooltip>
-            </el-table-column>
-            <el-table-column label="可见范围" align="center">
-              <template slot-scope="scope">
-                {{ regionName[scope.row.visibleRange] }}
-              </template>
-            </el-table-column>
-            <el-table-column prop="createTime" label="创建时间" align="center">
-            </el-table-column>
-            <el-table-column prop="founder" label="创建人" align="center">
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="250">
-                <template slot-scope="scope">
-                    <el-button v-auth="'课程管理:编辑信息'" type="text" @click="editCourse(scope.row)">编辑信息</el-button>
-                    <el-divider v-auth="'课程管理:编辑信息'" direction="vertical"></el-divider>
-                    <el-button v-auth="'课程管理:内容设置'" type="text" @click="config(scope.row)">内容设置</el-button>
-                    <el-divider v-auth="'课程管理:内容设置'" direction="vertical"></el-divider>
-                    <el-button v-auth="'课程管理:预览'" type="text" @click="preview(scope.row)">预览</el-button>
-                    <el-divider v-auth="'课程管理:预览'" direction="vertical"></el-divider>
-                    <el-button v-auth="'课程管理:删除'" type="text" @click="handleDelete(scope.row)">删除</el-button>
-                </template>
-            </el-table-column>
-            <el-table-column label="可授权状态" align="center" width="120">
-                <template slot-scope="scope">
-                    <!-- 列表展示中台的禁启用依据zt_open展示，职站的禁启用依据is_open展示 -->
-                    <!-- 中台禁用了这个学校发布的学校这边还能看到，但是学校这边不能启用。 -->
-                    <el-switch
-                        v-auth="'课程管理:禁用'"
-                        v-model="scope.row.isOpen"
-                        :active-value="0"
-                        :inactive-value="1"
-                        style="margin: 0 10px 0 5px"
-                        :active-text="scope.row.isOpen ? '关' : '开'"
-                        @change="switchOff($event,scope.row,scope.$index)"
-                    ></el-switch>
-                </template>
-            </el-table-column>
-        </el-table>
-        <div class="pagination">
-            <el-pagination background layout="total, prev, pager, next" :total="total" @current-change="handleCurrentChange" :current-page="page">
-            </el-pagination>
-        </div>
+    <el-table :data="list"
+              class="table"
+              ref="table"
+              stripe
+              header-align="center"
+              @selection-change="handleSelectionChange"
+              row-key="id">
+      <el-table-column type="selection"
+                       width="80"
+                       align="center"
+                       :reserve-selection="true"></el-table-column>
+      <el-table-column type="index"
+                       width="100"
+                       label="序号"
+                       align="center">
+        <template slot-scope="scope">
+          {{ scope.$index + (page - 1) * pageSize + 1 }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="courseName"
+                       label="课程名称"
+                       align="center">
+      </el-table-column>
+      <el-table-column prop="courseClassification"
+                       label="课程分类"
+                       align="center"
+                       show-overflow-tooltip>
+      </el-table-column>
+      <el-table-column label="可见范围"
+                       align="center">
+        <template slot-scope="scope">
+          {{ regionName[scope.row.visibleRange] }}
+        </template>
+      </el-table-column>
+      <el-table-column prop="createTime"
+                       label="创建时间"
+                       align="center">
+      </el-table-column>
+      <el-table-column prop="founder"
+                       label="创建人"
+                       align="center">
+      </el-table-column>
+      <el-table-column label="操作"
+                       align="center"
+                       width="250">
+        <template slot-scope="scope">
+          <el-button v-auth="'课程管理:编辑信息'"
+                     type="text"
+                     @click="editCourse(scope.row)">编辑信息</el-button>
+          <el-divider v-auth="'课程管理:编辑信息'"
+                      direction="vertical"></el-divider>
+          <el-button v-auth="'课程管理:内容设置'"
+                     type="text"
+                     @click="config(scope.row)">内容设置</el-button>
+          <el-divider v-auth="'课程管理:内容设置'"
+                      direction="vertical"></el-divider>
+          <el-button v-auth="'课程管理:预览'"
+                     type="text"
+                     @click="preview(scope.row)">预览</el-button>
+          <el-divider v-auth="'课程管理:预览'"
+                      direction="vertical"></el-divider>
+          <el-button v-auth="'课程管理:删除'"
+                     type="text"
+                     @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+      <el-table-column label="可授权状态"
+                       align="center"
+                       width="120">
+        <template slot-scope="scope">
+          <!-- 列表展示中台的禁启用依据zt_open展示，职站的禁启用依据is_open展示 -->
+          <!-- 中台禁用了这个学校发布的学校这边还能看到，但是学校这边不能启用。 -->
+          <el-switch v-auth="'课程管理:禁用'"
+                     v-model="scope.row.isOpen"
+                     :active-value="0"
+                     :inactive-value="1"
+                     style="margin: 0 10px 0 5px"
+                     :active-text="scope.row.isOpen ? '关' : '开'"
+                     @change="switchOff($event,scope.row,scope.$index)"></el-switch>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="pagination">
+      <el-pagination background
+                     layout="total, prev, pager, next"
+                     :total="total"
+                     @current-change="handleCurrentChange"
+                     :current-page="page">
+      </el-pagination>
     </div>
+  </div>
 </template>
 
 <script>
 import util from "@/libs/util";
 import Setting from '@/setting'
 export default {
-    name: "courseManagement",
-    data() {
-        return {
-            regionName: ['本校内', '全平台可见', '指定院校区域'],
-            timer: null,
-            keyword: "",
-            categoryId: '',
-            list: [],
-            multipleSelection: [],
-            classificationList: [],
-            page: +this.$route.query.page || 1, // 当前页码
-            pageSize: 10,
-            total: 0
-        };
-    },
-    watch: {
-        keyword: function(val) {
-            clearTimeout(this.searchTimer);
-            this.searchTimer = setTimeout(() => {
-                this.initData();
-            }, 500);
+  name: "courseManagement",
+  data () {
+    return {
+      regionName: ['本校内', '全平台可见', '指定院校区域'],
+      timer: null,
+      keyword: "",
+      categoryId: '',
+      list: [],
+      multipleSelection: [],
+      classificationList: [],
+      page: +this.$route.query.page || 1, // 当前页码
+      pageSize: 10,
+      total: 0
+    };
+  },
+  watch: {
+    keyword: function (val) {
+      clearTimeout(this.searchTimer);
+      this.searchTimer = setTimeout(() => {
+        this.initData();
+      }, 500);
+    }
+  },
+  mounted () {
+    this.getClassification();
+    this.getData();
+    this.$once('hook:beforeDestroy', function () {
+      clearInterval(this.timer)
+    })
+  },
+  methods: {
+    getList () {
+      this.$post(this.api.listTheoreticalCourse, {
+        pageNum: this.page,
+        pageSize: this.pageSize,
+        keyWord: this.keyword,
+        createPlatform: 1,
+        platformSource: Setting.platformSource,
+        categoryId: this.categoryId
+      }).then(({ page }) => {
+        this.list = page.records;
+        //原理论课程需求:
+        // 用户创建的理论课程，禁用时职站首页以及学生登录后的理论课程模块看不到对应的课程，创建的老师在理论课程管理还是可以看到该理论课程，可以编辑，但是无法启用。
+        // 即中台禁用的理论课程，即使是该院校老师创建的，老师端也不能自己启用，需要中台启用。
+        //1.判断当前院校禁启用状态为要启用时候再判断当前课程中台禁启用的状态
+        page.records.map(e => {
+          if (e.ztOpen) e.isOpen = 1
+        })
+        this.total = page.total;
+        if (!this.list.length && this.total) {
+          this.page--;
+          this.getData();
         }
+      }).catch(res => {
+      });
+    },
+    // 获取redis缓存
+    getRedis () {
+      this.$post(this.api.getRedisCache).then(({ data }) => {
+        data && this.getList()
+      }).catch(res => { })
+    },
+    getData () {
+      this.getList()
+      // if (!Setting.isDev) {
+      //   clearInterval(this.timer)
+      //   this.timer = setInterval(this.getRedis, 1000)
+      // }
     },
-    mounted() {
-      this.getClassification();
+    initData () {
+      this.page = 1;
       this.getData();
-      this.$once('hook:beforeDestroy', function() {
-        clearInterval(this.timer)
+    },
+    getClassification () {
+      this.$post(this.api.listClassification, {
+        pageNum: 1,
+        pageSize: 1000,
+        platformSource: Setting.platformSource
+      }).then(({ page }) => {
+        this.classificationList = page.records
+      }).catch(res => { })
+    },
+    preview (row) {
+      this.$router.push(`/course/preview?id=${row.id}`);
+    },
+    config (row) {
+      this.$router.push(`/course/contentSettings?id=${row.id}`);
+    },
+    addCourse () {
+      this.$router.push("/course/add");
+    },
+    editCourse (row) {
+      this.$router.push(`/course/add?id=${row.id}`);
+    },
+    handleDelete (row) {
+      this.$confirm("此删除操作不可逆，是否确认删除选中项？", "提示", {
+        type: "warning"
       })
+        .then(() => {
+          this.$post(`${this.api.delTheoreticalCourse}?ids=${row.id}`).then(res => {
+            util.successMsg("删除成功");
+            this.initData();
+          }).catch(res => {
+          });
+        })
+        .catch(() => {
+        });
+    },
+    handleSelectionChange (val) {
+      this.multipleSelection = val;
     },
-    methods: {
-        getList() {
-            this.$post(this.api.listTheoreticalCourse, {
-              pageNum: this.page,
-              pageSize: this.pageSize,
-              keyWord: this.keyword,
-              createPlatform: 1,
-              platformSource: Setting.platformSource,
-              categoryId: this.categoryId
-            }).then(({ page }) => {
-                this.list = page.records;
-                //原理论课程需求:
-                // 用户创建的理论课程，禁用时职站首页以及学生登录后的理论课程模块看不到对应的课程，创建的老师在理论课程管理还是可以看到该理论课程，可以编辑，但是无法启用。
-                // 即中台禁用的理论课程，即使是该院校老师创建的，老师端也不能自己启用，需要中台启用。
-                //1.判断当前院校禁启用状态为要启用时候再判断当前课程中台禁启用的状态
-                page.records.map(e => {
-                  if (e.ztOpen) e.isOpen = 1
-                })
-                this.total = page.total;
-                if (!this.list.length && this.total) {
-                    this.page--;
-                    this.getData();
-                }
+    delAllData () {
+      const list = this.multipleSelection
+      if (list.length != "") {
+        this.$confirm(`确定要删除吗？`, "提示", {
+          type: "warning"
+        })
+          .then(() => {
+            const data = []
+            list.map(e => {
+              data.push('ids=' + e.id)
+            })
+            this.$post(`${this.api.delTheoreticalCourse}?${data.join('&')}`).then(res => {
+              this.$refs.table.clearSelection();
+              util.successMsg("删除成功");
+              this.initData();
             }).catch(res => {
             });
-        },
-        // 获取redis缓存
-        getRedis() {
-          this.$post(this.api.getRedisCache).then(({ data }) => {
-            data && this.getList()
-          }).catch(res => {})
-        },
-        getData() {
-          this.getList()
-          if (!Setting.isDev) {
-            clearInterval(this.timer)
-            this.timer = setInterval(this.getRedis, 1000)
-          }
-        },
-        initData() {
-            this.page = 1;
-            this.getData();
-        },
-        getClassification() {
-          this.$post(this.api.listClassification, {
-            pageNum: 1,
-            pageSize: 1000,
-            platformSource: Setting.platformSource
-          }).then(({ page }) => {
-              this.classificationList = page.records
-          }).catch(res => {})
-        },
-        preview(row) {
-            this.$router.push(`/course/preview?id=${row.id}`);
-        },
-        config(row) {
-            this.$router.push(`/course/contentSettings?id=${row.id}`);
-        },
-        addCourse() {
-            this.$router.push("/course/add");
-        },
-        editCourse(row) {
-            this.$router.push(`/course/add?id=${row.id}`);
-        },
-        handleDelete(row) {
-            this.$confirm("此删除操作不可逆，是否确认删除选中项？", "提示", {
-                type: "warning"
-            })
-                .then(() => {
-                    this.$post(`${this.api.delTheoreticalCourse}?ids=${row.id}`).then(res => {
-                        util.successMsg("删除成功");
-                        this.initData();
-                    }).catch(res => {
-                    });
-                })
-                .catch(() => {
-                });
-        },
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
-        delAllData() {
-          const list = this.multipleSelection
-          if (list.length != "") {
-              this.$confirm(`确定要删除吗？`, "提示", {
-                  type: "warning"
-              })
-                  .then(() => {
-                    const data = []
-                    list.map(e => {
-                      data.push('ids=' + e.id)
-                    })
-                    this.$post(`${this.api.delTheoreticalCourse}?${data.join('&')}`).then(res => {
-                        this.$refs.table.clearSelection();
-                        util.successMsg("删除成功");
-                        this.initData();
-                    }).catch(res => {
-                    });
-                  }).catch(() => {
-              });
-          } else {
-              util.errorMsg("请先选择数据 ！");
-          }
-        },
-        handleCurrentChange(val) {
-            this.page = val;
-            this.$router.push(`list?page=${val}`)
-            this.getData();
-        },
-        switchOff(val, row) {
-          this.$post(this.api.disabledTheoreticalCourse, {
-            courseId: row.id,
-            isOpen: val,
-            type: 1 // 禁用平台来源(0中台，1职站)
-          }).then(res => {
-            val == 1 ? util.warningMsg('禁用成功') : util.successMsg('启用成功')
-          }).catch(err => {})
-        }
+          }).catch(() => {
+          });
+      } else {
+        util.errorMsg("请先选择数据 ！");
+      }
+    },
+    handleCurrentChange (val) {
+      this.page = val;
+      this.$router.push(`list?page=${val}`)
+      this.getData();
+    },
+    switchOff (val, row) {
+      this.$post(this.api.disabledTheoreticalCourse, {
+        courseId: row.id,
+        isOpen: val,
+        type: 1 // 禁用平台来源(0中台，1职站)
+      }).then(res => {
+        val == 1 ? util.warningMsg('禁用成功') : util.successMsg('启用成功')
+      }).catch(err => { })
     }
+  }
 };
 </script>
 
diff --git a/src/pages/match/add/step1.vue b/src/pages/match/add/step1.vue
index a148f68..fa18321 100644
--- a/src/pages/match/add/step1.vue
+++ b/src/pages/match/add/step1.vue
@@ -696,7 +696,7 @@ export default {
       this.$parent.showLoad()
       delete form.publishStatus
       if (status === 1) form.publishStatus = 1
-      form.isOpen = status ? 0 : 1 // 保存则禁用，发布则启用
+      form.ztOpen = status ? 0 : 1 // 保存则禁用，发布则启用
       form.releaseType = releaseType
 
       form.id = this.$route.query.id
diff --git a/src/pages/match/add/step2.vue b/src/pages/match/add/step2.vue
index 0daf10b..16a6f14 100644
--- a/src/pages/match/add/step2.vue
+++ b/src/pages/match/add/step2.vue
@@ -80,8 +80,7 @@
                   <span class="req">*</span>
                   团队参赛人数限制：
                   <el-radio v-model="item.teamNumLimitOpt"
-                            :label="0"
-                            @change="item.teamNumLimit = 0">不限制</el-radio>
+                            :label="0">不限制</el-radio>
                   <el-radio v-model="item.teamNumLimitOpt"
                             :label="1">自定义</el-radio>
                   <el-input v-model.number="item.teamNumLimit"
@@ -449,7 +448,7 @@ export default {
               }
               e.resultAnnouncementTime = +e.resultAnnouncementTime
             }
-            if (e.teamNumLimit) teamNumLimit += e.teamNumLimit // 各阶段自定义的人数之和
+            if (e.teamNumLimitOpt && e.teamNumLimit) teamNumLimit += e.teamNumLimit // 各阶段自定义的人数之和
           }
           if (invalid) return
           if (form.teamLimit && competitionType) {
@@ -461,9 +460,9 @@ export default {
       } else { // 保存草稿的情况下，只保存输入了阶段名称的阶段
         form.competitionStageList = form.competitionStageList.filter(e => e.stageName)
       }
-      for (const e of form.competitionStageList) {
-        if (!e.teamNumLimitOpt) e.teamNumLimit = 0
-      }
+      // for (const e of form.competitionStageList) {
+      //   if (!e.teamNumLimitOpt) e.teamNumLimit = 0
+      // }
       this.$parent.showLoad()
       this.pass = 1
       if (form.ruleId) {
diff --git a/src/pages/match/manage/matchInfo.vue b/src/pages/match/manage/matchInfo.vue
index dbabc51..ccddd58 100644
--- a/src/pages/match/manage/matchInfo.vue
+++ b/src/pages/match/manage/matchInfo.vue
@@ -435,7 +435,6 @@ export default {
         status = 5;
       }
       this.status = status
-      console.log("🚀 ~ file: matchInfo.vue:350 ~ handleStatus ~ status", status)
     },
     // 编辑保存
     edit (showMsg) {
diff --git a/src/pages/product/show/index.vue b/src/pages/product/show/index.vue
index 4ad1f18..819f6b7 100644
--- a/src/pages/product/show/index.vue
+++ b/src/pages/product/show/index.vue
@@ -533,6 +533,7 @@ export default {
             margin-bottom: 15px;
             color: #333;
             font-size: 14px;
+            font-weight: 600;
         }
         .sectionName {
             position: relative;
diff --git a/src/pages/screen/index.vue b/src/pages/screen/index.vue
index baab042..7e44446 100644
--- a/src/pages/screen/index.vue
+++ b/src/pages/screen/index.vue
@@ -772,7 +772,7 @@ export default {
         sort: 0,
         isShelves: 0,
         hotTag: 1,
-        purchaseStatus: 1
+        purchaseStatus: this.token ? 1 : ''
       })
       if (cousrseRes) {
         const courseList = cousrseRes.page.records
@@ -1063,6 +1063,8 @@ export default {
           }],
           yAxis: [{
             type: 'value',
+            minInterval: 1,
+            min: 0,
             axisTick: {
               show: false
             },
@@ -1072,6 +1074,7 @@ export default {
               }
             },
             axisLabel: {
+              // interval: 5,
               margin: 10,
               textStyle: {
                 fontSize: 12,
diff --git a/src/pages/system/list/index.vue b/src/pages/system/list/index.vue
index 58168aa..7e0ae13 100644
--- a/src/pages/system/list/index.vue
+++ b/src/pages/system/list/index.vue
@@ -1,13 +1,18 @@
 <template>
-    <div class="page" style="padding: 0">
-        <div class="tabs">
-            <a class="item" v-for="(item,index) in tabs" :key="index" :class="{active: index == active}" @click="tabChange(index)">{{ item }}</a>
-        </div>
-
-        <staff v-if="active == 'staff'"></staff>
-        <role v-if="active == 'role'"></role>
-        <logo v-if="active == 'logo'"></logo>
+  <div class="page"
+       style="padding: 0">
+    <div class="tabs">
+      <a class="item"
+         v-for="(item,index) in tabs"
+         :key="index"
+         :class="{active: index == active}"
+         @click="tabChange(index)">{{ item }}</a>
     </div>
+
+    <staff v-if="active == 'staff'"></staff>
+    <role v-if="active == 'role'"></role>
+    <logo v-if="active == 'logo'"></logo>
+  </div>
 </template>
 
 <script>
@@ -17,46 +22,45 @@ import staff from "./staff";
 import role from "./role";
 import logo from "./logo";
 export default {
-    data() {
-        return {
-            active: "staff",
-            tabs: {
-                staff: "员工管理",
-                role: "角色权限",
-                logo: "系统logo设置",
-            }
-        };
-    },
-    computed: {
-      ...mapState('auth', [
-        'btns'
-      ])
-    },
-    components: {
-        staff,
-        role,
-        logo
-    },
-    created() {
-      Setting.dynamicRoute && this.initTabs()
-    },
-    methods: {
-      tabChange(index) {
-        this.active = index
-      },
-      initTabs() {
-        const { btns } = this
-        const tab1 = btns.includes('/system/list:员工管理')
-        const tab2 = btns.includes('/system/list:角色权限')
-        const tab3 = btns.includes('/system/list:系统logo设置')
-        tab1 || delete this.tabs.staff
-        tab2 || delete this.tabs.role
-        tab3 || delete this.tabs.logo
+  data () {
+    return {
+      active: "staff",
+      tabs: {
+        staff: "教师管理",
+        role: "角色权限",
+        logo: "系统logo设置",
       }
+    };
+  },
+  computed: {
+    ...mapState('auth', [
+      'btns'
+    ])
+  },
+  components: {
+    staff,
+    role,
+    logo
+  },
+  created () {
+    Setting.dynamicRoute && this.initTabs()
+  },
+  methods: {
+    tabChange (index) {
+      this.active = index
+    },
+    initTabs () {
+      const { btns } = this
+      const tab1 = btns.includes('/system/list:员工管理')
+      const tab2 = btns.includes('/system/list:角色权限')
+      const tab3 = btns.includes('/system/list:系统logo设置')
+      tab1 || delete this.tabs.staff
+      tab2 || delete this.tabs.role
+      tab3 || delete this.tabs.logo
     }
+  }
 };
 </script>
 
 <style lang="scss" scoped>
-
 </style>
\ No newline at end of file
diff --git a/src/pages/system/list/staff.vue b/src/pages/system/list/staff.vue
index 0df5c9c..1d011a7 100644
--- a/src/pages/system/list/staff.vue
+++ b/src/pages/system/list/staff.vue
@@ -1,120 +1,206 @@
 <template>
-    <div class="wrap">
-        <div class="side">
-            <org ref="org" @getSingle="getSingle" @getCheck="getCheck"></org>
-        </div>
-
-        <div class="right">
-            <h6 class="p-title">筛选</h6>
-            <div class="tool">
-                <ul class="filter">
-                    <li>
-                        <el-input placeholder="请输入员工姓名/工号" prefix-icon="el-icon-search" v-model.trim="keyword" clearable></el-input>
-                    </li>
-                </ul>
-                <div>
-                    <el-button v-auth="'员工管理:新增员工'" type="info" round @click="addTeacher">新增员工</el-button>
-                    <el-button v-auth="'员工管理:批量导入'" type="primary" round @click="batchImport">批量导入</el-button>
-                    <el-button v-auth="'员工管理:批量删除'" type="primary" round @click="delAllSelection">批量删除</el-button>
-                </div>
-            </div>
+  <div class="wrap">
+    <div class="side">
+      <org ref="org"
+           @getSingle="getSingle"
+           @getCheck="getCheck"></org>
+    </div>
 
-            <el-table :data="listData" class="table" ref="table" stripe header-align="center" @selection-change="handleSelectionChange">
-                <el-table-column type="selection" width="55" align="center"></el-table-column>
-                <el-table-column type="index" label="序号" width="55" align="center"></el-table-column>
-                <el-table-column prop="userName" label="职工姓名" align="center"></el-table-column>
-                <el-table-column prop="workNumber" label="职工工号" align="center"></el-table-column>
-                <el-table-column prop="dept" label="部门" align="center"></el-table-column>
-                <el-table-column prop="roleName" label="账号角色" align="center"></el-table-column>
-                <el-table-column prop="logInNumber" label="登录次数" align="center"></el-table-column>
-                <el-table-column prop="lastLoginTime" label="上次登录时间" align="center"></el-table-column>
-                <el-table-column label="操作" width="200" align="center">
-                    <template slot-scope="scope">
-                        <el-button v-auth="'员工管理:员工查看'" type="text" @click="showTeacher(scope.row)">查看</el-button>
-                        <el-button v-auth="'员工管理:员工编辑'" type="text" @click="editTeacher(scope.row)">编辑</el-button>
-                        <el-button v-auth="'员工管理:重置密码'" type="text" @click="resetPassword(scope.row)">重置密码</el-button>
-                        <el-button v-auth="'员工管理:员工删除'" type="text" @click="delTeacher(scope.row)">删除</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <div class="pagination">
-                <el-pagination background layout="total, prev, pager, next" :current-page="page" @current-change="handleCurrentChange" :total="total"></el-pagination>
-            </div>
+    <div class="right">
+      <h6 class="p-title">筛选</h6>
+      <div class="tool">
+        <ul class="filter">
+          <li>
+            <el-input placeholder="请输入教师姓名/工号"
+                      prefix-icon="el-icon-search"
+                      v-model.trim="keyword"
+                      clearable></el-input>
+          </li>
+        </ul>
+        <div>
+          <el-button v-auth="'员工管理:新增员工'"
+                     type="info"
+                     round
+                     @click="addTeacher">新增教师</el-button>
+          <el-button v-auth="'员工管理:批量导入'"
+                     type="primary"
+                     round
+                     @click="batchImport">批量导入</el-button>
+          <el-button v-auth="'员工管理:批量删除'"
+                     type="primary"
+                     round
+                     @click="delAllSelection">批量删除</el-button>
         </div>
+      </div>
+
+      <el-table :data="listData"
+                class="table"
+                ref="table"
+                stripe
+                header-align="center"
+                @selection-change="handleSelectionChange">
+        <el-table-column type="selection"
+                         width="55"
+                         align="center"></el-table-column>
+        <el-table-column type="index"
+                         label="序号"
+                         width="55"
+                         align="center"></el-table-column>
+        <el-table-column prop="userName"
+                         label="教师姓名"
+                         align="center"></el-table-column>
+        <el-table-column prop="workNumber"
+                         label="教师工号"
+                         align="center"></el-table-column>
+        <el-table-column prop="dept"
+                         label="部门"
+                         align="center"></el-table-column>
+        <el-table-column prop="roleName"
+                         label="账号角色"
+                         align="center"></el-table-column>
+        <el-table-column prop="logInNumber"
+                         label="登录次数"
+                         align="center"></el-table-column>
+        <el-table-column prop="lastLoginTime"
+                         label="上次登录时间"
+                         align="center"></el-table-column>
+        <el-table-column label="操作"
+                         width="200"
+                         align="center">
+          <template slot-scope="scope">
+            <el-button v-auth="'员工管理:员工查看'"
+                       type="text"
+                       @click="showTeacher(scope.row)">查看</el-button>
+            <el-button v-auth="'员工管理:员工编辑'"
+                       type="text"
+                       @click="editTeacher(scope.row)">编辑</el-button>
+            <el-button v-auth="'员工管理:重置密码'"
+                       type="text"
+                       @click="resetPassword(scope.row)">重置密码</el-button>
+            <el-button v-auth="'员工管理:员工删除'"
+                       type="text"
+                       @click="delTeacher(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="pagination">
+        <el-pagination background
+                       layout="total, prev, pager, next"
+                       :current-page="page"
+                       @current-change="handleCurrentChange"
+                       :total="total"></el-pagination>
+      </div>
+    </div>
 
-        <el-dialog :title="isDetail ? '查看员工' : (isAdd ? '新增员工' : '编辑员工')" :visible.sync="teacherVisible"
-                   width="30%" @close="closeTeacher" class="dialog" :close-on-click-modal="false">
-            <el-form ref="form" :model="form" :rules="rules" label-width="150px" :disabled="isDetail" style='margin-right: 80px;'>
-                <el-form-item prop="workNumber" label="工号">
-                    <el-input v-model.trim="form.workNumber" placeholder="请输入职工工号" @blur="workNumberChange"></el-input>
-                </el-form-item>
-                <el-form-item prop="userName" label="用户姓名">
-                    <el-input v-model.trim="form.userName" placeholder="请输入员工姓名"></el-input>
-                </el-form-item>
-                <el-form-item prop="roleValue" label="账号角色">
-                    <el-select v-model="form.roleValue" @change="roleChange" @remove-tag="roleRemove" multiple style="width: 100%;height: 32px">
-                        <el-option
-                            v-for="item in roleList"
-                            :key="item.id"
-                            :label="item.roleName"
-                            :value="item.id">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item prop="uniqueIdentification" label="唯一标识">
-                    <el-input disabled v-model.trim="form.uniqueIdentification" placeholder="请输入职工工号获取唯一标识"></el-input>
-                </el-form-item>
-                <el-form-item v-for="item in form.roleAndDeptList" :label="`${item.roleName}所属部门`" :rules="{
+    <el-dialog :title="isDetail ? '查看教师' : (isAdd ? '新增教师' : '编辑教师')"
+               :visible.sync="teacherVisible"
+               width="30%"
+               @close="closeTeacher"
+               class="dialog"
+               :close-on-click-modal="false">
+      <el-form ref="form"
+               :model="form"
+               :rules="rules"
+               label-width="150px"
+               :disabled="isDetail"
+               style='margin-right: 80px;'>
+        <el-form-item prop="workNumber"
+                      label="工号">
+          <el-input v-model.trim="form.workNumber"
+                    placeholder="请输入教师工号"
+                    @blur="workNumberChange"></el-input>
+        </el-form-item>
+        <el-form-item prop="userName"
+                      label="用户姓名">
+          <el-input v-model.trim="form.userName"
+                    placeholder="请输入教师姓名"></el-input>
+        </el-form-item>
+        <el-form-item prop="roleValue"
+                      label="账号角色">
+          <el-select v-model="form.roleValue"
+                     @change="roleChange"
+                     @remove-tag="roleRemove"
+                     multiple
+                     style="width: 100%;height: 32px">
+            <el-option v-for="item in roleList"
+                       :key="item.id"
+                       :label="item.roleName"
+                       :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="uniqueIdentification"
+                      label="唯一标识">
+          <el-input disabled
+                    v-model.trim="form.uniqueIdentification"
+                    placeholder="请输入教师工号获取唯一标识"></el-input>
+        </el-form-item>
+        <el-form-item v-for="item in form.roleAndDeptList"
+                      :label="`${item.roleName}所属部门`"
+                      :rules="{
       required: true, message: '请选择', trigger: 'change'
     }">
-                    <el-cascader
-                        v-model="item.cascaderValue"
-                        :options="orgList"
-                        :props="casProps"
-                        style="width: 100%"
-                    ></el-cascader>
-                </el-form-item>
-                <el-form-item prop="phone" label="手机号">
-                    <el-input v-model.trim="form.phone" placeholder="请输入手机号" maxlength="11"></el-input>
-                </el-form-item>
-                <el-form-item prop="email" label="邮箱">
-                    <el-input v-model.trim="form.email" placeholder="请输入邮箱"></el-input>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer" v-if="!isDetail">
-                <el-button @click="closeTeacher">取 消</el-button>
-                <el-button type="primary" @click="saveSure('form')">确 定</el-button>
-            </span>
-        </el-dialog>
+          <el-cascader v-model="item.cascaderValue"
+                       :options="orgList"
+                       :props="casProps"
+                       style="width: 100%"></el-cascader>
+        </el-form-item>
+        <el-form-item prop="phone"
+                      label="手机号">
+          <el-input v-model.trim="form.phone"
+                    placeholder="请输入手机号"
+                    maxlength="11"></el-input>
+        </el-form-item>
+        <el-form-item prop="email"
+                      label="邮箱">
+          <el-input v-model.trim="form.email"
+                    placeholder="请输入邮箱"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer"
+            class="dialog-footer"
+            v-if="!isDetail">
+        <el-button @click="closeTeacher">取 消</el-button>
+        <el-button type="primary"
+                   @click="saveSure('form')">确 定</el-button>
+      </span>
+    </el-dialog>
 
-        <el-dialog title="批量导入" :visible.sync="importVisible" width="24%" :close-on-click-modal="false">
-            <div style="text-align: center">
-                <div style="margin-bottom: 10px;">
-                    <el-button type="primary" @click="downLoad">模板下载<i class="el-icon-download el-icon--right"></i></el-button>
-                </div>
-                <el-upload
-                    name="file"
-                    accept=".xls,.xlsx"
-                    :on-remove="handleRemove"
-                    :on-error="uploadError"
-                    :on-success="uploadSuccess"
-                    :before-remove="beforeRemove"
-                    :limit="1"
-                    :on-exceed="handleExceed"
-                    :action="this.api.importStaff"
-                    :file-list="uploadList"
-                    :headers="headers"
-                >
-                    <el-button type="primary" class="ml20">上传文件<i class="el-icon-upload2 el-icon--right"></i></el-button>
-                </el-upload>
-                <el-link v-if="uploadFaild" type="primary" @click="showFaild">部分数据导入失败，查看失败原因</el-link>
-            </div>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="importVisible = false">取 消</el-button>
-                <el-button type="primary" @click="uploadSure">确 定</el-button>
-            </span>
-        </el-dialog>
-    </div>
+    <el-dialog title="批量导入"
+               :visible.sync="importVisible"
+               width="24%"
+               :close-on-click-modal="false">
+      <div style="text-align: center">
+        <div style="margin-bottom: 10px;">
+          <el-button type="primary"
+                     @click="downLoad">模板下载<i class="el-icon-download el-icon--right"></i></el-button>
+        </div>
+        <el-upload name="file"
+                   accept=".xls,.xlsx"
+                   :on-remove="handleRemove"
+                   :on-error="uploadError"
+                   :on-success="uploadSuccess"
+                   :before-remove="beforeRemove"
+                   :limit="1"
+                   :on-exceed="handleExceed"
+                   :action="this.api.importStaff"
+                   :file-list="uploadList"
+                   :headers="headers">
+          <el-button type="primary"
+                     class="ml20">上传文件<i class="el-icon-upload2 el-icon--right"></i></el-button>
+        </el-upload>
+        <el-link v-if="uploadFaild"
+                 type="primary"
+                 @click="showFaild">部分数据导入失败，查看失败原因</el-link>
+      </div>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button @click="importVisible = false">取 消</el-button>
+        <el-button type="primary"
+                   @click="uploadSure">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 <script>
 import Setting from "@/setting";
@@ -122,446 +208,446 @@ import util from "@/libs/util";
 import org from "./staffSide"
 import { mapState } from "vuex";
 export default {
-    data() {
-        return {
-            exportCode: "",
-            headers: {
-                token: util.local.get(Setting.tokenKey)
-            },
-            isDetail: false,
-            isAdd: false,
-            teacherVisible: false,
-            roleList: [], // 角色列表
-            orgList: [], // 员工组织架构列表
-            casProps: {
-                value: 'id'
-            },
-            originForm: {},
-            form: {
-                accountId: "",
-                account: "",
-                userName: "",
-                roleValue: [],
-                roleAndDeptList: [],
-                uniqueIdentification: "",
-                workNumber: "",
-                phone: "",
-                email: ""
-            },
-            rules: {
-                userName: [
-                    { required: true, message: "请输入用户姓名", trigger: "blur" }
-                ],
-                roleValue: [
-                    { required: true, message: "请选择账号角色", trigger: "change" }
-                ],
-                workNumber: [
-                    { required: true, message: "请输入工号", trigger: 'blur' },
-                    {
-                        pattern: /^[A-Za-z0-9]*$/,
-                        message: "职工工号必须为数字或英文",
-                        trigger: "blur"
-                    }
-                ],
-                uniqueIdentification: [
-                    // { required: true, message: '请输入唯一标识', trigger: 'blur' },
-                ],
-                phone: [
-                    { pattern: /^1[3456789]\d{9}$/, message: "请输入正确的手机号", trigger: "blur"}
-                ],
-                email: [
-                    {
-                        pattern: /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/,
-                        message: "请输入正确的邮箱",
-                        trigger: "blur"
-                    }
-                ],
-            },
-            workNumberReapeat: false,
-            phoneRepeat: false,
-            emailRepeat: false,
+  data () {
+    return {
+      exportCode: "",
+      headers: {
+        token: util.local.get(Setting.tokenKey)
+      },
+      isDetail: false,
+      isAdd: false,
+      teacherVisible: false,
+      roleList: [], // 角色列表
+      orgList: [], // 员工组织架构列表
+      casProps: {
+        value: 'id'
+      },
+      originForm: {},
+      form: {
+        accountId: "",
+        account: "",
+        userName: "",
+        roleValue: [],
+        roleAndDeptList: [],
+        uniqueIdentification: "",
+        workNumber: "",
+        phone: "",
+        email: ""
+      },
+      rules: {
+        userName: [
+          { required: true, message: "请输入用户姓名", trigger: "blur" }
+        ],
+        roleValue: [
+          { required: true, message: "请选择账号角色", trigger: "change" }
+        ],
+        workNumber: [
+          { required: true, message: "请输入工号", trigger: 'blur' },
+          {
+            pattern: /^[A-Za-z0-9]*$/,
+            message: "教师工号必须为数字或英文",
+            trigger: "blur"
+          }
+        ],
+        uniqueIdentification: [
+          // { required: true, message: '请输入唯一标识', trigger: 'blur' },
+        ],
+        phone: [
+          { pattern: /^1[3456789]\d{9}$/, message: "请输入正确的手机号", trigger: "blur" }
+        ],
+        email: [
+          {
+            pattern: /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/,
+            message: "请输入正确的邮箱",
+            trigger: "blur"
+          }
+        ],
+      },
+      workNumberReapeat: false,
+      phoneRepeat: false,
+      emailRepeat: false,
 
-            listData: [], // 员工列表数据
-            keyword: "",
-            page: 1,
-            pageSize: 10,
-            total: 0,
-            multipleSelection: [], // 多选
+      listData: [], // 员工列表数据
+      keyword: "",
+      page: 1,
+      pageSize: 10,
+      total: 0,
+      multipleSelection: [], // 多选
 
-            importVisible: false, // 批量导入对话框
-            uploadList: [], // 上传文件列表
-            uploadFaild: false, // 上传失败
+      importVisible: false, // 批量导入对话框
+      uploadList: [], // 上传文件列表
+      uploadFaild: false, // 上传失败
 
-            gradeId: "", // 员工年级ID
-            staffArchitectureId: "", // 员工部门ID
-            submiting: false // 新增编辑员工防抖标识
-        };
-    },
-    components: {
-        org
+      gradeId: "", // 员工年级ID
+      staffArchitectureId: "", // 员工部门ID
+      submiting: false // 新增编辑员工防抖标识
+    };
+  },
+  components: {
+    org
+  },
+  computed: {
+    ...mapState("user", [
+      'schoolId'
+    ])
+  },
+  watch: {
+    keyword: function (val) {
+      clearTimeout(this.searchTimer);
+      this.searchTimer = setTimeout(() => {
+        this.initData();
+      }, 500);
+    }
+  },
+  mounted () {
+    this.originForm = JSON.parse(JSON.stringify(this.form))
+    this.getRoleData()
+    this.getData()
+  },
+  methods: {
+    getSingle (data) {
+      this.staffArchitectureId = data.gradeId ? '' : data.staffArchitectureId
+      this.gradeId = data.gradeId || ''
+      this.initData()
     },
-    computed: {
-        ...mapState("user", [
-            'schoolId'
-        ])
+    getCheck (data) {
+      const marjorIds = []
+      const depIds = []
+      data.forEach(e => {
+        e.gradeId ? depIds.push(e.gradeId) : marjorIds.push(e.staffArchitectureId)
+      });
+      this.staffArchitectureId = marjorIds.toString()
+      this.gradeId = depIds.toString()
+      this.initData()
     },
-    watch: {
-        keyword: function(val) {
-            clearTimeout(this.searchTimer);
-            this.searchTimer = setTimeout(() => {
-                this.initData();
-            }, 500);
-        }
+    initData () {
+      this.$refs.table.clearSelection()
+      this.page = 1
+      this.getData()
     },
-    mounted() {
-        this.originForm = JSON.parse(JSON.stringify(this.form))
-        this.getRoleData()
-        this.getData()
+    getData () { // 获取员工列表数据
+      let data = {
+        keyWord: this.keyword,
+        pageNum: this.page,
+        pageSize: this.pageSize,
+        staffArchitectureId: this.staffArchitectureId,
+        gradeId: this.gradeId
+      };
+      this.$post(this.api.staffList, data).then(res => {
+        this.listData = res.page.records;
+        this.total = res.page.total;
+      }).catch(res => { });
     },
-    methods: {
-        getSingle(data) {
-            this.staffArchitectureId = data.gradeId ? '' : data.staffArchitectureId
-            this.gradeId = data.gradeId || ''
-            this.initData()
-        },
-        getCheck(data) {
-            const marjorIds = []
-            const depIds = []
-            data.forEach(e => {
-                e.gradeId ? depIds.push(e.gradeId) : marjorIds.push(e.staffArchitectureId)
-            });
-            this.staffArchitectureId = marjorIds.toString()
-            this.gradeId = depIds.toString()
-            this.initData()
-        },
-        initData() {
-            this.$refs.table.clearSelection()
-            this.page = 1
-            this.getData()
-        },
-        getData() { // 获取员工列表数据
-            let data = {
-                keyWord: this.keyword,
-                pageNum: this.page,
-                pageSize: this.pageSize,
-                staffArchitectureId: this.staffArchitectureId,
-                gradeId: this.gradeId
-            };
-            this.$post(this.api.staffList, data).then(res => {
-                this.listData = res.page.records;
-                this.total = res.page.total;
-            }).catch(res => {});
-        },
-        getRoleData() { // 获取角色数据
-            this.roleList =[];
-            this.$get(`${this.api.roleList}?page=1&size=100&name=&platformId=1&port=0`).then(res => {
-                for(var i=0;i<res.rolePage.records.length;i++){
-                    if (res.rolePage.records[i].roleName == '超级管理员'){
+    getRoleData () { // 获取角色数据
+      this.roleList = [];
+      this.$get(`${this.api.roleList}?page=1&size=100&name=&platformId=1&port=0`).then(res => {
+        for (var i = 0; i < res.rolePage.records.length; i++) {
+          if (res.rolePage.records[i].roleName == '超级管理员') {
 
-                    }else{
-                        this.roleList.push(res.rolePage.records[i])
-                    }
-                }
-                // this.roleList = res.rolePage.records;
-            }).catch(res => {});
-        },
-        closeTeacher() { // 关闭新增/编辑员工对话框
-            this.form = {
-                accountId: "",
-                account: "",
-                userName: "",
-                roleValue: [],
-                roleAndDeptList: [],
-                uniqueIdentification: "",
-                workNumber: "",
-                phone: "",
-                email: ""
-            };
-            this.$refs.form.clearValidate();
-            this.teacherVisible = false;
-        },
-        addTeacher() { // 新增员工
-            this.isDetail = false;
-            this.isAdd = true;
-            this.teacherVisible = true;
-            this.orgList = this.$refs.org.orgList;
-        },
-        getStaffDetail(accountId) { // 获取员工详情
-            this.$get(`${this.api.staffDetail}?accountId=${accountId}`).then(res => {
-                let { data } = res;
-                this.form = data;
-                this.form.roleValue = data.roleAndDeptList.map(i => i.roleId);
-                this.form.roleAndDeptList = data.roleAndDeptList.map(i => {
-                    i.cascaderValue = [i.staffArchitectureId, i.gradeId]
-                    return i;
-                });
-                console.log(22, this.form)
-            }).catch(res => {});
-        },
-        resetPassword(row) { // 重置密码
-            this.$confirm(`重置后的密码为：${Setting.initialPassword}，确定重置？`, "提示", { type: "warning" }).then(() => {
-                this.$get(`${this.api.resetPassword}?userId=${row.userId}&newPwd=1122aa`).then(res => {
-                    util.successMsg("重置成功");
-                }).catch(res => {
-                });
-            }).catch(() => {
-            });
-        },
-        editTeacher(row) { // 处理编辑
-            this.isDetail = false;
-            this.isAdd = false;
-            this.teacherVisible = true;
-            this.orgList = this.$refs.org.orgList;
-            this.getStaffDetail(row.accountId);
-        },
-        showTeacher(row) { // 处理查看
-            this.isDetail = true;
-            this.isAdd = false;
-            this.teacherVisible = true;
-            this.orgList = this.$refs.org.orgList;
-            this.getStaffDetail(row.accountId);
-        },
-        // 组合账号
-        renderAccount() {
-          const form = this.form
-          // 平台id-端id-schoolId-workNumber组成账号
-          form.account = `${Setting.platformId}-0-${this.schoolId}-${form.workNumber}`
-        },
-        workNumberChange() { // 切换工号
-          const form = this.form
-          const { workNumber, accountId } = form
-          if (workNumber) {
-            this.$post(`${this.api.checkWorkNumOrAccount}?platformId=${Setting.platformId}&type=${Setting.platformType}${accountId ? `&accountId=${form.accountId}` : ''}&workNumber=${workNumber}&account=`).then(res => {
-              if (res.status === 200) {
-                this.workNumberReapeat = false
-                this.renderAccount()
-              }
-            }).catch( err => {
-              this.workNumberReapeat = true
-            })
           } else {
+            this.roleList.push(res.rolePage.records[i])
+          }
+        }
+        // this.roleList = res.rolePage.records;
+      }).catch(res => { });
+    },
+    closeTeacher () { // 关闭新增/编辑员工对话框
+      this.form = {
+        accountId: "",
+        account: "",
+        userName: "",
+        roleValue: [],
+        roleAndDeptList: [],
+        uniqueIdentification: "",
+        workNumber: "",
+        phone: "",
+        email: ""
+      };
+      this.$refs.form.clearValidate();
+      this.teacherVisible = false;
+    },
+    addTeacher () { // 新增员工
+      this.isDetail = false;
+      this.isAdd = true;
+      this.teacherVisible = true;
+      this.orgList = this.$refs.org.orgList;
+    },
+    getStaffDetail (accountId) { // 获取员工详情
+      this.$get(`${this.api.staffDetail}?accountId=${accountId}`).then(res => {
+        let { data } = res;
+        this.form = data;
+        this.form.roleValue = data.roleAndDeptList.map(i => i.roleId);
+        this.form.roleAndDeptList = data.roleAndDeptList.map(i => {
+          i.cascaderValue = [i.staffArchitectureId, i.gradeId]
+          return i;
+        });
+        console.log(22, this.form)
+      }).catch(res => { });
+    },
+    resetPassword (row) { // 重置密码
+      this.$confirm(`重置后的密码为：${Setting.initialPassword}，确定重置？`, "提示", { type: "warning" }).then(() => {
+        this.$get(`${this.api.resetPassword}?userId=${row.userId}&newPwd=1122aa`).then(res => {
+          util.successMsg("重置成功");
+        }).catch(res => {
+        });
+      }).catch(() => {
+      });
+    },
+    editTeacher (row) { // 处理编辑
+      this.isDetail = false;
+      this.isAdd = false;
+      this.teacherVisible = true;
+      this.orgList = this.$refs.org.orgList;
+      this.getStaffDetail(row.accountId);
+    },
+    showTeacher (row) { // 处理查看
+      this.isDetail = true;
+      this.isAdd = false;
+      this.teacherVisible = true;
+      this.orgList = this.$refs.org.orgList;
+      this.getStaffDetail(row.accountId);
+    },
+    // 组合账号
+    renderAccount () {
+      const form = this.form
+      // 平台id-端id-schoolId-workNumber组成账号
+      form.account = `${Setting.platformId}-0-${this.schoolId}-${form.workNumber}`
+    },
+    workNumberChange () { // 切换工号
+      const form = this.form
+      const { workNumber, accountId } = form
+      if (workNumber) {
+        this.$post(`${this.api.checkWorkNumOrAccount}?platformId=${Setting.platformId}&type=${Setting.platformType}${accountId ? `&accountId=${form.accountId}` : ''}&workNumber=${workNumber}&account=`).then(res => {
+          if (res.status === 200) {
+            this.workNumberReapeat = false
             this.renderAccount()
           }
-        },
-        phoneChange() { // 切换手机号
-            let regex = /^1[3456789]\d{9}$/;
-            if (regex.test(this.form.phone)) {
-                let url = "";
-                if (this.isAdd) {
-                    url = `${this.api.checkEmailOrPhone}?phone=${this.form.phone}&email=`;
-                } else {
-                    url = `${this.api.checkEmailOrPhone}?accountId=${this.form.accountId}&phone=${this.form.phone}&email=`;
-                }
-                this.$post(url).then(res => {
-                    if (res.status === 200) {
-                        this.phoneRepeat = false;
-                    }
-                }).catch( err => {
-                    this.phoneRepeat = true;
-                });
-            }
-        },
-        emailChange() { // 切换邮箱
-            let regex = /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/;
-            if (regex.test(this.form.email)) {
-                let url = "";
-                if (this.isAdd) {
-                    url = `${this.api.checkEmailOrPhone}?email=${this.form.email}&phone=`;
-                } else {
-                    url = `${this.api.checkEmailOrPhone}?accountId=${this.form.accountId}&email=${this.form.email}&phone=`;
-                }
-                this.$post(url).then(res => {
-                    if (res.status === 200) {
-                        this.emailRepeat = false;
-                    }
-                }).catch( err => {
-                    this.emailRepeat = true;
-                });
-            }
-        },
-        roleChange(value) { // 处理切换角色
-            console.log(this.form.roleValue)
-            if (value.length) {
-                let ids = this.form.roleAndDeptList.map(e => e.roleId);
-                this.roleList.forEach(i => {
-                    let obj = {
-                        roleId: "",
-                        roleName: "",
-                        cascaderValue: []
-                    };
-                    if (value.includes(i.id) && !ids.includes(i.id)) {
-                        console.log(i)
-                        obj.roleId = i.id;
-                        obj.roleName = i.roleName;
-                        this.form.roleAndDeptList.push(obj);
-                    }
-                });
-            } else {
-                this.form.roleAndDeptList.splice(0);
-            }
-        },
-        roleRemove(value) { // 处理移除角色
-            let list = [];
-            for(var i=0;i<this.form.roleAndDeptList.length;i++){
-                if (this.form.roleAndDeptList[i].roleId == value){
+        }).catch(err => {
+          this.workNumberReapeat = true
+        })
+      } else {
+        this.renderAccount()
+      }
+    },
+    phoneChange () { // 切换手机号
+      let regex = /^1[3456789]\d{9}$/;
+      if (regex.test(this.form.phone)) {
+        let url = "";
+        if (this.isAdd) {
+          url = `${this.api.checkEmailOrPhone}?phone=${this.form.phone}&email=`;
+        } else {
+          url = `${this.api.checkEmailOrPhone}?accountId=${this.form.accountId}&phone=${this.form.phone}&email=`;
+        }
+        this.$post(url).then(res => {
+          if (res.status === 200) {
+            this.phoneRepeat = false;
+          }
+        }).catch(err => {
+          this.phoneRepeat = true;
+        });
+      }
+    },
+    emailChange () { // 切换邮箱
+      let regex = /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/;
+      if (regex.test(this.form.email)) {
+        let url = "";
+        if (this.isAdd) {
+          url = `${this.api.checkEmailOrPhone}?email=${this.form.email}&phone=`;
+        } else {
+          url = `${this.api.checkEmailOrPhone}?accountId=${this.form.accountId}&email=${this.form.email}&phone=`;
+        }
+        this.$post(url).then(res => {
+          if (res.status === 200) {
+            this.emailRepeat = false;
+          }
+        }).catch(err => {
+          this.emailRepeat = true;
+        });
+      }
+    },
+    roleChange (value) { // 处理切换角色
+      console.log(this.form.roleValue)
+      if (value.length) {
+        let ids = this.form.roleAndDeptList.map(e => e.roleId);
+        this.roleList.forEach(i => {
+          let obj = {
+            roleId: "",
+            roleName: "",
+            cascaderValue: []
+          };
+          if (value.includes(i.id) && !ids.includes(i.id)) {
+            console.log(i)
+            obj.roleId = i.id;
+            obj.roleName = i.roleName;
+            this.form.roleAndDeptList.push(obj);
+          }
+        });
+      } else {
+        this.form.roleAndDeptList.splice(0);
+      }
+    },
+    roleRemove (value) { // 处理移除角色
+      let list = [];
+      for (var i = 0; i < this.form.roleAndDeptList.length; i++) {
+        if (this.form.roleAndDeptList[i].roleId == value) {
 
-                }else{
-                    list.push(this.form.roleAndDeptList[i])
-                }
+        } else {
+          list.push(this.form.roleAndDeptList[i])
+        }
+      }
+      this.form.roleAndDeptList = list
+    },
+    async saveSure (form) {
+      this.$refs[form].validate((valid) => {
+        if (valid) {
+          if (this.submiting) return false
+          if (this.workNumberReapeat) return util.errorMsg('工号/学号已存在!');
+          if (this.phoneRepeat) return util.errorMsg("该手机号已存在");
+          if (this.emailRepeat) return util.errorMsg("该邮箱已存在");
+          let data = {
+            accountId: this.form.accountId,
+            account: this.form.account,
+            userName: this.form.userName,
+            roleAndDeptList: [],
+            uniqueIdentification: this.form.uniqueIdentification ? this.form.uniqueIdentification : new Date().getTime(),
+            workNumber: this.form.workNumber,
+            phone: this.form.phone,
+            email: this.form.email
+          };
+          if (this.form.roleAndDeptList.length) {
+            for (let i = 0; i < this.form.roleAndDeptList.length; i++) {
+              if (this.form.roleAndDeptList[i].cascaderValue.length < 2) {
+                util.warningMsg(`请选择${this.form.roleAndDeptList[i].roleName}所属部门`)
+                return;
+              } else {
+                let obj = {
+                  roleId: this.form.roleAndDeptList[i].roleId,
+                  staffArchitectureId: this.form.roleAndDeptList[i].cascaderValue[0],
+                  gradeId: this.form.roleAndDeptList[i].cascaderValue[1]
+                };
+                data.roleAndDeptList.push(obj);
+              }
             }
-            this.form.roleAndDeptList = list
-        },
-        async saveSure(form) {
-            this.$refs[form].validate((valid) => {
-                if (valid) {
-                    if (this.submiting) return false
-                    if (this.workNumberReapeat) return util.errorMsg('工号/学号已存在!');
-                    if (this.phoneRepeat) return util.errorMsg("该手机号已存在");
-                    if (this.emailRepeat) return util.errorMsg("该邮箱已存在");
-                    let data = {
-                        accountId: this.form.accountId,
-                        account: this.form.account,
-                        userName: this.form.userName,
-                        roleAndDeptList: [],
-                        uniqueIdentification: this.form.uniqueIdentification ? this.form.uniqueIdentification : new Date().getTime(),
-                        workNumber: this.form.workNumber,
-                        phone: this.form.phone,
-                        email: this.form.email
-                    };
-                    if (this.form.roleAndDeptList.length){
-                        for (let i = 0; i < this.form.roleAndDeptList.length; i++) {
-                            if (this.form.roleAndDeptList[i].cascaderValue.length < 2) {
-                                util.warningMsg(`请选择${this.form.roleAndDeptList[i].roleName}所属部门`)
-                                return;
-                            } else {
-                                let obj = {
-                                    roleId: this.form.roleAndDeptList[i].roleId,
-                                    staffArchitectureId: this.form.roleAndDeptList[i].cascaderValue[0],
-                                    gradeId: this.form.roleAndDeptList[i].cascaderValue[1]
-                                };
-                                data.roleAndDeptList.push(obj);
-                            }
-                        }
-                    }
-                    this.submiting = true
-                    if (this.form.accountId) {
-                        this.$post(this.api.modifyStaff, data).then(res => {
-                            util.successMsg("编辑成功");
-                            this.closeTeacher();
-                            this.getData();
-                            this.submiting = false
-                        }).catch(res => {
-                            this.submiting = false
-                        });
-                    } else {
-                        this.$post(this.api.saveStaff, data).then(res => {
-                            util.successMsg("添加成功");
-                            this.closeTeacher();
-                            this.getData();
-                            this.submiting = false
-                        }).catch(res => {
-                            this.submiting = false
-                        });
-                    }
-                } else {
-                    return false;
-                }
+          }
+          this.submiting = true
+          if (this.form.accountId) {
+            this.$post(this.api.modifyStaff, data).then(res => {
+              util.successMsg("编辑成功");
+              this.closeTeacher();
+              this.getData();
+              this.submiting = false
+            }).catch(res => {
+              this.submiting = false
             });
-        },
-        delTeacher(row) {
-            this.$confirm("确定要删除吗？", "提示", {
-                type: "warning"
-            }).then(() => {
-                this.$post(`${this.api.delStaff}?accountIds=${row.accountId}`).then(res => {
-                    util.successMsg("删除成功");
-                    this.getData();
-                }).catch(res => {});
-            }).catch(() => {});
-        },
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
-        delAllSelection() {
-            if (this.multipleSelection.length) {
-                // 批量删除
-                this.$confirm("确定要删除吗？", "提示", {
-                    type: "warning"
-                }).then(() => {
-                    let ids = this.multipleSelection.map(item => {
-                        return item.accountId;
-                    });
-                    this.$post(`${this.api.delStaff}?accountIds=${ids.toString()}`).then(res => {
-                        this.multipleSelection = [];
-                        this.$refs.table.clearSelection();
-                        util.successMsg("删除成功");
-                        this.getData();
-                    }).catch(res => {
-                    });
-                }).catch(() => {
-                });
-            } else {
-                util.errorMsg("请先选择员工 ！");
-            }
-        },
-        batchImport() {
-            this.importVisible = true;
-            this.uploadList = [];
-            this.uploadFaild = false;
-        },
-        searchTeacher() {
-            this.page = 1;
-            this.getData();
-        },
-        handleCurrentChange(val) {
-            this.page = val;
-            this.getData();
-        },
-        downLoad() {
-            location.href = this.api.staffTemplate;
-        },
-        showFaild() {
-            location.href = `${this.api.exportFailureStaff}?exportCode=${this.exportCode}`;
-        },
-        // 上传文件
-        handleExceed(files, fileList) {
-            util.warningMsg(
-                `当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！`
-            );
-        },
-        uploadSuccess(res, file, fileList) {
-            console.log(res);
-            this.uploadFaild = false;
-            if (res.status === 200) {
-                if (res.data.exportCode) {
-                    this.exportCode = res.data.exportCode;
-                    this.uploadFaild = true;
-                }
-                util.successMsg(`上传成功${res.data.successNum}，上传失败${res.data.failureNum}`);
-            } else {
-                res.message ? util.errorMsg(res.message) : util.errorMsg("上传失败，请检查数据");
-            }
-        },
-        uploadError(err, file, fileList) {
-            this.$message({
-                message: "上传出错，请重试！",
-                type: "error",
-                center: true
+          } else {
+            this.$post(this.api.saveStaff, data).then(res => {
+              util.successMsg("添加成功");
+              this.closeTeacher();
+              this.getData();
+              this.submiting = false
+            }).catch(res => {
+              this.submiting = false
             });
-        },
-        beforeRemove(file, fileList) {
-            return this.$confirm(`确定移除 ${file.name}？`);
-        },
-        handleRemove(file, fileList) {
-            this.uploadList = fileList;
-            this.uploadFaild = false;
-        },
-        uploadSure() {
-            this.importVisible = false;
-            this.page = 1;
-            this.keyword = "";
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+    delTeacher (row) {
+      this.$confirm("确定要删除吗？", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$post(`${this.api.delStaff}?accountIds=${row.accountId}`).then(res => {
+          util.successMsg("删除成功");
+          this.getData();
+        }).catch(res => { });
+      }).catch(() => { });
+    },
+    handleSelectionChange (val) {
+      this.multipleSelection = val;
+    },
+    delAllSelection () {
+      if (this.multipleSelection.length) {
+        // 批量删除
+        this.$confirm("确定要删除吗？", "提示", {
+          type: "warning"
+        }).then(() => {
+          let ids = this.multipleSelection.map(item => {
+            return item.accountId;
+          });
+          this.$post(`${this.api.delStaff}?accountIds=${ids.toString()}`).then(res => {
+            this.multipleSelection = [];
+            this.$refs.table.clearSelection();
+            util.successMsg("删除成功");
             this.getData();
+          }).catch(res => {
+          });
+        }).catch(() => {
+        });
+      } else {
+        util.errorMsg("请先选择教师 ！");
+      }
+    },
+    batchImport () {
+      this.importVisible = true;
+      this.uploadList = [];
+      this.uploadFaild = false;
+    },
+    searchTeacher () {
+      this.page = 1;
+      this.getData();
+    },
+    handleCurrentChange (val) {
+      this.page = val;
+      this.getData();
+    },
+    downLoad () {
+      location.href = this.api.staffTemplate;
+    },
+    showFaild () {
+      location.href = `${this.api.exportFailureStaff}?exportCode=${this.exportCode}`;
+    },
+    // 上传文件
+    handleExceed (files, fileList) {
+      util.warningMsg(
+        `当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！`
+      );
+    },
+    uploadSuccess (res, file, fileList) {
+      console.log(res);
+      this.uploadFaild = false;
+      if (res.status === 200) {
+        if (res.data.exportCode) {
+          this.exportCode = res.data.exportCode;
+          this.uploadFaild = true;
         }
+        util.successMsg(`上传成功${res.data.successNum}，上传失败${res.data.failureNum}`);
+      } else {
+        res.message ? util.errorMsg(res.message) : util.errorMsg("上传失败，请检查数据");
+      }
+    },
+    uploadError (err, file, fileList) {
+      this.$message({
+        message: "上传出错，请重试！",
+        type: "error",
+        center: true
+      });
+    },
+    beforeRemove (file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`);
+    },
+    handleRemove (file, fileList) {
+      this.uploadList = fileList;
+      this.uploadFaild = false;
+    },
+    uploadSure () {
+      this.importVisible = false;
+      this.page = 1;
+      this.keyword = "";
+      this.getData();
     }
+  }
 };
 </script>
 <style lang="scss" scoped>
@@ -579,7 +665,7 @@ export default {
         padding: 24px;
     }
 }
-.el-input__inner{
+.el-input__inner {
     height: 32px;
 }
 </style>
\ No newline at end of file
diff --git a/src/pages/system/list/staffSide.vue b/src/pages/system/list/staffSide.vue
index ab1d85e..cadc92c 100644
--- a/src/pages/system/list/staffSide.vue
+++ b/src/pages/system/list/staffSide.vue
@@ -1,12 +1,14 @@
 <template>
+  <div>
     <div>
-        <div>
-            <div class="flex-between m-b-20">
-                <h6 class="p-title" style="margin-bottom: 0">员工组织架构</h6>
-                <el-button type="text" @click="addMajor" v-auth="'员工管理:新增专业'">添加</el-button>
-            </div>
-            <org-tree
-                :data="orgList"
+      <div class="flex-between m-b-20">
+        <h6 class="p-title"
+            style="margin-bottom: 0">教师组织架构</h6>
+        <el-button type="text"
+                   @click="addMajor"
+                   v-auth="'员工管理:新增专业'">添加</el-button>
+      </div>
+      <org-tree :data="orgList"
                 show-checkbox
                 default-expand-all
                 ref="orgTree"
@@ -15,277 +17,294 @@
                 :expand-on-click-node="false"
                 @node-click="getSingle"
                 @check="getCheck"
-                :props="{children: 'children', label: 'label', isLeaf: 'leaf'}"
-            >
-                <span class="custom-tree-node" slot-scope="{ node, data }">
-                    <span style="display: inline-block; margin-right: 20px">{{ node.label }}</span>
-                    <span>
-                        <el-button
-                            v-auth="'员工管理:新增专业'"
-                            type="text"
-                            icon="el-icon-edit-outline"
-                            @click="() => handleEdit(node, data)">
-                        </el-button>
-                        <el-button
-                            v-auth="'员工管理:编辑专业'"
-                            v-if="node.level === 1"
-                            type="text"
-                            icon="el-icon-circle-plus-outline"
-                            @click="() => handleAdd(node, data)">
-                        </el-button>
-                        <el-button
-                            v-auth="'员工管理:删除专业'"
-                            type="text"
-                            icon="el-icon-delete"
-                            @click="() => handleDel(node, data)">
-                        </el-button>
-                    </span>
-                </span>
-            </org-tree>
-        </div>
+                :props="{children: 'children', label: 'label', isLeaf: 'leaf'}">
+        <span class="custom-tree-node"
+              slot-scope="{ node, data }">
+          <span style="display: inline-block; margin-right: 20px">{{ node.label }}</span>
+          <span>
+            <el-button v-auth="'员工管理:新增专业'"
+                       type="text"
+                       icon="el-icon-edit-outline"
+                       @click="() => handleEdit(node, data)">
+            </el-button>
+            <el-button v-auth="'员工管理:编辑专业'"
+                       v-if="node.level === 1"
+                       type="text"
+                       icon="el-icon-circle-plus-outline"
+                       @click="() => handleAdd(node, data)">
+            </el-button>
+            <el-button v-auth="'员工管理:删除专业'"
+                       type="text"
+                       icon="el-icon-delete"
+                       @click="() => handleDel(node, data)">
+            </el-button>
+          </span>
+        </span>
+      </org-tree>
+    </div>
 
-        <el-dialog :title="Form.staffArchitectureId ? '编辑部门' : '新增部门'" :visible.sync="majorVisible" width="24%" center @close="closeAdd" :close-on-click-modal="false">
-            <el-form ref="Form" :model="Form" :rules="rules">
-                <el-form-item prop="staffArchitectureName">
-                    <el-input placeholder="请输入部门名称" v-model="Form.staffArchitectureName"></el-input>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="majorVisible = false">取 消</el-button>
-                <el-button type="primary" @click="sure('Form')">确 定</el-button>
-            </span>
-        </el-dialog>
+    <el-dialog :title="Form.staffArchitectureId ? '编辑部门' : '新增部门'"
+               :visible.sync="majorVisible"
+               width="24%"
+               center
+               @close="closeAdd"
+               :close-on-click-modal="false">
+      <el-form ref="Form"
+               :model="Form"
+               :rules="rules">
+        <el-form-item prop="staffArchitectureName">
+          <el-input placeholder="请输入部门名称"
+                    v-model="Form.staffArchitectureName"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button @click="majorVisible = false">取 消</el-button>
+        <el-button type="primary"
+                   @click="sure('Form')">确 定</el-button>
+      </span>
+    </el-dialog>
 
-        <el-dialog :title="Form.gradeId ? '编辑部门' : '新增部门'" :visible.sync="depVisible" width="24%" center @close="closeAdd" :close-on-click-modal="false">
-            <el-form ref="Form1" :model="Form" :rules="rules">
-                <el-form-item prop="gradeName">
-                    <el-input placeholder="请输入部门名称" v-model="Form.gradeName"></el-input>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="depVisible = false">取 消</el-button>
-                <el-button type="primary" @click="sureDepartment('Form1')">确 定</el-button>
-            </span>
-        </el-dialog>
-    </div>
+    <el-dialog :title="Form.gradeId ? '编辑部门' : '新增部门'"
+               :visible.sync="depVisible"
+               width="24%"
+               center
+               @close="closeAdd"
+               :close-on-click-modal="false">
+      <el-form ref="Form1"
+               :model="Form"
+               :rules="rules">
+        <el-form-item prop="gradeName">
+          <el-input placeholder="请输入部门名称"
+                    v-model="Form.gradeName"></el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer"
+            class="dialog-footer">
+        <el-button @click="depVisible = false">取 消</el-button>
+        <el-button type="primary"
+                   @click="sureDepartment('Form1')">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
 </template>
 <script>
 import util from "@/libs/util";
 import OrgTree from "@/components/org-tree/src/tree";
 export default {
-    props: ["Data"],
-    data() {
-        return {
-            orgList: [],
-            firactive: 0,
-            twoactive: 0,
-            majorVisible: false,
-            depVisible: false,
-            Form: {
-                staffArchitectureId: "", // 专业ID
-                staffArchitectureName: "", // // 专业名称
-                gradeId: "",
-                gradeName: ""
-            },
-            rules: {
-                staffArchitectureName: [
-                    { required: true, message: "请输入部门名称", trigger: "blur" }
-                ],
-                gradeName: [
-                    { required: true, message: "请输入部门名称", trigger: "blur" }
-                ]
-            },
-            staffstateProfessId: "",
-            staffstateId: "",
-        };
+  props: ["Data"],
+  data () {
+    return {
+      orgList: [],
+      firactive: 0,
+      twoactive: 0,
+      majorVisible: false,
+      depVisible: false,
+      Form: {
+        staffArchitectureId: "", // 专业ID
+        staffArchitectureName: "", // // 专业名称
+        gradeId: "",
+        gradeName: ""
+      },
+      rules: {
+        staffArchitectureName: [
+          { required: true, message: "请输入部门名称", trigger: "blur" }
+        ],
+        gradeName: [
+          { required: true, message: "请输入部门名称", trigger: "blur" }
+        ]
+      },
+      staffstateProfessId: "",
+      staffstateId: "",
+    };
+  },
+  components: {
+    OrgTree
+  },
+  mounted () {
+    this.getStaff()
+  },
+  methods: {
+    getStaff () {
+      this.$get(this.api.professionalList).then(res => {
+        if (res.data && res.data.length) {
+          res.data.map(e => {
+            (e.ifVisible = false), (e.ischeck = false), (e.label = e.staffArchitectureName), (e.id = e.staffArchitectureId);
+            let data = {
+              staffArchitectureId: e.staffArchitectureId
+            }
+            this.$get(this.api.staffGradeList, data).then(res => {
+              res.data.map(e => {
+                (e.ischeck = false), (e.label = e.gradeName), (e.id = e.gradeId)
+              })
+              e.children = res.data
+            }).catch(res => { })
+          });
+        }
+        setTimeout(() => {
+          this.orgList = res.data;
+        }, 500)
+      }).catch(res => { })
     },
-    components: {
-        OrgTree
+    closeAdd () {
+      this.$refs.Form.resetFields()
     },
-    mounted() {
-        this.getStaff()
+    getSingle (data) {
+      this.$emit('getSingle', data)
     },
-    methods: {
-        getStaff() {
-            this.$get(this.api.professionalList).then(res => {
-                if (res.data && res.data.length) {
-                    res.data.map(e => {
-                        (e.ifVisible = false), (e.ischeck = false), (e.label = e.staffArchitectureName), (e.id = e.staffArchitectureId);
-                        let data = {
-                            staffArchitectureId: e.staffArchitectureId
-                        }
-                        this.$get(this.api.staffGradeList, data).then(res => {
-                            res.data.map(e => {
-                                (e.ischeck = false), (e.label = e.gradeName), (e.id = e.gradeId)
-                            })
-                            e.children = res.data
-                        }).catch(res => {})
-                    });
-                }
-                setTimeout(() => {
-                    this.orgList = res.data;
-                }, 500)
-            }).catch(res => {})
-        },
-        closeAdd() {
-            this.$refs.Form.resetFields()
-        },
-        getSingle(data) {
-            this.$emit('getSingle', data)
-        },
-        getCheck(data, checked) {
-            this.$emit('getCheck', checked.checkedNodes)
-        },
-        // 新增编辑专业
-        addMajor() {
-            this.Form.staffArchitectureId = ''
-            this.Form.staffArchitectureName = ''
-            this.majorVisible = true
-        },
-        sure(Form) { // 提交新增/修改专业
-            this.$refs[Form].validate((valid) => {
-                if (valid) {
-                    let data = {
-                        staffArchitectureName: this.Form.staffArchitectureName,
-                        staffArchitectureId: this.Form.staffArchitectureId,
-                        isDel: 0 // 是否删除(0、未删除 1、已删除)
-                    };
-                    if (this.Form.staffArchitectureId) {
-                        this.$post(this.api.updateProfessional, data).then(res => {
-                            util.successMsg("编辑成功");
-                            this.majorVisible = false;
-                            this.orgList.map(e => {
-                                if (e.staffArchitectureId == this.Form.staffArchitectureId) {
-                                    e.staffArchitectureName = this.Form.staffArchitectureName;
-                                    e.label = this.Form.staffArchitectureName;
-                                }
-                            });
-                            this.$emit("getData");
-                        }).catch(res => {
-                        });
-                    } else {
-                        this.$post(this.api.saveProfessional, data).then(res => {
-                            util.successMsg("添加成功");
-                            this.majorVisible = false;
-                            this.getStaff()
-                            // let newData = {
-                            //     staffArchitectureId: res.staffArchitectureId,
-                            //     staffArchitectureName: this.Form.staffArchitectureName,
-                            //     label: this.Form.staffArchitectureName,
-                            //     value: res.staffArchitectureId,
-                            //     ifVisible: false,
-                            //     ischeck: false,
-                            //     children: []
-                            // };
-                            // this.orgList.push(newData);
-                        }).catch(res => {
-                        });
-                    }
-                } else {
-                    return false;
+    getCheck (data, checked) {
+      this.$emit('getCheck', checked.checkedNodes)
+    },
+    // 新增编辑专业
+    addMajor () {
+      this.Form.staffArchitectureId = ''
+      this.Form.staffArchitectureName = ''
+      this.majorVisible = true
+    },
+    sure (Form) { // 提交新增/修改专业
+      this.$refs[Form].validate((valid) => {
+        if (valid) {
+          let data = {
+            staffArchitectureName: this.Form.staffArchitectureName,
+            staffArchitectureId: this.Form.staffArchitectureId,
+            isDel: 0 // 是否删除(0、未删除 1、已删除)
+          };
+          if (this.Form.staffArchitectureId) {
+            this.$post(this.api.updateProfessional, data).then(res => {
+              util.successMsg("编辑成功");
+              this.majorVisible = false;
+              this.orgList.map(e => {
+                if (e.staffArchitectureId == this.Form.staffArchitectureId) {
+                  e.staffArchitectureName = this.Form.staffArchitectureName;
+                  e.label = this.Form.staffArchitectureName;
                 }
+              });
+              this.$emit("getData");
+            }).catch(res => {
             });
-        },
-        handleAdd(node, data) { // 添加部门
-            this.Form.gradeId = ''
-            this.Form.gradeName = ''
-            this.depVisible = true
-            this.Form.staffArchitectureId = data.staffArchitectureId
-        },
-        handleEdit(node, data) { // 编辑部门
-            if (node.level === 1) {
-                this.Form.staffArchitectureId = data.staffArchitectureId
-                this.Form.staffArchitectureName = data.staffArchitectureName
-                this.majorVisible = true
-            } else {
-                this.Form.gradeId = data.gradeId
-                this.Form.gradeName = data.gradeName
-                this.depVisible = true
-            }
-            for (let j = 0; j < this.orgList.length; j++) {
-                for (let k = 0; k < this.orgList[j].children.length; k++) {
-                    if (this.orgList[j].children[k].gradeName == data.gradeName) {
-                        this.Form.staffArchitectureId = this.orgList[j].staffArchitectureId;
-                    }
-                }
-            }
-        },
-        sureDepartment(Form) { // 提交新增编辑部门
-            this.$refs[Form].validate((valid) => {
-                if (valid) {
-                    let data = {
-                        gradeId: this.Form.gradeId,
-                        gradeName: this.Form.gradeName,
-                        staffArchitectureId: this.Form.staffArchitectureId
-                    };
-                    if (this.Form.gradeId) {
-                        this.$post(this.api.updateGrade, data).then(res => {
-                            util.successMsg("编辑成功");
-                            this.depVisible = false;
-                            this.orgList.map(e => {
-                                e.children.map(r => {
-                                    if (r.gradeId == this.Form.gradeId) {
-                                        r.gradeName = this.Form.gradeName;
-                                        r.label = this.Form.gradeName;
-                                    }
-                                });
-                            });
-                        }).catch(res => {
-                        });
-                    } else {
-                        this.$post(this.api.saveGrade, data).then(res => {
-                            util.successMsg("添加成功");
-                            this.depVisible = false;
-                            this.getStaff()
-                            // let newData = {
-                            //     gradeId: res.gradeId,
-                            //     gradeName: this.Form.gradeName,
-                            //     label: this.Form.gradeName,
-                            //     value: res.gradeId,
-                            //     ifVisible: false,
-                            //     ischeck: false
-                            // };
-                            // this.orgList.map(e => {
-                            //     if (e.staffArchitectureId == this.Form.staffArchitectureId) {
-                            //         e.ifVisible = true;
-                            //         e.children.push(newData);
-                            //     }
-                            // });
-                        }).catch(res => {
-                        });
-                    }
-                } else {
-                    return false;
-                }
+          } else {
+            this.$post(this.api.saveProfessional, data).then(res => {
+              util.successMsg("添加成功");
+              this.majorVisible = false;
+              this.getStaff()
+              // let newData = {
+              //     staffArchitectureId: res.staffArchitectureId,
+              //     staffArchitectureName: this.Form.staffArchitectureName,
+              //     label: this.Form.staffArchitectureName,
+              //     value: res.staffArchitectureId,
+              //     ifVisible: false,
+              //     ischeck: false,
+              //     children: []
+              // };
+              // this.orgList.push(newData);
+            }).catch(res => {
             });
-        },
-        handleDel(node, data) {
-            node.level === 1 ? this.delMajor(data) : this.delDepartment(data)
-        },
-        delMajor(item) {
-            this.$confirm("确定要删除该专业吗？该操作将会删除该组织下的用户账号。", "提示", {
-                type: "warning"
-            }).then(() => {
-                this.$post(`${this.api.deleteProfessional}?staffArchitectureId=${item.staffArchitectureId}`).then(res => {
-                    util.successMsg("删除成功")
-                    this.$emit("getData")
-                    this.getStaff()
-                }).catch(res => {})
-            }).catch(() => {})
-        },
-        delDepartment(item) {
-            this.$confirm("确定要删除该部门吗？该操作将会删除该组织下的用户账号。", "提示", {
-                type: "warning"
-            }).then(() => {
-                this.$post(`${this.api.deleteGrade}?gradeId=${item.gradeId}`).then(res => {
-                    util.successMsg("删除成功")
-                    this.getStaff()
-                    this.$emit("delDep", item, this.orgList)
-                    this.$emit("getData")
-                }).catch(res => {})
-            }).catch(() => {})
+          }
+        } else {
+          return false;
         }
+      });
+    },
+    handleAdd (node, data) { // 添加部门
+      this.Form.gradeId = ''
+      this.Form.gradeName = ''
+      this.depVisible = true
+      this.Form.staffArchitectureId = data.staffArchitectureId
+    },
+    handleEdit (node, data) { // 编辑部门
+      if (node.level === 1) {
+        this.Form.staffArchitectureId = data.staffArchitectureId
+        this.Form.staffArchitectureName = data.staffArchitectureName
+        this.majorVisible = true
+      } else {
+        this.Form.gradeId = data.gradeId
+        this.Form.gradeName = data.gradeName
+        this.depVisible = true
+      }
+      for (let j = 0; j < this.orgList.length; j++) {
+        for (let k = 0; k < this.orgList[j].children.length; k++) {
+          if (this.orgList[j].children[k].gradeName == data.gradeName) {
+            this.Form.staffArchitectureId = this.orgList[j].staffArchitectureId;
+          }
+        }
+      }
+    },
+    sureDepartment (Form) { // 提交新增编辑部门
+      this.$refs[Form].validate((valid) => {
+        if (valid) {
+          let data = {
+            gradeId: this.Form.gradeId,
+            gradeName: this.Form.gradeName,
+            staffArchitectureId: this.Form.staffArchitectureId
+          };
+          if (this.Form.gradeId) {
+            this.$post(this.api.updateGrade, data).then(res => {
+              util.successMsg("编辑成功");
+              this.depVisible = false;
+              this.orgList.map(e => {
+                e.children.map(r => {
+                  if (r.gradeId == this.Form.gradeId) {
+                    r.gradeName = this.Form.gradeName;
+                    r.label = this.Form.gradeName;
+                  }
+                });
+              });
+            }).catch(res => {
+            });
+          } else {
+            this.$post(this.api.saveGrade, data).then(res => {
+              util.successMsg("添加成功");
+              this.depVisible = false;
+              this.getStaff()
+              // let newData = {
+              //     gradeId: res.gradeId,
+              //     gradeName: this.Form.gradeName,
+              //     label: this.Form.gradeName,
+              //     value: res.gradeId,
+              //     ifVisible: false,
+              //     ischeck: false
+              // };
+              // this.orgList.map(e => {
+              //     if (e.staffArchitectureId == this.Form.staffArchitectureId) {
+              //         e.ifVisible = true;
+              //         e.children.push(newData);
+              //     }
+              // });
+            }).catch(res => {
+            });
+          }
+        } else {
+          return false;
+        }
+      });
+    },
+    handleDel (node, data) {
+      node.level === 1 ? this.delMajor(data) : this.delDepartment(data)
+    },
+    delMajor (item) {
+      this.$confirm("确定要删除该专业吗？该操作将会删除该组织下的用户账号。", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$post(`${this.api.deleteProfessional}?staffArchitectureId=${item.staffArchitectureId}`).then(res => {
+          util.successMsg("删除成功")
+          this.$emit("getData")
+          this.getStaff()
+        }).catch(res => { })
+      }).catch(() => { })
+    },
+    delDepartment (item) {
+      this.$confirm("确定要删除该部门吗？该操作将会删除该组织下的用户账号。", "提示", {
+        type: "warning"
+      }).then(() => {
+        this.$post(`${this.api.deleteGrade}?gradeId=${item.gradeId}`).then(res => {
+          util.successMsg("删除成功")
+          this.getStaff()
+          this.$emit("delDep", item, this.orgList)
+          this.$emit("getData")
+        }).catch(res => { })
+      }).catch(() => { })
     }
+  }
 };
 </script>
 <style scoped>
@@ -302,7 +321,7 @@ export default {
 .side_icon i {
     cursor: pointer;
     font-size: 20px;
-    color: #9278FF;
+    color: #9278ff;
 }
 
 .side_tree {
@@ -312,7 +331,7 @@ export default {
 }
 
 .side_tree i {
-    color: #9278FF;
+    color: #9278ff;
     margin-left: 10px;
 }
 
@@ -339,7 +358,7 @@ export default {
 }
 
 .two_active {
-    color: #9278FF;
+    color: #9278ff;
 }
 
 /* .two_active:hover{
@@ -348,7 +367,7 @@ export default {
 } */
 .two_back:hover {
     cursor: pointer;
-    color: #9278FF;
+    color: #9278ff;
 }
 
 .mar_top {
@@ -382,11 +401,13 @@ export default {
     transform: rotate(180deg);
 }
 
-.list-enter-active, .list-leave-active {
+.list-enter-active,
+.list-leave-active {
     transition: all 1s;
 }
 
-.list-enter, .list-leave-to {
+.list-enter,
+.list-leave-to {
     opacity: 0;
     transform: translateY(-30px);
 }