fix

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);
             })();

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>

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]++
       })

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) {

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();

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;
     }

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, // 总数

src/pages/course/list/courseManagement/index.vue

@@ -2,74 +2,131 @@
   <!--   课程管理     -->
   <div style="padding-top: 24px">
     <div class="tool">
-            <ul class="filter" style="align-items: flex-start">
+      <ul class="filter"
+          style="align-items: flex-start">
         <li>
           <label>课程分类：</label>
-                    <el-select v-model="categoryId" clearable placeholder="请选择课程分类" @change="initData">
+          <el-select v-model="categoryId"
-                        <el-option label="不限" value=""></el-option>
+                     clearable
-                        <el-option v-for="(item,index) in classificationList" :key="index" :label="item.classificationName" :value="item.id"></el-option>
+                     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>
+          <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="'课程管理:新增'"
-                <el-button v-auth="'课程管理:批量删除'" type="primary" round @click="delAllData">批量删除</el-button>
+                   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 :data="list"
-            <el-table-column type="selection" width="80" align="center" :reserve-selection="true"></el-table-column>
+              class="table"
-            <el-table-column type="index" width="100" label="序号" align="center">
+              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 prop="courseName"
+                       label="课程名称"
+                       align="center">
       </el-table-column>
-            <el-table-column prop="courseClassification" label="课程分类" align="center" show-overflow-tooltip>
+      <el-table-column prop="courseClassification"
+                       label="课程分类"
+                       align="center"
+                       show-overflow-tooltip>
       </el-table-column>
-            <el-table-column label="可见范围" align="center">
+      <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 prop="createTime"
+                       label="创建时间"
+                       align="center">
       </el-table-column>
-            <el-table-column prop="founder" label="创建人" align="center">
+      <el-table-column prop="founder"
+                       label="创建人"
+                       align="center">
       </el-table-column>
-            <el-table-column label="操作" align="center" width="250">
+      <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-button v-auth="'课程管理:编辑信息'"
-                    <el-divider v-auth="'课程管理:编辑信息'" direction="vertical"></el-divider>
+                     type="text"
-                    <el-button v-auth="'课程管理:内容设置'" type="text" @click="config(scope.row)">内容设置</el-button>
+                     @click="editCourse(scope.row)">编辑信息</el-button>
-                    <el-divider v-auth="'课程管理:内容设置'" direction="vertical"></el-divider>
+          <el-divider v-auth="'课程管理:编辑信息'"
-                    <el-button v-auth="'课程管理:预览'" type="text" @click="preview(scope.row)">预览</el-button>
+                      direction="vertical"></el-divider>
-                    <el-divider v-auth="'课程管理:预览'" direction="vertical"></el-divider>
+          <el-button v-auth="'课程管理:内容设置'"
-                    <el-button v-auth="'课程管理:删除'" type="text" @click="handleDelete(scope.row)">删除</el-button>
+                     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">
+      <el-table-column label="可授权状态"
+                       align="center"
+                       width="120">
         <template slot-scope="scope">
           <!-- 列表展示中台的禁启用依据zt_open展示，职站的禁启用依据is_open展示 -->
           <!-- 中台禁用了这个学校发布的学校这边还能看到，但是学校这边不能启用。 -->
-                    <el-switch
+          <el-switch v-auth="'课程管理:禁用'"
-                        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)"
+                     @change="switchOff($event,scope.row,scope.$index)"></el-switch>
-                    ></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 background
+                     layout="total, prev, pager, next"
+                     :total="total"
+                     @current-change="handleCurrentChange"
+                     :current-page="page">
       </el-pagination>
     </div>
   </div>
