From e3d4018c143cd8127e31091f7da6f278ebb81dfd Mon Sep 17 00:00:00 2001
From: likaikai <593496637@qq.com>
Date: 星期六, 29 六月 2024 14:11:19 +0800
Subject: [PATCH] chore:1.修复升级element-plus后el-radio使用label过期的问题。2.修复DictTag组件缺少type的问题
---
src/views/monitor/operlog/index.vue | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index 2ac5ea0..5405f4c 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -1,6 +1,15 @@
<template>
<div class="app-container">
<el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form-item label="鎿嶄綔鍦板潃" prop="operIp">
+ <el-input
+ v-model="queryParams.operIp"
+ placeholder="璇疯緭鍏ユ搷浣滃湴鍧�"
+ clearable
+ style="width: 240px;"
+ @keyup.enter="handleQuery"
+ />
+ </el-form-item>
<el-form-item label="绯荤粺妯″潡" prop="title">
<el-input
v-model="queryParams.title"
@@ -52,11 +61,12 @@
<el-form-item label="鎿嶄綔鏃堕棿" style="width: 308px">
<el-date-picker
v-model="dateRange"
- value-format="YYYY-MM-DD"
+ value-format="YYYY-MM-DD HH:mm:ss"
type="daterange"
range-separator="-"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
+ :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
></el-date-picker>
</el-form-item>
<el-form-item>
@@ -107,7 +117,7 @@
</template>
</el-table-column>
<el-table-column label="鎿嶄綔浜哄憳" align="center" width="110" prop="operName" :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="operIp" width="130" :show-overflow-tooltip="true" />
<el-table-column label="鎿嶄綔鐘舵��" align="center" prop="status">
<template #default="scope">
<dict-tag :options="sys_common_status" :value="scope.row.status" />
@@ -139,7 +149,7 @@
/>
<!-- 鎿嶄綔鏃ュ織璇︾粏 -->
- <el-dialog title="鎿嶄綔鏃ュ織璇︾粏" v-model="open" width="700px" append-to-body>
+ <el-dialog title="鎿嶄綔鏃ュ織璇︾粏" v-model="open" width="800px" append-to-body>
<el-form :model="form" label-width="100px">
<el-row>
<el-col :span="12">
@@ -161,7 +171,7 @@
<el-col :span="24">
<el-form-item label="杩斿洖鍙傛暟锛�">{{ form.jsonResult }}</el-form-item>
</el-col>
- <el-col :span="6">
+ <el-col :span="8">
<el-form-item label="鎿嶄綔鐘舵�侊細">
<div v-if="form.status === 0">姝ｅ父</div>
<div v-else-if="form.status === 1">澶辫触</div>
@@ -170,7 +180,7 @@
<el-col :span="8">
<el-form-item label="娑堣�楁椂闂达細">{{ form.costTime }}姣</el-form-item>
</el-col>
- <el-col :span="10">
+ <el-col :span="8">
<el-form-item label="鎿嶄綔鏃堕棿锛�">{{ parseTime(form.operTime) }}</el-form-item>
</el-col>
<el-col :span="24">
@@ -210,6 +220,7 @@
queryParams: {
pageNum: 1,
pageSize: 10,
+ operIp: undefined,
title: undefined,
operName: undefined,
businessType: undefined,
@@ -228,15 +239,18 @@
loading.value = false;
});
}
+
/** 鎿嶄綔鏃ュ織绫诲瀷瀛楀吀缈昏瘧 */
function typeFormat(row, column) {
return proxy.selectDictLabel(sys_oper_type.value, row.businessType);
}
+
/** 鎼滅储鎸夐挳鎿嶄綔 */
function handleQuery() {
queryParams.value.pageNum = 1;
getList();
}
+
/** 閲嶇疆鎸夐挳鎿嶄綔 */
function resetQuery() {
dateRange.value = [];
@@ -244,22 +258,26 @@
queryParams.value.pageNum = 1;
proxy.$refs["operlogRef"].sort(defaultSort.value.prop, defaultSort.value.order);
}
+
/** 澶氶�夋閫変腑鏁版嵁 */
function handleSelectionChange(selection) {
ids.value = selection.map(item => item.operId);
multiple.value = !selection.length;
}
+
/** 鎺掑簭瑙﹀彂浜嬩欢 */
function handleSortChange(column, prop, order) {
queryParams.value.orderByColumn = column.prop;
queryParams.value.isAsc = column.order;
getList();
}
+
/** 璇︾粏鎸夐挳鎿嶄綔 */
function handleView(row) {
open.value = true;
form.value = row;
}
+
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
function handleDelete(row) {
const operIds = row.operId || ids.value;
@@ -270,6 +288,7 @@
proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
}).catch(() => {});
}
+
/** 娓呯┖鎸夐挳鎿嶄綔 */
function handleClean() {
proxy.$modal.confirm("鏄惁纭娓呯┖鎵�鏈夋搷浣滄棩蹇楁暟鎹」?").then(function () {
@@ -279,6 +298,7 @@
proxy.$modal.msgSuccess("娓呯┖鎴愬姛");
}).catch(() => {});
}
+
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
function handleExport() {
proxy.download("monitor/operlog/export",{
--
Gitblit v1.9.3