From 0b3f0086bddb1669711821e1428ea89e6c5f7b78 Mon Sep 17 00:00:00 2001
From: lxl <lixuliang_hd@126.com>
Date: 星期三, 21 九月 2022 14:40:21 +0800
Subject: [PATCH] commit

---
 src/assets/lang/zh.js                |   10 ++++++++++
 src/assets/lang/en.js                |   34 ++++++++++++++++++++++++++++++----
 src/views/userManage/roleManage.vue  |    6 +++---
 src/views/userManage/groupManage.vue |    6 +++---
 4 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/src/assets/lang/en.js b/src/assets/lang/en.js
index 9e4e5ec..48adb8d 100644
--- a/src/assets/lang/en.js
+++ b/src/assets/lang/en.js
@@ -263,16 +263,42 @@
     state: 'State',
   },
   userManage: {
-    userInfoManage: 'userInfoManage',
-    orgManage: 'orgManage',
-    userAuditing: 'userAuditing',
-    roleManage: 'roleManage',
+    userManage: 'User Manage',
+    userInfoManage: 'User Information Manage',
+    orgManage: 'Org Manage',
+    userAuditing: 'User Auditing',
+    UA: {
+      userName: "userName",
+      userState: "userState",
+      unitName: "unitName",
+      pass: "pass",
+      deny: "deny",
+      query: "query",
+      reset: "reset",
+      ChineseName: "ChineseName銆恥sername銆�"
+    },
+    roleManage: 'Role Manage',
+    RM: {
+      roleName: "roleName",
+      ownedSystem: 'ownedSystem',
+      add: 'add',
+      query: "query",
+      reset: "reset",
+      index: "index",
+      Permission: "Permission",
+      resourcePermission: "Resource Permission",
+      groupSetting: "groupSetting",
+      operate: 'operate',
+      one: 'one',
+    },
     groupManage: 'groupManage',
     GM: {
       groupName: "groupName",
       ownedSystem: 'ownedSystem',
       add: 'add',
       index: "index",
+      query: "query",
+      reset: "reset",
       applicationName: "applicationName",
       userSetting: "userSetting",
       roleSetting: "roleSetting",
diff --git a/src/assets/lang/zh.js b/src/assets/lang/zh.js
index c0d5970..16958c1 100644
--- a/src/assets/lang/zh.js
+++ b/src/assets/lang/zh.js
@@ -267,6 +267,16 @@
     userInfoManage: '鐢ㄦ埛淇℃伅绠$悊',
     orgManage: '缁勭粐鏈烘瀯绠$悊',
     userAuditing: '鐢ㄦ埛瀹℃牳',
+    UA: {
+      userName: "鐢ㄦ埛鍚嶇О",
+      userState: "鐢ㄦ埛鐘舵��",
+      unitName: "鍗曚綅鍚嶇О",
+      pass: "閫氳繃",
+      deny: "涓嶉�氳繃",
+      query: "鏌ヨ",
+      reset: "娓呴櫎",
+      ChineseName:"涓枃鍚嶃�愮敤鎴峰悕銆�"
+    },
     roleManage: '瑙掕壊绠$悊',
     RM: {
       roleName: "瑙掕壊鍚嶇О",
diff --git a/src/views/userManage/groupManage.vue b/src/views/userManage/groupManage.vue
index a5b1ea5..2e9301b 100644
--- a/src/views/userManage/groupManage.vue
+++ b/src/views/userManage/groupManage.vue
@@ -79,12 +79,12 @@
           width="300"
         >
           <template #default>
-            <el-button type="danger" size="small">{{
-              $t("common.delete")
-            }}</el-button>
             <el-button type="warning" size="small">{{
               $t("common.update")
             }}</el-button>
+            <el-button type="danger" size="small">{{
+              $t("common.delete")
+            }}</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/userManage/roleManage.vue b/src/views/userManage/roleManage.vue
index 3a23e71..bb43f89 100644
--- a/src/views/userManage/roleManage.vue
+++ b/src/views/userManage/roleManage.vue
@@ -84,12 +84,12 @@
           width="300"
         >
           <template #default>
-            <el-button type="danger" size="small">{{
-              $t("common.delete")
-            }}</el-button>
             <el-button type="warning" size="small">{{
               $t("common.update")
             }}</el-button>
+            <el-button type="danger" size="small">{{
+              $t("common.delete")
+            }}</el-button>
           </template>
         </el-table-column>
       </el-table>

--
Gitblit v1.9.3