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

WebContent/jfcas04/js/disk.js

@@ -1586,7 +1586,8 @@ function init_disk_enjoyUser_list(rows_data){
 			var temp = {   //这里的键的名字和控制器的变量名必须一直，这边改动，控制器也需要改成一样的  
 				//limit: params.limit,   //页面大小  
 				//offset: params.offset,  //页码  
-				rows:this.pageSize,  
+				rows:this.pageSize, 
+				page:this.pageNumber,
 				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:''
 				/* projectId: $("#projectId").val(),  
@@ -1644,6 +1645,8 @@ function init_disk_enjoyUser_list(rows_data){
 	     onLoadSuccess:function(){
 	    	 //去掉加载的效果
 	    	 $('.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){
 	    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><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 += "					<\/div>\n";
 	    strVar += "				<\/div>	\n";

WebContent/jfcas04/js/index.js

@@ -1237,7 +1237,13 @@ function init_index_fullCalendar() {
 			//开始时间
 			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;
 
@@ -1485,7 +1491,6 @@ function init_index_color(color) {
 		color = '#ECC';
 	}
 	$("#index_calendarColor").val(color);
-	console.log($("#index_calendarColor"))
 	$("#index_calendarColor").spectrum({
 		/*allowEmpty:true,*/
 		color : color,