1212

dist/static/css/chunk-32441d16.4ef937ac.css → dist/static/css/chunk-7ec1e8ed.7df003bc.css

@@ -1 +1 @@
-.el-button--primary[data-v-31ef6eb9],.el-button--primary[data-v-31ef6eb9]:active,.el-button--primary[data-v-31ef6eb9]:focus,.el-button--primary[data-v-31ef6eb9]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-31ef6eb9] .el-date-editor.el-input,[data-v-31ef6eb9] .el-select{width:100%!important}[data-v-31ef6eb9] .el-form-item__content{font-size:14px!important;margin-right:5%}.infoWrap[data-v-31ef6eb9]{margin-top:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.infoWrap .left[data-v-31ef6eb9]{max-width:1000px;width:100%}.infoWrap .left h4[data-v-31ef6eb9]{margin-bottom:20px}.infoWrap .right[data-v-31ef6eb9]{margin-left:100px}.infoWrap .right .teacherIcon[data-v-31ef6eb9]{width:150px;height:150px;border-radius:50%;overflow:hidden}.infoWrap .right .teacherIcon img[data-v-31ef6eb9]{width:150px;height:150px}.salarySet h3[data-v-90ce9dec]{margin-top:10px;margin-bottom:10px;font-size:14px;color:#444;font-weight:400}.salarySet .tableList .left[data-v-90ce9dec],.salarySet .tableList .right[data-v-90ce9dec]{float:left}.salarySet .tableList .left[data-v-90ce9dec]{width:70%;margin-right:2%}.salarySet .tableList .right[data-v-90ce9dec]{width:56%;margin-left:2%}[data-v-90ce9dec] .el-table__body tr td:nth-child(3){border-right:1px solid #ebeef5}[data-v-90ce9dec] .el-input-group__append{background-color:#f5f7fa;color:#909399;vertical-align:middle;display:table-cell;position:relative;border:1px solid #dcdfe6;border-left:0}
+.el-button--primary[data-v-3e8c41e7],.el-button--primary[data-v-3e8c41e7]:active,.el-button--primary[data-v-3e8c41e7]:focus,.el-button--primary[data-v-3e8c41e7]:hover{background:#14928a;border-color:#14928a;color:#fff}[data-v-3e8c41e7] .el-date-editor.el-input,[data-v-3e8c41e7] .el-select{width:100%!important}[data-v-3e8c41e7] .el-form-item__content{font-size:14px!important;margin-right:5%}.infoWrap[data-v-3e8c41e7]{margin-top:20px;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:start;-ms-flex-pack:start;justify-content:flex-start}.infoWrap .left[data-v-3e8c41e7]{max-width:1000px;width:100%}.infoWrap .left h4[data-v-3e8c41e7]{margin-bottom:20px}.infoWrap .right[data-v-3e8c41e7]{margin-left:100px}.infoWrap .right .teacherIcon[data-v-3e8c41e7]{width:150px;height:150px;border-radius:50%;overflow:hidden}.infoWrap .right .teacherIcon img[data-v-3e8c41e7]{width:150px;height:150px}.salarySet h3[data-v-90ce9dec]{margin-top:10px;margin-bottom:10px;font-size:14px;color:#444;font-weight:400}.salarySet .tableList .left[data-v-90ce9dec],.salarySet .tableList .right[data-v-90ce9dec]{float:left}.salarySet .tableList .left[data-v-90ce9dec]{width:70%;margin-right:2%}.salarySet .tableList .right[data-v-90ce9dec]{width:56%;margin-left:2%}[data-v-90ce9dec] .el-table__body tr td:nth-child(3){border-right:1px solid #ebeef5}[data-v-90ce9dec] .el-input-group__append{background-color:#f5f7fa;color:#909399;vertical-align:middle;display:table-cell;position:relative;border:1px solid #dcdfe6;border-left:0}

dist/static/js/chunk-2d208c0d.65b1cb94.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-2d208c0d"],{a5ad:function(n,e,t){"use strict";t.r(e);var c=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("div",[n._v("\n  请假管理\n")])},u=[],a=t("2877"),l={},r=Object(a["a"])(l,c,u,!1,null,null,null);e["default"]=r.exports}}]);

dist/static/js/chunk-76f0f5c7.d7bf674f.js

@@ -0,0 +1 @@
+(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["chunk-76f0f5c7"],{a5ad4:function(n,e,t){"use strict";t.r(e);var c=function(){var n=this,e=n.$createElement,t=n._self._c||e;return t("div",[n._v("\n  请假管理\n")])},u=[],a=t("2877"),l={},r=Object(a["a"])(l,c,u,!1,null,null,null);e["default"]=r.exports}}]);

src/router/index.js

@@ -44,7 +44,7 @@ export const constantRoutes = [
     ]
   },
   {
-    path: '/timedtask',
+    path: '/timedtask', // 定时任务列表
     component: Layout,
     // component: () => import('@/views/timedTask/index'),
     hidden: false,
@@ -57,6 +57,18 @@ export const constantRoutes = [
     ]
   },
   {
+    path: '/setSilder', // 侧边栏
+    component: Layout,
+    hidden: false,
+    children: [
+      {
+        path: 'setSilder',
+        component: () => import('@/views/setSilder/addSilder'),
+        hidden: false,
+      }
+    ]
+  },
+  {
     path: '/login',
     component: () => import('@/views/login/index'),
     hidden: true
@@ -112,6 +124,7 @@ export const asyncRoutes = {
   teacherList: () => import('@/views/teacherManager/teacherList'),
   // 新增&修改教师
   teacherOperation: () => import('@/views/teacherManager/teacherOperation/index'),
+  teacherOperationUpdate: () => import('@/views/teacherManager/teacherOperation/index'),
   // 老师详情
   teacherDetail: () => import('@/views/teacherManager/teacherDetail/index'),
   // 学员管理

src/store/modules/permission.js

@@ -1,7 +1,8 @@
 import { asyncRoutes, constantRoutes } from '@/router'
 import { getSilder } from '@/api/silder'
-import { removeToken } from '@/utils/auth'
-import Layout from '@/layout'
+import { stat } from 'fs'
+// import { removeToken } from '@/utils/auth'
+// import Layout from '@/layout'
 
 /**
  * 遍历接口菜单添加页面
@@ -31,13 +32,17 @@ function generateAsyncRouter (asyncRoutes, data) {
 const state = {
   routes: [],
   addRoutes: [],
-  type: '' // 登录的平台类型
+  type: '', // 登录的平台类型
+  permission: [] // 权限
 }
 
 const mutations = {
   SET_ROUTES: (state, routes) => {
     state.addRoutes = routes
     state.routes = constantRoutes.concat(routes)
+  },
+  SET_PERMISSION: (state, permission) => {
+    state.permission = permission
   }
 }
 // 递归遍历数组
@@ -46,7 +51,6 @@ function recursionRouter (arr) {
     let newArr = arr.map(item => {
       let obj = {};
       obj.component = item.component;
-
       item.hid == 0 ? obj.hidden = false : obj.hidden = true
       obj.path = item.path;
       obj.meta = { 'title': item.name, 'icon': item.icon }
@@ -57,14 +61,29 @@ function recursionRouter (arr) {
     })
     return newArr
   }
+}
 
+// 递归遍历数组
+function recursionPerission(arr) {
+  let newArr = arr.map(item => {
+    let obj = []
+    obj.push(item.permission)
+    if(item.sysMenus && item.sysMenus.length > 0) {
+      obj.push(recursionPerission(item.sysMenus))
+    }
+    return obj
+  })
+  return newArr
 }
+
 const actions = {
   generateRoutes ({ commit }, roles) {
     return new Promise(resolve => {
       // 获取接口返回的权限菜单
       getSilder().then(res => {
         if (res.code == 200) {
+          let aa = (recursionPerission(res.data)).flat(Infinity)
+          console.log(state.permission)
           let newData = recursionRouter(res.data);
           var accessedRoutes
           // 生成异步路由表

src/views/categroyManager/insideSetting/branchActive.vue

@@ -1,6 +1,6 @@
 <template>
   <div class='m-container'>
-    <h2><div class="squrt"></div>VIP分部活动设置</h2>
+    <h2><div class="squrt"></div>VIP分部活动列表</h2>
     <div class="m-core">
       <div @click="openActive('create')" class='newBand'>新建</div>
       <!-- 搜索类型 -->

src/views/setSilder/addSilder.vue

@@ -1,20 +1,22 @@
 <template>
   <div class="slider-container">
-    <el-button @click='onOperation("create")'>添加按钮</el-button>
+    <el-button @click='onOperation("create")' style="position: fixed; z-index: 100;">添加按钮</el-button>
 
     <el-table :data="tableList"
               style="width: 100%;margin-bottom: 20px;"
               row-key="id"
               border
               :tree-props="{children: 'children', hasChildren: 'hasChildren'}">
-      <el-table-column prop="name"
+      <el-table-column width="400px" prop="name"
                        label="菜单名称">
       </el-table-column>
       <el-table-column prop="id"
                        label="元素ID">
       </el-table-column>
-      <el-table-column prop="type"
-                       label="菜单类型">
+      <el-table-column label="菜单类型">
+        <template slot-scope="scope">
+          {{ scope.row.type == 1 ? '按钮' : '菜单' }}
+        </template>
       </el-table-column>
       <el-table-column prop="path"
                        label="文件路径">
@@ -24,6 +26,9 @@
       </el-table-column>
       <el-table-column prop="hid"
                        label="是否隐藏">
+        <template slot-scope="scope">
+          {{ scope.row.hid == 1 ? '隐藏' : '不隐藏' }}
+        </template>
       </el-table-column>
       <el-table-column label="操作">
         <template slot-scope="scope">
@@ -34,7 +39,6 @@
         </template>
       </el-table-column>
     </el-table>
-
     <el-dialog title="侧边栏管理"
                 :close-on-click-modal="false"
                :visible.sync="branchStatus"
@@ -76,9 +80,9 @@
         </el-form-item>
         <el-form-item label="菜单类型"
                       :label-width="formLabelWidth">
-          <el-select v-model="form.type">
-            <el-option label="菜单" :value="'0'"></el-option>
-            <el-option label="按钮" :value="'1'"></el-option>
+          <el-select v-model.number="form.type">
+            <el-option label="菜单" :value="0"></el-option>
+            <el-option label="按钮" :value="1"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="排序"
@@ -147,7 +151,7 @@ export default {
           component: row.component,
           id: row.id,
           hid: row.hid,
-          type: row.type
+          type: Number(row.type)
         }
       }
     },

src/views/teacherManager/teacherList.vue

@@ -235,8 +235,12 @@ export default {
       if (row) {
         params.teacherId = row.id
       }
+      let path = '/business/teacherOperation'
+      if(type == 'update') {
+        path = '/business/teacherOperationUpdate'
+      }
       this.$router.push({
-        path: '/business/teacherOperation',
+        path: path,
         query: params
       })
     },

src/views/teacherManager/teacherOperation/components/teacherOperation.vue

@@ -250,7 +250,7 @@
   </div>
 </template>
 <script>
-import { queryByOrganId } from '@/api/systemManage'
+// import { queryByOrganId } from '@/api/systemManage'
 import { branchQueryPage, subjectListTree } from '@/api/specialSetting'
 import { teacherAdd, teacherUpdate, teacherGet } from '@/api/teacherManager'
 import store from '@/store'

src/views/vipClass/vipDetail/index.vue

@@ -8,19 +8,19 @@
                @tab-click="handleClick">
         <el-tab-pane label="基本信息"
                      name="1">
-          <vipBase @getName='getName' />
+          <vipBase v-if="activeName == 1" @getName='getName' />
         </el-tab-pane>
         <el-tab-pane label="教学记录"
                      name="2">
-          <teacherRecord />
+          <teacherRecord v-if="activeName == 2" />
         </el-tab-pane>
         <el-tab-pane label="VIP课程财务"
                      name="3">
-          <fnanceInfo />
+          <fnanceInfo v-if="activeName == 3" />
         </el-tab-pane>
         <el-tab-pane label="VIP学生列表"
                      name="4">
-          <vipStudentList />
+          <vipStudentList v-if="activeName == 4" />
         </el-tab-pane>
       </el-tabs>
     </div>