From b8720f30d8916555067c22acb7fda83efbc2f9f3 Mon Sep 17 00:00:00 2001
From: lxl <lixuliang_hd@126.com>
Date: 星期二, 20 九月 2022 17:36:12 +0800
Subject: [PATCH] 暂存

---
 src/assets/lang/zh.js |   74 +++++++++++++++++++++++++++++++++++++
 1 files changed, 74 insertions(+), 0 deletions(-)

diff --git a/src/assets/lang/zh.js b/src/assets/lang/zh.js
index 832046b..58d2ce7 100644
--- a/src/assets/lang/zh.js
+++ b/src/assets/lang/zh.js
@@ -10,6 +10,7 @@
     iquery: '鏌ヨ',
     selectdate: '璇烽�夋嫨鏃ユ湡',
     pleaseInput: '璇疯緭鍏�',
+    update: '淇敼',
   },
   dataManage: {
     dataManage: '鏁版嵁绠$悊',
@@ -61,6 +62,7 @@
     logLog: '鐧诲綍鏃ュ織',
     operationLog: '鎿嶄綔鏃ュ織',
     databaseMonitoring: '鏁版嵁搴撶洃鎺�',
+<<<<<<< HEAD
     blackwhiteList: "榛�/鐧藉悕鍗�",
     BWL: {
       blackList: "榛戝悕鍗�",
@@ -79,6 +81,60 @@
       change: '淇敼',
       index:"搴忓彿",
     }
+=======
+    tokentool: 'Token宸ュ叿',
+    tokentoolObj: {
+      first: '鏈嶅姟鍒楄〃',
+      second: 'Token绠$悊',
+      serviceid: '璧勬簮ID',
+      serviceName: '鏈嶅姟鍚嶇О',
+      excelTemplate: 'Excel妯℃澘',
+      uploadExcel: '涓婁紶Excel',
+      serviceToken: 'Token 鐢熸垚澶�',
+      pleaseInput: '鐢宠Token鍚庢澶勫彲澶嶅埗',
+      copy: '澶嶅埗',
+      tokenName: 'Token鏌ヨ',
+      tokenStatus: 'Token鐘舵��',
+      tokenAll: '鍏ㄩ儴',
+      tokeNormal: '姝e父',
+      tokenInvalid: '澶辨晥',
+      tokenRenewal: '缁湡',
+      serialnumber: '搴忓彿',
+      applysystem: '鐢宠浣跨敤绯荤粺',
+      applicantIP: '鐢宠鑰匢P',
+      applicationtime: '鐢宠鏃堕棿',
+      applytime: '鐢宠浣跨敤鏃堕棿(s)',
+      tokenstring: 'Token涓�',
+      serviceAddress: '鏈嶅姟鍦板潃',
+      porstServiceAddress: '浠g悊鍚庢湇鍔″湴鍧�',
+      sourcesystem: '鏉ユ簮绯荤粺',
+      pubicnot: '鏄惁鍏紑',
+      suffixID: '鍚庣紑ID',
+      goonlinenot: '鏄惁涓婄嚎',
+      primaryKey: '涓婚敭',
+      applyToken: '鐢宠Token',
+      operation: '鎿嶄綔',
+      resourcetoken: 'Token鎵�灞炶祫婧怚D',
+      tokeninformation: 'Token淇℃伅',
+      autorenew: '鑷姩缁害',
+    },
+    operationLogObj: {
+      queryRegion: '鏌ヨ鍖�',
+      resourceName: '璧勬簮鍚嶇О',
+      operationType: '鎿嶄綔绫诲瀷',
+      operatingTime: '鎿嶄綔鏃堕棿',
+      inquire: '鏌ヨ',
+      empty: '娓呯┖',
+      num: '搴忓彿',
+      username: '鐢ㄦ埛鍚�',
+      systematicName: '绯荤粺鍚嶇О',
+      IP: ' IP',
+      pleaseInput: '璇疯緭鍏�',
+      pleaseSelect: '璇烽�夋嫨',
+      optionDate: '閫夋嫨鏃ユ湡',
+      selectTime: '閫夋嫨鏃堕棿',
+    },
+>>>>>>> eb8b11722d1d778311ae7c4eb47869288e30ade6
   },
   synthesis: {
     synthesis: '缁煎悎灞曠ず',
@@ -147,6 +203,24 @@
     operationtype: '鎿嶄綔绫诲瀷',
     operationStatus: '鎿嶄綔鐘舵��',
   },
+  themaic: {
+    name: '涓撻鍦板浘',
+    maptltle: '鍦板浘鍚嶇О',
+    all: '鍏ㄩ儴',
+    sortbytime: '鎸夋椂闂存帓搴�',
+    sortbyviews: '鎸夋祻瑙堟鏁版帓搴�',
+    find: '鍏辨壘鍒�',
+    record: '鏉℃暟鎹�',
+  },
+  archive: {
+    name: '绠¢亾璧勬枡',
+    keyword: '鍏抽敭瀛�',
+    uname: '鍚嶇О',
+    type: '绫诲瀷',
+    modifications: '淇敼娆℃暟',
+    creationtime: '鍒涘缓鏃堕棿',
+    state: '鐘舵��',
+  },
 };
 
 export default zh;

--
Gitblit v1.9.3