解决打开弹窗时导航头闪烁问题

src/assets/styles/ruoyi.scss

@@ -505,10 +505,12 @@ h6 {
   font-size: 16px;
   color: #525252;
 }
-.searchInputForm .el-input__wrapper { 
-  border-radius: 18px; 
+
+.searchInputForm .el-input__wrapper {
+  border-radius: 18px;
   padding: 3px 15px;
 }
+
 .searchInputForm .el-input__inner::placeholder {
   font-family: Microsoft YaHei;
   font-weight: 400;
@@ -675,9 +677,13 @@ h6 {
   vertical-align: middle;
 }
 
-// .myInsertForm .el-form-item__content {
-//     display: block;
-// }
+.myInsertForm .el-form-item__content {
+  font-family: Microsoft YaHei;
+  font-weight: 400;
+  font-size: 16px;
+  color: #525252;
+  display: block;
+}
 
 .myInsertForm .el-form-item__label {
   font-family: Microsoft YaHei;

src/layout/components/Navbar.vue

@@ -88,8 +88,8 @@ function toggleTheme() {
 
   .navContent {
     height: 43px;
-    width: 1840px;
-    margin: 19px auto 18px auto;
+    width: 100%;
+    margin: 19px 40px 18px 40px;
     display: flex; // 添加flex布局
     justify-content: space-between; // 使子元素平均分布
     align-items: center; // 垂直居中

src/views/monitor/operlog/index.vue

@@ -1,162 +1,108 @@
 <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"
-               placeholder="请输入系统模块"
-               clearable
-               style="width: 240px;"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="操作人员" prop="operName">
-            <el-input
-               v-model="queryParams.operName"
-               placeholder="请输入操作人员"
-               clearable
-               style="width: 240px;"
-               @keyup.enter="handleQuery"
-            />
-         </el-form-item>
-         <el-form-item label="类型" prop="businessType">
-            <el-select
-               v-model="queryParams.businessType"
-               placeholder="操作类型"
-               clearable
-               style="width: 240px"
-            >
-               <el-option
-                  v-for="dict in sys_oper_type"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-               />
-            </el-select>
-         </el-form-item>
-         <el-form-item label="状态" prop="status">
-            <el-select
-               v-model="queryParams.status"
-               placeholder="操作状态"
-               clearable
-               style="width: 240px"
-            >
-               <el-option
-                  v-for="dict in sys_common_status"
-                  :key="dict.value"
-                  :label="dict.label"
-                  :value="dict.value"
-               />
-            </el-select>
-         </el-form-item>
-         <el-form-item label="操作时间" style="width: 308px">
-            <el-date-picker
-               v-model="dateRange"
-               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>
-            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-         </el-form-item>
-      </el-form>
+      <div class="searchPanel">
+         <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" class="searchPanelForm">
+            <el-form-item label="操作地址:" prop="operIp">
+               <el-input v-model="queryParams.operIp" placeholder="请输入操作地址" clearable style="width: 140px;"
+                  @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="系统模块:" prop="title">
+               <el-input v-model="queryParams.title" placeholder="请输入系统模块" clearable style="width: 140px;"
+                  @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="操作人员:" prop="operName">
+               <el-input v-model="queryParams.operName" placeholder="请输入操作人员" clearable style="width: 140px;"
+                  @keyup.enter="handleQuery" />
+            </el-form-item>
+            <el-form-item label="类型:" prop="businessType">
+               <el-select v-model="queryParams.businessType" placeholder="操作类型" clearable style="min-width: 86px">
+                  <el-option v-for="dict in sys_oper_type" :key="dict.value" :label="dict.label" :value="dict.value" />
+               </el-select>
+            </el-form-item>
+            <el-form-item label="状态:" prop="status">
+               <el-select v-model="queryParams.status" placeholder="操作状态" clearable style="min-width: 86px">
+                  <el-option v-for="dict in sys_common_status" :key="dict.value" :label="dict.label"
+                     :value="dict.value" />
+               </el-select>
+            </el-form-item>
+            <el-form-item label="操作时间:" style="width: 308px">
+               <el-date-picker v-model="dateRange" 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>
+      </div>
+      <el-card>
+         <template #header>
+            <div class="card-header">
+               <span>系统管理</span> <span class="subHeaderTitle">- 日志查看与管理</span>
+            </div>
+         </template>
 
-      <el-row :gutter="10" class="mb8">
-         <el-col :span="1.5">
-            <el-button
-               type="danger"
-               plain
-               icon="Delete"
-               :disabled="multiple"
-               @click="handleDelete"
-               v-hasPermi="['monitor:operlog:remove']"
-            >删除</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="danger"
-               plain
-               icon="Delete"
-               @click="handleClean"
-               v-hasPermi="['monitor:operlog:remove']"
-            >清空</el-button>
-         </el-col>
-         <el-col :span="1.5">
-            <el-button
-               type="warning"
-               plain
-               icon="Download"
-               @click="handleExport"
-               v-hasPermi="['monitor:operlog:export']"
-            >导出</el-button>
-         </el-col>
-         <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
-      </el-row>
+         <el-row :gutter="10" class="my_row">
+            <el-col :span="24">
+               <el-button type="primary" class="primaryBtn" @click="handleQuery">搜索</el-button>
+               <el-button type="primary" class="primaryBtn" @click="resetQuery">重置</el-button>
+               <el-button type="primary" class="primaryBtn" :disabled="multiple" @click="handleDelete"
+                  v-hasPermi="['monitor:operlog:remove']">删除</el-button>
+               <el-button type="primary" class="primaryBtn" @click="handleClean"
+                  v-hasPermi="['monitor:operlog:remove']">清空</el-button>
+               <el-button type="primary" class="primaryBtn" @click="handleExport"
+                  v-hasPermi="['monitor:operlog:export']">导出</el-button>
+            </el-col>
+         </el-row>
 
-      <el-table ref="operlogRef" v-loading="loading" :data="operlogList" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
-         <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" :show-overflow-tooltip="true" />
-         <el-table-column label="操作类型" align="center" prop="businessType">
-            <template #default="scope">
-               <dict-tag :options="sys_oper_type" :value="scope.row.businessType" />
-            </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="status">
-            <template #default="scope">
-               <dict-tag :options="sys_common_status" :value="scope.row.status" />
-            </template>
-         </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>
-            </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 #default="scope">
-               <span>{{ scope.row.costTime }}毫秒</span>
-            </template>
-         </el-table-column>
-         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
-            <template #default="scope">
-               <el-button link type="primary" icon="View" @click="handleView(scope.row, scope.index)" v-hasPermi="['monitor:operlog:query']">详细</el-button>
-            </template>
-         </el-table-column>
-      </el-table>
+         <el-table ref="operlogRef" v-loading="loading" :data="operlogList" height="calc(100vh - 362px)"
+            @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
+            <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" :show-overflow-tooltip="true" />
+            <el-table-column label="操作类型" align="center" prop="businessType">
+               <template #default="scope">
+                  <dict-tag :options="sys_oper_type" :value="scope.row.businessType" />
+               </template>
+            </el-table-column>
+            <el-table-column label="操作人员" align="center" width="130" 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="status">
+               <template #default="scope">
+                  <dict-tag :options="sys_common_status" :value="scope.row.status" />
+               </template>
+            </el-table-column>
+            <el-table-column label="操作日期" align="center" prop="operTime" width="210" sortable="custom"
+               :sort-orders="['descending', 'ascending']">
+               <template #default="scope">
+                  <span>{{ parseTime(scope.row.operTime) }}</span>
+               </template>
+            </el-table-column>
+            <el-table-column label="消耗时间" align="center" prop="costTime" width="130" :show-overflow-tooltip="true"
+               sortable="custom" :sort-orders="['descending', 'ascending']">
+               <template #default="scope">
+                  <span>{{ scope.row.costTime }}毫秒</span>
+               </template>
+            </el-table-column>
+            <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+               <template #default="scope">
+                  <el-button link type="primary" @click="handleView(scope.row, scope.index)"
+                     v-hasPermi="['monitor:operlog:query']">详细</el-button>
+               </template>
+            </el-table-column>
+         </el-table>
 
-      <pagination
-         v-show="total > 0"
-         :total="total"
-         v-model:page="queryParams.pageNum"
-         v-model:limit="queryParams.pageSize"
-         @pagination="getList"
-      />
+         <pagination :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize"
+            @pagination="getList" />
+      </el-card>
 
       <!-- 操作日志详细 -->
-      <el-dialog title="操作日志详细" v-model="open" width="800px" append-to-body>
-         <el-form :model="form" label-width="100px">
+      <el-dialog title="操作日志详细" v-model="open" width="800px" class="my_dialog" append-to-body :destroy-on-close="true"
+         :close-on-click-modal="false">
+         <el-form :model="form" label-width="100px" class="myInsertForm">
             <el-row>
                <el-col :span="12">
                   <el-form-item label="操作模块：">{{ form.title }} / {{ typeFormat(form) }}</el-form-item>
-                  <el-form-item
-                    label="登录信息："
-                  >{{ form.operName }} / {{ form.operIp }} / {{ form.operLocation }}</el-form-item>
+                  <el-form-item label="登录信息：">{{ form.operName }} / {{ form.operIp }} / {{ form.operLocation
+                     }}</el-form-item>
                </el-col>
                <el-col :span="12">
                   <el-form-item label="请求地址：">{{ form.operUrl }}</el-form-item>
@@ -171,7 +117,7 @@
                <el-col :span="24">
                   <el-form-item label="返回参数：">{{ form.jsonResult }}</el-form-item>
                </el-col>
-               <el-col :span="8">
+               <el-col :span="6">
                   <el-form-item label="操作状态：">
                      <div v-if="form.status === 0">正常</div>
                      <div v-else-if="form.status === 1">失败</div>
@@ -180,7 +126,7 @@
                <el-col :span="8">
                   <el-form-item label="消耗时间：">{{ form.costTime }}毫秒</el-form-item>
                </el-col>
-               <el-col :span="8">
+               <el-col :span="10">
                   <el-form-item label="操作时间：">{{ parseTime(form.operTime) }}</el-form-item>
                </el-col>
                <el-col :span="24">
@@ -216,94 +162,94 @@ const dateRange = ref([])
 const defaultSort = ref({ prop: "operTime", order: "descending" })
 
 const data = reactive({
-  form: {},
-  queryParams: {
-    pageNum: 1,
-    pageSize: 10,
-    operIp: undefined,
-    title: undefined,
-    operName: undefined,
-    businessType: undefined,
-    status: undefined
-  }
+   form: {},
+   queryParams: {
+      pageNum: 1,
+      pageSize: 10,
+      operIp: undefined,
+      title: undefined,
+      operName: undefined,
+      businessType: undefined,
+      status: undefined
+   }
 })
 
 const { queryParams, form } = toRefs(data)
 
 /** 查询登录日志 */
 function getList() {
-  loading.value = true
-  list(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
-    operlogList.value = response.rows
-    total.value = response.total
-    loading.value = false
-  })
+   loading.value = true
+   list(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
+      operlogList.value = response.rows
+      total.value = response.total
+      loading.value = false
+   })
 }
 
 /** 操作日志类型字典翻译 */
 function typeFormat(row, column) {
-  return proxy.selectDictLabel(sys_oper_type.value, row.businessType)
+   return proxy.selectDictLabel(sys_oper_type.value, row.businessType)
 }
 
 /** 搜索按钮操作 */
 function handleQuery() {
-  queryParams.value.pageNum = 1
-  getList()
+   queryParams.value.pageNum = 1
+   getList()
 }
 
 /** 重置按钮操作 */
 function resetQuery() {
-  dateRange.value = []
-  proxy.resetForm("queryRef")
-  queryParams.value.pageNum = 1
-  proxy.$refs["operlogRef"].sort(defaultSort.value.prop, defaultSort.value.order)
+   dateRange.value = []
+   proxy.resetForm("queryRef")
+   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
+   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()
+   queryParams.value.orderByColumn = column.prop
+   queryParams.value.isAsc = column.order
+   getList()
 }
 
 /** 详细按钮操作 */
 function handleView(row) {
-  open.value = true
-  form.value = row
+   open.value = true
+   form.value = row
 }
 
 /** 删除按钮操作 */
 function handleDelete(row) {
-  const operIds = row.operId || ids.value
-  proxy.$modal.confirm('是否确认删除日志编号为"' + operIds + '"的数据项?').then(function () {
-    return delOperlog(operIds)
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess("删除成功")
-  }).catch(() => {})
+   const operIds = row.operId || ids.value
+   proxy.$modal.confirm('是否确认删除日志编号为"' + operIds + '"的数据项?').then(function () {
+      return delOperlog(operIds)
+   }).then(() => {
+      getList()
+      proxy.$modal.msgSuccess("删除成功")
+   }).catch(() => { })
 }
 
 /** 清空按钮操作 */
 function handleClean() {
-  proxy.$modal.confirm("是否确认清空所有操作日志数据项?").then(function () {
-    return cleanOperlog()
-  }).then(() => {
-    getList()
-    proxy.$modal.msgSuccess("清空成功")
-  }).catch(() => {})
+   proxy.$modal.confirm("是否确认清空所有操作日志数据项?").then(function () {
+      return cleanOperlog()
+   }).then(() => {
+      getList()
+      proxy.$modal.msgSuccess("清空成功")
+   }).catch(() => { })
 }
 
 /** 导出按钮操作 */
 function handleExport() {
-  proxy.download("monitor/operlog/export",{
-    ...queryParams.value,
-  }, `config_${new Date().getTime()}.xlsx`)
+   proxy.download("monitor/operlog/export", {
+      ...queryParams.value,
+   }, `config_${new Date().getTime()}.xlsx`)
 }
 
 getList()