diff --git a/src/assets/images/bg_top.png b/src/assets/images/bg_top.png new file mode 100644 index 0000000..88b5f61 Binary files /dev/null and b/src/assets/images/bg_top.png differ diff --git a/src/assets/images/optionIcon.png b/src/assets/images/optionIcon.png new file mode 100644 index 0000000..e3a9c29 Binary files /dev/null and b/src/assets/images/optionIcon.png differ diff --git a/src/assets/images/optionIconHover.png b/src/assets/images/optionIconHover.png new file mode 100644 index 0000000..2fa5559 Binary files /dev/null and b/src/assets/images/optionIconHover.png differ diff --git a/src/assets/images/viewFile.png b/src/assets/images/viewFile.png new file mode 100644 index 0000000..ccce28c Binary files /dev/null and b/src/assets/images/viewFile.png differ diff --git a/src/assets/images/viewFileHover.png b/src/assets/images/viewFileHover.png new file mode 100644 index 0000000..9cb3524 Binary files /dev/null and b/src/assets/images/viewFileHover.png differ diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss index 53bcbc8..5b36567 100644 --- a/src/assets/styles/ruoyi.scss +++ b/src/assets/styles/ruoyi.scss @@ -465,6 +465,54 @@ h6 { background: #1a75e6; } +.my_popover { + width: 96px !important; + min-width: 96px !important; + padding: 10px 20px !important; + + .el-popper__arrow, + .el-popper__arrow:before { + display: none; + } +} + +.myImg_popover { + width: 476px !important; + height: 284px !important; + border-radius: 6px !important; + padding: 8px !important; + background: #d1e3f9cc !important; + box-shadow: 0 0 6px 0 #0731597a !important; + + .el-popper__arrow, + .el-popper__arrow:before { + display: none; + } + + img { + width: 460px; + height: 268px; + border-radius: 6px; + background: #000000; + } +} + +.popBtns { + width: 100%; + line-height: 30px; + font-family: Microsoft YaHei; + font-weight: 400; + font-size: 14px; + text-align: left; + color: #000000; + cursor: pointer; +} + +.popBtns:hover { + font-weight: 700; + color: #1C88FB; +} + .el-form-item.is-required:not(.is-no-asterisk).asterisk-left>.el-form-item__label-wrap>.el-form-item__label:before, .el-form-item.is-required:not(.is-no-asterisk).asterisk-left>.el-form-item__label:before { color: #FF2A00; @@ -524,6 +572,70 @@ h6 { padding: 0 20px; } +.choseResultPanel { + width: 100%; + min-height: 40px; + line-height: 40px; +} + +.choseResultPanel .el-form-item--default { + margin-bottom: 0px; +} + +.choseResultPanel .el-form-item--default .el-form-item__content { + line-height: 40px; +} + +.choseResultTag { + height: 26px; + padding: 5px 11px; + border-radius: 4px; + background: #ffffff; + font-family: Microsoft YaHei; + font-weight: 400; + font-size: 16px; + color: #1E1E1E; + margin-right: 10px; + margin-top: 5px; +} + +.choseResultTag .el-tag__close { + color: #a7bcdc !important; +} + +.choseResultTag .el-tag__close:hover { + background: transparent !important; +} + +.choseResultTag .el-icon { + font-size: 14px; +} + +.exportPPTTag { + height: 26px; + padding: 16px 20px; + border-radius: 4px; + border: none; + background: #ffffff; + font-family: Microsoft YaHei; + font-weight: 400; + font-size: 16px; + color: #1E1E1E; + margin-right: 10px; +} +.exportPPTTag .el-tag__close { + color: #9CA6B2 !important; + background: #EEEEEE !important; +} + +.exportPPTTag .el-tag__close:hover { + background: #EEEEEE !important; +} + +.exportPPTTag .el-icon { + font-size: 14px; +} + .el-button.is-text { background-color: transparent; border: 0 solid transparent; @@ -820,12 +932,16 @@ h6 { width: 100%; height: calc(100vh - 165px); } -.myDetailCard .el-table .el-table__header-wrapper th, .el-table .el-table__fixed-header-wrapper th{ + +.myDetailCard .el-table .el-table__header-wrapper th, +.el-table .el-table__fixed-header-wrapper th { background: #ffffff !important; } + .myDetailCard .el-table thead th { font-weight: 400; } + .myDetailCard .el-table .el-table__cell { color: #000000 !important; } @@ -877,7 +993,7 @@ h6 { } .my_dialog .el-dialog__body { - padding: 20px; + padding: 30px; } .my_dialog .el-dialog__footer { diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 09bb920..784656b 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -137,7 +137,9 @@ const submitForm = () => { width: 100%; overflow: hidden; position: fixed; - background: transparent; + background-image: url(../../assets/images/bg_top.png); + background-size: cover; + // background: transparent; box-shadow: none; padding: 0 36px; diff --git a/src/layout/index.vue b/src/layout/index.vue index aab70f7..d52f897 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -75,7 +75,8 @@ function setLayout() { @include mix.clearfix; position: relative; width: 100%; - height: 100vh; + // height: 100vh; + min-height: 100%; background-position: top; /* 顶部对齐 */ background-repeat: no-repeat; diff --git a/src/views/mediaLibrary/index.vue b/src/views/mediaLibrary/index.vue new file mode 100644 index 0000000..e16adee --- /dev/null +++ b/src/views/mediaLibrary/index.vue @@ -0,0 +1,582 @@ + + + \ No newline at end of file diff --git a/src/views/supplier/index.vue b/src/views/supplier/index.vue index 1831121..f5c866a 100644 --- a/src/views/supplier/index.vue +++ b/src/views/supplier/index.vue @@ -129,7 +129,8 @@ @@ -151,14 +152,21 @@ {{ parseTime(scope.row.createTime) }} --> - + @@ -201,8 +209,9 @@