diff --git a/src/components/ListTable/TableAction/index.vue b/src/components/ListTable/TableAction/index.vue
index 930e0cc07..6a7754a67 100644
--- a/src/components/ListTable/TableAction/index.vue
+++ b/src/components/ListTable/TableAction/index.vue
@@ -40,16 +40,17 @@ import LeftSide from './LeftSide'
 import RightSide from './RightSide'
 import AutoDataSearch from '@/components/AutoDataSearch'
 import DatetimeRangePicker from '@/components/FormFields/DatetimeRangePicker'
+import { getDaysAgo, getDaysFuture } from '@/utils/common'
 
 const defaultTrue = { type: Boolean, default: true }
 const defaultFalse = { type: Boolean, default: false }
 export default {
   name: 'TableAction',
   components: {
-    AutoDataSearch,
     LeftSide,
-    DatetimeRangePicker,
-    RightSide
+    RightSide,
+    AutoDataSearch,
+    DatetimeRangePicker
   },
   props: {
     hasLeftActions: defaultTrue,
@@ -58,7 +59,10 @@ export default {
     hasDatePicker: defaultFalse,
     datePicker: {
       type: Object,
-      default: () => ({})
+      default: () => ({
+        dateStart: getDaysAgo(7).toISOString(),
+        dateEnd: getDaysFuture(1).toISOString()
+      })
     },
     searchConfig: {
       type: Object,
diff --git a/src/components/ListTable/index.vue b/src/components/ListTable/index.vue
index 620bd43ba..c9aa61d1b 100644
--- a/src/components/ListTable/index.vue
+++ b/src/components/ListTable/index.vue
@@ -29,6 +29,7 @@ import IBox from '../IBox'
 import TableAction from './TableAction'
 import Emitter from '@/mixins/emitter'
 import AutoDataTable from '../AutoDataTable'
+import { getDayEnd, getDaysAgo } from '@/utils/common'
 
 export default {
   name: 'ListTable',
@@ -51,10 +52,21 @@ export default {
     }
   },
   data() {
+    let extraQuery = {}
+    if (this.headerActions.hasDatePicker) {
+      extraQuery = {
+        start_time: getDaysAgo(7).toISOString(),
+        end_time: getDayEnd().toISOString()
+      }
+      this.headerActions.datePicker = Object.assign({
+        dateStart: extraQuery.start_time,
+        dateEnd: extraQuery.end_time
+      }, this.headerActions.datePicker)
+    }
     return {
       selectedRows: [],
       init: false,
-      extraQuery: {}
+      extraQuery: extraQuery
     }
   },
   computed: {
diff --git a/src/i18n/langs/zh.json b/src/i18n/langs/zh.json
index e03f40140..f606b34bc 100644
--- a/src/i18n/langs/zh.json
+++ b/src/i18n/langs/zh.json
@@ -977,7 +977,7 @@
   },
   "perms": {
     "": "",
-    "AccountsHelp": "所有账号: 资产上添加的账号; 指定账号：指定账号的用户名；手动输入: 用户名/密码 手动输入; 同名账号: 和账号使用者用户名相同的账号;",
+    "AccountsHelp": "所有账号: 资产上添加的账号; 指定账号：指定账号的用户名；手动输入: 用户名/密码 手动输入; 同名账号: 与被授权人用户名相同的账号;",
     "AllAccounts": "所有账号",
     "ManualInput": "手动输入",
     "SameAccount": "同名账号",
diff --git a/src/utils/common.js b/src/utils/common.js
index 53cb7658f..845e2d285 100644
--- a/src/utils/common.js
+++ b/src/utils/common.js
@@ -186,7 +186,7 @@ export function getDayEnd(now) {
   if (!now) {
     now = new Date()
   }
-  const zoneTime = moment(now).utc().endOf('month').format('YYYY-MM-DD HH:mm:ss')
+  const zoneTime = moment(now).utc().endOf('day').format('YYYY-MM-DD HH:mm:ss')
   return moment(zoneTime).utc().toDate()
 }
 
diff --git a/src/views/audits/JobExecutionLogList.vue b/src/views/audits/JobExecutionLogList.vue
index 8481fd770..6096d29d2 100644
--- a/src/views/audits/JobExecutionLogList.vue
+++ b/src/views/audits/JobExecutionLogList.vue
@@ -6,7 +6,6 @@
 
 <script type="text/jsx">
 import GenericListPage from '@/layout/components/GenericListPage'
-import { getDaysAgo, getDaysFuture } from '@/utils/common'
 import { ActionsFormatter } from '@/components/TableFormatters'
 import { openTaskPage } from '@/utils/jms'
 
@@ -15,9 +14,6 @@ export default {
     GenericListPage
   },
   data() {
-    const now = new Date()
-    const dateFrom = getDaysAgo(7, now).toISOString()
-    const dateTo = getDaysFuture(1, now).toISOString()
     return {
       tableConfig: {
         url: '/api/v1/audits/job-logs/',
@@ -95,10 +91,6 @@ export default {
           date_start: {
             width: '160px'
           }
-        },
-        extraQuery: {
-          date_to: dateTo,
-          date_from: dateFrom
         }
       },
       headerActions: {
@@ -120,10 +112,6 @@ export default {
               value: 'run_as__username'
             }
           ]
-        },
-        datePicker: {
-          dateStart: dateFrom,
-          dateEnd: dateTo
         }
       }
     }
diff --git a/src/views/audits/LoginLog/LoginLogList.vue b/src/views/audits/LoginLog/LoginLogList.vue
index 7aad0ca17..0efcc4095 100644
--- a/src/views/audits/LoginLog/LoginLogList.vue
+++ b/src/views/audits/LoginLog/LoginLogList.vue
@@ -4,16 +4,12 @@
 
 <script>
 import GenericListPage from '@/layout/components/GenericListPage'
-import { getDaysAgo, getDaysFuture } from '@/utils/common'
 
 export default {
   components: {
     GenericListPage
   },
   data() {
-    const now = new Date()
-    const dateFrom = getDaysAgo(7, now).toISOString()
-    const dateTo = getDaysFuture(1, now).toISOString()
     return {
       tableConfig: {
         permissions: {
@@ -51,20 +47,12 @@ export default {
           datetime: {
             width: '160px'
           }
-        },
-        extraQuery: {
-          date_to: dateTo,
-          date_from: dateFrom
         }
       },
       headerActions: {
         hasLeftActions: false,
         hasImport: false,
         hasDatePicker: true,
-        datePicker: {
-          dateStart: dateFrom,
-          dateEnd: dateTo
-        },
         searchConfig: {
           getUrlQuery: true
         }
diff --git a/src/views/audits/LoginLogList.vue b/src/views/audits/LoginLogList.vue
deleted file mode 100644
index 7aad0ca17..000000000
--- a/src/views/audits/LoginLogList.vue
+++ /dev/null
@@ -1,79 +0,0 @@
-<template>
-  <GenericListPage :header-actions="headerActions" :table-config="tableConfig" />
-</template>
-
-<script>
-import GenericListPage from '@/layout/components/GenericListPage'
-import { getDaysAgo, getDaysFuture } from '@/utils/common'
-
-export default {
-  components: {
-    GenericListPage
-  },
-  data() {
-    const now = new Date()
-    const dateFrom = getDaysAgo(7, now).toISOString()
-    const dateTo = getDaysFuture(1, now).toISOString()
-    return {
-      tableConfig: {
-        permissions: {
-          app: 'audits',
-          resource: 'userloginlog'
-        },
-        columnsExclude: ['backend'],
-        columnsShow: {
-          min: ['username', 'type'],
-          default: [
-            'username', 'type', 'backend_display', 'ip', 'city',
-            'user_agent', 'mfa', 'reason_display', 'status', 'datetime'
-          ]
-        },
-        url: '/api/v1/audits/login-logs/',
-        columnsMeta: {
-          user_agent: {
-            width: '150px'
-          },
-          actions: {
-            has: false
-          },
-          ip: {
-            width: '140px'
-          },
-          city: {
-            width: '90px'
-          },
-          mfa: {
-            width: '80px'
-          },
-          type: {
-            width: '110px'
-          },
-          datetime: {
-            width: '160px'
-          }
-        },
-        extraQuery: {
-          date_to: dateTo,
-          date_from: dateFrom
-        }
-      },
-      headerActions: {
-        hasLeftActions: false,
-        hasImport: false,
-        hasDatePicker: true,
-        datePicker: {
-          dateStart: dateFrom,
-          dateEnd: dateTo
-        },
-        searchConfig: {
-          getUrlQuery: true
-        }
-      }
-    }
-  }
-}
-</script>
-
-<style>
-
-</style>
diff --git a/src/views/audits/OperateLog/OperateLogList.vue b/src/views/audits/OperateLog/OperateLogList.vue
index 9aac4bb88..1edb2bd54 100644
--- a/src/views/audits/OperateLog/OperateLogList.vue
+++ b/src/views/audits/OperateLog/OperateLogList.vue
@@ -11,7 +11,6 @@
 
 <script>
 import GenericListPage from '@/layout/components/GenericListPage'
-import { getDaysAgo, getDaysFuture } from '@/utils/common'
 import { ActionsFormatter } from '@/components/TableFormatters'
 import DiffDetail from '@/components/Dialog/DiffDetail'
 
@@ -22,9 +21,6 @@ export default {
   },
   data() {
     const vm = this
-    const now = new Date()
-    const dateFrom = getDaysAgo(7, now).toISOString()
-    const dateTo = getDaysFuture(1, now).toISOString()
     return {
       url: '/api/v1/audits/operate-logs/',
       rowObj: {
@@ -83,20 +79,12 @@ export default {
               ]
             }
           }
-        },
-        extraQuery: {
-          date_to: dateTo,
-          date_from: dateFrom
         }
       },
       headerActions: {
         hasLeftActions: false,
         hasImport: false,
-        hasDatePicker: true,
-        datePicker: {
-          dateStart: dateFrom,
-          dateEnd: dateTo
-        }
+        hasDatePicker: true
       }
     }
   }
diff --git a/src/views/audits/PasswordChangeLogList.vue b/src/views/audits/PasswordChangeLogList.vue
index 0c8fe1060..349a34cba 100644
--- a/src/views/audits/PasswordChangeLogList.vue
+++ b/src/views/audits/PasswordChangeLogList.vue
@@ -4,16 +4,12 @@
 
 <script>
 import GenericListPage from '@/layout/components/GenericListPage'
-import { getDaysAgo, getDaysFuture } from '@/utils/common'
 
 export default {
   components: {
     GenericListPage
   },
   data() {
-    const now = new Date()
-    const dateFrom = getDaysAgo(7, now).toISOString()
-    const dateTo = getDaysFuture(1, now).toISOString()
     return {
       tableConfig: {
         url: '/api/v1/audits/password-change-logs/',
@@ -31,20 +27,12 @@ export default {
           actions: {
             has: false
           }
-        },
-        extraQuery: {
-          date_to: dateTo,
-          date_from: dateFrom
         }
       },
       headerActions: {
         hasLeftActions: false,
         hasImport: false,
-        hasDatePicker: true,
-        datePicker: {
-          dateStart: dateFrom,
-          dateEnd: dateTo
-        }
+        hasDatePicker: true
       }
     }
   }
diff --git a/src/views/sessions/CommandList.vue b/src/views/sessions/CommandList.vue
index bf63aa7c3..1124ad971 100644
--- a/src/views/sessions/CommandList.vue
+++ b/src/views/sessions/CommandList.vue
@@ -15,7 +15,7 @@
 
 <script>
 import GenericTreeListPage from '@/layout/components/GenericTreeListPage/index'
-import { getDaysAgo, getDaysFuture, toSafeLocalDateStr } from '@/utils/common'
+import { getDayEnd, getDaysAgo, toSafeLocalDateStr } from '@/utils/common'
 import { OutputExpandFormatter } from './formatters'
 import { DetailFormatter } from '@/components/TableFormatters'
 import isFalsey from '@/components/DataTable/compenents/el-data-table/utils/is-falsey'
@@ -29,13 +29,12 @@ export default {
   },
   data() {
     const vm = this
-    const now = new Date()
-    const dateFrom = getDaysAgo(7, now).toISOString()
-    const dateTo = getDaysFuture(1, now).toISOString()
+    const dateFrom = getDaysAgo(7).toISOString()
+    const dateTo = getDayEnd().toISOString()
     return {
       query: {
-        date_from: getDaysAgo(7, now).toISOString(),
-        date_to: getDaysFuture(1, now).toISOString()
+        date_from: dateFrom,
+        date_to: dateTo
       },
       loading: true,
       tableConfig: {
@@ -116,6 +115,10 @@ export default {
         hasImport: false,
         hasExport: this.$hasPerm('terminal.view_command'),
         hasDatePicker: true,
+        datePicker: {
+          dateStart: dateFrom,
+          dateEnd: dateTo
+        },
         canExportSelected: true,
         exportOptions: {
           // Todo: 优化这里，和抽象组件重复了
@@ -143,10 +146,6 @@ export default {
             a.click()
             window.URL.revokeObjectURL(url + queryStr)
           }
-        },
-        datePicker: {
-          dateStart: dateFrom,
-          dateEnd: dateTo
         }
       },
       treeSetting: {
diff --git a/src/views/sessions/FTPLogList.vue b/src/views/sessions/FTPLogList.vue
index 73a6f4ca7..ed54ba438 100644
--- a/src/views/sessions/FTPLogList.vue
+++ b/src/views/sessions/FTPLogList.vue
@@ -4,16 +4,12 @@
 
 <script>
 import GenericListPage from '@/layout/components/GenericListPage'
-import { getDaysAgo, getDaysFuture } from '@/utils/common'
 
 export default {
   components: {
     GenericListPage
   },
   data() {
-    const now = new Date()
-    const dateFrom = getDaysAgo(7, now).toISOString()
-    const dateTo = getDaysFuture(1, now).toISOString()
     return {
       tableConfig: {
         url: '/api/v1/audits/ftp-logs/',
@@ -30,20 +26,12 @@ export default {
           actions: {
             has: false
           }
-        },
-        extraQuery: {
-          date_to: dateTo,
-          date_from: dateFrom
         }
       },
       headerActions: {
         hasLeftActions: false,
         hasImport: false,
-        hasDatePicker: true,
-        datePicker: {
-          dateStart: dateFrom,
-          dateEnd: dateTo
-        }
+        hasDatePicker: true
       }
     }
   }
diff --git a/src/views/sessions/SessionList/BaseList.vue b/src/views/sessions/SessionList/BaseList.vue
index 55681a86d..2e9f7f51c 100644
--- a/src/views/sessions/SessionList/BaseList.vue
+++ b/src/views/sessions/SessionList/BaseList.vue
@@ -1,11 +1,12 @@
 <template>
-  <ListTable :table-config="tableConfig" :header-actions="headerActions" />
+  <ListTable :header-actions="headerActions" :table-config="tableConfig" />
 </template>
 
 <script type="text/jsx">
 import ListTable from '@/components/ListTable'
-import { timeOffset, getDaysAgo, getDaysFuture } from '@/utils/common'
+import { timeOffset } from '@/utils/common'
 import { ActionsFormatter } from '@/components/TableFormatters'
+
 export default {
   name: 'BaseList',
   components: {
@@ -22,9 +23,6 @@ export default {
     }
   },
   data() {
-    const now = new Date()
-    const dateFrom = getDaysAgo(7, now).toISOString()
-    const dateTo = getDaysFuture(1, now).toISOString()
     return {
       tableConfig: {
         url: this.url,
@@ -124,20 +122,12 @@ export default {
               extraActions: this.extraActions
             }
           }
-        },
-        extraQuery: {
-          date_to: dateTo,
-          date_from: dateFrom
         }
       },
       headerActions: {
         hasLeftActions: false,
         hasImport: false,
         hasDatePicker: true,
-        datePicker: {
-          dateEnd: dateTo,
-          dateStart: dateFrom
-        },
         searchConfig: {
           getUrlQuery: false,
           exclude: ['is_finished']
diff --git a/src/views/settings/Applet/Applet/UploadDialog.vue b/src/views/settings/Applet/Applet/UploadDialog.vue
index 048e81807..dc2ac2cf2 100644
--- a/src/views/settings/Applet/Applet/UploadDialog.vue
+++ b/src/views/settings/Applet/Applet/UploadDialog.vue
@@ -2,6 +2,7 @@
   <Dialog
     :title="$tc('common.OfflineUpload')"
     v-bind="$attrs"
+    @cancel="onCancel"
     @confirm="onSubmit"
     v-on="$listeners"
   >
@@ -13,15 +14,15 @@
       >
         <el-upload
           ref="upload"
-          drag
-          action="string"
-          list-type="text/csv"
-          :limit="1"
           :auto-upload="false"
-          upload-files="uploadFiles"
-          :on-change="onFileChange"
           :before-upload="beforeUpload"
+          :limit="1"
+          :on-change="onFileChange"
           accept=".zip"
+          action="string"
+          drag
+          list-type="text/csv"
+          upload-files="uploadFiles"
         >
           <i class="el-icon-upload" />
           <div class="el-upload__text">
@@ -41,6 +42,7 @@
 
 <script>
 import { Dialog } from '@/components'
+
 export default {
   name: 'UploadDialog',
   components: {
@@ -62,6 +64,9 @@ export default {
     },
     beforeUpload(file) {
     },
+    onCancel() {
+      this.$emit('update:visible', false)
+    },
     onSubmit() {
       if (!this.file) {
         return