Merge remote-tracking branch 'origin/admin' into lms_v1.0.0

nladmin-ui/src/api/system/dept.js

@@ -1,60 +0,0 @@
-import request from '@/utils/request'
-
-export function getDepts(params) {
-  return request({
-    url: 'api/dept',
-    method: 'get',
-    params
-  })
-}
-
-export function getDeptTree(params) {
-  return request({
-    url: '/api/dept/allTree',
-    method: 'get',
-    params
-  })
-}
-
-export function getDeptSuperior(ids) {
-  const data = ids.length || ids.length === 0 ? ids : Array.of(ids)
-  return request({
-    url: 'api/dept/superior',
-    method: 'post',
-    data
-  })
-}
-
-export function getDeptvo(params) {
-  return request({
-    url: 'api/dept/vo',
-    method: 'get',
-    params
-  })
-}
-
-export function add(data) {
-  return request({
-    url: 'api/dept',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/dept',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/dept',
-    method: 'put',
-    data
-  })
-}
-
-export default { add, edit, del, getDepts, getDeptSuperior, getDeptvo, getDeptTree }

nladmin-ui/src/api/system/grid.js

@@ -1,33 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/grid',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/grid/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/grid',
-    method: 'put',
-    data
-  })
-}
-export function selectList() {
-  return request({
-    url: 'api/grid/selectList',
-    method: 'get'
-  })
-}
-
-export default { add, edit, del, selectList }

nladmin-ui/src/api/system/gridField.js

@@ -1,50 +0,0 @@
-import request from '@/utils/request'
-
-export function add(data) {
-  return request({
-    url: 'api/gridField',
-    method: 'post',
-    data
-  })
-}
-export function batchAdd(json) { // use
-  return request({
-    url: 'api/gridField/batchAdd',
-    method: 'post',
-    data: json
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/gridField/',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/gridField',
-    method: 'put',
-    data
-  })
-}
-
-export function getGridFieldsById(id) { // use
-  return request({
-    url: 'api/gridField/getGridFields',
-    method: 'post',
-    data: id
-  })
-}
-
-export function getGridFieldsByCode(grid_code) { // use
-  return request({
-    url: 'api/gridField/getGridFieldsByCode',
-    method: 'post',
-    data: grid_code
-  })
-}
-
-export default { add, edit, del, batchAdd, getGridFieldsById, getGridFieldsByCode }

nladmin-ui/src/api/system/menu.js

@@ -1,73 +0,0 @@
-import request from '@/utils/request'
-
-export function getMenusTree(pid) {
-  return request({
-    url: 'api/sysMenu/lazy?pid=' + pid,
-    method: 'get'
-  })
-}
-
-export function getMenus(params) {
-  return request({
-    url: 'api/sysMenu',
-    method: 'get',
-    params
-  })
-}
-
-export function getMenusByRole(params) {
-  return request({
-    url: 'api/sysMenu/getMenusByRole',
-    method: 'post',
-    data: params
-  })
-}
-
-export function getMenuSuperior(ids) {
-  const data = ids.length || ids.length === 0 ? ids : Array.of(ids)
-  return request({
-    url: 'api/sysMenu/superior',
-    method: 'post',
-    data
-  })
-}
-
-export function getChild(id) {
-  return request({
-    url: 'api/sysMenu/child?id=' + id,
-    method: 'get'
-  })
-}
-
-export function buildMenus(data) {
-  return request({
-    url: 'api/sysMenu/build?systemType=' + data,
-    method: 'get'
-  })
-}
-
-export function add(data) {
-  return request({
-    url: 'api/sysMenu',
-    method: 'post',
-    data
-  })
-}
-
-export function del(ids) {
-  return request({
-    url: 'api/sysMenu',
-    method: 'delete',
-    data: ids
-  })
-}
-
-export function edit(data) {
-  return request({
-    url: 'api/sysMenu',
-    method: 'put',
-    data
-  })
-}
-
-export default { add, edit, del, getMenusTree, getMenuSuperior, getMenus, getChild, getMenusByRole }

