优化UI界面,新增异常处理页面

pull/1/head
wangziyangyang 2020-03-05 13:41:54 +08:00
parent 628c627ef3
commit f5ffbdaf98
9 changed files with 403 additions and 309 deletions

View File

@ -0,0 +1,16 @@
package com.songpeng.sparchetype.common.advice;
import org.springframework.boot.web.server.ErrorPage;
import org.springframework.boot.web.server.ErrorPageRegistrar;
import org.springframework.boot.web.server.ErrorPageRegistry;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpStatus;
@Configuration
public class MyErrorViewResolver implements ErrorPageRegistrar {
@Override
public void registerErrorPages(ErrorPageRegistry registry) {
registry.addErrorPages(new ErrorPage(HttpStatus.BAD_REQUEST, "/400"));
}
}

View File

@ -46,7 +46,7 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
homeInfo.put("url", "admin/welcome-ui");
Map<String, String> logoInfo = new HashMap<>(4);
logoInfo.put("name", "后台管理");
logoInfo.put("name", "黑科制造MES");
logoInfo.put("image", "image/logo.png");
logoInfo.put("url", "");

View File

@ -3,473 +3,555 @@
*/
/**头部-配色*/
.layui-layout-admin .layui-header {
background-color: #1aa094 !important;
background-color: #23262e !important;
}
.layui-header > ul > .layui-nav-item.layui-this,
.splayui-tool i:hover {
background-color: #197971 !important;
background-color: #197971 !important;
}
/**logo-配色*/
.layui-layout-admin .layui-logo {
background-color: #243346 !important;
background-color: #243346 !important;
}
/**左侧-配色*/
.layui-side.layui-bg-black,
.layui-side.layui-bg-black > .layui-left-menu > ul {
background-color: #2f4056 !important;
background-color: #2f4056 !important;
}
.layui-left-menu .layui-nav .layui-nav-child a:hover:not(.layui-this) {
background-color: #3b3f4b;
background-color: #3b3f4b;
}
/**左侧菜单选中-配色*/
.layui-layout-admin .layui-nav-tree .layui-this,
.layui-layout-admin .layui-nav-tree .layui-this > a,
.layui-layout-admin .layui-nav-tree .layui-nav-child dd.layui-this,
.layui-layout-admin .layui-nav-tree .layui-nav-child dd.layui-this a {
background-color: #1aa094 !important;
background-color: #1aa094 !important;
}
/**头部样式 */
.layui-layout-admin .header {
position: fixed;
left: 0;
right: 0;
top: 0;
bottom: 0;
position: fixed;
left: 0;
right: 0;
top: 0;
bottom: 0;
}
.layui-header-menu,
.layui-header {
height: 60px !important;
height: 60px !important;
}
.layui-header-menu > .layui-nav-item {
color: #1b1d21;
height: 60px !important;
line-height: 60px !important;
color: #1b1d21;
height: 60px !important;
line-height: 60px !important;
}
.layui-header > .layui-layout-right > .layui-nav-item {
height: 60px !important;
line-height: 60px !important;
height: 60px !important;
line-height: 60px !important;
}
.layui-layout-left {
left: 295px !important;
left: 295px !important;
}
.layui-nav.layui-layout-left.layui-header-menu.mobile.layui-hide-xs {
font-weight: bold;
transition: all 0.2s;
font-weight: bold;
transition: all 0.2s;
}
/**头部样式(缩放) */
.splayui-admin .layui-layout-left.layui-header-menu.layui-hide-xs {
left: 155px !important;
left: 155px !important;
}
/**logo演示通用 */
.layui-layout-admin .layui-logo {
font-weight: bold;
color: #ffffff !important;
height: 60px !important;
line-height: 60px !important;
overflow: hidden;
line-height: 64px;
transition: all 0.2s !important;
font-weight: bold;
color: #ffffff !important;
height: 60px !important;
line-height: 60px !important;
overflow: hidden;
line-height: 64px;
transition: all 0.2s !important;
}
.layui-layout-admin .layui-logo img {
display: inline-block;
height: 30px;
vertical-align: middle;
display: inline-block;
height: 30px;
vertical-align: middle;
}
.scale img {
background-size: contain;
width: 100%;
height: auto;
}
.layui-layout-admin .layui-logo h1 {
display: inline-block;
margin: 0 0 0 12px;
color: #dadde2;
font-weight: 600;
font-size: 20px;
font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
vertical-align: middle;
display: inline-block;
margin: 0 0 0 12px;
color: #dadde2;
font-weight: 600;
font-size: 20px;
font-family: Avenir, Helvetica Neue, Arial, Helvetica, sans-serif;
vertical-align: middle;
}
/**logo演示缩放 */
.splayui-admin .layui-layout-admin .layui-logo {
width: 60px !important;
width: 60px !important;
}
.splayui-admin .layui-layout-admin .layui-logo h1 {
display: none;
display: none;
}
/**缩放工具(通用) */
.splayui-tool {
position: absolute !important;
top: 0;
left: 235px;
width: 60px;
height: 100%;
line-height: 60px;
text-align: center;
color: #ffffff !important;
transition: all 0.2s;
position: absolute !important;
top: 0;
left: 235px;
width: 60px;
height: 100%;
line-height: 60px;
text-align: center;
color: #ffffff !important;
transition: all 0.2s;
}
/**缩放工具(缩放) */
.splayui-admin .splayui-tool {
left: 95px !important;
left: 95px !important;
}
.splayui-tool i {
display: block;
color: #fff;
width: 32px;
height: 32px;
line-height: 32px;
border-radius: 3px;
text-align: center;
margin-top: 15px;
cursor: pointer;
display: block;
color: #fff;
width: 32px;
height: 32px;
line-height: 32px;
border-radius: 3px;
text-align: center;
margin-top: 15px;
cursor: pointer;
}
/**tab选项卡 */
.layui-tab-title li cite {
font-style: normal;
padding-left: 5px;
font-style: normal;
padding-left: 5px;
}
#top_tabs_box > .layui-tab-title {
color: #acafb1;
color: #acafb1;
}
#top_tabs_box > .layui-tab-title li:hover {
color: #000000;
background-color: #e7ebed;
color: #000000;
background-color: #e7ebed;
}
#top_tabs_box .layui-tab-close {
font-size: 12px !important;
width: 14px !important;
height: 14px !important;
line-height: 16px !important;
font-size: 12px !important;
width: 14px !important;
height: 14px !important;
line-height: 16px !important;
}
#top_tabs_box .layui-tab-close:hover {
border-radius: 4em;
background: #ff5722;
border-radius: 4em;
background: #ff5722;
}
#top_tabs_box > .layui-tab-title > .layui-this > i:first-child {
color: #009688;
color: #009688;
}
#top_tabs_box > .layui-tab-title li {
border-right: 1px solid #e2e2e2;
font-size: 12.5px !important;
border-right: 1px solid #e2e2e2;
font-size: 12.5px !important;
}
#top_tabs_box > .layui-tab-title .layui-this {
color: #000000;
color: #000000;
}
.layui-tab-title .layui-this:after {
border: none;
border: none;
}
#top_tabs_box {
padding-right: 138px;
height: 34px;
border-bottom: 1px solid #e2e2e2;
padding-right: 138px;
height: 34px;
border-bottom: 1px solid #e2e2e2;
}
#top_tabs_box > .layui-tab-title,
#top_tabs_box > .closeBox {
height: 35px !important;
height: 35px !important;
}
#top_tabs_box > .layui-tab-title > li,
#top_tabs_box > .closeBox > li {
line-height: 35px !important;
line-height: 35px !important;
}
#top_tabs {
position: absolute;
border-bottom: none;
position: absolute;
border-bottom: none;
}
/**多窗口页面操作下拉**/
.closeBox {
position: absolute;
right: 15px;
background-color: #fff !important;
color: #000;
border-left: 1px solid #e2e2e2;
border-bottom: 1px solid #e2e2e2;
padding: 0 10px !important;
position: absolute;
right: 15px;
background-color: #fff !important;
color: #000;
border-left: 1px solid #e2e2e2;
border-bottom: 1px solid #e2e2e2;
padding: 0 10px !important;
}
.closeBox .layui-nav-item {
line-height: 40px;
line-height: 40px;
}
.closeBox .layui-nav-item > a,
.closeBox .layui-nav-item > a:hover {
color: #000;
color: #000;
}
.closeBox .layui-nav-child {
top: 40px;
top: 40px;
}
.closeBox .layui-nav-bar {
display: none;
display: none;
}
.closeBox a i.caozuo {
font-size: 20px;
position: absolute;
top: 1px;
left: 0;
font-size: 20px;
position: absolute;
top: 1px;
left: 0;
}
.closeBox a span.layui-nav-more {
border-color: #333 transparent transparent;
border-color: #333 transparent transparent;
}
.closeBox a span.layui-nav-more.layui-nav-mored {
border-color: transparent transparent #333;
border-color: transparent transparent #333;
}
/**左侧菜单栏 (通用) */
.layui-side.layui-bg-black {
transition: all 0.2s;
transition: all 0.2s;
}
.layui-side.layui-bg-black > .layui-left-menu > ul {
transition: all 0.2s;
transition: all 0.2s;
}
.layui-side.layui-bg-black
> .layui-left-menu
> ul
> .layui-nav-item:first-child {
border-top: 1px solid #4b5461;
> .layui-left-menu
> ul
> .layui-nav-item:first-child {
border-top: 1px solid #4b5461;
}
.layui-left-menu .layui-nav .layui-nav-item a {
height: 40px;
line-height: 40px;
padding-right: 30px;
height: 40px;
line-height: 40px;
padding-right: 30px;
}
.layui-left-menu .layui-nav .layui-nav-item > a {
padding-top: 5px;
padding-bottom: 5px;
padding-top: 5px;
padding-bottom: 5px;
}
.layui-left-menu .layui-nav .layui-nav-child .layui-nav-child {
background: 0 0 !important;
background: 0 0 !important;
}
.layui-left-menu .layui-nav .layui-nav-more {
right: 15px;
right: 15px;
}
/**左侧菜单栏 (正常) */
.splayui-all .layui-nav-itemed .layui-nav-child a,
.splayui-all .layui-left-menu .layui-nav .layui-nav-child a {
padding-left: 35px;
padding-left: 35px;
}
.splayui-all .layui-left-menu .layui-nav .layui-nav-child .layui-nav-child a {
padding-left: 45px;
padding-left: 45px;
}
.splayui-all
.layui-left-menu
.layui-nav
.layui-nav-child
.layui-nav-child
.layui-nav-child
a {
padding-left: 55px;
.layui-left-menu
.layui-nav
.layui-nav-child
.layui-nav-child
.layui-nav-child
a {
padding-left: 55px;
}
.splayui-all
.layui-left-menu
.layui-nav
.layui-nav-child
.layui-nav-child
.layui-nav-child
.layui-nav-child
a {
padding-left: 65px;
.layui-left-menu
.layui-nav
.layui-nav-child
.layui-nav-child
.layui-nav-child
.layui-nav-child
a {
padding-left: 65px;
}
.splayui-all
.layui-left-menu
.layui-nav
.layui-nav-itemed
> .layui-nav-child {
padding: 5px 0;
.layui-left-menu
.layui-nav
.layui-nav-itemed
> .layui-nav-child {
padding: 5px 0;
}
/**左侧菜单栏(缩放) */
.splayui-admin .layui-side.layui-bg-black,
.splayui-admin .layui-left-menu,
.splayui-admin .layui-left-menu > ul,
.splayui-admin .layui-left-menu > ul li i {
width: 60px !important;
width: 60px !important;
}
.splayui-admin .layui-left-menu > ul li span:first-child {
display: none;
display: none;
}
.splayui-admin .layui-left-menu > ul li span:last-child {
float: right;
right: 7px;
float: right;
right: 7px;
}
.splayui-admin .layui-left-menu .layui-nav .layui-nav-item a {
height: 40px;
line-height: 40px;
padding-right: 0px !important;
height: 40px;
line-height: 40px;
padding-right: 0px !important;
}
/**内容主体(通用) */
.layui-layout-admin .layui-body {
overflow: hidden;
bottom: 0px !important;
top: 60px !important;
transition: all 0.2s;
overflow: hidden;
bottom: 0px !important;
top: 60px !important;
transition: all 0.2s;
}
/**内容主体(缩放) */
.splayui-admin .layui-layout-admin .layui-body {
left: 60px !important;
left: 60px !important;
}
/**选择配色方案 */
.splayui-color .color-title {
padding: 10px 0 10px 20px;
border-bottom: 1px solid #d9dada;
margin-bottom: 8px;
padding: 10px 0 10px 20px;
border-bottom: 1px solid #d9dada;
margin-bottom: 8px;
}
.splayui-color .color-content {
padding: 0 5px 0 5px;
padding: 0 5px 0 5px;
}
.splayui-color .color-content ul {
list-style: none;
text-align: center;
list-style: none;
text-align: center;
}
.splayui-color .color-content ul li {
position: relative;
display: inline-block;
vertical-align: top;
width: 80px;
height: 50px;
margin: 0 15px 15px 0;
padding: 2px 2px 4px 2px;
background-color: #f2f2f2;
cursor: pointer;
font-size: 12px;
color: #666;
position: relative;
display: inline-block;
vertical-align: top;
width: 80px;
height: 50px;
margin: 0 15px 15px 0;
padding: 2px 2px 4px 2px;
background-color: #f2f2f2;
cursor: pointer;
font-size: 12px;
color: #666;
}
.splayui-color .color-content li.layui-this:after,
.splayui-color .color-content li:hover:after {
width: 100%;
height: 100%;
padding: 4px;
top: -5px;
left: -5px;
border-color: #d8d8d8;
opacity: 1;
width: 100%;
height: 100%;
padding: 4px;
top: -5px;
left: -5px;
border-color: #d8d8d8;
opacity: 1;
}
.splayui-color .color-content li:after {
content: "";
position: absolute;
z-index: 20;
top: 50%;
left: 50%;
width: 1px;
height: 0;
border: 1px solid #f2f2f2;
transition: all 0.3s;
-webkit-transition: all 0.3s;
opacity: 0;
content: "";
position: absolute;
z-index: 20;
top: 50%;
left: 50%;
width: 1px;
height: 0;
border: 1px solid #f2f2f2;
transition: all 0.3s;
-webkit-transition: all 0.3s;
opacity: 0;
}
/**其它 */
.layui-tab-item {
width: 100% !important;
height: 100% !important;
width: 100% !important;
height: 100% !important;
}
.layui-nav-item.layui-this {
background-color: #1b1d21;
background-color: #1b1d21;
}
.layui-width-height {
width: 100%;
height: 95%;
width: 100%;
height: 95%;
}
.layui-tab {
margin: 0 0 0 0;
z-index: 99999;
margin: 0 0 0 0;
z-index: 99999;
}
.text-center {
height: 30px !important;
line-height: 30px !important;
text-align: center !important;
height: 30px !important;
line-height: 30px !important;
text-align: center !important;
}
.layui-nav {
padding: 0 !important;
padding: 0 !important;
}
.layui-nav .layui-this:after,
.layui-nav-bar,
.layui-nav-tree .layui-nav-itemed:after {
width: 0 !important;
height: 0 !important;
width: 0 !important;
height: 0 !important;
}
.layui-layout-admin .layui-side {
top: 60px !important;
top: 60px !important;
}
.layui-tab-card {
box-shadow: 0px 0px 0px #888888;
border-bottom: 0;
box-shadow: 0px 0px 0px #888888;
border-bottom: 0;
}
.clildFrame.layui-tab-content {
top: 35px;
position: absolute;
bottom: 0px;
width: 100%;
padding: 0;
top: 35px;
position: absolute;
bottom: 0px;
width: 100%;
padding: 0;
}
* {
touch-action: pan-y;
touch-action: pan-y;
}
/**
*/
@media screen and (max-width: 768px) {
#top_tabs_box {
border-bottom: 0px !important;
}
.layui-layout-admin .layui-body .layui-tab-item.layui-show {
border-top: 1px solid #e2e2e2;
}
.splayui-admin .splayui-tool {
left: 15px !important;
}
.splayui-tool i:hover {
background-color: transparent !important;
}
.splayui-all .layui-layout-left.layui-header-menu {
transition: all 0.2s;
float: right;
right: 5px;
}
.splayui-all .layui-header-menu > .layui-nav-item {
float: right;
right: 0px;
}
.splayui-admin .layui-layout-left.layui-header-menu {
left: 50px !important;
transition: all 0.2s;
}
.layui-layout-admin .layui-nav.layui-layout-right {
margin-right: 15px !important;
}
.layui-layout-admin
#top_tabs_box {
border-bottom: 0px !important;
}
.layui-layout-admin .layui-body .layui-tab-item.layui-show {
border-top: 1px solid #e2e2e2;
}
.splayui-admin .splayui-tool {
left: 15px !important;
}
.splayui-tool i:hover {
background-color: transparent !important;
}
.splayui-all .layui-layout-left.layui-header-menu {
transition: all 0.2s;
float: right;
right: 5px;
}
.splayui-all .layui-header-menu > .layui-nav-item {
float: right;
right: 0px;
}
.splayui-admin .layui-layout-left.layui-header-menu {
left: 50px !important;
transition: all 0.2s;
}
.layui-layout-admin .layui-nav.layui-layout-right {
margin-right: 15px !important;
}
.layui-layout-admin
.layui-nav.layui-layout-right
> li:not(.splayui-setting) {
width: 40px !important;
}
.layui-layout-admin
width: 40px !important;
}
.layui-layout-admin
.layui-nav.layui-layout-right
> li:not(.splayui-setting)
a {
padding: 0 15px;
}
.splayui-admin .layui-layout-admin .layui-body {
left: 0px !important;
}
.layui-layout-admin .layui-body .clildFrame.layui-tab-content {
top: 0px !important;
}
.layui-layout-admin .layui-body .clildFrame.layui-tab-content {
overflow: scroll;
table-layout: fixed;
word-wrap: break-word;
word-break: break-all;
-webkit-overflow-scrolling: touch !important;
}
.splayui-all .layui-nav.layui-layout-right,
.splayui-admin .layui-layout-admin .layui-logo,
.splayui-admin .layui-side.layui-bg-black,
.splayui-admin .layui-left-menu,
.layui-layout-admin .layui-body #top_tabs,
.layui-layout-admin .layui-body .layui-nav.closeBox {
transition: all 0.2s;
display: none;
}
padding: 0 15px;
}
.splayui-admin .layui-layout-admin .layui-body {
left: 0px !important;
}
.layui-layout-admin .layui-body .clildFrame.layui-tab-content {
top: 0px !important;
}
.layui-layout-admin .layui-body .clildFrame.layui-tab-content {
overflow: scroll;
table-layout: fixed;
word-wrap: break-word;
word-break: break-all;
-webkit-overflow-scrolling: touch !important;
}
.splayui-all .layui-nav.layui-layout-right,
.splayui-admin .layui-layout-admin .layui-logo,
.splayui-admin .layui-side.layui-bg-black,
.splayui-admin .layui-left-menu,
.layui-layout-admin .layui-body #top_tabs,
.layui-layout-admin .layui-body .layui-nav.closeBox {
transition: all 0.2s;
display: none;
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 66 KiB

After

Width:  |  Height:  |  Size: 66 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 133 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.1 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

View File

@ -25,7 +25,7 @@ layui.define(["element", "jquery"], function (exports) {
var config = {
urlHashLocation: true, // URL地址hash定位
urlSuffixDefault: true, // URL后缀
BgColorDefault: 0, // 默认皮肤0开始
BgColorDefault: 1, // 默认皮肤0开始
checkUrlDefault: true // 是否判断URL有效
};
@ -389,7 +389,7 @@ layui.define(["element", "jquery"], function (exports) {
var html = '';
var bgcolorId = sessionStorage.getItem('splayuiBgcolorId');
if (bgcolorId == null || bgcolorId == undefined || bgcolorId == '') {
bgcolorId = 0;
bgcolorId = 1;
}
var bgColorConfig = splayui.bgColorConfig();
$.each(bgColorConfig, function (key, val) {

View File

@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="UTF-8">
<title>后台管理系统</title>
<title>黑科-MES系统</title>
<meta name="renderer" content="webkit">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta http-equiv="Access-Control-Allow-Origin" content="*">

View File

@ -11,56 +11,52 @@
<meta name="format-detection" content="telephone=no">
<#include "${request.contextPath}/common/common.ftl">
</head>
<style>
.splayUi-container {
background-image: url(../image/hk.jpg);
background-size: cover;
height: 670px;
}
.box {
margin-left: auto;
margin-right: 20px;
}
.wrap {
display: flex;
}
</style>
<body>
<div class="splayui-container">
<div class="splayui-main">
<ul class="layui-timeline">
<li class="layui-timeline-item">
<i class="layui-icon layui-timeline-axis">&#xe63f;</i>
<div class="layui-timeline-content layui-text">
<h3 class="layui-timeline-title">8月18日</h3>
<p>
layui 2.0 的一切准备工作似乎都已到位。发布之弦,一触即发。
<br>不枉近百个日日夜夜与之为伴。因小而大,因弱而强。
<br>无论它能走多远,抑或如何支撑?至少我曾倾注全心,无怨无悔 <i class="layui-icon"></i>
</p>
</div>
</li>
<li class="layui-timeline-item">
<i class="layui-icon layui-timeline-axis">&#xe63f;</i>
<div class="layui-timeline-content layui-text">
<h3 class="layui-timeline-title">8月16日</h3>
<p>杜甫的思想核心是儒家的仁政思想,他有<em>“致君尧舜上,再使风俗淳”</em>的宏伟抱负。个人最爱的名篇有:</p>
<ul>
<li>《登高》</li>
<li>《茅屋为秋风所破歌》</li>
</ul>
</div>
</li>
<li class="layui-timeline-item">
<i class="layui-icon layui-timeline-axis">&#xe63f;</i>
<div class="layui-timeline-content layui-text">
<h3 class="layui-timeline-title">8月15日</h3>
<p>
中国人民抗日战争胜利72周年
<br>常常在想,尽管对这个国家有这样那样的抱怨,但我们的确生在了最好的时代
<br>铭记、感恩
<br>所有为中华民族浴血奋战的英雄将士
<br>永垂不朽
</p>
</div>
</li>
<li class="layui-timeline-item">
<i class="layui-icon layui-timeline-axis">&#xe63f;</i>
<div class="layui-timeline-content layui-text">
<div class="layui-timeline-title">过去</div>
</div>
</li>
</ul>
<div style="width:100%;">
<div class="splayUi-container">
</div>
</div>
<script>
<div class="wrap">
<b>开发者:王子杨</b>
<div class="box" id="div_timer">
</div>
</div>
<script type="text/javascript">
//获取系统时间
function showTime() {
nowtime = new Date();
year = nowtime.getFullYear();//年
month = nowtime.getMonth() + 1;//月
day = nowtime.getDate();//日
hour = nowtime.getHours();//时
minutes = nowtime.getMinutes();//分
seconds = nowtime.getSeconds();//秒//文字增加空格
document.getElementById("div_timer").style = "white-space:pre;";//显示时间
document.getElementById("div_timer").innerText = '当前时间:' + year + "." + p(month) + "." + p(day) + " " + p(hour) + ":" + p(minutes) + ":" + p(seconds);
}
setInterval("showTime()", 1000);
//月日时分秒小于10补0
function p(s) {
return s < 10 ? '0' + s : s;
}
</script>
</body>
</html>