diff --git a/src/assets/icons/svg/packUp.svg b/src/assets/icons/svg/packUp.svg new file mode 100644 index 0000000..f38cbfe --- /dev/null +++ b/src/assets/icons/svg/packUp.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/assets/icons/svg/unfold.svg b/src/assets/icons/svg/unfold.svg new file mode 100644 index 0000000..227acb3 --- /dev/null +++ b/src/assets/icons/svg/unfold.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/src/assets/images/icon_feedback.png b/src/assets/images/icon_feedback.png new file mode 100644 index 0000000..261132d Binary files /dev/null and b/src/assets/images/icon_feedback.png differ diff --git a/src/assets/images/no_notice.png b/src/assets/images/no_notice.png new file mode 100644 index 0000000..9175a18 Binary files /dev/null and b/src/assets/images/no_notice.png differ diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 0ff47c4..2aa7e91 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -122,7 +122,7 @@ aside { //main-container全局样式 .app-container { - width: 1840px; + width: 100%; margin: 0 auto; padding: 0 !important; } diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index ab82c2f..6ece4dd 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -90,10 +90,6 @@ h6 { font-weight: 700; } -.el-dialog:not(.is-fullscreen) { - margin-top: 6vh !important; -} - .el-dialog.scrollbar .el-dialog__body { overflow: auto; overflow-x: hidden; @@ -345,6 +341,109 @@ h6 { } // 按钮样式 +.el-message-box__btns .el-button--primary { + /* 修改确认按钮样式 */ + border-radius: 4px 4px 4px 4px; + background: #1a75e6 !important; + font-family: Microsoft YaHei; + font-weight: 400; + font-size: 16px; + text-align: center; + color: #FFFFFF !important; +} + +.el-message-box__btns .el-button--primary:hover { + /* 修改确认按钮样式 */ + background: #1a75e6 !important; + color: #FFFFFF !important; +} + +.el-message-box__btns .el-button--default { + /* 修改取消按钮样式 */ + border-radius: 4px 4px 4px 4px; + background: #ffc63d; + font-family: Microsoft YaHei; + font-weight: 400; + font-size: 16px; + text-align: center; + color: #000000; +} + +.el-message-box__btns .el-button--default:hover { + /* 修改取消按钮样式 */ + background: #ffc63d; + color: #000000; +} + +.custom-confirm-btn { + // width: 100px; + // height: 34px; + border-radius: 4px 4px 4px 4px; + background: #1a75e6; + font-family: Microsoft YaHei; + font-weight: 400; + font-size: 16px; + text-align: center; + color: #FFFFFF; +} + +.custom-confirm-btn:hover { + background: #1a75e6; + color: #FFFFFF; +} + +.custom-cancel-btn { + // width: 100px; + // height: 34px; + border-radius: 4px 4px 4px 4px; + background: #ffc63d; + font-family: Microsoft YaHei; + font-weight: 400; + font-size: 16px; + text-align: center; + color: #000000; +} + +.custom-cancel-btn:hover { + background: #ffc63d; + color: #000000; +} + + +.my-confirm-btn { + width: 100px; + height: 34px; + border-radius: 4px 4px 4px 4px; + background: #1a75e6; + font-family: Microsoft YaHei; + font-weight: 400; + font-size: 16px; + text-align: center; + color: #FFFFFF; +} + +.my-confirm-btn:hover { + background: #1a75e6; + color: #FFFFFF; +} + +.my-cancel-btn { + width: 100px; + height: 34px; + border-radius: 4px 4px 4px 4px; + background: #ffc63d; + font-family: Microsoft YaHei; + font-weight: 400; + font-size: 16px; + text-align: center; + color: #000000; +} + +.my-cancel-btn:hover { + background: #ffc63d; + color: #000000; +} + .primaryBtn { height: 30px; border-radius: 15px 15px 15px 15px; @@ -382,22 +481,64 @@ h6 { } // 查询条件表单样式覆盖 +.more-search-pane { + display: flex; + justify-content: space-between; + align-items: center; +} + +.search-where-container { + flex: 1; +} + +.search-more-button { + width: 100px; + text-align: right; + display: flex; + align-items: center; + justify-content: flex-end; +} + .searchPanel { - width: 1840px; + width: 100%; height: 45px; line-height: 45px; background: rgba(255, 255, 255, 0.06); border-top: 1px solid rgba(255, 255, 255, 0.3); border-bottom: 1px solid rgba(255, 255, 255, 0.3); - margin-bottom: 20px; padding: 0 20px; } -.searchPanelForm .el-form-item--default { +.searchSmallPanel { + width: 100%; + height: 34px; + line-height: 34px; + background: rgba(255, 255, 255, 0.06); + border-top: 1px solid rgba(255, 255, 255, 0.3); + border-bottom: 1px solid rgba(255, 255, 255, 0.3); + padding: 0 20px; +} + +.el-button.is-text { + background-color: transparent; + border: 0 solid transparent; + color: #ffffff; + padding: 0 !important; +} + +.el-button.is-text:not(.is-disabled):hover { + background-color: transparent; + border: 0 solid transparent; + color: #ffffff; +} + +.searchPanelForm .el-form-item--default, +.searchSmallPanelForm .el-form-item--default { margin-bottom: 6px; } -.searchPanelForm .el-form--inline .el-form-item { +.searchPanelForm .el-form--inline .el-form-item, +.searchSmallPanelForm .el-form--inline .el-form-item { display: inline-flex; margin-right: 26px; vertical-align: middle; @@ -411,94 +552,127 @@ h6 { min-width: 34px; } +.searchSmallPanelForm .el-form-item__label { + font-family: Microsoft YaHei; + font-weight: 400; + font-size: 16px; + color: #FFFFFF; + min-width: 34px; + line-height: 34px; +} + + // 文本输入框样式 -.searchPanelForm .el-input__inner { +.searchPanelForm .el-input__inner, +.searchSmallPanelForm .el-input__inner { font-family: Microsoft YaHei; font-weight: 400; font-size: 16px; color: #FFFFFF; } -.searchPanelForm .el-input__clear { +.searchPanelForm .el-input__clear, +.searchSmallPanelForm .el-input__clear { color: #FFFFFF; } -.searchPanelForm .el-input__clear:hover { +.searchPanelForm .el-input__clear:hover, +.searchSmallPanelForm .el-input__clear:hover { color: #FFFFFF; } -.searchPanelForm .el-input__inner::placeholder { +.searchPanelForm .el-input__inner::placeholder, +.searchSmallPanelForm .el-input__inner::placeholder { font-family: Microsoft YaHei; font-weight: 400; font-size: 16px; color: #FFFFFF; } -.searchPanelForm .el-input__wrapper { +.searchPanelForm .el-input__wrapper, +.searchSmallPanelForm .el-input__wrapper { background-color: transparent; border-radius: 0; box-shadow: none; padding: 0; } -// 选择框样式 -.searchPanelForm .el-select__wrapper { +// 选择框样式 +.searchPanelForm .el-select__wrapper, +.searchSmallPanelForm .el-select__wrapper { background-color: transparent; border-radius: 0; box-shadow: none; padding: 0; } -.searchPanelForm .el-select__wrapper.is-hovering:not(.is-focused) { +.searchPanelForm .el-select__wrapper.is-hovering:not(.is-focused), +.searchSmallPanelForm .el-select__wrapper.is-hovering:not(.is-focused) { box-shadow: none; } -.searchPanelForm .el-select__placeholder { +.searchPanelForm .el-select__placeholder, +.searchSmallPanelForm .el-select__placeholder { font-family: Microsoft YaHei; font-weight: 400; font-size: 16px; color: #FFFFFF; + + // 添加这三行,select中设置最小宽度,可以依据选择内容自适应 + position: relative; + top: none; + transform: none; } -.searchPanelForm .el-select__caret { +.searchPanelForm .el-select__caret, +.searchSmallPanelForm .el-select__caret { color: #FFFFFF; } // 查询日期框样式 -.searchPanelForm .el-date-editor .el-range__icon { +.searchPanelForm .el-date-editor .el-range__icon, +.searchSmallPanelForm .el-date-editor .el-range__icon { color: #FFFFFF; } -.searchPanelForm .el-date-editor .el-range-separator { +.searchPanelForm .el-date-editor .el-range-separator, +.searchSmallPanelForm .el-date-editor .el-range-separator { color: #FFFFFF; } -.searchPanelForm .el-date-editor .el-range-input { +.searchPanelForm .el-date-editor .el-range-input, +.searchSmallPanelForm .el-date-editor .el-range-input { font-family: Microsoft YaHei; font-weight: 400; font-size: 16px; color: #FFFFFF; } -.searchPanelForm .el-date-editor .el-range-input::placeholder { +.searchPanelForm .el-date-editor .el-range-input::placeholder, +.searchSmallPanelForm .el-date-editor .el-range-input::placeholder { font-family: Microsoft YaHei; font-weight: 400; font-size: 16px; color: #FFFFFF; } -.searchPanelForm .el-date-editor .el-range__close-icon { +.searchPanelForm .el-date-editor .el-range__close-icon, +.searchSmallPanelForm .el-date-editor .el-range__close-icon { color: #FFFFFF; } -.searchPanelForm .el-date-editor.el-input__wrapper:hover { +.searchPanelForm .el-date-editor.el-input__wrapper:hover, +.searchSmallPanelForm .el-date-editor.el-input__wrapper:hover { background-color: transparent; border-radius: 0; box-shadow: none !important; padding: 0; } -// 独立查询输入框样式 +// 独立查询输入框样式 +.searchInputForm .el-form-item--default { + margin-bottom: 0px; +} .searchInputForm .el-input__inner { font-family: Microsoft YaHei; font-weight: 400; @@ -635,7 +809,7 @@ h6 { } .my_dialog .el-dialog__header { - border-bottom: 1px solid #D4DAE1 !important; + border-bottom: 1px solid #58585820 !important; padding: 16px; font-family: Microsoft YaHei; font-weight: 700; @@ -652,18 +826,14 @@ h6 { } .my_dialog .el-dialog__body { - // font-family: Microsoft YaHei; - // font-weight: 400; - // font-size: 16px; - // color: #3B3B3B; padding: 20px; } .my_dialog .el-dialog__footer { box-sizing: border-box; padding: 16px; - text-align: right; - border-top: 1px solid #D4DAE1 !important; + text-align: center; + border-top: 1px solid #58585830 !important; } // 表单录入样式 @@ -792,4 +962,25 @@ h6 { font-weight: 400; font-size: 16px; color: #B8B8B8; +} + +.myFeedBackForm .el-form-item__label { + font-family: Microsoft YaHei; + font-weight: 600; + font-size: 16px; + color: #000000; + // min-width: 34px; +} + +.myFeedBackForm .el-textarea__inner { + font-family: Microsoft YaHei; + font-weight: 400; + font-size: 16px; + color: #525252; +} +.myFeedBackForm .el-textarea__inner::placeholder { + font-family: Microsoft YaHei; + font-weight: 400; + font-size: 16px; + color: #87898E !important; } \ No newline at end of file diff --git a/src/assets/styles/sidebar.scss b/src/assets/styles/sidebar.scss index 809f7c2..208f6bc 100644 --- a/src/assets/styles/sidebar.scss +++ b/src/assets/styles/sidebar.scss @@ -113,11 +113,11 @@ .hideSidebar { .sidebar-container { - width: 54px !important; + width: 0px !important; } .main-container { - margin-left: 54px; + margin: 0 36px; } .sub-menu-title-noDropdown { diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 335b8c2..09bb920 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -13,19 +13,40 @@
+ {{ userStore.nickName }} admin
-
+
+ + + + + + + + + +