From 5313d8736c40de0693f89dce77cb93e9983b5ace Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期五, 01 九月 2023 14:30:21 +0800
Subject: [PATCH] 添加   角色列表中英文json包

---
 CanadaMes-ui/src/views/user/index.vue |   61 ++++++++++++++++++++----------
 1 files changed, 41 insertions(+), 20 deletions(-)

diff --git a/CanadaMes-ui/src/views/user/index.vue b/CanadaMes-ui/src/views/user/index.vue
index 0a0421c..b2bf51c 100644
--- a/CanadaMes-ui/src/views/user/index.vue
+++ b/CanadaMes-ui/src/views/user/index.vue
@@ -67,15 +67,19 @@
         </el-table-column>
       </el-table>
       <!--鍒嗛〉鍖哄煙-->
-      <el-pagination
-          @size-change="handleSizeChange"
-          @current-change="handleCurrentChange"
-          :current-page="queryInfo.pageNum"
-          :page-sizes="[10, 20, 30, 40]"
-          :page-size="queryInfo.pageSize"
-          layout="total, sizes, prev, pager, next, jumper"
-          :total="userList.total">
-      </el-pagination>
+       <el-pagination
+      @size-change="handleSizeChange"
+      @current-change="handleCurrentChange"
+      :current-page="queryInfo.pageNum"
+      :page-sizes="[6, 12, 18, 24]"
+      :page-size="queryInfo.pageSize"
+      :total="userList.total"
+      :prev-text="$t('pagination.prev')"
+      :next-text="$t('pagination.next')"
+      :pager-count="7"
+      :layout="layout"
+    >
+    </el-pagination>
     </el-card>
     <!--娣诲姞鐢ㄦ埛鐨勫璇濇-->
     <el-dialog
@@ -131,7 +135,7 @@
         <el-form-item :label="$t('langUsername')" prop="username">
           <el-input v-model="editUserForm.username" disabled></el-input>
         </el-form-item>
-        <el-form-item label="瑙掕壊" prop="roleId">
+        <el-form-item :label="$t('role')" prop="roleId">
           <el-select filterable v-model="editUserForm.roleId" placeholder="璇烽�夋嫨">
             <el-option v-for="item in roleList"
                        :key="item.id"
@@ -170,11 +174,13 @@
 export default {
   name: "User",
   mixins: [LanguageMixin],
+
   data() {
     return {
+      layout: 'total, sizes, prev, pager, next, jumper',
       queryInfo: {
         pageNum: 1,
-        pageSize: 10
+        pageSize: 6
       },
       userList: {
         records: [],
@@ -227,6 +233,7 @@
         this.userList.records = res.data.records;
         this.userList.total = res.data.total
       });
+    
 //       test().then(res => {
 //         console.log(res.data)
 //       });
@@ -248,25 +255,39 @@
 //       });
 
     },
-   
+  
     showAddDialog() {
       this.addDialogVisible = true;
        select().then(res => {
   this.roleList = res.data;
 });
     },
+    // stateChange(info) {
+    //   saveOrUpdate(info).then(() => {
+    //     this.$message.success("鏇存柊鐘舵�佹垚鍔�")
+    //   });
+    // },
     stateChange(info) {
-      saveOrUpdate(info).then(() => {
-        this.$message.success("鏇存柊鐘舵�佹垚鍔�")
-      });
-    },
+  saveOrUpdate(info).then(() => {
+    const successMessage = this.$t('updateSuccessMessage');
+    this.$message.success(successMessage);
+  });
+},
     resetPassword(info) {
+  this.$confirm('纭閲嶇疆瀵嗙爜涓洪粯璁ゅ�煎悧锛�', '閲嶇疆瀵嗙爜', {
+    confirmButtonText: '纭畾',
+    cancelButtonText: '鍙栨秷',
+    type: 'warning',
+  })
+    .then(() => {
       resetPass(info).then(() => {
-        this.$message.success("瀵嗙爜宸查噸缃负榛樿鍊�");
+        this.$message.success('瀵嗙爜宸查噸缃负榛樿鍊�');
       });
-  
-   
-  },
+    })
+    .catch(() => {
+      // 鐢ㄦ埛鍙栨秷閲嶇疆瀵嗙爜鎿嶄綔
+    });
+},
     showEditDialog(id) {
       getById({id: id}).then(res => {
         this.editUserForm = res.data;

--
Gitblit v1.8.0