From 0053138f9fb3c4bdab4f95962e6877225327c64a 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 20:18:23 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/index.vue                |  6 +-
 .../footer/LayoutCopyrightFooter.vue          | 46 -----------
 .../header/LayoutTopHeaderAvatar.vue          | 11 +--
 src/pages/frame/layouts/AdminLayout.vue       | 10 +--
 src/pages/frame/layouts/CommonLayout.vue      |  3 -
 src/pages/system/view/log/LogManagement.vue   |  4 -
 src/pages/system/view/log/index.js            |  3 -
 src/pages/system/view/log/login_log/form.vue  |  3 -
 src/pages/system/view/log/operation/form.vue  |  9 +++
 src/pages/system/view/log/operation/index.vue | 76 +++++++++++++++++++
 src/pages/user/components/info.vue            |  5 +-
 src/router/async/router.map.js                | 25 +++---
 src/router/config.js                          |  5 ++
 13 files changed, 113 insertions(+), 93 deletions(-)
 delete mode 100644 src/pages/frame/components/footer/LayoutCopyrightFooter.vue
 delete mode 100644 src/pages/system/view/log/LogManagement.vue
 delete mode 100644 src/pages/system/view/log/index.js
 delete mode 100644 src/pages/system/view/log/login_log/form.vue
 create mode 100644 src/pages/system/view/log/operation/form.vue
 create mode 100644 src/pages/system/view/log/operation/index.vue

diff --git a/src/components/table/index.vue b/src/components/table/index.vue
index 2e808aa..40af63d 100644
--- a/src/components/table/index.vue
+++ b/src/components/table/index.vue
@@ -51,11 +51,11 @@
             placement="right"
             :visible="addVisible"
             @close="addDrawerClose"
-            v-if="addBtn"
-            :maskClosable="!!addBtn.maskClosable"
+            v-if="$slots.drawer"
+            :maskClosable="addBtn && !!addBtn.maskClosable"
             :drawerStyle="drawerStyle"
             :bodyStyle="bodyStyle"
-            :width="addBtn.width || 600"
+            :width="(addBtn && addBtn.width) || 600"
             destroyOnClose
         >
             <div class="tw-overflow-y-hidden">
diff --git a/src/pages/frame/components/footer/LayoutCopyrightFooter.vue b/src/pages/frame/components/footer/LayoutCopyrightFooter.vue
deleted file mode 100644
index 80b1dce..0000000
--- a/src/pages/frame/components/footer/LayoutCopyrightFooter.vue
+++ /dev/null
@@ -1,46 +0,0 @@
-<template>
-    <div class="footer">
-        <div class="links">
-            <a target="_blank" :key="index" :href="item.link ? item.link : 'javascript: void(0)'" v-for="(item, index) in linkList">
-                <a-icon v-if="item.icon" :type="item.icon" />{{item.name}}
-            </a>
-        </div>
-        <div class="copyright">
-            Copyright
-            <a-icon type="copyright" />{{copyright}}
-        </div>
-    </div>
-</template>
-
-<script>
-export default {
-    name: 'LayoutCopyrightFooter',
-    props: ['copyright', 'linkList'],
-};
-</script>
-
-<style lang="less" scoped>
-.footer {
-    padding: 48px 16px 24px;
-    /*margin: 48px 0 24px;*/
-    text-align: center;
-    .copyright {
-        color: @text-color-second;
-        font-size: 14px;
-        i {
-            margin: 0 4px;
-        }
-    }
-    .links {
-        margin-bottom: 8px;
-        a:not(:last-child) {
-            margin-right: 40px;
-        }
-        a {
-            color: @text-color-second;
-            -webkit-transition: all 0.3s;
-            transition: all 0.3s;
-        }
-    }
-}
-</style>
diff --git a/src/pages/frame/components/header/LayoutTopHeaderAvatar.vue b/src/pages/frame/components/header/LayoutTopHeaderAvatar.vue
index 9a18ec1..e5c4d66 100644
--- a/src/pages/frame/components/header/LayoutTopHeaderAvatar.vue
+++ b/src/pages/frame/components/header/LayoutTopHeaderAvatar.vue
@@ -1,12 +1,7 @@
 <template>
     <a-dropdown>
         <div class="tw-inline-flex tw-cursor-pointer tw-items-center">
-            <a-avatar
-                class="tw-mr-3"
-                size="small"
-                shape="circle"
-                :src="`${$fileUrl}${userInfo.userAvatar}`"
-            />
+            <a-avatar class="tw-mr-3" size="small" shape="circle" :src="userAvatar" />
             <span>{{ userInfo.userName }}</span>
         </div>
         <a-menu style="width: 150px" slot="overlay">
