前端-框架整理格式化

dvadmin-backend/apps/vadmin/permission/management/commands/init.py

@@ -45,7 +45,8 @@ class Command(BaseCommand):
             for sql in sql_list:
                 try:
                     cursor.execute(sql)
-                except : pass
+                except:
+                    pass
             connection.commit()
             return True
 
@@ -63,15 +64,30 @@ class Command(BaseCommand):
         else:
             logger.info(f'已取消[{table_name}]初始化')
 
+    def add_arguments(self, parser):
+        parser.add_argument('init_name', nargs='+', type=str)
+
     def handle(self, *args, **options):
-        self.init(os.path.join('system', 'system_dictdata.sql'), '字典管理', 'system_dictdata')
-        self.init(os.path.join('system', 'system_dictdetails.sql'), '字典详情', 'system_dictdetails')
-        self.init(os.path.join('system', 'system_configsettings.sql'), '参数设置', 'system_configsettings')
-        self.init(os.path.join('permission', 'permission_post.sql'), '岗位管理', 'permission_post')
-        self.init(os.path.join('permission', 'permission_dept.sql'), '部门管理', 'permission_dept')
-        self.init(os.path.join('permission', 'permission_menu.sql'), '菜单管理', 'permission_menu')
-        self.init(os.path.join('permission', 'permission_role.sql'), '角色管理',
-                  ','.join(['permission_role', 'permission_role_dept', 'permission_role_menu']))
-        self.init(os.path.join('permission', 'permission_userprofile.sql'), '用户管理', ','.join(
-            ['permission_userprofile_groups', 'permission_userprofile', 'permission_userprofile_role',
-             'permission_userprofile_post']))
+        init_dict = {
+            'system_dictdata': [os.path.join('system', 'system_dictdata.sql'), '字典管理', 'system_dictdata'],
+            'system_dictdetails': [os.path.join('system', 'system_dictdetails.sql'), '字典详情', 'system_dictdetails'],
+            'system_configsettings': [os.path.join('system', 'system_configsettings.sql'), '参数设置',
+                                      'system_configsettings'],
+            'permission_post': [os.path.join('permission', 'permission_post.sql'), '岗位管理', 'permission_post'],
+            'permission_dept': [os.path.join('permission', 'permission_dept.sql'), '部门管理', 'permission_dept'],
+            'permission_menu': [os.path.join('permission', 'permission_menu.sql'), '菜单管理', 'permission_menu'],
+            'permission_role': [os.path.join('permission', 'permission_role.sql'), '角色管理',
+                                ','.join(['permission_role', 'permission_role_dept', 'permission_role_menu'])],
+            'permission_userprofile': [os.path.join('permission', 'permission_userprofile.sql'), '用户管理', ','.join(
+                ['permission_userprofile_groups', 'permission_userprofile', 'permission_userprofile_role',
+                 'permission_userprofile_post'])]
+        }
+        init_name = options.get('init_name')
+        if init_name:
+            for ele in init_name:
+                if ele in init_dict:
+                    self.init(*init_dict[ele])
+
+        else:
+            for ele in init_dict.values():
+                self.init(*ele)

dvadmin-backend/apps/vadmin/scripts/permission/permission_menu.sql

@@ -34,15 +34,15 @@
 -- ----------------------------
 INSERT INTO `permission_menu` VALUES (1, '', 'admin', '2021-02-27 07:50:00.410101', '2021-02-27 07:41:28.660364', '0', 'system', '系统管理', 1, '1', '/system', '', '', 'GET', NULL, '1', '1', '1', 1, NULL);
 INSERT INTO `permission_menu` VALUES (2, '', 'admin', '2021-02-27 07:51:14.500722', '2021-02-27 07:51:14.500768', '0', 'peoples', '权限管理', 2, '1', '/permission', '', '', 'GET', NULL, '1', '1', '1', 1, NULL);
