From 2475c65a3c091cee4fe48f49e0f53697403750df Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期三, 17 八月 2022 19:55:34 +0800
Subject: [PATCH] 冲突
---
src/views/system/menu/index.vue | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 7b9b536..7b5cd4b 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -66,13 +66,13 @@
import { storeToRefs } from 'pinia';
import { useRoutesList } from '/@/stores/routesList';
import menuDialog from '/@/views/system/menu/component/menuDialog.vue';
-import { useMenuApi } from '/@/api/menu';
+import { useMenuApi } from '/@/api/systemManage/menu';
import { Session } from '/@/utils/storage';
import pinia from '/@/stores';
import { dynamicRoutes } from '/@/router/route';
import { useUserInfo } from '/@/stores/userInfo';
import { initBackEndControlRoutes } from '/@/router/backEnd';
-import { useRoleApi } from '/@/api/role';
+import { useRoleApi } from '/@/api/systemManage/role';
export default defineComponent({
name: 'systemMenu',
@@ -91,7 +91,7 @@
roleList: [],
menuTableData: [],
projectList: [
- { id: '1', name: '基础数据权限管理系统', key: 0 },
+ { id: '1', name: '安全基础信息系统', key: 0 },
{ id: '2', name: '双重预防系统', key: 1 },
{ id: '3', name: '特殊作业系统', key: 2 },
{ id: '4', name: '智能巡检系统', key: 3 },
--
Gitblit v1.9.2