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/zh.js |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/assets/lang/zh.js b/src/assets/lang/zh.js
index 781d989..019d92b 100644
--- a/src/assets/lang/zh.js
+++ b/src/assets/lang/zh.js
@@ -76,6 +76,7 @@
     projectManage: '椤圭洰淇℃伅',
     dataStatistics: '鏁版嵁缁熻',
     layerManage: '鍥惧眰绠$悊',
+    resourceManage: '璧勬簮绠$悊',
     layerObj: {
       menuName: '鑿滃崟鍚嶇О',
       menuType: '鑿滃崟绫诲瀷',
@@ -84,17 +85,22 @@
       layerType: '鍥惧眰绫诲瀷',
       serviceName: '鏈嶅姟鍚嶇О',
       serviceType: '鏈嶅姟绫诲瀷',
+      serviceResources: '鏈嶅姟璧勬簮',
       serviceAddress: '鏈嶅姟鍦板潃',
+      serviceParameters: '鏈嶅姟鍙傛暟',
       displayOrNot: '鏄惁鏄剧ず',
       isItProjectData: '鏄惁涓洪」鐩暟鎹�',
       dataType: '鏁版嵁绫诲瀷',
       istrue: '鏄�',
       isfalse: '鍚�',
       isEnable: '鍚敤',
+      enableProxy: '鍚敤浠g悊鍦板潃',
+      disable: '绂佺敤',
+      enableOriginalAddress: '鍚敤鍘熷鍦板潃',
       isDisuse: '搴熷純',
       isStop: '鍋滄',
       testAddress: '娴嬭瘯鍦板潃',
-      firm: '鍘傚晢',
+      firm: '鏈嶅姟绫诲埆',
       descr: '鎻忚堪',
       status: '鐘舵��',
       proxyAddress: '浠g悊鍦板潃',
@@ -110,7 +116,13 @@
       prompt10: '璇疯緭鍏ユ弿杩颁俊鎭�',
       prompt11: '璇疯緭鍏ヤ唬鐞嗗湴鍧�',
       prompt12: '璇疯緭鍏ヨ〃鍚嶇О',
-      tableName: '琛ㄥ悕绉�'
+      prompt13: '璇疯緭鍏ヨ祫婧愬悕绉�',
+      prompt14: '璇疯緭鍏ヨ嫳鏂囧悕绉�',
+      prompt15: '璇疯緭鍏ユ湇鍔″弬鏁�',
+      prompt16: "璇疯緭鍏ユ弿杩颁俊鎭�",
+      prompt17: "璇疯緭鍏ュ娉ㄤ俊鎭�",
+      tableName: '琛ㄥ悕绉�',
+      resourceName: '璧勬簮鍚嶇О',
     },
     dataStaticObj: {
       type1: '鏈嶅姟鍚嶇О',
@@ -299,6 +311,7 @@
     UserRoleAuthorization: '鐢ㄦ埛瑙掕壊鎺堟潈',
     MenuRoleAuthorization: '鑿滃崟鏉冮檺鎺堟潈',
     RoleResAuthorization: '瑙掕壊璧勬簮鎺堟潈',
+    RoleLayerAuthorization: '瑙掕壊鍥惧眰鎺堟潈',
     RoleMenuAuthorization: '瑙掕壊鑿滃崟鎺堟潈',
     UserRoleAuthorizationObj: {
       RoleTable: '瑙掕壊琛�',
@@ -311,6 +324,9 @@
       menuTable: '鑿滃崟琛�',
       server: '鏈嶅姟鍦板潃',
       ResTable: '璧勬簮琛�',
+
+
+      layerTable: '鍥惧眰琛�'
     },
     ELM: {
       username: '鐢ㄦ埛鍚嶇О',

--
Gitblit v1.9.3