From 0f5deea676b3d325f13edd2ae9cd91b169fdf0b3 Mon Sep 17 00:00:00 2001 From: Xu Zhimeng Date: Fri, 26 May 2023 15:07:08 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=98=E5=8C=96=E5=90=84=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/images/global/calendar.png | Bin 0 -> 1131 bytes src/components/CustomDatePicker/index.vue | 20 ++++++++++++ src/components/SearchForm/index.vue | 2 +- src/main.js | 3 +- src/mixins/JeecgListMixin.js | 6 ++-- src/style.less | 36 ++++++++++++++++------ src/views/logManage/index.vue | 18 ++++++++--- src/views/system/DataBase.vue | 6 ++-- src/views/system/modules/RoleModal.vue | 6 ++-- 9 files changed, 72 insertions(+), 25 deletions(-) create mode 100644 src/assets/images/global/calendar.png create mode 100644 src/components/CustomDatePicker/index.vue diff --git a/src/assets/images/global/calendar.png b/src/assets/images/global/calendar.png new file mode 100644 index 0000000000000000000000000000000000000000..1018c2716a37e6de870eafccbe01fcd49680b908 GIT binary patch literal 1131 zcmeAS@N?(olHy`uVBq!ia0vp^f*{Pn1|+R>-G2co$r9IylHmNblJdl&R0hYC{G?O` z&)mfH)S%SFl*+=BsWuD@%*vS|5hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP zs8ErclUHn2VXFi-*9yo63F|8hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83 zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0*(J3ovn(~mttdZN0qke1Ox$iU z!D${;ZwhX=nBvr{4|I$^C}xpj8YToxJ|HGM-2yrAl%JXhOzuU%blqq9P8gUc?s>X6 zhE&{2O1blG1|ye9!w)+Fb*7I@Y;P18JDxLdR1⁡QaG>N@4=zB_W47j7N$BS_2(& z8V(ESYQ(Z1>2IiD6WE`?vg?VBoNvnk)&<@?Gc^nv7?(}&Y~*TS^{Qui#IN#7lp(1u z#aWG^kh!z1;mY;J)$AhP>F2*j6nU7N}@SIV@}|Nj?h=X7XbWXQKMInBEK#}82U_jL7hS?83{1OWKMYySWM literal 0 HcmV?d00001 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 @@ + + + \ 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 @@ - search + Search 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 @@ - - - {{ logInfo }} + + +
+ {{ logItem }} +
@@ -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)' }" >