@@ -143,10 +200,10 @@ export default {
     },
     getData () {
       this.getList()
-          if (!Setting.isDev) {
+      // if (!Setting.isDev) {
-            clearInterval(this.timer)
+      //   clearInterval(this.timer)
-            this.timer = setInterval(this.getRedis, 1000)
+      //   this.timer = setInterval(this.getRedis, 1000)
-          }
+      // }
     },
     initData () {
       this.page = 1;

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

src/pages/match/add/step2.vue

@@ -80,8 +80,7 @@
                   <span class="req">*</span>
                   团队参赛人数限制：
                   <el-radio v-model="item.teamNumLimitOpt"
-                            :label="0"
+                            :label="0">不限制</el-radio>
-                            @change="item.teamNumLimit = 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) {
+      // for (const e of form.competitionStageList) {
-        if (!e.teamNumLimitOpt) e.teamNumLimit = 0
+      //   if (!e.teamNumLimitOpt) e.teamNumLimit = 0
-      }
+      // }
       this.$parent.showLoad()
       this.pass = 1
       if (form.ruleId) {

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) {

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;

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,

src/pages/system/list/index.vue

@@ -1,7 +1,12 @@
 <template>
-    <div class="page" style="padding: 0">
+  <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>
+      <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>
@@ -21,7 +26,7 @@ export default {
     return {
       active: "staff",
       tabs: {
-                staff: "员工管理",
+        staff: "教师管理",
         role: "角色权限",
         logo: "系统logo设置",
       }
@@ -58,5 +63,4 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-
 </style>

src/pages/system/list/staff.vue

@@ -1,7 +1,9 @@
 <template>
   <div class="wrap">
     <div class="side">
-            <org ref="org" @getSingle="getSingle" @getCheck="getCheck"></org>
+      <org ref="org"
+           @getSingle="getSingle"
+           @getCheck="getCheck"></org>
     </div>
 
     <div class="right">
@@ -9,91 +11,171 @@
       <div class="tool">
         <ul class="filter">
           <li>
-                        <el-input placeholder="请输入员工姓名/工号" prefix-icon="el-icon-search" v-model.trim="keyword" clearable></el-input>
+            <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="'员工管理:新增员工'"
-                    <el-button v-auth="'员工管理:批量导入'" type="primary" round @click="batchImport">批量导入</el-button>
+                     type="info"
-                    <el-button v-auth="'员工管理:批量删除'" type="primary" round @click="delAllSelection">批量删除</el-button>
+                     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 :data="listData"
-                <el-table-column type="selection" width="55" align="center"></el-table-column>
+                class="table"
-                <el-table-column type="index" label="序号" width="55" align="center"></el-table-column>
+                ref="table"
-                <el-table-column prop="userName" label="职工姓名" align="center"></el-table-column>
+                stripe
-                <el-table-column prop="workNumber" label="职工工号" align="center"></el-table-column>
+                header-align="center"
-                <el-table-column prop="dept" label="部门" align="center"></el-table-column>
+                @selection-change="handleSelectionChange">
-                <el-table-column prop="roleName" label="账号角色" align="center"></el-table-column>
+        <el-table-column type="selection"
-                <el-table-column prop="logInNumber" label="登录次数" align="center"></el-table-column>
+                         width="55"
-                <el-table-column prop="lastLoginTime" label="上次登录时间" align="center"></el-table-column>
+                         align="center"></el-table-column>
-                <el-table-column label="操作" width="200" align="center">
+        <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="'员工管理:员工查看'"
-                        <el-button v-auth="'员工管理:员工编辑'" type="text" @click="editTeacher(scope.row)">编辑</el-button>
+                       type="text"
-                        <el-button v-auth="'员工管理:重置密码'" type="text" @click="resetPassword(scope.row)">重置密码</el-button>
+                       @click="showTeacher(scope.row)">查看</el-button>
-                        <el-button v-auth="'员工管理:员工删除'" type="text" @click="delTeacher(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>
+        <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"
+    <el-dialog :title="isDetail ? '查看教师' : (isAdd ? '新增教师' : '编辑教师')"
-                   width="30%" @close="closeTeacher" class="dialog" :close-on-click-modal="false">
+               :visible.sync="teacherVisible"
-            <el-form ref="form" :model="form" :rules="rules" label-width="150px" :disabled="isDetail" style='margin-right: 80px;'>
+               width="30%"
-                <el-form-item prop="workNumber" label="工号">
+               @close="closeTeacher"
-                    <el-input v-model.trim="form.workNumber" placeholder="请输入职工工号" @blur="workNumberChange"></el-input>
+               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-form-item prop="userName"
-                    <el-input v-model.trim="form.userName" placeholder="请输入员工姓名"></el-input>
+                      label="用户姓名">
+          <el-input v-model.trim="form.userName"
+                    placeholder="请输入教师姓名"></el-input>
         </el-form-item>
-                <el-form-item prop="roleValue" label="账号角色">
+        <el-form-item prop="roleValue"
-                    <el-select v-model="form.roleValue" @change="roleChange" @remove-tag="roleRemove" multiple style="width: 100%;height: 32px">
+                      label="账号角色">
-                        <el-option
+          <el-select v-model="form.roleValue"
-                            v-for="item in roleList"
+                     @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-form-item prop="uniqueIdentification"
-                    <el-input disabled v-model.trim="form.uniqueIdentification" placeholder="请输入职工工号获取唯一标识"></el-input>
+                      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-form-item v-for="item in form.roleAndDeptList"
+                      :label="`${item.roleName}所属部门`"
+                      :rules="{
       required: true, message: '请选择', trigger: 'change'
     }">
-                    <el-cascader
+          <el-cascader v-model="item.cascaderValue"
-                        v-model="item.cascaderValue"
                        :options="orgList"
                        :props="casProps"
-                        style="width: 100%"
+                       style="width: 100%"></el-cascader>
-                    ></el-cascader>
         </el-form-item>
-                <el-form-item prop="phone" label="手机号">
+        <el-form-item prop="phone"
-                    <el-input v-model.trim="form.phone" placeholder="请输入手机号" maxlength="11"></el-input>
+                      label="手机号">
+          <el-input v-model.trim="form.phone"
+                    placeholder="请输入手机号"
+                    maxlength="11"></el-input>
         </el-form-item>
-                <el-form-item prop="email" label="邮箱">
+        <el-form-item prop="email"
-                    <el-input v-model.trim="form.email" placeholder="请输入邮箱"></el-input>
+                      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">
+      <span slot="footer"
+            class="dialog-footer"
+            v-if="!isDetail">
         <el-button @click="closeTeacher">取 消</el-button>
-                <el-button type="primary" @click="saveSure('form')">确 定</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">
+    <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>
+          <el-button type="primary"
+                     @click="downLoad">模板下载<i class="el-icon-download el-icon--right"></i></el-button>
         </div>
-                <el-upload
+        <el-upload name="file"
-                    name="file"
                    accept=".xls,.xlsx"
                    :on-remove="handleRemove"
                    :on-error="uploadError"
@@ -103,15 +185,19 @@
                    :on-exceed="handleExceed"
                    :action="this.api.importStaff"
                    :file-list="uploadList"
-                    :headers="headers"
+                   :headers="headers">
-                >
+          <el-button type="primary"
-                    <el-button type="primary" class="ml20">上传文件<i class="el-icon-upload2 el-icon--right"></i></el-button>
+                     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>
+        <el-link v-if="uploadFaild"
+                 type="primary"
+                 @click="showFaild">部分数据导入失败，查看失败原因</el-link>
       </div>
-            <span slot="footer" class="dialog-footer">
+      <span slot="footer"
+            class="dialog-footer">
         <el-button @click="importVisible = false">取 消</el-button>
-                <el-button type="primary" @click="uploadSure">确 定</el-button>
+        <el-button type="primary"
+                   @click="uploadSure">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -159,7 +245,7 @@ export default {
           { required: true, message: "请输入工号", trigger: 'blur' },
           {
             pattern: /^[A-Za-z0-9]*$/,
-                        message: "职工工号必须为数字或英文",
+            message: "教师工号必须为数字或英文",
             trigger: "blur"
           }
         ],
@@ -500,7 +586,7 @@ export default {
         }).catch(() => {
         });
       } else {
-                util.errorMsg("请先选择员工 ！");
+        util.errorMsg("请先选择教师 ！");
       }
     },
     batchImport () {

src/pages/system/list/staffSide.vue

@@ -2,11 +2,13 @@
   <div>
     <div>
       <div class="flex-between m-b-20">
-                <h6 class="p-title" style="margin-bottom: 0">员工组织架构</h6>
+        <h6 class="p-title"
-                <el-button type="text" @click="addMajor" v-auth="'员工管理:新增专业'">添加</el-button>
+            style="margin-bottom: 0">教师组织架构</h6>
+        <el-button type="text"
+                   @click="addMajor"
+                   v-auth="'员工管理:新增专业'">添加</el-button>
       </div>
-            <org-tree
+      <org-tree :data="orgList"
-                :data="orgList"
                 show-checkbox
                 default-expand-all
                 ref="orgTree"
@@ -15,26 +17,23 @@
                 :expand-on-click-node="false"
                 @node-click="getSingle"
                 @check="getCheck"
-                :props="{children: 'children', label: 'label', isLeaf: 'leaf'}"
+                :props="{children: 'children', label: 'label', isLeaf: 'leaf'}">
-            >
+        <span class="custom-tree-node"
-                <span class="custom-tree-node" slot-scope="{ node, data }">
+              slot-scope="{ node, data }">
           <span style="display: inline-block; margin-right: 20px">{{ node.label }}</span>
           <span>
-                        <el-button
+            <el-button v-auth="'员工管理:新增专业'"
-                            v-auth="'员工管理:新增专业'"
                        type="text"
                        icon="el-icon-edit-outline"
                        @click="() => handleEdit(node, data)">
             </el-button>
-                        <el-button
+            <el-button v-auth="'员工管理:编辑专业'"
-                            v-auth="'员工管理:编辑专业'"
                        v-if="node.level === 1"
                        type="text"
                        icon="el-icon-circle-plus-outline"
                        @click="() => handleAdd(node, data)">
             </el-button>
-                        <el-button
+            <el-button v-auth="'员工管理:删除专业'"
-                            v-auth="'员工管理:删除专业'"
                        type="text"
                        icon="el-icon-delete"
                        @click="() => handleDel(node, data)">
@@ -44,27 +43,47 @@
       </org-tree>
     </div>
 
-        <el-dialog :title="Form.staffArchitectureId ? '编辑部门' : '新增部门'" :visible.sync="majorVisible" width="24%" center @close="closeAdd" :close-on-click-modal="false">
+    <el-dialog :title="Form.staffArchitectureId ? '编辑部门' : '新增部门'"
-            <el-form ref="Form" :model="Form" :rules="rules">
+               :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-input placeholder="请输入部门名称"
+                    v-model="Form.staffArchitectureName"></el-input>
         </el-form-item>
       </el-form>
-            <span slot="footer" class="dialog-footer">
+      <span slot="footer"
+            class="dialog-footer">
         <el-button @click="majorVisible = false">取 消</el-button>
-                <el-button type="primary" @click="sure('Form')">确 定</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-dialog :title="Form.gradeId ? '编辑部门' : '新增部门'"
-            <el-form ref="Form1" :model="Form" :rules="rules">
+               :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-input placeholder="请输入部门名称"
+                    v-model="Form.gradeName"></el-input>
         </el-form-item>
       </el-form>
-            <span slot="footer" class="dialog-footer">
+      <span slot="footer"
+            class="dialog-footer">
         <el-button @click="depVisible = false">取 消</el-button>
-                <el-button type="primary" @click="sureDepartment('Form1')">确 定</el-button>
+        <el-button type="primary"
+                   @click="sureDepartment('Form1')">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -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);
 }