Skip to content

W
warehouse
Commit 4d8575ab by yyq1988
Options

代码优化

parent 02273372
Showing with 83 additions and 78 deletions
src/main/webapp/webpage/modules/sys/login/sysIndex-jp.jsp
<%@ page contentType="text/html;charset=UTF-8" %> <%@ page contentType="text/html;charset=UTF-8" %>
<%@ include file="/webpage/include/taglib.jsp"%> <%@ include file="/webpage/include/taglib.jsp" %>
<html> <html>
<head> <head>
...@@ -8,24 +8,28 @@ ...@@ -8,24 +8,28 @@
<meta name="renderer" content="webkit"> <meta name="renderer" content="webkit">
<title>${fns:getConfig('productName')}</title> <title>${fns:getConfig('productName')}</title>
<meta name="decorator" content="ani"/> <meta name="decorator" content="ani"/>
<link href="${ctxStatic}/common/css/jp-menu.css" rel="stylesheet" /> <link href="${ctxStatic}/common/css/jp-menu.css" rel="stylesheet"/>
<script src="${ctxStatic}/plugin/js-menu/contabs.js"></script> <script src="${ctxStatic}/plugin/js-menu/contabs.js"></script>
<link id="theme-tab" href="${ctxStatic}/plugin/js-menu/menuTab-${cookie.theme.value==null?'blue':cookie.theme.value}.css" rel="stylesheet" /> <link id="theme-tab"
href="${ctxStatic}/plugin/js-menu/menuTab-${cookie.theme.value==null?'blue':cookie.theme.value}.css"
<%@ include file="/webpage/include/systemInfoSocket-init.jsp"%> rel="stylesheet"/>
<%@ include file="/webpage/include/layIM-init.jsp"%>
<style> <%@ include file="/webpage/include/systemInfoSocket-init.jsp" %>
.push-right #sidebar-nav{ <%@ include file="/webpage/include/layIM-init.jsp" %>
display:block; <style>
.push-right #sidebar-nav {
display: block;
} }
.navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus { .navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus {
background-color: transparent !important; background-color: transparent !important;
} }
.navbar-inverse .navbar-toggle { .navbar-inverse .navbar-toggle {
border-color: transparent !important; border-color: transparent !important;
} }
</style> </style>
</head> </head>
...@@ -40,17 +44,19 @@ ...@@ -40,17 +44,19 @@
<span class="icon-bar"></span> <span class="icon-bar"></span>
</button> </button>
<a class="navbar-brand J_menuItem" href="${ctx}/home" data-index="0">JeePlus快速开发框架</a> <a class="navbar-brand J_menuItem" href="${ctx}/warehouse/goods/goods" data-index="0">仓储系统</a>
</div> </div>
</div> </div>
<div class="navbar-container container-fluid"> <div class="navbar-container container-fluid">
<div class="collapse navbar-collapse navbar-collapse-toolbar row" id="jpMenu"> <div class="collapse navbar-collapse navbar-collapse-toolbar row" id="jpMenu">
<ul id="o1" class="nav navbar-toolbar nav-tabs navbar-left" style="width: calc( 100% - 680px)" role="tablist"> <ul id="o1" class="nav navbar-toolbar nav-tabs navbar-left" style="width: calc( 100% - 680px)"
role="tablist">
<t:jpMenu menu="${fns:getTopMenu()}" position="top"></t:jpMenu> <t:jpMenu menu="${fns:getTopMenu()}" position="top"></t:jpMenu>
</ul> </ul>
<ul class="nav navbar-nav pull-right navbar-right"> <ul class="nav navbar-nav pull-right navbar-right">
<li> <li>
<a href="${ctx}/home" class="J_menuItem"><i class="fa fa-home" style="font-size:14px;"></i></a> <a href="${ctx}/warehouse/goods/goods" class="J_menuItem"><i class="fa fa-home"
style="font-size:14px;"></i></a>
</li> </li>
<li class="hidden-xs"> <li class="hidden-xs">
<a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-language"></i></a> <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-language"></i></a>
...@@ -80,11 +86,13 @@ ...@@ -80,11 +86,13 @@
<a class="J_menuItem" title="站内信" href="${ctx}/iim/mailBox/detail?id=${mailBox.id}"> <a class="J_menuItem" title="站内信" href="${ctx}/iim/mailBox/detail?id=${mailBox.id}">
<div class="message-sender"> <div class="message-sender">
${mailBox.sender.name }<small class="pull-right">${fns:getTime(mailBox.sendtime)}前</small> ${mailBox.sender.name }<small
class="pull-right">${fns:getTime(mailBox.sendtime)}前</small>
</div> </div>
<div class="message-header"> <div class="message-header">
${mailBox.mail.overview} <small class="pull-right"> ${mailBox.mail.overview} <small class="pull-right">
<fmt:formatDate value="${mailBox.sendtime}" pattern="yyyy-MM-dd HH:mm:ss"/></small> <fmt:formatDate value="${mailBox.sendtime}"
pattern="yyyy-MM-dd HH:mm:ss"/></small>
</div> </div>
</a> </a>
...@@ -124,7 +132,8 @@ ...@@ -124,7 +132,8 @@
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
<span><i class="fa fa-gears"></i></span> <span><i class="fa fa-gears"></i></span>
</a> </a>
<ul class="dropdown-menu pull-right animated fadeIn" role="menu" style="width:250px; padding-left: 10px;"> <ul class="dropdown-menu pull-right animated fadeIn" role="menu"
style="width:250px; padding-left: 10px;">
<li class="padder-h-xs"> <li class="padder-h-xs">
<div class="theme-icons"> <div class="theme-icons">
...@@ -153,7 +162,8 @@ ...@@ -153,7 +162,8 @@
<span class="con" style="background: rgb(245, 247, 250);"></span> <span class="con" style="background: rgb(245, 247, 250);"></span>
</div> </div>
</label> </label>
<label data-theme="white_midnight-blue" class="ng-star-inserted" style="background: #2c3e50;"> <label data-theme="white_midnight-blue" class="ng-star-inserted"
style="background: #2c3e50;">
<div class="areas"> <div class="areas">
<span class="nav" style="background: rgb(255, 255, 255);"></span> <span class="nav" style="background: rgb(255, 255, 255);"></span>
<span class="con" style="background: rgb(245, 247, 250);"></span> <span class="con" style="background: rgb(245, 247, 250);"></span>
...@@ -193,7 +203,8 @@ ...@@ -193,7 +203,8 @@
<span class="con" style="background: rgb(245, 247, 250);"></span> <span class="con" style="background: rgb(245, 247, 250);"></span>
</div> </div>
</label> </label>
<label data-theme="black_midnight-blue" class="ng-star-inserted" style="background: #2c3e50;"> <label data-theme="black_midnight-blue" class="ng-star-inserted"
style="background: #2c3e50;">
<div class="areas"> <div class="areas">
<span class="nav" style="background: rgb(64, 64, 64);"></span> <span class="nav" style="background: rgb(64, 64, 64);"></span>
<span class="con" style="background: rgb(245, 247, 250);"></span> <span class="con" style="background: rgb(245, 247, 250);"></span>
...@@ -213,28 +224,22 @@ ...@@ -213,28 +224,22 @@
</li> </li>
<li class="hidden-xs"> <li class="hidden-xs">
<a href="#" onClick="toggleFullScreen()" data-toggle="fullscreen"><i class="fa fa-arrows-alt"></i></a> <a href="#" onClick="toggleFullScreen()" data-toggle="fullscreen"><i
class="fa fa-arrows-alt"></i></a>
</li> </li>
<li class="dropdown admin-dropdown"> <li class="dropdown admin-dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
<img src="<c:if test="${fns:getUser().photo == null || fns:getUser().photo==''}">${ctxStatic}/common/images/flat-avatar.png</c:if> <c:if test="${fns:getUser().photo != null && fns:getUser().photo!=''}">${fns:getUser().photo}</c:if>" class="topnav-img" style=" width: 30px; <img src="<c:if test="${fns:getUser().photo == null || fns:getUser().photo==''}">${ctxStatic}/common/images/flat-avatar.png</c:if> <c:if test="${fns:getUser().photo != null && fns:getUser().photo!=''}">${fns:getUser().photo}</c:if>"
class="topnav-img" style=" width: 30px;
margin-right: 5px; margin-right: 5px;
max-height: 30px;" alt=""><span class="hidden-sm">${fns:getUser().name}</span> max-height: 30px;" alt=""><span class="hidden-sm">${fns:getUser().name}</span>
</a> </a>
<ul class="dropdown-menu animated fadeIn" role="menu"> <ul class="dropdown-menu animated fadeIn" role="menu">
<li><a class="J_menuItem" href="${ctx}/sys/user/imageEdit">修改头像</a> <li><a class="J_menuItem" href="${ctx}/sys/user/imageEdit">修改头像</a></li>
</li> <li><a class="J_menuItem" href="${ctx }/sys/user/info">个人资料</a></li>
<li><a class="J_menuItem" href="${ctx }/sys/user/info">个人资料</a> <li><a href="${ctx}/logout">安全退出</a></li>
</li>
<li><a class="J_menuItem" href="${ctx }/iim/contact/index">我的通讯录</a>
</li>
<li><a class="J_menuItem" href="${ctx }/iim/mailBox/list">信箱</a>
</li>
<li><a href="javaScript:changeStyle()">切换成左侧菜单</a>
<li><a href="${ctx}/logout">安全退出</a>
</li>
</ul> </ul>
</li> </li>
</ul> </ul>
...@@ -243,7 +248,8 @@ ...@@ -243,7 +248,8 @@
<ul class="nav navbar-nav pull-right hidd"> <ul class="nav navbar-nav pull-right hidd">
<li class="dropdown admin-dropdown"> <li class="dropdown admin-dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false"> <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">
<img src="<c:if test="${fns:getUser().photo == null || fns:getUser().photo==''}">${ctxStatic}/common/images/flat-avatar.png</c:if> <c:if test="${fns:getUser().photo != null && fns:getUser().photo!=''}">${fns:getUser().photo}</c:if>" class="topnav-img" style=" width: 30px; <img src="<c:if test="${fns:getUser().photo == null || fns:getUser().photo==''}">${ctxStatic}/common/images/flat-avatar.png</c:if> <c:if test="${fns:getUser().photo != null && fns:getUser().photo!=''}">${fns:getUser().photo}</c:if>"
class="topnav-img" style=" width: 30px;
margin-right: 5px; margin-right: 5px;
max-height: 30px;" alt=""><span class="hidden-sm">${fns:getUser().name}</span> max-height: 30px;" alt=""><span class="hidden-sm">${fns:getUser().name}</span>
</a> </a>
...@@ -267,7 +273,8 @@ ...@@ -267,7 +273,8 @@
<section id="col-left" class="nano"> <section id="col-left" class="nano">
<div id="col-left-inner" class="nano-content"> <div id="col-left-inner" class="nano-content">
<div id="user-left-box" class="clearfix hidden-sm hidden-xs"> <div id="user-left-box" class="clearfix hidden-sm hidden-xs">
<a href="#"><img src="<c:if test="${fns:getUser().photo == null || fns:getUser().photo==''}">${ctxStatic}/common/images/flat-avatar.png</c:if> <c:if test="${fns:getUser().photo != null && fns:getUser().photo!=''}">${fns:getUser().photo}</c:if>" /></a> <a href="#"><img
src="<c:if test="${fns:getUser().photo == null || fns:getUser().photo==''}">${ctxStatic}/common/images/flat-avatar.png</c:if> <c:if test="${fns:getUser().photo != null && fns:getUser().photo!=''}">${fns:getUser().photo}</c:if>"/></a>
<div class="user-box"> <div class="user-box">
<span class="name"> <span class="name">
${fns:getUser().name} ${fns:getUser().name}
...@@ -278,7 +285,6 @@ ...@@ -278,7 +285,6 @@
</div> </div>
</div> </div>
<div class="collapse navbar-collapse navbar-ex1-collapse tab-content" id="sidebar-nav"> <div class="collapse navbar-collapse navbar-ex1-collapse tab-content" id="sidebar-nav">
<ul class="nav nav-pills nav-stacked"> <ul class="nav nav-pills nav-stacked">
...@@ -288,12 +294,6 @@ ...@@ -288,12 +294,6 @@
</li> </li>
<li><a class="J_menuItem" href="${ctx }/sys/user/info">个人资料</a> <li><a class="J_menuItem" href="${ctx }/sys/user/info">个人资料</a>
</li> </li>
<li><a class="J_menuItem" href="${ctx }/iim/contact/index">我的通讯录</a>
</li>
<li><a class="J_menuItem" href="${ctx }/iim/mailBox/list">信箱</a>
</li>
<li><a href="javaScript:changeStyle()">切换成左侧菜单</a>
</li>
<li><a href="${ctx}/logout">安全退出</a> <li><a href="${ctx}/logout">安全退出</a>
</li> </li>
</ul> </ul>
...@@ -324,17 +324,21 @@ ...@@ -324,17 +324,21 @@
</button> </button>
<nav class="page-tabs J_menuTabs"> <nav class="page-tabs J_menuTabs">
<div class="page-tabs-content"> <div class="page-tabs-content">
<a href="javascript:;" class="active J_menuTab" data-id="${ctx}/home">首页</a> <a href="javascript:;" class="active J_menuTab" data-id="${ctx}/warehouse/goods/goods">首页</a>
</div> </div>
</nav> </nav>
<button class="roll-nav roll-right J_tabRight"><i class="fa fa-forward"></i> <button class="roll-nav roll-right J_tabRight"><i class="fa fa-forward"></i>
</button> </button>
<a href="${ctx}/logout" class="roll-nav roll-right J_tabExit"><i class="fa fa fa-sign-out"></i> 退出</a> <a href="${ctx}/logout" class="roll-nav roll-right J_tabExit"><i class="fa fa fa-sign-out"></i>
退出</a>
</div> </div>
</div> </div>
<div class="J_mainContent" id="content-main" style="${cookie.tab.value!=false?'height:calc(100% - 40px)':'height:calc(100%)'}"> <div class="J_mainContent" id="content-main"
<iframe class="J_iframe" name="iframe0" width="100%" height="100%" src="${ctx}/home" frameborder="0" data-id="${ctx}/home" seamless></iframe> style="${cookie.tab.value!=false?'height:calc(100% - 40px)':'height:calc(100%)'}">
<iframe class="J_iframe" name="iframe0" width="100%" height="100%"
src="${ctx}/warehouse/goods/goods" frameborder="0" data-id="${ctx}/warehouse/goods/goods"
seamless></iframe>
</div> </div>
</div> </div>
...@@ -349,14 +353,12 @@ ...@@ -349,14 +353,12 @@
</section> </section>
<script> <script>
$(function(){ $(function () {
$.addtabs.drop(); $.addtabs.drop();
$('#showMenu').click(function() { $('#showMenu').click(function () {
$('body').toggleClass('push-right'); $('body').toggleClass('push-right');
}); });
$('#hideMenu').click(function () { $('#hideMenu').click(function () {
...@@ -369,17 +371,19 @@ ...@@ -369,17 +371,19 @@
$('#showTab').click(function () { $('#showTab').click(function () {
$('#showTab').parent().toggleClass("active") $('#showTab').parent().toggleClass("active")
$('#closeTab').parent().toggleClass("active") $('#closeTab').parent().toggleClass("active")
$("#breadcrumbs").attr("class","breadcrumbs"); $("#breadcrumbs").attr("class", "breadcrumbs");
$("#content-main").css("height","calc(100% - 40px)") $("#content-main").css("height", "calc(100% - 40px)")
$.get('${ctx}/tab/true?url='+window.top.location.href,function(result){ }); $.get('${ctx}/tab/true?url=' + window.top.location.href, function (result) {
});
}); });
$('#closeTab').click(function () { $('#closeTab').click(function () {
$('#showTab').parent().toggleClass("active") $('#showTab').parent().toggleClass("active")
$('#closeTab').parent().toggleClass("active") $('#closeTab').parent().toggleClass("active")
$("#breadcrumbs").attr("class","un-breadcrumbs"); $("#breadcrumbs").attr("class", "un-breadcrumbs");
$("#content-main").css("height","calc(100%)") $("#content-main").css("height", "calc(100%)")
$.get('${ctx}/tab/false',function(result){ }); $.get('${ctx}/tab/false', function (result) {
});
}); });
$(".theme-icons label").click(function () { $(".theme-icons label").click(function () {
...@@ -389,14 +393,16 @@ ...@@ -389,14 +393,16 @@
}) })
}); });
/** /**
*切换主题 *切换主题
*/ */
function changeStyle(){ function changeStyle() {
$.get('${ctx}/style/default',function(result){ $.get('${ctx}/style/default', function (result) {
window.location.reload(); window.location.reload();
}); });
} }
/** /**
* 切换颜色 * 切换颜色
* @param theme * @param theme
...@@ -404,50 +410,51 @@ ...@@ -404,50 +410,51 @@
function changeTheme(style_theme) { function changeTheme(style_theme) {
var style = style_theme.split("_")[0]; var style = style_theme.split("_")[0];
var theme = style_theme.split("_")[1]; var theme = style_theme.split("_")[1];
if(style == "black"){ if (style == "black") {
$("body").removeClass("theme-whbl"); $("body").removeClass("theme-whbl");
}else{ } else {
$("body").addClass("theme-whbl"); $("body").addClass("theme-whbl");
} }
var link = $('<link>') var link = $('<link>')
.appendTo('head') .appendTo('head')
.attr({type : 'text/css', rel : 'stylesheet'}) .attr({type: 'text/css', rel: 'stylesheet'})
.attr('href', '${ctxStatic}/common/css/app-'+theme+'.css'); .attr('href', '${ctxStatic}/common/css/app-' + theme + '.css');
var tabLink = $('<link>') var tabLink = $('<link>')
.appendTo('head') .appendTo('head')
.attr({type : 'text/css', rel : 'stylesheet'}) .attr({type: 'text/css', rel: 'stylesheet'})
.attr('href', '${ctxStatic}/plugin/js-menu/menuTab-'+theme+'.css'); .attr('href', '${ctxStatic}/plugin/js-menu/menuTab-' + theme + '.css');
var childrenLink= $('<link>').appendTo($(".J_iframe").contents().find("head")) var childrenLink = $('<link>').appendTo($(".J_iframe").contents().find("head"))
.attr({type : 'text/css', rel : 'stylesheet'}) .attr({type: 'text/css', rel: 'stylesheet'})
.attr('href', '${ctxStatic}/common/css/app-'+theme+'.css'); .attr('href', '${ctxStatic}/common/css/app-' + theme + '.css');
$.get('${ctx}/theme/'+style_theme,function(result){ $.get('${ctx}/theme/' + style_theme, function (result) {
setTimeout(function () { setTimeout(function () {
$('#theme').remove(); $('#theme').remove();
$('#theme-tab').remove(); $('#theme-tab').remove();
$(".J_iframe").contents().find("#theme").remove(); $(".J_iframe").contents().find("#theme").remove();
}, 500); }, 500);
link.attr("id","theme"); link.attr("id", "theme");
childrenLink.attr("id","theme"); childrenLink.attr("id", "theme");
tabLink.attr("id","theme-tab") tabLink.attr("id", "theme-tab")
}); });
} }
$(function ($) { $(function ($) {
$('#sidebar-nav a').on('click', function (e) { $('#sidebar-nav a').on('click', function (e) {
var _this = $(this); var _this = $(this);
$('#sidebar-nav a').each(function(){ $('#sidebar-nav a').each(function () {
if($(this) != _this){ if ($(this) != _this) {
if($(this).hasClass("active")){ if ($(this).hasClass("active")) {
$(this).removeClass("active"); $(this).removeClass("active");
} }
} }
}); });
if(!_this.hasClass("active")){ if (!_this.hasClass("active")) {
_this.addClass("active") _this.addClass("active")
_this.parent("li.open").find("a").first().addClass("active"); _this.parent("li.open").find("a").first().addClass("active");
} }
...@@ -464,8 +471,7 @@ ...@@ -464,8 +471,7 @@
$item.toggleClass('open'); $item.toggleClass('open');
if ($item.hasClass('open')) { if ($item.hasClass('open')) {
$item.children('.submenu').slideDown('fast'); $item.children('.submenu').slideDown('fast');
} } else {
else {
$item.children('.submenu').slideUp('fast'); $item.children('.submenu').slideUp('fast');
} }
if ($("#user-menu").parent().hasClass('open')) { if ($("#user-menu").parent().hasClass('open')) {
...@@ -473,13 +479,12 @@ ...@@ -473,13 +479,12 @@
$("#user-menu").parent().toggleClass('open'); $("#user-menu").parent().toggleClass('open');
} }
}); });
$('#user-link').on('click',function () { $('#user-link').on('click', function () {
var $item = $("#user-menu"); var $item = $("#user-menu");
$item.parent().toggleClass('open'); $item.parent().toggleClass('open');
if ($item.parent().hasClass('open')) { if ($item.parent().hasClass('open')) {
$item.slideDown('fast'); $item.slideDown('fast');
} } else {
else {
$item.slideUp('fast'); $item.slideUp('fast');
} }
$("#sidebar-nav .tab-pane").find('.open .submenu').slideUp('fast'); $("#sidebar-nav .tab-pane").find('.open .submenu').slideUp('fast');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment