#627 Resolve the conflict

WeBankPartners · Jan 14, 2020 · 487d239 · 487d239
1 parent 2b59714
commit 487d239
Showing 1 changed file with 18 additions and 18 deletions.
diff --git a/cmdb-ui/src/const/menus.js b/cmdb-ui/src/const/menus.js
@@ -2,58 +2,58 @@ export const MENUS = [
   {
     code: 'DATA_QUERY',
     cnName: '数据查询',
-    enName: 'Data Enquiry'
+    enName: 'Enquiry'
   },
   {
     code: 'DATA_MANAGEMENT',
     cnName: '数据管理',
-    enName: 'Data Management'
+    enName: 'Edit'
   },
   {
     code: 'ADMIN',
     cnName: '系统',
-    enName: 'Administration'
+    enName: 'Admin'
   },
   {
     code: 'DESIGNING_CI_DATA_MANAGEMENT',
     cnName: 'CI数据管理',
-    enName: 'CI Data Management',
+    enName: 'Configuration Items',
     link: '/wecmdb/designing/ci-data-management'
   },
   {
     code: 'DESIGNING_CI_DATA_ENQUIRY',
     cnName: 'CI数据查询',
-    enName: 'CI Data Enquiry',
+    enName: 'Configuration Items',
     link: '/wecmdb/designing/ci-data-enquiry'
   },
   {
     code: 'DESIGNING_CI_INTEGRATED_QUERY_MANAGEMENT',
     cnName: 'CI综合查询管理',
-    enName: 'CI Integrated Enquiry Management',
+    enName: 'Customization Report',
     link: '/wecmdb/designing/ci-integrated-query-management'
   },
   {
     code: 'DESIGNING_CI_INTEGRATED_QUERY_EXECUTION',
     cnName: 'CI数据综合查询',
-    enName: 'CI Integrated Enquiry',
+    enName: 'Customization Report',
     link: '/wecmdb/designing/ci-integrated-query-execution'
   },
   {
     code: 'CMDB_DESIGNING_ENUM_MANAGEMENT',
     cnName: '枚举数据管理',
-    enName: 'Enum Management',
+    enName: 'Enumeration',
     link: '/wecmdb/designing/enum-management'
   },
   {
     code: 'CMDB_DESIGNING_ENUM_ENQUIRY',
     cnName: '枚举数据查询',
-    enName: 'Enum Enquiry',
+    enName: 'Enumeration',
     link: '/wecmdb/designing/enum-enquiry'
   },
   {
     code: 'ADMIN_CMDB_MODEL_MANAGEMENT',
     cnName: 'CMDB模型管理',
-    enName: 'CMDB Modeling',
+    enName: 'Modeling',
     link: '/wecmdb/admin/cmdb-model-management'
   },
   {
@@ -65,19 +65,19 @@ export const MENUS = [
   {
     code: 'CMDB_ADMIN_BASE_DATA_MANAGEMENT',
     cnName: '基础数据管理',
-    enName: 'Base Data Management',
+    enName: 'System Variables',
     link: '/wecmdb/admin/base-data-management'
   },
   {
     code: 'ADMIN_QUERY_LOG',
     cnName: '日志查询',
-    enName: 'Logs Enquiry',
+    enName: 'Logs',
     link: '/wecmdb/admin/log-enquiry'
   },
   {
     code: 'ADMIN_USER_PASSWORD_MANAGEMENT',
     cnName: '用户密码管理',
-    enName: 'User Password Management',
+    enName: 'Password',
     link: '/wecmdb/admin/user-password-management'
   },
   // 视图查询
@@ -114,30 +114,30 @@ export const MENUS = [
   {
     code: 'VIEW_MANAGEMENT',
     cnName: '视图管理',
-    enName: 'Views Management'
+    enName: 'View'
   },
   {
     code: 'IDC_PLANNING_DESIGN',
     cnName: 'IDC规划设计',
-    enName: 'IDC Planning Design',
+    enName: 'IDC Design',
     link: '/wecmdb/view-management/idc-planning-design'
   },
   {
     code: 'IDC_RESOURCE_PLANNING',
     cnName: 'IDC资源规划',
-    enName: 'IDC Resource Planning',
+    enName: 'IDC Resource',
     link: '/wecmdb/view-management/idc-resource-planning'
   },
   {
     code: 'APPLICATION_ARCHITECTURE_DESIGN',
     cnName: '应用架构设计',
-    enName: 'App Architecture Design',
+    enName: 'App Architecture',
     link: '/wecmdb/view-management/application-architecture-design'
   },
   {
     code: 'APPLICATION_DEPLOYMENT_DESIGN',
     cnName: '应用部署设计',
-    enName: 'App Deployment Design',
+    enName: 'App Deployment',
     link: '/wecmdb/view-management/application-deployment-design'
   }
 ]