diff --git a/src/assets/images/global/calendar.png b/src/assets/images/global/calendar.png
new file mode 100644
index 0000000..1018c27
Binary files /dev/null and b/src/assets/images/global/calendar.png differ
diff --git a/src/components/CustomDatePicker/index.vue b/src/components/CustomDatePicker/index.vue
new file mode 100644
index 0000000..36cc78f
--- /dev/null
+++ b/src/components/CustomDatePicker/index.vue
@@ -0,0 +1,20 @@
+<template>
+    <a-date-picker v-bind="$attrs">
+        <img src="@/assets/images/global/calendar.png" slot="suffixIcon" alt="" srcset="">
+    </a-date-picker>
+</template>
+<script>
+export default {
+    props: {
+        value: {
+            type: [String, Object]
+        }
+    },
+    methods: {
+
+    }
+}
+</script>
+<style lang="">
+    
+</style>
\ No newline at end of file
diff --git a/src/components/SearchForm/index.vue b/src/components/SearchForm/index.vue
index 17bde55..fe23734 100644
--- a/src/components/SearchForm/index.vue
+++ b/src/components/SearchForm/index.vue
@@ -15,7 +15,7 @@
         </a-col>
         <a-button class="search-btn" type="primary" @click="onSearch">
           <img src="@/assets/images/global/search.png" alt="" />
-          search
+          Search
         </a-button>
         <slot name="additional"></slot>
       </a-row>
diff --git a/src/main.js b/src/main.js
index a12562f..b1991b3 100644
--- a/src/main.js
+++ b/src/main.js
@@ -15,7 +15,6 @@ import Antd, { version } from 'ant-design-vue'
 console.log('ant-design-vue version:', version)
 
 import Viser from 'viser-vue'
-import 'ant-design-vue/dist/antd.less';  // or 'ant-design-vue/dist/antd.less'
 
 import '@/permission' // permission control
 import '@/utils/filter' // base filter
@@ -55,6 +54,7 @@ import SearchForm from '@/components/SearchForm'
 import CustomSelect from '@/components/CustomSelect'
 import CustomTable from '@/components/CustomTable'
 import CustomModal from '@/components/CustomModal'
+import CustomDatePicker from '@/components/CustomDatePicker'
 
 
 Vue.prototype.rules = rules
@@ -74,6 +74,7 @@ Vue.component('search-form', SearchForm)
 Vue.component('custom-select', CustomSelect)
 Vue.component('custom-table', CustomTable)
 Vue.component('custom-modal', CustomModal)
