Skip to content

J
jfV5pc
Commit c9059c25 by 罗绍泽
Options

Merge remote-tracking branch 'origin/develop' into develop

parents f215601a 8450c0b4
Showing with 56 additions and 29 deletions
WebContent/gaowj/ria/jquery/jquery-easyui-1.4.1/themes/icon.css
...@@ -298,21 +298,15 @@ ...@@ -298,21 +298,15 @@
.icon-ext-34_40{ .icon-ext-34_40{
background:url('../../../../images/icons/(34,40).png') no-repeat left center; background:url('../../../../images/icons/(34,40).png') no-repeat left center;
} }
.icon-ext-11_10{ .icon-ext-01_07{
background:url('../../../../images/icons/(11,10).png') no-repeat left center; background:url('../../../../images/icons/(01,07).png') no-repeat left center;
} }
.icon-ext-02_25{ .icon-ext-29_22{
background:url('../../../../images/icons/(02,25).png') no-repeat left center; background:url('../../../../images/icons/(29,22).png') no-repeat left center;
} }
.icon-ext-04_14{ .icon-ext-26_01{
background:url('../../../../images/icons/(04,14).png') no-repeat left center; background:url('../../../../images/icons/(26,01).png') no-repeat left center;
} }
.icon-ext-10_34{ .icon-ext-27_01{
background:url('../../../../images/icons/(10,34).png') no-repeat left center; background:url('../../../../images/icons/(27,01).png') no-repeat left center;
}
.icon-ext-10_36{
background:url('../../../../images/icons/(10,36).png') no-repeat left center;
}
.icon-ext-13_12{
background:url('../../../../images/icons/(13,12).png') no-repeat left center;
} }
\ No newline at end of file
WebContent/system/pages/frameEasyui/main.jsp
...@@ -11,13 +11,13 @@ ...@@ -11,13 +11,13 @@
<html> <html>
<head> <head>
<title>V5 | PC</title> <title>V5 | XXX系统</title>
<%-- 富客户端环境引用文件 --%> <%-- 富客户端环境引用文件 --%>
<%@ include file="/gaowj/header-simple-1.0.jsp"%> <%@ include file="/gaowj/header-simple-1.0.jsp"%>
<link rel="shortcut icon" href="images/main/logo.ico" /> <link rel="shortcut icon" href="images/main/logo.ico" />
<link rel="icon" type="image/gif" href="images/main/logo.png" /> <link rel="icon" type="image/gif" href="images/main/logo.png" />
</head> </head>
<body class="easyui-layout" data-options="fit:true"> <body id="cc" class="easyui-layout" data-options="fit:true">
<div id="layout_north" data-options="region:'north'" style="height:80px;background:url('${ctx}/images/main/nbjwtop.jpg') no-repeat;"></div> <div id="layout_north" data-options="region:'north'" style="height:80px;background:url('${ctx}/images/main/nbjwtop.jpg') no-repeat;"></div>
<div id="layout_south" data-options="region:'south',split:true" style="height:30px;overflow:hidden;border-top:none;"> <div id="layout_south" data-options="region:'south',split:true" style="height:30px;overflow:hidden;border-top:none;">
<div id="foot" ></div> <div id="foot" ></div>
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
</div> </div>
</div> </div>
<div id="tab-tools"> <div id="tab-tools">
<a href="javascript:void(0)" class="easyui-linkbutton" style = "text-decoration:none;"
data-options="plain:true,iconCls:'icon-ext-26_01'" id="cc_layout_button" onclick="maxPanel()"><font id="cc_layout_text" style="color:#ccc;">最大化</font></a>
<a href="javascript:void(0)" class="easyui-linkbutton" style = "text-decoration:none;" <a href="javascript:void(0)" class="easyui-linkbutton" style = "text-decoration:none;"
data-options="plain:true,iconCls:'icon-ext-22_27_undo'" onclick="removeAllPanel()"><font style="color:#ccc;">全部关闭</font></a> data-options="plain:true,iconCls:'icon-ext-22_27_undo'" onclick="removeAllPanel()"><font style="color:#ccc;">全部关闭</font></a>
</div> </div>
...@@ -121,5 +123,33 @@ ...@@ -121,5 +123,33 @@
href : '${ctx}/system/pages/frameEasyui/top.jsp' href : '${ctx}/system/pages/frameEasyui/top.jsp'
}); });
}); });
var cc_layout_status='0';
function maxPanel(){
if(cc_layout_status=='1'){
cc_layout_status='0';
$("#cc_layout_text").html("最大化");
$('#cc_layout_button').linkbutton({
iconCls: 'icon-ext-26_01'
});
$('#cc').layout('add',{
region: 'north',
height: 80});
$('#cc').layout('expand','west');
$('#cc').layout('panel','north').css("background","url('${ctx}/images/main/nbjwtop.jpg') no-repeat").css("overflow","hidden");
$('#cc').layout('panel','north').panel({
href : '${ctx}/system/pages/frameEasyui/top.jsp'
});
}else{
cc_layout_status='1';
$('#cc_layout_button').linkbutton({
iconCls: 'icon-ext-27_01'
});
$('#cc').layout('remove','north');
$('#cc').layout('collapse','west');
$("#cc_layout_text").html("恢复");
}
}
</script> </script>
</html> </html>
WebContent/system/pages/frameEasyui/top.jsp
...@@ -68,7 +68,7 @@ A:link { ...@@ -68,7 +68,7 @@ A:link {
</tr> </tr>
</table> </table>
<div id="SendProduct" > </div> <div id="SendProduct" > </div>
<div id="modifypassDialog"> <div id="modifypassDialog" style="overflow:auto;">
<form id="modifypassForm" method="post"> <form id="modifypassForm" method="post">
<table align="center" style="margin-top:10px;"> <table align="center" style="margin-top:10px;">
<tr> <tr>
...@@ -148,6 +148,7 @@ A:link { ...@@ -148,6 +148,7 @@ A:link {
<script type="text/javascript"> <script type="text/javascript">
$(function() { $(function() {
//如果是v5原始版本那就显示换肤功能 //如果是v5原始版本那就显示换肤功能
var localPath = '<%=localPath %>'; var localPath = '<%=localPath %>';
if(localPath=='/jfV5'){ if(localPath=='/jfV5'){
...@@ -161,16 +162,13 @@ $(function() { ...@@ -161,16 +162,13 @@ $(function() {
$("#personInfo").hide(); $("#personInfo").hide();
$("#modifypassDialog").hide(); $("#modifypassDialog").hide();
function doMain(idx){ function doMain(idx){
if(idx=='quit'){ if(idx=='quit'){
if(window.confirm('<fmt:message key="common.quit.click" bundle="${p1}"/>?')){ $.messager.confirm('提示', '<fmt:message key="common.quit.click" bundle="${p1}"/>?', function(r) {
window.top.location = "<%=localPath %>/logout"; if (r) {
//window.top.location = WebContextPath + "/logoutcas.jsp"; window.top.location = "<%=localPath %>/logout";
return true; }
}else{ });
return false;
}
}else{ }else{
window.top.location = "<%=localPath %>/login"; window.top.location = "<%=localPath %>/login";
} }
...@@ -181,6 +179,9 @@ $(function() { ...@@ -181,6 +179,9 @@ $(function() {
$("#modifypassDialog").show(); $("#modifypassDialog").show();
$("#modifypassForm")[0].reset(); $("#modifypassForm")[0].reset();
$("#OLDPASS").textbox("setValue","");
$("#NEWPASS").textbox("setValue","");
$("#AGAINNEWPASS").textbox("setValue","");
$('#modifypassDialog') $('#modifypassDialog')
.dialog( .dialog(
{ {
...@@ -213,6 +214,7 @@ $(function() { ...@@ -213,6 +214,7 @@ $(function() {
text : '返回', text : '返回',
iconCls : 'icon-back', iconCls : 'icon-back',
handler : function() { handler : function() {
$("#modifypassDialog").hide();
$('#modifypassDialog').dialog('close'); $('#modifypassDialog').dialog('close');
} }
} ] } ]
......
WebContent/system/pages/login/sampleLogin.jsp
...@@ -282,7 +282,7 @@ input[type="checkbox"] { ...@@ -282,7 +282,7 @@ input[type="checkbox"] {
<input type="button" id="b_login" class="Login_button" value="登&nbsp;&nbsp;&nbsp;录" /> <input type="button" id="b_login" class="Login_button" value="登&nbsp;&nbsp;&nbsp;录" />
<!-- 找回密码开始 --> <!-- 找回密码开始 -->
<span class="Login_passwordBack"> <a href="#"> 找回密码 </a></span> <span class="Login_passwordBack" style="display:none;"> <a href="#"> 找回密码 </a></span>
</div> </div>
<!-- 记住帐户开始 --> <!-- 记住帐户开始 -->
...@@ -296,7 +296,7 @@ input[type="checkbox"] { ...@@ -296,7 +296,7 @@ input[type="checkbox"] {
<!-- 底部文字开始 --> <!-- 底部文字开始 -->
<div class="Login_lastword"> <div class="Login_lastword">
Powered By © 2014-2018 <a href="http://www.jfbrother.com"> <span>www.jfbrother.com </span></a> Powered By © 2014-2018 <a target="_blank" href="http://www.jfbrother.com"> <span>www.jfbrother.com </span></a>
</div> </div>
</div> </div>
</div> </div>
......
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