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/en.js |   76 +++++++++++++++++++++++++++++++++++++
 1 files changed, 75 insertions(+), 1 deletions(-)

diff --git a/src/assets/lang/en.js b/src/assets/lang/en.js
index 7efadfb..6e238bb 100644
--- a/src/assets/lang/en.js
+++ b/src/assets/lang/en.js
@@ -4,12 +4,13 @@
     choose: 'Please choose',
     name: 'name',
     edit: 'edit',
-    delete: 'delete',
+    delete: 'Delete',
     username: 'UserName',
     empty: 'Empty',
     iquery: 'IQuery',
     selectdate: 'Please select a date',
     pleaseInput: 'Please input',
+    update: 'Modify',
   },
   dataManage: {
     dataManage: 'Data Manage',
@@ -61,7 +62,62 @@
     logLog: 'ConLog',
     operationLog: 'Operation Log',
     databaseMonitoring: 'Database Monitoring',
+<<<<<<< HEAD
     blackwhiteList: "Black/White List"
+=======
+    tokentool: 'Token Tool',
+    tokentoolObj: {
+      first: 'Service List',
+      second: 'Token management',
+      serviceid: 'Resource ID',
+      serviceName: 'Service name',
+      excelTemplate: 'Excel Template',
+      uploadExcel: 'Upload Excel',
+      serviceToken: 'Token generation place',
+      pleaseInput: 'After applying for a token, you can copy it here',
+      copy: 'Copy',
+      tokenName: 'Token Name',
+      tokenStatus: 'Token Status',
+      tokenAll: 'All',
+      tokeNormal: 'Normal',
+      tokenInvalid: 'Invalid',
+      tokenRenewal: 'Renewal',
+      serialnumber: 'Serial Number',
+      applysystem: 'Apply to use the system',
+      applicantIP: 'Applicant IP',
+      applicationtime: 'Application time',
+      applytime: 'Apply for use time (s)',
+      tokenstring: 'Token string',
+      serviceAddress: 'Service address',
+      porstServiceAddress: 'Post proxy service address',
+      sourcesystem: 'sourcesystem',
+      pubicnot: 'Public or not',
+      suffixID: 'Suffix ID',
+      goonlinenot: 'Go online or not',
+      primaryKey: 'Primary key',
+      applyToken: 'Apply for Token',
+      operation: 'Operation',
+      resourcetoken: 'Resource ID of the token',
+      tokeninformation: 'Token information',
+      autorenew: 'Auto renew',
+    },
+    operationLogObj: {
+      queryRegion: 'QueryRegion',
+      resourceName: 'resourceName',
+      operationType: 'operationType',
+      operatingTime: 'operatingTime',
+      inquire: 'inquire',
+      empty: 'empty',
+      num: 'num',
+      username: 'username',
+      systematicName: 'systematicName',
+      IP: ' IP',
+      pleaseInput: 'pleaseInput',
+      pleaseSelect: 'pleaseSelect',
+      optionDate: 'optionDate',
+      selectTime: 'selectTime',
+    },
+>>>>>>> eb8b11722d1d778311ae7c4eb47869288e30ade6
   },
   synthesis: {
     synthesis: 'Comprehensive Display',
@@ -130,6 +186,24 @@
     operationtype: 'Operation Type',
     operationStatus: 'Operation Status',
   },
+  themaic: {
+    name: 'Themaic Map',
+    maptltle: 'Map Title',
+    all: 'All',
+    sortbytime: 'Sort by Time',
+    sortbyviews: 'Sort by Views',
+    find: 'Find',
+    record: 'pieces of data',
+  },
+  archive: {
+    name: 'Piping materials',
+    keyword: 'Keyword',
+    uname: 'Name',
+    type: 'Type',
+    modifications: 'Revision number',
+    creationtime: 'Creation Time',
+    state: 'State',
+  },
 };
 
 export default en;

--
Gitblit v1.9.3