diff --git a/src/assets/img/header_bg.png b/src/assets/img/header_bg.png index 1884e81..ed4d432 100644 Binary files a/src/assets/img/header_bg.png and b/src/assets/img/header_bg.png differ diff --git a/src/assets/img/icon-密码.png b/src/assets/img/icon-密码.png new file mode 100644 index 0000000..c6383ea Binary files /dev/null and b/src/assets/img/icon-密码.png differ diff --git a/src/assets/img/icon-账户.png b/src/assets/img/icon-账户.png new file mode 100644 index 0000000..83ceef7 Binary files /dev/null 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 f017e8a..2494c30 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 aa58e87..c5014f5 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 new file mode 100644 index 0000000..3a319ae Binary files /dev/null and b/src/assets/img/login_button_hover.png differ diff --git a/src/assets/img/loginbg.png b/src/assets/img/loginbg.png new file mode 100644 index 0000000..07c37e3 Binary files /dev/null and b/src/assets/img/loginbg.png differ diff --git a/src/assets/img/menuDefault.png b/src/assets/img/menuDefault.png index fd205eb..ad46ca1 100644 Binary files a/src/assets/img/menuDefault.png and b/src/assets/img/menuDefault.png differ diff --git a/src/assets/img/menuSelect.png b/src/assets/img/menuSelect.png index 833aa69..463a066 100644 Binary files a/src/assets/img/menuSelect.png and b/src/assets/img/menuSelect.png differ diff --git a/src/assets/less/Suless.less b/src/assets/less/Suless.less index 24998cf..e277225 100644 --- a/src/assets/less/Suless.less +++ b/src/assets/less/Suless.less @@ -1,10 +1,12 @@ -@bordercolor : #327290; +@bordercolor : #C8C8C8; @headercolor : #1f232a; @backcolor : #454959; -@inpuitbackcolor : #343642; -@labelDeaultColor : #9698a4; +@inpuitbackcolor : #ffffff; +@labelDeaultColor : #282828; @defaultWhiteColor: #eeeeee; @fontfamily : 'Microsoft YaHei'; +@tableheadColor : #e5e8eb; +@tableColor : #575D63; /* 滚动条优化 start */ ::-webkit-scrollbar { @@ -36,7 +38,7 @@ } body { // 打开滚动条固定显示 - overflow-y: hidden; + overflow: hidden; &.colorWeak { filter: invert(80%); @@ -59,22 +61,27 @@ body { color: #8a8e9e !important; } + + /* chrome 记住密码样式 */ .user-layout-login .has-success input:-webkit-autofill { - box-shadow : inset 0 0 1000px #252c40 !important; - -webkit-text-fill-color: @labelDeaultColor !important; + box-shadow: inset 0 0 1000px 1000px #0f142a !important; + -webkit-text-fill-color: #fff !important; } .ant-layout { - background: url('~@/assets/img/layoutbg.png') no-repeat center bottom !important; + // background: url('~@/assets/img/layoutbg.png') no-repeat center bottom !important; + background-color: #fff !important; + overflow: hidden; } .ant-layout-header { - background: url('~@/assets/img/header_bg.png') no-repeat center top !important; - height: 154px !important; - margin-top: -4px; + background-image: url('~@/assets/img/header_bg.png') !important; + background-size: 100% 100%; + height: 64px !important; } + .signdiv, .ant-card-head, .ant-form-item label, @@ -198,11 +205,11 @@ ul li { font-family: @fontfamily; font-weight: 400 !important; font-size : 16px !important; - color : #d4d4d4 !important; + color : @tableColor !important; } .table-page-search-wrapper { - padding: 8px 0 0 0; + padding: 30px 10px 10px 20px; } @@ -212,9 +219,6 @@ ul li { background: none !important; } -.ant-layout-header { - height: 160px !important; -} .libraryConfiguration .border-card { height: 670px !important; @@ -265,11 +269,11 @@ ul li { } .ant-radio-wrapper, .ant-input-affix-wrapper .ant-input-prefix, -.ant-input-affix-wrapper .ant-input-suffix， +.ant-input-affix-wrapper .ant-input-suffix, .ant-pagination-disabled .ant-pagination-item-link, .ant-pagination-item a, .ant-empty-normal, -.anticon.anticon-schedule， .border-card:hover, +.anticon.anticon-schedule, .border-card:hover, .ant-tabs-tab-active, .ant-tabs-tab:hover, .ant-form-item, @@ -290,11 +294,12 @@ ul li { } .ant-layout-content { - margin : 0 30px; - padding : 20px 50px !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 - 155px) !important; + padding : 0 !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 - 64px) !important; + margin-top: -2px; + overflow: hidden; } .layout { @@ -441,12 +446,12 @@ ul li { margin : auto; padding: 0 20px 0 0; display: flex; - height : 80px; + height : 64px; .ant-menu.ant-menu-horizontal { border : none; - height : 80px; - line-height: 80px; + height : 64px; + line-height: 64px; } .header-index-left { @@ -454,9 +459,9 @@ ul li { .logo.top-nav-header { width : 165px; - height : 80px; + height : 64px; position : relative; - line-height: 80px; + line-height: 64px; transition : all 0.3s; overflow : hidden; @@ -479,7 +484,7 @@ ul li { .header-index-right { float : right; - height : 80px; + height : 64px; overflow: hidden; .action:hover { @@ -570,7 +575,7 @@ textarea, .ant-input-number-handler-wrap, .ant-select-dropdown-content { border : 1px solid @bordercolor !important; - border-radius: 0 !important; + border-radius: 3px; } .ant-input-number-handler-down { @@ -605,6 +610,7 @@ textarea, color: #919499 !important; } + .ant-modal-body, .ant-drawer-body { @@ -624,12 +630,6 @@ textarea, } } - .ant-table-align-center, - .ant-table-thead tr th { - background-color: @backcolor !important; - color : @labelDeaultColor !important; - } - .ant-table-bordered .ant-table-thead>tr>th, .ant-table-bordered .ant-table-tbody>tr>td, .ant-table-content .ant-table-thead>tr>th, @@ -650,7 +650,7 @@ textarea, } .ant-btn { - width : 160px !important; + min-width : 60px !important; height : 36px !important; font-family: @fontfamily; color : @defaultWhiteColor !important; @@ -658,7 +658,7 @@ textarea, .ant-btn, .ant-input-search-button { - background : url('~@/assets/img/buttonDefault.png') !important; + // background : url('~@/assets/img/buttonDefault.png') !important; border : none !important; border-radius: 0 !important; } @@ -674,9 +674,9 @@ textarea, } .ant-menu-light { - height : 850px; - padding-bottom: 10px; - overflow-y : scroll; + height : 100%; + padding-bottom: 0; + overflow-y : none; } .ant-layout-sider { @@ -748,17 +748,20 @@ textarea, .ant-menu-horizontal .ant-menu-item, .ant-menu-submenu.ant-menu-submenu-horizontal { - background : url('~@/assets/img/menuDefault.png') no-repeat; - width : 176px !important; - margin : 0 20px !important; - min-height : 60px !important; - line-height : 60px !important; + 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 : 36px !important; + line-height : 36px !important; text-align : center; font-weight : bold; - font-size : 18px !important; - padding : 0px !important; + font-size : 16px !important; + padding :0 20px !important; vertical-align: middle !important; font-family : @fontfamily; + border-bottom: none !important; } .ant-menu-item>a>span, @@ -776,8 +779,9 @@ textarea, .ant-menu-submenu-horizontal.ant-menu-submenu-selected, .ant-menu-submenu-horizontal.ant-menu-submenu-open, +.ant-menu-horizontal .ant-menu-item-selected, .ant-menu-horizontal .ant-menu-item-active { - background: url('~@/assets/img/menuSelect.png') no-repeat !important; + background-image: url('~@/assets/img/menuSelect.png') !important; } .ant-menu-vertical .ant-menu-item, @@ -797,7 +801,8 @@ textarea, .ant-menu-submenu-vertical.ant-menu-submenu-open, .ant-menu-vertical .ant-menu-item-selected, .ant-menu-vertical .ant-menu-item-active { - background: url('~@/assets/img/MenuSecSelect.png') no-repeat; + background-image: url('~@/assets/img/MenuSecSelect.png'); + background-size: 100% 100%; } .ant-menu-submenu-placement-rightTop { @@ -877,7 +882,6 @@ textarea, .ant-table-align-center, .ant-table-selection-column, -.ant-table-thead th, .ant-table-row-expand-icon { background-color: transparent !important; color : @labelDeaultColor !important; @@ -906,12 +910,16 @@ tr.ant-table-expanded-row:hover { .ant-table-tbody>tr td, .ant-table-row>td>span>a { background-color: transparent !important; - color : @defaultWhiteColor; + color : #00A2FF; height : 50px; font-family : @fontfamily; font-weight : 400 !important; font-size : 16px !important; } +.ant-divider{ + background:#00A2FF !important; +} + .ant-table-tbody>tr.ant-table-row-hover>td, .ant-table-tbody>tr.ant-table-row-hover>td>span>a, @@ -964,14 +972,25 @@ tr.ant-table-expanded-row:hover { border-bottom: 1px solid #31343d !important; } +.ant-table-tbody>tr>td { + color: @tableColor !important; +} +.ant-table-align-center, +.ant-table-thead tr th { + background-color: @tableheadColor !important; + color : @labelDeaultColor !important; + font-weight: 700 !important; +} + .ant-alert-info { background-color: #3D4145; border : none; color : @defaultWhiteColor; } + .ant-alert-info>a { - color: @defaultWhiteColor; + color: #00A2FF; } .ant-card-body { @@ -1026,7 +1045,10 @@ tr.ant-table-expanded-row:hover { .content { .table-operator { + position: absolute; margin-bottom: 18px; + right: 10px; + top:30px; button { margin-right: 8px; diff --git a/src/components/layouts/TabLayout.vue b/src/components/layouts/TabLayout.vue index fb61424..934353e 100644 --- a/src/components/layouts/TabLayout.vue +++ b/src/components/layouts/TabLayout.vue @@ -18,7 +18,7 @@ {{ page.meta.title }} -
+
diff --git a/src/components/layouts/UserLayout.vue b/src/components/layouts/UserLayout.vue index 7af7524..6def8f5 100644 --- a/src/components/layouts/UserLayout.vue +++ b/src/components/layouts/UserLayout.vue @@ -59,7 +59,7 @@ export default { .container { width: 1920px; min-height: 100%; - background: url('~@/assets/img/layoutbg.png') no-repeat center bottom ; + background: url('~@/assets/img/loginbg.png') no-repeat center center ; background-size: 100%; // padding: 110px 0 144px; position: relative; @@ -112,9 +112,9 @@ export default { } .main { - width: 670px; - height: 488px; - margin: 200px auto; + width: 568px; + height: 440px; + margin: 293px 1173px; background: url(~@/assets/img/login_bg.png) no-repeat; } diff --git a/src/components/menu/index.js b/src/components/menu/index.js index abc8835..41a2335 100644 --- a/src/components/menu/index.js +++ b/src/components/menu/index.js @@ -99,14 +99,15 @@ export default { renderItem (menu) { if (!menu.hidden) { return menu.children && !menu.alwaysShow ? this.renderSubMenu(menu) : this.renderMenuItem(menu) + return this.renderMenuItem(menu) } return null }, renderMenuItem (menu) { - if(menu.meta.title == '首页') - { - return null - } + // if(menu.meta.title == '首页') + // { + // return null + // } const target = menu.meta.target || null const tag = target && 'a' || 'router-link' let props = { to: { name: menu.name } } @@ -124,7 +125,7 @@ export default { item.meta = Object.assign(item.meta, { hidden: true }) }) } - + return ( @@ -139,6 +140,7 @@ export default { if (!menu.alwaysShow) { menu.children.forEach(item => itemArr.push(this.renderItem(item))) } + return ( diff --git a/src/components/page/GlobalHeader.vue b/src/components/page/GlobalHeader.vue index 7300843..49924c3 100644 --- a/src/components/page/GlobalHeader.vue +++ b/src/components/page/GlobalHeader.vue @@ -28,35 +28,24 @@
-
-
{{ nowTime }}
-
{{ nowDate }}
-
{{ nowWeek }}
-
+
末端数据接入处理系统
- +
+
+ +
+
-
-
- -
-
- -
-
- -
-
@@ -222,8 +171,8 @@ export default { margin-left: 10px; .ant-menu.ant-menu-horizontal { - height: 82px; - line-height: 82px; + height: 64px; + line-height: 64px; } } .trigger { @@ -237,7 +186,7 @@ export default { .header { z-index: 2; color: white; - height: 82px; + height: 64px; background-color: @primary-color; transition: background 300ms; @@ -258,32 +207,15 @@ export default { } .ant-layout-header { - height: 82px; - line-height: 76px; + height: 64px; + line-height: 64px; } .header-nowTime { - color: #00c3ff; + color: #fff; font-family: 'Microsoft YaHei'; - letter-spacing: 2px; - .nowTime { - font-size: 40px; - width: 120px; - float: left; - margin-left:27px; - } - .nowDate { - font-size: 14px; - width: 200px; - height: 42px; - float: left; - line-height: 62px; - } - .nowWeek { - font-size: 14px; - width: 200px; - height: 14px; - float: left; - line-height: 14px; - } + font-size: 26px; + letter-spacing: 3px; + font-weight: 700; + padding-left:23px; } \ No newline at end of file diff --git a/src/components/page/GlobalLayout.vue b/src/components/page/GlobalLayout.vue index ef63342..05d9cb9 100644 --- a/src/components/page/GlobalLayout.vue +++ b/src/components/page/GlobalLayout.vue @@ -133,6 +133,7 @@ export default { //--update-begin----author:scott---date:20190320------for:根据后台菜单配置，判断是否路由菜单字段，动态选择是否生成路由（为了支持参数URL菜单）------ //this.menus = this.mainRouters.find((item) => item.path === '/').children; this.menus = this.permissionMenuList + console.log(this.permissionMenuList) // 根据后台配置菜单，重新排序加载路由信息 //console.log('----加载菜单逻辑----') //console.log(this.mainRouters) diff --git a/src/components/page/PageHeader.vue b/src/components/page/PageHeader.vue index abf8ea3..7924b9e 100644 --- a/src/components/page/PageHeader.vue +++ b/src/components/page/PageHeader.vue @@ -102,11 +102,17 @@ \ No newline at end of file diff --git a/src/components/tools/UserMenu.vue b/src/components/tools/UserMenu.vue index 77f96f7..e363c68 100644 --- a/src/components/tools/UserMenu.vue +++ b/src/components/tools/UserMenu.vue @@ -33,7 +33,7 @@ --> - + logo 欢迎您，{{ nickname() }} diff --git a/src/views/user/Login.vue b/src/views/user/Login.vue index 92d4bab..d2a40f0 100644 --- a/src/views/user/Login.vue +++ b/src/views/user/Login.vue @@ -2,18 +2,23 @@
@@ -76,7 +71,7 @@ export default { }, labelCol: { xs: { span: 24 }, - sm: { span: 7 }, + sm: { span: 4 }, }, wrapperCol: { xs: { span: 24 }, @@ -226,13 +221,16 @@ export default { }) }, loginSuccess() { - this.$router.push({ path: '/dashboard/analysis' }).catch(() => { - console.log('登录跳转首页出错,这个错误从哪里来的') - }) this.$notification.success({ message: '欢迎', description: `${timeFix()}，欢迎回来`, }) + this.loginBtn = false + this.$router.push({ path: '/dashboard/analysis' }).then(() => { + console.log('222') + }).catch(() => { + console.log('登录跳转首页出错,这个错误从哪里来的') + }) }, cmsFailed(err) { this.$notification['error']({ @@ -298,34 +296,61 @@ export default {