diff --git a/src/assets/img/icon-密码.png b/src/assets/img/icon-密码.png index fcc8e00..aae0f71 100644 Binary files a/src/assets/img/icon-密码.png and b/src/assets/img/icon-密码.png differ diff --git a/src/assets/img/icon-账户.png b/src/assets/img/icon-账户.png index b16b96b..b9109d8 100644 Binary files a/src/assets/img/icon-账户.png and b/src/assets/img/icon-账户.png differ diff --git a/src/assets/img/login_bg.png b/src/assets/img/login_bg.png index 8d39b67..574715b 100644 Binary files a/src/assets/img/login_bg.png and b/src/assets/img/login_bg.png differ diff --git a/src/assets/img/login_button.png b/src/assets/img/login_button.png index 4e3b073..f158561 100644 Binary files a/src/assets/img/login_button.png and b/src/assets/img/login_button.png differ diff --git a/src/assets/img/login_button_hover.png b/src/assets/img/login_button_hover.png index 23f7404..765b2ec 100644 Binary files a/src/assets/img/login_button_hover.png and b/src/assets/img/login_button_hover.png differ diff --git a/src/assets/img/loginbg.png b/src/assets/img/loginbg.png index 0bc0d6a..83dc590 100644 Binary files a/src/assets/img/loginbg.png and b/src/assets/img/loginbg.png differ diff --git a/src/assets/img/logo.png b/src/assets/img/logo.png index 04f12b1..82cd31e 100644 Binary files a/src/assets/img/logo.png and b/src/assets/img/logo.png differ diff --git a/src/assets/img/menuDefault.png b/src/assets/img/menuDefault.png index 5dd41ad..a035310 100644 Binary files a/src/assets/img/menuDefault.png and b/src/assets/img/menuDefault.png differ diff --git a/src/assets/less/Suless.less b/src/assets/less/Suless.less index 25d664f..9372e4e 100644 --- a/src/assets/less/Suless.less +++ b/src/assets/less/Suless.less @@ -1,14 +1,14 @@ -@bordercolor : rgb(98,133,151); -@headercolor : #ffffff; -@backcolor : #ffffff; +@bordercolor : rgb(98, 133, 151); +@headercolor : #ffffff; +@backcolor : #ffffff; @inpuitbordercolor: #C3C3C3; -@inpuitbackcolor : #C3C3C346; -@labelDeaultColor : rgb(98,133,151); -@defaultWhiteColor: rgb(98,133,151); -@fontfamily : 'MyCustomFont3', sans-serif; -@tableheadColor : #363F56; -@tableheadBgColor : linear-gradient(180deg, #D6DAE2,#B0B6C2); -@tableColor : #6C758B; +@inpuitbackcolor : #C3C3C346; +@labelDeaultColor : rgb(98, 133, 151); +@defaultWhiteColor: rgb(98, 133, 151); +@fontfamily : 'MyCustomFont3', sans-serif; +@tableheadColor : #363F56; +@tableheadBgColor : linear-gradient(180deg, #D6DAE2, #B0B6C2); +@tableColor : #6C758B; @font-face { font-family: 'MyCustomFont1'; @@ -16,12 +16,14 @@ font-weight: normal; font-style: normal; } + @font-face { font-family: 'MyCustomFont2'; src: url('~@/assets/less/锐字潮牌真言简2.0免费 特粗(REEJI-ZhenyanGB2.0-Black).ttf') format('truetype'); font-weight: normal; font-style: normal; } + @font-face { font-family: 'MyCustomFont3'; src: url('~@/assets/less/锐字潮牌真言简2.0免费 常规(REEJI-ZhenyanGB2.0-Regular).ttf') format('truetype'); @@ -29,51 +31,54 @@ font-style: normal; } -body{ +body { font-family: 'MyCustomFont3', sans-serif !important; } -.datanum{ +.datanum { font-family: 'MyCustomFont2', sans-serif; } -.analysisBG .num{ + +.analysisBG .num { font-family: 'MyCustomFont1', sans-serif; } -.echartsTitle{ + +.echartsTitle { height: 36px; - background: linear-gradient(90deg, #788095,#c5cad6); + background: linear-gradient(90deg, #788095, #c5cad6); color: #ffffff; font-size: 16px; line-height: 34px; - .ecicon{ + + .ecicon { margin-top: 2px; - width:30px; + width: 30px; height: 30px; float: left; background: url('~@/assets/img/echartsTitlebg.png') no-repeat; } } -.linese{ +.linese { width: 100%; height: 1px; margin: 10px 0; - background: linear-gradient(90deg, #1671DB 20px,#a2c6f1 20px,#a2c6f1 calc(100% - 20px),#1671DB calc(100% - 20px)); + background: linear-gradient(90deg, #1671DB 20px, #a2c6f1 20px, #a2c6f1 calc(100% - 20px), #1671DB calc(100% - 20px)); } /* 滚动条优化 start */ ::-webkit-scrollbar { - width : 10px; + width: 10px; height: 8px; } ::-webkit-scrollbar-track { - background : #C8C8C8; + background: #C8C8C8; border-radius: 2px; } ::-webkit-scrollbar-thumb { - background : #fafafa; + background: #fafafa; border-radius: 10px; } @@ -89,6 +94,7 @@ body{ .ant-col { margin-bottom: 6px; } + body { // 打开滚动条固定显示 overflow: hidden; @@ -99,15 +105,15 @@ body { } .logoLabel { - font-size : 36px !important; - color : @defaultWhiteColor !important; - font-family : @fontfamily; + font-size: 36px !important; + color: @defaultWhiteColor !important; + font-family: @fontfamily; letter-spacing: 20px; } .ant-select-selection--multiple .ant-select-selection__choice { background-color: #3f4354 !important; - border : 1px solid #3f4354 !important; + border: 1px solid #3f4354 !important; } .ant-select-selection--multiple .ant-select-selection__choice__remove { @@ -130,18 +136,20 @@ body { background: transparent !important; height: 130px !important; } -.header-nowTime{ + +.header-nowTime { background-image: url('~@/assets/img/header_bg.png') !important; background-size: 100% 66px; background-repeat: no-repeat !important; - + color: #fff; font-family: 'Microsoft YaHei'; font-size: 28px; letter-spacing: 3px; font-weight: 700; - height:70px; - img{ + height: 70px; + + img { margin-right: 10px; } } @@ -156,12 +164,12 @@ body { .border-card, .ant-tabs-tab { font-weight: 400 !important; - font-size : 16px !important; - color : @labelDeaultColor !important; + font-size: 16px !important; + color: @labelDeaultColor !important; } .ant-radio-disabled+span { - color: @labelDeaultColor !important; + color: @labelDeaultColor !important; } /* tab背景 */ @@ -172,23 +180,23 @@ body { .ant-tabs-tab { border-bottom: 2px solid #336591 !important; - text-align : center; - width : 178px; - height : 40px !important; - padding : 6px 16px !important; - margin : 0 -8px 0 0px !important; - background : url('~@/assets/img/tab_bg_default.png') no-repeat; + text-align: center; + width: 178px; + height: 40px !important; + padding: 6px 16px !important; + margin: 0 -8px 0 0px !important; + background: url('~@/assets/img/tab_bg_default.png') no-repeat; } .ant-tabs-tab-active { - z-index : 200 !important; + z-index: 200 !important; border-bottom: 0px !important; - background : url('~@/assets/img/tab_bg_active.png') no-repeat; - color: @headercolor !important; + background: url('~@/assets/img/tab_bg_active.png') no-repeat; + color: @headercolor !important; } .ant-tabs-tab:first-child { - width : 172px; + width: 172px; background: url('~@/assets/img/tab_bg_1_default.png') no-repeat; } @@ -247,7 +255,7 @@ input { } .ant-form-item-label { - text-align : left !important; + text-align: left !important; line-height: 32px !important; } @@ -261,7 +269,7 @@ input { } ul { - list-style : none; + list-style: none; padding-left: 0; } @@ -269,8 +277,8 @@ ul li { line-height: 32px; font-family: @fontfamily; font-weight: 400; - font-size : 16px !important; - color : @tableColor !important; + font-size: 16px !important; + color: @tableColor !important; } @@ -288,7 +296,7 @@ ul li { .border-card, .border-card img { - height : 655px; + height: 655px; overflow-y: auto; } @@ -309,13 +317,14 @@ ul li { .ant-menu.ant-menu-dark .ant-menu-item-selected, .ant-menu-submenu-popup.ant-menu-dark .ant-menu-item-selected { background-color: transparent !important; - background: linear-gradient(180deg, transparent 5px,#11B3FF 5px,#1E30A2 45px,transparent 45px); + background: linear-gradient(180deg, transparent 5px, #11B3FF 5px, #1E30A2 45px, transparent 45px); } .ant-radio-inner, .ant-checkbox-inner { - border-color: @bordercolor !important; + border-color: @bordercolor !important; } + .ant-card-bordered, .ant-pagination-item, .ant-pagination-item-active, @@ -326,20 +335,22 @@ ul li { } .ant-pagination-item-active a, -.ant-pagination-item a:hover{ - background-color: #2989CC !important; +.ant-pagination-item a:hover { + background-color: #1671DB !important; border-radius: 30px; + color: #ffffff !important; } + .ant-pagination-prev .ant-pagination-item-link, -.ant-pagination-next .ant-pagination-item-link -{ +.ant-pagination-next .ant-pagination-item-link { color: #40a9ff; } + .ant-radio-wrapper, .ant-input-affix-wrapper .ant-input-prefix, .ant-input-affix-wrapper .ant-input-suffix, .ant-pagination-disabled .ant-pagination-item-link, -.ant-pagination-item a, +.ant-pagination-item a .ant-empty-normal, .border-card:hover, .ant-tabs-tab:hover, @@ -349,22 +360,23 @@ ul li { .ant-input-password-icon, .ant-dropdown-menu-item>a, .ant-dropdown-menu-submenu-title>a { - color: @defaultWhiteColor !important; + color: @defaultWhiteColor !important; } .ant-breadcrumb { - font-size : 16px; + font-size: 16px; font-family: @fontfamily; } + .ant-breadcrumb>span:last-child { color: #00c3ff !important; } .ant-layout-content { - padding : 0 20px !important; + padding: 0 20px !important; // background : url(~@/assets/img/layoutcontentTop.png) 0 0 no-repeat, url(~@/assets/img/layoutcontentMiddle.png) 0 24px no-repeat, url(~@/assets/img/layoutcontentBottom.png) 0 calc(100vh - 182px) no-repeat; // background-size: calc(100vw - 80px) 24px, calc(100vw - 80px) calc(100vh - 206px), calc(100vw - 80px) 24px; - height : calc(100vh - 130px) !important; + height: calc(100vh - 130px) !important; margin-top: -2px; overflow: hidden; } @@ -378,11 +390,11 @@ ul li { } .trigger { - font-size : 22px; + font-size: 22px; line-height: 42px; - padding : 0 18px; - cursor : pointer; - transition : color 300ms, background 300ms; + padding: 0 18px; + cursor: pointer; + transition: color 300ms, background 300ms; &:hover { background: rgba(255, 255, 255, 0.3); @@ -391,11 +403,11 @@ ul li { .topmenu { .ant-header-fixedHeader { - position : fixed; - top : 0; - right : 0; - z-index : 9; - width : 100%; + position: fixed; + top: 0; + right: 0; + z-index: 9; + width: 100%; transition: width 0.2s; &.ant-header-side-opened { @@ -410,7 +422,7 @@ ul li { /* 必须为 topmenu 才能启用流式布局 */ &.content-width-Fluid { .header-index-wide { - max-width : unset; + max-width: unset; margin-left: 24px; } @@ -422,26 +434,26 @@ ul li { .header { - height : 80px; - padding : 0 12px 0 0; + height: 80px; + padding: 0 12px 0 0; background: @defaultWhiteColor; box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08); - position : relative; + position: relative; } .header, .top-nav-header-index { .user-wrapper { - float : right; + float: right; height: 100%; .action { - cursor : pointer; - padding : 0 14px; - display : inline-block; + cursor: pointer; + padding: 0 14px; + display: inline-block; transition: all 0.3s; - height : 70%; + height: 70%; line-height: 46px; &.action-full { @@ -453,15 +465,15 @@ ul li { } .avatar { - margin : 20px 10px 20px 0; - color : #1890ff; - background : hsla(0, 0%, 100%, 0.85); + margin: 20px 10px 20px 0; + color: #1890ff; + background: hsla(0, 0%, 100%, 0.85); vertical-align: middle; } .icon { font-size: 16px; - padding : 4px; + padding: 4px; } .anticon { @@ -494,9 +506,9 @@ ul li { .header-index-wide { .header-index-left { .logo>a { - overflow : hidden; + overflow: hidden; text-overflow: ellipsis; - white-space : nowrap; + white-space: nowrap; } } } @@ -505,19 +517,19 @@ ul li { .top-nav-header-index { box-shadow: 0 1px 4px rgba(0, 21, 41, 0.08); - position : relative; + position: relative; transition: background 0.3s, width 0.2s; .header-index-wide { - width : 100%; - margin : auto; + width: 100%; + margin: auto; padding: 0 20px 0 0; display: flex; - height : 64px; + height: 64px; .ant-menu.ant-menu-horizontal { - border : none; - height : 64px; + border: none; + height: 64px; line-height: 64px; } @@ -525,33 +537,33 @@ ul li { display: block; .logo.top-nav-header { - width : 165px; - height : 64px; - position : relative; + width: 165px; + height: 64px; + position: relative; line-height: 64px; - transition : all 0.3s; - overflow : hidden; + transition: all 0.3s; + overflow: hidden; img { - display : inline-block; + display: inline-block; vertical-align: middle; - height : 32px; + height: 32px; } h1 { - color : @defaultWhiteColor; - display : inline-block; + color: @defaultWhiteColor; + display: inline-block; vertical-align: top; - font-size : 16px; - margin : 0 0 0 12px; - font-weight : 400; + font-size: 16px; + margin: 0 0 0 12px; + font-weight: 400; } } } .header-index-right { - float : right; - height : 64px; + float: right; + height: 64px; overflow: hidden; .action:hover { @@ -579,8 +591,8 @@ ul li { // 内容区 .layout-content { - margin : 24px 24px 0px; - height : 64px; + margin: 24px 24px 0px; + height: 64px; padding: 0 12px 0 0; } } @@ -592,12 +604,12 @@ ul li { -.ant-btn-background-ghost{ +.ant-btn-background-ghost { display: none !important; } .ant-popover-inner { - background: @inpuitbackcolor !important; + background: @inpuitbackcolor !important; } input:not(.ant-calendar-input):not(.ant-select-search__field):not(.ant-input-lg), @@ -613,7 +625,7 @@ textarea, .ant-select-dropdown-menu-item, .ant-select-dropdown-menu-item-selected, .ant-select-dropdown-content { - background: @inpuitbackcolor !important; + background: @inpuitbackcolor !important; } .ant-popover-message, @@ -631,9 +643,9 @@ textarea, .ant-select-dropdown-menu-item-selected, .ant-select-dropdown-content, .ant-select-dropdown.ant-select-dropdown--multiple .ant-select-dropdown-menu-item-selected .ant-select-selected-icon, -.ant-select-dropdown.ant-select-dropdown--multiple .ant-select-dropdown-menu-item:hover .ant-select-selected-icon { - color: @defaultWhiteColor !important; - min-height: 38px; +.ant-select-dropdown.ant-select-dropdown--multiple .ant-select-dropdown-menu-item:hover .ant-select-selected-icon { + color: @defaultWhiteColor !important; + min-height: 32px; } input:not(.ant-calendar-input):not(.ant-calendar-range-picker-input):not(.ant-select-search__field):not(.ant-input-lg), @@ -642,31 +654,31 @@ textarea, .ant-calendar-picker-input, .ant-input-number-handler-wrap, .ant-select-dropdown-content { - border : 1px solid @inpuitbordercolor !important; + border: 1px solid @inpuitbordercolor !important; border-radius: 3px; } .ant-input-number-handler-down { - border-top: 1px solid @inpuitbordercolor !important; + border-top: 1px solid @inpuitbordercolor !important; } .ant-dropdown-menu, .ant-drawer-content { - overflow : hidden !important; - background: @backcolor !important; - border : 1px solid #5a91c7 !important; + overflow: hidden !important; + background: @backcolor !important; + border: 1px solid #5a91c7 !important; .ant-drawer-header { border-bottom: 0; - background : @headercolor !important; - padding : 10px 24px; + background: @headercolor !important; + padding: 10px 24px; } .ant-modal-close-x { - width : 36px; - height : 36px; + width: 36px; + height: 36px; line-height: 36px; - right : 30px !important; + right: 30px !important; } .ant-modal-title, @@ -681,18 +693,18 @@ textarea, .ant-drawer-body { .drawer-bootom-button { - background-color: @backcolor !important; - border-top : 1px solid @backcolor; + background-color: @backcolor !important; + border-top: 1px solid @backcolor; } .ant-table-tbody tr th, .ant-table-tbody tr td { - color : @tableheadColor; + color: @tableheadColor; font-family: 'MyCustomFont3', sans-serif; // height: 50px; a { - color: @defaultWhiteColor !important; + color: @defaultWhiteColor !important; } } @@ -700,9 +712,9 @@ textarea, .ant-table-bordered .ant-table-tbody>tr>td, .ant-table-content .ant-table-thead>tr>th, .ant-table-content .ant-table-tbody>tr>td { - border-right : 0 !important; + border-right: 0 !important; border-bottom: 0 solid #31343d !important; - line-height : 22px; + line-height: 22px; background: @tableheadBgColor; } } @@ -713,12 +725,12 @@ textarea, } .ant-checkbox-disabled+span { - color: @labelDeaultColor !important; + color: @labelDeaultColor !important; } .ant-btn { - min-width : 60px !important; - height : 36px !important; + min-width: 60px !important; + height: 36px !important; font-family: @fontfamily; //color : @defaultWhiteColor !important; } @@ -726,7 +738,7 @@ textarea, .ant-btn, .ant-input-search-button { // background : url('~@/assets/img/buttonDefault.png') !important; - border : none !important; + border: none !important; border-radius: 0 !important; } @@ -741,31 +753,32 @@ textarea, } .ant-menu-light { - height : 100%; + height: 100%; padding-bottom: 0; - overflow-y : none; + overflow-y: none; } .ant-layout-sider { - margin-left : 50px; - min-width : 286px !important; + margin-left: 50px; + min-width: 286px !important; background-color: transparent !important; } .ant-tree li .ant-tree-node-content-wrapper { - height : 32px !important; + height: 32px !important; line-height: 32px !important; } .ant-tree-node-content-wrapper { - color: @labelDeaultColor !important; + color: @labelDeaultColor !important; } + .ant-tree li .ant-tree-node-content-wrapper.ant-tree-node-selected, -.ant-tree li .ant-tree-node-content-wrapper:hover -{ - color: rgba(0, 0, 0, 0.65) !important; +.ant-tree li .ant-tree-node-content-wrapper:hover { + color: rgba(0, 0, 0, 0.65) !important; } + .ant-notification-notice-icon-error { color: #f5222d !important; } @@ -785,11 +798,12 @@ textarea, .ant-notification-notice-icon-error { color: #f5222d !important; } + .userrolemodel { .ant-tree-node-content-wrapper, .anticon { - color: @labelDeaultColor !important; + color: @labelDeaultColor !important; } } @@ -818,16 +832,16 @@ textarea, background-image: url('~@/assets/img/menuDefault.png'); background-repeat: no-repeat !important; background-size: 100% 100% !important; - min-width : 130px !important; - margin : 0 10px !important; - min-height : 55px !important; - line-height : 50px !important; - text-align : center; - font-weight : 800; - font-size : 20px !important; - padding :0 20px !important; + min-width: 130px !important; + margin: 0 10px !important; + min-height: 55px !important; + line-height: 50px !important; + text-align: center; + font-weight: 800; + font-size: 20px !important; + padding: 0 20px !important; vertical-align: middle !important; - font-family : @fontfamily; + font-family: @fontfamily; border-bottom: none !important; } @@ -837,7 +851,7 @@ textarea, .ant-menu-submenu:hover, .ant-menu-submenu-title, .ant-menu-submenu-title:hover { - color: @headercolor !important; + color: @headercolor !important; } .ant-menu-submenu-horizontal.ant-menu-submenu-selected, @@ -846,28 +860,31 @@ textarea, .ant-menu-horizontal .ant-menu-item-active { background-image: url('~@/assets/img/menuSelect.png') !important; } -.ant-menu-dark .ant-menu-sub{ + +.ant-menu-dark .ant-menu-sub { background: transparent !important; } -.ant-menu{ +.ant-menu { border-radius: 0 !important; box-shadow: none !important; border-bottom: 1px dotted #00CBFF; } -.ant-menu-submenu, .ant-menu-submenu-inline -{ + +.ant-menu-submenu, +.ant-menu-submenu-inline { transition: 0 !important; } + .ant-menu-vertical .ant-menu-item, .ant-menu-submenu.ant-menu-submenu-vertical { // background-image: url('~@/assets/img/MenuSecDefault.png'); background-size: 100% 100%; - width : 263px !important; - height : 50px !important; + width: 263px !important; + height: 50px !important; margin-bottom: 0 !important; - margin-top : -1px !important; + margin-top: -1px !important; line-height: 50px !important; text-align: left; float: left; @@ -875,8 +892,8 @@ textarea, padding: 0 0 0 20px !important; border-top: 1px dotted #00CBFF; } -.ant-menu-item > a > span -{ + +.ant-menu-item>a>span { color: #ffffff !important; } @@ -894,7 +911,7 @@ textarea, .ant-menu-submenu-placement-rightTop { left: 194px !important; - top : 0 !important; + top: 0 !important; } .ant-layout.ant-layout-has-sider>.ant-layout, @@ -902,32 +919,36 @@ textarea, overflow-y: hidden; } -.ant-modal-content{ +.ant-modal-content { // background-image: url('~@/assets/img/文件上传.png') !important; background-size: 100% 100%; background-color: #ffffff !important; } -.ant-modal-header{ +.ant-modal-header { background: #1671DB !important; border-bottom: none !important; } -.ant-modal-title{ + +.ant-modal-title { color: #fff !important; font-size: 20px !important; font-family: 'MyCustomFont2', sans-serif; } -.result-wrapper{ - background: rgb(15,41,61) !important; + +.result-wrapper { + background: rgb(15, 41, 61) !important; border: none !important; height: 360px; - .item{ + + .item { font-family: 'MyCustomFont3', sans-serif; color: #fff !important; } } -.ant-modal-footer{ + +.ant-modal-footer { border-top: none !important; } @@ -974,7 +995,9 @@ textarea, .ant-menu-inline .ant-menu-submenu-title { font-size: 16px !important; } -.ant-menu-item .anticon, .ant-menu-submenu-title .anticon{ + +.ant-menu-item .anticon, +.ant-menu-submenu-title .anticon { font-size: 20px !important; } @@ -989,7 +1012,7 @@ textarea, .ant-dropdown-menu-item>.anticon:first-child, .ant-dropdown-menu-item>a>.anticon:first-child, .ant-dropdown-menu-submenu-title>.anticon:first-child .ant-dropdown-menu-submenu-title>a>.anticon:first-child { - min-width : 12px; + min-width: 12px; margin-right: 8px; } } @@ -1003,9 +1026,9 @@ textarea, .ant-table-selection-column, .ant-table-row-expand-icon { background-color: transparent !important; - color : @labelDeaultColor !important; - font-weight : 400 !important; - font-size : 16px !important; + color: @labelDeaultColor !important; + font-weight: 400 !important; + font-size: 16px !important; } .ant-table-header, @@ -1023,14 +1046,15 @@ tr.ant-table-expanded-row:hover { .ant-table-tbody>tr td, .ant-table-row>td>span>a { background-color: transparent !important; - color : #00A2FF; - height : 50px; - font-family : 'MyCustomFont1', sans-serif; - font-weight : 400 !important; - font-size : 16px !important; + color: #00A2FF; + height: 50px; + font-family: 'MyCustomFont1', sans-serif; + font-weight: 400 !important; + font-size: 16px !important; } -.ant-divider{ - background:#00A2FF !important; + +.ant-divider { + background: #00A2FF !important; } @@ -1066,37 +1090,38 @@ tr.ant-table-expanded-row:hover { .ant-table-small.ant-table-bordered .ant-table-content, .ant-table-fixed, .ant-table-body table { - border : 0px solid #096A87 !important; - border-right : 0px !important; + border: 0px solid #096A87 !important; + border-right: 0px !important; border-bottom: 0px !important; } .ant-table-fixed-right .ant-table-fixed { - border-left : 0 !important; + border-left: 0 !important; border-right: 0 !important; } .ant-table-thead>tr>th, .ant-table-tbody>tr>td { - border-right : 0px solid #096A87 !important; + border-right: 0px solid #096A87 !important; border-bottom: 1px solid #1671DB48 !important; } .ant-table-tbody>tr>td { color: @tableColor !important; } + .ant-table-align-center, .ant-table-thead tr th { - background: @tableheadBgColor !important; - color : @tableheadColor !important; + background: @tableheadBgColor !important; + color: @tableheadColor !important; font-family: 'MyCustomFont3', sans-serif; font-size: 16px; } .ant-alert-info { background-color: #3D4145; - border : none; - color : @defaultWhiteColor; + border: none; + color: @defaultWhiteColor; } @@ -1124,33 +1149,33 @@ tr.ant-table-expanded-row:hover { .table-page-search-wrapper { .ant-form-inline { .ant-form-item { - display : flex; + display: flex; margin-bottom: 10px; - margin-right : 0; + margin-right: 0; .ant-form-item-control-wrapper { - flex : 1 1; - display : inline-block; + flex: 1 1; + display: inline-block; vertical-align: middle; } >.ant-form-item-label { - line-height : 32px; + line-height: 32px; padding-right: 8px; - width : auto; + width: auto; } .ant-form-item-control { - height : 32px; + height: 32px; line-height: 32px; } } } .table-page-search-submitButtons { - display : block; + display: block; margin-bottom: 0px; - white-space : nowrap; + white-space: nowrap; } } diff --git a/src/components/jeecg/JVxeTable/less/size/tiny.less b/src/components/jeecg/JVxeTable/less/size/tiny.less index 5682f2a..e367c2a 100644 --- a/src/components/jeecg/JVxeTable/less/size/tiny.less +++ b/src/components/jeecg/JVxeTable/less/size/tiny.less @@ -39,7 +39,7 @@ // ant输入框 .ant-input, - // ant下拉框 + // ant下拉框 .ant-select-selection { padding: 2px @spacing; height: @height; @@ -70,7 +70,7 @@ .ant-select-selection--multiple { min-height: @height; - & .ant-select-selection__rendered > ul > li { + & .ant-select-selection__rendered>ul>li { height: calc(@height - 6px); font-size: calc(@fontSize - 2px); margin-top: 0; @@ -110,7 +110,6 @@ margin-left: 0; } - // 工具栏 .j-vxe-toolbar { margin-bottom: 4px; @@ -190,13 +189,13 @@ } - .vxe-table.size--tiny .vxe-table--filter-option > .vxe-checkbox--icon, - .vxe-table.size--small .vxe-table--filter-option > .vxe-checkbox--icon { + .vxe-table.size--tiny .vxe-table--filter-option>.vxe-checkbox--icon, + .vxe-table.size--small .vxe-table--filter-option>.vxe-checkbox--icon { font-size: 14px } - .vxe-modal--wrapper.size--tiny .vxe-export--panel-column-option > .vxe-checkbox--icon, - .vxe-modal--wrapper.size--small .vxe-export--panel-column-option > .vxe-checkbox--icon { + .vxe-modal--wrapper.size--tiny .vxe-export--panel-column-option>.vxe-checkbox--icon, + .vxe-modal--wrapper.size--small .vxe-export--panel-column-option>.vxe-checkbox--icon { font-size: 14px } @@ -209,7 +208,7 @@ height: 46px } - .vxe-toolbar.size--tiny .vxe-custom--option > .vxe-checkbox--icon { + .vxe-toolbar.size--tiny .vxe-custom--option>.vxe-checkbox--icon { font-size: 14px } @@ -327,6 +326,4 @@ } -} - - +} \ No newline at end of file diff --git a/src/views/fileManage/modules/uploadModal.vue b/src/views/fileManage/modules/uploadModal.vue index ba55b2c..21d2040 100644 --- a/src/views/fileManage/modules/uploadModal.vue +++ b/src/views/fileManage/modules/uploadModal.vue @@ -67,6 +67,7 @@ import SliceUpload from './SliceUpload' this.visible = false; }, handleOk () { + this.$parent.searchgetFileList(); this.close(); }, handleCancel () { diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue index 8d7991c..766f25d 100644 --- a/src/views/user/Login.vue +++ b/src/views/user/Login.vue @@ -303,8 +303,8 @@ export default { .header { position: absolute; text-align: center; - top:200px; - left:1218px; + top: 160px; + left: 1230px; .title { font-family: 'REEJI-FlashSansGB-Flash-Heavy'; font-weight: 800;