Merge branch 'master' of http://git.dayaedu.com/molingzhide/dy-admin-manager

src/api/generalSettings.js

@@ -0,0 +1,20 @@
+// 通用设置api文件
+import request from '@/utils/request'
+import qs from 'qs'
+// 参数列表
+export function sysConfigList(data) {
+    return request({
+        url: '/web-server/sysConfig/list',
+        method: 'get',
+        params: data
+    })
+}
+// 修改参数
+export function sysConfigUpdate(data) {
+    return request({
+        url: '/web-server/sysConfig/update',
+        method: 'post',
+        data: qs.stringify(data)
+    })
+}
+

src/api/systemManage.js

@@ -112,4 +112,48 @@ export function employeeOperate(data) {
         method: 'post',
         data: qs.stringify(data)
     })
+}
+
+// 分页查询角色列表
+export function roleQueryPage(data) {
+    return request({
+        url: `/api-auth/role/queryPage`,
+        method: 'get',
+        params: data
+    })
+}
+
+// 根据角色编号查询拥有的菜单列表
+export function roleGetMenus(data) {
+    return request({
+        url: `/api-auth/role/getMenus`,
+        method: 'get',
+        params: data
+    })
+}
+
+// 根据权限id查询角色
+export function getRoleInfo(data) {
+    return request({
+        url: `/api-auth/role/${data.id}`,
+        method: 'get'
+    })
+}
+
+// 修改角色
+export function roleUpdate(data) {
+    return request({
+        url: `/api-auth/role/update`,
+        method: 'post',
+        data: data
+    })
+}
+
+// 添加角色
+export function roleAdd(data) {
+    return request({
+        url: `/api-auth/role/add`,
+        method: 'post',
+        data: data
+    })
 }

src/router/index.js

@@ -36,7 +36,19 @@ export const constantRoutes = [
     component: () => import('@/views/login/index'),
     hidden: true
   },
