From ec86ce630c3bf6ef4abe5f52ecde21eeda03c5e7 Mon Sep 17 00:00:00 2001
From: WX <1377869194@qq.com>
Date: 星期二, 15 八月 2023 10:59:21 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.20.39:8989/r/LunarMidplane

---
 src/assets/lang/en.js |   35 +++++++++++++++++++++++++++++++----
 1 files changed, 31 insertions(+), 4 deletions(-)

diff --git a/src/assets/lang/en.js b/src/assets/lang/en.js
index 69e8700..4ee7212 100644
--- a/src/assets/lang/en.js
+++ b/src/assets/lang/en.js
@@ -67,8 +67,8 @@
   dataManage: {
     dataManage: 'Data Manage',
     catalogueManage: 'Directory management',
-    projectManagement: 'Project Management',
-    dataUpdata: 'dataUpdata',
+    projectManagement: 'Data Resource Catalog Management',
+    dataUpdata: 'Data warehousing and updating',
     datawarehousing: 'Data warehousing',
     rangeManage: 'Range management',
     dataRetrieval: 'Data query',
@@ -80,24 +80,49 @@
       menuName: 'menu name',
       menuType: 'Menu Type',
       layerName: 'Layer Name',
+      englishName: 'English name',
       layerType: 'Layer Type',
       serviceName: 'service name',
       serviceType: 'service type',
+      serviceResources: 'Service Resources',
       serviceAddress: 'Service Address',
+      serviceParameters: 'Service parameters ',
       displayOrNot: 'Display or not',
       isItProjectData: 'Is it project data',
       dataType: 'data type',
       istrue: 'true',
       isfalse: 'false',
+      isEnable: 'Enable',
+      enableProxy: 'Enable proxy address',
+      disable: 'Disable',
+      enableOriginalAddress: 'Enable original address',
+      isDisuse: 'Disuse',
+      isStop: 'Stop',
+      testAddress: 'Test Address',
+      firm: 'Service category',
+      descr: 'descr',
+      status: 'status',
+      proxyAddress: 'Proxy Address',
       enTableName: 'English Table Name',
       prompt1: 'Please enter a layer name',
       prompt2: 'Please select a layer type',
       prompt3: 'Please select a service type',
       prompt4: 'Please enter the service address',
 
-      prompt6: 'Please enter the name of the English table (eg: m_geocontrollpoint)',
+      prompt6: 'Please enter an English name',
       prompt7: 'Please enter note information',
       prompt8: 'Please select a data type',
+      prompt9: 'Please enter the testing address',
+      prompt10: 'Please enter descriptive information',
+      prompt11: 'Please enter the proxy address',
+      prompt12: 'Please enter a table name',
+      prompt13: 'Please enter a resource name',
+      prompt14: 'Please enter an English name',
+      prompt15: 'Please enter service parameters',
+      prompt16: "Please enter descriptive information",
+      prompt17: "Please enter note information",
+      tableName: 'Table Name',
+      resourceName: 'resourceName',
 
     },
     dataStaticObj: {
@@ -284,12 +309,13 @@
   },
   operatManage: {
     organizationManage: 'Organizational management',
-    operatManage: 'Operat Manage',
+    operatManage: 'Operation and maintenance supervision',
     ResourceLog: 'Resource Log',
     DownloadLog: 'Download Log',
     UserRoleAuthorization: 'User Role Authorization',
     MenuRoleAuthorization: 'Menu Permission Authorization',
     RoleResAuthorization: 'Role Resource Authorization',
+    RoleLayerAuthorization: 'Role Layer Authorization',
     RoleMenuAuthorization: 'Role Menu Authorization',
     UserRoleAuthorizationObj: {
       RoleTable: 'Role Table',
@@ -302,6 +328,7 @@
       PermissionTable: 'Permission table',
       server: 'Service Address',
       ResTable: 'Resource table',
+      layerTable: 'Layer Table'
     },
     ELM: {
       username: 'username',

--
Gitblit v1.9.3