-INSERT INTO `permission_menu` VALUES (3, '', 'admin', '2021-02-27 08:20:40.164651', '2021-02-27 07:54:38.630670', '1', 'dict', '字典管理', 1, '1', '/system/dict', 'system/dict/index', '/admin/system/dict/type', 'GET', 'system:dict:type:get', '1', '1', '1', 1, 1);
-INSERT INTO `permission_menu` VALUES (4, '', 'admin', '2021-02-27 08:24:03.776515', '2021-02-27 08:06:51.019173', '1', 'edit', '参数管理', 2, '1', '/system/config', 'system/config/index', '/admin/system/config/', 'GET', 'system:config:get', '1', '1', '1', 1, 1);
-INSERT INTO `permission_menu` VALUES (5, '', 'admin', '2021-02-27 08:26:56.407590', '2021-02-27 08:25:37.339270', '1', 'post', '岗位管理', 1, '1', '/permission/post', 'permission/post/index', '/admin/permission/post', 'GET', 'permission:post:get', '1', '1', '1', 1, 2);
-INSERT INTO `permission_menu` VALUES (6, '', 'admin', '2021-02-27 08:26:48.454509', '2021-02-27 08:26:48.454553', '1', 'tree', '部门管理', 2, '1', '/permission/dept', 'permission/dept/index', '/admin/permission/dept', 'GET', 'permission:dept:get', '1', '1', '1', 1, 2);
-INSERT INTO `permission_menu` VALUES (7, '', 'admin', '2021-02-27 08:28:20.411115', '2021-02-27 08:28:20.411164', '1', 'tree-table', '菜单管理', 3, '1', '/permission/menu', 'permission/menu/index', '/admin/permission/menus', 'GET', 'permission:menus:get', '1', '1', '1', 1, 2);
-INSERT INTO `permission_menu` VALUES (8, '', 'admin', '2021-02-27 08:29:30.153322', '2021-02-27 08:29:30.153361', '1', 'peoples', '角色管理', 4, '1', '/permission/role', 'permission/role/index', '/admin/permission/role', 'GET', 'permission:role:get', '1', '1', '1', 1, 2);
-INSERT INTO `permission_menu` VALUES (9, '', 'admin', '2021-02-27 08:30:14.030845', '2021-02-27 08:30:14.030888', '1', 'user', '用户管理', 5, '1', '/permission/user', 'permission/user/index', '/admin/permission/user', 'GET', 'permission:user:get', '1', '1', '1', 1, 2);
+INSERT INTO `permission_menu` VALUES (3, '', 'admin', '2021-02-27 08:20:40.164651', '2021-02-27 07:54:38.630670', '1', 'dict', '字典管理', 1, '1', '/system/dict', 'vadmin/system/dict/index', '/admin/system/dict/type', 'GET', 'system:dict:type:get', '1', '1', '1', 1, 1);
+INSERT INTO `permission_menu` VALUES (4, '', 'admin', '2021-02-27 08:24:03.776515', '2021-02-27 08:06:51.019173', '1', 'edit', '参数管理', 2, '1', '/system/config', 'vadmin/system/config/index', '/admin/system/config/', 'GET', 'system:config:get', '1', '1', '1', 1, 1);
+INSERT INTO `permission_menu` VALUES (5, '', 'admin', '2021-02-27 08:26:56.407590', '2021-02-27 08:25:37.339270', '1', 'post', '岗位管理', 1, '1', '/permission/post', 'vadmin/permission/post/index', '/admin/permission/post', 'GET', 'permission:post:get', '1', '1', '1', 1, 2);
+INSERT INTO `permission_menu` VALUES (6, '', 'admin', '2021-02-27 08:26:48.454509', '2021-02-27 08:26:48.454553', '1', 'tree', '部门管理', 2, '1', '/permission/dept', 'vadmin/permission/dept/index', '/admin/permission/dept', 'GET', 'permission:dept:get', '1', '1', '1', 1, 2);
+INSERT INTO `permission_menu` VALUES (7, '', 'admin', '2021-02-27 08:28:20.411115', '2021-02-27 08:28:20.411164', '1', 'tree-table', '菜单管理', 3, '1', '/permission/menu', 'vadmin/permission/menu/index', '/admin/permission/menus', 'GET', 'permission:menus:get', '1', '1', '1', 1, 2);
+INSERT INTO `permission_menu` VALUES (8, '', 'admin', '2021-02-27 08:29:30.153322', '2021-02-27 08:29:30.153361', '1', 'peoples', '角色管理', 4, '1', '/permission/role', 'vadmin/permission/role/index', '/admin/permission/role', 'GET', 'permission:role:get', '1', '1', '1', 1, 2);
+INSERT INTO `permission_menu` VALUES (9, '', 'admin', '2021-02-27 08:30:14.030845', '2021-02-27 08:30:14.030888', '1', 'user', '用户管理', 5, '1', '/permission/user', 'vadmin/permission/user/index', '/admin/permission/user', 'GET', 'permission:user:get', '1', '1', '1', 1, 2);
 INSERT INTO `permission_menu` VALUES (10, '', 'admin', '2021-02-27 08:37:24.948235', '2021-02-27 08:36:04.824117', '0', 'guide', 'dvAdmin官网', 9, '0', 'https://django-vue-admin.com', '', NULL, 'GET', NULL, '1', '1', '1', 1, NULL);
