diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/common/advice/MyErrorViewResolver.java b/sparchetype/src/main/java/com/songpeng/sparchetype/common/advice/MyErrorViewResolver.java new file mode 100644 index 0000000..5bcdbd1 --- /dev/null +++ b/sparchetype/src/main/java/com/songpeng/sparchetype/common/advice/MyErrorViewResolver.java @@ -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")); + } +} \ No newline at end of file diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/ShiroConfig.java b/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/ShiroConfig.java index 3ea7188..06cbeb5 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/ShiroConfig.java +++ b/sparchetype/src/main/java/com/songpeng/sparchetype/system/config/shiro/ShiroConfig.java @@ -93,7 +93,7 @@ public class ShiroConfig { filterChainDefinitionMap.put("/files/**", "anon"); filterChainDefinitionMap.put("/logout", "logout"); filterChainDefinitionMap.put("/client/**", "anon"); - filterChainDefinitionMap.put("/", "anon"); + filterChainDefinitionMap.put("/", "authc"); filterChainDefinitionMap.put("/blog", "anon"); filterChainDefinitionMap.put("/blog/open/**", "anon"); filterChainDefinitionMap.put("/**", "authc"); diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/client/SysLoginController.java b/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/client/SysLoginController.java index 63ca2e9..e3bee37 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/client/SysLoginController.java +++ b/sparchetype/src/main/java/com/songpeng/sparchetype/system/controller/client/SysLoginController.java @@ -35,7 +35,7 @@ public class SysLoginController { */ @GetMapping({"/", ""}) public String welcomeUI(Model model) { - return "redirect:/client/company"; + return "redirect:/admin/index"; } /** diff --git a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysMenuServiceImpl.java b/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysMenuServiceImpl.java index 7d45a16..3bd7e85 100644 --- a/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysMenuServiceImpl.java +++ b/sparchetype/src/main/java/com/songpeng/sparchetype/system/service/impl/SysMenuServiceImpl.java @@ -59,7 +59,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl homeInfo.put("url", "admin/welcome-ui"); Map logoInfo = new HashMap<>(4); - logoInfo.put("name", "后台管理"); + logoInfo.put("name", "黑科制造MES"); logoInfo.put("image", "image/logo.png"); logoInfo.put("url", ""); diff --git a/sparchetype/src/main/resources/application-dev.yml b/sparchetype/src/main/resources/application-dev.yml index 5f5799a..e53adbc 100644 --- a/sparchetype/src/main/resources/application-dev.yml +++ b/sparchetype/src/main/resources/application-dev.yml @@ -13,6 +13,7 @@ spring: templateLoaderPath: classpath:/templates/ cache: false expose-spring-macro-helpers: false + request-context-attribute: request settings: classic_compatible: true diff --git a/sparchetype/src/main/resources/static/css/splayui.css b/sparchetype/src/main/resources/static/css/splayui.css index 566df9a..ad3f497 100644 --- a/sparchetype/src/main/resources/static/css/splayui.css +++ b/sparchetype/src/main/resources/static/css/splayui.css @@ -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; + } } diff --git a/sparchetype/src/main/resources/static/css/start.css b/sparchetype/src/main/resources/static/css/start.css new file mode 100644 index 0000000..23ffcbe --- /dev/null +++ b/sparchetype/src/main/resources/static/css/start.css @@ -0,0 +1,64 @@ +body { + background: radial-gradient(200% 100% at bottom center, #f7f7b6, #e96f92, #75517d, #1b2947); + background: radial-gradient(220% 105% at top center, #1b2947 10%, #75517d 40%, #e96f92 65%, #f7f7b6); + background-attachment: fixed; + overflow: hidden; +} + +@keyframes rotate { + 0% { + transform: perspective(400px) rotateZ(20deg) rotateX(-40deg) rotateY(0); + } + 100% { + transform: perspective(400px) rotateZ(20deg) rotateX(-40deg) rotateY(-360deg); + } +} +.stars { + transform: perspective(500px); + transform-style: preserve-3d; + position: absolute; + bottom: 0; + perspective-origin: 50% 100%; + left: 50%; + animation: rotate 90s infinite linear; +} + +.star { + width: 2px; + height: 2px; + background: #F7F7B6; + position: absolute; + top: 0; + left: 0; + transform-origin: 0 0 -300px; + transform: translate3d(0, 0, -300px); + backface-visibility: hidden; +} +.table{ + width: 400px; + height: 350px; + margin: 80px auto; +} +.table form{ + width: 100%; +} +.table .name{ + width: 280px; + margin: 20px auto 30px auto; + display: block; + height: 30px; + border-radius: 20px; + border: none; + background: rgba(0,0,0,0.2); + text-indent: 0.5em; +} +.table .btn{ + width: 100px; + height: 30px; + background: rgba(0,0,0,0.1); + border-radius: 8px; + border: none; + color: white; + margin: 0 auto; + display: block; +} diff --git a/sparchetype/src/main/resources/static/favicon.ico b/sparchetype/src/main/resources/static/favicon.ico index 350dc0a..87e85a7 100644 Binary files a/sparchetype/src/main/resources/static/favicon.ico and b/sparchetype/src/main/resources/static/favicon.ico differ diff --git a/sparchetype/src/main/resources/static/image/hk.png b/sparchetype/src/main/resources/static/image/hk.png new file mode 100644 index 0000000..e280c25 Binary files /dev/null and b/sparchetype/src/main/resources/static/image/hk.png differ diff --git a/sparchetype/src/main/resources/static/image/logo.png b/sparchetype/src/main/resources/static/image/logo.png index 0a2d856..460a5a1 100644 Binary files a/sparchetype/src/main/resources/static/image/logo.png and b/sparchetype/src/main/resources/static/image/logo.png differ diff --git a/sparchetype/src/main/resources/static/js/layuimodule/splayui/splayui.js b/sparchetype/src/main/resources/static/js/layuimodule/splayui/splayui.js index 568edf7..a51cc86 100644 --- a/sparchetype/src/main/resources/static/js/layuimodule/splayui/splayui.js +++ b/sparchetype/src/main/resources/static/js/layuimodule/splayui/splayui.js @@ -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有效 }; @@ -80,7 +80,7 @@ layui.define(["element", "jquery"], function (exports) { sessionStorage.setItem('splayuiHomeHref', data.url); $('#splayuiHomeTabId').html(' ' + data.name + ''); $('#splayuiHomeTabId').attr('lay-id', data.url); - $('#splayuiHomeTabIframe').html(''); + $('#splayuiHomeTabIframe').html(''); }; /** @@ -390,7 +390,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) { diff --git a/sparchetype/src/main/resources/templates/admin/index.ftl b/sparchetype/src/main/resources/templates/admin/index.ftl index a6ac706..cffc868 100644 --- a/sparchetype/src/main/resources/templates/admin/index.ftl +++ b/sparchetype/src/main/resources/templates/admin/index.ftl @@ -2,7 +2,7 @@ - 后台管理系统 + 黑科-MES系统 diff --git a/sparchetype/src/main/resources/templates/admin/welcome.ftl b/sparchetype/src/main/resources/templates/admin/welcome.ftl index 8a424b7..0096012 100644 --- a/sparchetype/src/main/resources/templates/admin/welcome.ftl +++ b/sparchetype/src/main/resources/templates/admin/welcome.ftl @@ -11,56 +11,52 @@ <#include "${request.contextPath}/common/common.ftl"> + -
-
-
    -
  • - -
    -

    8月18日

    -

    - layui 2.0 的一切准备工作似乎都已到位。发布之弦,一触即发。 -
    不枉近百个日日夜夜与之为伴。因小而大,因弱而强。 -
    无论它能走多远,抑或如何支撑?至少我曾倾注全心,无怨无悔 -

    -
    -
  • -
  • - -
    -

    8月16日

    -

    杜甫的思想核心是儒家的仁政思想,他有“致君尧舜上,再使风俗淳”的宏伟抱负。个人最爱的名篇有:

    -
      -
    • 《登高》
    • -
    • 《茅屋为秋风所破歌》
    • -
    -
    -
  • -
  • - -
    -

    8月15日

    -

    - 中国人民抗日战争胜利72周年 -
    常常在想,尽管对这个国家有这样那样的抱怨,但我们的确生在了最好的时代 -
    铭记、感恩 -
    所有为中华民族浴血奋战的英雄将士 -
    永垂不朽 -

    -
    -
  • -
  • - -
    -
    过去
    -
    -
  • -
+
+
- \ No newline at end of file diff --git a/sparchetype/src/main/resources/templates/login.ftl b/sparchetype/src/main/resources/templates/login.ftl index bade22f..f7daece 100644 --- a/sparchetype/src/main/resources/templates/login.ftl +++ b/sparchetype/src/main/resources/templates/login.ftl @@ -2,7 +2,7 @@ - 后台管理系统 + 黑科-MES系统 @@ -10,17 +10,13 @@ <#include "${request.contextPath}/common/common.ftl"> + +