-
+  {
+    path: '/system/insideSetting',
+    component: Layout,
+    meta: { title: '内部分部设置' },
+    hidden: true,
+    children: [
+      {
+        path: 'adminoperation',
+        component: () => import('@/views/categroyManager/insideSetting/adminOperation'),
+        meta: { title: '侧系统角色权限管理边栏' }
+      }
+    ]
+  },
   {
     path: '/404',
     component: () => import('@/views/404'),
@@ -568,6 +580,7 @@ export const asyncRoutes = {
   bannerManager: () => import('@/views/categroyManager/specialSetup/bannerManager'),
   holidayManager: () => import('@/views/categroyManager/specialSetup/holidayManager'),
   branchSetting: () => import('@/views/categroyManager/specialSetup/branchSetting'),
+  jobTemplateSetting: () => import('@/views/categroyManager/specialSetup/jobTemplateSetting'),
   generalSettings: () => import('@/views/categroyManager/generalSettings/index'),
   siginManager: () => import('@/views/categroyManager/generalSettings/siginManager'),
   leaveManager: () => import('@/views/categroyManager/generalSettings/leaveManager'),

src/views/categroyManager/generalSettings/overallManager.vue

@@ -1,5 +1,96 @@
 <template>
-  <div>
-    全局配置
+  <div class='m-container'>
+    <h2>参数设置</h2>
+    <div class="m-core">
+      <!-- 列表 -->
+      <el-row>
+        <el-col :span="12" v-for="(config, index) in configList" :key="config.id">
+          {{ config.description[0] }}
+          <el-input type="number" v-model="input[index]">
+            <template slot="append" v-if="config.paramName !== 'default_password'">{{ config.description[1] }}</template>
+          </el-input>
+          <el-button @click="onSave(config, index)" type="primary">保存</el-button>
+        </el-col>
+      </el-row>
+    </div>
   </div>
-</template>
+</template>
+<script>
+import pagination from '@/components/Pagination/index'
+import store from '@/store'
+import { sysConfigList, sysConfigUpdate } from '@/api/generalSettings'
+export default {
+  components: { pagination },
+  name: 'musicalManager',
+  data () {
+    return {
+      organId: store.getters.organ,
+      configList: [],
+      input: []
+    }
+  },
+  mounted() {
+    this.__init()
+  },
+  methods: {
+    __init() {
+      sysConfigList().then(res => {
+        if(res.code == 200 && res.data.length > 0) {
+          res.data.forEach((item, index) => {
+            this.input[index] = item.paranValue
+            this.configList.push({
+              id: item.id,
+              paramName: item.paramName,
+              paranValue: item.paranValue,
+              description: item.description.split('{}')
+            })
+          })
+        }
+      })
+    },
+    onSave (row, index) { 
+      let params = {
+        id: row.id,
+        paranValue: this.input[index],
+        paramName: row.paramName,
+        description: row.description.join('{}')
+      }
+      sysConfigUpdate(params).then(res => {
+        if(res.code == 200) {
+          this.$message({
+            message: '修改成功',
+            type: 'success'
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.el-button--primary {
+  background: #14928a;
+  border-color: #14928a;
+  color: #fff;
+  &:hover, &:active, &:focus {
+    background: #14928a;
+    border-color: #14928a;
+    color: #FFF;
+  }
+}
+.el-row {
+  margin-top: 40px;
+}
+.el-col {
+  display: flex;
+  align-items: center;
+  margin-bottom: 20px;
+  justify-content: flex-end;
+  margin-right: 50%;
+}
+.el-input-group, .el-input {
+  width: 200px;
+  margin: 0 20px;
+}
+
+</style>

src/views/categroyManager/insideSetting/adminManager.vue

@@ -2,47 +2,21 @@
   <div class='m-container'>
     <h2>系统角色权限管理</h2>
     <div class="m-core">
-      <div class='newBand'>添加</div>
-      <!-- 搜索类型 -->
-      <el-form :inline="true"
-               class="searchForm"
-               v-model="searchForm">
-        <el-form-item>
-          <el-select v-model="searchForm.status"
-                     placeholder="角色类型">
-            <el-option v-for="item in roleList" :key="item.value"
-              :label="item.label" :value="item.value"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item>
-          <el-input suffix-icon="el-icon-search"
-                    placeholder="请输入搜索内容"></el-input>
-        </el-form-item>
-      </el-form>
-      <!-- 查询列表 -->
-      <!-- <div class="searchWrap">
-        <p>查询条件:</p>
-        <div class="searchItem"
-             @click="closeSearch(item)"
-             v-for="(item,index) in searchLsit">
-          {{ item.key }}
-          <i class="el-icon-close"></i>
-        </div>
-      </div> -->
+      <div @click="onAdminOperation('create')" class='newBand'>添加</div>
       <!-- 列表 -->
       <div class="tableWrap">
-        <el-table :data='tableList'>
-          <el-table-column align='center'
-                           label="角色分类">
-          </el-table-column>
-          <el-table-column align='center'
-                           label="状态">
+        <el-table :data='tableList' header-cell-class-name="headerName">
+          <el-table-column align='center' prop="roleName"
+                           label="角色类型">
           </el-table-column>
-          <el-table-column align='center'
+          <el-table-column align='center' prop="roleDesc"
                            label="权限范围">
           </el-table-column>
           <el-table-column align='center'
                            label="操作">
+            <template slot-scope="scope">
+              <el-button @click="onAdminOperation('update', scope.row)" type="text">修改</el-button>
+            </template>
           </el-table-column>
         </el-table>
         <pagination :total="pageInfo.total"
@@ -56,17 +30,13 @@
 </template>
 <script>
 import pagination from '@/components/Pagination/index'
-import { getUserRole } from '@/api/systemManage'
+import { roleQueryPage } from '@/api/systemManage'
 import store from '@/store'
 export default {
   components: { pagination },
   name: 'adminManager',
   data () {
     return {
-      searchForm: {
-        status: ''
-      },
-      searchLsit: [],
       tableList: [],
       pageInfo: {
         // 分页规则
@@ -75,27 +45,38 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      organId: store.getters.organ,
-      roleList: [], // 角色列表
+      organId: store.getters.organ
     }
   },
   mounted() {
-    this.getRoleList()
+    this.getList()
   },
   methods: {
-    getList () { },
-    getRoleList() {
-      getUserRole({ organId: this.organId }).then(res => {
-        if(res.code == 200) {
-          this.roleList = {
-            label: res.data.roleName,
-            value: res.data.id
-          }
+    getList () { 
+      roleQueryPage({ organId: this.organId }).then(res => {
+        if(res.code == 200 && res.data && res.data.rows.length > 0) {
+          this.tableList = res.data.rows
         }
       })
+    },
+    onAdminOperation(type, row) {
+      let params = {
+        path: '/system/insideSetting/adminoperation',
+        query: {
+          type: type
+        }
+      }
+      if(row) {
+        params.query.id = row.id
+      }
+      this.$router.push(params)
     }
   }
 }
 </script>
 <style lang="scss">
+.headerName {
+  background-color: #EDEEF0 !important;
+  color: #444444; 
+}
 </style>

src/views/categroyManager/insideSetting/adminOperation.vue

@@ -0,0 +1,170 @@
+<template>
+  <div class='m-container'>
+    <h2>{{ pageType == "create" ? '添加' : '修改' }}角色</h2>
+    <div class="m-core">
+      <el-form ref="form" label-width="120px" width="500px">
+        <el-form-item label="角色名称" prop="roleName">
+          <el-input v-model="result.roleName"></el-input>
+        </el-form-item>
+        <el-form-item label="角色描述">
+          <el-input type="textarea" v-model="result.roleDesc"></el-input>
+        </el-form-item>
+        <el-form-item label="基本权限">
+          <el-checkbox :indeterminate="isIndeterminate" @change="onCheckAll" v-model="checkAll">全选</el-checkbox>
+          <el-tree
+            :data="data"
+            show-checkbox
+            node-key="id"
+            ref="tree"
+            highlight-current
+            :props="defaultProps">
+          </el-tree>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="onSubmit" type="primary">立即{{ pageType == "create" ? '创建' : '修改' }}</el-button>
+          <el-button @click="onCancel">取消</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+  </div>
+</template>
+<script>
+import { getUserRole } from '@/api/systemManage'
+import store from '@/store'
+import { getSilder } from '@/api/silder'
+import { roleGetMenus, getRoleInfo, roleUpdate, roleAdd } from '@/api/systemManage'
+export default {
+  name: 'adminManager',
+  data () {
+    return {
+      organId: store.getters.organ,
+      pageType: this.$route.query.type,
+      id: this.$route.query.id,
+      isIndeterminate: true,
+      data: [],
+      defaultProps: {
+        children: 'children',
+        label: 'label'
+      },
+      result: {
+        roleName: null,
+        roleDesc: null,
+      },
+      checkAll: false
+    }
+  },
+  mounted() {
+    this.lookSilder()
+  },
+  methods: {
+    onSubmit() {
+      if(this.pageType == 'update') {
+        roleUpdate({
+          id: this.id,
+          organId: this.organId,
+          roleDesc: this.result.roleDesc,
+          roleName: this.result.roleName,
+          menuIds: this.$refs.tree.getCheckedKeys()
+        }).then(res => {
+          console.log(res)
+        })
+      } else if(this.pageType == 'create') {
+        roleAdd({
+          organId: this.organId,
+          roleDesc: this.result.roleDesc,
+          roleName: this.result.roleName,
+          menuIds: this.$refs.tree.getCheckedKeys()
+        }).then(res => {
+          console.log(res)
+        })
+      }
+    },
+    lookSilder () { 
+      getSilder().then(res => {
+        if(res.code != 200) return
+        this.data = this.setTableData(res.data)
+      })
+      if(this.pageType == 'update') {
+        getRoleInfo({ id: this.id }).then(res => {
+          if(res.code == 200) {
+            this.result = res.data
+          }
+        })
+      }
+    },
+    onCheckAll(val) {
+      if(val) {
+        this.$refs.tree.setCheckedNodes(this.data)
+      } else {
+        this.$refs.tree.setCheckedNodes([])
+      }
+    },
+    setTableData(result) {
+      let list = []
+      list = result.map( res => {
+        let tempList = {}
+        tempList = {
+          id: res.id,
+          name: res.name,
+          label: res.name,
+          type: res.type,
+          path: res.path,
+          permission: res.permission,
+          icon: res.icon,
+          parentId: res.parentId
+        }
+        if(res.sysMenus && res.sysMenus.length > 0) {
+            tempList.children = this.setTableData(res.sysMenus)
+        }
+        return tempList
+      })
+      return list
+    },
+    submitForm(formName) {
+      this.$refs[formName].validate((valid) => {
+        if (valid) {
+          alert('submit!');
+        } else {
+          console.log('error submit!!');
+          return false;
+        }
+      });
+    },
+    resetForm(formName) {
+      this.$refs[formName].resetFields()
+    },
+    onCancel() {
+      this.$router.push('/system/insideSetting/adminManager')
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.el-button--primary {
+  background: #14928a;
+  border-color: #14928a;
+  color: #fff;
+  &:hover, &:active, &:focus {
+    background: #14928a;
+    border-color: #14928a;
+    color: #FFF;
+  }
+}
+.el-row {
+  margin-top: 40px;
+}
+.el-col {
+  display: flex;
+  align-items: center;
+  margin-bottom: 20px;
+  justify-content: flex-end;
+  margin-right: 50%;
+}
+.el-input-group {
+  width: 200px;
+  margin: 0 20px;
+}
+/deep/.el-tree-node__content {
+  height: 40px !important;
+}
+</style>

src/views/categroyManager/specialSetup/bannerManager.vue

@@ -1,5 +1,95 @@
 <template>
-  <div>
-    banner管理
+  <div class='m-container'>
+    <h2>Banner管理</h2>
+    <div class="m-core">
+      <div class='newBand'>添加</div>
+      <!-- 列表 -->
+      <div class="tableWrap">
+        <el-table :data='tableList'>
+          <el-table-column align='center'
+                           label="轮播图">
+          </el-table-column>
+          <el-table-column align='center'
+                           label="跳转连接">
+          </el-table-column>
+          <el-table-column align='center'
+                           label="是否使用">
+          </el-table-column>
+          <el-table-column align='center'
+                           label="操作">
+            <template slot-scope="scope">
+              <el-button type="text">删除</el-button>
+              <el-button type="text">停用</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination :total="pageInfo.total"
+                    :page.sync="pageInfo.page"
+                    :limit.sync="pageInfo.limit"
+                    :page-sizes="pageInfo.page_size"
+                    @pagination="getList" />
+      </div>
+    </div>
+
   </div>
-</template>
+</template>
+<script>
+import pagination from '@/components/Pagination/index'
+import store from '@/store'
+export default {
+  components: { pagination },
+  name: 'adminManager',
+  data () {
+    return {
+      tableList: [],
+      pageInfo: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      },
+      organId: store.getters.organ
+    }
+  },
+  mounted() {
+    this.getList()
+    this.getAreaList()
+  },
+  methods: {
+    messageTips(title, res) {
+      if(res.code == 200) {
+        this.$message({
+          message: title + '成功',
+          type: 'success'
+        })
+        this.branchStatus = false
+        this.getList()
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    getList () { 
+      
+    }
+  }
+}
+</script>
+<style lang="scss">
+.el-input-group__append, .el-button--primary {
+  background: #14928a;
+  border-color: #14928a;
+  color: #fff;
+  &:hover, &:active, &:focus {
+    background: #14928a;
+    border-color: #14928a;
+    color: #FFF;
+  }
+}
+.el-date-editor.el-input{
+  width: 100% !important;
+}
+.el-select {
+  width: 98% !important;
+}
+</style>

src/views/categroyManager/specialSetup/jobTemplateSetting.vue

@@ -0,0 +1,98 @@
+<template>
+  <div class='m-container'>
+    <h2>作业模板管理</h2>
+    <div class="m-core">
+      <div class='newBand'>添加</div>
+      <!-- 列表 -->
+      <div class="tableWrap">
+        <el-table :data='tableList'>
+          <el-table-column align='center'
+                           label="作业模板名称">
+          </el-table-column>
+          <el-table-column align='center'
+                           label="对应课程类型">
+          </el-table-column>
+          <el-table-column align='center'
+                           label="声部">
+          </el-table-column>
+          <el-table-column align='center'
+                           label="模板内容">
+          </el-table-column>
+          <el-table-column align='center'
+                           label="操作">
+            <template slot-scope="scope">
+              <el-button type="text">修改</el-button>
+              <el-button type="text">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination :total="pageInfo.total"
+                    :page.sync="pageInfo.page"
+                    :limit.sync="pageInfo.limit"
+                    :page-sizes="pageInfo.page_size"
+                    @pagination="getList" />
+      </div>
+    </div>
+
+  </div>
+</template>
+<script>
+import pagination from '@/components/Pagination/index'
+import store from '@/store'
+export default {
+  components: { pagination },
+  name: 'adminManager',
+  data () {
+    return {
+      tableList: [],
+      pageInfo: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      },
+      organId: store.getters.organ
+    }
+  },
+  mounted() {
+    this.getList()
+    this.getAreaList()
+  },
+  methods: {
+    messageTips(title, res) {
+      if(res.code == 200) {
+        this.$message({
+          message: title + '成功',
+          type: 'success'
+        })
+        this.branchStatus = false
+        this.getList()
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    getList () { 
+      
+    }
+  }
+}
+</script>
+<style lang="scss">
+.el-input-group__append, .el-button--primary {
+  background: #14928a;
+  border-color: #14928a;
+  color: #fff;
+  &:hover, &:active, &:focus {
+    background: #14928a;
+    border-color: #14928a;
+    color: #FFF;
+  }
+}
+.el-date-editor.el-input{
+  width: 100% !important;
+}
+.el-select {
+  width: 98% !important;
+}
+</style>

src/views/categroyManager/specialSetup/musicalManager.vue

@@ -1,12 +1,141 @@
 <template>
-  <div>
-    声部设置
+  <div class='m-container'>
+    <h2>作业模板管理</h2>
+    <div class="m-core">
+      <div class='newBand'>添加</div>
+      <!-- 列表 -->
+      <el-row class="music-title">
+        <el-col :span="6">
+          一级分类 
+          <el-popover placement="right_start" width="300" trigger="click">
+            <el-input v-model="oneTypeName" size="medium" style="width: 73%" autocomplete="off"></el-input>
+            <el-button type="primary" size="medium" >提交</el-button>
+            <el-button slot="reference" type="primary" size="mini" round icon="el-icon-plus">添加</el-button>
+          </el-popover>
+          
+        </el-col>
+        <el-col :span="18">
+          二级分类
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="6">
+          <el-button icon="el-icon-delete" circle></el-button>
+          <span class="one_name">一级分类</span>
+        </el-col>
+        <el-col :span="18" class="tow_col">
+          <el-input class="tow_input" v-model="input"></el-input>
+          <el-button type="primary" size="mini" round icon="el-icon-plus">添加</el-button>
+          <el-button type="info" size="mini" round icon="el-icon-check">保存</el-button>
+        </el-col>
+      </el-row>
+
+
+
+    </div>
   </div>
 </template>
 <script>
+import pagination from '@/components/Pagination/index'
+import store from '@/store'
 export default {
-
+  components: { pagination },
+  name: 'musicalManager',
+  data () {
+    return {
+      organId: store.getters.organ,
+      oneTypeName: null, // 添加一级分类名称
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    messageTips(title, res) {
+      if(res.code == 200) {
+        this.$message({
+          message: title + '成功',
+          type: 'success'
+        })
+        this.branchStatus = false
+        this.getList()
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    getList () { 
+      
+    }
+  }
 }
 </script>
-<style lang="scss">
+<style lang="scss" scoped>
+.el-popover {
+  .el-form {
+    display: flex;
+  }
+  .el-form-item__content {
+    margin-left: 0 !important;
+  }
+}
+.music-title {
+  font-size: 14px;
+  color: #444;
+  .el-col {
+    background-color: #EDEEF0;
+    padding-left: 36px;
+  }
+  .el-button {
+    float: right;
+    margin-top: 10px;
+    margin-right: 16px;
+  }
+}
+.el-row {
+  margin-bottom: 12px;
+  .el-col {
+    line-height: 48px;
+  }
+  .el-col-18 {
+    width: calc(75% - 20px);
+    margin-left: 20px;
+  }
+  .one_name {
+    padding-left: 10px;
+  }
+  .tow_col {
+    padding-left: 20px;
+    .el-button--primary{
+      background: #fff;
+      border-color: #979797;
+      color: #777;
+      &:hover, &:active, &:focus {
+        background: #fff;
+        border-color: #979797;
+        color: #777;
+      }
+    }
+  }
+  .tow_input {
+    width: 100px;
+    margin-right: 12px;
+  }
+}
+.el-input-group__append, .el-button--primary {
+  background: #14928a;
+  border-color: #14928a;
+  color: #fff;
+  &:hover, &:active, &:focus {
+    background: #14928a;
+    border-color: #14928a;
+    color: #FFF;
+  }
+}
+.el-date-editor.el-input{
+  width: 100% !important;
+}
+.el-select {
+  width: 98% !important;
+}
 </style>

src/views/categroyManager/specialSetup/tryClass.vue

@@ -1,5 +1,95 @@
 <template>
-  <div>
-    试听课设置
+  <div class='m-container'>
+    <h2>试听课设置</h2>
+    <div class="m-core">
+      <!-- <div class='newBand'>新建</div> -->
+      <!-- 列表 -->
+      <div class="tableWrap">
+        <el-table :data='tableList'>
+          <el-table-column align='center'
+                           label="试听课可选专业">
+          </el-table-column>
+          <el-table-column align='center'
+                           label="收费方式">
+          </el-table-column>
+          <el-table-column align='center'
+                           label="收费金额">
+          </el-table-column>
+          <el-table-column align='center'
+                           label="操作">
+            <template slot-scope="scope">
+              <el-button type="text">删除</el-button>
+              <el-button type="text">停用</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+        <pagination :total="pageInfo.total"
+                    :page.sync="pageInfo.page"
+                    :limit.sync="pageInfo.limit"
+                    :page-sizes="pageInfo.page_size"
+                    @pagination="getList" />
+      </div>
+    </div>
+
   </div>
-</template>
+</template>
+<script>
+import pagination from '@/components/Pagination/index'
+import store from '@/store'
+export default {
+  components: { pagination },
+  name: 'adminManager',
+  data () {
+    return {
+      tableList: [],
+      pageInfo: {
+        // 分页规则
+        limit: 10, // 限制显示条数
+        page: 1, // 当前页
+        total: 0, // 总条数
+        page_size: [10, 20, 40, 50] // 选择限制显示条数
+      },
+      organId: store.getters.organ
+    }
+  },
+  mounted() {
+    this.getList()
+    this.getAreaList()
+  },
+  methods: {
+    messageTips(title, res) {
+      if(res.code == 200) {
+        this.$message({
+          message: title + '成功',
+          type: 'success'
+        })
+        this.branchStatus = false
+        this.getList()
+      } else {
+        this.$message.error(res.msg)
+      }
+    },
+    getList () { 
+      
+    }
+  }
+}
+</script>
+<style lang="scss">
+.el-input-group__append, .el-button--primary {
+  background: #14928a;
+  border-color: #14928a;
+  color: #fff;
+  &:hover, &:active, &:focus {
+    background: #14928a;
+    border-color: #14928a;
+    color: #FFF;
+  }
+}
+.el-date-editor.el-input{
+  width: 100% !important;
+}
+.el-select {
+  width: 98% !important;
+}
+</style>

src/views/setSilder/addSilder.vue

@@ -16,6 +16,10 @@
         label="菜单名称">
       </el-table-column>
       <el-table-column
+        prop="parentId"
+        label="元素ID">
+      </el-table-column>
+      <el-table-column
         prop="path"
         label="接口路径">
       </el-table-column>
@@ -64,16 +68,21 @@ export default {
      */
     //  Layout
     addSilder () {
-      // addSilder({
-      //   path: 'branchSetting',
-      //   component: 'branchSetting',
-      //   name: '分部设置',
-      //   permission: '/branchSetting',
-      //   sort: '1',
-      //   parentId: '22'
-      // }).then(res => {
-
-      // })
+      addSilder({
+        path: 'jobTemplateSetting',
+        component: 'jobTemplateSetting',
+        name: '作业模板管理',
+        permission: '/jobTemplateSetting',
+        sort: '1',
+        parentId: '22'
+      }).then(res => {
+        if(res.code == 200) {
+          this.$message({
+            message: '添加成功',
+            type: 'success'
+          })
+        }
+      })
     },
     removeSilder () {
       deleteSilder().then(res => {
@@ -96,7 +105,8 @@ export default {
           type: res.type,
           path: res.path,
           permission: res.permission,
-          icon: res.icon
+          icon: res.icon,
+          parentId: res.parentId
         }
         if(res.sysMenus && res.sysMenus.length > 0) {
             tempList.children = this.setTableData(res.sysMenus)
@@ -105,22 +115,6 @@ export default {
       })
       return list
     },
-    childrenList(res) {
-      res.forEach(item => {
-        let tempList = {}
-        tempList = {
-          id: res.id,
-          name: res.name,
-          type: res.type,
-          path: res.path,
-          permission: res.permission,
-          icon: res.icon
-        }
-        if(res.sysMenus && res.sysMenus.length > 0) {
-          tempList.children = this.setTableData(res.sysMenus)
-        }
-      })
-    },
     onDelete(row) { // 删除左则菜单
 
     },

vue.config.js

@@ -16,8 +16,8 @@ const name = defaultSettings.title || 'vue Admin Template' // page title
 // const port = process.env.port || process.env.npm_config_port || 9528 // dev port
 // http://47.99.212.176:8000
 // http://192.168.3.28:8000
-// let target = 'http://47.99.212.176:8000'
-let target = 'http://192.168.3.48:8000'
+let target = 'http://47.99.212.176:8000'
+// let target = 'http://192.168.3.48:8000'
 // All configuration item explanations can be find in https://cli.vuejs.org/config/
 module.exports = {
   /**