+Vue.component('custom-date-picker', CustomDatePicker)
 
 SSO.init(() => {
   main()
diff --git a/src/mixins/JeecgListMixin.js b/src/mixins/JeecgListMixin.js
index 4993894..69beb27 100644
--- a/src/mixins/JeecgListMixin.js
+++ b/src/mixins/JeecgListMixin.js
@@ -168,7 +168,7 @@ export const JeecgListMixin = {
         return
       }
       if (this.selectedRowKeys.length <= 0) {
-        this.$message.warning('请选择一条记录！');
+        this.$message.warning('Please Select An Item');
         return;
       } else {
         var ids = "";
@@ -177,8 +177,8 @@ export const JeecgListMixin = {
         }
         var that = this;
         this.$confirm({
-          title: "确认删除",
-          content: "是否删除选中数据?",
+          title: "Confirm Delete",
+          content: "Do You Want To Delete This Item?",
           onOk: function () {
             that.loading = true;
             deleteAction(that.url.deleteBatch, {ids: ids}).then((res) => {
diff --git a/src/style.less b/src/style.less
index 49422de..e528eeb 100644
--- a/src/style.less
+++ b/src/style.less
@@ -1,4 +1,28 @@
 // 重置样式
+@import '~ant-design-vue/dist/antd.less'; // 引入官方提供的 less 样式入口文件
+
+@modalBg: #022024;
+@formInputBgColor: #03353f;
+@formInputBorderColor: #0b8c82;
+
+@primary-color: #1397a3;
+@link-color: #1397a3;
+@border-radius-base: 4px;
+@text-color: #fff;
+@btn-default-bg: #b98326;
+@btn-default-border: #b98326;
+
+@radio-button-bg: transparent;
+@radio-button-checked-bg: transparent;
+@radio-button-color: @btn-default-color;
+
+@modal-footer-border-color-split: @formInputBorderColor;
+
+.ant-btn:hover, .ant-btn:active {
+  color: #fff !important;
+  border-color: transparent;
+}
+
 
 @font-face {
   font-family: MicrogrammaD-MediExte;
@@ -21,8 +45,6 @@ body {
   height: 100vh;
 }
 
-@modalBg: #022024;
-
 // 卡片样式
 .ant-card {
   background-color: transparent;
@@ -134,11 +156,9 @@ body {
     &-container {
       padding-top: 2px;
     }
-    &-clear,
-    &-icon {
-      >svg {
-        display: none;
-      }
+    &-clear {
+      background-color: @formInputBgColor;
+      color: #00e9fe !important;
     }
   }
 
@@ -275,8 +295,6 @@ body {
   }
 }
 
-@formInputBgColor: #03353f;
-@formInputBorderColor: #0b8c82;
 // 输入框样式
 .ant-input {
   background-color: @formInputBgColor !important;
diff --git a/src/views/logManage/index.vue b/src/views/logManage/index.vue
index 9e552a4..7e5e6fa 100644
--- a/src/views/logManage/index.vue
+++ b/src/views/logManage/index.vue
@@ -55,9 +55,16 @@
       </custom-table>
     </div>
     <!-- 日志列表结束 -->
-    <custom-modal title="Log" v-model="visible" :show-footer="false">
-      <a-spin :spinning="isGettingDetail" style="min-height: 100px">
-        {{ logInfo }}
+    <custom-modal
+      title="Log"
+      :width="620"
+      v-model="visible"
+      :show-footer="false"
+    >
+      <a-spin :spinning="isGettingDetail" style="min-height: 100px; max-height: 520px; overflow: auto; white-space: nowrap; padding: 10px;">
+        <div v-for="(logItem, index) in logInfo" :key="index">
+          {{ logItem }}
+        </div>
       </a-spin>
     </custom-modal>
   </div>
@@ -116,7 +123,7 @@ export default {
 
       visible: false,
       isGettingDetail: false,
-      logInfo: ''
+      logInfo: []
     }
   },
   created() {
@@ -197,7 +204,8 @@ export default {
       try {
         this.isGettingDetail = true
         const res = await postAction('/logManage/downloadFile', formData)
-        this.logInfo = res
+        console.log('%c [ res ]-206', 'font-size:13px; background:pink; color:#bf2c9f;', res.split('\r\n'))
+        this.logInfo = res.split('\r\n')
       } catch (error) {
         console.error(error)
       } finally {
diff --git a/src/views/system/DataBase.vue b/src/views/system/DataBase.vue
index b6de7fc..03d2133 100644
--- a/src/views/system/DataBase.vue
+++ b/src/views/system/DataBase.vue
@@ -17,7 +17,7 @@
       :loading="loading"
       @change="handleTableChange"
       :selectedRowKeys.sync="selectedRowKeys"
-      :scroll="{ x: true, y: 'calc(100vh - 405px)' }"
+      :scroll="{ x: true, y: 'calc(100vh - 410px)' }"
     >
       <template slot="index" slot-scope="{ index }">
         {{ index + 1 }}
@@ -295,7 +295,7 @@ export default {
         },
         {
           label: 'From',
-          type: 'a-date-picker',
+          type: 'custom-date-picker',
           name: 'collectStart',
           props: {
             showTime: { format: 'HH:mm' },
@@ -312,7 +312,7 @@ export default {
         },
         {
           label: 'To',
-          type: 'a-date-picker',
+          type: 'custom-date-picker',
           name: 'collectStop',
           props: {
             showTime: { format: 'HH:mm' },
diff --git a/src/views/system/modules/RoleModal.vue b/src/views/system/modules/RoleModal.vue
index 80828c4..2b1f8dd 100644
--- a/src/views/system/modules/RoleModal.vue
+++ b/src/views/system/modules/RoleModal.vue
@@ -1,7 +1,7 @@
 <template>
   <custom-modal
     :title="title"
-    :width="800"
+    :width="600"
     v-model="visible"
     :confirmLoading="confirmLoading"
     :okHandler="handleOk"
@@ -35,8 +35,8 @@
         roleDisabled: false,
         model: {},
         layout: {
-          labelCol: { span: 3 },
-          wrapperCol: { span: 14 },
+          labelCol: { span: 5 },
+          wrapperCol: { span: 17 },
         },
         confirmLoading: false,
         validatorRules:{