From 410facfa35a29a14f2dc5a5d74629a8291148aff Mon Sep 17 00:00:00 2001
From: 王旭 <1377869194@qq.com>
Date: 星期三, 12 十月 2022 11:03:26 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.20.39:29418/LFWEB

---
 src/assets/lang/en.js |   72 +++++++++++++++++++-----------------
 1 files changed, 38 insertions(+), 34 deletions(-)

diff --git a/src/assets/lang/en.js b/src/assets/lang/en.js
index b57bc1e..44cbc70 100644
--- a/src/assets/lang/en.js
+++ b/src/assets/lang/en.js
@@ -18,6 +18,7 @@
     preservation: 'Preservation',
     close: 'Close',
     see: 'See',
+    index: 'index',
   },
   dataManage: {
     dataManage: 'Data Manage',
@@ -210,39 +211,28 @@
     },
     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',
+      tokenId: 'Resource id',
+      tokenQuery: 'Token',
+      tokenStatus: 'Token Type',
+      whole: 'All',
+      normal: 'Normal',
+      invalid: 'Invalid',
+      index: 'Index',
+      token: 'Token',
+      duration: 'Usage time',
+      expire: 'Expiration time',
+      type: 'Type',
+      ip: 'IP address',
+      createUser: 'Creator ID',
+      createTime: 'Creation Time',
+      updateUser: 'Updater ID',
+      updateTime: 'Update Time',
       operation: 'Operation',
-      resourcetoken: 'Resource ID of the token',
-      tokeninformation: 'Token information',
-      autorenew: 'Auto renew',
+      renewal: 'Renewal',
+      addToken: 'New Token Information',
+      editToken: 'Modify token information',
+      temporary: 'Temporary',
+      fixed: 'Fixed',
     },
     operationLogObj: {
       queryRegion: 'QueryRegion',
@@ -250,7 +240,7 @@
       operationType: 'operationType',
       startTime: 'start time',
       endTime: 'end time',
-      operatingTime:"Operating Time",
+      operatingTime: 'Operating Time',
       inquire: 'inquire',
       empty: 'empty',
       num: 'num',
@@ -388,9 +378,23 @@
       delete: 'Delete',
       apply: 'Apply',
       rejection: 'Rejection',
-      companyName: 'Company name',
+      depName: 'department name',
       userexport: 'Excel user export',
       userinput: 'Excel user input',
+      userStatus: "User Status",
+      addr: "address",
+      bak: "notes",
+      contact: "contact",
+      edu: "education",
+      email: "email",
+      idcard: "idcard",
+      job: "job",
+      natives: "natives",
+      pwd: "password",
+      sex: "gender",
+      status: "status",
+      uname: "username",
+      depid: "department",
       chineseName: 'Chinese Name [User Name]',
       affiliatedUnit: 'Affiliated unit [on-the-job]',
       mobileNumber: 'Mobile number [receive SMS]',

--
Gitblit v1.9.3