nladmin-ui/src/router/index.js

@@ -3,7 +3,7 @@ import store from '@/store'
 import NProgress from 'nprogress' // progress bar
 import 'nprogress/nprogress.css' // progress bar style
 import { getToken } from '@/utils/auth' // getToken from cookie
-import { buildMenus } from '@/api/system/menu'
+import { buildMenus } from '@/views/system/menu/menu'
 import { filterAsyncRouter } from '@/store/modules/permission'
 import i18n from '@/i18n'
 

nladmin-ui/src/views/generator/config.vue

@@ -202,8 +202,8 @@
 
 <script>
 import crud from '@/mixins/crud'
-import { update, get } from '@/api/generator/genConfig'
+import { update, get } from '@/views/generator/genConfig'
-import { save, sync, generator } from '@/api/generator/generator'
+import { save, sync, generator } from '@/views/generator/generator'
 import { getDicts } from '@/views/system/dict/dict'
 export default {
   name: 'GeneratorConfig',

nladmin-ui/src/views/generator/index.vue

@@ -56,7 +56,7 @@
 
 <script>
 
-import { generator, sync } from '@/api/generator/generator'
+import { generator, sync } from '@/views/generator/generator'
 import { downloadFile } from '@/utils/index'
 import CRUD, { presenter, header } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'

nladmin-ui/src/views/generator/preview.vue

@@ -8,7 +8,7 @@
 
 <script>
 import Java from '@/components/JavaEdit/index'
-import { generator } from '@/api/generator/generator'
+import { generator } from '@/views/generator/generator'
 export default {
   name: 'Preview',
   components: { Java },

nladmin-ui/src/views/monitor/log/errorLog.vue

@@ -55,7 +55,7 @@
 </template>
 
 <script>
-import { getErrDetail, delAllError } from '@/api/monitor/log'
+import { getErrDetail, delAllError } from '@/views/monitor/log/log'
 import Search from './search'
 import CRUD, { presenter } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'

nladmin-ui/src/views/monitor/log/index.vue

@@ -55,7 +55,7 @@
 
 <script>
 import Search from './search'
-import { delAllInfo } from '@/api/monitor/log'
+import { delAllInfo } from '@/views/monitor/log/log'
 import CRUD, { presenter } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 import pagination from '@crud/Pagination'

nladmin-ui/src/views/monitor/online/index.vue

@@ -58,7 +58,7 @@
 </template>
 
 <script>
-import { del } from '@/api/monitor/online'
+import { del } from '@/views/monitor/online/online'
 import CRUD, { presenter, header, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'

nladmin-ui/src/views/system/auto/index.vue

@@ -44,7 +44,7 @@
 </template>
 
 <script>
-import crudAutoRun from '@/api/system/autorun'
+import crudAutoRun from '@/views/system/auto/autorun'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'

nladmin-ui/src/views/system/dept/index.vue

@@ -134,7 +134,7 @@
 </template>
 
 <script>
-import crudDept from '@/api/system/dept'
+import crudDept from '@/views/system/dept/dept'
 import Treeselect, { LOAD_CHILDREN_OPTIONS } from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'

nladmin-ui/src/views/system/logicflow/editor/components/Diagram.vue

@@ -52,7 +52,7 @@ import DiagramToolbar from './DiagramToolbar.vue'
 import DiagramSidebar from './DiagramSidebar.vue'
 import PropertyPanel from './PropertyPanel.vue'
 import { registerCustomElement } from './node'
-import crudStage from '@/api/logicflow/stage'
+import crudStage from '@/views/system/logicflow/stage'
 
 let data = ''
 let lf = ''

nladmin-ui/src/views/system/logicflow/editor/components/DiagramToolbar.vue

@@ -89,7 +89,7 @@ import ZoomOut from './icon/ZoomOut.vue'
 import StepBack from './icon/StepBack.vue'
 import StepFoward from './icon/StepFoward.vue'
 import AreaSelect from './icon/AreaSelect.vue'
-import crudStage from '@/api/logicflow/stage'
+import crudStage from '@/views/system/logicflow/stage'
 
 export default {
   components: {

nladmin-ui/src/views/system/logicflow/editor/components/PropertyPanel.vue

@@ -171,7 +171,7 @@
 <script>
 import { Sketch } from 'vue-color'
 import { shortStyles, borderStyles, fontFamilies } from '../constant'
-import crudStageImage from '@/api/logicflow/stageImage'
+import crudStageImage from '@/views/system/logicflow/stageImage'
 
 export default {
   components: {

nladmin-ui/src/views/system/logicflow/image/index.vue

@@ -109,7 +109,7 @@
 </template>
 
 <script>
-import crudStageImage from '@/api/logicflow/stageImage'
+import crudStageImage from '@/views/system/logicflow/stageImage'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'

nladmin-ui/src/views/system/logicflow/index.vue

@@ -62,7 +62,7 @@
 </template>
 
 <script>
-import crudStage from '@/api/logicflow/stage'
+import crudStage from '@/views/system/logicflow/stage'
 import CRUD, { presenter, header, form, crud } from '@crud/crud'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'

nladmin-ui/src/views/system/menu/dd/index.vue

@@ -176,7 +176,7 @@
 </template>
 
 <script>
-import crudMenu from '@/api/system/menu'
+import crudMenu from '@/views/system/menu/menu'
 import IconSelect from '@/components/IconSelect'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'

nladmin-ui/src/views/system/monitor/device/index.vue

@@ -7,7 +7,7 @@
 </template>
 
 <script>
-import crudStage from '@/api/logicflow/stage'
+import crudStage from '@/views/system/logicflow/stage'
 import paramCrud from '@/views/system/param/param'
 import '@logicflow/core/dist/style/index.css'
 import '@logicflow/extension/lib/style/index.css'

nladmin-ui/src/views/system/redis/index.vue

@@ -107,7 +107,7 @@
 </template>
 
 <script>
-import { getCache, getKeyDefineList, getKeyValueList, batch } from '@/api/system/redis'
+import { getCache, getKeyDefineList, getKeyValueList, batch } from '@/views/system/redis/redis'
 import echarts from 'echarts'
 import i18n from '@/i18n'
 export default {

nladmin-ui/src/views/system/role/index.vue

@@ -122,8 +122,8 @@
 
 <script>
 import crudRoles from './role'
-import crudMenu from '@/api/system/menu'
+import crudMenu from '@/views/system/menu/menu'
-import { getChild, getMenusTree } from '@/api/system/menu'
+import { getChild, getMenusTree } from '@/views/system/menu/menu'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'

nladmin-ui/src/views/system/user/center/updateEmail.vue

@@ -21,7 +21,7 @@
 import store from '@/store'
 import { validEmail } from '@/utils/validate'
 import { updateEmail } from '@/views/system/user'
-import { resetEmail } from '@/api/system/code'
+import { resetEmail } from '@/views/system/user/center/code'
 export default {
   props: {
     email: {

nladmin-ui/src/views/system/user/dialog/relevanceDeptDialog.vue

@@ -67,7 +67,7 @@
 
 <script>
 
-import crudDept from '@/api/system/dept'
+import crudDept from '@/views/system/dept/dept'
 import CRUD, { header, presenter } from '@crud/crud'
 import rrOperation from '@crud/RR.operation'
 import pagination from '@crud/Pagination'

nladmin-ui/src/views/system/user/index.vue

@@ -327,7 +327,7 @@
 
 <script>
 import crudUser from '@/views/system/user/user'
-import crudDept from '@/api/system/dept'
+import crudDept from '@/views/system/dept/dept'
 import crudDataPermission from '@/views/system/dataPermission/dataPermission'
 import { getAll, getLevel } from '@/views/system/role/role'
 import CRUD, { crud, form, header, presenter } from '@crud/crud'