diff --git a/src/api/process/processTemplate.js b/src/api/process/processTemplate.js new file mode 100644 index 0000000..c0ec3f7 --- /dev/null +++ b/src/api/process/processTemplate.js @@ -0,0 +1,41 @@ +import request from '@/utils/request' + +const api_name = '/admin/process/processTemplate' + +export default { + + getPageList(page, limit) { + return request({ + url: `${api_name}/${page}/${limit}`, + method: 'get' + }) + }, + getById(id) { + return request({ + url: `${api_name}/get/${id}`, + method: 'get' + }) + }, + + save(role) { + return request({ + url: `${api_name}/save`, + method: 'post', + data: role + }) + }, + + updateById(role) { + return request({ + url: `${api_name}/update`, + method: 'put', + data: role + }) + }, + removeById(id) { + return request({ + url: `${api_name}/remove/${id}`, + method: 'delete' + }) + } +} diff --git a/src/api/process/processType.js b/src/api/process/processType.js new file mode 100644 index 0000000..4ec7450 --- /dev/null +++ b/src/api/process/processType.js @@ -0,0 +1,39 @@ +import request from '@/utils/request' + +const api_name = '/admin/process/processType' + +export default { + + getPageList(page, limit) { + return request({ + url: `${api_name}/${page}/${limit}`, + method: 'get' + }) + }, + getById(id) { + return request({ + url: `${api_name}/get/${id}`, + method: 'get' + }) + }, + save(role) { + return request({ + url: `${api_name}/save`, + method: 'post', + data: role + }) + }, + updateById(role) { + return request({ + url: `${api_name}/update`, + method: 'put', + data: role + }) + }, + removeById(id) { + return request({ + url: `${api_name}/remove/${id}`, + method: 'delete' + }) + } +} diff --git a/src/api/system/sysMenu.js b/src/api/system/sysMenu.js index d4ca570..670c74f 100644 --- a/src/api/system/sysMenu.js +++ b/src/api/system/sysMenu.js @@ -23,7 +23,7 @@ export default { removeById(id) { return request({ url: `${api_name}/remove/${id}`, - method: "delete" + method: 'delete' }) }, @@ -33,7 +33,7 @@ export default { save(sysMenu) { return request({ url: `${api_name}/save`, - method: "post", + method: 'post', data: sysMenu }) }, @@ -44,7 +44,7 @@ export default { updateById(sysMenu) { return request({ url: `${api_name}/update`, - method: "put", + method: 'put', data: sysMenu }) }, @@ -65,7 +65,7 @@ export default { doAssign(assginMenuVo) { return request({ url: `${api_name}/doAssign`, - method: "post", + method: 'post', data: assginMenuVo }) } diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue index cad6821..f07d8df 100644 --- a/src/layout/components/Sidebar/index.vue +++ b/src/layout/components/Sidebar/index.vue @@ -31,7 +31,7 @@ export default { 'sidebar' ]), routes() { - //return this.$router.options.routes + // return this.$router.options.routes return this.$router.options.routes.concat(global.antRouter) }, activeMenu() { diff --git a/src/permission.js b/src/permission.js index 6404e33..3306e1f 100644 --- a/src/permission.js +++ b/src/permission.js @@ -7,15 +7,16 @@ import 'nprogress/nprogress.css' // 水平进度条样式 import getPageTitle from '@/utils/get-page-title' // 获取应用头部标题的函数 import Layout from '@/layout' import ParentView from '@/components/ParentView' -const _import = require('./router/_import_'+process.env.NODE_ENV) // 获取组件的方法 + +const _import = require('./router/_import_' + process.env.NODE_ENV) // 获取组件的方法 NProgress.configure({ showSpinner: false }) // NProgress Configuration const whiteList = ['/login'] // no redirect whitelist router.beforeEach(async(to, from, next) => { NProgress.start() -// set page title + // set page title document.title = getPageTitle(to.meta.title) -// determine whether the user has logged in + // determine whether the user has logged in const hasToken = getToken() if (hasToken) { if (to.path === '/login') { @@ -37,14 +38,14 @@ router.beforeEach(async(to, from, next) => { const menus = filterAsyncRouter(store.getters.menus)// 1.过滤路由 console.log(menus) router.addRoutes(menus) // 2.动态添加路由 - let lastRou = [{ path: '*', redirect: '/404', hidden: true }] + const lastRou = [{ path: '*', redirect: '/404', hidden: true }] router.addRoutes(lastRou) global.antRouter = menus // 3.将路由数据传递给全局变量，做侧边栏菜单渲染工作 next({ ...to, replace: true }) - //next() + // next() } catch (error) { // remove token and go to login page to re-login console.log(error) @@ -81,7 +82,6 @@ function filterAsyncRouter(asyncRouterMap) { try { route.component = _import(route.component)// 导入组件 } catch (error) { - debugger console.log(error) route.component = _import('dashboard/index')// 导入组件 } diff --git a/src/views/processSet/processTemplate/list.vue b/src/views/processSet/processTemplate/list.vue new file mode 100644 index 0000000..468d03b --- /dev/null +++ b/src/views/processSet/processTemplate/list.vue @@ -0,0 +1,143 @@ + + diff --git a/src/views/processSet/processType/list.vue b/src/views/processSet/processType/list.vue new file mode 100644 index 0000000..b4814a5 --- /dev/null +++ b/src/views/processSet/processType/list.vue @@ -0,0 +1,192 @@ + + diff --git a/src/views/system/sysMenu/list.vue b/src/views/system/sysMenu/list.vue index 7276041..1328ea3 100644 --- a/src/views/system/sysMenu/list.vue +++ b/src/views/system/sysMenu/list.vue @@ -21,16 +21,16 @@ style="width: 100%;margin-bottom: 20px;margin-top: 10px;" > - + - - - - + + + + - + diff --git a/src/views/system/sysRole/list.vue b/src/views/system/sysRole/list.vue index ee20658..a15910d 100644 --- a/src/views/system/sysRole/list.vue +++ b/src/views/system/sysRole/list.vue @@ -220,7 +220,6 @@ export default { }, // 根据id删除数据 removeDataById(id) { - // debugger this.$confirm('此操作将永久删除该记录, 是否继续?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', diff --git a/src/views/system/sysUser/list.vue b/src/views/system/sysUser/list.vue index 4bf6cb4..4549fd4 100644 --- a/src/views/system/sysUser/list.vue +++ b/src/views/system/sysUser/list.vue @@ -6,7 +6,7 @@ - + @@ -63,11 +63,11 @@ - - - - - + + + + + - +