From a15e8b0d05b45805749140151043796ebf3beac8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=B9=81=E8=8A=B1=E8=90=BD=E5=B0=BD?= <821072292@qq.com>
Date: Mon, 22 Jan 2024 03:44:31 +0000
Subject: [PATCH] =?UTF-8?q?update=20vue/y9vue-kernel-standard/src/views/sy?=
 =?UTF-8?q?sManagerLog/operationLogs.vue.=20=E6=97=A5=E6=9C=9F=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 繁花落尽 <821072292@qq.com>
---
 .../src/views/sysManagerLog/operationLogs.vue | 143 ++++++++++--------
 1 file changed, 81 insertions(+), 62 deletions(-)

diff --git a/vue/y9vue-kernel-standard/src/views/sysManagerLog/operationLogs.vue b/vue/y9vue-kernel-standard/src/views/sysManagerLog/operationLogs.vue
index 73f97ac4..bef15bdd 100644
--- a/vue/y9vue-kernel-standard/src/views/sysManagerLog/operationLogs.vue
+++ b/vue/y9vue-kernel-standard/src/views/sysManagerLog/operationLogs.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: your name
  * @Date: 2022-05-05 09:43:05
- * @LastEditTime: 2023-08-03 11:21:10
+ * @LastEditTime: 2024-01-05 10:39:25
  * @LastEditors: mengjuhua
  * @Description: 系统管理员日志 - 操作日志  
 -->
@@ -12,10 +12,10 @@
                 <y9Table
                     ref="filterRef"
                     :config="operationLogsTable"
+                    :filterConfig="filterOperaConfig"
+                    border
                     @on-curr-page-change="handlerPageChange"
                     @on-page-size-change="handlerSizeChange"
-                    border
-                    :filterConfig="filterOperaConfig"
                     @window-height-change="windowHeightChange"
                 >
                     <template v-slot:slotDate>
@@ -23,15 +23,15 @@
                             <el-form-item :label="$t('操作时间')" :size="fontSizeObj.buttonSize">
                                 <el-date-picker
                                     v-model="selectedDate"
-                                    type="daterange"
+                                    :end-placeholder="$t('结束时间')"
                                     :range-separator="$t('至')"
                                     :shortcuts="shortcuts"
                                     :start-placeholder="$t('开始时间')"
-                                    :end-placeholder="$t('结束时间')"
                                     format="YYYY-MM-DD"
+                                    style="width: 100%; height: var(--el-input-height)"
+                                    type="daterange"
                                     value-format="YYYY-MM-DD"
                                     @change="selectdDate()"
-                                    style="width: 100%; height: var(--el-input-height)"
                                 ></el-date-picker>
                             </el-form-item>
                         </el-form>
@@ -39,20 +39,20 @@
                     <template v-slot:slotSearch>
                         <el-divider content-position="center">
                             <el-button
-                                class="global-btn-main"
-                                type="primary"
                                 :size="fontSizeObj.buttonSize"
                                 :style="{ fontSize: fontSizeObj.baseFontSize }"
+                                class="global-btn-main"
+                                type="primary"
                                 @click="search()"
-                                >{{ $t('查询') }}</el-button
-                            >
+                                >{{ $t('查询') }}
+                            </el-button>
                             <el-button
-                                class="global-btn-second"
-                                :style="{ fontSize: fontSizeObj.baseFontSize }"
                                 :size="fontSizeObj.buttonSize"
+                                :style="{ fontSize: fontSizeObj.baseFontSize }"
+                                class="global-btn-second"
                                 @click="reset()"
-                                >{{ $t('重置') }}</el-button
-                            >
+                                >{{ $t('重置') }}
+                            </el-button>
                         </el-divider>
                     </template>
                 </y9Table>
@@ -62,10 +62,12 @@
 </template>
 
 <script lang="ts" setup>
-    import { inject, ref, computed } from 'vue';
+    import { computed, inject, ref } from 'vue';
     import { searchLogInfoList4SystemManagers } from '@/api/log/index';
     import { useSettingStore } from '@/store/modules/settingStore';
     import { useI18n } from 'vue-i18n';
+    import moment from 'moment';
+
     const { t } = useI18n();
     const settingStore = useSettingStore();
     // 注入 字体对象
@@ -83,7 +85,7 @@
                 const start = new Date();
                 start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
                 return [start, end];
