From 833698168b9b428ca621982cf7f66b1fa35ef3cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Wed, 25 Oct 2023 19:31:23 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=E4=BC=98=E5=8C=96ui?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/i18n/pages/menu/zh-cn.js        |  2 +-
 src/views/monitor/operlog/index.vue |  8 +++++---
 src/views/system/menu/index.vue     | 11 ++++++++---
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/i18n/pages/menu/zh-cn.js b/src/i18n/pages/menu/zh-cn.js
index b47c11b..324a292 100644
--- a/src/i18n/pages/menu/zh-cn.js
+++ b/src/i18n/pages/menu/zh-cn.js
@@ -2,7 +2,7 @@ export default {
   m: {
     menuName: '菜单名称',
     menuState: '菜单状态',
-    icon: '菜单图标',
+    icon: '图标',
     menuid: '菜单id',
     menuType: '菜单类型',
     sort: '菜单排序',
diff --git a/src/views/monitor/operlog/index.vue b/src/views/monitor/operlog/index.vue
index c8637e6..eee193f 100644
--- a/src/views/monitor/operlog/index.vue
+++ b/src/views/monitor/operlog/index.vue
@@ -27,6 +27,7 @@
           range-separator="-"
           start-placeholder="开始日期"
           end-placeholder="结束日期"
+          :default-time="defaultTime"
           value-format="YYYY-MM-DD HH:mm:ss"
           :shortcuts="dateOptions"></el-date-picker>
       </el-form-item>
@@ -158,8 +159,8 @@
 </template>
 
 <script setup name="operlog">
-import { list as listOperLog, delOperlog, cleanOperlog, exportOperlog } from '@/api/monitor/operlog'
-
+import { list as listOperLog, delOperlog, cleanOperlog } from '@/api/monitor/operlog'
+import dayjs from 'dayjs'
 const { proxy } = getCurrentInstance()
 // 遮罩层
 const loading = ref(true)
@@ -180,7 +181,8 @@ const statusOptions = ref([])
 // 业务类型（0其它 1新增 2修改 3删除）选项列表 格式 eg:{ dictLabel: '标签', dictValue: '0'}
 const businessTypeOptions = ref([])
 // 日期范围
-const dateRange = ref([])
+const dateRange = ref([dayjs().format('YYYY-MM-DD 00:00:00'), dayjs().format('YYYY-MM-DD 23:59:59')])
+const defaultTime = ref([new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 2, 1, 23, 59, 59)])
 
 const state = reactive({
   form: {},
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 2ab93eb..0c3bc79 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -41,7 +41,7 @@
       <el-col :span="1.5">
         <el-button type="info" plain icon="Sort" @click="toggleExpandAll">{{ $t('btn.expand') }}/{{ $t('btn.collapse') }}</el-button>
       </el-col>
-      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
     </el-row>
 
     <vxe-table
@@ -68,7 +68,7 @@
           <el-tag :disable-transitions="true" type="warning" v-else-if="scope.row.menuType == 'F'">{{ $t('m.button') }}</el-tag>
         </template>
       </vxe-column>
-      <vxe-column field="orderNum" :title="$t('m.sort')" width="90" sortable align="center">
+      <vxe-column field="orderNum" :title="$t('m.sort')" width="90" sortable align="center" v-if="columns.showColumn('orderNum')">
         <template #default="scope">
           <span v-show="editIndex != scope.row.menuId" @click="editCurrRow(scope.row.menuId)">{{ scope.row.orderNum }}</span>
           <el-input
@@ -90,7 +90,7 @@
           <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
         </template>
       </vxe-column>
-      <vxe-column :title="$t('common.addTime')" align="center" field="createTime" show-overflow>
+      <vxe-column :title="$t('common.addTime')" align="center" field="createTime" show-overflow v-if="columns.showColumn('createTime')">
         <template #default="scope">
           <span>{{ parseTime(scope.row.createTime) }}</span>
         </template>
@@ -363,6 +363,11 @@ proxy.getDicts(dictParams).then((response) => {
     state[element.dictType] = element.list
   })
 })
+// 列显隐信息
+const columns = ref([
+  { label: `添加时间`, visible: false, prop: 'createTime' },
+  { label: `排序`, visible: false, prop: 'orderNum' }
+])
 
 const tableHeight = ref(document.documentElement.scrollHeight - 245 + 'px')
 const { queryParams, form, rules, sys_show_hide, sys_normal_disable } = toRefs(state)