Commit e9da1255 by 罗绍泽

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

parents 8f9733c3 ca70c8cf
...@@ -1587,6 +1587,7 @@ function init_disk_enjoyUser_list(rows_data){ ...@@ -1587,6 +1587,7 @@ function init_disk_enjoyUser_list(rows_data){
//limit: params.limit, //页面大小 //limit: params.limit, //页面大小
//offset: params.offset, //页码 //offset: params.offset, //页码
rows:this.pageSize, rows:this.pageSize,
page:this.pageNumber,
FIELD_USER_NAME:$('#disk_enjoyUser_list_search_key').val(), FIELD_USER_NAME:$('#disk_enjoyUser_list_search_key').val(),
FIELD_UNIT_ID:$.fn.zTree.getZTreeObj("disk_enjoyUser_tree").getSelectedNodes()[0]?$.fn.zTree.getZTreeObj("disk_enjoyUser_tree").getSelectedNodes()[0].UUID:'' FIELD_UNIT_ID:$.fn.zTree.getZTreeObj("disk_enjoyUser_tree").getSelectedNodes()[0]?$.fn.zTree.getZTreeObj("disk_enjoyUser_tree").getSelectedNodes()[0].UUID:''
/* projectId: $("#projectId").val(), /* projectId: $("#projectId").val(),
...@@ -1644,6 +1645,8 @@ function init_disk_enjoyUser_list(rows_data){ ...@@ -1644,6 +1645,8 @@ function init_disk_enjoyUser_list(rows_data){
onLoadSuccess:function(){ onLoadSuccess:function(){
//去掉加载的效果 //去掉加载的效果
$('.disk_selectUser_content>div').eq(1).children('div').children('img').parent('div').remove(); $('.disk_selectUser_content>div').eq(1).children('div').children('img').parent('div').remove();
//显示表格
$('.disk_selectUser_table').show();
} }
}) })
} }
...@@ -2532,7 +2535,7 @@ function disk_enjoyFolder(handler){ ...@@ -2532,7 +2535,7 @@ function disk_enjoyFolder(handler){
strVar += " <input id=\"disk_enjoyUser_list_search_key\" type=\"text\" class=\"form-control\" placeholder=\"请输入关键字\" /><span onclick=\"init_disk_enjoyUser_list_search(this)\">查询<\/span><span>确定<\/span><label>至少要选择一个人员...<\/label>\n"; strVar += " <input id=\"disk_enjoyUser_list_search_key\" type=\"text\" class=\"form-control\" placeholder=\"请输入关键字\" /><span onclick=\"init_disk_enjoyUser_list_search(this)\">查询<\/span><span>确定<\/span><label>至少要选择一个人员...<\/label>\n";
strVar += " <\/div>\n"; strVar += " <\/div>\n";
strVar += " <div><img src=\"custom/images/loading.gif\"/><\/div>\n"; strVar += " <div><img src=\"custom/images/loading.gif\"/><\/div>\n";
strVar += " <div class=\"disk_selectUser_table\">\n"; strVar += " <div style=\"display:none;\" class=\"disk_selectUser_table\">\n";
strVar += " <table id=\"disk_selectUser_list\"><\/table>\n"; strVar += " <table id=\"disk_selectUser_list\"><\/table>\n";
strVar += " <\/div>\n"; strVar += " <\/div>\n";
strVar += " <\/div> \n"; strVar += " <\/div> \n";
......
...@@ -1237,7 +1237,13 @@ function init_index_fullCalendar() { ...@@ -1237,7 +1237,13 @@ function init_index_fullCalendar() {
//开始时间 //开始时间
var start = calEvent.start._i; var start = calEvent.start._i;
//结束时间 //结束时间
var end = calEvent.end._i; var end = '';
if(calEvent.end==null){
end = start;
}
else{
end = calEvent.end._i;
}
//颜色 //颜色
var color = calEvent.color; var color = calEvent.color;
...@@ -1485,7 +1491,6 @@ function init_index_color(color) { ...@@ -1485,7 +1491,6 @@ function init_index_color(color) {
color = '#ECC'; color = '#ECC';
} }
$("#index_calendarColor").val(color); $("#index_calendarColor").val(color);
console.log($("#index_calendarColor"))
$("#index_calendarColor").spectrum({ $("#index_calendarColor").spectrum({
/*allowEmpty:true,*/ /*allowEmpty:true,*/
color : color, color : color,
......
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