From 1e09b147f84337bcf4d0a106cf246c2ad9d16236 Mon Sep 17 00:00:00 2001
From: lxl <lixuliang_hd@126.com>
Date: 星期二, 20 九月 2022 18:18:56 +0800
Subject: [PATCH] 第六个
---
src/assets/lang/zh.js | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/assets/lang/zh.js b/src/assets/lang/zh.js
index 58d2ce7..9e192ef 100644
--- a/src/assets/lang/zh.js
+++ b/src/assets/lang/zh.js
@@ -62,13 +62,13 @@
logLog: '鐧诲綍鏃ュ織',
operationLog: '鎿嶄綔鏃ュ織',
databaseMonitoring: '鏁版嵁搴撶洃鎺�',
-<<<<<<< HEAD
blackwhiteList: "榛�/鐧藉悕鍗�",
BWL: {
blackList: "榛戝悕鍗�",
whiteList: "鐧藉悕鍗�",
blackListIP: '榛戝悕鍗旾P',
- blackListIPInfo: '杈撳叆IP鏌ヨ',
+ whiteListIP: '鐧藉悕鍗旾P',
+ listIPInfo: '杈撳叆IP鏌ヨ',
IPState: 'IP鐘舵��',
all: '鍏ㄩ儴',
validity: '鐢熸晥',
@@ -79,9 +79,22 @@
hours: '鏃�',
interceptionNumber: '鎷︽埅娆℃暟',
change: '淇敼',
- index:"搴忓彿",
- }
-=======
+ search: '鎼滅储',
+ reset: '閲嶇疆',
+ index: "搴忓彿",
+ serviceName: '鏈嶅姟鍚嶇О',
+ accessSourceSystem: '璁块棶鏉ユ簮绯荤粺',
+ IPRequest: '鐢宠IP',
+ servicesRequestUrl: '鐢宠鏈嶅姟Url',
+ resourceIDRequest: '鐢宠璧勬簮Id',
+ serviceSystemRequest: '鐢宠鏈嶅姟绯荤粺',
+ blackListStatus: '榛戝悕鍗曠姸鎬�',
+ operate: '鎿嶄綔',
+ effectiveDate: "鐢熸晥鏃ユ湡",
+ requestUser: "鐢宠浜�",
+ tokenInfo: "token淇℃伅",
+ whiteListStatus: '鐧藉悕鍗曠姸鎬�',
+ },
tokentool: 'Token宸ュ叿',
tokentoolObj: {
first: '鏈嶅姟鍒楄〃',
@@ -134,7 +147,6 @@
optionDate: '閫夋嫨鏃ユ湡',
selectTime: '閫夋嫨鏃堕棿',
},
->>>>>>> eb8b11722d1d778311ae7c4eb47869288e30ade6
},
synthesis: {
synthesis: '缁煎悎灞曠ず',
--
Gitblit v1.9.3