From 5e440a7dc434c43eb828fa62cf9c12b0078b8565 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期一, 20 一月 2025 11:36:18 +0800 Subject: [PATCH] !173 发布 5.3.0-BETA 公测版本 Merge pull request !173 from 疯狂的狮子Li/dev --- src/views/monitor/operlog/index.vue | 61 ++++-------------------------- 1 files changed, 8 insertions(+), 53 deletions(-) diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue index ed0d755..0c64af4 100644 --- a/src/views/monitor/operlog/index.vue +++ b/src/views/monitor/operlog/index.vue @@ -57,7 +57,7 @@ <el-col :span="1.5"> <el-button v-hasPermi="['monitor:operlog:export']" type="warning" plain icon="Download" @click="handleExport">瀵煎嚭</el-button> </el-col> - <right-toolbar v-model:showSearch="showSearch" @query-table="getList"></right-toolbar> + <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar> </el-row> </template> @@ -95,7 +95,7 @@ </el-table-column> <el-table-column label="鎿嶄綔鏃ユ湡" align="center" prop="operTime" width="180" sortable="custom" :sort-orders="['descending', 'ascending']"> <template #default="scope"> - <span>{{ parseTime(scope.row.operTime) }}</span> + <span>{{ proxy.parseTime(scope.row.operTime) }}</span> </template> </el-table-column> <el-table-column @@ -123,56 +123,14 @@ <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" /> </el-card> <!-- 鎿嶄綔鏃ュ織璇︾粏 --> - <el-dialog v-model="dialog.visible" title="鎿嶄綔鏃ュ織璇︾粏" width="700px" append-to-body> - <el-form :model="form" label-width="100px"> - <el-row> - <el-col :span="24"> - <el-form-item label="鐧诲綍淇℃伅锛�">{{ form.operName }} / {{ form.deptName }} / {{ form.operIp }} / {{ form.operLocation }}</el-form-item> - </el-col> - <el-col :span="12"> - <el-form-item label="璇锋眰淇℃伅锛�">{{ form.requestMethod }} {{ form.operUrl }}</el-form-item> - </el-col> - <el-col :span="12"> - <el-form-item label="鎿嶄綔妯″潡锛�">{{ form.title }} / {{ typeFormat(form) }}</el-form-item> - </el-col> - <el-col :span="24"> - <el-form-item label="鎿嶄綔鏂规硶锛�">{{ form.method }}</el-form-item> - </el-col> - <el-col :span="24"> - <el-form-item label="璇锋眰鍙傛暟锛�">{{ form.operParam }}</el-form-item> - </el-col> - <el-col :span="24"> - <el-form-item label="杩斿洖鍙傛暟锛�">{{ form.jsonResult }}</el-form-item> - </el-col> - <el-col :span="6"> - <el-form-item label="鎿嶄綔鐘舵�侊細"> - <div v-if="form.status === 0">姝e父</div> - <div v-else-if="form.status === 1">澶辫触</div> - </el-form-item> - </el-col> - <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"> - <el-form-item v-if="form.status === 1" label="寮傚父淇℃伅锛�">{{ form.errorMsg }}</el-form-item> - </el-col> - </el-row> - </el-form> - <template #footer> - <div class="dialog-footer"> - <el-button @click="dialog.visible = false">鍏� 闂�</el-button> - </div> - </template> - </el-dialog> + <OperInfoDialog ref="operInfoDialogRef" /> </div> </template> <script setup name="Operlog" lang="ts"> import { list, delOperlog, cleanOperlog } from '@/api/monitor/operlog'; import { OperLogForm, OperLogQuery, OperLogVO } from '@/api/monitor/operlog/types'; +import OperInfoDialog from './oper-info-dialog.vue'; const { proxy } = getCurrentInstance() as ComponentInternalInstance; const { sys_oper_type, sys_common_status } = toRefs<any>(proxy?.useDict('sys_oper_type', 'sys_common_status')); @@ -188,11 +146,6 @@ const operLogTableRef = ref<ElTableInstance>(); const queryFormRef = ref<ElFormInstance>(); - -const dialog = reactive<DialogOption>({ - visible: false, - title: '' -}); const data = reactive<PageData<OperLogForm, OperLogQuery>>({ form: { @@ -267,11 +220,13 @@ queryParams.value.isAsc = column.order; getList(); }; + +const operInfoDialogRef = ref<InstanceType<typeof OperInfoDialog>>(); /** 璇︾粏鎸夐挳鎿嶄綔 */ const handleView = (row: OperLogVO) => { - dialog.visible = true; - form.value = row; + operInfoDialogRef.value.openDialog(row); }; + /** 鍒犻櫎鎸夐挳鎿嶄綔 */ const handleDelete = async (row?: OperLogVO) => { const operIds = row?.operId || ids.value; -- Gitblit v1.9.3