-            },
+            }
         },
         {
             text: t('最近一个月'),
@@ -92,7 +94,7 @@
                 const start = new Date();
                 start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
                 return [start, end];
-            },
+            }
         },
         {
             text: t('最近三个月'),
@@ -101,8 +103,8 @@
                 const start = new Date();
                 start.setTime(start.getTime() - 3600 * 1000 * 24 * 90);
                 return [start, end];
-            },
-        },
+            }
+        }
     ];
 
     const selectdDate = () => {
@@ -121,7 +123,7 @@
                 key: 'userName',
                 label: computed(() => t('用户名称')),
                 labelWidth: '82px',
-                span: settingStore.device === 'mobile' ? 24 : 6,
+                span: settingStore.device === 'mobile' ? 24 : 6
             },
             {
                 type: 'input',
@@ -129,7 +131,7 @@
                 key: 'userHostIp',
                 labelWidth: '82px',
                 label: computed(() => t('客户端IP')),
-                span: settingStore.device === 'mobile' ? 24 : 6,
+                span: settingStore.device === 'mobile' ? 24 : 6
             },
             {
                 type: 'input',
@@ -137,7 +139,7 @@
                 key: 'modularName',
                 label: computed(() => t('模块名称')),
                 labelWidth: '82px',
-                span: settingStore.device === 'mobile' ? 24 : 6,
+                span: settingStore.device === 'mobile' ? 24 : 6
             },
             {
                 type: 'input',
@@ -145,7 +147,7 @@
                 key: 'operateName',
                 label: computed(() => t('操作名称')),
                 labelWidth: '82px',
-                span: settingStore.device === 'mobile' ? 24 : 6,
+                span: settingStore.device === 'mobile' ? 24 : 6
             },
             {
                 type: 'select',
@@ -158,47 +160,51 @@
                         //选项列表
                         {
                             label: computed(() => t('全部')),
-                            value: '',
+                            value: ''
                         },
                         {
                             label: computed(() => t('使用')),
-                            value: '使用',
+                            value: '使用'
                         },
                         {
                             label: computed(() => t('登录')),
-                            value: '登录',
+                            value: '登录'
                         },
                         {
                             label: computed(() => t('退出')),
-                            value: '退出',
+                            value: '退出'
                         },
                         {
                             label: computed(() => t('查看')),
-                            value: '查看',
+                            value: '查看'
                         },
                         {
                             label: computed(() => t('增加')),
-                            value: '增加',
+                            value: '增加'
                         },
                         {
                             label: computed(() => t('修改')),
-                            value: '修改',
+                            value: '修改'
                         },
                         {
                             label: computed(() => t('删除')),
-                            value: '删除',
+                            value: '删除'
                         },
                         {
                             label: computed(() => t('发送')),
-                            value: '发送',
+                            value: '发送'
                         },
                         {
                             label: computed(() => t('活动')),
-                            value: '活动',
+                            value: '活动'
                         },
-                    ],
+                        {
+                            label: computed(() => t('检查')),
+                            value: '检查'
+                        }
+                    ]
                 },
-                span: settingStore.device === 'mobile' ? 24 : 6,
+                span: settingStore.device === 'mobile' ? 24 : 6
             },
             {
                 type: 'select',
@@ -211,19 +217,19 @@
                         //选项列表
                         {
                             label: computed(() => t('全部')),
-                            value: '',
+                            value: ''
                         },
                         {
                             label: computed(() => t('成功')),
-                            value: '成功',
+                            value: '成功'
                         },
                         {
                             label: computed(() => t('出错')),
-                            value: '出错',
-                        },
-                    ],
+                            value: '出错'
+                        }
+                    ]
                 },
-                span: settingStore.device === 'mobile' ? 24 : 6,
+                span: settingStore.device === 'mobile' ? 24 : 6
             },
             {
                 type: 'select',
@@ -236,52 +242,52 @@
                         //选项列表
                         {
                             label: computed(() => t('全部')),
-                            value: '',
+                            value: ''
                         },
                         {
                             label: computed(() => t('错误')),
-                            value: 'ERROR',
+                            value: 'ERROR'
                         },
                         {
                             label: computed(() => t('警告')),
-                            value: 'WARN',
+                            value: 'WARN'
                         },
                         {
                             label: computed(() => t('调试')),
-                            value: 'DEBUG',
+                            value: 'DEBUG'
                         },
                         {
                             label: computed(() => t('跟踪')),
-                            value: 'TRACE',
+                            value: 'TRACE'
                         },
                         {
                             label: computed(() => t('记录日志')),
-                            value: 'RSLOG',
+                            value: 'RSLOG'
                         },
                         {
                             label: computed(() => t('管理日志')),
-                            value: 'MANAGERLOG',
+                            value: 'MANAGERLOG'
                         },
                         {
                             label: computed(() => t('通知')),
-                            value: 'INFO',
-                        },
-                    ],
+                            value: 'INFO'
+                        }
+                    ]
                 },
