diff --git a/src/api/common/job.js b/src/api/common/job.js new file mode 100644 index 0000000..0d256ce --- /dev/null +++ b/src/api/common/job.js @@ -0,0 +1,45 @@ +/** + * 任务调度 + */ +import request from '@/utils/request' +export function getListPage(params) { + return request({ + url: 'jobConfig/listPage', + method: 'get', + params + }) +} + +// 添加字典 +export function add(params) { + return request({ + url: 'jobConfig/add', + method: 'post', + params + }) +} + +export function update(params) { + return request({ + url: 'jobConfig/update', + method: 'post', + params + }) +} +// 删除字典机构 +export function del(id) { + return request({ + url: 'jobConfig/delete', + method: 'post', + params: { + id: id + } + }) +} +// 任务操作相关接口 +export function operation(jobName, operation) { + return request({ + url: 'elasticJob/' + jobName + '/' + operation, + method: 'get' + }) +} diff --git a/src/api/common/job.js b/src/api/common/job.js new file mode 100644 index 0000000..0d256ce --- /dev/null +++ b/src/api/common/job.js @@ -0,0 +1,45 @@ +/** + * 任务调度 + */ +import request from '@/utils/request' +export function getListPage(params) { + return request({ + url: 'jobConfig/listPage', + method: 'get', + params + }) +} + +// 添加字典 +export function add(params) { + return request({ + url: 'jobConfig/add', + method: 'post', + params + }) +} + +export function update(params) { + return request({ + url: 'jobConfig/update', + method: 'post', + params + }) +} +// 删除字典机构 +export function del(id) { + return request({ + url: 'jobConfig/delete', + method: 'post', + params: { + id: id + } + }) +} +// 任务操作相关接口 +export function operation(jobName, operation) { + return request({ + url: 'elasticJob/' + jobName + '/' + operation, + method: 'get' + }) +} diff --git a/src/api/common/view.js b/src/api/common/view.js new file mode 100644 index 0000000..8f56271 --- /dev/null +++ b/src/api/common/view.js @@ -0,0 +1,39 @@ +/** + * 数据api访问 + */ +import request from '@/utils/request' +// 字典查询 +export function getViewListPage(params) { + return request({ + url: 'view/listPage', + method: 'get', + params + }) +} + +// 添加字典 +export function addView(params) { + return request({ + url: 'view/add', + method: 'post', + params + }) +} + +export function updateView(params) { + return request({ + url: 'view/update', + method: 'post', + params + }) +} +// 删除字典机构 +export function delView(id) { + return request({ + url: 'view/delete', + method: 'post', + params: { + id: id + } + }) +} diff --git a/src/api/common/job.js b/src/api/common/job.js new file mode 100644 index 0000000..0d256ce --- /dev/null +++ b/src/api/common/job.js @@ -0,0 +1,45 @@ +/** + * 任务调度 + */ +import request from '@/utils/request' +export function getListPage(params) { + return request({ + url: 'jobConfig/listPage', + method: 'get', + params + }) +} + +// 添加字典 +export function add(params) { + return request({ + url: 'jobConfig/add', + method: 'post', + params + }) +} + +export function update(params) { + return request({ + url: 'jobConfig/update', + method: 'post', + params + }) +} +// 删除字典机构 +export function del(id) { + return request({ + url: 'jobConfig/delete', + method: 'post', + params: { + id: id + } + }) +} +// 任务操作相关接口 +export function operation(jobName, operation) { + return request({ + url: 'elasticJob/' + jobName + '/' + operation, + method: 'get' + }) +} diff --git a/src/api/common/view.js b/src/api/common/view.js new file mode 100644 index 0000000..8f56271 --- /dev/null +++ b/src/api/common/view.js @@ -0,0 +1,39 @@ +/** + * 数据api访问 + */ +import request from '@/utils/request' +// 字典查询 +export function getViewListPage(params) { + return request({ + url: 'view/listPage', + method: 'get', + params + }) +} + +// 添加字典 +export function addView(params) { + return request({ + url: 'view/add', + method: 'post', + params + }) +} + +export function updateView(params) { + return request({ + url: 'view/update', + method: 'post', + params + }) +} +// 删除字典机构 +export function delView(id) { + return request({ + url: 'view/delete', + method: 'post', + params: { + id: id + } + }) +} diff --git a/src/api/monitor/view.js b/src/api/monitor/view.js deleted file mode 100644 index 8f56271..0000000 --- a/src/api/monitor/view.js +++ /dev/null @@ -1,39 +0,0 @@ -/** - * 数据api访问 - */ -import request from '@/utils/request' -// 字典查询 -export function getViewListPage(params) { - return request({ - url: 'view/listPage', - method: 'get', - params - }) -} - -// 添加字典 -export function addView(params) { - return request({ - url: 'view/add', - method: 'post', - params - }) -} - -export function updateView(params) { - return request({ - url: 'view/update', - method: 'post', - params - }) -} -// 删除字典机构 -export function delView(id) { - return request({ - url: 'view/delete', - method: 'post', - params: { - id: id - } - }) -} diff --git a/src/api/common/job.js b/src/api/common/job.js new file mode 100644 index 0000000..0d256ce --- /dev/null +++ b/src/api/common/job.js @@ -0,0 +1,45 @@ +/** + * 任务调度 + */ +import request from '@/utils/request' +export function getListPage(params) { + return request({ + url: 'jobConfig/listPage', + method: 'get', + params + }) +} + +// 添加字典 +export function add(params) { + return request({ + url: 'jobConfig/add', + method: 'post', + params + }) +} + +export function update(params) { + return request({ + url: 'jobConfig/update', + method: 'post', + params + }) +} +// 删除字典机构 +export function del(id) { + return request({ + url: 'jobConfig/delete', + method: 'post', + params: { + id: id + } + }) +} +// 任务操作相关接口 +export function operation(jobName, operation) { + return request({ + url: 'elasticJob/' + jobName + '/' + operation, + method: 'get' + }) +} diff --git a/src/api/common/view.js b/src/api/common/view.js new file mode 100644 index 0000000..8f56271 --- /dev/null +++ b/src/api/common/view.js @@ -0,0 +1,39 @@ +/** + * 数据api访问 + */ +import request from '@/utils/request' +// 字典查询 +export function getViewListPage(params) { + return request({ + url: 'view/listPage', + method: 'get', + params + }) +} + +// 添加字典 +export function addView(params) { + return request({ + url: 'view/add', + method: 'post', + params + }) +} + +export function updateView(params) { + return request({ + url: 'view/update', + method: 'post', + params + }) +} +// 删除字典机构 +export function delView(id) { + return request({ + url: 'view/delete', + method: 'post', + params: { + id: id + } + }) +} diff --git a/src/api/monitor/view.js b/src/api/monitor/view.js deleted file mode 100644 index 8f56271..0000000 --- a/src/api/monitor/view.js +++ /dev/null @@ -1,39 +0,0 @@ -/** - * 数据api访问 - */ -import request from '@/utils/request' -// 字典查询 -export function getViewListPage(params) { - return request({ - url: 'view/listPage', - method: 'get', - params - }) -} - -// 添加字典 -export function addView(params) { - return request({ - url: 'view/add', - method: 'post', - params - }) -} - -export function updateView(params) { - return request({ - url: 'view/update', - method: 'post', - params - }) -} -// 删除字典机构 -export function delView(id) { - return request({ - url: 'view/delete', - method: 'post', - params: { - id: id - } - }) -} diff --git a/src/permission.js b/src/permission.js index 5965c45..ed63713 100644 --- a/src/permission.js +++ b/src/permission.js @@ -36,10 +36,10 @@ url: '/baseResourse' } // 将当前系统信息保存在localStorage中 - store.commit('SET_SYSTEM', currentSys) + // store.commit('SET_SYSTEM', currentSys) // 远程访问获取权限列表(菜单&按钮) store.dispatch('GetMenus', currentSys).then(() => { - store.commit('SET_CHANGEFLAG', '0') + // store.commit('SET_CHANGEFLAG', '0') router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表 next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record }) diff --git a/src/api/common/job.js b/src/api/common/job.js new file mode 100644 index 0000000..0d256ce --- /dev/null +++ b/src/api/common/job.js @@ -0,0 +1,45 @@ +/** + * 任务调度 + */ +import request from '@/utils/request' +export function getListPage(params) { + return request({ + url: 'jobConfig/listPage', + method: 'get', + params + }) +} + +// 添加字典 +export function add(params) { + return request({ + url: 'jobConfig/add', + method: 'post', + params + }) +} + +export function update(params) { + return request({ + url: 'jobConfig/update', + method: 'post', + params + }) +} +// 删除字典机构 +export function del(id) { + return request({ + url: 'jobConfig/delete', + method: 'post', + params: { + id: id + } + }) +} +// 任务操作相关接口 +export function operation(jobName, operation) { + return request({ + url: 'elasticJob/' + jobName + '/' + operation, + method: 'get' + }) +} diff --git a/src/api/common/view.js b/src/api/common/view.js new file mode 100644 index 0000000..8f56271 --- /dev/null +++ b/src/api/common/view.js @@ -0,0 +1,39 @@ +/** + * 数据api访问 + */ +import request from '@/utils/request' +// 字典查询 +export function getViewListPage(params) { + return request({ + url: 'view/listPage', + method: 'get', + params + }) +} + +// 添加字典 +export function addView(params) { + return request({ + url: 'view/add', + method: 'post', + params + }) +} + +export function updateView(params) { + return request({ + url: 'view/update', + method: 'post', + params + }) +} +// 删除字典机构 +export function delView(id) { + return request({ + url: 'view/delete', + method: 'post', + params: { + id: id + } + }) +} diff --git a/src/api/monitor/view.js b/src/api/monitor/view.js deleted file mode 100644 index 8f56271..0000000 --- a/src/api/monitor/view.js +++ /dev/null @@ -1,39 +0,0 @@ -/** - * 数据api访问 - */ -import request from '@/utils/request' -// 字典查询 -export function getViewListPage(params) { - return request({ - url: 'view/listPage', - method: 'get', - params - }) -} - -// 添加字典 -export function addView(params) { - return request({ - url: 'view/add', - method: 'post', - params - }) -} - -export function updateView(params) { - return request({ - url: 'view/update', - method: 'post', - params - }) -} -// 删除字典机构 -export function delView(id) { - return request({ - url: 'view/delete', - method: 'post', - params: { - id: id - } - }) -} diff --git a/src/permission.js b/src/permission.js index 5965c45..ed63713 100644 --- a/src/permission.js +++ b/src/permission.js @@ -36,10 +36,10 @@ url: '/baseResourse' } // 将当前系统信息保存在localStorage中 - store.commit('SET_SYSTEM', currentSys) + // store.commit('SET_SYSTEM', currentSys) // 远程访问获取权限列表(菜单&按钮) store.dispatch('GetMenus', currentSys).then(() => { - store.commit('SET_CHANGEFLAG', '0') + // store.commit('SET_CHANGEFLAG', '0') router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表 next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record }) diff --git a/src/router/modules/monitor.js b/src/router/modules/monitor.js index a7a989f..ddd2366 100644 --- a/src/router/modules/monitor.js +++ b/src/router/modules/monitor.js @@ -8,13 +8,14 @@ name: 'monitor', alwaysShow: true, meta: { - title: '数据管理', - icon: 'icon-config' // 图标 + title: '监测管理', + icon: 'icon-config', + permission: ['/monitor'] }, children: [ { - path: '/exampleTable', - name: 'ExampleTable', + path: '/monitor', + name: 'monitor', component: () => import('@/views/view/listView'), meta: { title: '数据集服务', icon: '', permission: ['/monitor/view'] } } diff --git a/src/api/common/job.js b/src/api/common/job.js new file mode 100644 index 0000000..0d256ce --- /dev/null +++ b/src/api/common/job.js @@ -0,0 +1,45 @@ +/** + * 任务调度 + */ +import request from '@/utils/request' +export function getListPage(params) { + return request({ + url: 'jobConfig/listPage', + method: 'get', + params + }) +} + +// 添加字典 +export function add(params) { + return request({ + url: 'jobConfig/add', + method: 'post', + params + }) +} + +export function update(params) { + return request({ + url: 'jobConfig/update', + method: 'post', + params + }) +} +// 删除字典机构 +export function del(id) { + return request({ + url: 'jobConfig/delete', + method: 'post', + params: { + id: id + } + }) +} +// 任务操作相关接口 +export function operation(jobName, operation) { + return request({ + url: 'elasticJob/' + jobName + '/' + operation, + method: 'get' + }) +} diff --git a/src/api/common/view.js b/src/api/common/view.js new file mode 100644 index 0000000..8f56271 --- /dev/null +++ b/src/api/common/view.js @@ -0,0 +1,39 @@ +/** + * 数据api访问 + */ +import request from '@/utils/request' +// 字典查询 +export function getViewListPage(params) { + return request({ + url: 'view/listPage', + method: 'get', + params + }) +} + +// 添加字典 +export function addView(params) { + return request({ + url: 'view/add', + method: 'post', + params + }) +} + +export function updateView(params) { + return request({ + url: 'view/update', + method: 'post', + params + }) +} +// 删除字典机构 +export function delView(id) { + return request({ + url: 'view/delete', + method: 'post', + params: { + id: id + } + }) +} diff --git a/src/api/monitor/view.js b/src/api/monitor/view.js deleted file mode 100644 index 8f56271..0000000 --- a/src/api/monitor/view.js +++ /dev/null @@ -1,39 +0,0 @@ -/** - * 数据api访问 - */ -import request from '@/utils/request' -// 字典查询 -export function getViewListPage(params) { - return request({ - url: 'view/listPage', - method: 'get', - params - }) -} - -// 添加字典 -export function addView(params) { - return request({ - url: 'view/add', - method: 'post', - params - }) -} - -export function updateView(params) { - return request({ - url: 'view/update', - method: 'post', - params - }) -} -// 删除字典机构 -export function delView(id) { - return request({ - url: 'view/delete', - method: 'post', - params: { - id: id - } - }) -} diff --git a/src/permission.js b/src/permission.js index 5965c45..ed63713 100644 --- a/src/permission.js +++ b/src/permission.js @@ -36,10 +36,10 @@ url: '/baseResourse' } // 将当前系统信息保存在localStorage中 - store.commit('SET_SYSTEM', currentSys) + // store.commit('SET_SYSTEM', currentSys) // 远程访问获取权限列表(菜单&按钮) store.dispatch('GetMenus', currentSys).then(() => { - store.commit('SET_CHANGEFLAG', '0') + // store.commit('SET_CHANGEFLAG', '0') router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表 next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record }) diff --git a/src/router/modules/monitor.js b/src/router/modules/monitor.js index a7a989f..ddd2366 100644 --- a/src/router/modules/monitor.js +++ b/src/router/modules/monitor.js @@ -8,13 +8,14 @@ name: 'monitor', alwaysShow: true, meta: { - title: '数据管理', - icon: 'icon-config' // 图标 + title: '监测管理', + icon: 'icon-config', + permission: ['/monitor'] }, children: [ { - path: '/exampleTable', - name: 'ExampleTable', + path: '/monitor', + name: 'monitor', component: () => import('@/views/view/listView'), meta: { title: '数据集服务', icon: '', permission: ['/monitor/view'] } } diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 200cef3..13490f1 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -64,7 +64,13 @@ path: '/config', component: () => import('@/views/system/config/listConfig'), // Parent router-view name: 'Config', - meta: { title: '系统配置' } + meta: { title: '系统配置', permission: ['/config'] } + }, + { + path: '/job', + component: () => import('@/views/job/listJob'), // Parent router-view , permission: ['/job'] + name: 'job', + meta: { title: '任务管理' } } ] }] diff --git a/src/api/common/job.js b/src/api/common/job.js new file mode 100644 index 0000000..0d256ce --- /dev/null +++ b/src/api/common/job.js @@ -0,0 +1,45 @@ +/** + * 任务调度 + */ +import request from '@/utils/request' +export function getListPage(params) { + return request({ + url: 'jobConfig/listPage', + method: 'get', + params + }) +} + +// 添加字典 +export function add(params) { + return request({ + url: 'jobConfig/add', + method: 'post', + params + }) +} + +export function update(params) { + return request({ + url: 'jobConfig/update', + method: 'post', + params + }) +} +// 删除字典机构 +export function del(id) { + return request({ + url: 'jobConfig/delete', + method: 'post', + params: { + id: id + } + }) +} +// 任务操作相关接口 +export function operation(jobName, operation) { + return request({ + url: 'elasticJob/' + jobName + '/' + operation, + method: 'get' + }) +} diff --git a/src/api/common/view.js b/src/api/common/view.js new file mode 100644 index 0000000..8f56271 --- /dev/null +++ b/src/api/common/view.js @@ -0,0 +1,39 @@ +/** + * 数据api访问 + */ +import request from '@/utils/request' +// 字典查询 +export function getViewListPage(params) { + return request({ + url: 'view/listPage', + method: 'get', + params + }) +} + +// 添加字典 +export function addView(params) { + return request({ + url: 'view/add', + method: 'post', + params + }) +} + +export function updateView(params) { + return request({ + url: 'view/update', + method: 'post', + params + }) +} +// 删除字典机构 +export function delView(id) { + return request({ + url: 'view/delete', + method: 'post', + params: { + id: id + } + }) +} diff --git a/src/api/monitor/view.js b/src/api/monitor/view.js deleted file mode 100644 index 8f56271..0000000 --- a/src/api/monitor/view.js +++ /dev/null @@ -1,39 +0,0 @@ -/** - * 数据api访问 - */ -import request from '@/utils/request' -// 字典查询 -export function getViewListPage(params) { - return request({ - url: 'view/listPage', - method: 'get', - params - }) -} - -// 添加字典 -export function addView(params) { - return request({ - url: 'view/add', - method: 'post', - params - }) -} - -export function updateView(params) { - return request({ - url: 'view/update', - method: 'post', - params - }) -} -// 删除字典机构 -export function delView(id) { - return request({ - url: 'view/delete', - method: 'post', - params: { - id: id - } - }) -} diff --git a/src/permission.js b/src/permission.js index 5965c45..ed63713 100644 --- a/src/permission.js +++ b/src/permission.js @@ -36,10 +36,10 @@ url: '/baseResourse' } // 将当前系统信息保存在localStorage中 - store.commit('SET_SYSTEM', currentSys) + // store.commit('SET_SYSTEM', currentSys) // 远程访问获取权限列表(菜单&按钮) store.dispatch('GetMenus', currentSys).then(() => { - store.commit('SET_CHANGEFLAG', '0') + // store.commit('SET_CHANGEFLAG', '0') router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表 next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record }) diff --git a/src/router/modules/monitor.js b/src/router/modules/monitor.js index a7a989f..ddd2366 100644 --- a/src/router/modules/monitor.js +++ b/src/router/modules/monitor.js @@ -8,13 +8,14 @@ name: 'monitor', alwaysShow: true, meta: { - title: '数据管理', - icon: 'icon-config' // 图标 + title: '监测管理', + icon: 'icon-config', + permission: ['/monitor'] }, children: [ { - path: '/exampleTable', - name: 'ExampleTable', + path: '/monitor', + name: 'monitor', component: () => import('@/views/view/listView'), meta: { title: '数据集服务', icon: '', permission: ['/monitor/view'] } } diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 200cef3..13490f1 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -64,7 +64,13 @@ path: '/config', component: () => import('@/views/system/config/listConfig'), // Parent router-view name: 'Config', - meta: { title: '系统配置' } + meta: { title: '系统配置', permission: ['/config'] } + }, + { + path: '/job', + component: () => import('@/views/job/listJob'), // Parent router-view , permission: ['/job'] + name: 'job', + meta: { title: '任务管理' } } ] }] diff --git a/src/views/job/editJob.vue b/src/views/job/editJob.vue new file mode 100644 index 0000000..3b52a12 --- /dev/null +++ b/src/views/job/editJob.vue @@ -0,0 +1,202 @@ + + + + + diff --git a/src/api/common/job.js b/src/api/common/job.js new file mode 100644 index 0000000..0d256ce --- /dev/null +++ b/src/api/common/job.js @@ -0,0 +1,45 @@ +/** + * 任务调度 + */ +import request from '@/utils/request' +export function getListPage(params) { + return request({ + url: 'jobConfig/listPage', + method: 'get', + params + }) +} + +// 添加字典 +export function add(params) { + return request({ + url: 'jobConfig/add', + method: 'post', + params + }) +} + +export function update(params) { + return request({ + url: 'jobConfig/update', + method: 'post', + params + }) +} +// 删除字典机构 +export function del(id) { + return request({ + url: 'jobConfig/delete', + method: 'post', + params: { + id: id + } + }) +} +// 任务操作相关接口 +export function operation(jobName, operation) { + return request({ + url: 'elasticJob/' + jobName + '/' + operation, + method: 'get' + }) +} diff --git a/src/api/common/view.js b/src/api/common/view.js new file mode 100644 index 0000000..8f56271 --- /dev/null +++ b/src/api/common/view.js @@ -0,0 +1,39 @@ +/** + * 数据api访问 + */ +import request from '@/utils/request' +// 字典查询 +export function getViewListPage(params) { + return request({ + url: 'view/listPage', + method: 'get', + params + }) +} + +// 添加字典 +export function addView(params) { + return request({ + url: 'view/add', + method: 'post', + params + }) +} + +export function updateView(params) { + return request({ + url: 'view/update', + method: 'post', + params + }) +} +// 删除字典机构 +export function delView(id) { + return request({ + url: 'view/delete', + method: 'post', + params: { + id: id + } + }) +} diff --git a/src/api/monitor/view.js b/src/api/monitor/view.js deleted file mode 100644 index 8f56271..0000000 --- a/src/api/monitor/view.js +++ /dev/null @@ -1,39 +0,0 @@ -/** - * 数据api访问 - */ -import request from '@/utils/request' -// 字典查询 -export function getViewListPage(params) { - return request({ - url: 'view/listPage', - method: 'get', - params - }) -} - -// 添加字典 -export function addView(params) { - return request({ - url: 'view/add', - method: 'post', - params - }) -} - -export function updateView(params) { - return request({ - url: 'view/update', - method: 'post', - params - }) -} -// 删除字典机构 -export function delView(id) { - return request({ - url: 'view/delete', - method: 'post', - params: { - id: id - } - }) -} diff --git a/src/permission.js b/src/permission.js index 5965c45..ed63713 100644 --- a/src/permission.js +++ b/src/permission.js @@ -36,10 +36,10 @@ url: '/baseResourse' } // 将当前系统信息保存在localStorage中 - store.commit('SET_SYSTEM', currentSys) + // store.commit('SET_SYSTEM', currentSys) // 远程访问获取权限列表(菜单&按钮) store.dispatch('GetMenus', currentSys).then(() => { - store.commit('SET_CHANGEFLAG', '0') + // store.commit('SET_CHANGEFLAG', '0') router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表 next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record }) diff --git a/src/router/modules/monitor.js b/src/router/modules/monitor.js index a7a989f..ddd2366 100644 --- a/src/router/modules/monitor.js +++ b/src/router/modules/monitor.js @@ -8,13 +8,14 @@ name: 'monitor', alwaysShow: true, meta: { - title: '数据管理', - icon: 'icon-config' // 图标 + title: '监测管理', + icon: 'icon-config', + permission: ['/monitor'] }, children: [ { - path: '/exampleTable', - name: 'ExampleTable', + path: '/monitor', + name: 'monitor', component: () => import('@/views/view/listView'), meta: { title: '数据集服务', icon: '', permission: ['/monitor/view'] } } diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 200cef3..13490f1 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -64,7 +64,13 @@ path: '/config', component: () => import('@/views/system/config/listConfig'), // Parent router-view name: 'Config', - meta: { title: '系统配置' } + meta: { title: '系统配置', permission: ['/config'] } + }, + { + path: '/job', + component: () => import('@/views/job/listJob'), // Parent router-view , permission: ['/job'] + name: 'job', + meta: { title: '任务管理' } } ] }] diff --git a/src/views/job/editJob.vue b/src/views/job/editJob.vue new file mode 100644 index 0000000..3b52a12 --- /dev/null +++ b/src/views/job/editJob.vue @@ -0,0 +1,202 @@ + + + + + diff --git a/src/views/job/listJob.vue b/src/views/job/listJob.vue new file mode 100644 index 0000000..d5e2418 --- /dev/null +++ b/src/views/job/listJob.vue @@ -0,0 +1,293 @@ + + + + + diff --git a/src/api/common/job.js b/src/api/common/job.js new file mode 100644 index 0000000..0d256ce --- /dev/null +++ b/src/api/common/job.js @@ -0,0 +1,45 @@ +/** + * 任务调度 + */ +import request from '@/utils/request' +export function getListPage(params) { + return request({ + url: 'jobConfig/listPage', + method: 'get', + params + }) +} + +// 添加字典 +export function add(params) { + return request({ + url: 'jobConfig/add', + method: 'post', + params + }) +} + +export function update(params) { + return request({ + url: 'jobConfig/update', + method: 'post', + params + }) +} +// 删除字典机构 +export function del(id) { + return request({ + url: 'jobConfig/delete', + method: 'post', + params: { + id: id + } + }) +} +// 任务操作相关接口 +export function operation(jobName, operation) { + return request({ + url: 'elasticJob/' + jobName + '/' + operation, + method: 'get' + }) +} diff --git a/src/api/common/view.js b/src/api/common/view.js new file mode 100644 index 0000000..8f56271 --- /dev/null +++ b/src/api/common/view.js @@ -0,0 +1,39 @@ +/** + * 数据api访问 + */ +import request from '@/utils/request' +// 字典查询 +export function getViewListPage(params) { + return request({ + url: 'view/listPage', + method: 'get', + params + }) +} + +// 添加字典 +export function addView(params) { + return request({ + url: 'view/add', + method: 'post', + params + }) +} + +export function updateView(params) { + return request({ + url: 'view/update', + method: 'post', + params + }) +} +// 删除字典机构 +export function delView(id) { + return request({ + url: 'view/delete', + method: 'post', + params: { + id: id + } + }) +} diff --git a/src/api/monitor/view.js b/src/api/monitor/view.js deleted file mode 100644 index 8f56271..0000000 --- a/src/api/monitor/view.js +++ /dev/null @@ -1,39 +0,0 @@ -/** - * 数据api访问 - */ -import request from '@/utils/request' -// 字典查询 -export function getViewListPage(params) { - return request({ - url: 'view/listPage', - method: 'get', - params - }) -} - -// 添加字典 -export function addView(params) { - return request({ - url: 'view/add', - method: 'post', - params - }) -} - -export function updateView(params) { - return request({ - url: 'view/update', - method: 'post', - params - }) -} -// 删除字典机构 -export function delView(id) { - return request({ - url: 'view/delete', - method: 'post', - params: { - id: id - } - }) -} diff --git a/src/permission.js b/src/permission.js index 5965c45..ed63713 100644 --- a/src/permission.js +++ b/src/permission.js @@ -36,10 +36,10 @@ url: '/baseResourse' } // 将当前系统信息保存在localStorage中 - store.commit('SET_SYSTEM', currentSys) + // store.commit('SET_SYSTEM', currentSys) // 远程访问获取权限列表(菜单&按钮) store.dispatch('GetMenus', currentSys).then(() => { - store.commit('SET_CHANGEFLAG', '0') + // store.commit('SET_CHANGEFLAG', '0') router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表 next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record }) diff --git a/src/router/modules/monitor.js b/src/router/modules/monitor.js index a7a989f..ddd2366 100644 --- a/src/router/modules/monitor.js +++ b/src/router/modules/monitor.js @@ -8,13 +8,14 @@ name: 'monitor', alwaysShow: true, meta: { - title: '数据管理', - icon: 'icon-config' // 图标 + title: '监测管理', + icon: 'icon-config', + permission: ['/monitor'] }, children: [ { - path: '/exampleTable', - name: 'ExampleTable', + path: '/monitor', + name: 'monitor', component: () => import('@/views/view/listView'), meta: { title: '数据集服务', icon: '', permission: ['/monitor/view'] } } diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 200cef3..13490f1 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -64,7 +64,13 @@ path: '/config', component: () => import('@/views/system/config/listConfig'), // Parent router-view name: 'Config', - meta: { title: '系统配置' } + meta: { title: '系统配置', permission: ['/config'] } + }, + { + path: '/job', + component: () => import('@/views/job/listJob'), // Parent router-view , permission: ['/job'] + name: 'job', + meta: { title: '任务管理' } } ] }] diff --git a/src/views/job/editJob.vue b/src/views/job/editJob.vue new file mode 100644 index 0000000..3b52a12 --- /dev/null +++ b/src/views/job/editJob.vue @@ -0,0 +1,202 @@ + + + + + diff --git a/src/views/job/listJob.vue b/src/views/job/listJob.vue new file mode 100644 index 0000000..d5e2418 --- /dev/null +++ b/src/views/job/listJob.vue @@ -0,0 +1,293 @@ + + + + + diff --git a/src/views/system/config/editConfig.vue b/src/views/system/config/editConfig.vue index 0d1ef7f..d6f03b5 100644 --- a/src/views/system/config/editConfig.vue +++ b/src/views/system/config/editConfig.vue @@ -52,11 +52,8 @@ create: '新增' }, // 表头显示标题 rules: { - simplename: [{ required: true, message: '组织机构名称不能为空', trigger: ['blur', 'change'] }], - fullname: [{ required: true, message: '组织机构全称不能为空', trigger: ['blur', 'change'] }], - pid: [{ required: true, message: '父组织机构必选', trigger: ['blur', 'change'] }], - num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }], - deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }] + targetName: [{ required: true, message: '配置项不能为空', trigger: ['blur', 'change'] }], + value: [{ required: true, message: '值不能为空', trigger: ['blur', 'change'] }] } // 前端校验规则 } }, @@ -135,7 +132,7 @@ if (valid) { this.btnLoading = true this.dialogFormVisible = true - updateConfig(this.deptForm).then(response => { + updateConfig(this.configForm).then(response => { if (response.code === 200) { this.$message.success('修改成功') this.$emit('watchChild') diff --git a/src/api/common/job.js b/src/api/common/job.js new file mode 100644 index 0000000..0d256ce --- /dev/null +++ b/src/api/common/job.js @@ -0,0 +1,45 @@ +/** + * 任务调度 + */ +import request from '@/utils/request' +export function getListPage(params) { + return request({ + url: 'jobConfig/listPage', + method: 'get', + params + }) +} + +// 添加字典 +export function add(params) { + return request({ + url: 'jobConfig/add', + method: 'post', + params + }) +} + +export function update(params) { + return request({ + url: 'jobConfig/update', + method: 'post', + params + }) +} +// 删除字典机构 +export function del(id) { + return request({ + url: 'jobConfig/delete', + method: 'post', + params: { + id: id + } + }) +} +// 任务操作相关接口 +export function operation(jobName, operation) { + return request({ + url: 'elasticJob/' + jobName + '/' + operation, + method: 'get' + }) +} diff --git a/src/api/common/view.js b/src/api/common/view.js new file mode 100644 index 0000000..8f56271 --- /dev/null +++ b/src/api/common/view.js @@ -0,0 +1,39 @@ +/** + * 数据api访问 + */ +import request from '@/utils/request' +// 字典查询 +export function getViewListPage(params) { + return request({ + url: 'view/listPage', + method: 'get', + params + }) +} + +// 添加字典 +export function addView(params) { + return request({ + url: 'view/add', + method: 'post', + params + }) +} + +export function updateView(params) { + return request({ + url: 'view/update', + method: 'post', + params + }) +} +// 删除字典机构 +export function delView(id) { + return request({ + url: 'view/delete', + method: 'post', + params: { + id: id + } + }) +} diff --git a/src/api/monitor/view.js b/src/api/monitor/view.js deleted file mode 100644 index 8f56271..0000000 --- a/src/api/monitor/view.js +++ /dev/null @@ -1,39 +0,0 @@ -/** - * 数据api访问 - */ -import request from '@/utils/request' -// 字典查询 -export function getViewListPage(params) { - return request({ - url: 'view/listPage', - method: 'get', - params - }) -} - -// 添加字典 -export function addView(params) { - return request({ - url: 'view/add', - method: 'post', - params - }) -} - -export function updateView(params) { - return request({ - url: 'view/update', - method: 'post', - params - }) -} -// 删除字典机构 -export function delView(id) { - return request({ - url: 'view/delete', - method: 'post', - params: { - id: id - } - }) -} diff --git a/src/permission.js b/src/permission.js index 5965c45..ed63713 100644 --- a/src/permission.js +++ b/src/permission.js @@ -36,10 +36,10 @@ url: '/baseResourse' } // 将当前系统信息保存在localStorage中 - store.commit('SET_SYSTEM', currentSys) + // store.commit('SET_SYSTEM', currentSys) // 远程访问获取权限列表(菜单&按钮) store.dispatch('GetMenus', currentSys).then(() => { - store.commit('SET_CHANGEFLAG', '0') + // store.commit('SET_CHANGEFLAG', '0') router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表 next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record }) diff --git a/src/router/modules/monitor.js b/src/router/modules/monitor.js index a7a989f..ddd2366 100644 --- a/src/router/modules/monitor.js +++ b/src/router/modules/monitor.js @@ -8,13 +8,14 @@ name: 'monitor', alwaysShow: true, meta: { - title: '数据管理', - icon: 'icon-config' // 图标 + title: '监测管理', + icon: 'icon-config', + permission: ['/monitor'] }, children: [ { - path: '/exampleTable', - name: 'ExampleTable', + path: '/monitor', + name: 'monitor', component: () => import('@/views/view/listView'), meta: { title: '数据集服务', icon: '', permission: ['/monitor/view'] } } diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 200cef3..13490f1 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -64,7 +64,13 @@ path: '/config', component: () => import('@/views/system/config/listConfig'), // Parent router-view name: 'Config', - meta: { title: '系统配置' } + meta: { title: '系统配置', permission: ['/config'] } + }, + { + path: '/job', + component: () => import('@/views/job/listJob'), // Parent router-view , permission: ['/job'] + name: 'job', + meta: { title: '任务管理' } } ] }] diff --git a/src/views/job/editJob.vue b/src/views/job/editJob.vue new file mode 100644 index 0000000..3b52a12 --- /dev/null +++ b/src/views/job/editJob.vue @@ -0,0 +1,202 @@ + + + + + diff --git a/src/views/job/listJob.vue b/src/views/job/listJob.vue new file mode 100644 index 0000000..d5e2418 --- /dev/null +++ b/src/views/job/listJob.vue @@ -0,0 +1,293 @@ + + + + + diff --git a/src/views/system/config/editConfig.vue b/src/views/system/config/editConfig.vue index 0d1ef7f..d6f03b5 100644 --- a/src/views/system/config/editConfig.vue +++ b/src/views/system/config/editConfig.vue @@ -52,11 +52,8 @@ create: '新增' }, // 表头显示标题 rules: { - simplename: [{ required: true, message: '组织机构名称不能为空', trigger: ['blur', 'change'] }], - fullname: [{ required: true, message: '组织机构全称不能为空', trigger: ['blur', 'change'] }], - pid: [{ required: true, message: '父组织机构必选', trigger: ['blur', 'change'] }], - num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }], - deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }] + targetName: [{ required: true, message: '配置项不能为空', trigger: ['blur', 'change'] }], + value: [{ required: true, message: '值不能为空', trigger: ['blur', 'change'] }] } // 前端校验规则 } }, @@ -135,7 +132,7 @@ if (valid) { this.btnLoading = true this.dialogFormVisible = true - updateConfig(this.deptForm).then(response => { + updateConfig(this.configForm).then(response => { if (response.code === 200) { this.$message.success('修改成功') this.$emit('watchChild') diff --git a/src/views/system/config/listConfig.vue b/src/views/system/config/listConfig.vue index 76b3e4f..c336082 100644 --- a/src/views/system/config/listConfig.vue +++ b/src/views/system/config/listConfig.vue @@ -26,8 +26,8 @@ @@ -77,7 +77,7 @@ }, computed: { 'showOperate': function(row) { // 判断是否显示操作列,如果编辑和删除的权限都没有则不显示操作列 - return this.hasPerm('/dict/update') || this.hasPerm('/dict/delete') + return this.hasPerm('/config/update') || this.hasPerm('/config/delete') } }, created() { @@ -105,7 +105,7 @@ // 删除字典 del(row) { this.$confirm( - '确定要删除字典吗?', + '确定要删除吗?', '确认操作', { confirmButtonText: '确定', diff --git a/src/api/common/job.js b/src/api/common/job.js new file mode 100644 index 0000000..0d256ce --- /dev/null +++ b/src/api/common/job.js @@ -0,0 +1,45 @@ +/** + * 任务调度 + */ +import request from '@/utils/request' +export function getListPage(params) { + return request({ + url: 'jobConfig/listPage', + method: 'get', + params + }) +} + +// 添加字典 +export function add(params) { + return request({ + url: 'jobConfig/add', + method: 'post', + params + }) +} + +export function update(params) { + return request({ + url: 'jobConfig/update', + method: 'post', + params + }) +} +// 删除字典机构 +export function del(id) { + return request({ + url: 'jobConfig/delete', + method: 'post', + params: { + id: id + } + }) +} +// 任务操作相关接口 +export function operation(jobName, operation) { + return request({ + url: 'elasticJob/' + jobName + '/' + operation, + method: 'get' + }) +} diff --git a/src/api/common/view.js b/src/api/common/view.js new file mode 100644 index 0000000..8f56271 --- /dev/null +++ b/src/api/common/view.js @@ -0,0 +1,39 @@ +/** + * 数据api访问 + */ +import request from '@/utils/request' +// 字典查询 +export function getViewListPage(params) { + return request({ + url: 'view/listPage', + method: 'get', + params + }) +} + +// 添加字典 +export function addView(params) { + return request({ + url: 'view/add', + method: 'post', + params + }) +} + +export function updateView(params) { + return request({ + url: 'view/update', + method: 'post', + params + }) +} +// 删除字典机构 +export function delView(id) { + return request({ + url: 'view/delete', + method: 'post', + params: { + id: id + } + }) +} diff --git a/src/api/monitor/view.js b/src/api/monitor/view.js deleted file mode 100644 index 8f56271..0000000 --- a/src/api/monitor/view.js +++ /dev/null @@ -1,39 +0,0 @@ -/** - * 数据api访问 - */ -import request from '@/utils/request' -// 字典查询 -export function getViewListPage(params) { - return request({ - url: 'view/listPage', - method: 'get', - params - }) -} - -// 添加字典 -export function addView(params) { - return request({ - url: 'view/add', - method: 'post', - params - }) -} - -export function updateView(params) { - return request({ - url: 'view/update', - method: 'post', - params - }) -} -// 删除字典机构 -export function delView(id) { - return request({ - url: 'view/delete', - method: 'post', - params: { - id: id - } - }) -} diff --git a/src/permission.js b/src/permission.js index 5965c45..ed63713 100644 --- a/src/permission.js +++ b/src/permission.js @@ -36,10 +36,10 @@ url: '/baseResourse' } // 将当前系统信息保存在localStorage中 - store.commit('SET_SYSTEM', currentSys) + // store.commit('SET_SYSTEM', currentSys) // 远程访问获取权限列表(菜单&按钮) store.dispatch('GetMenus', currentSys).then(() => { - store.commit('SET_CHANGEFLAG', '0') + // store.commit('SET_CHANGEFLAG', '0') router.addRoutes(store.getters.addRouters) // 动态添加可访问路由表 next({ ...to, replace: true }) // hack方法 确保addRoutes已完成 ,set the replace: true so the navigation will not leave a history record }) diff --git a/src/router/modules/monitor.js b/src/router/modules/monitor.js index a7a989f..ddd2366 100644 --- a/src/router/modules/monitor.js +++ b/src/router/modules/monitor.js @@ -8,13 +8,14 @@ name: 'monitor', alwaysShow: true, meta: { - title: '数据管理', - icon: 'icon-config' // 图标 + title: '监测管理', + icon: 'icon-config', + permission: ['/monitor'] }, children: [ { - path: '/exampleTable', - name: 'ExampleTable', + path: '/monitor', + name: 'monitor', component: () => import('@/views/view/listView'), meta: { title: '数据集服务', icon: '', permission: ['/monitor/view'] } } diff --git a/src/router/modules/system.js b/src/router/modules/system.js index 200cef3..13490f1 100644 --- a/src/router/modules/system.js +++ b/src/router/modules/system.js @@ -64,7 +64,13 @@ path: '/config', component: () => import('@/views/system/config/listConfig'), // Parent router-view name: 'Config', - meta: { title: '系统配置' } + meta: { title: '系统配置', permission: ['/config'] } + }, + { + path: '/job', + component: () => import('@/views/job/listJob'), // Parent router-view , permission: ['/job'] + name: 'job', + meta: { title: '任务管理' } } ] }] diff --git a/src/views/job/editJob.vue b/src/views/job/editJob.vue new file mode 100644 index 0000000..3b52a12 --- /dev/null +++ b/src/views/job/editJob.vue @@ -0,0 +1,202 @@ + + + + + diff --git a/src/views/job/listJob.vue b/src/views/job/listJob.vue new file mode 100644 index 0000000..d5e2418 --- /dev/null +++ b/src/views/job/listJob.vue @@ -0,0 +1,293 @@ + + + + + diff --git a/src/views/system/config/editConfig.vue b/src/views/system/config/editConfig.vue index 0d1ef7f..d6f03b5 100644 --- a/src/views/system/config/editConfig.vue +++ b/src/views/system/config/editConfig.vue @@ -52,11 +52,8 @@ create: '新增' }, // 表头显示标题 rules: { - simplename: [{ required: true, message: '组织机构名称不能为空', trigger: ['blur', 'change'] }], - fullname: [{ required: true, message: '组织机构全称不能为空', trigger: ['blur', 'change'] }], - pid: [{ required: true, message: '父组织机构必选', trigger: ['blur', 'change'] }], - num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }], - deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }] + targetName: [{ required: true, message: '配置项不能为空', trigger: ['blur', 'change'] }], + value: [{ required: true, message: '值不能为空', trigger: ['blur', 'change'] }] } // 前端校验规则 } }, @@ -135,7 +132,7 @@ if (valid) { this.btnLoading = true this.dialogFormVisible = true - updateConfig(this.deptForm).then(response => { + updateConfig(this.configForm).then(response => { if (response.code === 200) { this.$message.success('修改成功') this.$emit('watchChild') diff --git a/src/views/system/config/listConfig.vue b/src/views/system/config/listConfig.vue index 76b3e4f..c336082 100644 --- a/src/views/system/config/listConfig.vue +++ b/src/views/system/config/listConfig.vue @@ -26,8 +26,8 @@ @@ -77,7 +77,7 @@ }, computed: { 'showOperate': function(row) { // 判断是否显示操作列,如果编辑和删除的权限都没有则不显示操作列 - return this.hasPerm('/dict/update') || this.hasPerm('/dict/delete') + return this.hasPerm('/config/update') || this.hasPerm('/config/delete') } }, created() { @@ -105,7 +105,7 @@ // 删除字典 del(row) { this.$confirm( - '确定要删除字典吗?', + '确定要删除吗?', '确认操作', { confirmButtonText: '确定', diff --git a/src/views/view/editView.vue b/src/views/view/editView.vue index a5c24c7..c08506a 100644 --- a/src/views/view/editView.vue +++ b/src/views/view/editView.vue @@ -72,7 +72,7 @@ + + diff --git a/src/views/job/listJob.vue b/src/views/job/listJob.vue new file mode 100644 index 0000000..d5e2418 --- /dev/null +++ b/src/views/job/listJob.vue @@ -0,0 +1,293 @@ + + + + + diff --git a/src/views/system/config/editConfig.vue b/src/views/system/config/editConfig.vue index 0d1ef7f..d6f03b5 100644 --- a/src/views/system/config/editConfig.vue +++ b/src/views/system/config/editConfig.vue @@ -52,11 +52,8 @@ create: '新增' }, // 表头显示标题 rules: { - simplename: [{ required: true, message: '组织机构名称不能为空', trigger: ['blur', 'change'] }], - fullname: [{ required: true, message: '组织机构全称不能为空', trigger: ['blur', 'change'] }], - pid: [{ required: true, message: '父组织机构必选', trigger: ['blur', 'change'] }], - num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }], - deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }] + targetName: [{ required: true, message: '配置项不能为空', trigger: ['blur', 'change'] }], + value: [{ required: true, message: '值不能为空', trigger: ['blur', 'change'] }] } // 前端校验规则 } }, @@ -135,7 +132,7 @@ if (valid) { this.btnLoading = true this.dialogFormVisible = true - updateConfig(this.deptForm).then(response => { + updateConfig(this.configForm).then(response => { if (response.code === 200) { this.$message.success('修改成功') this.$emit('watchChild') diff --git a/src/views/system/config/listConfig.vue b/src/views/system/config/listConfig.vue index 76b3e4f..c336082 100644 --- a/src/views/system/config/listConfig.vue +++ b/src/views/system/config/listConfig.vue @@ -26,8 +26,8 @@ @@ -77,7 +77,7 @@ }, computed: { 'showOperate': function(row) { // 判断是否显示操作列,如果编辑和删除的权限都没有则不显示操作列 - return this.hasPerm('/dict/update') || this.hasPerm('/dict/delete') + return this.hasPerm('/config/update') || this.hasPerm('/config/delete') } }, created() { @@ -105,7 +105,7 @@ // 删除字典 del(row) { this.$confirm( - '确定要删除字典吗?', + '确定要删除吗?', '确认操作', { confirmButtonText: '确定', diff --git a/src/views/view/editView.vue b/src/views/view/editView.vue index a5c24c7..c08506a 100644 --- a/src/views/view/editView.vue +++ b/src/views/view/editView.vue @@ -72,7 +72,7 @@ + + diff --git a/src/views/job/listJob.vue b/src/views/job/listJob.vue new file mode 100644 index 0000000..d5e2418 --- /dev/null +++ b/src/views/job/listJob.vue @@ -0,0 +1,293 @@ + + + + + diff --git a/src/views/system/config/editConfig.vue b/src/views/system/config/editConfig.vue index 0d1ef7f..d6f03b5 100644 --- a/src/views/system/config/editConfig.vue +++ b/src/views/system/config/editConfig.vue @@ -52,11 +52,8 @@ create: '新增' }, // 表头显示标题 rules: { - simplename: [{ required: true, message: '组织机构名称不能为空', trigger: ['blur', 'change'] }], - fullname: [{ required: true, message: '组织机构全称不能为空', trigger: ['blur', 'change'] }], - pid: [{ required: true, message: '父组织机构必选', trigger: ['blur', 'change'] }], - num: [{ required: true, message: '排序不能为空' }, { type: 'number', message: '必须为数字值' }], - deptType: [{ required: true, message: '组织类型必选', trigger: ['blur', 'change'] }] + targetName: [{ required: true, message: '配置项不能为空', trigger: ['blur', 'change'] }], + value: [{ required: true, message: '值不能为空', trigger: ['blur', 'change'] }] } // 前端校验规则 } }, @@ -135,7 +132,7 @@ if (valid) { this.btnLoading = true this.dialogFormVisible = true - updateConfig(this.deptForm).then(response => { + updateConfig(this.configForm).then(response => { if (response.code === 200) { this.$message.success('修改成功') this.$emit('watchChild') diff --git a/src/views/system/config/listConfig.vue b/src/views/system/config/listConfig.vue index 76b3e4f..c336082 100644 --- a/src/views/system/config/listConfig.vue +++ b/src/views/system/config/listConfig.vue @@ -26,8 +26,8 @@ @@ -77,7 +77,7 @@ }, computed: { 'showOperate': function(row) { // 判断是否显示操作列,如果编辑和删除的权限都没有则不显示操作列 - return this.hasPerm('/dict/update') || this.hasPerm('/dict/delete') + return this.hasPerm('/config/update') || this.hasPerm('/config/delete') } }, created() { @@ -105,7 +105,7 @@ // 删除字典 del(row) { this.$confirm( - '确定要删除字典吗?', + '确定要删除吗?', '确认操作', { confirmButtonText: '确定', diff --git a/src/views/view/editView.vue b/src/views/view/editView.vue index a5c24c7..c08506a 100644 --- a/src/views/view/editView.vue +++ b/src/views/view/editView.vue @@ -72,7 +72,7 @@