From 11014c335946291aff7d33e22e785d18c678f886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=B0=B4=E8=90=BD=28YangLei=29?= <lzi.love@icloud.com>
Date: Wed, 30 Jun 2021 23:16:38 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=94=A8=E6=88=B7=E4=B8=AD=E5=BF=83bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=8C=E8=A1=A8=E6=A0=BC=E5=88=86=E9=A1=B5?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/index.vue                |  1 +
 src/pages/system/view/log/operation/index.vue |  7 +--
 src/pages/system/view/user/UserManagement.vue | 46 -------------------
 src/pages/system/view/user/index.js           |  3 --
 src/pages/user/components/info.vue            | 10 ++++
 5 files changed, 13 insertions(+), 54 deletions(-)
 delete mode 100644 src/pages/system/view/user/UserManagement.vue
 delete mode 100644 src/pages/system/view/user/index.js

diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index 40af63d..c4a0f34 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -140,6 +140,7 @@ export default {
                       current: this.initQuery.pageNum,
                       pageSize: this.initQuery.pageSize,
                       total: this.total,
+                      showQuickJumper: true,
                   };
         },
         isRowSelection() {
diff --git a/src/pages/system/view/log/operation/index.vue b/src/pages/system/view/log/operation/index.vue
index 87f09df..a4747fa 100644
--- a/src/pages/system/view/log/operation/index.vue
+++ b/src/pages/system/view/log/operation/index.vue
@@ -21,8 +21,8 @@
                     valueFormat="YYYY-MM-DD HH:mm:ss"
                 />
             </my-form-item>
-            <my-form-item label="登录用户">
-                <a-input v-model="query.userId" />
+            <my-form-item label="操作用户Id">
+                <a-input v-model="query.operatorId" />
             </my-form-item>
             <my-form-item label="业务模块">
                 <a-select v-model="query.loginType" allowClear>
@@ -61,9 +61,6 @@ export default {
         };
     },
     methods: {
-        refreshTable() {
-            this.$refs.table.getData();
-        },
         showDrawer(type, noFooter) {
             this.$refs['table'].show({ type, noFooter });
         },
diff --git a/src/pages/system/view/user/UserManagement.vue b/src/pages/system/view/user/UserManagement.vue
deleted file mode 100644
index b810432..0000000
--- a/src/pages/system/view/user/UserManagement.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-    <my-table url="table" addBtn="addBtn">
-        <template #search="{query}">
-            <a-form-model-item label="所属组织">
-                <a-input v-model="query.name" />
-            </a-form-model-item>
-            <a-form-model-item label="所属组织">
-                <a-input v-model="query.name" />
-            </a-form-model-item>
-            <a-form-model-item label="所属组织">
-                <a-input v-model="query.name" />
-            </a-form-model-item>
-            <a-form-model-item label="所属组织">
-                <a-input v-model="query.name" />
-            </a-form-model-item>
-            <a-form-model-item label="所属组织">
-                <a-input v-model="query.name" />
-            </a-form-model-item>
-            <a-form-model-item label="所属组织">
-                <a-input v-model="query.name" />
-            </a-form-model-item>
-        </template>
-        <template #add>
-            <a-input v-model="add.name" />
-        </template>
-        <a-table-column title="姓名" data-index="name" />
-        <a-table-column title="操作">
-            <template #default="row">
-                <span>
-                    <a> {{ row }}</a>
-                    <a-divider type="vertical" />
-                    <a>Delete</a>
-                </span>
-            </template>
-        </a-table-column>
-    </my-table>
-</template>
-
-<script>
-export default {
-    data: () => ({
-        add: {},
-        addBtn: {},
-    }),
-};
-</script>
diff --git a/src/pages/system/view/user/index.js b/src/pages/system/view/user/index.js
deleted file mode 100644
index 39c7198..0000000
--- a/src/pages/system/view/user/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import UserManagement from './UserManagement';
-
-export default UserManagement;
\ No newline at end of file
diff --git a/src/pages/user/components/info.vue b/src/pages/user/components/info.vue
index 9bc1b92..eba3c97 100644
--- a/src/pages/user/components/info.vue
+++ b/src/pages/user/components/info.vue
@@ -54,6 +54,16 @@ export default {
             return this.form.userAvatar ? `${this.$fileUrl}${this.form.userAvatar}` : null;
         },
     },
+    mounted() {
+        if (this.loginId) {
+            const userInfo = this.$store.state.userInfo;
+            this.form.userName = userInfo.userName;
+            this.form.fixedPhone = userInfo.fixedPhone;
+            this.form.mobilePhone = userInfo.mobilePhone;
+            this.form.userEmail = userInfo.userEmail;
+            this.form.userAvatar = userInfo.userAvatar;
+        }
+    },
     watch: {
         '$store.state.userInfo'(userInfo) {
             this.form.userName = userInfo.userName;
-- 
GitLab