-                span: settingStore.device === 'mobile' ? 24 : 6,
+                span: settingStore.device === 'mobile' ? 24 : 6
             },
             {
                 type: 'slot',
                 slotName: 'slotDate',
-                span: settingStore.device === 'mobile' ? 24 : 6,
+                span: settingStore.device === 'mobile' ? 24 : 6
             },
             {
                 type: 'slot',
                 slotName: 'slotSearch',
-                span: 24,
-            },
+                span: 24
+            }
         ],
-        showBorder: true,
+        showBorder: true
         // borderRadio: '4px'
     });
 
@@ -296,7 +302,8 @@
             var hour = logTime.getHours() < 10 ? '0' + logTime.getHours() : logTime.getHours();
             var minute = logTime.getMinutes() < 10 ? '0' + logTime.getMinutes() : logTime.getMinutes();
             var second = logTime.getSeconds() < 10 ? '0' + logTime.getSeconds() : logTime.getSeconds();
-            return year + '-' + month + '-' + date + ' ' + hour + ':' + minute + ':' + second;
+            // return year + '-' + month + '-' + date + ' ' + hour + ':' + minute + ':' + second;
+            return moment(row.logTime).format('YYYY-MM-DD HH:mm:ss');
         } else {
             return cellValue;
         }
@@ -317,6 +324,7 @@
     function windowHeightChange(tableHeight) {
         operationLogsTable.value.maxHeight = tableHeight - 35 - 35; //35 35 是y9-card-content样式中上padding、下padding的值
     }
+
     // 表格 配置
     let operationLogsTable = ref({
         columns: [
@@ -349,24 +357,24 @@
                         case 'INFO':
                             return '通知';
                     }
-                },
+                }
             },
             { title: computed(() => t('操作用时')), key: 'elapsedTime', formatter: elapsedTimeFormat, width: 150 },
             {
                 title: computed(() => t('操作时间')),
                 key: 'logTime',
                 formatter: logTimeFormat,
-                width: settingStore.getDatetimeSpan,
+                width: settingStore.getDatetimeSpan
             },
-            { title: computed(() => t('错误信息')), key: 'throwable' },
+            { title: computed(() => t('错误信息')), key: 'throwable' }
         ],
         tableData: [],
         pageConfig: {
             currentPage: 1, //当前页数，支持 v-model 双向绑定
             pageSize: 20, //每页显示条目个数，支持 v-model 双向绑定
-            total: 0, //总条目数
+            total: 0 //总条目数
         },
-        loading: false,
+        loading: false
     });
 
     // 初始化列表
@@ -382,6 +390,7 @@
         operationLogsTable.value.pageConfig.currentPage = res.currPage || 1;
         operationLogsTable.value.loading = false;
     }
+
     getDataList();
 
     const refreshTable = () => {
@@ -410,6 +419,7 @@
         operationLogsTable.value.pageConfig.currentPage = currPage;
         getDataList();
     }
+
     //每页条数改变时触发
     function handlerSizeChange(pageSize) {
         operationLogsTable.value.pageConfig.pageSize = pageSize;
@@ -420,6 +430,7 @@
     .userLog .content {
         width: auto;
         margin: 0 auto;
+
         .pagination-style {
             display: flex;
             justify-content: v-bind("settingStore.device === 'mobile'?'flex-start':'flex-end'");
@@ -427,16 +438,20 @@
             overflow: auto;
             scrollbar-width: none;
         }
+
         :deep(.y9-card-content) {
             padding: 35px 20px;
+
             .el-divider--horizontal {
                 margin: 20px 0 30px 0;
             }
         }
     }
+
     :deep(.el-divider__text) {
         display: flex;
     }
+
     :deep(.el-form-item__label) {
         width: 90px;
         display: flex;
@@ -445,15 +460,19 @@
         align-items: center;
         line-height: 18px;
     }
+
     :deep(.el-date-range-picker__time-header) {
         display: none;
     }
+
     :deep(.el-form-item__content) {
         align-items: stretch;
     }
+
     :deep(.el-form-item) {
         margin: 0;
     }
+
     :deep(.el-date-editor) {
         i,
         input {
-- 
Gitee