-INSERT INTO `permission_menu` VALUES (11, '', 'admin', '2021-02-27 16:19:21.529666', '2021-02-27 16:17:36.685174', '1', 'job', '文件管理', 3, '1', '/system/savefile', 'system/savefile/index', '/admin/system/savefile', 'GET', 'system:savefile:get', '1', '1', '1', 1, 1);
+INSERT INTO `permission_menu` VALUES (11, '', 'admin', '2021-02-27 16:19:21.529666', '2021-02-27 16:17:36.685174', '1', 'job', '文件管理', 3, '1', '/system/savefile', 'vadmin/system/savefile/index', '/admin/system/savefile', 'GET', 'system:savefile:get', '1', '1', '1', 1, 1);
 INSERT INTO `permission_menu` VALUES (13, '', 'admin', '2021-03-03 14:41:08.227821', '2021-03-03 14:18:52.530449', '2', NULL, '用户新增', 1, '1', NULL, NULL, '/admin/permission/user/', 'POST', 'permission:user:post', '1', '1', '1', 1, 9);
 INSERT INTO `permission_menu` VALUES (14, '', 'admin', '2021-03-03 14:43:34.207938', '2021-03-03 14:43:34.208093', '2', NULL, '用户修改', 2, '1', NULL, NULL, '/admin/permission/user/{id}/', 'PUT', 'permission:user:{id}:put', '1', '1', '1', 1, 9);
 INSERT INTO `permission_menu` VALUES (15, '', 'admin', '2021-03-03 14:44:58.006289', '2021-03-03 14:44:58.006338', '2', NULL, '用户删除', 3, '1', '', NULL, '/admin/permission/user/{id}/', 'DELETE', 'permission:user:{id}:delete', '1', '1', '1', 1, 9);
