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/en.js | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/src/assets/lang/en.js b/src/assets/lang/en.js
index 6e238bb..9e70448 100644
--- a/src/assets/lang/en.js
+++ b/src/assets/lang/en.js
@@ -62,9 +62,39 @@
logLog: 'ConLog',
operationLog: 'Operation Log',
databaseMonitoring: 'Database Monitoring',
-<<<<<<< HEAD
- blackwhiteList: "Black/White List"
-=======
+ blackwhiteList: "Black/White List",
+ BWL: {
+ blackList: "blackList",
+ whiteList: "whiteList",
+ blackListIP: 'blackListIP',
+ whiteListIP: 'whiteListIP',
+ listIPInfo: 'listIPInfo',
+ IPState: 'IPState',
+ all: 'all',
+ validity: 'validity',
+ invalidity: 'invalidity',
+ interceptionCycle: 'interceptionCycle',
+ seconds: 'seconds',
+ mins: 'mins',
+ hours: 'hours',
+ interceptionNumber: 'interceptionNumber',
+ change: 'change',
+ search: 'search',
+ reset: 'reset',
+ index: "index",
+ serviceName: 'serviceName',
+ accessSourceSystem: 'accessSourceSystem',
+ IPRequest: 'IPRequest',
+ servicesRequestUrl: 'servicesRequestUrl',
+ resourceIDRequest: 'resourceIDRequest',
+ serviceSystemRequest: 'serviceSystemRequest',
+ blackListStatus: 'blackListStatus',
+ operate: 'operate',
+ effectiveDate: "effectiveDate",
+ requestUser: "requestUser",
+ tokenInfo: "tokenInfo",
+ whiteListStatus: 'whiteListStatus',
+ },
tokentool: 'Token Tool',
tokentoolObj: {
first: 'Service List',
@@ -117,7 +147,6 @@
optionDate: 'optionDate',
selectTime: 'selectTime',
},
->>>>>>> eb8b11722d1d778311ae7c4eb47869288e30ade6
},
synthesis: {
synthesis: 'Comprehensive Display',
--
Gitblit v1.9.3