Commit 7182ca27 by 周添尉

接口

parent 1d47c486
...@@ -466,6 +466,17 @@ $(document).ready(function () { ...@@ -466,6 +466,17 @@ $(document).ready(function () {
// 点击记住密码 // 点击记住密码
$("#remember").live('click', function() { $("#remember").live('click', function() {
updateCookie(); updateCookie();
if ($("#remember").attr('checked') != 'checked') {
$('#username').val('');
$('#password').val('');
$('.login_yzm>input').val('');
$('#username').next('label').remove();
$('#password').next('label').remove();
$('.login_yzm>input').next('label').remove();
init_login_tip($('#username'),'请输入账号');
init_login_tip($('#password'),'请输入密码');
init_login_tip($('.login_yzm>input'),'请输入验证码');
}
}); });
// 点击重置 // 点击重置
$("#b_cancel").live('click', function() { $("#b_cancel").live('click', function() {
......
...@@ -465,6 +465,17 @@ $(document).ready(function () { ...@@ -465,6 +465,17 @@ $(document).ready(function () {
// 点击记住密码 // 点击记住密码
$("#remember").live('click', function() { $("#remember").live('click', function() {
updateCookie(); updateCookie();
if ($("#remember").attr('checked') != 'checked') {
$('#username').val('');
$('#password').val('');
$('.login_yzm>input').val('');
$('#username').next('label').remove();
$('#password').next('label').remove();
$('.login_yzm>input').next('label').remove();
init_login_tip($('#username'),'请输入账号');
init_login_tip($('#password'),'请输入密码');
init_login_tip($('.login_yzm>input'),'请输入验证码');
}
}); });
// 点击重置 // 点击重置
$("#b_cancel").live('click', function() { $("#b_cancel").live('click', function() {
......
...@@ -318,6 +318,17 @@ $(document).ready(function () { ...@@ -318,6 +318,17 @@ $(document).ready(function () {
// 点击记住密码 // 点击记住密码
$("#remember").live('click', function() { $("#remember").live('click', function() {
updateCookie(); updateCookie();
if ($("#remember").attr('checked') != 'checked') {
$('#username').val('');
$('#password').val('');
$('.login_yzm>input').val('');
$('#username').next('label').remove();
$('#password').next('label').remove();
$('.login_yzm>input').next('label').remove();
init_login_tip($('#username'),'请输入账号');
init_login_tip($('#password'),'请输入密码');
init_login_tip($('.login_yzm>input'),'请输入验证码');
}
}); });
// 点击重置 // 点击重置
$("#b_cancel").live('click', function() { $("#b_cancel").live('click', function() {
......
...@@ -1017,6 +1017,7 @@ a{ ...@@ -1017,6 +1017,7 @@ a{
border:1px solid transparent; border:1px solid transparent;
padding: 15px 15px 10px; padding: 15px 15px 10px;
margin-bottom: 10px; margin-bottom: 10px;
text-align: center;
} }
.disk_content_lump>div>div:hover{ .disk_content_lump>div>div:hover{
background:#F5FBFF; background:#F5FBFF;
...@@ -1036,8 +1037,7 @@ a{ ...@@ -1036,8 +1037,7 @@ a{
cursor: pointer; cursor: pointer;
color:#2CA4F0; color:#2CA4F0;
} }
.disk_content_lump img{ .disk_content_lump>div>div>img{
width:100%;
margin-bottom:10px; margin-bottom:10px;
} }
.disk_content_lump img+div{ .disk_content_lump img+div{
...@@ -1046,10 +1046,30 @@ a{ ...@@ -1046,10 +1046,30 @@ a{
cursor: default; cursor: default;
height: 30px; height: 30px;
line-height: 30px; line-height: 30px;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
} }
.disk_content_lump img+div+input{ .disk_content_lump img+div+input{
height:30px; height:30px;
} }
.disk_content_lump_noFile{
margin-top:30px;
text-align: center;
}
.disk_content_lump_noFile>img+p{
margin:20px 0 30px;
}
.disk_content_lump_noFile span{
color:white;
background: #8ED3FF;
padding:5px 12px;
border-radius: 3px;
cursor: pointer;
}
.disk_content_lump_noFile span:hover{
background: #4eaeec;
}
/***************右键菜单样式*******************/ /***************右键菜单样式*******************/
.disk_menu{ .disk_menu{
width: 128px; width: 128px;
...@@ -1091,6 +1111,7 @@ a{ ...@@ -1091,6 +1111,7 @@ a{
} }
.disk_content_list_fileName>div:first-child{ .disk_content_list_fileName>div:first-child{
padding:0px; padding:0px;
text-align: center;
} }
.disk_content_list_fileName>div:first-child+div>div:first-child{ .disk_content_list_fileName>div:first-child+div>div:first-child{
height:34px; height:34px;
......
...@@ -6,6 +6,7 @@ ...@@ -6,6 +6,7 @@
<title>网盘</title> <title>网盘</title>
<jsp:include page="header.jsp"></jsp:include> <jsp:include page="header.jsp"></jsp:include>
<script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/portlet/js/jwAppPortletModule.js" charset="utf-8"></script> <script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/portlet/js/jwAppPortletModule.js" charset="utf-8"></script>
<script type="text/javascript" src="${pageContext.request.contextPath}/jwapp/pages/storepersonal/js/storePersonalModule.js" charset="utf-8"></script>
<script src="${ctx}/jfcas04/js/disk.js"></script> <script src="${ctx}/jfcas04/js/disk.js"></script>
</head> </head>
<body> <body>
...@@ -17,8 +18,8 @@ ...@@ -17,8 +18,8 @@
<div class="row disk_search"> <div class="row disk_search">
<div class="col-md-3"> <div class="col-md-3">
<div class="col-md-3" onclick="location.href='disk'"><img src="${ctx}/custom/images/disk_home.png" wdith="14" height="14" /><span>|</span></div> <div class="col-md-3" onclick="location.href='disk'"><img src="${ctx}/custom/images/disk_home.png" wdith="14" height="14" /><span>|</span></div>
<div class="col-md-3"><img src="${ctx}/custom/images/disk_last.png" wdith="14" height="14" /><span>|</span></div> <div class="col-md-3" id="disk_backFolder_prev" onclick="disk_backFolder_prev(this)"><img src="${ctx}/custom/images/disk_last.png" wdith="14" height="14" /><span>|</span></div>
<div class="col-md-3"><img src="${ctx}/custom/images/disk_next.png" wdith="14" height="14" /><span>|</span></div> <div class="col-md-3" id="disk_backFolder_next" onclick="disk_backFolder_next(this)"><img src="${ctx}/custom/images/disk_next.png" wdith="14" height="14" /><span>|</span></div>
<div id="disk_rubbish" class="col-md-3" onclick="disk_rubbish()"><img src="${ctx}/custom/images/disk_circle.png" wdith="14" height="14" /></div> <div id="disk_rubbish" class="col-md-3" onclick="disk_rubbish()"><img src="${ctx}/custom/images/disk_circle.png" wdith="14" height="14" /></div>
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
......
...@@ -320,6 +320,17 @@ $(document).ready(function () { ...@@ -320,6 +320,17 @@ $(document).ready(function () {
// 点击记住密码 // 点击记住密码
$("#remember").live('click', function() { $("#remember").live('click', function() {
updateCookie(); updateCookie();
if ($("#remember").attr('checked') != 'checked') {
$('#username').val('');
$('#password').val('');
$('.login_yzm>input').val('');
$('#username').next('label').remove();
$('#password').next('label').remove();
$('.login_yzm>input').next('label').remove();
init_login_tip($('#username'),'请输入账号');
init_login_tip($('#password'),'请输入密码');
init_login_tip($('.login_yzm>input'),'请输入验证码');
}
}); });
// 点击重置 // 点击重置
$("#b_cancel").live('click', function() { $("#b_cancel").live('click', function() {
......
...@@ -16,9 +16,9 @@ jwAppAppsModel.prototype.insert_installApp_byResourceId=function(){}; ...@@ -16,9 +16,9 @@ jwAppAppsModel.prototype.insert_installApp_byResourceId=function(){};
jwAppAppsModel.prototype.insert_unInstallApp_byResourceId=function(){}; jwAppAppsModel.prototype.insert_unInstallApp_byResourceId=function(){};
//创建一个数据操作对象,然后再后续使用 //创建一个数据操作对象,然后再后续使用
jwAppAppsModel.jwAppsAppsActAction = new jwAppAppsModel("json").delegate("jwAppsAppstoreAct"); jwAppAppsModel.jwAppsAppsActAction = new jwAppAppsModel("json").delegate("frontAppstoreAct");
//创建一个数据获取对象,然后再后续使用 //创建一个数据获取对象,然后再后续使用
jwAppAppsModel.jwAppsAppsDataAction = new jwAppAppsModel("json").delegate("jwAppsAppstoreData"); jwAppAppsModel.jwAppsAppsDataAction = new jwAppAppsModel("json").delegate("frontAppstoreData");
//说明: 1、所有方法里统一传递josn格式的参数,用于后台交互,如data.listTables(param) ,如没有参数则传'{}',如data.listTables({}) //说明: 1、所有方法里统一传递josn格式的参数,用于后台交互,如data.listTables(param) ,如没有参数则传'{}',如data.listTables({})
// 2、前后台数据获取传输协议 如:json[{'0':{pageCount':'2','pageNo':'1','pageSize':'20','rowSet':'[{0},{1}....]'}}] // 2、前后台数据获取传输协议 如:json[{'0':{pageCount':'2','pageNo':'1','pageSize':'20','rowSet':'[{0},{1}....]'}}]
......
...@@ -24,9 +24,9 @@ jwAppPortletModel.prototype.saveCalendarInfo = function(){}; ...@@ -24,9 +24,9 @@ jwAppPortletModel.prototype.saveCalendarInfo = function(){};
jwAppPortletModel.prototype.removeCalendarInfo = function(){}; jwAppPortletModel.prototype.removeCalendarInfo = function(){};
//创建一个数据操作对象,然后再后续使用 //创建一个数据操作对象,然后再后续使用
jwAppPortletModel.jwAppsPortletActAction = new jwAppPortletModel("json").delegate("jwAppsPortletAct"); jwAppPortletModel.jwAppsPortletActAction = new jwAppPortletModel("json").delegate("frontPortletAct");
//创建一个数据获取对象,然后再后续使用 //创建一个数据获取对象,然后再后续使用
jwAppPortletModel.jwAppsPortletDataAction = new jwAppPortletModel("json").delegate("jwAppsPortletData"); jwAppPortletModel.jwAppsPortletDataAction = new jwAppPortletModel("json").delegate("frontPortletData");
//说明: 1、所有方法里统一传递josn格式的参数,用于后台交互,如data.listTables(param) ,如没有参数则传'{}',如data.listTables({}) //说明: 1、所有方法里统一传递josn格式的参数,用于后台交互,如data.listTables(param) ,如没有参数则传'{}',如data.listTables({})
// 2、前后台数据获取传输协议 如:json[{'0':{pageCount':'2','pageNo':'1','pageSize':'20','rowSet':'[{0},{1}....]'}}] // 2、前后台数据获取传输协议 如:json[{'0':{pageCount':'2','pageNo':'1','pageSize':'20','rowSet':'[{0},{1}....]'}}]
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<input type="hidden" name="FIELD_OPETYPE" id="OPETYPE" value="${is_row.OPETYPE}"/> <input type="hidden" name="FIELD_OPETYPE" id="OPETYPE" value="${is_row.OPETYPE}"/>
<input type="hidden" name="FIELD_UUID" id="UUID" value="${is_row.UUID}"/> <input type="hidden" name="FIELD_UUID" id="UUID" value="${is_row.UUID}"/>
<input type="hidden" name="FATHER_PATH" id="FATHER_PATH" value="${is_row.UUID}"/> <input type="hidden" name="FATHER_PATH" id="FATHER_PATH" value="${is_row.UUID}"/>
<input type="hidden" name="OLD_FILE_NAME" id="OLD_FILE_NAME" value="${is_row.FILE_NAME}"/>
<table align="center" border="0" cellpadding="0" cellspacing="0" class="tableStyle" style="margin: 10px 15px; width: 95%; line-height: 30px;"> <table align="center" border="0" cellpadding="0" cellspacing="0" class="tableStyle" style="margin: 10px 15px; width: 95%; line-height: 30px;">
<tr> <tr>
<td class="tableStyleLable"> <td class="tableStyleLable">
......
...@@ -27,9 +27,7 @@ ...@@ -27,9 +27,7 @@
</foreach> </foreach>
</trim> </trim>
<where> <where>
<if test="UUID != null and UUID != ''"> UUID = #{UUID}
and UUID = #{UUID}
</if>
</where> </where>
</update> </update>
......
...@@ -71,6 +71,28 @@ public class actAction extends BasicAction { ...@@ -71,6 +71,28 @@ public class actAction extends BasicAction {
//去除不要更新的字段 //去除不要更新的字段
entity.remove("OPETYPE"); entity.remove("OPETYPE");
//处理目录/文件重名的问题,处理是直接在文件和目录后加数字
Map<String,Object> v_congfu_query = new HashMap<String,Object>();
v_congfu_query.put("FATHER_ID", entity.get("FATHER_ID"));
v_congfu_query.put("CREATOR_ID", entity.get("CREATOR_ID"));
String isfile_1 = (String) entity.get("ISFILE");
if(StringUtils.equals(isfile_1, "1")){
String fname = (String) entity.get("FILE_NAME");
fname = fname.substring(0,fname.lastIndexOf("."));
v_congfu_query.put("FILE_NAME",fname);
}else{
v_congfu_query.put("FILE_NAME", entity.get("FILE_NAME"));
}
int ret_count = business.listCount_storePersonal(v_congfu_query);
if(ret_count>0){
String fname = (String) entity.get("FILE_NAME");
if(StringUtils.equals(isfile_1, "1")){
fname = fname.substring(0,fname.lastIndexOf("."))+"("+ret_count+")."+fname.substring(fname.lastIndexOf(".")+1);
}else{
fname = fname + "("+ret_count+")";
}
entity.put("FILE_NAME",fname);
}
//处理超限问题 //处理超限问题
StoreUserBusiness business_storeuser = BusinessManager.getBusiness(StoreUserBusiness.class); StoreUserBusiness business_storeuser = BusinessManager.getBusiness(StoreUserBusiness.class);
Map<String,Object> storeuserQuery = new HashMap<String,Object>(); Map<String,Object> storeuserQuery = new HashMap<String,Object>();
...@@ -224,8 +246,33 @@ public class actAction extends BasicAction { ...@@ -224,8 +246,33 @@ public class actAction extends BasicAction {
StorePersonalBusiness business = BusinessManager.getBusiness(StorePersonalBusiness.class); StorePersonalBusiness business = BusinessManager.getBusiness(StorePersonalBusiness.class);
Map<String, Object> entity = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX); Map<String, Object> entity = RequestUtils.getUpdateFieldMap(request,RequestUtils.UPDATEDATAFIELDPREFIX);
String father_path = request.getParameter("FATHER_PATH"); String father_path = request.getParameter("FATHER_PATH");
String old_file_name = request.getParameter("OLD_FILE_NAME");
try { try {
String is_fname = (String) entity.get("FILE_NAME");
if(!StringUtils.equals(is_fname, old_file_name)){
//处理目录/文件重名的问题,处理是直接在文件和目录后加数字
Map<String,Object> v_congfu_query = new HashMap<String,Object>();
v_congfu_query.put("FATHER_ID", entity.get("FATHER_ID"));
v_congfu_query.put("CREATOR_ID", entity.get("CREATOR_ID"));
String isfile_1 = (String) entity.get("ISFILE");
if(StringUtils.equals(isfile_1, "1")){
String fname = (String) entity.get("FILE_NAME");
fname = fname.substring(0,fname.lastIndexOf("."));
v_congfu_query.put("FILE_NAME",fname);
}else{
v_congfu_query.put("FILE_NAME", entity.get("FILE_NAME"));
}
int ret_count = business.listCount_storePersonal(v_congfu_query);
if(ret_count>0){
String fname = (String) entity.get("FILE_NAME");
if(StringUtils.equals(isfile_1, "1")){
fname = fname.substring(0,fname.lastIndexOf("."))+"("+ret_count+")."+fname.substring(fname.lastIndexOf(".")+1);
}else{
fname = fname + "("+ret_count+")";
}
entity.put("FILE_NAME",fname);
}
}
//去除不要更新的字段 //去除不要更新的字段
entity.remove("OPETYPE"); entity.remove("OPETYPE");
boolean is_save2db = Boolean.parseBoolean(PropUtil.getValue("uploadfile_savetodb", "quartz_service", "true")); boolean is_save2db = Boolean.parseBoolean(PropUtil.getValue("uploadfile_savetodb", "quartz_service", "true"));
......
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