@@ -77,7 +77,7 @@ INSERT INTO `permission_menu` VALUES (43, '', 'admin', '2021-03-03 15:22:48.4926
 INSERT INTO `permission_menu` VALUES (44, '', 'admin', '2021-03-03 15:23:58.219105', '2021-03-03 15:23:58.219155', '2', NULL, '文件删除', 2, '1', NULL, NULL, '/admin/system/savefile/{id}/', 'DELETE', 'system:savefile:{id}:delete', '1', '1', '1', 1, 11);
 INSERT INTO `permission_menu` VALUES (45, '', 'admin', '2021-03-03 15:25:15.224971', '2021-03-03 15:25:15.225018', '2', NULL, '清理废弃文件', 3, '1', NULL, NULL, '/admin/system/clearsavefile/', 'POST', 'system:clearsavefile:post', '1', '1', '1', 1, 11);
 INSERT INTO `permission_menu` VALUES (46, '', 'admin', '2021-03-03 15:28:30.061632', '2021-03-03 15:27:19.945663', '2', NULL, '文件下载', 4, '1', NULL, NULL, NULL, 'GET', 'system:clearsavefile:download:post', '1', '1', '1', 1, 11);
-INSERT INTO `permission_menu` VALUES (47, '', 'admin', '2021-03-07 14:35:34.237127', '2021-03-07 14:32:06.754815', '1', 'message', '通知公告', 4, '1', 'system/message', 'system/message/index', '/admin/system/message/', 'GET', 'system:message:get', '1', '1', '1', 1, 1);
+INSERT INTO `permission_menu` VALUES (47, '', 'admin', '2021-03-07 14:35:34.237127', '2021-03-07 14:32:06.754815', '1', 'message', '通知公告', 4, '1', 'system/message', 'vadmin/system/message/index', '/admin/system/message/', 'GET', 'system:message:get', '1', '1', '1', 1, 1);
 INSERT INTO `permission_menu` VALUES (48, '', 'admin', '2021-03-07 14:35:06.718432', '2021-03-07 14:35:06.718463', '2', NULL, '发布公告', 1, '1', NULL, NULL, '/admin/system/message/', 'POST', 'system:message:post', '1', '1', '1', 1, 47);
 INSERT INTO `permission_menu` VALUES (49, '', 'admin', '2021-03-08 13:04:32.158707', '2021-03-07 14:36:47.675837', '2', NULL, '修改公告', 2, '1', NULL, NULL, '/admin/system/message/{id}/', 'PUT', 'system:message:{id}:put', '1', '1', '1', 1, 47);
 INSERT INTO `permission_menu` VALUES (50, '', 'admin', '2021-03-08 13:04:58.206693', '2021-03-07 14:37:52.130567', '2', NULL, '删除公告', 3, '1', NULL, NULL, '/admin/permission/menu/{id}/', 'DELETE', 'permission:menu:{id}:delete', '1', '1', '1', 1, 47);

dvadmin-backend/apps/vadmin/urls.py

@@ -35,7 +35,7 @@ class CaptchaRefresh(APIView):
         new_key = CaptchaStore.pick()
         to_json_response = {
             "key": new_key,
-            "image_url": captcha_image_url(new_key),
+            "image_url": str(captcha_image_url(new_key)).lstrip('/'),
             "audio_url": captcha_audio_url(new_key) if ca_settings.CAPTCHA_FLITE_PATH else None,
         }
         return SuccessResponse(to_json_response)

dvadmin-ui/src/api/vadmin/login.js

@@ -34,7 +34,7 @@ export function logout() {
 // 获取验证码
 export function getCodeImg() {
   return request({
-    url: '/captcha/refresh/',
+    url: '/admin/captcha/refresh/',
     method: 'get'
   })
 }

dvadmin-ui/src/main.js

@@ -14,8 +14,8 @@ import permission from './directive/permission'
 
 import './assets/icons' // icon
 import './permission' // permission control
-import { getDicts } from "@/api/system/dict/data";
-import { getConfigKey } from "@/api/system/config";
+import { getDicts } from "@/api/vadmin/system/dict/data";
+import { getConfigKey } from "@/api/vadmin/system/config";
 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree } from "@/utils/ruoyi";
 import Pagination from "@/components/Pagination";
 // 自定义表格工具扩展

dvadmin-ui/src/router/index.js

@@ -74,13 +74,13 @@ export const constantRoutes = [
     children: [
       {
         path: 'profile',
-        component: (resolve) => require(['@/views/permission/user/profile/index'], resolve),
+        component: (resolve) => require(['@/views/vadmin/permission/user/profile/index'], resolve),
         name: 'Profile',
         meta: { title: '个人中心', icon: 'user' }
       },
       {
         path: 'msg',
-        component: (resolve) => require(['@/views/system/message/Mymessage'], resolve),
+        component: (resolve) => require(['@/views/vadmin/system/message/Mymessage'], resolve),
         name: 'msg',
         meta: { title: '消息通知', icon: 'user' }
       }
@@ -93,37 +93,11 @@ export const constantRoutes = [
     children: [
       {
         path: 'type/data/:dictId(\\d+)',
-        component: (resolve) => require(['@/views/system/dict/data'], resolve),
+        component: (resolve) => require(['@/views/vadmin/system/dict/data'], resolve),
         name: 'Data',
         meta: { title: '字典数据', icon: '' }
       }
     ]
-  },
-  {
-    path: '/job',
-    component: Layout,
-    hidden: true,
-    children: [
-      {
-        path: 'log',
-        component: (resolve) => require(['@/views/monitor/job/log'], resolve),
-        name: 'JobLog',
-        meta: { title: '调度日志' }
-      }
-    ]
-  },
-  {
-    path: '/gen',
-    component: Layout,
-    hidden: true,
-    children: [
-      {
-        path: 'edit/:tableId(\\d+)',
-        component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
-        name: 'GenEdit',
-        meta: { title: '修改生成配置' }
-      }
-    ]
   }
 ]
 

dvadmin-ui/src/store/modules/permission.js

@@ -1,5 +1,5 @@
 import { constantRoutes } from '@/router'
-import { getRouters } from '@/api/menu'
+import { getRouters } from '@/api/vadmin/menu'
 import Layout from '@/layout/index'
 import ParentView from '@/components/ParentView';
 import { handleTree } from "@/utils/ruoyi";

dvadmin-ui/src/store/modules/user.js

@@ -1,4 +1,4 @@
-import {getInfo, login, logout} from '@/api/login'
+import {getInfo, login, logout} from '@/api/vadmin/login'
 import {getToken, removeToken, setToken} from '@/utils/auth'
 
 const user = {

dvadmin-ui/src/views/index_v1.vue

@@ -1,98 +0,0 @@
-<template>
-  <div class="dashboard-editor-container">
-
-    <panel-group @handleSetLineChartData="handleSetLineChartData" />
-
-    <el-row style="background:#fff;padding:16px 16px 0;margin-bottom:32px;">
-      <line-chart :chart-data="lineChartData" />
-    </el-row>
-
-    <el-row :gutter="32">
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <raddar-chart />
-        </div>
-      </el-col>
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <pie-chart />
-        </div>
-      </el-col>
-      <el-col :xs="24" :sm="24" :lg="8">
-        <div class="chart-wrapper">
-          <bar-chart />
-        </div>
-      </el-col>
-    </el-row>
-
-    
-  </div>
-</template>
-
-<script>
-import PanelGroup from './dashboard/PanelGroup'
-import LineChart from './dashboard/LineChart'
-import RaddarChart from './dashboard/RaddarChart'
-import PieChart from './dashboard/PieChart'
-import BarChart from './dashboard/BarChart'
-
-const lineChartData = {
-  newVisitis: {
-    expectedData: [100, 120, 161, 134, 105, 160, 165],
-    actualData: [120, 82, 91, 154, 162, 140, 145]
-  },
-  messages: {
-    expectedData: [200, 192, 120, 144, 160, 130, 140],
-    actualData: [180, 160, 151, 106, 145, 150, 130]
-  },
-  purchases: {
-    expectedData: [80, 100, 121, 104, 105, 90, 100],
-    actualData: [120, 90, 100, 138, 142, 130, 130]
-  },
-  shoppings: {
-    expectedData: [130, 140, 141, 142, 145, 150, 160],
-    actualData: [120, 82, 91, 154, 162, 140, 130]
-  }
-}
-
-export default {
-  name: 'Index',
-  components: {
-    PanelGroup,
-    LineChart,
-    RaddarChart,
-    PieChart,
-    BarChart
-  },
-  data() {
-    return {
-      lineChartData: lineChartData.newVisitis
-    }
-  },
-  methods: {
-    handleSetLineChartData(type) {
-      this.lineChartData = lineChartData[type]
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.dashboard-editor-container {
-  padding: 32px;
-  background-color: rgb(240, 242, 245);
-  position: relative;
-
-  .chart-wrapper {
-    background: #fff;
-    padding: 16px 16px 0;
-    margin-bottom: 32px;
-  }
-}
-
-@media (max-width:1024px) {
-  .chart-wrapper {
-    padding: 8px;
-  }
-}
-</style>

dvadmin-ui/src/views/login.vue

@@ -54,7 +54,7 @@
 </template>
 
 <script>
-  import {getCodeImg} from "@/api/login";
+  import {getCodeImg} from "@/api/vadmin/login";
   import Cookies from "js-cookie";
   import {decrypt, encrypt} from '@/utils/jsencrypt'
 

dvadmin-ui/src/views/vadmin/monitor/cache/index.vue

@@ -67,7 +67,7 @@
 </template>
 
 <script>
-import { getCache } from "@/api/monitor/cache";
+import { getCache } from "@/api/vadmin/monitor/cache";
 import echarts from "echarts";
 
 export default {

dvadmin-ui/src/views/vadmin/monitor/job/index.vue

@@ -266,7 +266,7 @@
 </template>
 
 <script>
-import { listJob, getJob, delJob, addJob, updateJob, exportJob, runJob, changeJobStatus } from "@/api/monitor/job";
+import { listJob, getJob, delJob, addJob, updateJob, exportJob, runJob, changeJobStatus } from "@/api/vadmin/monitor/job";
 
 export default {
   name: "Job",

dvadmin-ui/src/views/vadmin/monitor/job/log.vue

@@ -167,7 +167,7 @@
 </template>
 
 <script>
-import { listJobLog, delJobLog, exportJobLog, cleanJobLog } from "@/api/monitor/jobLog";
+import { listJobLog, delJobLog, exportJobLog, cleanJobLog } from "@/api/vadmin/monitor/jobLog";
 
 export default {
   name: "JobLog",

dvadmin-ui/src/views/vadmin/monitor/logininfor/index.vue

@@ -118,7 +118,7 @@
 </template>
 
 <script>
-import { list, delLogininfor, cleanLogininfor, exportLogininfor } from "@/api/monitor/logininfor";
+import { list, delLogininfor, cleanLogininfor, exportLogininfor } from "@/api/vadmin/monitor/logininfor";
 
 export default {
   name: "Logininfor",

dvadmin-ui/src/views/vadmin/monitor/online/index.vue

@@ -65,7 +65,7 @@
 </template>
 
 <script>
-import { list, forceLogout } from "@/api/monitor/online";
+import { list, forceLogout } from "@/api/vadmin/monitor/online";
 
 export default {
   name: "Online",

dvadmin-ui/src/views/vadmin/monitor/operlog/index.vue

@@ -187,7 +187,7 @@
 </template>
 
 <script>
-import { list, delOperlog, cleanOperlog, exportOperlog } from "@/api/monitor/operlog";
+import { list, delOperlog, cleanOperlog, exportOperlog } from "@/api/vadmin/monitor/operlog";
 
 export default {
   name: "Operlog",

dvadmin-ui/src/views/vadmin/monitor/server/index.vue

@@ -172,7 +172,7 @@
 </template>
 
 <script>
-import { getServer } from "@/api/monitor/server";
+import { getServer } from "@/api/vadmin/monitor/server";
 
 export default {
   name: "Server",
@@ -207,4 +207,4 @@ export default {
     }
   }
 };
-</script>
+</script>

dvadmin-ui/src/views/vadmin/permission/dept/index.vue

@@ -149,7 +149,7 @@
 </template>
 
 <script>
-import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/permission/dept";
+import { listDept, getDept, delDept, addDept, updateDept, listDeptExcludeChild } from "@/api/vadmin/permission/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 

dvadmin-ui/src/views/vadmin/permission/menu/index.vue

@@ -254,7 +254,7 @@
 </template>
 
 <script>
-  import {addMenu, delMenu, getMenu, listMenu, updateMenu} from "@/api/permission/menu";
+  import {addMenu, delMenu, getMenu, listMenu, updateMenu} from "@/api/vadmin/permission/menu";
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
   import IconSelect from "@/components/IconSelect";

dvadmin-ui/src/views/vadmin/permission/post/index.vue

@@ -160,7 +160,7 @@
 </template>
 
 <script>
-import { listPost, getPost, delPost, addPost, updatePost, exportPost } from "@/api/permission/post";
+import { listPost, getPost, delPost, addPost, updatePost, exportPost } from "@/api/vadmin/permission/post";
 
 export default {
   name: "Post",

dvadmin-ui/src/views/vadmin/permission/role/index.vue

@@ -254,9 +254,9 @@
 </template>
 
 <script>
-import { listRole, getRole, delRole, addRole, updateRole, exportRole, dataScope, changeRoleStatus } from "@/api/permission/role";
-import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/permission/menu";
-import { treeselect as deptTreeselect, roleDeptTreeselect } from "@/api/permission/dept";
+import { listRole, getRole, delRole, addRole, updateRole, exportRole, dataScope, changeRoleStatus } from "@/api/vadmin/permission/role";
+import { treeselect as menuTreeselect, roleMenuTreeselect } from "@/api/vadmin/permission/menu";
+import { treeselect as deptTreeselect, roleDeptTreeselect } from "@/api/vadmin/permission/dept";
 
 export default {
   name: "Role",

dvadmin-ui/src/views/vadmin/permission/user/index.vue

@@ -343,9 +343,9 @@
 </template>
 
 <script>
-import { listUser, getUser, delUser, addUser, updateUser, exportUser, resetUserPwd, changeUserStatus, importTemplate } from "@/api/permission/user";
+import { listUser, getUser, delUser, addUser, updateUser, exportUser, resetUserPwd, changeUserStatus, importTemplate } from "@/api/vadmin/permission/user";
 import { getToken } from "@/utils/auth";
-import { treeselect } from "@/api/permission/dept";
+import { treeselect } from "@/api/vadmin/permission/dept";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 

dvadmin-ui/src/views/vadmin/permission/user/profile/index.vue

@@ -68,7 +68,7 @@
   import userAvatar from "./userAvatar";
   import userInfo from "./userInfo";
   import resetPwd from "./resetPwd";
-  import {getUserProfile} from "@/api/permission/user";
+  import {getUserProfile} from "@/api/vadmin/permission/user";
 
   export default {
     name: "Profile",

dvadmin-ui/src/views/vadmin/permission/user/profile/resetPwd.vue

@@ -17,7 +17,7 @@
 </template>
 
 <script>
-import { updateUserPwd } from "@/api/permission/user";
+import { updateUserPwd } from "@/api/vadmin/permission/user";
 
 export default {
   data() {

dvadmin-ui/src/views/vadmin/permission/user/profile/userAvatar.vue

@@ -55,7 +55,7 @@
 <script>
 import store from "@/store";
 import { VueCropper } from "vue-cropper";
-import { uploadAvatar } from "@/api/permission/user";
+import { uploadAvatar } from "@/api/vadmin/permission/user";
 
 export default {
   components: { VueCropper },

dvadmin-ui/src/views/vadmin/permission/user/profile/userInfo.vue

@@ -26,7 +26,7 @@
 </template>
 
 <script>
-  import {updateUserProfile} from "@/api/permission/user";
+  import {updateUserProfile} from "@/api/vadmin/permission/user";
 
   export default {
     props: {

dvadmin-ui/src/views/vadmin/system/config/index.vue

@@ -182,7 +182,7 @@
 </template>
 
 <script>
-import { listConfig, getConfig, delConfig, addConfig, updateConfig, exportConfig, clearCache } from "@/api/system/config";
+import { listConfig, getConfig, delConfig, addConfig, updateConfig, exportConfig, clearCache } from "@/api/vadmin/system/config";
 
 export default {
   name: "Config",

dvadmin-ui/src/views/vadmin/system/dict/data.vue

@@ -180,8 +180,8 @@
 </template>
 
 <script>
-  import {addData, delData, exportData, getData, listData, updateData} from "@/api/system/dict/data";
-  import {getType, listType} from "@/api/system/dict/type";
+  import {addData, delData, exportData, getData, listData, updateData} from "@/api/vadmin/system/dict/data";
+  import {getType, listType} from "@/api/vadmin/system/dict/type";
 
   export default {
   name: "Data",

dvadmin-ui/src/views/vadmin/system/dict/index.vue

@@ -193,7 +193,7 @@
 </template>
 
 <script>
-import { listType, getType, delType, addType, updateType, exportType, clearCache } from "@/api/system/dict/type";
+import { listType, getType, delType, addType, updateType, exportType, clearCache } from "@/api/vadmin/system/dict/type";
 
 export default {
   name: "Dict",

dvadmin-ui/src/views/vadmin/system/message/Mymessage.vue

@@ -47,7 +47,7 @@
 </template>
 
 <script>
-  import {updateIsRead, userMessage} from "@/api/system/message";
+  import {updateIsRead, userMessage} from "@/api/vadmin/system/message";
   import store from "@/store";
 
   export default {

dvadmin-ui/src/views/vadmin/system/message/index.vue

@@ -202,7 +202,7 @@
 </template>
 
 <script>
-  import {addMessage, delMessage, exportMessage, getMessage, listMessage, updateMessage} from "@/api/system/message";
+  import {addMessage, delMessage, exportMessage, getMessage, listMessage, updateMessage} from "@/api/vadmin/system/message";
   import Editor from '@/components/Editor';
 
   export default {

dvadmin-ui/src/views/vadmin/system/notice/index.vue

@@ -176,7 +176,7 @@
 </template>
 
 <script>
-import { listNotice, getNotice, delNotice, addNotice, updateNotice, exportNotice } from "@/api/system/notice";
+import { listNotice, getNotice, delNotice, addNotice, updateNotice, exportNotice } from "@/api/vadmin/system/notice";
 import Editor from '@/components/Editor';
 
 export default {

dvadmin-ui/src/views/vadmin/system/savefile/index.vue

@@ -124,7 +124,7 @@
 </template>
 
 <script>
-  import {clearSaveFile, delSaveFile, listSaveFile} from "@/api/system/savefile";
+  import {clearSaveFile, delSaveFile, listSaveFile} from "@/api/vadmin/system/savefile";
   import FileUpload from "@/components/FileUpload/index";
 
   export default {

dvadmin-ui/src/views/vadmin/tool/gen/editTable.vue

@@ -125,9 +125,9 @@
   </el-card>
 </template>
 <script>
-import { getGenTable, updateGenTable } from "@/api/tool/gen";
-import { optionselect as getDictOptionselect } from "@/api/system/dict/type";
-import { listMenu as getMenuTreeselect } from "@/api/permission/menu";
+import { getGenTable, updateGenTable } from "@/api/vadmin/tool/gen";
+import { optionselect as getDictOptionselect } from "@/api/vadmin/system/dict/type";
+import { listMenu as getMenuTreeselect } from "@/api/vadmin/permission/menu";
 import basicInfoForm from "./basicInfoForm";
 import genInfoForm from "./genInfoForm";
 import Sortable from 'sortablejs'

dvadmin-ui/src/views/vadmin/tool/gen/importTable.vue

@@ -49,7 +49,7 @@
 </template>
 
 <script>
-import { listDbTable, importTable } from "@/api/tool/gen";
+import { listDbTable, importTable } from "@/api/vadmin/tool/gen";
 export default {
   data() {
     return {

dvadmin-ui/src/views/vadmin/tool/gen/index.vue

@@ -178,7 +178,7 @@
 </template>
 
 <script>
-import { listTable, previewTable, delTable, genCode, synchDb } from "@/api/tool/gen";
+import { listTable, previewTable, delTable, genCode, synchDb } from "@/api/vadmin/tool/gen";
 import importTable from "./importTable";
 import { downLoadZip } from "@/utils/zipdownload";
 import hljs from "highlight.js/lib/highlight";