From 17600f41d7c3f6c28cc5393dbb4d3d7e82eccad6 Mon Sep 17 00:00:00 2001
From: Your Name <123456>
Date: 星期四, 25 八月 2022 09:54:47 +0800
Subject: [PATCH] conflict
---
src/views/system/menu/index.vue | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index b177040..4bc20a5 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -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 },
@@ -191,6 +191,7 @@
onMounted(() => {
getMenuList();
getRoleList();
+ console.log(1);
});
return {
parseRole,
--
Gitblit v1.9.2