diff --git a/.env.development b/.env.development index 26837aa..f27d241 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ # VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 -VITE_APP_API_BASEURL = http://111.198.10.15:11638 +VITE_APP_API_BASEURL = http://111.198.10.15:11420 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.development b/.env.development index 26837aa..f27d241 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ # VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 -VITE_APP_API_BASEURL = http://111.198.10.15:11638 +VITE_APP_API_BASEURL = http://111.198.10.15:11420 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.production b/.env.production index 7217090..c0534e5 100644 --- a/.env.production +++ b/.env.production @@ -3,7 +3,7 @@ # 页面标题 VITE_APP_TITLE = 行政问效综合评价平台 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:11638 +VITE_APP_API_BASEURL = http://111.198.10.15:11420 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.development b/.env.development index 26837aa..f27d241 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ # VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 -VITE_APP_API_BASEURL = http://111.198.10.15:11638 +VITE_APP_API_BASEURL = http://111.198.10.15:11420 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.production b/.env.production index 7217090..c0534e5 100644 --- a/.env.production +++ b/.env.production @@ -3,7 +3,7 @@ # 页面标题 VITE_APP_TITLE = 行政问效综合评价平台 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:11638 +VITE_APP_API_BASEURL = http://111.198.10.15:11420 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 0acc3c5..bd6c64d 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:11638" + "baseUrl": "http://111.198.10.15:11420" } diff --git a/.env.development b/.env.development index 26837aa..f27d241 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ # VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 -VITE_APP_API_BASEURL = http://111.198.10.15:11638 +VITE_APP_API_BASEURL = http://111.198.10.15:11420 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.production b/.env.production index 7217090..c0534e5 100644 --- a/.env.production +++ b/.env.production @@ -3,7 +3,7 @@ # 页面标题 VITE_APP_TITLE = 行政问效综合评价平台 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:11638 +VITE_APP_API_BASEURL = http://111.198.10.15:11420 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 0acc3c5..bd6c64d 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:11638" + "baseUrl": "http://111.198.10.15:11420" } diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue index 3c4fe75..e2a3c90 100644 --- a/src/layouts/components/Topbar/index.vue +++ b/src/layouts/components/Topbar/index.vue @@ -61,7 +61,8 @@ - + + {{ item.title }} diff --git a/.env.development b/.env.development index 26837aa..f27d241 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ # VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 -VITE_APP_API_BASEURL = http://111.198.10.15:11638 +VITE_APP_API_BASEURL = http://111.198.10.15:11420 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.production b/.env.production index 7217090..c0534e5 100644 --- a/.env.production +++ b/.env.production @@ -3,7 +3,7 @@ # 页面标题 VITE_APP_TITLE = 行政问效综合评价平台 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:11638 +VITE_APP_API_BASEURL = http://111.198.10.15:11420 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 0acc3c5..bd6c64d 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:11638" + "baseUrl": "http://111.198.10.15:11420" } diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue index 3c4fe75..e2a3c90 100644 --- a/src/layouts/components/Topbar/index.vue +++ b/src/layouts/components/Topbar/index.vue @@ -61,7 +61,8 @@ - + + {{ item.title }} diff --git a/src/router/modules/common.ts b/src/router/modules/common.ts deleted file mode 100644 index 7957fe2..0000000 --- a/src/router/modules/common.ts +++ /dev/null @@ -1,321 +0,0 @@ -import type { Route } from '@/global' - -const Layout = () => import('@/layouts/index.vue') - -const routes: Route.recordRaw[] = [ - { - path: '/area', - component: Layout, - redirect: '/area/list', - name: 'AreaManage', - meta: { - title: '区域管理', - icon: 'ep:key', - auth: '/sys/area', - }, - children: [ - { - path: 'list', - name: 'AreaList', - component: () => import('@/views/system/area/listArea.vue'), - meta: { - title: '区域管理', - auth: '/sys/area', - sidebar: false, - breadcrumb: false, - activeMenu: '/area', - }, - }, - ], - }, - { - path: '/resource', - component: Layout, - redirect: '/resource/list', - name: 'ResourceManage', - meta: { - title: '资源管理', - icon: 'ep:key', - auth: '/sys/resource', - }, - children: [ - { - path: 'list', - name: 'ResourceList', - component: () => import('@/views/system/resource/listResource.vue'), - meta: { - title: '资源管理', - auth: '/sys/resource', - sidebar: false, - breadcrumb: false, - activeMenu: '/resource', - }, - }, - ], - }, - { - path: '/dept', - component: Layout, - redirect: '/dept/list', - name: 'DeptManage', - meta: { - title: '组织管理', - icon: 'ep:key', - auth: '/sys/dept', - }, - children: [ - { - path: 'list', - name: 'DeptList', - component: () => import('@/views/system/dept/listDept.vue'), - meta: { - title: '组织管理', - auth: '/sys/dept', - sidebar: false, - breadcrumb: false, - activeMenu: '/dept', - }, - }, - ], - }, - { - path: '/role', - component: Layout, - redirect: '/role/list', - name: 'RoleManage', - meta: { - title: '角色管理', - icon: 'ep:key', - auth: '/sys/role', - }, - children: [ - { - path: 'list', - name: 'RoleList', - component: () => import('@/views/system/role/listRole.vue'), - meta: { - title: '角色管理', - auth: '/sys/role', - sidebar: false, - breadcrumb: false, - activeMenu: '/role', - }, - }, - ], - }, - { - path: '/user', - component: Layout, - redirect: '/user/list', - name: 'UserManage', - meta: { - title: '用户管理', - icon: 'ep:key', - auth: '/sys/mgr', - }, - children: [ - { - path: 'list', - name: 'UserList', - component: () => import('@/views/system/user/listUser.vue'), - meta: { - title: '用户管理', - auth: '/sys/mgr', - sidebar: false, - breadcrumb: false, - activeMenu: '/user', - }, - }, - ], - }, - { - path: '/dict', - component: Layout, - redirect: '/dict/list', - name: 'DictManage', - meta: { - title: '字典管理', - icon: 'ep:key', - auth: '/sys/dict', - }, - children: [ - { - path: 'list', - name: 'DictList', - component: () => import('@/views/system/dict/listDict.vue'), - meta: { - title: '字典管理', - auth: '/sys/dict', - sidebar: false, - breadcrumb: false, - activeMenu: '/dict', - }, - }, - ], - }, - { - path: '/process', - component: Layout, - redirect: '/process/list', - name: 'Process', - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - }, - children: [ - { - path: 'list', - name: 'ProcessList', - component: () => import('@/views/system/process/process.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - sidebar: false, - breadcrumb: false, - activeMenu: '/process', - }, - }, - { - path: 'edit', - name: 'ProcessListEdit', - component: () => import('@/views/system/process/editProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - { - path: 'detail', - name: 'ProcessListDetail', - component: () => import('@/views/system/process/detailProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - { - path: 'add', - name: 'ProcessListAdd', - component: () => import('@/views/system/process/addProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - ], - }, - { - path: '/tenant', - component: Layout, - redirect: '/tenant/list', - name: 'TenantManage', - meta: { - title: '项目管理', - icon: 'ep:key', - auth: '/sys/tenantSys/list', - }, - children: [ - { - path: 'list', - name: 'TenantList', - component: () => import('@/views/system/tenant/list.tenant.vue'), - meta: { - title: '项目管理', - auth: '/sys/tenantSys/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/tenant', - }, - }, - ], - }, - { - path: '/businessLog', - component: Layout, - redirect: '/businessLog/list', - name: 'BusinessLog', - meta: { - title: '业务日志', - icon: 'ep:key', - auth: '/sys/log/biz/list', - }, - children: [ - { - path: 'list', - name: 'BusinessList', - component: () => import('@/views/system/log/listLog.vue'), - meta: { - title: '业务日志', - auth: '/sys/log/biz/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/businessLog', - }, - }, - ], - }, - { - path: '/error', - component: Layout, - redirect: '/error/list', - name: 'ErrorLog', - meta: { - title: '异常日志', - icon: 'ep:key', - auth: '/sys/log/error/list', - }, - children: [ - { - path: 'list', - name: 'ErrorList', - component: () => import('@/views/system/log/listErrorLog.vue'), - meta: { - title: '异常日志', - auth: '/sys/log/error/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/error', - }, - }, - ], - }, - { - path: '/loginDiary', - component: Layout, - redirect: '/loginDiary/list', - name: 'loginDiaryLog', - meta: { - title: '登录日志', - icon: 'ep:key', - auth: '/sys/loginLog', - }, - children: [ - { - path: 'list', - name: 'loginDiaryList', - component: () => import('@/views/system/log/LoginLog.vue'), - meta: { - title: '登录日志', - auth: '/sys/loginLog', - sidebar: false, - breadcrumb: false, - activeMenu: '/loginDiary', - }, - }, - ], - }, -] - -export default routes diff --git a/.env.development b/.env.development index 26837aa..f27d241 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ # VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 -VITE_APP_API_BASEURL = http://111.198.10.15:11638 +VITE_APP_API_BASEURL = http://111.198.10.15:11420 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.production b/.env.production index 7217090..c0534e5 100644 --- a/.env.production +++ b/.env.production @@ -3,7 +3,7 @@ # 页面标题 VITE_APP_TITLE = 行政问效综合评价平台 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:11638 +VITE_APP_API_BASEURL = http://111.198.10.15:11420 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 0acc3c5..bd6c64d 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:11638" + "baseUrl": "http://111.198.10.15:11420" } diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue index 3c4fe75..e2a3c90 100644 --- a/src/layouts/components/Topbar/index.vue +++ b/src/layouts/components/Topbar/index.vue @@ -61,7 +61,8 @@ - + + {{ item.title }} diff --git a/src/router/modules/common.ts b/src/router/modules/common.ts deleted file mode 100644 index 7957fe2..0000000 --- a/src/router/modules/common.ts +++ /dev/null @@ -1,321 +0,0 @@ -import type { Route } from '@/global' - -const Layout = () => import('@/layouts/index.vue') - -const routes: Route.recordRaw[] = [ - { - path: '/area', - component: Layout, - redirect: '/area/list', - name: 'AreaManage', - meta: { - title: '区域管理', - icon: 'ep:key', - auth: '/sys/area', - }, - children: [ - { - path: 'list', - name: 'AreaList', - component: () => import('@/views/system/area/listArea.vue'), - meta: { - title: '区域管理', - auth: '/sys/area', - sidebar: false, - breadcrumb: false, - activeMenu: '/area', - }, - }, - ], - }, - { - path: '/resource', - component: Layout, - redirect: '/resource/list', - name: 'ResourceManage', - meta: { - title: '资源管理', - icon: 'ep:key', - auth: '/sys/resource', - }, - children: [ - { - path: 'list', - name: 'ResourceList', - component: () => import('@/views/system/resource/listResource.vue'), - meta: { - title: '资源管理', - auth: '/sys/resource', - sidebar: false, - breadcrumb: false, - activeMenu: '/resource', - }, - }, - ], - }, - { - path: '/dept', - component: Layout, - redirect: '/dept/list', - name: 'DeptManage', - meta: { - title: '组织管理', - icon: 'ep:key', - auth: '/sys/dept', - }, - children: [ - { - path: 'list', - name: 'DeptList', - component: () => import('@/views/system/dept/listDept.vue'), - meta: { - title: '组织管理', - auth: '/sys/dept', - sidebar: false, - breadcrumb: false, - activeMenu: '/dept', - }, - }, - ], - }, - { - path: '/role', - component: Layout, - redirect: '/role/list', - name: 'RoleManage', - meta: { - title: '角色管理', - icon: 'ep:key', - auth: '/sys/role', - }, - children: [ - { - path: 'list', - name: 'RoleList', - component: () => import('@/views/system/role/listRole.vue'), - meta: { - title: '角色管理', - auth: '/sys/role', - sidebar: false, - breadcrumb: false, - activeMenu: '/role', - }, - }, - ], - }, - { - path: '/user', - component: Layout, - redirect: '/user/list', - name: 'UserManage', - meta: { - title: '用户管理', - icon: 'ep:key', - auth: '/sys/mgr', - }, - children: [ - { - path: 'list', - name: 'UserList', - component: () => import('@/views/system/user/listUser.vue'), - meta: { - title: '用户管理', - auth: '/sys/mgr', - sidebar: false, - breadcrumb: false, - activeMenu: '/user', - }, - }, - ], - }, - { - path: '/dict', - component: Layout, - redirect: '/dict/list', - name: 'DictManage', - meta: { - title: '字典管理', - icon: 'ep:key', - auth: '/sys/dict', - }, - children: [ - { - path: 'list', - name: 'DictList', - component: () => import('@/views/system/dict/listDict.vue'), - meta: { - title: '字典管理', - auth: '/sys/dict', - sidebar: false, - breadcrumb: false, - activeMenu: '/dict', - }, - }, - ], - }, - { - path: '/process', - component: Layout, - redirect: '/process/list', - name: 'Process', - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - }, - children: [ - { - path: 'list', - name: 'ProcessList', - component: () => import('@/views/system/process/process.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - sidebar: false, - breadcrumb: false, - activeMenu: '/process', - }, - }, - { - path: 'edit', - name: 'ProcessListEdit', - component: () => import('@/views/system/process/editProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - { - path: 'detail', - name: 'ProcessListDetail', - component: () => import('@/views/system/process/detailProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - { - path: 'add', - name: 'ProcessListAdd', - component: () => import('@/views/system/process/addProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - ], - }, - { - path: '/tenant', - component: Layout, - redirect: '/tenant/list', - name: 'TenantManage', - meta: { - title: '项目管理', - icon: 'ep:key', - auth: '/sys/tenantSys/list', - }, - children: [ - { - path: 'list', - name: 'TenantList', - component: () => import('@/views/system/tenant/list.tenant.vue'), - meta: { - title: '项目管理', - auth: '/sys/tenantSys/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/tenant', - }, - }, - ], - }, - { - path: '/businessLog', - component: Layout, - redirect: '/businessLog/list', - name: 'BusinessLog', - meta: { - title: '业务日志', - icon: 'ep:key', - auth: '/sys/log/biz/list', - }, - children: [ - { - path: 'list', - name: 'BusinessList', - component: () => import('@/views/system/log/listLog.vue'), - meta: { - title: '业务日志', - auth: '/sys/log/biz/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/businessLog', - }, - }, - ], - }, - { - path: '/error', - component: Layout, - redirect: '/error/list', - name: 'ErrorLog', - meta: { - title: '异常日志', - icon: 'ep:key', - auth: '/sys/log/error/list', - }, - children: [ - { - path: 'list', - name: 'ErrorList', - component: () => import('@/views/system/log/listErrorLog.vue'), - meta: { - title: '异常日志', - auth: '/sys/log/error/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/error', - }, - }, - ], - }, - { - path: '/loginDiary', - component: Layout, - redirect: '/loginDiary/list', - name: 'loginDiaryLog', - meta: { - title: '登录日志', - icon: 'ep:key', - auth: '/sys/loginLog', - }, - children: [ - { - path: 'list', - name: 'loginDiaryList', - component: () => import('@/views/system/log/LoginLog.vue'), - meta: { - title: '登录日志', - auth: '/sys/loginLog', - sidebar: false, - breadcrumb: false, - activeMenu: '/loginDiary', - }, - }, - ], - }, -] - -export default routes diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index 587eb68..046f9fe 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -12,6 +12,7 @@ meta: { title: '首页看板', icon: 'ep:key', + auth: '/dashboard', }, children: [ { @@ -24,6 +25,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/testeddashboard', + auth: '/dashboard', }, }, ], @@ -37,6 +39,7 @@ meta: { title: '考核规则管理', icon: 'ep:key', + auth: '/examine', }, children: [ { @@ -47,7 +50,7 @@ meta: { title: '考核等级评定', icon: 'ep:key', - // auth: '/sys/area', + auth: '/examine/grade', }, children: [ { @@ -56,7 +59,7 @@ component: () => import('@/views/rule/grade/index.vue'), meta: { title: '考核等级评定', - // auth: '/sys/area', + auth: '/examine/grade', sidebar: false, breadcrumb: false, activeMenu: '/grade', @@ -72,7 +75,7 @@ meta: { title: '考核指标管理', icon: 'ep:key', - // auth: '/sys/area', + auth: '/examine/proxy', }, children: [ { @@ -81,7 +84,7 @@ component: () => import('@/views/rule/proxy/index.vue'), meta: { title: '考核指标管理', - // auth: '/sys/area', + auth: '/examine/proxy', sidebar: false, breadcrumb: false, activeMenu: '/proxy', @@ -97,7 +100,7 @@ meta: { title: '考核方案管理', icon: 'ep:key', - // auth: '/sys/area', + auth: '/examine/programme', }, children: [ { @@ -106,7 +109,7 @@ component: () => import('@/views/rule/programme/index.vue'), meta: { title: '考核方案管理', - // auth: '/sys/area', + auth: '/examine/programme', sidebar: false, breadcrumb: false, activeMenu: '/programme', @@ -125,6 +128,7 @@ meta: { title: '考核填报', icon: 'ep:key', + auth: '/filling', }, children: [ { @@ -135,7 +139,7 @@ meta: { title: '待填报考核结果', icon: 'ep:key', - // auth: '/sys/area', + auth: '/filling/treat', }, children: [ { @@ -144,7 +148,7 @@ component: () => import('@/views/flling/treat/index.vue'), meta: { title: '待填报考核结果', - // auth: '/sys/area', + auth: '/filling/treat', sidebar: false, breadcrumb: false, activeMenu: '/treat', @@ -158,9 +162,9 @@ redirect: '/already/alreadylist', name: 'AlreadyManage', meta: { - title: '待填报考核结果', + title: '已填报考核结果', icon: 'ep:key', - // auth: '/sys/area', + auth: '/filling/already', }, children: [ { @@ -169,7 +173,7 @@ component: () => import('@/views/flling/already/index.vue'), meta: { title: '已填报考核结果', - // auth: '/sys/area', + auth: '/filling/already', sidebar: false, breadcrumb: false, activeMenu: '/already', @@ -188,6 +192,7 @@ meta: { title: '问效考核结果', icon: 'ep:key', + auth: '/efficiency', }, children: [ { @@ -198,7 +203,7 @@ meta: { title: '部门考核结果', icon: 'ep:key', - // auth: '/sys/area', + auth: '/efficiency/deptresult', }, children: [ { @@ -207,7 +212,7 @@ component: () => import('@/views/efficiency/dept/index.vue'), meta: { title: '部门考核结果', - // auth: '/sys/area', + auth: '/efficiency/deptresult', sidebar: false, breadcrumb: false, activeMenu: '/deptresult', @@ -221,9 +226,9 @@ redirect: '/analysis/analysislist', name: 'AnalysisResultManage', meta: { - title: '待填报考核结果', + title: '考核统计分析', icon: 'ep:key', - // auth: '/sys/area', + auth: '/efficiency/analysis', }, children: [ { @@ -232,7 +237,7 @@ component: () => import('@/views/efficiency/analysis/index.vue'), meta: { title: '考核统计分析', - // auth: '/sys/area', + auth: '/efficiency/analysis', sidebar: false, breadcrumb: false, activeMenu: '/analysis', @@ -251,6 +256,7 @@ meta: { title: '指标态势分析', icon: 'ep:key', + auth: '/proxy', }, children: [ { @@ -261,7 +267,7 @@ meta: { title: '预警结果列表', icon: 'ep:key', - // auth: '/sys/area', + auth: '/proxy/list', }, children: [ { @@ -270,7 +276,7 @@ component: () => import('@/views/proxy/list/index.vue'), meta: { title: '预警结果列表', - // auth: '/sys/area', + auth: '/proxy/list', sidebar: false, breadcrumb: false, activeMenu: '/list', @@ -286,7 +292,7 @@ meta: { title: '预警统计分析', icon: 'ep:key', - // auth: '/sys/area', + auth: '/proxy/analysiss', }, children: [ { @@ -295,7 +301,7 @@ component: () => import('@/views/proxy/analysis/index.vue'), meta: { title: '预警统计分析', - // auth: '/sys/area', + auth: '/proxy/analysiss', sidebar: false, breadcrumb: false, activeMenu: '/analysiss', @@ -314,6 +320,7 @@ meta: { title: '系统设置', icon: 'ep:key', + auth: '/system', }, children: [ { @@ -324,7 +331,7 @@ meta: { title: '区域管理', icon: 'ep:key', - // auth: '/sys/area', + auth: '/sys/area', }, children: [ { @@ -333,7 +340,7 @@ component: () => import('@/views/system/area/listArea.vue'), meta: { title: '区域管理', - // auth: '/sys/area', + auth: '/sys/area', sidebar: false, breadcrumb: false, activeMenu: '/area', @@ -349,7 +356,7 @@ meta: { title: '资源管理', icon: 'ep:key', - // auth: '/sys/resource', + auth: '/sys/resource', }, children: [ { @@ -358,7 +365,7 @@ component: () => import('@/views/system/resource/listResource.vue'), meta: { title: '资源管理', - // auth: '/sys/resource', + auth: '/sys/resource', sidebar: false, breadcrumb: false, activeMenu: '/resource', @@ -374,7 +381,7 @@ meta: { title: '组织管理', icon: 'ep:key', - // auth: '/sys/dept', + auth: '/sys/dept', }, children: [ { @@ -383,7 +390,7 @@ component: () => import('@/views/system/dept/listDept.vue'), meta: { title: '组织管理', - // auth: '/sys/dept', + auth: '/sys/dept', sidebar: false, breadcrumb: false, activeMenu: '/dept', @@ -399,7 +406,7 @@ meta: { title: '角色管理', icon: 'ep:key', - // auth: '/sys/role', + auth: '/sys/role', }, children: [ { @@ -408,7 +415,7 @@ component: () => import('@/views/system/role/listRole.vue'), meta: { title: '角色管理', - // auth: '/sys/role', + auth: '/sys/role', sidebar: false, breadcrumb: false, activeMenu: '/role', @@ -424,7 +431,7 @@ meta: { title: '用户管理', icon: 'ep:key', - // auth: '/sys/mgr', + auth: '/sys/mgr', }, children: [ { @@ -433,7 +440,7 @@ component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', - // auth: '/sys/mgr', + auth: '/sys/mgr', sidebar: false, breadcrumb: false, activeMenu: '/user', @@ -449,7 +456,7 @@ meta: { title: '字典管理', icon: 'ep:key', - // auth: '/sys/dict', + auth: '/sys/dict', }, children: [ { @@ -458,7 +465,7 @@ component: () => import('@/views/system/dict/listDict.vue'), meta: { title: '字典管理', - // auth: '/sys/dict', + auth: '/sys/dict', sidebar: false, breadcrumb: false, activeMenu: '/dict', @@ -474,7 +481,7 @@ meta: { title: '业务日志', icon: 'ep:key', - // auth: '/sys/log/biz/list', + auth: '/sys/log/biz/list', }, children: [ { @@ -483,7 +490,7 @@ component: () => import('@/views/system/log/listLog.vue'), meta: { title: '业务日志', - // auth: '/sys/log/biz/list', + auth: '/sys/log/biz/list', sidebar: false, breadcrumb: false, activeMenu: '/businessLog', @@ -499,7 +506,7 @@ meta: { title: '异常日志', icon: 'ep:key', - // auth: '/sys/log/error/list', + auth: '/sys/log/error/list', }, children: [ { @@ -508,7 +515,7 @@ component: () => import('@/views/system/log/listErrorLog.vue'), meta: { title: '异常日志', - // auth: '/sys/log/error/list', + auth: '/sys/log/error/list', sidebar: false, breadcrumb: false, activeMenu: '/error', @@ -524,7 +531,7 @@ meta: { title: '登录日志', icon: 'ep:key', - // auth: '/sys/loginLog', + auth: '/sys/loginLog', }, children: [ { @@ -533,7 +540,7 @@ component: () => import('@/views/system/log/LoginLog.vue'), meta: { title: '登录日志', - // auth: '/sys/loginLog', + auth: '/sys/loginLog', sidebar: false, breadcrumb: false, activeMenu: '/loginDiary', diff --git a/.env.development b/.env.development index 26837aa..f27d241 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ # VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 -VITE_APP_API_BASEURL = http://111.198.10.15:11638 +VITE_APP_API_BASEURL = http://111.198.10.15:11420 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.production b/.env.production index 7217090..c0534e5 100644 --- a/.env.production +++ b/.env.production @@ -3,7 +3,7 @@ # 页面标题 VITE_APP_TITLE = 行政问效综合评价平台 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:11638 +VITE_APP_API_BASEURL = http://111.198.10.15:11420 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 0acc3c5..bd6c64d 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:11638" + "baseUrl": "http://111.198.10.15:11420" } diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue index 3c4fe75..e2a3c90 100644 --- a/src/layouts/components/Topbar/index.vue +++ b/src/layouts/components/Topbar/index.vue @@ -61,7 +61,8 @@ - + + {{ item.title }} diff --git a/src/router/modules/common.ts b/src/router/modules/common.ts deleted file mode 100644 index 7957fe2..0000000 --- a/src/router/modules/common.ts +++ /dev/null @@ -1,321 +0,0 @@ -import type { Route } from '@/global' - -const Layout = () => import('@/layouts/index.vue') - -const routes: Route.recordRaw[] = [ - { - path: '/area', - component: Layout, - redirect: '/area/list', - name: 'AreaManage', - meta: { - title: '区域管理', - icon: 'ep:key', - auth: '/sys/area', - }, - children: [ - { - path: 'list', - name: 'AreaList', - component: () => import('@/views/system/area/listArea.vue'), - meta: { - title: '区域管理', - auth: '/sys/area', - sidebar: false, - breadcrumb: false, - activeMenu: '/area', - }, - }, - ], - }, - { - path: '/resource', - component: Layout, - redirect: '/resource/list', - name: 'ResourceManage', - meta: { - title: '资源管理', - icon: 'ep:key', - auth: '/sys/resource', - }, - children: [ - { - path: 'list', - name: 'ResourceList', - component: () => import('@/views/system/resource/listResource.vue'), - meta: { - title: '资源管理', - auth: '/sys/resource', - sidebar: false, - breadcrumb: false, - activeMenu: '/resource', - }, - }, - ], - }, - { - path: '/dept', - component: Layout, - redirect: '/dept/list', - name: 'DeptManage', - meta: { - title: '组织管理', - icon: 'ep:key', - auth: '/sys/dept', - }, - children: [ - { - path: 'list', - name: 'DeptList', - component: () => import('@/views/system/dept/listDept.vue'), - meta: { - title: '组织管理', - auth: '/sys/dept', - sidebar: false, - breadcrumb: false, - activeMenu: '/dept', - }, - }, - ], - }, - { - path: '/role', - component: Layout, - redirect: '/role/list', - name: 'RoleManage', - meta: { - title: '角色管理', - icon: 'ep:key', - auth: '/sys/role', - }, - children: [ - { - path: 'list', - name: 'RoleList', - component: () => import('@/views/system/role/listRole.vue'), - meta: { - title: '角色管理', - auth: '/sys/role', - sidebar: false, - breadcrumb: false, - activeMenu: '/role', - }, - }, - ], - }, - { - path: '/user', - component: Layout, - redirect: '/user/list', - name: 'UserManage', - meta: { - title: '用户管理', - icon: 'ep:key', - auth: '/sys/mgr', - }, - children: [ - { - path: 'list', - name: 'UserList', - component: () => import('@/views/system/user/listUser.vue'), - meta: { - title: '用户管理', - auth: '/sys/mgr', - sidebar: false, - breadcrumb: false, - activeMenu: '/user', - }, - }, - ], - }, - { - path: '/dict', - component: Layout, - redirect: '/dict/list', - name: 'DictManage', - meta: { - title: '字典管理', - icon: 'ep:key', - auth: '/sys/dict', - }, - children: [ - { - path: 'list', - name: 'DictList', - component: () => import('@/views/system/dict/listDict.vue'), - meta: { - title: '字典管理', - auth: '/sys/dict', - sidebar: false, - breadcrumb: false, - activeMenu: '/dict', - }, - }, - ], - }, - { - path: '/process', - component: Layout, - redirect: '/process/list', - name: 'Process', - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - }, - children: [ - { - path: 'list', - name: 'ProcessList', - component: () => import('@/views/system/process/process.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - sidebar: false, - breadcrumb: false, - activeMenu: '/process', - }, - }, - { - path: 'edit', - name: 'ProcessListEdit', - component: () => import('@/views/system/process/editProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - { - path: 'detail', - name: 'ProcessListDetail', - component: () => import('@/views/system/process/detailProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - { - path: 'add', - name: 'ProcessListAdd', - component: () => import('@/views/system/process/addProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - ], - }, - { - path: '/tenant', - component: Layout, - redirect: '/tenant/list', - name: 'TenantManage', - meta: { - title: '项目管理', - icon: 'ep:key', - auth: '/sys/tenantSys/list', - }, - children: [ - { - path: 'list', - name: 'TenantList', - component: () => import('@/views/system/tenant/list.tenant.vue'), - meta: { - title: '项目管理', - auth: '/sys/tenantSys/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/tenant', - }, - }, - ], - }, - { - path: '/businessLog', - component: Layout, - redirect: '/businessLog/list', - name: 'BusinessLog', - meta: { - title: '业务日志', - icon: 'ep:key', - auth: '/sys/log/biz/list', - }, - children: [ - { - path: 'list', - name: 'BusinessList', - component: () => import('@/views/system/log/listLog.vue'), - meta: { - title: '业务日志', - auth: '/sys/log/biz/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/businessLog', - }, - }, - ], - }, - { - path: '/error', - component: Layout, - redirect: '/error/list', - name: 'ErrorLog', - meta: { - title: '异常日志', - icon: 'ep:key', - auth: '/sys/log/error/list', - }, - children: [ - { - path: 'list', - name: 'ErrorList', - component: () => import('@/views/system/log/listErrorLog.vue'), - meta: { - title: '异常日志', - auth: '/sys/log/error/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/error', - }, - }, - ], - }, - { - path: '/loginDiary', - component: Layout, - redirect: '/loginDiary/list', - name: 'loginDiaryLog', - meta: { - title: '登录日志', - icon: 'ep:key', - auth: '/sys/loginLog', - }, - children: [ - { - path: 'list', - name: 'loginDiaryList', - component: () => import('@/views/system/log/LoginLog.vue'), - meta: { - title: '登录日志', - auth: '/sys/loginLog', - sidebar: false, - breadcrumb: false, - activeMenu: '/loginDiary', - }, - }, - ], - }, -] - -export default routes diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index 587eb68..046f9fe 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -12,6 +12,7 @@ meta: { title: '首页看板', icon: 'ep:key', + auth: '/dashboard', }, children: [ { @@ -24,6 +25,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/testeddashboard', + auth: '/dashboard', }, }, ], @@ -37,6 +39,7 @@ meta: { title: '考核规则管理', icon: 'ep:key', + auth: '/examine', }, children: [ { @@ -47,7 +50,7 @@ meta: { title: '考核等级评定', icon: 'ep:key', - // auth: '/sys/area', + auth: '/examine/grade', }, children: [ { @@ -56,7 +59,7 @@ component: () => import('@/views/rule/grade/index.vue'), meta: { title: '考核等级评定', - // auth: '/sys/area', + auth: '/examine/grade', sidebar: false, breadcrumb: false, activeMenu: '/grade', @@ -72,7 +75,7 @@ meta: { title: '考核指标管理', icon: 'ep:key', - // auth: '/sys/area', + auth: '/examine/proxy', }, children: [ { @@ -81,7 +84,7 @@ component: () => import('@/views/rule/proxy/index.vue'), meta: { title: '考核指标管理', - // auth: '/sys/area', + auth: '/examine/proxy', sidebar: false, breadcrumb: false, activeMenu: '/proxy', @@ -97,7 +100,7 @@ meta: { title: '考核方案管理', icon: 'ep:key', - // auth: '/sys/area', + auth: '/examine/programme', }, children: [ { @@ -106,7 +109,7 @@ component: () => import('@/views/rule/programme/index.vue'), meta: { title: '考核方案管理', - // auth: '/sys/area', + auth: '/examine/programme', sidebar: false, breadcrumb: false, activeMenu: '/programme', @@ -125,6 +128,7 @@ meta: { title: '考核填报', icon: 'ep:key', + auth: '/filling', }, children: [ { @@ -135,7 +139,7 @@ meta: { title: '待填报考核结果', icon: 'ep:key', - // auth: '/sys/area', + auth: '/filling/treat', }, children: [ { @@ -144,7 +148,7 @@ component: () => import('@/views/flling/treat/index.vue'), meta: { title: '待填报考核结果', - // auth: '/sys/area', + auth: '/filling/treat', sidebar: false, breadcrumb: false, activeMenu: '/treat', @@ -158,9 +162,9 @@ redirect: '/already/alreadylist', name: 'AlreadyManage', meta: { - title: '待填报考核结果', + title: '已填报考核结果', icon: 'ep:key', - // auth: '/sys/area', + auth: '/filling/already', }, children: [ { @@ -169,7 +173,7 @@ component: () => import('@/views/flling/already/index.vue'), meta: { title: '已填报考核结果', - // auth: '/sys/area', + auth: '/filling/already', sidebar: false, breadcrumb: false, activeMenu: '/already', @@ -188,6 +192,7 @@ meta: { title: '问效考核结果', icon: 'ep:key', + auth: '/efficiency', }, children: [ { @@ -198,7 +203,7 @@ meta: { title: '部门考核结果', icon: 'ep:key', - // auth: '/sys/area', + auth: '/efficiency/deptresult', }, children: [ { @@ -207,7 +212,7 @@ component: () => import('@/views/efficiency/dept/index.vue'), meta: { title: '部门考核结果', - // auth: '/sys/area', + auth: '/efficiency/deptresult', sidebar: false, breadcrumb: false, activeMenu: '/deptresult', @@ -221,9 +226,9 @@ redirect: '/analysis/analysislist', name: 'AnalysisResultManage', meta: { - title: '待填报考核结果', + title: '考核统计分析', icon: 'ep:key', - // auth: '/sys/area', + auth: '/efficiency/analysis', }, children: [ { @@ -232,7 +237,7 @@ component: () => import('@/views/efficiency/analysis/index.vue'), meta: { title: '考核统计分析', - // auth: '/sys/area', + auth: '/efficiency/analysis', sidebar: false, breadcrumb: false, activeMenu: '/analysis', @@ -251,6 +256,7 @@ meta: { title: '指标态势分析', icon: 'ep:key', + auth: '/proxy', }, children: [ { @@ -261,7 +267,7 @@ meta: { title: '预警结果列表', icon: 'ep:key', - // auth: '/sys/area', + auth: '/proxy/list', }, children: [ { @@ -270,7 +276,7 @@ component: () => import('@/views/proxy/list/index.vue'), meta: { title: '预警结果列表', - // auth: '/sys/area', + auth: '/proxy/list', sidebar: false, breadcrumb: false, activeMenu: '/list', @@ -286,7 +292,7 @@ meta: { title: '预警统计分析', icon: 'ep:key', - // auth: '/sys/area', + auth: '/proxy/analysiss', }, children: [ { @@ -295,7 +301,7 @@ component: () => import('@/views/proxy/analysis/index.vue'), meta: { title: '预警统计分析', - // auth: '/sys/area', + auth: '/proxy/analysiss', sidebar: false, breadcrumb: false, activeMenu: '/analysiss', @@ -314,6 +320,7 @@ meta: { title: '系统设置', icon: 'ep:key', + auth: '/system', }, children: [ { @@ -324,7 +331,7 @@ meta: { title: '区域管理', icon: 'ep:key', - // auth: '/sys/area', + auth: '/sys/area', }, children: [ { @@ -333,7 +340,7 @@ component: () => import('@/views/system/area/listArea.vue'), meta: { title: '区域管理', - // auth: '/sys/area', + auth: '/sys/area', sidebar: false, breadcrumb: false, activeMenu: '/area', @@ -349,7 +356,7 @@ meta: { title: '资源管理', icon: 'ep:key', - // auth: '/sys/resource', + auth: '/sys/resource', }, children: [ { @@ -358,7 +365,7 @@ component: () => import('@/views/system/resource/listResource.vue'), meta: { title: '资源管理', - // auth: '/sys/resource', + auth: '/sys/resource', sidebar: false, breadcrumb: false, activeMenu: '/resource', @@ -374,7 +381,7 @@ meta: { title: '组织管理', icon: 'ep:key', - // auth: '/sys/dept', + auth: '/sys/dept', }, children: [ { @@ -383,7 +390,7 @@ component: () => import('@/views/system/dept/listDept.vue'), meta: { title: '组织管理', - // auth: '/sys/dept', + auth: '/sys/dept', sidebar: false, breadcrumb: false, activeMenu: '/dept', @@ -399,7 +406,7 @@ meta: { title: '角色管理', icon: 'ep:key', - // auth: '/sys/role', + auth: '/sys/role', }, children: [ { @@ -408,7 +415,7 @@ component: () => import('@/views/system/role/listRole.vue'), meta: { title: '角色管理', - // auth: '/sys/role', + auth: '/sys/role', sidebar: false, breadcrumb: false, activeMenu: '/role', @@ -424,7 +431,7 @@ meta: { title: '用户管理', icon: 'ep:key', - // auth: '/sys/mgr', + auth: '/sys/mgr', }, children: [ { @@ -433,7 +440,7 @@ component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', - // auth: '/sys/mgr', + auth: '/sys/mgr', sidebar: false, breadcrumb: false, activeMenu: '/user', @@ -449,7 +456,7 @@ meta: { title: '字典管理', icon: 'ep:key', - // auth: '/sys/dict', + auth: '/sys/dict', }, children: [ { @@ -458,7 +465,7 @@ component: () => import('@/views/system/dict/listDict.vue'), meta: { title: '字典管理', - // auth: '/sys/dict', + auth: '/sys/dict', sidebar: false, breadcrumb: false, activeMenu: '/dict', @@ -474,7 +481,7 @@ meta: { title: '业务日志', icon: 'ep:key', - // auth: '/sys/log/biz/list', + auth: '/sys/log/biz/list', }, children: [ { @@ -483,7 +490,7 @@ component: () => import('@/views/system/log/listLog.vue'), meta: { title: '业务日志', - // auth: '/sys/log/biz/list', + auth: '/sys/log/biz/list', sidebar: false, breadcrumb: false, activeMenu: '/businessLog', @@ -499,7 +506,7 @@ meta: { title: '异常日志', icon: 'ep:key', - // auth: '/sys/log/error/list', + auth: '/sys/log/error/list', }, children: [ { @@ -508,7 +515,7 @@ component: () => import('@/views/system/log/listErrorLog.vue'), meta: { title: '异常日志', - // auth: '/sys/log/error/list', + auth: '/sys/log/error/list', sidebar: false, breadcrumb: false, activeMenu: '/error', @@ -524,7 +531,7 @@ meta: { title: '登录日志', icon: 'ep:key', - // auth: '/sys/loginLog', + auth: '/sys/loginLog', }, children: [ { @@ -533,7 +540,7 @@ component: () => import('@/views/system/log/LoginLog.vue'), meta: { title: '登录日志', - // auth: '/sys/loginLog', + auth: '/sys/loginLog', sidebar: false, breadcrumb: false, activeMenu: '/loginDiary', diff --git a/src/router/modules/multilevel.menu.example.ts b/src/router/modules/multilevel.menu.example.ts deleted file mode 100644 index 75f3eb3..0000000 --- a/src/router/modules/multilevel.menu.example.ts +++ /dev/null @@ -1,70 +0,0 @@ -import type { Route } from '@/global' - -const Layout = () => import('@/layouts/index.vue') - -const routes: Route.recordRaw = { - path: '/multilevel_menu_example', - component: Layout, - redirect: '/multilevel_menu_example/page', - name: 'multilevelMenuExample', - meta: { - title: '多级导航', - icon: 'sidebar-menu', - }, - children: [ - { - path: 'page', - name: 'multilevelMenuExample1', - component: () => import('@/views/multilevel_menu_example/page.vue'), - meta: { - title: '导航1', - }, - }, - { - path: 'level2', - name: 'multilevelMenuExample2', - redirect: '/multilevel_menu_example/level2/page', - meta: { - title: '导航2', - }, - children: [ - { - path: 'page', - name: 'multilevelMenuExample2-1', - component: () => import('@/views/multilevel_menu_example/level2/page.vue'), - meta: { - title: '导航2-1', - }, - }, - { - path: 'level3', - name: 'multilevelMenuExample2-2', - redirect: '/multilevel_menu_example/level2/level3/page1', - meta: { - title: '导航2-2', - }, - children: [ - { - path: 'page1', - name: 'multilevelMenuExample2-2-1', - component: () => import('@/views/multilevel_menu_example/level2/level3/page1.vue'), - meta: { - title: '导航2-2-1', - }, - }, - { - path: 'page2', - name: 'multilevelMenuExample2-2-2', - component: () => import('@/views/multilevel_menu_example/level2/level3/page2.vue'), - meta: { - title: '导航2-2-2', - }, - }, - ], - }, - ], - }, - ], -} - -export default routes diff --git a/.env.development b/.env.development index 26837aa..f27d241 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ # VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 -VITE_APP_API_BASEURL = http://111.198.10.15:11638 +VITE_APP_API_BASEURL = http://111.198.10.15:11420 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.production b/.env.production index 7217090..c0534e5 100644 --- a/.env.production +++ b/.env.production @@ -3,7 +3,7 @@ # 页面标题 VITE_APP_TITLE = 行政问效综合评价平台 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:11638 +VITE_APP_API_BASEURL = http://111.198.10.15:11420 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 0acc3c5..bd6c64d 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:11638" + "baseUrl": "http://111.198.10.15:11420" } diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue index 3c4fe75..e2a3c90 100644 --- a/src/layouts/components/Topbar/index.vue +++ b/src/layouts/components/Topbar/index.vue @@ -61,7 +61,8 @@ - + + {{ item.title }} diff --git a/src/router/modules/common.ts b/src/router/modules/common.ts deleted file mode 100644 index 7957fe2..0000000 --- a/src/router/modules/common.ts +++ /dev/null @@ -1,321 +0,0 @@ -import type { Route } from '@/global' - -const Layout = () => import('@/layouts/index.vue') - -const routes: Route.recordRaw[] = [ - { - path: '/area', - component: Layout, - redirect: '/area/list', - name: 'AreaManage', - meta: { - title: '区域管理', - icon: 'ep:key', - auth: '/sys/area', - }, - children: [ - { - path: 'list', - name: 'AreaList', - component: () => import('@/views/system/area/listArea.vue'), - meta: { - title: '区域管理', - auth: '/sys/area', - sidebar: false, - breadcrumb: false, - activeMenu: '/area', - }, - }, - ], - }, - { - path: '/resource', - component: Layout, - redirect: '/resource/list', - name: 'ResourceManage', - meta: { - title: '资源管理', - icon: 'ep:key', - auth: '/sys/resource', - }, - children: [ - { - path: 'list', - name: 'ResourceList', - component: () => import('@/views/system/resource/listResource.vue'), - meta: { - title: '资源管理', - auth: '/sys/resource', - sidebar: false, - breadcrumb: false, - activeMenu: '/resource', - }, - }, - ], - }, - { - path: '/dept', - component: Layout, - redirect: '/dept/list', - name: 'DeptManage', - meta: { - title: '组织管理', - icon: 'ep:key', - auth: '/sys/dept', - }, - children: [ - { - path: 'list', - name: 'DeptList', - component: () => import('@/views/system/dept/listDept.vue'), - meta: { - title: '组织管理', - auth: '/sys/dept', - sidebar: false, - breadcrumb: false, - activeMenu: '/dept', - }, - }, - ], - }, - { - path: '/role', - component: Layout, - redirect: '/role/list', - name: 'RoleManage', - meta: { - title: '角色管理', - icon: 'ep:key', - auth: '/sys/role', - }, - children: [ - { - path: 'list', - name: 'RoleList', - component: () => import('@/views/system/role/listRole.vue'), - meta: { - title: '角色管理', - auth: '/sys/role', - sidebar: false, - breadcrumb: false, - activeMenu: '/role', - }, - }, - ], - }, - { - path: '/user', - component: Layout, - redirect: '/user/list', - name: 'UserManage', - meta: { - title: '用户管理', - icon: 'ep:key', - auth: '/sys/mgr', - }, - children: [ - { - path: 'list', - name: 'UserList', - component: () => import('@/views/system/user/listUser.vue'), - meta: { - title: '用户管理', - auth: '/sys/mgr', - sidebar: false, - breadcrumb: false, - activeMenu: '/user', - }, - }, - ], - }, - { - path: '/dict', - component: Layout, - redirect: '/dict/list', - name: 'DictManage', - meta: { - title: '字典管理', - icon: 'ep:key', - auth: '/sys/dict', - }, - children: [ - { - path: 'list', - name: 'DictList', - component: () => import('@/views/system/dict/listDict.vue'), - meta: { - title: '字典管理', - auth: '/sys/dict', - sidebar: false, - breadcrumb: false, - activeMenu: '/dict', - }, - }, - ], - }, - { - path: '/process', - component: Layout, - redirect: '/process/list', - name: 'Process', - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - }, - children: [ - { - path: 'list', - name: 'ProcessList', - component: () => import('@/views/system/process/process.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - sidebar: false, - breadcrumb: false, - activeMenu: '/process', - }, - }, - { - path: 'edit', - name: 'ProcessListEdit', - component: () => import('@/views/system/process/editProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - { - path: 'detail', - name: 'ProcessListDetail', - component: () => import('@/views/system/process/detailProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - { - path: 'add', - name: 'ProcessListAdd', - component: () => import('@/views/system/process/addProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - ], - }, - { - path: '/tenant', - component: Layout, - redirect: '/tenant/list', - name: 'TenantManage', - meta: { - title: '项目管理', - icon: 'ep:key', - auth: '/sys/tenantSys/list', - }, - children: [ - { - path: 'list', - name: 'TenantList', - component: () => import('@/views/system/tenant/list.tenant.vue'), - meta: { - title: '项目管理', - auth: '/sys/tenantSys/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/tenant', - }, - }, - ], - }, - { - path: '/businessLog', - component: Layout, - redirect: '/businessLog/list', - name: 'BusinessLog', - meta: { - title: '业务日志', - icon: 'ep:key', - auth: '/sys/log/biz/list', - }, - children: [ - { - path: 'list', - name: 'BusinessList', - component: () => import('@/views/system/log/listLog.vue'), - meta: { - title: '业务日志', - auth: '/sys/log/biz/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/businessLog', - }, - }, - ], - }, - { - path: '/error', - component: Layout, - redirect: '/error/list', - name: 'ErrorLog', - meta: { - title: '异常日志', - icon: 'ep:key', - auth: '/sys/log/error/list', - }, - children: [ - { - path: 'list', - name: 'ErrorList', - component: () => import('@/views/system/log/listErrorLog.vue'), - meta: { - title: '异常日志', - auth: '/sys/log/error/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/error', - }, - }, - ], - }, - { - path: '/loginDiary', - component: Layout, - redirect: '/loginDiary/list', - name: 'loginDiaryLog', - meta: { - title: '登录日志', - icon: 'ep:key', - auth: '/sys/loginLog', - }, - children: [ - { - path: 'list', - name: 'loginDiaryList', - component: () => import('@/views/system/log/LoginLog.vue'), - meta: { - title: '登录日志', - auth: '/sys/loginLog', - sidebar: false, - breadcrumb: false, - activeMenu: '/loginDiary', - }, - }, - ], - }, -] - -export default routes diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index 587eb68..046f9fe 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -12,6 +12,7 @@ meta: { title: '首页看板', icon: 'ep:key', + auth: '/dashboard', }, children: [ { @@ -24,6 +25,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/testeddashboard', + auth: '/dashboard', }, }, ], @@ -37,6 +39,7 @@ meta: { title: '考核规则管理', icon: 'ep:key', + auth: '/examine', }, children: [ { @@ -47,7 +50,7 @@ meta: { title: '考核等级评定', icon: 'ep:key', - // auth: '/sys/area', + auth: '/examine/grade', }, children: [ { @@ -56,7 +59,7 @@ component: () => import('@/views/rule/grade/index.vue'), meta: { title: '考核等级评定', - // auth: '/sys/area', + auth: '/examine/grade', sidebar: false, breadcrumb: false, activeMenu: '/grade', @@ -72,7 +75,7 @@ meta: { title: '考核指标管理', icon: 'ep:key', - // auth: '/sys/area', + auth: '/examine/proxy', }, children: [ { @@ -81,7 +84,7 @@ component: () => import('@/views/rule/proxy/index.vue'), meta: { title: '考核指标管理', - // auth: '/sys/area', + auth: '/examine/proxy', sidebar: false, breadcrumb: false, activeMenu: '/proxy', @@ -97,7 +100,7 @@ meta: { title: '考核方案管理', icon: 'ep:key', - // auth: '/sys/area', + auth: '/examine/programme', }, children: [ { @@ -106,7 +109,7 @@ component: () => import('@/views/rule/programme/index.vue'), meta: { title: '考核方案管理', - // auth: '/sys/area', + auth: '/examine/programme', sidebar: false, breadcrumb: false, activeMenu: '/programme', @@ -125,6 +128,7 @@ meta: { title: '考核填报', icon: 'ep:key', + auth: '/filling', }, children: [ { @@ -135,7 +139,7 @@ meta: { title: '待填报考核结果', icon: 'ep:key', - // auth: '/sys/area', + auth: '/filling/treat', }, children: [ { @@ -144,7 +148,7 @@ component: () => import('@/views/flling/treat/index.vue'), meta: { title: '待填报考核结果', - // auth: '/sys/area', + auth: '/filling/treat', sidebar: false, breadcrumb: false, activeMenu: '/treat', @@ -158,9 +162,9 @@ redirect: '/already/alreadylist', name: 'AlreadyManage', meta: { - title: '待填报考核结果', + title: '已填报考核结果', icon: 'ep:key', - // auth: '/sys/area', + auth: '/filling/already', }, children: [ { @@ -169,7 +173,7 @@ component: () => import('@/views/flling/already/index.vue'), meta: { title: '已填报考核结果', - // auth: '/sys/area', + auth: '/filling/already', sidebar: false, breadcrumb: false, activeMenu: '/already', @@ -188,6 +192,7 @@ meta: { title: '问效考核结果', icon: 'ep:key', + auth: '/efficiency', }, children: [ { @@ -198,7 +203,7 @@ meta: { title: '部门考核结果', icon: 'ep:key', - // auth: '/sys/area', + auth: '/efficiency/deptresult', }, children: [ { @@ -207,7 +212,7 @@ component: () => import('@/views/efficiency/dept/index.vue'), meta: { title: '部门考核结果', - // auth: '/sys/area', + auth: '/efficiency/deptresult', sidebar: false, breadcrumb: false, activeMenu: '/deptresult', @@ -221,9 +226,9 @@ redirect: '/analysis/analysislist', name: 'AnalysisResultManage', meta: { - title: '待填报考核结果', + title: '考核统计分析', icon: 'ep:key', - // auth: '/sys/area', + auth: '/efficiency/analysis', }, children: [ { @@ -232,7 +237,7 @@ component: () => import('@/views/efficiency/analysis/index.vue'), meta: { title: '考核统计分析', - // auth: '/sys/area', + auth: '/efficiency/analysis', sidebar: false, breadcrumb: false, activeMenu: '/analysis', @@ -251,6 +256,7 @@ meta: { title: '指标态势分析', icon: 'ep:key', + auth: '/proxy', }, children: [ { @@ -261,7 +267,7 @@ meta: { title: '预警结果列表', icon: 'ep:key', - // auth: '/sys/area', + auth: '/proxy/list', }, children: [ { @@ -270,7 +276,7 @@ component: () => import('@/views/proxy/list/index.vue'), meta: { title: '预警结果列表', - // auth: '/sys/area', + auth: '/proxy/list', sidebar: false, breadcrumb: false, activeMenu: '/list', @@ -286,7 +292,7 @@ meta: { title: '预警统计分析', icon: 'ep:key', - // auth: '/sys/area', + auth: '/proxy/analysiss', }, children: [ { @@ -295,7 +301,7 @@ component: () => import('@/views/proxy/analysis/index.vue'), meta: { title: '预警统计分析', - // auth: '/sys/area', + auth: '/proxy/analysiss', sidebar: false, breadcrumb: false, activeMenu: '/analysiss', @@ -314,6 +320,7 @@ meta: { title: '系统设置', icon: 'ep:key', + auth: '/system', }, children: [ { @@ -324,7 +331,7 @@ meta: { title: '区域管理', icon: 'ep:key', - // auth: '/sys/area', + auth: '/sys/area', }, children: [ { @@ -333,7 +340,7 @@ component: () => import('@/views/system/area/listArea.vue'), meta: { title: '区域管理', - // auth: '/sys/area', + auth: '/sys/area', sidebar: false, breadcrumb: false, activeMenu: '/area', @@ -349,7 +356,7 @@ meta: { title: '资源管理', icon: 'ep:key', - // auth: '/sys/resource', + auth: '/sys/resource', }, children: [ { @@ -358,7 +365,7 @@ component: () => import('@/views/system/resource/listResource.vue'), meta: { title: '资源管理', - // auth: '/sys/resource', + auth: '/sys/resource', sidebar: false, breadcrumb: false, activeMenu: '/resource', @@ -374,7 +381,7 @@ meta: { title: '组织管理', icon: 'ep:key', - // auth: '/sys/dept', + auth: '/sys/dept', }, children: [ { @@ -383,7 +390,7 @@ component: () => import('@/views/system/dept/listDept.vue'), meta: { title: '组织管理', - // auth: '/sys/dept', + auth: '/sys/dept', sidebar: false, breadcrumb: false, activeMenu: '/dept', @@ -399,7 +406,7 @@ meta: { title: '角色管理', icon: 'ep:key', - // auth: '/sys/role', + auth: '/sys/role', }, children: [ { @@ -408,7 +415,7 @@ component: () => import('@/views/system/role/listRole.vue'), meta: { title: '角色管理', - // auth: '/sys/role', + auth: '/sys/role', sidebar: false, breadcrumb: false, activeMenu: '/role', @@ -424,7 +431,7 @@ meta: { title: '用户管理', icon: 'ep:key', - // auth: '/sys/mgr', + auth: '/sys/mgr', }, children: [ { @@ -433,7 +440,7 @@ component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', - // auth: '/sys/mgr', + auth: '/sys/mgr', sidebar: false, breadcrumb: false, activeMenu: '/user', @@ -449,7 +456,7 @@ meta: { title: '字典管理', icon: 'ep:key', - // auth: '/sys/dict', + auth: '/sys/dict', }, children: [ { @@ -458,7 +465,7 @@ component: () => import('@/views/system/dict/listDict.vue'), meta: { title: '字典管理', - // auth: '/sys/dict', + auth: '/sys/dict', sidebar: false, breadcrumb: false, activeMenu: '/dict', @@ -474,7 +481,7 @@ meta: { title: '业务日志', icon: 'ep:key', - // auth: '/sys/log/biz/list', + auth: '/sys/log/biz/list', }, children: [ { @@ -483,7 +490,7 @@ component: () => import('@/views/system/log/listLog.vue'), meta: { title: '业务日志', - // auth: '/sys/log/biz/list', + auth: '/sys/log/biz/list', sidebar: false, breadcrumb: false, activeMenu: '/businessLog', @@ -499,7 +506,7 @@ meta: { title: '异常日志', icon: 'ep:key', - // auth: '/sys/log/error/list', + auth: '/sys/log/error/list', }, children: [ { @@ -508,7 +515,7 @@ component: () => import('@/views/system/log/listErrorLog.vue'), meta: { title: '异常日志', - // auth: '/sys/log/error/list', + auth: '/sys/log/error/list', sidebar: false, breadcrumb: false, activeMenu: '/error', @@ -524,7 +531,7 @@ meta: { title: '登录日志', icon: 'ep:key', - // auth: '/sys/loginLog', + auth: '/sys/loginLog', }, children: [ { @@ -533,7 +540,7 @@ component: () => import('@/views/system/log/LoginLog.vue'), meta: { title: '登录日志', - // auth: '/sys/loginLog', + auth: '/sys/loginLog', sidebar: false, breadcrumb: false, activeMenu: '/loginDiary', diff --git a/src/router/modules/multilevel.menu.example.ts b/src/router/modules/multilevel.menu.example.ts deleted file mode 100644 index 75f3eb3..0000000 --- a/src/router/modules/multilevel.menu.example.ts +++ /dev/null @@ -1,70 +0,0 @@ -import type { Route } from '@/global' - -const Layout = () => import('@/layouts/index.vue') - -const routes: Route.recordRaw = { - path: '/multilevel_menu_example', - component: Layout, - redirect: '/multilevel_menu_example/page', - name: 'multilevelMenuExample', - meta: { - title: '多级导航', - icon: 'sidebar-menu', - }, - children: [ - { - path: 'page', - name: 'multilevelMenuExample1', - component: () => import('@/views/multilevel_menu_example/page.vue'), - meta: { - title: '导航1', - }, - }, - { - path: 'level2', - name: 'multilevelMenuExample2', - redirect: '/multilevel_menu_example/level2/page', - meta: { - title: '导航2', - }, - children: [ - { - path: 'page', - name: 'multilevelMenuExample2-1', - component: () => import('@/views/multilevel_menu_example/level2/page.vue'), - meta: { - title: '导航2-1', - }, - }, - { - path: 'level3', - name: 'multilevelMenuExample2-2', - redirect: '/multilevel_menu_example/level2/level3/page1', - meta: { - title: '导航2-2', - }, - children: [ - { - path: 'page1', - name: 'multilevelMenuExample2-2-1', - component: () => import('@/views/multilevel_menu_example/level2/level3/page1.vue'), - meta: { - title: '导航2-2-1', - }, - }, - { - path: 'page2', - name: 'multilevelMenuExample2-2-2', - component: () => import('@/views/multilevel_menu_example/level2/level3/page2.vue'), - meta: { - title: '导航2-2-2', - }, - }, - ], - }, - ], - }, - ], -} - -export default routes diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts deleted file mode 100644 index e686132..0000000 --- a/src/router/modules/system.ts +++ /dev/null @@ -1,334 +0,0 @@ -import type { Route } from '@/global' - -const Layout = () => import('@/layouts/index.vue') - -const routes: Route.recordRaw[] = [ - { - path: '/system', - component: Layout, - redirect: '/system/area', - name: 'System', - meta: { - title: '系统设置', - icon: 'ep:key', - auth: '/system', - }, - children: [ - { - path: '/area', - component: Layout, - redirect: '/area/list', - name: 'AreaManage', - meta: { - title: '区域管理', - icon: 'ep:key', - auth: '/sys/area', - }, - children: [ - { - path: 'list', - name: 'AreaList', - component: () => import('@/views/system/area/listArea.vue'), - meta: { - title: '区域管理', - auth: '/sys/area', - sidebar: false, - breadcrumb: false, - activeMenu: '/area', - }, - }, - ], - }, - { - path: '/resource', - component: Layout, - redirect: '/resource/list', - name: 'ResourceManage', - meta: { - title: '资源管理', - icon: 'ep:key', - auth: '/sys/resource', - }, - children: [ - { - path: 'list', - name: 'ResourceList', - component: () => import('@/views/system/resource/listResource.vue'), - meta: { - title: '资源管理', - auth: '/sys/resource', - sidebar: false, - breadcrumb: false, - activeMenu: '/resource', - }, - }, - ], - }, - { - path: '/dept', - component: Layout, - redirect: '/dept/list', - name: 'DeptManage', - meta: { - title: '组织管理', - icon: 'ep:key', - auth: '/sys/dept', - }, - children: [ - { - path: 'list', - name: 'DeptList', - component: () => import('@/views/system/dept/listDept.vue'), - meta: { - title: '组织管理', - auth: '/sys/dept', - sidebar: false, - breadcrumb: false, - activeMenu: '/dept', - }, - }, - ], - }, - { - path: '/role', - component: Layout, - redirect: '/role/list', - name: 'RoleManage', - meta: { - title: '角色管理', - icon: 'ep:key', - auth: '/sys/role', - }, - children: [ - { - path: 'list', - name: 'RoleList', - component: () => import('@/views/system/role/listRole.vue'), - meta: { - title: '角色管理', - auth: '/sys/role', - sidebar: false, - breadcrumb: false, - activeMenu: '/role', - }, - }, - ], - }, - { - path: '/user', - component: Layout, - redirect: '/user/list', - name: 'UserManage', - meta: { - title: '用户管理', - icon: 'ep:key', - auth: '/sys/mgr', - }, - children: [ - { - path: 'list', - name: 'UserList', - component: () => import('@/views/system/user/listUser.vue'), - meta: { - title: '用户管理', - auth: '/sys/mgr', - sidebar: false, - breadcrumb: false, - activeMenu: '/user', - }, - }, - ], - }, - { - path: '/dict', - component: Layout, - redirect: '/dict/list', - name: 'DictManage', - meta: { - title: '字典管理', - icon: 'ep:key', - auth: '/sys/dict', - }, - children: [ - { - path: 'list', - name: 'DictList', - component: () => import('@/views/system/dict/listDict.vue'), - meta: { - title: '字典管理', - auth: '/sys/dict', - sidebar: false, - breadcrumb: false, - activeMenu: '/dict', - }, - }, - ], - }, - { - path: '/process', - component: Layout, - redirect: '/process/list', - name: 'Process', - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - }, - children: [ - { - path: 'list', - name: 'ProcessList', - component: () => import('@/views/system/process/process.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - sidebar: false, - breadcrumb: false, - activeMenu: '/process', - }, - }, - { - path: 'edit', - name: 'ProcessListEdit', - component: () => import('@/views/system/process/editProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - { - path: 'detail', - name: 'ProcessListDetail', - component: () => import('@/views/system/process/detailProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - { - path: 'add', - name: 'ProcessListAdd', - component: () => import('@/views/system/process/addProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - ], - }, - { - path: '/tenant', - component: Layout, - redirect: '/tenant/list', - name: 'TenantManage', - meta: { - title: '项目管理', - icon: 'ep:key', - auth: '/sys/tenantSys/list', - }, - children: [ - { - path: 'list', - name: 'TenantList', - component: () => import('@/views/system/tenant/list.tenant.vue'), - meta: { - title: '项目管理', - auth: '/sys/tenantSys/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/tenant', - }, - }, - ], - }, - { - path: '/businessLog', - component: Layout, - redirect: '/businessLog/list', - name: 'BusinessLog', - meta: { - title: '业务日志', - icon: 'ep:key', - auth: '/sys/log/biz/list', - }, - children: [ - { - path: 'list', - name: 'BusinessList', - component: () => import('@/views/system/log/listLog.vue'), - meta: { - title: '业务日志', - auth: '/sys/log/biz/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/businessLog', - }, - }, - ], - }, - { - path: '/error', - component: Layout, - redirect: '/error/list', - name: 'ErrorLog', - meta: { - title: '异常日志', - icon: 'ep:key', - auth: '/sys/log/error/list', - }, - children: [ - { - path: 'list', - name: 'ErrorList', - component: () => import('@/views/system/log/listErrorLog.vue'), - meta: { - title: '异常日志', - auth: '/sys/log/error/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/error', - }, - }, - ], - }, - { - path: '/loginDiary', - component: Layout, - redirect: '/loginDiary/list', - name: 'loginDiaryLog', - meta: { - title: '登录日志', - icon: 'ep:key', - auth: '/sys/loginLog', - }, - children: [ - { - path: 'list', - name: 'loginDiaryList', - component: () => import('@/views/system/log/LoginLog.vue'), - meta: { - title: '登录日志', - auth: '/sys/loginLog', - sidebar: false, - breadcrumb: false, - activeMenu: '/loginDiary', - }, - }, - ], - }], - }, - -] - -export default routes diff --git a/.env.development b/.env.development index 26837aa..f27d241 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ # VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 -VITE_APP_API_BASEURL = http://111.198.10.15:11638 +VITE_APP_API_BASEURL = http://111.198.10.15:11420 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.production b/.env.production index 7217090..c0534e5 100644 --- a/.env.production +++ b/.env.production @@ -3,7 +3,7 @@ # 页面标题 VITE_APP_TITLE = 行政问效综合评价平台 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:11638 +VITE_APP_API_BASEURL = http://111.198.10.15:11420 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 0acc3c5..bd6c64d 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:11638" + "baseUrl": "http://111.198.10.15:11420" } diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue index 3c4fe75..e2a3c90 100644 --- a/src/layouts/components/Topbar/index.vue +++ b/src/layouts/components/Topbar/index.vue @@ -61,7 +61,8 @@ - + + {{ item.title }} diff --git a/src/router/modules/common.ts b/src/router/modules/common.ts deleted file mode 100644 index 7957fe2..0000000 --- a/src/router/modules/common.ts +++ /dev/null @@ -1,321 +0,0 @@ -import type { Route } from '@/global' - -const Layout = () => import('@/layouts/index.vue') - -const routes: Route.recordRaw[] = [ - { - path: '/area', - component: Layout, - redirect: '/area/list', - name: 'AreaManage', - meta: { - title: '区域管理', - icon: 'ep:key', - auth: '/sys/area', - }, - children: [ - { - path: 'list', - name: 'AreaList', - component: () => import('@/views/system/area/listArea.vue'), - meta: { - title: '区域管理', - auth: '/sys/area', - sidebar: false, - breadcrumb: false, - activeMenu: '/area', - }, - }, - ], - }, - { - path: '/resource', - component: Layout, - redirect: '/resource/list', - name: 'ResourceManage', - meta: { - title: '资源管理', - icon: 'ep:key', - auth: '/sys/resource', - }, - children: [ - { - path: 'list', - name: 'ResourceList', - component: () => import('@/views/system/resource/listResource.vue'), - meta: { - title: '资源管理', - auth: '/sys/resource', - sidebar: false, - breadcrumb: false, - activeMenu: '/resource', - }, - }, - ], - }, - { - path: '/dept', - component: Layout, - redirect: '/dept/list', - name: 'DeptManage', - meta: { - title: '组织管理', - icon: 'ep:key', - auth: '/sys/dept', - }, - children: [ - { - path: 'list', - name: 'DeptList', - component: () => import('@/views/system/dept/listDept.vue'), - meta: { - title: '组织管理', - auth: '/sys/dept', - sidebar: false, - breadcrumb: false, - activeMenu: '/dept', - }, - }, - ], - }, - { - path: '/role', - component: Layout, - redirect: '/role/list', - name: 'RoleManage', - meta: { - title: '角色管理', - icon: 'ep:key', - auth: '/sys/role', - }, - children: [ - { - path: 'list', - name: 'RoleList', - component: () => import('@/views/system/role/listRole.vue'), - meta: { - title: '角色管理', - auth: '/sys/role', - sidebar: false, - breadcrumb: false, - activeMenu: '/role', - }, - }, - ], - }, - { - path: '/user', - component: Layout, - redirect: '/user/list', - name: 'UserManage', - meta: { - title: '用户管理', - icon: 'ep:key', - auth: '/sys/mgr', - }, - children: [ - { - path: 'list', - name: 'UserList', - component: () => import('@/views/system/user/listUser.vue'), - meta: { - title: '用户管理', - auth: '/sys/mgr', - sidebar: false, - breadcrumb: false, - activeMenu: '/user', - }, - }, - ], - }, - { - path: '/dict', - component: Layout, - redirect: '/dict/list', - name: 'DictManage', - meta: { - title: '字典管理', - icon: 'ep:key', - auth: '/sys/dict', - }, - children: [ - { - path: 'list', - name: 'DictList', - component: () => import('@/views/system/dict/listDict.vue'), - meta: { - title: '字典管理', - auth: '/sys/dict', - sidebar: false, - breadcrumb: false, - activeMenu: '/dict', - }, - }, - ], - }, - { - path: '/process', - component: Layout, - redirect: '/process/list', - name: 'Process', - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - }, - children: [ - { - path: 'list', - name: 'ProcessList', - component: () => import('@/views/system/process/process.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - sidebar: false, - breadcrumb: false, - activeMenu: '/process', - }, - }, - { - path: 'edit', - name: 'ProcessListEdit', - component: () => import('@/views/system/process/editProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - { - path: 'detail', - name: 'ProcessListDetail', - component: () => import('@/views/system/process/detailProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - { - path: 'add', - name: 'ProcessListAdd', - component: () => import('@/views/system/process/addProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - ], - }, - { - path: '/tenant', - component: Layout, - redirect: '/tenant/list', - name: 'TenantManage', - meta: { - title: '项目管理', - icon: 'ep:key', - auth: '/sys/tenantSys/list', - }, - children: [ - { - path: 'list', - name: 'TenantList', - component: () => import('@/views/system/tenant/list.tenant.vue'), - meta: { - title: '项目管理', - auth: '/sys/tenantSys/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/tenant', - }, - }, - ], - }, - { - path: '/businessLog', - component: Layout, - redirect: '/businessLog/list', - name: 'BusinessLog', - meta: { - title: '业务日志', - icon: 'ep:key', - auth: '/sys/log/biz/list', - }, - children: [ - { - path: 'list', - name: 'BusinessList', - component: () => import('@/views/system/log/listLog.vue'), - meta: { - title: '业务日志', - auth: '/sys/log/biz/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/businessLog', - }, - }, - ], - }, - { - path: '/error', - component: Layout, - redirect: '/error/list', - name: 'ErrorLog', - meta: { - title: '异常日志', - icon: 'ep:key', - auth: '/sys/log/error/list', - }, - children: [ - { - path: 'list', - name: 'ErrorList', - component: () => import('@/views/system/log/listErrorLog.vue'), - meta: { - title: '异常日志', - auth: '/sys/log/error/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/error', - }, - }, - ], - }, - { - path: '/loginDiary', - component: Layout, - redirect: '/loginDiary/list', - name: 'loginDiaryLog', - meta: { - title: '登录日志', - icon: 'ep:key', - auth: '/sys/loginLog', - }, - children: [ - { - path: 'list', - name: 'loginDiaryList', - component: () => import('@/views/system/log/LoginLog.vue'), - meta: { - title: '登录日志', - auth: '/sys/loginLog', - sidebar: false, - breadcrumb: false, - activeMenu: '/loginDiary', - }, - }, - ], - }, -] - -export default routes diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index 587eb68..046f9fe 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -12,6 +12,7 @@ meta: { title: '首页看板', icon: 'ep:key', + auth: '/dashboard', }, children: [ { @@ -24,6 +25,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/testeddashboard', + auth: '/dashboard', }, }, ], @@ -37,6 +39,7 @@ meta: { title: '考核规则管理', icon: 'ep:key', + auth: '/examine', }, children: [ { @@ -47,7 +50,7 @@ meta: { title: '考核等级评定', icon: 'ep:key', - // auth: '/sys/area', + auth: '/examine/grade', }, children: [ { @@ -56,7 +59,7 @@ component: () => import('@/views/rule/grade/index.vue'), meta: { title: '考核等级评定', - // auth: '/sys/area', + auth: '/examine/grade', sidebar: false, breadcrumb: false, activeMenu: '/grade', @@ -72,7 +75,7 @@ meta: { title: '考核指标管理', icon: 'ep:key', - // auth: '/sys/area', + auth: '/examine/proxy', }, children: [ { @@ -81,7 +84,7 @@ component: () => import('@/views/rule/proxy/index.vue'), meta: { title: '考核指标管理', - // auth: '/sys/area', + auth: '/examine/proxy', sidebar: false, breadcrumb: false, activeMenu: '/proxy', @@ -97,7 +100,7 @@ meta: { title: '考核方案管理', icon: 'ep:key', - // auth: '/sys/area', + auth: '/examine/programme', }, children: [ { @@ -106,7 +109,7 @@ component: () => import('@/views/rule/programme/index.vue'), meta: { title: '考核方案管理', - // auth: '/sys/area', + auth: '/examine/programme', sidebar: false, breadcrumb: false, activeMenu: '/programme', @@ -125,6 +128,7 @@ meta: { title: '考核填报', icon: 'ep:key', + auth: '/filling', }, children: [ { @@ -135,7 +139,7 @@ meta: { title: '待填报考核结果', icon: 'ep:key', - // auth: '/sys/area', + auth: '/filling/treat', }, children: [ { @@ -144,7 +148,7 @@ component: () => import('@/views/flling/treat/index.vue'), meta: { title: '待填报考核结果', - // auth: '/sys/area', + auth: '/filling/treat', sidebar: false, breadcrumb: false, activeMenu: '/treat', @@ -158,9 +162,9 @@ redirect: '/already/alreadylist', name: 'AlreadyManage', meta: { - title: '待填报考核结果', + title: '已填报考核结果', icon: 'ep:key', - // auth: '/sys/area', + auth: '/filling/already', }, children: [ { @@ -169,7 +173,7 @@ component: () => import('@/views/flling/already/index.vue'), meta: { title: '已填报考核结果', - // auth: '/sys/area', + auth: '/filling/already', sidebar: false, breadcrumb: false, activeMenu: '/already', @@ -188,6 +192,7 @@ meta: { title: '问效考核结果', icon: 'ep:key', + auth: '/efficiency', }, children: [ { @@ -198,7 +203,7 @@ meta: { title: '部门考核结果', icon: 'ep:key', - // auth: '/sys/area', + auth: '/efficiency/deptresult', }, children: [ { @@ -207,7 +212,7 @@ component: () => import('@/views/efficiency/dept/index.vue'), meta: { title: '部门考核结果', - // auth: '/sys/area', + auth: '/efficiency/deptresult', sidebar: false, breadcrumb: false, activeMenu: '/deptresult', @@ -221,9 +226,9 @@ redirect: '/analysis/analysislist', name: 'AnalysisResultManage', meta: { - title: '待填报考核结果', + title: '考核统计分析', icon: 'ep:key', - // auth: '/sys/area', + auth: '/efficiency/analysis', }, children: [ { @@ -232,7 +237,7 @@ component: () => import('@/views/efficiency/analysis/index.vue'), meta: { title: '考核统计分析', - // auth: '/sys/area', + auth: '/efficiency/analysis', sidebar: false, breadcrumb: false, activeMenu: '/analysis', @@ -251,6 +256,7 @@ meta: { title: '指标态势分析', icon: 'ep:key', + auth: '/proxy', }, children: [ { @@ -261,7 +267,7 @@ meta: { title: '预警结果列表', icon: 'ep:key', - // auth: '/sys/area', + auth: '/proxy/list', }, children: [ { @@ -270,7 +276,7 @@ component: () => import('@/views/proxy/list/index.vue'), meta: { title: '预警结果列表', - // auth: '/sys/area', + auth: '/proxy/list', sidebar: false, breadcrumb: false, activeMenu: '/list', @@ -286,7 +292,7 @@ meta: { title: '预警统计分析', icon: 'ep:key', - // auth: '/sys/area', + auth: '/proxy/analysiss', }, children: [ { @@ -295,7 +301,7 @@ component: () => import('@/views/proxy/analysis/index.vue'), meta: { title: '预警统计分析', - // auth: '/sys/area', + auth: '/proxy/analysiss', sidebar: false, breadcrumb: false, activeMenu: '/analysiss', @@ -314,6 +320,7 @@ meta: { title: '系统设置', icon: 'ep:key', + auth: '/system', }, children: [ { @@ -324,7 +331,7 @@ meta: { title: '区域管理', icon: 'ep:key', - // auth: '/sys/area', + auth: '/sys/area', }, children: [ { @@ -333,7 +340,7 @@ component: () => import('@/views/system/area/listArea.vue'), meta: { title: '区域管理', - // auth: '/sys/area', + auth: '/sys/area', sidebar: false, breadcrumb: false, activeMenu: '/area', @@ -349,7 +356,7 @@ meta: { title: '资源管理', icon: 'ep:key', - // auth: '/sys/resource', + auth: '/sys/resource', }, children: [ { @@ -358,7 +365,7 @@ component: () => import('@/views/system/resource/listResource.vue'), meta: { title: '资源管理', - // auth: '/sys/resource', + auth: '/sys/resource', sidebar: false, breadcrumb: false, activeMenu: '/resource', @@ -374,7 +381,7 @@ meta: { title: '组织管理', icon: 'ep:key', - // auth: '/sys/dept', + auth: '/sys/dept', }, children: [ { @@ -383,7 +390,7 @@ component: () => import('@/views/system/dept/listDept.vue'), meta: { title: '组织管理', - // auth: '/sys/dept', + auth: '/sys/dept', sidebar: false, breadcrumb: false, activeMenu: '/dept', @@ -399,7 +406,7 @@ meta: { title: '角色管理', icon: 'ep:key', - // auth: '/sys/role', + auth: '/sys/role', }, children: [ { @@ -408,7 +415,7 @@ component: () => import('@/views/system/role/listRole.vue'), meta: { title: '角色管理', - // auth: '/sys/role', + auth: '/sys/role', sidebar: false, breadcrumb: false, activeMenu: '/role', @@ -424,7 +431,7 @@ meta: { title: '用户管理', icon: 'ep:key', - // auth: '/sys/mgr', + auth: '/sys/mgr', }, children: [ { @@ -433,7 +440,7 @@ component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', - // auth: '/sys/mgr', + auth: '/sys/mgr', sidebar: false, breadcrumb: false, activeMenu: '/user', @@ -449,7 +456,7 @@ meta: { title: '字典管理', icon: 'ep:key', - // auth: '/sys/dict', + auth: '/sys/dict', }, children: [ { @@ -458,7 +465,7 @@ component: () => import('@/views/system/dict/listDict.vue'), meta: { title: '字典管理', - // auth: '/sys/dict', + auth: '/sys/dict', sidebar: false, breadcrumb: false, activeMenu: '/dict', @@ -474,7 +481,7 @@ meta: { title: '业务日志', icon: 'ep:key', - // auth: '/sys/log/biz/list', + auth: '/sys/log/biz/list', }, children: [ { @@ -483,7 +490,7 @@ component: () => import('@/views/system/log/listLog.vue'), meta: { title: '业务日志', - // auth: '/sys/log/biz/list', + auth: '/sys/log/biz/list', sidebar: false, breadcrumb: false, activeMenu: '/businessLog', @@ -499,7 +506,7 @@ meta: { title: '异常日志', icon: 'ep:key', - // auth: '/sys/log/error/list', + auth: '/sys/log/error/list', }, children: [ { @@ -508,7 +515,7 @@ component: () => import('@/views/system/log/listErrorLog.vue'), meta: { title: '异常日志', - // auth: '/sys/log/error/list', + auth: '/sys/log/error/list', sidebar: false, breadcrumb: false, activeMenu: '/error', @@ -524,7 +531,7 @@ meta: { title: '登录日志', icon: 'ep:key', - // auth: '/sys/loginLog', + auth: '/sys/loginLog', }, children: [ { @@ -533,7 +540,7 @@ component: () => import('@/views/system/log/LoginLog.vue'), meta: { title: '登录日志', - // auth: '/sys/loginLog', + auth: '/sys/loginLog', sidebar: false, breadcrumb: false, activeMenu: '/loginDiary', diff --git a/src/router/modules/multilevel.menu.example.ts b/src/router/modules/multilevel.menu.example.ts deleted file mode 100644 index 75f3eb3..0000000 --- a/src/router/modules/multilevel.menu.example.ts +++ /dev/null @@ -1,70 +0,0 @@ -import type { Route } from '@/global' - -const Layout = () => import('@/layouts/index.vue') - -const routes: Route.recordRaw = { - path: '/multilevel_menu_example', - component: Layout, - redirect: '/multilevel_menu_example/page', - name: 'multilevelMenuExample', - meta: { - title: '多级导航', - icon: 'sidebar-menu', - }, - children: [ - { - path: 'page', - name: 'multilevelMenuExample1', - component: () => import('@/views/multilevel_menu_example/page.vue'), - meta: { - title: '导航1', - }, - }, - { - path: 'level2', - name: 'multilevelMenuExample2', - redirect: '/multilevel_menu_example/level2/page', - meta: { - title: '导航2', - }, - children: [ - { - path: 'page', - name: 'multilevelMenuExample2-1', - component: () => import('@/views/multilevel_menu_example/level2/page.vue'), - meta: { - title: '导航2-1', - }, - }, - { - path: 'level3', - name: 'multilevelMenuExample2-2', - redirect: '/multilevel_menu_example/level2/level3/page1', - meta: { - title: '导航2-2', - }, - children: [ - { - path: 'page1', - name: 'multilevelMenuExample2-2-1', - component: () => import('@/views/multilevel_menu_example/level2/level3/page1.vue'), - meta: { - title: '导航2-2-1', - }, - }, - { - path: 'page2', - name: 'multilevelMenuExample2-2-2', - component: () => import('@/views/multilevel_menu_example/level2/level3/page2.vue'), - meta: { - title: '导航2-2-2', - }, - }, - ], - }, - ], - }, - ], -} - -export default routes diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts deleted file mode 100644 index e686132..0000000 --- a/src/router/modules/system.ts +++ /dev/null @@ -1,334 +0,0 @@ -import type { Route } from '@/global' - -const Layout = () => import('@/layouts/index.vue') - -const routes: Route.recordRaw[] = [ - { - path: '/system', - component: Layout, - redirect: '/system/area', - name: 'System', - meta: { - title: '系统设置', - icon: 'ep:key', - auth: '/system', - }, - children: [ - { - path: '/area', - component: Layout, - redirect: '/area/list', - name: 'AreaManage', - meta: { - title: '区域管理', - icon: 'ep:key', - auth: '/sys/area', - }, - children: [ - { - path: 'list', - name: 'AreaList', - component: () => import('@/views/system/area/listArea.vue'), - meta: { - title: '区域管理', - auth: '/sys/area', - sidebar: false, - breadcrumb: false, - activeMenu: '/area', - }, - }, - ], - }, - { - path: '/resource', - component: Layout, - redirect: '/resource/list', - name: 'ResourceManage', - meta: { - title: '资源管理', - icon: 'ep:key', - auth: '/sys/resource', - }, - children: [ - { - path: 'list', - name: 'ResourceList', - component: () => import('@/views/system/resource/listResource.vue'), - meta: { - title: '资源管理', - auth: '/sys/resource', - sidebar: false, - breadcrumb: false, - activeMenu: '/resource', - }, - }, - ], - }, - { - path: '/dept', - component: Layout, - redirect: '/dept/list', - name: 'DeptManage', - meta: { - title: '组织管理', - icon: 'ep:key', - auth: '/sys/dept', - }, - children: [ - { - path: 'list', - name: 'DeptList', - component: () => import('@/views/system/dept/listDept.vue'), - meta: { - title: '组织管理', - auth: '/sys/dept', - sidebar: false, - breadcrumb: false, - activeMenu: '/dept', - }, - }, - ], - }, - { - path: '/role', - component: Layout, - redirect: '/role/list', - name: 'RoleManage', - meta: { - title: '角色管理', - icon: 'ep:key', - auth: '/sys/role', - }, - children: [ - { - path: 'list', - name: 'RoleList', - component: () => import('@/views/system/role/listRole.vue'), - meta: { - title: '角色管理', - auth: '/sys/role', - sidebar: false, - breadcrumb: false, - activeMenu: '/role', - }, - }, - ], - }, - { - path: '/user', - component: Layout, - redirect: '/user/list', - name: 'UserManage', - meta: { - title: '用户管理', - icon: 'ep:key', - auth: '/sys/mgr', - }, - children: [ - { - path: 'list', - name: 'UserList', - component: () => import('@/views/system/user/listUser.vue'), - meta: { - title: '用户管理', - auth: '/sys/mgr', - sidebar: false, - breadcrumb: false, - activeMenu: '/user', - }, - }, - ], - }, - { - path: '/dict', - component: Layout, - redirect: '/dict/list', - name: 'DictManage', - meta: { - title: '字典管理', - icon: 'ep:key', - auth: '/sys/dict', - }, - children: [ - { - path: 'list', - name: 'DictList', - component: () => import('@/views/system/dict/listDict.vue'), - meta: { - title: '字典管理', - auth: '/sys/dict', - sidebar: false, - breadcrumb: false, - activeMenu: '/dict', - }, - }, - ], - }, - { - path: '/process', - component: Layout, - redirect: '/process/list', - name: 'Process', - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - }, - children: [ - { - path: 'list', - name: 'ProcessList', - component: () => import('@/views/system/process/process.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - sidebar: false, - breadcrumb: false, - activeMenu: '/process', - }, - }, - { - path: 'edit', - name: 'ProcessListEdit', - component: () => import('@/views/system/process/editProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - { - path: 'detail', - name: 'ProcessListDetail', - component: () => import('@/views/system/process/detailProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - { - path: 'add', - name: 'ProcessListAdd', - component: () => import('@/views/system/process/addProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - ], - }, - { - path: '/tenant', - component: Layout, - redirect: '/tenant/list', - name: 'TenantManage', - meta: { - title: '项目管理', - icon: 'ep:key', - auth: '/sys/tenantSys/list', - }, - children: [ - { - path: 'list', - name: 'TenantList', - component: () => import('@/views/system/tenant/list.tenant.vue'), - meta: { - title: '项目管理', - auth: '/sys/tenantSys/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/tenant', - }, - }, - ], - }, - { - path: '/businessLog', - component: Layout, - redirect: '/businessLog/list', - name: 'BusinessLog', - meta: { - title: '业务日志', - icon: 'ep:key', - auth: '/sys/log/biz/list', - }, - children: [ - { - path: 'list', - name: 'BusinessList', - component: () => import('@/views/system/log/listLog.vue'), - meta: { - title: '业务日志', - auth: '/sys/log/biz/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/businessLog', - }, - }, - ], - }, - { - path: '/error', - component: Layout, - redirect: '/error/list', - name: 'ErrorLog', - meta: { - title: '异常日志', - icon: 'ep:key', - auth: '/sys/log/error/list', - }, - children: [ - { - path: 'list', - name: 'ErrorList', - component: () => import('@/views/system/log/listErrorLog.vue'), - meta: { - title: '异常日志', - auth: '/sys/log/error/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/error', - }, - }, - ], - }, - { - path: '/loginDiary', - component: Layout, - redirect: '/loginDiary/list', - name: 'loginDiaryLog', - meta: { - title: '登录日志', - icon: 'ep:key', - auth: '/sys/loginLog', - }, - children: [ - { - path: 'list', - name: 'loginDiaryList', - component: () => import('@/views/system/log/LoginLog.vue'), - meta: { - title: '登录日志', - auth: '/sys/loginLog', - sidebar: false, - breadcrumb: false, - activeMenu: '/loginDiary', - }, - }, - ], - }], - }, - -] - -export default routes diff --git a/src/router/routes.ts b/src/router/routes.ts index 4bdf999..3006ffe 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -1,6 +1,5 @@ import { setupLayouts } from 'virtual:generated-layouts' import generatedRoutes from 'virtual:generated-pages' -import commonRoute from './modules/common' import pageRoute from './modules/home' import type { Route } from '@/global' import useSettingsStore from '@/store/modules/settings' @@ -15,14 +14,6 @@ }, }, { - path: '/index', - name: 'index', - component: () => import('@/views/dashboard.vue'), - meta: { - title: '子系统列表', - }, - }, - { path: '/login', name: 'login', component: () => import('@/views/login.vue'), @@ -112,46 +103,15 @@ // 动态路由（异步路由、导航栏路由） const asyncRoutes: Route.recordMainRaw[] = [ - // { - // meta: { - // title: '计量业务管理系统', - // icon: '', - // auth: '/metering/index', - // }, - // children: [ - // ...meterRoute, - // ], - // }, { meta: { title: '', icon: '', - // auth: '/tested/index', }, children: [ ...pageRoute, ], }, - // { - // meta: { - // title: '实验室环境监控系统', - // icon: '', - // auth: '/laboratory/index', - // }, - // children: [ - // ...laboratoryRoute, - // ], - // }, - { - meta: { - title: '通用设置', - icon: '', - auth: '/common/index', - }, - children: [ - ...commonRoute, - ], - }, ] const constantRoutesByFilesystem = generatedRoutes.filter((item) => { diff --git a/.env.development b/.env.development index 26837aa..f27d241 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ # VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 -VITE_APP_API_BASEURL = http://111.198.10.15:11638 +VITE_APP_API_BASEURL = http://111.198.10.15:11420 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.production b/.env.production index 7217090..c0534e5 100644 --- a/.env.production +++ b/.env.production @@ -3,7 +3,7 @@ # 页面标题 VITE_APP_TITLE = 行政问效综合评价平台 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:11638 +VITE_APP_API_BASEURL = http://111.198.10.15:11420 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 0acc3c5..bd6c64d 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:11638" + "baseUrl": "http://111.198.10.15:11420" } diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue index 3c4fe75..e2a3c90 100644 --- a/src/layouts/components/Topbar/index.vue +++ b/src/layouts/components/Topbar/index.vue @@ -61,7 +61,8 @@ - + + {{ item.title }} diff --git a/src/router/modules/common.ts b/src/router/modules/common.ts deleted file mode 100644 index 7957fe2..0000000 --- a/src/router/modules/common.ts +++ /dev/null @@ -1,321 +0,0 @@ -import type { Route } from '@/global' - -const Layout = () => import('@/layouts/index.vue') - -const routes: Route.recordRaw[] = [ - { - path: '/area', - component: Layout, - redirect: '/area/list', - name: 'AreaManage', - meta: { - title: '区域管理', - icon: 'ep:key', - auth: '/sys/area', - }, - children: [ - { - path: 'list', - name: 'AreaList', - component: () => import('@/views/system/area/listArea.vue'), - meta: { - title: '区域管理', - auth: '/sys/area', - sidebar: false, - breadcrumb: false, - activeMenu: '/area', - }, - }, - ], - }, - { - path: '/resource', - component: Layout, - redirect: '/resource/list', - name: 'ResourceManage', - meta: { - title: '资源管理', - icon: 'ep:key', - auth: '/sys/resource', - }, - children: [ - { - path: 'list', - name: 'ResourceList', - component: () => import('@/views/system/resource/listResource.vue'), - meta: { - title: '资源管理', - auth: '/sys/resource', - sidebar: false, - breadcrumb: false, - activeMenu: '/resource', - }, - }, - ], - }, - { - path: '/dept', - component: Layout, - redirect: '/dept/list', - name: 'DeptManage', - meta: { - title: '组织管理', - icon: 'ep:key', - auth: '/sys/dept', - }, - children: [ - { - path: 'list', - name: 'DeptList', - component: () => import('@/views/system/dept/listDept.vue'), - meta: { - title: '组织管理', - auth: '/sys/dept', - sidebar: false, - breadcrumb: false, - activeMenu: '/dept', - }, - }, - ], - }, - { - path: '/role', - component: Layout, - redirect: '/role/list', - name: 'RoleManage', - meta: { - title: '角色管理', - icon: 'ep:key', - auth: '/sys/role', - }, - children: [ - { - path: 'list', - name: 'RoleList', - component: () => import('@/views/system/role/listRole.vue'), - meta: { - title: '角色管理', - auth: '/sys/role', - sidebar: false, - breadcrumb: false, - activeMenu: '/role', - }, - }, - ], - }, - { - path: '/user', - component: Layout, - redirect: '/user/list', - name: 'UserManage', - meta: { - title: '用户管理', - icon: 'ep:key', - auth: '/sys/mgr', - }, - children: [ - { - path: 'list', - name: 'UserList', - component: () => import('@/views/system/user/listUser.vue'), - meta: { - title: '用户管理', - auth: '/sys/mgr', - sidebar: false, - breadcrumb: false, - activeMenu: '/user', - }, - }, - ], - }, - { - path: '/dict', - component: Layout, - redirect: '/dict/list', - name: 'DictManage', - meta: { - title: '字典管理', - icon: 'ep:key', - auth: '/sys/dict', - }, - children: [ - { - path: 'list', - name: 'DictList', - component: () => import('@/views/system/dict/listDict.vue'), - meta: { - title: '字典管理', - auth: '/sys/dict', - sidebar: false, - breadcrumb: false, - activeMenu: '/dict', - }, - }, - ], - }, - { - path: '/process', - component: Layout, - redirect: '/process/list', - name: 'Process', - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - }, - children: [ - { - path: 'list', - name: 'ProcessList', - component: () => import('@/views/system/process/process.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - sidebar: false, - breadcrumb: false, - activeMenu: '/process', - }, - }, - { - path: 'edit', - name: 'ProcessListEdit', - component: () => import('@/views/system/process/editProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - { - path: 'detail', - name: 'ProcessListDetail', - component: () => import('@/views/system/process/detailProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - { - path: 'add', - name: 'ProcessListAdd', - component: () => import('@/views/system/process/addProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - ], - }, - { - path: '/tenant', - component: Layout, - redirect: '/tenant/list', - name: 'TenantManage', - meta: { - title: '项目管理', - icon: 'ep:key', - auth: '/sys/tenantSys/list', - }, - children: [ - { - path: 'list', - name: 'TenantList', - component: () => import('@/views/system/tenant/list.tenant.vue'), - meta: { - title: '项目管理', - auth: '/sys/tenantSys/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/tenant', - }, - }, - ], - }, - { - path: '/businessLog', - component: Layout, - redirect: '/businessLog/list', - name: 'BusinessLog', - meta: { - title: '业务日志', - icon: 'ep:key', - auth: '/sys/log/biz/list', - }, - children: [ - { - path: 'list', - name: 'BusinessList', - component: () => import('@/views/system/log/listLog.vue'), - meta: { - title: '业务日志', - auth: '/sys/log/biz/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/businessLog', - }, - }, - ], - }, - { - path: '/error', - component: Layout, - redirect: '/error/list', - name: 'ErrorLog', - meta: { - title: '异常日志', - icon: 'ep:key', - auth: '/sys/log/error/list', - }, - children: [ - { - path: 'list', - name: 'ErrorList', - component: () => import('@/views/system/log/listErrorLog.vue'), - meta: { - title: '异常日志', - auth: '/sys/log/error/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/error', - }, - }, - ], - }, - { - path: '/loginDiary', - component: Layout, - redirect: '/loginDiary/list', - name: 'loginDiaryLog', - meta: { - title: '登录日志', - icon: 'ep:key', - auth: '/sys/loginLog', - }, - children: [ - { - path: 'list', - name: 'loginDiaryList', - component: () => import('@/views/system/log/LoginLog.vue'), - meta: { - title: '登录日志', - auth: '/sys/loginLog', - sidebar: false, - breadcrumb: false, - activeMenu: '/loginDiary', - }, - }, - ], - }, -] - -export default routes diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index 587eb68..046f9fe 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -12,6 +12,7 @@ meta: { title: '首页看板', icon: 'ep:key', + auth: '/dashboard', }, children: [ { @@ -24,6 +25,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/testeddashboard', + auth: '/dashboard', }, }, ], @@ -37,6 +39,7 @@ meta: { title: '考核规则管理', icon: 'ep:key', + auth: '/examine', }, children: [ { @@ -47,7 +50,7 @@ meta: { title: '考核等级评定', icon: 'ep:key', - // auth: '/sys/area', + auth: '/examine/grade', }, children: [ { @@ -56,7 +59,7 @@ component: () => import('@/views/rule/grade/index.vue'), meta: { title: '考核等级评定', - // auth: '/sys/area', + auth: '/examine/grade', sidebar: false, breadcrumb: false, activeMenu: '/grade', @@ -72,7 +75,7 @@ meta: { title: '考核指标管理', icon: 'ep:key', - // auth: '/sys/area', + auth: '/examine/proxy', }, children: [ { @@ -81,7 +84,7 @@ component: () => import('@/views/rule/proxy/index.vue'), meta: { title: '考核指标管理', - // auth: '/sys/area', + auth: '/examine/proxy', sidebar: false, breadcrumb: false, activeMenu: '/proxy', @@ -97,7 +100,7 @@ meta: { title: '考核方案管理', icon: 'ep:key', - // auth: '/sys/area', + auth: '/examine/programme', }, children: [ { @@ -106,7 +109,7 @@ component: () => import('@/views/rule/programme/index.vue'), meta: { title: '考核方案管理', - // auth: '/sys/area', + auth: '/examine/programme', sidebar: false, breadcrumb: false, activeMenu: '/programme', @@ -125,6 +128,7 @@ meta: { title: '考核填报', icon: 'ep:key', + auth: '/filling', }, children: [ { @@ -135,7 +139,7 @@ meta: { title: '待填报考核结果', icon: 'ep:key', - // auth: '/sys/area', + auth: '/filling/treat', }, children: [ { @@ -144,7 +148,7 @@ component: () => import('@/views/flling/treat/index.vue'), meta: { title: '待填报考核结果', - // auth: '/sys/area', + auth: '/filling/treat', sidebar: false, breadcrumb: false, activeMenu: '/treat', @@ -158,9 +162,9 @@ redirect: '/already/alreadylist', name: 'AlreadyManage', meta: { - title: '待填报考核结果', + title: '已填报考核结果', icon: 'ep:key', - // auth: '/sys/area', + auth: '/filling/already', }, children: [ { @@ -169,7 +173,7 @@ component: () => import('@/views/flling/already/index.vue'), meta: { title: '已填报考核结果', - // auth: '/sys/area', + auth: '/filling/already', sidebar: false, breadcrumb: false, activeMenu: '/already', @@ -188,6 +192,7 @@ meta: { title: '问效考核结果', icon: 'ep:key', + auth: '/efficiency', }, children: [ { @@ -198,7 +203,7 @@ meta: { title: '部门考核结果', icon: 'ep:key', - // auth: '/sys/area', + auth: '/efficiency/deptresult', }, children: [ { @@ -207,7 +212,7 @@ component: () => import('@/views/efficiency/dept/index.vue'), meta: { title: '部门考核结果', - // auth: '/sys/area', + auth: '/efficiency/deptresult', sidebar: false, breadcrumb: false, activeMenu: '/deptresult', @@ -221,9 +226,9 @@ redirect: '/analysis/analysislist', name: 'AnalysisResultManage', meta: { - title: '待填报考核结果', + title: '考核统计分析', icon: 'ep:key', - // auth: '/sys/area', + auth: '/efficiency/analysis', }, children: [ { @@ -232,7 +237,7 @@ component: () => import('@/views/efficiency/analysis/index.vue'), meta: { title: '考核统计分析', - // auth: '/sys/area', + auth: '/efficiency/analysis', sidebar: false, breadcrumb: false, activeMenu: '/analysis', @@ -251,6 +256,7 @@ meta: { title: '指标态势分析', icon: 'ep:key', + auth: '/proxy', }, children: [ { @@ -261,7 +267,7 @@ meta: { title: '预警结果列表', icon: 'ep:key', - // auth: '/sys/area', + auth: '/proxy/list', }, children: [ { @@ -270,7 +276,7 @@ component: () => import('@/views/proxy/list/index.vue'), meta: { title: '预警结果列表', - // auth: '/sys/area', + auth: '/proxy/list', sidebar: false, breadcrumb: false, activeMenu: '/list', @@ -286,7 +292,7 @@ meta: { title: '预警统计分析', icon: 'ep:key', - // auth: '/sys/area', + auth: '/proxy/analysiss', }, children: [ { @@ -295,7 +301,7 @@ component: () => import('@/views/proxy/analysis/index.vue'), meta: { title: '预警统计分析', - // auth: '/sys/area', + auth: '/proxy/analysiss', sidebar: false, breadcrumb: false, activeMenu: '/analysiss', @@ -314,6 +320,7 @@ meta: { title: '系统设置', icon: 'ep:key', + auth: '/system', }, children: [ { @@ -324,7 +331,7 @@ meta: { title: '区域管理', icon: 'ep:key', - // auth: '/sys/area', + auth: '/sys/area', }, children: [ { @@ -333,7 +340,7 @@ component: () => import('@/views/system/area/listArea.vue'), meta: { title: '区域管理', - // auth: '/sys/area', + auth: '/sys/area', sidebar: false, breadcrumb: false, activeMenu: '/area', @@ -349,7 +356,7 @@ meta: { title: '资源管理', icon: 'ep:key', - // auth: '/sys/resource', + auth: '/sys/resource', }, children: [ { @@ -358,7 +365,7 @@ component: () => import('@/views/system/resource/listResource.vue'), meta: { title: '资源管理', - // auth: '/sys/resource', + auth: '/sys/resource', sidebar: false, breadcrumb: false, activeMenu: '/resource', @@ -374,7 +381,7 @@ meta: { title: '组织管理', icon: 'ep:key', - // auth: '/sys/dept', + auth: '/sys/dept', }, children: [ { @@ -383,7 +390,7 @@ component: () => import('@/views/system/dept/listDept.vue'), meta: { title: '组织管理', - // auth: '/sys/dept', + auth: '/sys/dept', sidebar: false, breadcrumb: false, activeMenu: '/dept', @@ -399,7 +406,7 @@ meta: { title: '角色管理', icon: 'ep:key', - // auth: '/sys/role', + auth: '/sys/role', }, children: [ { @@ -408,7 +415,7 @@ component: () => import('@/views/system/role/listRole.vue'), meta: { title: '角色管理', - // auth: '/sys/role', + auth: '/sys/role', sidebar: false, breadcrumb: false, activeMenu: '/role', @@ -424,7 +431,7 @@ meta: { title: '用户管理', icon: 'ep:key', - // auth: '/sys/mgr', + auth: '/sys/mgr', }, children: [ { @@ -433,7 +440,7 @@ component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', - // auth: '/sys/mgr', + auth: '/sys/mgr', sidebar: false, breadcrumb: false, activeMenu: '/user', @@ -449,7 +456,7 @@ meta: { title: '字典管理', icon: 'ep:key', - // auth: '/sys/dict', + auth: '/sys/dict', }, children: [ { @@ -458,7 +465,7 @@ component: () => import('@/views/system/dict/listDict.vue'), meta: { title: '字典管理', - // auth: '/sys/dict', + auth: '/sys/dict', sidebar: false, breadcrumb: false, activeMenu: '/dict', @@ -474,7 +481,7 @@ meta: { title: '业务日志', icon: 'ep:key', - // auth: '/sys/log/biz/list', + auth: '/sys/log/biz/list', }, children: [ { @@ -483,7 +490,7 @@ component: () => import('@/views/system/log/listLog.vue'), meta: { title: '业务日志', - // auth: '/sys/log/biz/list', + auth: '/sys/log/biz/list', sidebar: false, breadcrumb: false, activeMenu: '/businessLog', @@ -499,7 +506,7 @@ meta: { title: '异常日志', icon: 'ep:key', - // auth: '/sys/log/error/list', + auth: '/sys/log/error/list', }, children: [ { @@ -508,7 +515,7 @@ component: () => import('@/views/system/log/listErrorLog.vue'), meta: { title: '异常日志', - // auth: '/sys/log/error/list', + auth: '/sys/log/error/list', sidebar: false, breadcrumb: false, activeMenu: '/error', @@ -524,7 +531,7 @@ meta: { title: '登录日志', icon: 'ep:key', - // auth: '/sys/loginLog', + auth: '/sys/loginLog', }, children: [ { @@ -533,7 +540,7 @@ component: () => import('@/views/system/log/LoginLog.vue'), meta: { title: '登录日志', - // auth: '/sys/loginLog', + auth: '/sys/loginLog', sidebar: false, breadcrumb: false, activeMenu: '/loginDiary', diff --git a/src/router/modules/multilevel.menu.example.ts b/src/router/modules/multilevel.menu.example.ts deleted file mode 100644 index 75f3eb3..0000000 --- a/src/router/modules/multilevel.menu.example.ts +++ /dev/null @@ -1,70 +0,0 @@ -import type { Route } from '@/global' - -const Layout = () => import('@/layouts/index.vue') - -const routes: Route.recordRaw = { - path: '/multilevel_menu_example', - component: Layout, - redirect: '/multilevel_menu_example/page', - name: 'multilevelMenuExample', - meta: { - title: '多级导航', - icon: 'sidebar-menu', - }, - children: [ - { - path: 'page', - name: 'multilevelMenuExample1', - component: () => import('@/views/multilevel_menu_example/page.vue'), - meta: { - title: '导航1', - }, - }, - { - path: 'level2', - name: 'multilevelMenuExample2', - redirect: '/multilevel_menu_example/level2/page', - meta: { - title: '导航2', - }, - children: [ - { - path: 'page', - name: 'multilevelMenuExample2-1', - component: () => import('@/views/multilevel_menu_example/level2/page.vue'), - meta: { - title: '导航2-1', - }, - }, - { - path: 'level3', - name: 'multilevelMenuExample2-2', - redirect: '/multilevel_menu_example/level2/level3/page1', - meta: { - title: '导航2-2', - }, - children: [ - { - path: 'page1', - name: 'multilevelMenuExample2-2-1', - component: () => import('@/views/multilevel_menu_example/level2/level3/page1.vue'), - meta: { - title: '导航2-2-1', - }, - }, - { - path: 'page2', - name: 'multilevelMenuExample2-2-2', - component: () => import('@/views/multilevel_menu_example/level2/level3/page2.vue'), - meta: { - title: '导航2-2-2', - }, - }, - ], - }, - ], - }, - ], -} - -export default routes diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts deleted file mode 100644 index e686132..0000000 --- a/src/router/modules/system.ts +++ /dev/null @@ -1,334 +0,0 @@ -import type { Route } from '@/global' - -const Layout = () => import('@/layouts/index.vue') - -const routes: Route.recordRaw[] = [ - { - path: '/system', - component: Layout, - redirect: '/system/area', - name: 'System', - meta: { - title: '系统设置', - icon: 'ep:key', - auth: '/system', - }, - children: [ - { - path: '/area', - component: Layout, - redirect: '/area/list', - name: 'AreaManage', - meta: { - title: '区域管理', - icon: 'ep:key', - auth: '/sys/area', - }, - children: [ - { - path: 'list', - name: 'AreaList', - component: () => import('@/views/system/area/listArea.vue'), - meta: { - title: '区域管理', - auth: '/sys/area', - sidebar: false, - breadcrumb: false, - activeMenu: '/area', - }, - }, - ], - }, - { - path: '/resource', - component: Layout, - redirect: '/resource/list', - name: 'ResourceManage', - meta: { - title: '资源管理', - icon: 'ep:key', - auth: '/sys/resource', - }, - children: [ - { - path: 'list', - name: 'ResourceList', - component: () => import('@/views/system/resource/listResource.vue'), - meta: { - title: '资源管理', - auth: '/sys/resource', - sidebar: false, - breadcrumb: false, - activeMenu: '/resource', - }, - }, - ], - }, - { - path: '/dept', - component: Layout, - redirect: '/dept/list', - name: 'DeptManage', - meta: { - title: '组织管理', - icon: 'ep:key', - auth: '/sys/dept', - }, - children: [ - { - path: 'list', - name: 'DeptList', - component: () => import('@/views/system/dept/listDept.vue'), - meta: { - title: '组织管理', - auth: '/sys/dept', - sidebar: false, - breadcrumb: false, - activeMenu: '/dept', - }, - }, - ], - }, - { - path: '/role', - component: Layout, - redirect: '/role/list', - name: 'RoleManage', - meta: { - title: '角色管理', - icon: 'ep:key', - auth: '/sys/role', - }, - children: [ - { - path: 'list', - name: 'RoleList', - component: () => import('@/views/system/role/listRole.vue'), - meta: { - title: '角色管理', - auth: '/sys/role', - sidebar: false, - breadcrumb: false, - activeMenu: '/role', - }, - }, - ], - }, - { - path: '/user', - component: Layout, - redirect: '/user/list', - name: 'UserManage', - meta: { - title: '用户管理', - icon: 'ep:key', - auth: '/sys/mgr', - }, - children: [ - { - path: 'list', - name: 'UserList', - component: () => import('@/views/system/user/listUser.vue'), - meta: { - title: '用户管理', - auth: '/sys/mgr', - sidebar: false, - breadcrumb: false, - activeMenu: '/user', - }, - }, - ], - }, - { - path: '/dict', - component: Layout, - redirect: '/dict/list', - name: 'DictManage', - meta: { - title: '字典管理', - icon: 'ep:key', - auth: '/sys/dict', - }, - children: [ - { - path: 'list', - name: 'DictList', - component: () => import('@/views/system/dict/listDict.vue'), - meta: { - title: '字典管理', - auth: '/sys/dict', - sidebar: false, - breadcrumb: false, - activeMenu: '/dict', - }, - }, - ], - }, - { - path: '/process', - component: Layout, - redirect: '/process/list', - name: 'Process', - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - }, - children: [ - { - path: 'list', - name: 'ProcessList', - component: () => import('@/views/system/process/process.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - sidebar: false, - breadcrumb: false, - activeMenu: '/process', - }, - }, - { - path: 'edit', - name: 'ProcessListEdit', - component: () => import('@/views/system/process/editProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - { - path: 'detail', - name: 'ProcessListDetail', - component: () => import('@/views/system/process/detailProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - { - path: 'add', - name: 'ProcessListAdd', - component: () => import('@/views/system/process/addProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - ], - }, - { - path: '/tenant', - component: Layout, - redirect: '/tenant/list', - name: 'TenantManage', - meta: { - title: '项目管理', - icon: 'ep:key', - auth: '/sys/tenantSys/list', - }, - children: [ - { - path: 'list', - name: 'TenantList', - component: () => import('@/views/system/tenant/list.tenant.vue'), - meta: { - title: '项目管理', - auth: '/sys/tenantSys/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/tenant', - }, - }, - ], - }, - { - path: '/businessLog', - component: Layout, - redirect: '/businessLog/list', - name: 'BusinessLog', - meta: { - title: '业务日志', - icon: 'ep:key', - auth: '/sys/log/biz/list', - }, - children: [ - { - path: 'list', - name: 'BusinessList', - component: () => import('@/views/system/log/listLog.vue'), - meta: { - title: '业务日志', - auth: '/sys/log/biz/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/businessLog', - }, - }, - ], - }, - { - path: '/error', - component: Layout, - redirect: '/error/list', - name: 'ErrorLog', - meta: { - title: '异常日志', - icon: 'ep:key', - auth: '/sys/log/error/list', - }, - children: [ - { - path: 'list', - name: 'ErrorList', - component: () => import('@/views/system/log/listErrorLog.vue'), - meta: { - title: '异常日志', - auth: '/sys/log/error/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/error', - }, - }, - ], - }, - { - path: '/loginDiary', - component: Layout, - redirect: '/loginDiary/list', - name: 'loginDiaryLog', - meta: { - title: '登录日志', - icon: 'ep:key', - auth: '/sys/loginLog', - }, - children: [ - { - path: 'list', - name: 'loginDiaryList', - component: () => import('@/views/system/log/LoginLog.vue'), - meta: { - title: '登录日志', - auth: '/sys/loginLog', - sidebar: false, - breadcrumb: false, - activeMenu: '/loginDiary', - }, - }, - ], - }], - }, - -] - -export default routes diff --git a/src/router/routes.ts b/src/router/routes.ts index 4bdf999..3006ffe 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -1,6 +1,5 @@ import { setupLayouts } from 'virtual:generated-layouts' import generatedRoutes from 'virtual:generated-pages' -import commonRoute from './modules/common' import pageRoute from './modules/home' import type { Route } from '@/global' import useSettingsStore from '@/store/modules/settings' @@ -15,14 +14,6 @@ }, }, { - path: '/index', - name: 'index', - component: () => import('@/views/dashboard.vue'), - meta: { - title: '子系统列表', - }, - }, - { path: '/login', name: 'login', component: () => import('@/views/login.vue'), @@ -112,46 +103,15 @@ // 动态路由（异步路由、导航栏路由） const asyncRoutes: Route.recordMainRaw[] = [ - // { - // meta: { - // title: '计量业务管理系统', - // icon: '', - // auth: '/metering/index', - // }, - // children: [ - // ...meterRoute, - // ], - // }, { meta: { title: '', icon: '', - // auth: '/tested/index', }, children: [ ...pageRoute, ], }, - // { - // meta: { - // title: '实验室环境监控系统', - // icon: '', - // auth: '/laboratory/index', - // }, - // children: [ - // ...laboratoryRoute, - // ], - // }, - { - meta: { - title: '通用设置', - icon: '', - auth: '/common/index', - }, - children: [ - ...commonRoute, - ], - }, ] const constantRoutesByFilesystem = generatedRoutes.filter((item) => { diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts index 407b03d..539c862 100644 --- a/src/store/modules/route.ts +++ b/src/store/modules/route.ts @@ -189,10 +189,6 @@ if (currentSystem) { params.parentCode = currentSystem.code // 子系统code } - // 判断本地存储 - if (localStorage.getItem('currentSys')) { - params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code - } return new Promise((resolve) => { getUserMenus(params).then((response) => { const data = response.data diff --git a/.env.development b/.env.development index 26837aa..f27d241 100644 --- a/.env.development +++ b/.env.development @@ -5,7 +5,7 @@ # VITE_APP_API_BASEURL = http://111.198.10.15:21611 # VITE_APP_API_BASEURL = http://192.168.8.107:5909 # VITE_APP_API_BASEURL = http://111.198.10.15:21710 -VITE_APP_API_BASEURL = http://111.198.10.15:11638 +VITE_APP_API_BASEURL = http://111.198.10.15:11420 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/.env.production b/.env.production index 7217090..c0534e5 100644 --- a/.env.production +++ b/.env.production @@ -3,7 +3,7 @@ # 页面标题 VITE_APP_TITLE = 行政问效综合评价平台 # 接口请求地址，会设置到 axios 的 baseURL 参数上 -VITE_APP_API_BASEURL = http://111.198.10.15:11638 +VITE_APP_API_BASEURL = http://111.198.10.15:11420 # 调试工具，可设置 eruda 或 vconsole，如果不需要开启则留空 VITE_APP_DEBUG_TOOL = diff --git a/public/config/config.json b/public/config/config.json index 0acc3c5..bd6c64d 100644 --- a/public/config/config.json +++ b/public/config/config.json @@ -1,4 +1,4 @@ { "title":"计量业务系统", - "baseUrl": "http://111.198.10.15:11638" + "baseUrl": "http://111.198.10.15:11420" } diff --git a/src/layouts/components/Topbar/index.vue b/src/layouts/components/Topbar/index.vue index 3c4fe75..e2a3c90 100644 --- a/src/layouts/components/Topbar/index.vue +++ b/src/layouts/components/Topbar/index.vue @@ -61,7 +61,8 @@ - + + {{ item.title }} diff --git a/src/router/modules/common.ts b/src/router/modules/common.ts deleted file mode 100644 index 7957fe2..0000000 --- a/src/router/modules/common.ts +++ /dev/null @@ -1,321 +0,0 @@ -import type { Route } from '@/global' - -const Layout = () => import('@/layouts/index.vue') - -const routes: Route.recordRaw[] = [ - { - path: '/area', - component: Layout, - redirect: '/area/list', - name: 'AreaManage', - meta: { - title: '区域管理', - icon: 'ep:key', - auth: '/sys/area', - }, - children: [ - { - path: 'list', - name: 'AreaList', - component: () => import('@/views/system/area/listArea.vue'), - meta: { - title: '区域管理', - auth: '/sys/area', - sidebar: false, - breadcrumb: false, - activeMenu: '/area', - }, - }, - ], - }, - { - path: '/resource', - component: Layout, - redirect: '/resource/list', - name: 'ResourceManage', - meta: { - title: '资源管理', - icon: 'ep:key', - auth: '/sys/resource', - }, - children: [ - { - path: 'list', - name: 'ResourceList', - component: () => import('@/views/system/resource/listResource.vue'), - meta: { - title: '资源管理', - auth: '/sys/resource', - sidebar: false, - breadcrumb: false, - activeMenu: '/resource', - }, - }, - ], - }, - { - path: '/dept', - component: Layout, - redirect: '/dept/list', - name: 'DeptManage', - meta: { - title: '组织管理', - icon: 'ep:key', - auth: '/sys/dept', - }, - children: [ - { - path: 'list', - name: 'DeptList', - component: () => import('@/views/system/dept/listDept.vue'), - meta: { - title: '组织管理', - auth: '/sys/dept', - sidebar: false, - breadcrumb: false, - activeMenu: '/dept', - }, - }, - ], - }, - { - path: '/role', - component: Layout, - redirect: '/role/list', - name: 'RoleManage', - meta: { - title: '角色管理', - icon: 'ep:key', - auth: '/sys/role', - }, - children: [ - { - path: 'list', - name: 'RoleList', - component: () => import('@/views/system/role/listRole.vue'), - meta: { - title: '角色管理', - auth: '/sys/role', - sidebar: false, - breadcrumb: false, - activeMenu: '/role', - }, - }, - ], - }, - { - path: '/user', - component: Layout, - redirect: '/user/list', - name: 'UserManage', - meta: { - title: '用户管理', - icon: 'ep:key', - auth: '/sys/mgr', - }, - children: [ - { - path: 'list', - name: 'UserList', - component: () => import('@/views/system/user/listUser.vue'), - meta: { - title: '用户管理', - auth: '/sys/mgr', - sidebar: false, - breadcrumb: false, - activeMenu: '/user', - }, - }, - ], - }, - { - path: '/dict', - component: Layout, - redirect: '/dict/list', - name: 'DictManage', - meta: { - title: '字典管理', - icon: 'ep:key', - auth: '/sys/dict', - }, - children: [ - { - path: 'list', - name: 'DictList', - component: () => import('@/views/system/dict/listDict.vue'), - meta: { - title: '字典管理', - auth: '/sys/dict', - sidebar: false, - breadcrumb: false, - activeMenu: '/dict', - }, - }, - ], - }, - { - path: '/process', - component: Layout, - redirect: '/process/list', - name: 'Process', - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - }, - children: [ - { - path: 'list', - name: 'ProcessList', - component: () => import('@/views/system/process/process.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - sidebar: false, - breadcrumb: false, - activeMenu: '/process', - }, - }, - { - path: 'edit', - name: 'ProcessListEdit', - component: () => import('@/views/system/process/editProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - { - path: 'detail', - name: 'ProcessListDetail', - component: () => import('@/views/system/process/detailProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - { - path: 'add', - name: 'ProcessListAdd', - component: () => import('@/views/system/process/addProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - ], - }, - { - path: '/tenant', - component: Layout, - redirect: '/tenant/list', - name: 'TenantManage', - meta: { - title: '项目管理', - icon: 'ep:key', - auth: '/sys/tenantSys/list', - }, - children: [ - { - path: 'list', - name: 'TenantList', - component: () => import('@/views/system/tenant/list.tenant.vue'), - meta: { - title: '项目管理', - auth: '/sys/tenantSys/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/tenant', - }, - }, - ], - }, - { - path: '/businessLog', - component: Layout, - redirect: '/businessLog/list', - name: 'BusinessLog', - meta: { - title: '业务日志', - icon: 'ep:key', - auth: '/sys/log/biz/list', - }, - children: [ - { - path: 'list', - name: 'BusinessList', - component: () => import('@/views/system/log/listLog.vue'), - meta: { - title: '业务日志', - auth: '/sys/log/biz/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/businessLog', - }, - }, - ], - }, - { - path: '/error', - component: Layout, - redirect: '/error/list', - name: 'ErrorLog', - meta: { - title: '异常日志', - icon: 'ep:key', - auth: '/sys/log/error/list', - }, - children: [ - { - path: 'list', - name: 'ErrorList', - component: () => import('@/views/system/log/listErrorLog.vue'), - meta: { - title: '异常日志', - auth: '/sys/log/error/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/error', - }, - }, - ], - }, - { - path: '/loginDiary', - component: Layout, - redirect: '/loginDiary/list', - name: 'loginDiaryLog', - meta: { - title: '登录日志', - icon: 'ep:key', - auth: '/sys/loginLog', - }, - children: [ - { - path: 'list', - name: 'loginDiaryList', - component: () => import('@/views/system/log/LoginLog.vue'), - meta: { - title: '登录日志', - auth: '/sys/loginLog', - sidebar: false, - breadcrumb: false, - activeMenu: '/loginDiary', - }, - }, - ], - }, -] - -export default routes diff --git a/src/router/modules/home.ts b/src/router/modules/home.ts index 587eb68..046f9fe 100644 --- a/src/router/modules/home.ts +++ b/src/router/modules/home.ts @@ -12,6 +12,7 @@ meta: { title: '首页看板', icon: 'ep:key', + auth: '/dashboard', }, children: [ { @@ -24,6 +25,7 @@ sidebar: false, breadcrumb: false, activeMenu: '/testeddashboard', + auth: '/dashboard', }, }, ], @@ -37,6 +39,7 @@ meta: { title: '考核规则管理', icon: 'ep:key', + auth: '/examine', }, children: [ { @@ -47,7 +50,7 @@ meta: { title: '考核等级评定', icon: 'ep:key', - // auth: '/sys/area', + auth: '/examine/grade', }, children: [ { @@ -56,7 +59,7 @@ component: () => import('@/views/rule/grade/index.vue'), meta: { title: '考核等级评定', - // auth: '/sys/area', + auth: '/examine/grade', sidebar: false, breadcrumb: false, activeMenu: '/grade', @@ -72,7 +75,7 @@ meta: { title: '考核指标管理', icon: 'ep:key', - // auth: '/sys/area', + auth: '/examine/proxy', }, children: [ { @@ -81,7 +84,7 @@ component: () => import('@/views/rule/proxy/index.vue'), meta: { title: '考核指标管理', - // auth: '/sys/area', + auth: '/examine/proxy', sidebar: false, breadcrumb: false, activeMenu: '/proxy', @@ -97,7 +100,7 @@ meta: { title: '考核方案管理', icon: 'ep:key', - // auth: '/sys/area', + auth: '/examine/programme', }, children: [ { @@ -106,7 +109,7 @@ component: () => import('@/views/rule/programme/index.vue'), meta: { title: '考核方案管理', - // auth: '/sys/area', + auth: '/examine/programme', sidebar: false, breadcrumb: false, activeMenu: '/programme', @@ -125,6 +128,7 @@ meta: { title: '考核填报', icon: 'ep:key', + auth: '/filling', }, children: [ { @@ -135,7 +139,7 @@ meta: { title: '待填报考核结果', icon: 'ep:key', - // auth: '/sys/area', + auth: '/filling/treat', }, children: [ { @@ -144,7 +148,7 @@ component: () => import('@/views/flling/treat/index.vue'), meta: { title: '待填报考核结果', - // auth: '/sys/area', + auth: '/filling/treat', sidebar: false, breadcrumb: false, activeMenu: '/treat', @@ -158,9 +162,9 @@ redirect: '/already/alreadylist', name: 'AlreadyManage', meta: { - title: '待填报考核结果', + title: '已填报考核结果', icon: 'ep:key', - // auth: '/sys/area', + auth: '/filling/already', }, children: [ { @@ -169,7 +173,7 @@ component: () => import('@/views/flling/already/index.vue'), meta: { title: '已填报考核结果', - // auth: '/sys/area', + auth: '/filling/already', sidebar: false, breadcrumb: false, activeMenu: '/already', @@ -188,6 +192,7 @@ meta: { title: '问效考核结果', icon: 'ep:key', + auth: '/efficiency', }, children: [ { @@ -198,7 +203,7 @@ meta: { title: '部门考核结果', icon: 'ep:key', - // auth: '/sys/area', + auth: '/efficiency/deptresult', }, children: [ { @@ -207,7 +212,7 @@ component: () => import('@/views/efficiency/dept/index.vue'), meta: { title: '部门考核结果', - // auth: '/sys/area', + auth: '/efficiency/deptresult', sidebar: false, breadcrumb: false, activeMenu: '/deptresult', @@ -221,9 +226,9 @@ redirect: '/analysis/analysislist', name: 'AnalysisResultManage', meta: { - title: '待填报考核结果', + title: '考核统计分析', icon: 'ep:key', - // auth: '/sys/area', + auth: '/efficiency/analysis', }, children: [ { @@ -232,7 +237,7 @@ component: () => import('@/views/efficiency/analysis/index.vue'), meta: { title: '考核统计分析', - // auth: '/sys/area', + auth: '/efficiency/analysis', sidebar: false, breadcrumb: false, activeMenu: '/analysis', @@ -251,6 +256,7 @@ meta: { title: '指标态势分析', icon: 'ep:key', + auth: '/proxy', }, children: [ { @@ -261,7 +267,7 @@ meta: { title: '预警结果列表', icon: 'ep:key', - // auth: '/sys/area', + auth: '/proxy/list', }, children: [ { @@ -270,7 +276,7 @@ component: () => import('@/views/proxy/list/index.vue'), meta: { title: '预警结果列表', - // auth: '/sys/area', + auth: '/proxy/list', sidebar: false, breadcrumb: false, activeMenu: '/list', @@ -286,7 +292,7 @@ meta: { title: '预警统计分析', icon: 'ep:key', - // auth: '/sys/area', + auth: '/proxy/analysiss', }, children: [ { @@ -295,7 +301,7 @@ component: () => import('@/views/proxy/analysis/index.vue'), meta: { title: '预警统计分析', - // auth: '/sys/area', + auth: '/proxy/analysiss', sidebar: false, breadcrumb: false, activeMenu: '/analysiss', @@ -314,6 +320,7 @@ meta: { title: '系统设置', icon: 'ep:key', + auth: '/system', }, children: [ { @@ -324,7 +331,7 @@ meta: { title: '区域管理', icon: 'ep:key', - // auth: '/sys/area', + auth: '/sys/area', }, children: [ { @@ -333,7 +340,7 @@ component: () => import('@/views/system/area/listArea.vue'), meta: { title: '区域管理', - // auth: '/sys/area', + auth: '/sys/area', sidebar: false, breadcrumb: false, activeMenu: '/area', @@ -349,7 +356,7 @@ meta: { title: '资源管理', icon: 'ep:key', - // auth: '/sys/resource', + auth: '/sys/resource', }, children: [ { @@ -358,7 +365,7 @@ component: () => import('@/views/system/resource/listResource.vue'), meta: { title: '资源管理', - // auth: '/sys/resource', + auth: '/sys/resource', sidebar: false, breadcrumb: false, activeMenu: '/resource', @@ -374,7 +381,7 @@ meta: { title: '组织管理', icon: 'ep:key', - // auth: '/sys/dept', + auth: '/sys/dept', }, children: [ { @@ -383,7 +390,7 @@ component: () => import('@/views/system/dept/listDept.vue'), meta: { title: '组织管理', - // auth: '/sys/dept', + auth: '/sys/dept', sidebar: false, breadcrumb: false, activeMenu: '/dept', @@ -399,7 +406,7 @@ meta: { title: '角色管理', icon: 'ep:key', - // auth: '/sys/role', + auth: '/sys/role', }, children: [ { @@ -408,7 +415,7 @@ component: () => import('@/views/system/role/listRole.vue'), meta: { title: '角色管理', - // auth: '/sys/role', + auth: '/sys/role', sidebar: false, breadcrumb: false, activeMenu: '/role', @@ -424,7 +431,7 @@ meta: { title: '用户管理', icon: 'ep:key', - // auth: '/sys/mgr', + auth: '/sys/mgr', }, children: [ { @@ -433,7 +440,7 @@ component: () => import('@/views/system/user/listUser.vue'), meta: { title: '用户管理', - // auth: '/sys/mgr', + auth: '/sys/mgr', sidebar: false, breadcrumb: false, activeMenu: '/user', @@ -449,7 +456,7 @@ meta: { title: '字典管理', icon: 'ep:key', - // auth: '/sys/dict', + auth: '/sys/dict', }, children: [ { @@ -458,7 +465,7 @@ component: () => import('@/views/system/dict/listDict.vue'), meta: { title: '字典管理', - // auth: '/sys/dict', + auth: '/sys/dict', sidebar: false, breadcrumb: false, activeMenu: '/dict', @@ -474,7 +481,7 @@ meta: { title: '业务日志', icon: 'ep:key', - // auth: '/sys/log/biz/list', + auth: '/sys/log/biz/list', }, children: [ { @@ -483,7 +490,7 @@ component: () => import('@/views/system/log/listLog.vue'), meta: { title: '业务日志', - // auth: '/sys/log/biz/list', + auth: '/sys/log/biz/list', sidebar: false, breadcrumb: false, activeMenu: '/businessLog', @@ -499,7 +506,7 @@ meta: { title: '异常日志', icon: 'ep:key', - // auth: '/sys/log/error/list', + auth: '/sys/log/error/list', }, children: [ { @@ -508,7 +515,7 @@ component: () => import('@/views/system/log/listErrorLog.vue'), meta: { title: '异常日志', - // auth: '/sys/log/error/list', + auth: '/sys/log/error/list', sidebar: false, breadcrumb: false, activeMenu: '/error', @@ -524,7 +531,7 @@ meta: { title: '登录日志', icon: 'ep:key', - // auth: '/sys/loginLog', + auth: '/sys/loginLog', }, children: [ { @@ -533,7 +540,7 @@ component: () => import('@/views/system/log/LoginLog.vue'), meta: { title: '登录日志', - // auth: '/sys/loginLog', + auth: '/sys/loginLog', sidebar: false, breadcrumb: false, activeMenu: '/loginDiary', diff --git a/src/router/modules/multilevel.menu.example.ts b/src/router/modules/multilevel.menu.example.ts deleted file mode 100644 index 75f3eb3..0000000 --- a/src/router/modules/multilevel.menu.example.ts +++ /dev/null @@ -1,70 +0,0 @@ -import type { Route } from '@/global' - -const Layout = () => import('@/layouts/index.vue') - -const routes: Route.recordRaw = { - path: '/multilevel_menu_example', - component: Layout, - redirect: '/multilevel_menu_example/page', - name: 'multilevelMenuExample', - meta: { - title: '多级导航', - icon: 'sidebar-menu', - }, - children: [ - { - path: 'page', - name: 'multilevelMenuExample1', - component: () => import('@/views/multilevel_menu_example/page.vue'), - meta: { - title: '导航1', - }, - }, - { - path: 'level2', - name: 'multilevelMenuExample2', - redirect: '/multilevel_menu_example/level2/page', - meta: { - title: '导航2', - }, - children: [ - { - path: 'page', - name: 'multilevelMenuExample2-1', - component: () => import('@/views/multilevel_menu_example/level2/page.vue'), - meta: { - title: '导航2-1', - }, - }, - { - path: 'level3', - name: 'multilevelMenuExample2-2', - redirect: '/multilevel_menu_example/level2/level3/page1', - meta: { - title: '导航2-2', - }, - children: [ - { - path: 'page1', - name: 'multilevelMenuExample2-2-1', - component: () => import('@/views/multilevel_menu_example/level2/level3/page1.vue'), - meta: { - title: '导航2-2-1', - }, - }, - { - path: 'page2', - name: 'multilevelMenuExample2-2-2', - component: () => import('@/views/multilevel_menu_example/level2/level3/page2.vue'), - meta: { - title: '导航2-2-2', - }, - }, - ], - }, - ], - }, - ], -} - -export default routes diff --git a/src/router/modules/system.ts b/src/router/modules/system.ts deleted file mode 100644 index e686132..0000000 --- a/src/router/modules/system.ts +++ /dev/null @@ -1,334 +0,0 @@ -import type { Route } from '@/global' - -const Layout = () => import('@/layouts/index.vue') - -const routes: Route.recordRaw[] = [ - { - path: '/system', - component: Layout, - redirect: '/system/area', - name: 'System', - meta: { - title: '系统设置', - icon: 'ep:key', - auth: '/system', - }, - children: [ - { - path: '/area', - component: Layout, - redirect: '/area/list', - name: 'AreaManage', - meta: { - title: '区域管理', - icon: 'ep:key', - auth: '/sys/area', - }, - children: [ - { - path: 'list', - name: 'AreaList', - component: () => import('@/views/system/area/listArea.vue'), - meta: { - title: '区域管理', - auth: '/sys/area', - sidebar: false, - breadcrumb: false, - activeMenu: '/area', - }, - }, - ], - }, - { - path: '/resource', - component: Layout, - redirect: '/resource/list', - name: 'ResourceManage', - meta: { - title: '资源管理', - icon: 'ep:key', - auth: '/sys/resource', - }, - children: [ - { - path: 'list', - name: 'ResourceList', - component: () => import('@/views/system/resource/listResource.vue'), - meta: { - title: '资源管理', - auth: '/sys/resource', - sidebar: false, - breadcrumb: false, - activeMenu: '/resource', - }, - }, - ], - }, - { - path: '/dept', - component: Layout, - redirect: '/dept/list', - name: 'DeptManage', - meta: { - title: '组织管理', - icon: 'ep:key', - auth: '/sys/dept', - }, - children: [ - { - path: 'list', - name: 'DeptList', - component: () => import('@/views/system/dept/listDept.vue'), - meta: { - title: '组织管理', - auth: '/sys/dept', - sidebar: false, - breadcrumb: false, - activeMenu: '/dept', - }, - }, - ], - }, - { - path: '/role', - component: Layout, - redirect: '/role/list', - name: 'RoleManage', - meta: { - title: '角色管理', - icon: 'ep:key', - auth: '/sys/role', - }, - children: [ - { - path: 'list', - name: 'RoleList', - component: () => import('@/views/system/role/listRole.vue'), - meta: { - title: '角色管理', - auth: '/sys/role', - sidebar: false, - breadcrumb: false, - activeMenu: '/role', - }, - }, - ], - }, - { - path: '/user', - component: Layout, - redirect: '/user/list', - name: 'UserManage', - meta: { - title: '用户管理', - icon: 'ep:key', - auth: '/sys/mgr', - }, - children: [ - { - path: 'list', - name: 'UserList', - component: () => import('@/views/system/user/listUser.vue'), - meta: { - title: '用户管理', - auth: '/sys/mgr', - sidebar: false, - breadcrumb: false, - activeMenu: '/user', - }, - }, - ], - }, - { - path: '/dict', - component: Layout, - redirect: '/dict/list', - name: 'DictManage', - meta: { - title: '字典管理', - icon: 'ep:key', - auth: '/sys/dict', - }, - children: [ - { - path: 'list', - name: 'DictList', - component: () => import('@/views/system/dict/listDict.vue'), - meta: { - title: '字典管理', - auth: '/sys/dict', - sidebar: false, - breadcrumb: false, - activeMenu: '/dict', - }, - }, - ], - }, - { - path: '/process', - component: Layout, - redirect: '/process/list', - name: 'Process', - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - }, - children: [ - { - path: 'list', - name: 'ProcessList', - component: () => import('@/views/system/process/process.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - sidebar: false, - breadcrumb: false, - activeMenu: '/process', - }, - }, - { - path: 'edit', - name: 'ProcessListEdit', - component: () => import('@/views/system/process/editProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - auth: '/sys/process', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - { - path: 'detail', - name: 'ProcessListDetail', - component: () => import('@/views/system/process/detailProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - { - path: 'add', - name: 'ProcessListAdd', - component: () => import('@/views/system/process/addProcess.vue'), - meta: { - title: '流程管理', - icon: 'ep:key', - sidebar: false, - breadcrumb: false, - activeMenu: '/process/list', - }, - }, - ], - }, - { - path: '/tenant', - component: Layout, - redirect: '/tenant/list', - name: 'TenantManage', - meta: { - title: '项目管理', - icon: 'ep:key', - auth: '/sys/tenantSys/list', - }, - children: [ - { - path: 'list', - name: 'TenantList', - component: () => import('@/views/system/tenant/list.tenant.vue'), - meta: { - title: '项目管理', - auth: '/sys/tenantSys/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/tenant', - }, - }, - ], - }, - { - path: '/businessLog', - component: Layout, - redirect: '/businessLog/list', - name: 'BusinessLog', - meta: { - title: '业务日志', - icon: 'ep:key', - auth: '/sys/log/biz/list', - }, - children: [ - { - path: 'list', - name: 'BusinessList', - component: () => import('@/views/system/log/listLog.vue'), - meta: { - title: '业务日志', - auth: '/sys/log/biz/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/businessLog', - }, - }, - ], - }, - { - path: '/error', - component: Layout, - redirect: '/error/list', - name: 'ErrorLog', - meta: { - title: '异常日志', - icon: 'ep:key', - auth: '/sys/log/error/list', - }, - children: [ - { - path: 'list', - name: 'ErrorList', - component: () => import('@/views/system/log/listErrorLog.vue'), - meta: { - title: '异常日志', - auth: '/sys/log/error/list', - sidebar: false, - breadcrumb: false, - activeMenu: '/error', - }, - }, - ], - }, - { - path: '/loginDiary', - component: Layout, - redirect: '/loginDiary/list', - name: 'loginDiaryLog', - meta: { - title: '登录日志', - icon: 'ep:key', - auth: '/sys/loginLog', - }, - children: [ - { - path: 'list', - name: 'loginDiaryList', - component: () => import('@/views/system/log/LoginLog.vue'), - meta: { - title: '登录日志', - auth: '/sys/loginLog', - sidebar: false, - breadcrumb: false, - activeMenu: '/loginDiary', - }, - }, - ], - }], - }, - -] - -export default routes diff --git a/src/router/routes.ts b/src/router/routes.ts index 4bdf999..3006ffe 100644 --- a/src/router/routes.ts +++ b/src/router/routes.ts @@ -1,6 +1,5 @@ import { setupLayouts } from 'virtual:generated-layouts' import generatedRoutes from 'virtual:generated-pages' -import commonRoute from './modules/common' import pageRoute from './modules/home' import type { Route } from '@/global' import useSettingsStore from '@/store/modules/settings' @@ -15,14 +14,6 @@ }, }, { - path: '/index', - name: 'index', - component: () => import('@/views/dashboard.vue'), - meta: { - title: '子系统列表', - }, - }, - { path: '/login', name: 'login', component: () => import('@/views/login.vue'), @@ -112,46 +103,15 @@ // 动态路由（异步路由、导航栏路由） const asyncRoutes: Route.recordMainRaw[] = [ - // { - // meta: { - // title: '计量业务管理系统', - // icon: '', - // auth: '/metering/index', - // }, - // children: [ - // ...meterRoute, - // ], - // }, { meta: { title: '', icon: '', - // auth: '/tested/index', }, children: [ ...pageRoute, ], }, - // { - // meta: { - // title: '实验室环境监控系统', - // icon: '', - // auth: '/laboratory/index', - // }, - // children: [ - // ...laboratoryRoute, - // ], - // }, - { - meta: { - title: '通用设置', - icon: '', - auth: '/common/index', - }, - children: [ - ...commonRoute, - ], - }, ] const constantRoutesByFilesystem = generatedRoutes.filter((item) => { diff --git a/src/store/modules/route.ts b/src/store/modules/route.ts index 407b03d..539c862 100644 --- a/src/store/modules/route.ts +++ b/src/store/modules/route.ts @@ -189,10 +189,6 @@ if (currentSystem) { params.parentCode = currentSystem.code // 子系统code } - // 判断本地存储 - if (localStorage.getItem('currentSys')) { - params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code - } return new Promise((resolve) => { getUserMenus(params).then((response) => { const data = response.data diff --git a/src/store/modules/user.ts b/src/store/modules/user.ts index afdfb1c..cfcbfaf 100644 --- a/src/store/modules/user.ts +++ b/src/store/modules/user.ts @@ -4,7 +4,6 @@ import { doLogin, getConfig, getInfo, getUserMenus } from '@/api/system/login' import { changePwd } from '@/api/system/user' import type { Menu } from '@/global' -import { getPrivateKey, privateStr, setPrivateKey } from '@/utils/auth' const useUserStore = defineStore( // 唯一ID @@ -21,14 +20,12 @@ attr1: '', // 备用属性 tenantId: '', // 租户id publicKey: localStorage.publicKey || '', // 公钥 - privateKey: getPrivateKey() || '', // 私钥 roleList: [] as string[], // 角色id集合 roleNames: [] as string[], // 角色名称集合 roleTips: [] as string[], // 角色标签集合 systems: [] as Menu.menu[], // 子系统权限 menus: [] as Menu.menu[], // 菜单权限 btns: [] as Menu.menu[], // 按钮权限 - isLogout: 0, // 是否被退出登录 }), getters: { isLogin: (state) => { @@ -50,9 +47,6 @@ getPublicKey: (state) => { return state.publicKey }, - getPrivateKey: (state) => { - return state.privateKey - }, getMenus: (state): Menu.menu[] => { return state.menus }, @@ -67,10 +61,6 @@ getConfig().then((res) => { this.publicKey = res.data.publicKey localStorage.setItem('publicKey', res.data.publicKey) - // 保存私钥 - setPrivateKey(privateStr) - this.privateKey = privateStr - this.isLogout = 0 resolve(res.data) }).catch((e) => { reject(e) @@ -89,7 +79,6 @@ localStorage.setItem('token', res.data.token) this.username = res.data.username this.token = res.data.token - this.isLogout = 0 resolve() }).catch((error) => { reject(error) @@ -103,8 +92,6 @@ const menuStore = useMenuStore() localStorage.removeItem('username') localStorage.removeItem('token') - localStorage.removeItem('nameId') - localStorage.removeItem('depId') this.username = '' this.token = '' this.roleList = [] @@ -122,8 +109,6 @@ this.roleList = res.data.roleIds this.roleNames = res.data.roleNames this.roleTips = res.data.roleTips - localStorage.setItem('nameId', res.data.id) - localStorage.setItem('depId', res.data.deptId) } else { reject('该用户无角色') @@ -153,10 +138,6 @@ if (currentSystem) { params.parentCode = currentSystem.code // 子系统code } - // // 判断本地存储 - // if (localStorage.getItem('currentSys')) { - // params.parentCode = JSON.parse(localStorage.getItem('currentSys') as string).code - // } return new Promise((resolve) => { getUserMenus(params).then((response) => { const data = response.data @@ -199,10 +180,6 @@ }) }) }, - // 被退出登录 - toLogout() { - this.isLogout += 1 - }, }, }, )