From 6eeb90f5902098c4418c1386e6a3e0b043fb10d5 Mon Sep 17 00:00:00 2001 From: "du.meimei" Date: Thu, 24 Apr 2025 09:20:17 +0800 Subject: [PATCH 1/3] format --- src/store/modules/user.js | 2 +- src/views/rules/Index.vue | 50 +++++++++++-------- src/views/system/menu/index.vue | 16 ++++-- .../system/user/components/UserDialog.vue | 2 +- src/views/system/user/index.vue | 33 ++++++++---- 5 files changed, 65 insertions(+), 38 deletions(-) diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 5a33262..0b6e540 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -26,7 +26,7 @@ const actions = { setGroupList({ commit }, data) { commit('SET_GROUPLIST', data) }, - setToken({ commit },data){ + setToken({ commit }, data) { commit('SET_TOKEN', data) }, // user login diff --git a/src/views/rules/Index.vue b/src/views/rules/Index.vue index 06f1cd2..12c9dea 100644 --- a/src/views/rules/Index.vue +++ b/src/views/rules/Index.vue @@ -34,20 +34,17 @@ export default { isRedraw: true, render: (h, params) => { return h('div', [ - h( - 'el-button', - { - props: { type: 'text', size: 'mini', icon: 'el-icon-tickets', title: '查看详情' }, - on: { click: () => this.handleInfoVisible(params.row) } - } - ), + h('el-button', { + props: { type: 'text', size: 'mini', icon: 'el-icon-tickets', title: '查看详情' }, + on: { click: () => this.handleInfoVisible(params.row) } + }), h( 'el-button', { props: { type: 'text', size: 'mini', icon: 'el-icon-edit-outline', title: '修改' }, on: { click: () => this.handleEdit(params.row) } }, - "修改" + '修改' ), h( 'el-button', @@ -55,7 +52,7 @@ export default { props: { type: 'danger', size: 'mini', icon: 'el-icon-delete', title: '删除' }, on: { click: () => this.handleDelete(params.row, params.index) } }, - "删除" + '删除' ) ]) } @@ -107,7 +104,7 @@ export default { }, watch: { form: { - handler() { }, + handler() {}, deep: true } }, @@ -243,8 +240,7 @@ export default { 全部规则 - + @@ -257,8 +253,15 @@ export default { - + @@ -277,14 +280,19 @@ export default {
- +
- - + + diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 06d351c..e7015ac 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -36,14 +36,20 @@ - + - + diff --git a/src/views/system/user/components/UserDialog.vue b/src/views/system/user/components/UserDialog.vue index eb28b3c..b5a7d3e 100644 --- a/src/views/system/user/components/UserDialog.vue +++ b/src/views/system/user/components/UserDialog.vue @@ -173,7 +173,7 @@ export default { }, // 处理角色选择变化 handleRolesChange(roleIds) { - this.form.sysUserRoleDTOs = roleIds.map(id => ({ roleId: id })); + this.form.sysUserRoleDTOs = roleIds.map(id => ({ roleId: id })) } } } diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue index 2efc914..b1289d3 100644 --- a/src/views/system/user/index.vue +++ b/src/views/system/user/index.vue @@ -24,9 +24,16 @@ - + @@ -41,14 +48,20 @@ - + - + @@ -122,7 +135,7 @@ export default { 'el-button', { props: { type: 'text', size: 'mini' }, - class: "normal-button", + class: 'normal-button', on: { click: () => this.handleEdit(params.row) } }, '编辑' @@ -151,7 +164,7 @@ export default { 'el-button', { props: { type: 'text', size: 'mini', style: 'color: #409EFF' }, - class: "normal-button", + class: 'normal-button', on: { click: () => this.handleResetPassword(params.row) } }, '重置密码' From b2de4cd58d4564ebb33f019433044e9503a618c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=98=B1=E8=BE=BE?= Date: Thu, 24 Apr 2025 09:28:46 +0800 Subject: [PATCH 2/3] =?UTF-8?q?style:=20=E6=B7=BB=E5=8A=A0=E6=8A=BD?= =?UTF-8?q?=E5=B1=89=E7=BB=84=E4=BB=B6=E6=A0=B7=E5=BC=8F-=20=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=20drawer.scss=20=E6=96=87=E4=BB=B6=EF=BC=8C=E5=AE=9A?= =?UTF-8?q?=E4=B9=89=E6=8A=BD=E5=B1=89=E7=BB=84=E4=BB=B6=E7=9A=84=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=20-=20=E5=9C=A8=20renderUi.scss=20=E4=B8=AD=E5=BC=95?= =?UTF-8?q?=E5=85=A5=20drawer.scss-=20=E6=A0=B7=E5=BC=8F=E5=8C=85=E6=8B=AC?= =?UTF-8?q?=E6=8A=BD=E5=B1=89=E7=9A=84=E9=AB=98=E5=BA=A6=E3=80=81=E8=83=8C?= =?UTF-8?q?=E6=99=AF=E3=80=81=E8=BE=B9=E6=A1=86=E3=80=81=E4=BD=8D=E7=BD=AE?= =?UTF-8?q?=E7=AD=89=20-=20=E4=BC=98=E5=8C=96=E6=8A=BD=E5=B1=89=E5=A4=B4?= =?UTF-8?q?=E9=83=A8=E6=A0=B7=E5=BC=8F=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=BA=95?= =?UTF-8?q?=E9=83=A8=E8=BE=B9=E6=A1=86=E5=92=8C=E5=AD=97=E4=BD=93=E6=A0=B7?= =?UTF-8?q?=E5=BC=8F=20-=20=E8=AE=BE=E7=BD=AE=E6=8A=BD=E5=B1=89=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E5=8C=BA=E5=9F=9F=E7=9A=84=E5=86=85=E8=BE=B9=E8=B7=9D?= =?UTF-8?q?=E5=92=8C=E6=BB=9A=E5=8A=A8=E6=9D=A1=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/sass/renderSass/drawer.scss | 40 ++++++++++++++++++++++++++ src/assets/sass/renderUi.scss | 1 + 2 files changed, 41 insertions(+) create mode 100644 src/assets/sass/renderSass/drawer.scss diff --git a/src/assets/sass/renderSass/drawer.scss b/src/assets/sass/renderSass/drawer.scss new file mode 100644 index 0000000..e8035f2 --- /dev/null +++ b/src/assets/sass/renderSass/drawer.scss @@ -0,0 +1,40 @@ +.el-drawer { + &.ltr, + &.rtl { + height: calc(100% - 16px); + margin-top: 8px; + background: #ffffff; + border-radius: 7px; + border: 1px solid #ebeef2; + } + &.rtl { + right: 10px; + } + &.ltr { + left: 10px; + } + & .el-drawer__header { + padding: 27px 20px 10px 20px; + margin-bottom: 0px; + position: relative; + font-family: PingFangSC, PingFang SC; + font-weight: 600; + font-size: 16px; + color: #000000; + &:after { + content: ''; + position: absolute; + bottom: 0; + border-bottom: 1px solid #ddd; + left: 20px; + right: 20px; + transform: scaleY(0.4); + } + } + & .el-drawer__body { + padding: 20px; + &::-webkit-scrollbar { + width: 0px; + } + } +} diff --git a/src/assets/sass/renderUi.scss b/src/assets/sass/renderUi.scss index 8be7a31..d4dfee8 100644 --- a/src/assets/sass/renderUi.scss +++ b/src/assets/sass/renderUi.scss @@ -5,6 +5,7 @@ @import 'renderSass/table'; @import 'renderSass/label'; @import 'renderSass/radio'; +@import 'renderSass/drawer'; html, body, From 4ee2c0c5de404221c9f0adabe227790f7dcd55cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E6=98=B1=E8=BE=BE?= Date: Thu, 24 Apr 2025 10:22:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?style(knowledge):=20=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E7=9F=A5=E8=AF=86=E5=BA=93=E7=9B=B8=E5=85=B3=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 调整标签样式，增加顶部标签样式 - 优化单选按钮和开关样式 - 统一使用变量 --color-primary -调整知识库列表项样式，增加首字母显示 --- src/assets/sass/renderSass/label.scss | 22 ++++++- src/assets/sass/renderSass/radio.scss | 62 +++++++++++++++++++ .../detail/components/preprocessing.vue | 32 +++++----- src/views/knowledge/detail/create.vue | 2 +- src/views/knowledge/index.vue | 18 +++++- 5 files changed, 118 insertions(+), 18 deletions(-) diff --git a/src/assets/sass/renderSass/label.scss b/src/assets/sass/renderSass/label.scss index 0574a99..cade089 100644 --- a/src/assets/sass/renderSass/label.scss +++ b/src/assets/sass/renderSass/label.scss @@ -2,11 +2,31 @@ & .el-form-item__label { padding: 0; font-family: PingFangSC, PingFang SC; - font-weight: 500; + font-weight: 700; font-size: 13px; color: $--color-primary-label; //line-height: 18px; text-align: left; font-style: normal; } + & .el-form-item__content { + margin-left: unset !important; + } } + +//.top-label { +// & .el-form-item__label { +// float: none; +// display: inline-block; +// padding: 0; +// font-family: PingFangSC, PingFang SC; +// font-weight: 500; +// font-size: 13px; +// color: #70778d; +// text-align: left; +// font-style: normal; +// } +// & .el-form-item__content { +// margin-left: unset !important; +// } +//} diff --git a/src/assets/sass/renderSass/radio.scss b/src/assets/sass/renderSass/radio.scss index 5f1e31a..9e56db4 100644 --- a/src/assets/sass/renderSass/radio.scss +++ b/src/assets/sass/renderSass/radio.scss @@ -12,6 +12,7 @@ } .el-radio__inner { background: #fff; + border-color: $--color-primary; &:after { background: $--color-primary; width: 7px; @@ -21,3 +22,64 @@ } } } +.el-switch { + & .el-switch__core { + border-radius: 5px; + &:after { + border-radius: 4px; + } + } + &.is-checked { + & .el-switch__core { + background-color: $--color-primary; + border-color: $--color-primary; + border-radius: 5px; + &:after { + border-radius: 4px; + } + } + } +} +.el-radio-button__orig-radio { + & + .el-radio-button__inner { + font-family: PingFangSC, PingFang SC; + font-weight: 600; + font-size: 13px; + text-align: left; + font-style: normal; + background: #f8f8f8; + border-radius: 5px; + border: none; + box-shadow: unset; + &:hover { + color: $--color-primary; + } + } + + &:checked { + & + .el-radio-button__inner { + background: #fff; + border-radius: 8px; + border: unset; + box-shadow: unset; + color: $--color-primary; + } + } +} + +.el-radio-button { + background: #f8f8f8; + padding: 5px; + &:first-child { + border-radius: 8px 0 0 8px; + & .el-radio-button__inner { + border: none; + } + } + &:last-child { + border-radius: 0 8px 8px 0; + & .el-radio-button__inner { + border: none; + } + } +} diff --git a/src/views/knowledge/detail/components/preprocessing.vue b/src/views/knowledge/detail/components/preprocessing.vue index 5a4eb06..341a622 100644 --- a/src/views/knowledge/detail/components/preprocessing.vue +++ b/src/views/knowledge/detail/components/preprocessing.vue @@ -1,7 +1,7 @@ - - 是 - 否 - + + + + @@ -65,10 +65,10 @@ ： - - 是 - 否 - + + + + @@ -230,22 +230,26 @@ export default { }