@@ -33,7 +28,9 @@ export default {
     i18n: layoutTopHeaderI18n,
     computed: {
         ...mapState(['userInfo']),
-
+        userAvatar() {
+            return this.userInfo.userAvatar ? `${this.$fileUrl}${this.userInfo.userAvatar}` : null;
+        },
         profile() {
             return this.$t('profile');
         },
diff --git a/src/pages/frame/layouts/AdminLayout.vue b/src/pages/frame/layouts/AdminLayout.vue
index 78b4fed..ad47f97 100644
--- a/src/pages/frame/layouts/AdminLayout.vue
+++ b/src/pages/frame/layouts/AdminLayout.vue
@@ -52,16 +52,12 @@
                     <slot></slot>
                 </div>
             </a-layout-content>
-            <a-layout-footer style="padding: 0px">
-                <layout-copyright-footer :link-list="footerLinks" :copyright="copyright" />
-            </a-layout-footer>
         </a-layout>
     </a-layout>
 </template>
 
 <script>
 import LayoutTopHeader from '../components/header/LayoutTopHeader';
-import LayoutCopyrightFooter from '../components/footer/LayoutCopyrightFooter';
 import Drawer from '@/components/tool/Drawer';
 import SideMenu from '@/components/menu/SideMenu';
 import Setting from '../components/setting/Setting';
@@ -71,7 +67,7 @@ import { mapState, mapMutations, mapGetters } from 'vuex';
 
 export default {
     name: 'AdminLayout',
-    components: { Setting, SideMenu, Drawer, LayoutCopyrightFooter, LayoutTopHeader },
+    components: { Setting, SideMenu, Drawer, LayoutTopHeader },
     data() {
         return {
             minHeight: window.innerHeight - 64 - 122,
@@ -204,9 +200,7 @@ export default {
         }
     }
     .admin-layout-content {
-        padding: 24px 24px 0;
-        /*overflow-x: hidden;*/
-        /*min-height: calc(100vh - 64px - 122px);*/
+        padding: 24px;
     }
     .setting {
         background-color: @primary-color;
diff --git a/src/pages/frame/layouts/CommonLayout.vue b/src/pages/frame/layouts/CommonLayout.vue
index 6743938..89799a8 100644
--- a/src/pages/frame/layouts/CommonLayout.vue
+++ b/src/pages/frame/layouts/CommonLayout.vue
@@ -3,17 +3,14 @@
         <div class="content">
             <slot></slot>
         </div>
-        <layout-copyright-footer :link-list="footerLinks" :copyright="copyright"></layout-copyright-footer>
     </div>
 </template>
 
 <script>
-import LayoutCopyrightFooter from '../components/footer/LayoutCopyrightFooter';
 import { mapState } from 'vuex';
 
 export default {
     name: 'CommonLayout',
-    components: { LayoutCopyrightFooter },
     computed: {
         ...mapState('settingModule', ['footerLinks', 'copyright']),
     },
diff --git a/src/pages/system/view/log/LogManagement.vue b/src/pages/system/view/log/LogManagement.vue
deleted file mode 100644
index 3a598db..0000000
--- a/src/pages/system/view/log/LogManagement.vue
+++ /dev/null
@@ -1,4 +0,0 @@
-<template>
-  <h1>Log Management</h1>
-</template>
- 
\ No newline at end of file
diff --git a/src/pages/system/view/log/index.js b/src/pages/system/view/log/index.js
deleted file mode 100644
index 5a0ddbd..0000000
--- a/src/pages/system/view/log/index.js
+++ /dev/null
@@ -1,3 +0,0 @@
-import LogManagement from './LogManagement';
-
-export default LogManagement;
\ No newline at end of file
diff --git a/src/pages/system/view/log/login_log/form.vue b/src/pages/system/view/log/login_log/form.vue
deleted file mode 100644
index af14550..0000000
--- a/src/pages/system/view/log/login_log/form.vue
+++ /dev/null
@@ -1,3 +0,0 @@
-<template>
-    <h1>Form</h1>
-</template>
diff --git a/src/pages/system/view/log/operation/form.vue b/src/pages/system/view/log/operation/form.vue
new file mode 100644
index 0000000..8d34d3f
--- /dev/null
+++ b/src/pages/system/view/log/operation/form.vue
@@ -0,0 +1,9 @@
+<template>
+    <pre>{{ data.operateContent }}</pre>
+</template>
+
+<script>
+export default {
+    props: ['data'],
+};
+</script>
diff --git a/src/pages/system/view/log/operation/index.vue b/src/pages/system/view/log/operation/index.vue
new file mode 100644
index 0000000..87f09df
--- /dev/null
+++ b/src/pages/system/view/log/operation/index.vue
@@ -0,0 +1,76 @@
+<template>
+    <my-table url="/api/v1/logger/operation" rowKey="logId" ref="table">
+        <template #drawer>
+            <Form :data="currentClickRow" />
+        </template>
+
+        <template #search="{query}">
+            <my-form-item label="开始时间">
+                <a-date-picker
+                    class="tw-w-full"
+                    show-time
+                    v-model="query.startTime"
+                    valueFormat="YYYY-MM-DD HH:mm:ss"
+                />
+            </my-form-item>
+            <my-form-item label="结束时间">
+                <a-date-picker
+                    class="tw-w-full"
+                    show-time
+                    v-model="query.endTime"
+                    valueFormat="YYYY-MM-DD HH:mm:ss"
+                />
+            </my-form-item>
+            <my-form-item label="登录用户">
+                <a-input v-model="query.userId" />
+            </my-form-item>
+            <my-form-item label="业务模块">
+                <a-select v-model="query.loginType" allowClear>
+                    <a-select-option value="LOGIN">登录系统</a-select-option>
+                    <a-select-option value="LOGOUT">退出系统</a-select-option>
+                </a-select>
+            </my-form-item>
+            <my-form-item label="操作服务">
+                <a-select v-model="query.isSuccess" allowClear>
+                    <a-select-option value="0">失败</a-select-option>
+                    <a-select-option value="1">成功</a-select-option>
+                </a-select>
+            </my-form-item>
+        </template>
+        <a-table-column title="用户Id" data-index="operatorId" />
+        <a-table-column title="用户名称" data-index="operatorName" />
+        <a-table-column title="业务模块" data-index="moduleCode" />
+        <a-table-column title="操作服务" data-index="serviceCode" />
+        <a-table-column title="操作时间" data-index="operateTime" />
+        <a-table-column title="操作">
+            <template #default="row">
+                <a @click="() => view(row)">详情</a>
+            </template>
+        </a-table-column>
+    </my-table>
+</template>
+
+<script>
+import Form from './form.vue';
+
+export default {
+    components: { Form },
+    data() {
+        return {
+            currentClickRow: {},
+        };
+    },
+    methods: {
+        refreshTable() {
+            this.$refs.table.getData();
+        },
+        showDrawer(type, noFooter) {
+            this.$refs['table'].show({ type, noFooter });
+        },
+        view(row) {
+            this.currentClickRow = row;
+            this.showDrawer(2, true);
+        },
+    },
+};
+</script>
diff --git a/src/pages/user/components/info.vue b/src/pages/user/components/info.vue
index b1d6157..9bc1b92 100644
--- a/src/pages/user/components/info.vue
+++ b/src/pages/user/components/info.vue
@@ -25,7 +25,7 @@
             <img
                 style="width: 100px;height: 100px"
                 class="tw-max-w-full tw-max-h-full tw-rounded-full tw-my-4"
-                :src="`${$fileUrl}${form.userAvatar}`"
+                :src="userAvatar"
             />
             <my-upload v-model="form.userAvatar" />
         </div>
@@ -50,6 +50,9 @@ export default {
         loginId() {
             return this.$store.state.userInfo.loginId;
         },
+        userAvatar() {
+            return this.form.userAvatar ? `${this.$fileUrl}${this.form.userAvatar}` : null;
+        },
     },
     watch: {
         '$store.state.userInfo'(userInfo) {
diff --git a/src/router/async/router.map.js b/src/router/async/router.map.js
index c0ba6b4..4249088 100644
--- a/src/router/async/router.map.js
+++ b/src/router/async/router.map.js
@@ -1,4 +1,3 @@
-
 // 视图组件
 const view = {
     tabs: () => import('@/pages/frame/view/template/TabsTemplateView'),
@@ -20,20 +19,20 @@ const routerMap = {
         component: view.tabs,
     },
     exp403: {
-        authority: "*",
-        name: "403错误",
-        path: "403",
-        component: () => import("@/pages/frame/view/exception/403"),
+        authority: '*',
+        name: '403错误',
+        path: '403',
+        component: () => import('@/pages/frame/view/exception/403'),
     },
     exp404: {
-        name: "404错误",
-        path: "404",
-        component: () => import("@/pages/frame/view/exception/404"),
+        name: '404错误',
+        path: '404',
+        component: () => import('@/pages/frame/view/exception/404'),
     },
     exp500: {
-        name: "500错误",
-        path: "500",
-        component: () => import("@/pages/frame/view/exception/500"),
+        name: '500错误',
+        path: '500',
+        component: () => import('@/pages/frame/view/exception/500'),
     },
     dashboard: {
         name: 'Dashboard',
@@ -72,9 +71,5 @@ const routerMap = {
         name: '参数管理',
         component: () => import('@/pages/system/view/parameter'),
     },
-    log_management: {
-        name: '日志管理',
-        component: () => import('@/pages/system/view/log'),
-    },
 };
 export default routerMap;
diff --git a/src/router/config.js b/src/router/config.js
index ae3948d..9bf1e0f 100644
--- a/src/router/config.js
+++ b/src/router/config.js
@@ -122,6 +122,11 @@ const options = {
                                     name: '登录日志',
                                     component: () => import('@/pages/system/view/log/login_log/index.vue'),
                                 },
+                                {
+                                    path: 'operation_log',
+                                    name: '操作日志',
+                                    component: () => import('@/pages/system/view/log/operation/index.vue'),
+                                },
                             ],
                         },
                         {
-- 
GitLab