From 856f0767b4ada087e9e2cb33f373e23dbcf39b85 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 07 三月 2023 17:56:59 +0800
Subject: [PATCH] update 同步 ruoyi * update element-ui 2.15.10 => 2.15.12 * update 优化 tagsView右选框，首页不应该存在关闭左侧选项 * update copyright 2023 * update 优化 监控页面图标显示 * update 优化 日志注解支持排除指定的请求参数 * update 优化 业务校验优化代码 * fix 修复 优化文件下载出现的异常 * fix 修复 修改密码日志存储明文问题 * add 新增 操作日志消耗时间属性 * update 优化 日志管理使用索引提升查询性能 * update 优化 框架时间检索使用时间默认值 00:00:00 - 23:59:59
---
ruoyi-ui/src/views/monitor/operlog/index.vue | 118 +++++++++++++++++++++++------------------------------------
1 files changed, 46 insertions(+), 72 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/operlog/index.vue b/ruoyi-ui/src/views/monitor/operlog/index.vue
index 783908b..34a3ce3 100644
--- a/ruoyi-ui/src/views/monitor/operlog/index.vue
+++ b/ruoyi-ui/src/views/monitor/operlog/index.vue
@@ -1,13 +1,12 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
<el-form-item label="绯荤粺妯″潡" prop="title">
<el-input
v-model="queryParams.title"
placeholder="璇疯緭鍏ョ郴缁熸ā鍧�"
clearable
style="width: 240px;"
- size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -17,7 +16,6 @@
placeholder="璇疯緭鍏ユ搷浣滀汉鍛�"
clearable
style="width: 240px;"
- size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
@@ -26,14 +24,13 @@
v-model="queryParams.businessType"
placeholder="鎿嶄綔绫诲瀷"
clearable
- size="small"
style="width: 240px"
>
<el-option
- v-for="dict in typeOptions"
- :key="dict.dictValue"
- :label="dict.dictLabel"
- :value="dict.dictValue"
+ v-for="dict in dict.type.sys_oper_type"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
/>
</el-select>
</el-form-item>
@@ -42,27 +39,26 @@
v-model="queryParams.status"
placeholder="鎿嶄綔鐘舵��"
clearable
- size="small"
style="width: 240px"
>
<el-option
- v-for="dict in statusOptions"
- :key="dict.dictValue"
- :label="dict.dictLabel"
- :value="dict.dictValue"
+ v-for="dict in dict.type.sys_common_status"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
/>
</el-select>
</el-form-item>
<el-form-item label="鎿嶄綔鏃堕棿">
<el-date-picker
v-model="dateRange"
- size="small"
style="width: 240px"
- value-format="yyyy-MM-dd"
+ value-format="yyyy-MM-dd HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
+ :default-time="['00:00:00', '23:59:59']"
></el-date-picker>
</el-form-item>
<el-form-item>
@@ -99,7 +95,6 @@
plain
icon="el-icon-download"
size="mini"
- :loading="exportLoading"
@click="handleExport"
v-hasPermi="['monitor:operlog:export']"
>瀵煎嚭</el-button>
@@ -108,26 +103,30 @@
</el-row>
<el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
- <el-table-column type="selection" width="55" align="center" />
+ <el-table-column type="selection" width="50" align="center" />
<el-table-column label="鏃ュ織缂栧彿" align="center" prop="operId" />
- <el-table-column label="绯荤粺妯″潡" align="center" prop="title" />
+ <el-table-column label="绯荤粺妯″潡" align="center" prop="title" :show-overflow-tooltip="true" />
<el-table-column label="鎿嶄綔绫诲瀷" align="center" prop="businessType">
<template slot-scope="scope">
- <dict-tag :options="typeOptions" :value="scope.row.businessType"/>
+ <dict-tag :options="dict.type.sys_oper_type" :value="scope.row.businessType"/>
</template>
</el-table-column>
- <el-table-column label="璇锋眰鏂瑰紡" align="center" prop="requestMethod" />
- <el-table-column label="鎿嶄綔浜哄憳" align="center" prop="operName" width="100" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
+ <el-table-column label="鎿嶄綔浜哄憳" align="center" prop="operName" width="110" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
<el-table-column label="鎿嶄綔鍦板潃" align="center" prop="operIp" width="130" :show-overflow-tooltip="true" />
<el-table-column label="鎿嶄綔鍦扮偣" align="center" prop="operLocation" :show-overflow-tooltip="true" />
<el-table-column label="鎿嶄綔鐘舵��" align="center" prop="status">
<template slot-scope="scope">
- <dict-tag :options="statusOptions" :value="scope.row.status"/>
+ <dict-tag :options="dict.type.sys_common_status" :value="scope.row.status"/>
</template>
</el-table-column>
- <el-table-column label="鎿嶄綔鏃ユ湡" align="center" prop="operTime" sortable="custom" :sort-orders="['descending', 'ascending']" width="180">
+ <el-table-column label="鎿嶄綔鏃ユ湡" align="center" prop="operTime" width="160" sortable="custom" :sort-orders="['descending', 'ascending']">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.operTime) }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="娑堣�楁椂闂�" align="center" prop="costTime" width="110" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']">
+ <template slot-scope="scope">
+ <span>{{ scope.row.costTime }}姣</span>
</template>
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
@@ -174,13 +173,16 @@
<el-col :span="24">
<el-form-item label="杩斿洖鍙傛暟锛�">{{ form.jsonResult }}</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="6">
<el-form-item label="鎿嶄綔鐘舵�侊細">
<div v-if="form.status === 0">姝ｅ父</div>
<div v-else-if="form.status === 1">澶辫触</div>
</el-form-item>
</el-col>
- <el-col :span="12">
+ <el-col :span="8">
+ <el-form-item label="娑堣�楁椂闂达細">{{ form.costTime }}姣</el-form-item>
+ </el-col>
+ <el-col :span="10">
<el-form-item label="鎿嶄綔鏃堕棿锛�">{{ parseTime(form.operTime) }}</el-form-item>
</el-col>
<el-col :span="24">
@@ -196,16 +198,15 @@
</template>
<script>
-import { list, delOperlog, cleanOperlog, exportOperlog } from "@/api/monitor/operlog";
+import { list, delOperlog, cleanOperlog } from "@/api/monitor/operlog";
export default {
name: "Operlog",
+ dicts: ['sys_oper_type', 'sys_common_status'],
data() {
return {
// 閬僵灞�
loading: true,
- // 瀵煎嚭閬僵灞�
- exportLoading: false,
// 閫変腑鏁扮粍
ids: [],
// 闈炲涓鐢�
@@ -218,10 +219,6 @@
list: [],
// 鏄惁鏄剧ず寮瑰嚭灞�
open: false,
- // 绫诲瀷鏁版嵁瀛楀吀
- typeOptions: [],
- // 绫诲瀷鏁版嵁瀛楀吀
- statusOptions: [],
// 鏃ユ湡鑼冨洿
dateRange: [],
// 榛樿鎺掑簭
@@ -241,12 +238,6 @@
},
created() {
this.getList();
- this.getDicts("sys_oper_type").then(response => {
- this.typeOptions = response.data;
- });
- this.getDicts("sys_common_status").then(response => {
- this.statusOptions = response.data;
- });
},
methods: {
/** 鏌ヨ鐧诲綍鏃ュ織 */
@@ -261,7 +252,7 @@
},
// 鎿嶄綔鏃ュ織绫诲瀷瀛楀吀缈昏瘧
typeFormat(row, column) {
- return this.selectDictLabel(this.typeOptions, row.businessType);
+ return this.selectDictLabel(this.dict.type.sys_oper_type, row.businessType);
},
/** 鎼滅储鎸夐挳鎿嶄綔 */
handleQuery() {
@@ -272,8 +263,8 @@
resetQuery() {
this.dateRange = [];
this.resetForm("queryForm");
+ this.queryParams.pageNum = 1;
this.$refs.tables.sort(this.defaultSort.prop, this.defaultSort.order)
- this.handleQuery();
},
/** 澶氶�夋閫変腑鏁版嵁 */
handleSelectionChange(selection) {
@@ -294,44 +285,27 @@
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
handleDelete(row) {
const operIds = row.operId || this.ids;
- this.$confirm('鏄惁纭鍒犻櫎鏃ュ織缂栧彿涓�"' + operIds + '"鐨勬暟鎹」?', "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(function() {
- return delOperlog(operIds);
- }).then(() => {
- this.getList();
- this.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
+ this.$modal.confirm('鏄惁纭鍒犻櫎鏃ュ織缂栧彿涓�"' + operIds + '"鐨勬暟鎹」锛�').then(function() {
+ return delOperlog(operIds);
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+ }).catch(() => {});
},
/** 娓呯┖鎸夐挳鎿嶄綔 */
handleClean() {
- this.$confirm('鏄惁纭娓呯┖鎵�鏈夋搷浣滄棩蹇楁暟鎹」?', "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(function() {
- return cleanOperlog();
- }).then(() => {
- this.getList();
- this.msgSuccess("娓呯┖鎴愬姛");
- }).catch(() => {});
+ this.$modal.confirm('鏄惁纭娓呯┖鎵�鏈夋搷浣滄棩蹇楁暟鎹」锛�').then(function() {
+ return cleanOperlog();
+ }).then(() => {
+ this.getList();
+ this.$modal.msgSuccess("娓呯┖鎴愬姛");
+ }).catch(() => {});
},
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
handleExport() {
- const queryParams = this.queryParams;
- this.$confirm('鏄惁纭瀵煎嚭鎵�鏈夋搷浣滄棩蹇楁暟鎹」?', "璀﹀憡", {
- confirmButtonText: "纭畾",
- cancelButtonText: "鍙栨秷",
- type: "warning"
- }).then(() => {
- this.exportLoading = true;
- return exportOperlog(queryParams);
- }).then(response => {
- this.download(response.msg);
- this.exportLoading = false;
- }).catch(() => {});
+ this.download('monitor/operlog/export', {
+ ...this.queryParams
+ }, `operlog_${new Date().getTime()}.xlsx`)
}
}
};
--
Gitblit v1.9.3