完善个人信息修改页面

src/main/webapp/information.html

@@ -400,96 +400,108 @@
		<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
		<script type="text/javascript" src="js/information.js"></script>
		<script>
			var yearFlag=2016;			
			$(document).on("click",".date-btn",function() {
				//yearFlag=$(this).attr("flag");
				//ymFlag=$(this).attr("difference");
			
				$(this).siblings(".mr_calendar_ym").show();
				//$(this).parents(".txtExpForm").find(".year").val($(this).text());
					
			var yearFlag = 2016;			
			$(document).on("click", ".date-btn", function() {
				var flag = $(this).attr("flag");
				console.log(flag);
				var c = $(this).val();
				if(flag == 1) {
					if(c) {
						var ye = new Date().getFullYear();
						var sroTop = (ye - parseInt(c)) * 32;
						$(this).siblings(".mr_calendar_ym").show();
						$(this).siblings(".mr_calendar_ym").find(".full_year").scrollTop(sroTop);
						$(this).siblings(".mr_calendar_ym").find(".yearli:contains('" + c + "')").addClass("active").siblings().removeClass("active");
						return;
					} else {
						var ye = new Date().getFullYear();
						$(this).siblings(".mr_calendar_ym").show();
						$(this).siblings(".mr_calendar_ym").find(".yearli:contains('" + ye + "')").addClass("active").siblings().removeClass("active");
						return;
					}
				} else if(flag == 2) {
					if(c) {
						if(c == "至今") {
							$(this).siblings(".mr_calendar_ym").show();
							$(this).siblings(".mr_calendar_ym").find(".ymli:contains('" + c+ "')").addClass("active");
							$(this).siblings(".mr_calendar_ym").find(".ymli:contains('" + c + "')").siblings().removeClass("active");
							return;
						} else {
							$(this).siblings(".mr_calendar_ym").find(".ymli:contains('" + c.substr(0, 4) + "')").addClass("active");
							$(this).siblings(".mr_calendar_ym").find(".ymli:contains('" + c.substr(0, 4) + "')").siblings().removeClass("active");
							if(c.substr(5, 1) == 0) {
								$(this).siblings(".mr_calendar_ym").find(".mli:contains('" + c.substr(6, 1) + "')").addClass("active");
								$(this).siblings(".mr_calendar_ym").find(".mli:contains('" + c.substr(6, 1) + "')").siblings().removeClass("active");
							} else {
								$(this).siblings(".mr_calendar_ym").find(".mli:contains('" + c.substr(5, 2) + "')").addClass("active");
								$(this).siblings(".mr_calendar_ym").find(".mli:contains('" + c.substr(5, 2) + "')").siblings().removeClass("active");
							}							
							$(this).siblings(".mr_calendar_ym").show();
							var ya = $(this).siblings(".mr_calendar_ym").find(".mr_year .ymli").length;
							var ye = new Date().getFullYear();
							if(ya == 61) {
								ye = ye + 1;
							}
							var sroTop = (ye - parseInt(c.substr(0, 4))) * 32;
							$(this).siblings(".mr_calendar_ym").find(".mr_year").scrollTop(sroTop);
							return;
						}
					} else {
							var ye = new Date().getFullYear();
							$(this).siblings(".mr_calendar_ym").show();
							$(this).siblings(".mr_calendar_ym").find(".ymli:contains('" + ye + "')").addClass("active");
							$(this).siblings(".mr_calendar_ym").find(".ymli:contains('" + ye + "')").siblings().removeClass("active");
							
							return;
					}
				}
				//$(this).parents(".txtExpForm *").not(".mr_calendar_ym").click(function(){
				//alert(1);
				//$(this).parents(".txtExpForm").find(".mr_calendar_ym").hide()
				//})
			})
			$(document).on("click",".yearli",function(){
			$(this).addClass("active").siblings().removeClass("active");
			$(this).parents(".mr_calendar_ym ").siblings().val($(this).text());
			$(this).parents(".mr_calendar_ym ").hide();
			})
			$(document).on("click",".ymli",function(){
			$(this).addClass("active").siblings().removeClass("active");
			yearFlag=$(this).text();
			})
			$(document).on("click",".mli",function(){
			$(this).addClass("active").siblings().removeClass("active");
			if($(this).text()<10) {
			var month="0"+$(this).text();
			}else{
			var month=$(this).text();
			}
			$(this).parents(".mr_calendar_ym ").siblings().val(yearFlag+"-"+month);
			$(this).parents(".mr_calendar_ym ").hide();
			})
			/* //日历仅有年
			$(document).on("click",".yearli",function(){
			if(yearFlag==1) {			
				$(this).parents(".txtExpForm").find(".year").val($(this).text());
			}else if(yearFlag==2) {			
				$(this).parents(".txtExpForm").find(".paperYear").val($(this).text());
			}else if(yearFlag==3) {
			
				$(this).parents(".txtExpForm").find(".patentYear").val($(this).text());
			}else if(yearFlag==4) {			
				$(this).parents(".txtExpForm").find(".honorYear").val($(this).text());
			}						
			$(".mr_calendar_ym ").hide();
			$(document).on("click", ".ymli", function() {
				$(this).addClass("active").siblings().removeClass("active");
				yearFlag = $(this).text();
				if(yearFlag == "至今") {
					$(this).parents(".mr_calendar_ym ").siblings().val($(this).text())
					$(this).parents(".mr_calendar_ym ").hide();
				}
			})
			//日历年月
			var yValue=2016;
			$(document).on("click",".ymli",function(){			
			yValue=$(this).text();
			$(this).addClass("active").siblings().removeClass("active");			
			$(document).on("click", ".mli", function() {
				$(this).addClass("active").siblings().removeClass("active");
				if($(this).text() < 10) {
					var month = "0" + $(this).text();
				} else {
					var month = $(this).text();
				}
				if(yearFlag == "至今") {
					var valueM = yearFlag;
				} else {
					valueM = yearFlag + "-" + month
					$(this).parents(".mr_calendar_ym ").siblings().val(valueM);
					$(this).parents(".mr_calendar_ym ").hide();
				}
			})
			$(document).on("click",".mli",function() {						
			$(this).addClass("active").siblings().removeClass("active");
			
			if(yearFlag==5&&ymFlag==1){
			$(this).parents(".txtExpForm").find(".startMonth").val(yValue+"-"+$(this).text());
		
			}else if(yearFlag==5&&ymFlag==2){
			alert(2);
			$(this).parents(".txtExpForm").find(".stopMonth").val(yValue+"-"+$(this).text());
			
			}else if(yearFlag==6&&ymFlag==1){
			alert(3);
			$(this).parents(".txtExpForm").find(".startMonth").val(yValue+"-"+$(this).text());
			
			}else if(yearFlag==6&&ymFlag==2){
			alert(4);
			$(this).parents(".txtExpForm").find(".stopMonth").val(yValue+"-"+$(this).text());
		
			}
			
			
			$(".mr_calendar_ym ").hide();		
			}) */
			
			function yearAdd() {
				//先给年下拉框赋内容   			
				var y = new Date().getFullYear();
				for(var i = (y - 60); i < (y + 10); i++) { //以今年为准，前60年，后10年   
					$(".mr_year").append('<li class="ymli">' + i + '</li>');				
				for(var i = y; i > y - 60; i--) { //以今年为准，前60年，后10年   
					$(".mr_year").append('<li class="ymli">' + i + '</li>');
					$(".full_year").append('<li class="yearli">' + i + '</li>');
					if(i == y) {
						$(".mr_year>li:contains(" + i + ")").addClass("active");
						$(".full_year>li:contains(" + i + ")").addClass("active");
					}
				}
				
				/* document.reg_testdate.YYYY.value = y;
				document.reg_testdate.MM.value = new Date().getMonth() + 1;
				var n = MonHead[new Date().getMonth()];
				if(new Date().getMonth() == 1 && IsPinYear(YYYYvalue)) n++;
				writeDay(n); //赋日期下拉框Author:meiz */
			}
			function month(){
			   //赋月份的下拉框   

src/main/webapp/js/information.js

@@ -58,7 +58,24 @@ $(function(){
							data[i].degree="";
						}
						var string = '<li class="paddingSpace">'
							string+=' <div class="listdata h4Font h4tit edudata"><i class="listpoint"></i>'+data[i].school+'－'+data[i].college+'－'+data[i].major+'－'+data[i].degree+'<small class="h6Font">'+data[i].year+'</small><em class="exitlist inforedu"></em></div>'
							string+=' <div class="listdata h4Font h4tit edudata"><i class="listpoint"></i>'
								if(data[i].college&&data[i].major&&data[i].degree){
									string+=data[i].school+'－'+data[i].college+'－'+data[i].major+'－'+data[i].degree
								}else if(!data[i].college&&data[i].major&&data[i].degree){
									string+=data[i].school+'－'+data[i].major+'－'+data[i].degree
								}else if(data[i].college&&!data[i].major&&data[i].degree){
									string+=data[i].school+'－'+data[i].college+'－'+data[i].degree
								}else if(data[i].college&&data[i].major&&!data[i].degree){
									string+=data[i].school+'－'+data[i].college+'－'+data[i].major
								}else if(!data[i].college&&!data[i].major&&data[i].degree){
									string+=data[i].school+'－'+data[i].degree
								}else if(!data[i].college&&data[i].major&&!data[i].degree){
									string+=data[i].school+'－'+data[i].major
								}else if(data[i].college&&!data[i].major&&!data[i].degree){
									string+=data[i].school+'－'+data[i].college
								}
								//+data[i].school+'－'+data[i].college+'－'+data[i].major+'－'+data[i].degree+
								string+='<small class="h6Font">'+data[i].year+'</small><em class="exitlist inforedu"></em></div>'
							string += '<div class="modifybox">'
							string += '<form class="txtExpForm">'
							string += '<div class="infor edu">'
@@ -137,19 +154,25 @@ $(function(){
			var timeJobShow = function(data) {
				jobFil("#timeJobShow");
				if(data.length>0){
					for (var i = 0; i < data.length; i++) {
						if(!data[i].startMonth) {
							data[i].startMonth="";
						}else {
							data[i].startMonth=data[i].startMonth.substr(0,4)+"-"+data[i].startMonth.substr(4,6)
						}
						if(!data[i].stopMonth) {
							data[i].stopMonth="";
						}else {
							data[i].stopMonth=data[i].stopMonth.substr(0,4)+"-"+data[i].stopMonth.substr(4,6)
					for (var i = 0; i < data.length; i++) {	
						var sDate = "";
						var eDate = "";
						var string = '<li class="paddingSpace listnone">'
							string+=' <div class="listdata h4Font h4tit edudata"><i class="listpoint"></i>'+data[i].company+'－'+data[i].title+'<small class="h6Font">';
						if(data[i].startMonth){
							
							sDate =data[i].startMonth.substr(0,4)+"-"+data[i].startMonth.substr(4,6);
							if(data[i].stopMonth){
								eDate = data[i].stopMonth.substr(0,4)+"-"+data[i].stopMonth.substr(4,6);
							}else {
								eDate = "至今"
							}
						}
						var string = '<li class="paddingSpace listnone">'
							string+=' <div class="listdata h4Font h4tit edudata"><i class="listpoint"></i>'+data[i].company+'－'+data[i].title+'<small class="h6Font">'+data[i].startMonth+' － '+data[i].stopMonth+'</small><em class="exitlist inforedu"></em></div>'
							string+=' <div class="listdata h4Font h4tit edudata"><i class="listpoint"></i>'+data[i].company+'－'+data[i].title+'<small class="h6Font">';
						    string +=sDate;
						    if(eDate) string+=("-"+eDate);
						    string +='</small><em class="exitlist inforedu"></em></div>';
							string += '<div class="modifybox">'
							string += '<form class="txtExpForm">'
							string += '<div class="infor edu">'
@@ -161,7 +184,7 @@ $(function(){
							string += '<div class="txtType floatL"><em class="emspace">时</em>间</div>'
							string += '<div class="txtExp floatL">'
							string += '<div class="dateExp floatL">'
							string += '<input type="text" maxLength="6" class="date-btn input-txt edu-txt startMonth" flag="5" difference="1" value="'+data[i].startMonth+'">'
							string += '<input type="text" maxLength="6" class="date-btn input-txt edu-txt startMonth" flag="2" difference="1" value="'+sDate+'">'
							string += '<div class="mr_calendar_ym clearfix">'
							string += '<ul class="mr_year">'
							string += '</ul>'
@@ -171,10 +194,10 @@ $(function(){
							string += '</div>'
							string += '<div class="lineTo floatL"></div>'
							string += '<div class="dateExp floatL">'
							string += '<input type="text" maxLength="6" class="date-btn input-txt edu-txt stopMonth" flag="5" difference="2"  value="'+data[i].stopMonth+'">'
							string += '<input type="text" maxLength="6" class="date-btn input-txt edu-txt stopMonth" flag="2" difference="2"  value="'+eDate+'">'
							string += '<div class="mr_calendar_ym clearfix">'
							string += '<ul class="mr_year">'
							string += '<li>至今</li>'
							string += '<li class="ymli">至今</li>'
							string += '</ul>'
							string += '<ul class="mr_month">'
							string += '</ul>'
@@ -209,17 +232,18 @@ $(function(){
						}
						if(!data[i].startMonth){
							data[i].startMonth='';
						}else {
							data[i].startMonth=data[i].startMonth.substr(0,4)+"-"+data[i].startMonth.substr(4,6)
						}
						if(!data[i].stopMonth){
							data[i].stopMonth='';
						}else {
							data[i].stopMonth=data[i].stopMonth.substr(0,4)+"-"+data[i].stopMonth.substr(4,6)
							data[i].startMonth=data[i].startMonth.substr(0,4)+"-"+data[i].startMonth.substr(4,6)+"-"
							if(!data[i].stopMonth){
								data[i].stopMonth='至今';
							}else {
								data[i].stopMonth=data[i].stopMonth.substr(0,4)+"-"+data[i].stopMonth.substr(4,6)
							}
						}
						var string = '<li class="paddingSpace listnone">'
							string+='<div class="listdata h4Font h4tit edudata"><i class="listpoint"></i>'+ data[i].name +'<small class="h6Font">'+ data[i].startMonth +' － '+ data[i].stopMonth +'</small><em class="exitlist inforedu"></em></div>';
							string+='<div class="listdata h5Font pIndent">'+ data[i].descp +'</div>';
							string+='<div><div class="listdata h4Font h4tit edudata"><i class="listpoint"></i>'+ data[i].name +'<small class="h6Font">'+ data[i].startMonth +''+ data[i].stopMonth +'</small><em class="exitlist inforedu"></em></div>';
							string+='<div class="listdata h5Font pIndent">'+ data[i].descp +'</div></div>';
							//string+=' <div class="listdata h4Font h4tit edudata"><i class="listpoint"></i>'+data[i].name+'－'+data[i].descp+'－'+data[i].startMonth+'－'+data[i].stopMonth+'<em class="exitlist inforedu"></em></div>'
							string += '<div class="modifybox">'
							string += '<form class="txtExpForm">'
@@ -232,7 +256,7 @@ $(function(){
							string += '<div class="txtType floatL"><em class="emspace">时</em>间</div>'
							string += '<div class="txtExp floatL">'
							string += '<div class="dateExp floatL">'
							string += '<input type="text" class="date-btn input-txt edu-txt project StartMonth" flag="6" difference="1" value="'+data[i].startMonth+'">'
							string += '<input type="text" class="date-btn input-txt edu-txt project StartMonth" flag="2" difference="1" value="'+data[i].startMonth.substr(0,7)+'">'
							string += '<div class="mr_calendar_ym clearfix">'
							string += '<ul class="mr_year">'
							string += '</ul>'
@@ -242,10 +266,10 @@ $(function(){
							string += '</div>'
							string += '<div class="lineTo floatL"></div>'
							string += '<div class="dateExp floatL">'
							string += '<input type="text" class="date-btn input-txt edu-txt project StopMonth" flag="6" difference="2" value="'+data[i].stopMonth+'">'
							string += '<input type="text" class="date-btn input-txt edu-txt project StopMonth" flag="2" difference="2" value="'+data[i].stopMonth+'">'
							string += '<div class="mr_calendar_ym clearfix">'
							string += '<ul class="mr_year">'
							string += '<li>至今</li>'
							string += '<li class="ymli">至今</li>'
							string += '</ul>'
							string += '<ul class="mr_month">'
							string += '</ul>'
@@ -258,7 +282,7 @@ $(function(){
							string += '<div class="txtExp floatL"><input type="text" class="input-txt edu-txt projectDescp" value="'+data[i].descp+'"></div>'
							string += '</div>'
							string += '<div class="btnbox">'
							string += '<input type="button" value="添加" class="infor-save btn">'
							string += '<input type="button" value="保存" class="infor-save btn">'
							string += '<input type="button" value="取消" class="close btn">'
							string += '<input type="button" value="删除本条" class="deletebtn">'
							string += '</div>'
@@ -286,8 +310,8 @@ $(function(){
						}
							
						var string = '<li class="paddingSpace listnone">'
							string+='<div class="listdata h4Font h4tit edudata"><i class="listpoint"></i>'+ data[i].name +'<small class="h6Font">'+ data[i].year +'</small><em class="exitlist inforedu"></em></div>';
							string+='<div class="listdata h5Font pIndent">'+ data[i].descp +'</div>';
							string+='<div><div class="listdata h4Font h4tit edudata"><i class="listpoint"></i>'+ data[i].name +'<small class="h6Font">'+ data[i].year +'</small><em class="exitlist inforedu"></em></div>';
							string+='<div class="listdata h5Font pIndent">'+ data[i].descp +'</div></div>';
							//string+=' <div class="listdata edudata"><i class="listpoint"></i>'+data[i].year+'－'+data[i].name+'－'+data[i].descp+'<em class="exitlist inforedu"></em></div>'
							string += '<div class="modifybox">'
							string += '<form class="txtExpForm">'
@@ -298,7 +322,7 @@ $(function(){
							string += '<div class="edu date-box clearfix">'
							string += '<div class="txtType floatL">发表时间</div>'
							string += '<div class="txtExp floatL">'
							string += '<input type="text" class="date-btn input-txt edu-txt paperYear"  flag="2" value="'+data[i].year+'">'
							string += '<input type="text" class="date-btn input-txt edu-txt paperYear"  flag="1" value="'+data[i].year+'">'
							string += '<div class="mr_calendar_ym clearfix" style="wclassth: 180px; display: none;">'
							string += '<ul class="full_year">'
							string += '</ul>'
@@ -339,8 +363,8 @@ $(function(){
						}
						var string = '<li class="paddingSpace listnone">'
							//string+=' <div class="listdata edudata"><i class="listpoint"></i>'+data[i].year+'－'+data[i].name+'－'+data[i].descp+'<em class="exitlist inforedu"></em></div>'
							string+='<div class="listdata h4Font h4tit edudata"><i class="listpoint"></i>'+ data[i].name +'<small class="h6Font">'+ data[i].year +'</small><em class="exitlist inforedu"></em></div>';
							string+='<div class="listdata h5Font pIndent">'+ data[i].descp +'</div>';
							string+='<div><div class="listdata h4Font h4tit edudata"><i class="listpoint"></i>'+ data[i].name +'<small class="h6Font">'+ data[i].year +'</small><em class="exitlist inforedu"></em></div>';
							string+='<div class="listdata h5Font pIndent">'+ data[i].descp +'</div></div>';
							string += '<div class="modifybox">'
							string += '<form class="txtExpForm">'
							string += '<div class="infor edu">'
@@ -351,7 +375,7 @@ $(function(){
							string += '<div class="edu date-box clearfix">'
							string += '<div class="txtType floatL">发表时间</div>'
							string += '<div class="txtExp floatL">'
							string += '<input type="text" class="date-btn input-txt edu-txt patentYear" flag="3" value="'+data[i].year+'">'
							string += '<input type="text" class="date-btn input-txt edu-txt patentYear" flag="1" value="'+data[i].year+'">'
							string += '<div class="mr_calendar_ym clearfix" style="width: 180px; display: none;">'
							string += '<ul class="full_year">'				
							string += '</ul>'
@@ -391,8 +415,8 @@ $(function(){
						}
						var string = '<li class="paddingSpace listnone">'
							//string+=' <div class="listdata edudata"><i class="listpoint"></i>'+data[i].year+'－'+data[i].name+'－'+data[i].descp+'<em class="exitlist inforedu"></em></div>'
							string+='<div class="listdata h4Font h4tit edudata"><i class="listpoint"></i>'+ data[i].name +'<small class="h6Font">'+ data[i].year +'</small><em class="exitlist inforedu"></em></div>';
							string+='<div class="listdata h5Font pIndent">'+ data[i].descp +'</div>';
							string+='<div><div class="listdata h4Font h4tit edudata"><i class="listpoint"></i>'+ data[i].name +'<small class="h6Font">'+ data[i].year +'</small><em class="exitlist inforedu"></em></div>';
							string+='<div class="listdata h5Font pIndent">'+ data[i].descp +'</div></div>';
							string += '<div class="modifybox">'
							string += '<form class="txtExpForm">'
							string += '<div class="infor edu">'
@@ -407,7 +431,7 @@ $(function(){
							string += '<div class="edu date-box clearfix">'
							string += '<div class="txtType floatL"><em class="emspace">时</em>间</div>'
							string += '<div class="txtExp floatL">'
							string += '<input type="text" class="date-btn input-txt edu-txt honorYear" flag="4" value="'+data[i].year+'">'
							string += '<input type="text" class="date-btn input-txt edu-txt honorYear" flag="1" value="'+data[i].year+'">'
							string += '<div class="mr_calendar_ym clearfix" style="width: 180px; display: none;">'
							string += '<ul class="full_year">'
							string += '</ul>'
@@ -429,6 +453,7 @@ $(function(){
			//填充研究方向
			var researchAreaShow = function ($datas,$datarecords){
				if($datas != undefined &&  $datas.length != 0 ){
					$("#researchAreaList").empty();
					for(var i =0 ; i< $datas.length;++i){
						var $data = $datas[i];
						var $photos = [];
@@ -448,11 +473,7 @@ $(function(){
						showDiv += "</div></div>";
						$("#researchAreaShow").append(showDiv);
						$("#researchAreaList").append("<div class='list'><span class='like'>"+$data.count+"</span><span class='ra'>"+$data.caption+"</span><span class='remove'><img src='images/move.png'></span></div>");
						// $("#researchAreaList").append("<div class=\"list\"><span class=\"like\">");
						// $("#researchAreaList").append($data.count);
						// $("#researchAreaList").append("</span>");
						// $("#researchAreaList").append($data.caption);
						// $("#researchAreaList").append("<span class=\"remove\"><img src=\"images/move.png\"></span></div>");
						
						
						$(".like-h").load(function(){								
						})
@@ -485,13 +506,22 @@ $.get("/ajax/professor/info/" + userid, function($data) {
			//展示专家的信息
			$("#nameS").text($info.name);
			if($info.office) {
				$("#office").text($info.office+"，");
				if($info.title) {
					$("#office").text($info.office+"，");
				}else{
					$("#office").text($info.office);
				}
				
			}
			if($info.title) {
				$("#titleS").text($info.title);	
			}
			if($info.department) {
				$("#industryS").text($info.department+"，");
				if($info.orgName){
					$("#industryS").text($info.department+"，");
				}else{
					$("#industryS").text($info.department);
				}				
			}
			if($info.orgName) {
				$("#orgNameS").text($info.orgName);
@@ -618,8 +648,24 @@ else {
 	var searchContent = $("#hsearchContent").val();
 	location.href = "search.html?searchContent=" + searchContent;
 });
 function trim(str) { //删除左右两端的空格			　　
		return str.replace(/(^\s*)|(\s*$)/g, "");
	}
//头像旁保存
$("#saveProfessor").on("click",function () {
	var length1=trim($("#name").val());
	console.log(length1)
	var length2=trim($("#orgName").val());
	if(!length1&&length2){
		$.MsgBox.Alert("消息提醒","姓名不能为空");
		return;
	}else if(length1&&!length2){
		$.MsgBox.Alert("消息提醒","所在机构不能为空");
		return;
	}else if(!length1&&!length2){
		$.MsgBox.Alert("消息提醒","姓名和所在机构不能为空");
		return;
	}
	var $data = {};
	$data.name = $("#name").val();
	$data.orgId = $("#orgId").val();
@@ -647,15 +693,30 @@ $("#saveProfessor").on("click",function () {
				  				//展示专家的信息
				  				$(".modifybox").css("display","none");
				  				$(".infor-browse").css("display","block");
				  							$("#nameS").text("");
				  							$("#office").text("");
				  							$("#titleS").text("");
				  							$("#industryS").text("");
				  							$("#orgNameS").text("");
				  							$("#address").text("");
				  							$("#nameS").text($info.name);
				  							if($info.office) {
				  								$("#office").text($info.office+"，");
				  								if($info.title) {
				  									$("#office").text($info.office+"，");
				  								}else{
				  									$("#office").text($info.office);
				  								}
				  								
				  							}
				  							if($info.title) {
				  								$("#titleS").text($info.title);	
				  							}
				  							if($info.department) {
				  								$("#industryS").text($info.department+"，");
				  								if($info.orgName){
				  									$("#industryS").text($info.department+"，");
				  								}else{
				  									$("#industryS").text($info.department);
				  								}				
				  							}
				  							if($info.orgName) {
				  								$("#orgNameS").text($info.orgName);
@@ -763,8 +824,21 @@ $("#container .edit").click(function(){
//学术领域添加
$("#subjectAdd").click(function(){
	var val=$("#subject").val();
	if(!val){
		$.MsgBox.Alert("消息提醒","内容不能为空");
		return;
	}
	var inV=$("#subjectList .acad");	
	for(var i=0;i<inV.length;i++){		
		if(inV[i].innerText==val)
			{
				$.MsgBox.Alert("消息提醒","不能添加重复内容");
				return;
			}	
		}
	$("#subjectList").append("<div class='acad'>"+ val +"<span class='remove'><img src='images/move.png'></span></div>")							
	})
	$("#subject").val("")
})
//学术领域删除
$("#subjectList").on("click",".remove",function(){
	$(this).parent().remove();
@@ -801,8 +875,21 @@ $("#subjectList").on("click",".remove",function(){
//应用行业添加
$("#industryAdd").click(function(){
	var val=$("#industry").val();
	if(!val){
		$.MsgBox.Alert("消息提醒","内容不能为空");
		return;
	}
	var inV=$("#industryList .acad");	
	for(var i=0;i<inV.length;i++){		
		if(inV[i].innerText==val)
			{
				$.MsgBox.Alert("消息提醒","不能添加重复内容");
				return;
			}	
		}
	$("#industryList").append("<div class='acad'>"+ val +"<span class='remove'><img src='images/move.png'></span></div>")							
	})
	$("#industry").val("")
})
//应用行业删除
$("#industryList").on("click",".remove",function(){
	$(this).parent().remove();
@@ -839,8 +926,21 @@ $("#industryList").on("click",".remove",function(){
//研究方向添加
$("#researchAreaAdd").click(function(){
	var researchArea=$("#researchArea").val();
	if(!researchArea){
		$.MsgBox.Alert("消息提醒","内容不能为空");
		return;
	}
	var inV=$("#researchAreaList .ra");	
	for(var i=0;i<inV.length;i++){		
		if(inV[i].innerText==researchArea)
			{
				$.MsgBox.Alert("消息提醒","不能添加重复内容");
				return;
			}	
		}
	$("#researchAreaList").append("<div class='list'><span class='like'>0</span><span class='ra'>"+ researchArea +"</span><span class='remove'><img src='images/move.png'></span></div>")							
	});
	$("#researchArea").val("");
});
//研究方向删除
$("#researchAreaList").on("click",".remove",function(){
@@ -868,16 +968,14 @@ $("#researchAreaList").on("click",".remove",function(){
				"success" : function($data) {
					if ($data.success)
					{
						$("#researchArea").val("");						
						$("#researchAreaList").empty();
						$("#researchAreaShow").empty();						
						$(".modifybox").css("display","none");
						$(".infor-browse").css("display","block");
						$.get("/ajax/professor/info/" + userid, function($data) 
								{
								if ($data.success) 
								{
									researchAreaShow($data.data.researchAreas, $data.data.researchAreaLogs);
									$("#researchAreaShow").empty("");
									$("#researchAreaShow").show();
									$(".modifybox").hide();
									researchAreaShow($data.data.researchAreas, $data.data.editResearchAreaLogs);									
								}
							});
						
@@ -956,7 +1054,7 @@ var eduFil=function(select){
		string += '</div>'
		string += '</div>'
		string += '<div class="btnbox">'
		string += '<input type="button" value="保存" class="infor-save btn" class="saveEduBg">'
		string += '<input type="button" value="添加" class="infor-save btn" class="saveEduBg">'
		string += '<input type="button" value="取消" class="close1 close2 btn">'		
		string += '</div>'
		string += '</form>' 
@@ -1084,7 +1182,7 @@ $("#timeJobShow").on("blur", ".jobCompany", function() {
					string += '<div class="txtType floatL"><em class="emspace">时</em>间</div>'
					string += '<div class="txtExp floatL">'
					string += '<div class="dateExp floatL">'
					string += '<input type="text" maxLength="6" class="date-btn input-txt edu-txt startMonth" flag="5" difference="1" value="">'
					string += '<input type="text" maxLength="6" class="date-btn input-txt edu-txt startMonth" flag="2" difference="1" value="">'
					string += '<div class="mr_calendar_ym clearfix">'
					string += '<ul class="mr_year">'
					string += '</ul>'
@@ -1094,10 +1192,10 @@ $("#timeJobShow").on("blur", ".jobCompany", function() {
					string += '</div>'
					string += '<div class="lineTo floatL"></div>'
					string += '<div class="dateExp floatL">'
					string += '<input type="text" maxLength="6" class="date-btn input-txt edu-txt stopMonth" flag="5" difference="2"  value="">'
					string += '<input type="text" maxLength="6" class="date-btn input-txt edu-txt stopMonth" flag="2" difference="2"  value="">'
					string += '<div class="mr_calendar_ym clearfix">'
					string += '<ul class="mr_year">'
					string += '<li>至今</li>'
					string += '<li class="ymli">至今</li>'
					string += '</ul>'
					string += '<ul class="mr_month">'
					string += '</ul>'
@@ -1110,7 +1208,7 @@ $("#timeJobShow").on("blur", ".jobCompany", function() {
					string += '<div class="txtExp floatL"><input type="text" class="input-txt edu-txt jobTitle" /></div>'
					string += '</div>'
					string += '<div class="btnbox">'
					string += '<input type="button" value="保存" class="infor-save btn btn-marL">'
					string += '<input type="button" value="添加" class="infor-save btn btn-marL">'
					string += '<input type="button" value="取消" class="close1 close2 btn btn-marB">'
					string += '</div>'
					string += '</form>'
@@ -1162,6 +1260,15 @@ var delTimeJob = function(data){
$("#timeJobShow").on("click", ".infor-save", function() {
	var length1 = trim($(this).parents(".txtExpForm").find(".jobCompany").val());
	var length2 = trim($(this).parents(".txtExpForm").find(".jobTitle").val());
	var length3 = trim($(this).parents(".txtExpForm").find(".startMonth").val());
	var length4 = trim($(this).parents(".txtExpForm").find(".stopMonth").val());
	if(!length3&&length4) {
		$.MsgBox.Alert("消息", "没有选开始时间");
		return;
	}else if(length3&&!length4){
		$.MsgBox.Alert("消息", "没有选结束时间");
		return;
	}
	if(!length1&&length2) {
		$.MsgBox.Alert("消息", "机构名称不能为空");
		return;
@@ -1181,11 +1288,16 @@ $("#timeJobShow").on("click", ".infor-save", function() {
			$data.company = $(this).parents(".txtExpForm").find(".jobCompany").val();
			
			var s=$(this).parents(".txtExpForm").find(".startMonth").val();
			var st=$(this).parents(".txtExpForm").find(".stopMonth").val();
			console.log(s);
			console.log(st);
			$data.startMonth = s.substr(0,4)+s.substr(5,6);			
			$data.stopMonth =  st.substr(0,4)+st.substr(5,6);
			var st=$(this).parents(".txtExpForm").find(".stopMonth").val();	
			if(s){
				$data.startMonth = s.substr(0,4)+s.substr(5,6);			
			}
			if(st){
				if(st=="至今"){				
				}else{
					$data.stopMonth =  st.substr(0,4)+st.substr(5,6);	
				}
			}
			$data.title = $(this).parents(".txtExpForm").find(".jobTitle").val();
			$.ajax({
				"url" : "/ajax/job",
@@ -1193,6 +1305,7 @@ $("#timeJobShow").on("click", ".infor-save", function() {
				"data" : $id ? JSON.stringify($data) : $data,
				"contentType" : $id ? "application/json"
						: "application/x-www-form-urlencoded",
						beforeSend:function(){console.log(this.data)},
				"success" : function($data) {
					if ($data.success) 
					{
@@ -1236,7 +1349,7 @@ $("#timeJobShow").on("click", ".infor-save", function() {
					string += '<div class="txtType floatL"><em class="emspace">时</em>间</div>'
					string += '<div class="txtExp floatL">'
					string += '<div class="dateExp floatL">'
					string += '<input type="text" class="date-btn input-txt edu-txt project StartMonth" flag="6" difference="1"  value="">'
					string += '<input type="text" class="date-btn input-txt edu-txt project StartMonth" flag="2" difference="1"  value="">'
					string += '<div class="mr_calendar_ym clearfix">'
					string += '<ul class="mr_year">'
					string += '</ul>'
@@ -1246,10 +1359,10 @@ $("#timeJobShow").on("click", ".infor-save", function() {
					string += '</div>'
					string += '<div class="lineTo floatL"></div>'
					string += '<div class="dateExp floatL">'
					string += '<input type="text" class="date-btn input-txt edu-txt project StopMonth" flag="6" difference="2" value="">'
					string += '<input type="text" class="date-btn input-txt edu-txt project StopMonth" flag="2" difference="2" value="">'
					string += '<div class="mr_calendar_ym clearfix">'
					string += '<ul class="mr_year">'
					string += '<li>至今</li>'
					string += '<li class="ymli">至今</li>'
					string += '</ul>'
					string += '<ul class="mr_month">'
					string += '</ul>'
@@ -1277,8 +1390,8 @@ $("#timeJobShow").on("click", ".infor-save", function() {
				$("#projectShow").find(".listnone1").toggle(100);
			});
			$("#projectShow").on("click", "em", function() {
				$(this).parent().hide();
				$(this).parent().siblings().show();
				$(this).parent().parent().hide();
				$(this).parent().parent().siblings().show();
				//$(this).parent().parent().children(".")
			});
			$("#projectShow").on("click", ".close", function() {
@@ -1313,10 +1426,20 @@ var delProject = function(data){
//项目经历保存		
$("#projectShow").on("click", ".infor-save",function () {
			var length = trim($(this).parents(".txtExpForm").find(".projectName").val());
			var length1 = trim($(this).parents(".txtExpForm").find(".StartMonth").val());
			var length2 = trim($(this).parents(".txtExpForm").find(".StopMonth").val());			
			if(!length) {
				$.MsgBox.Alert("消息", "项目名称不能为空");
				return;
			}
			if(length1&&!length2){
				$.MsgBox.Alert("消息", "没有选结束时间");
				return;
			}
			if(!length1&&length2){
				$.MsgBox.Alert("消息", "没有选开始时间");
				return;
			}
			var $data = {};
			var $id = $(this).parents(".txtExpForm").find(".projectId").val();
			console.log($id);
@@ -1325,9 +1448,19 @@ $("#projectShow").on("click", ".infor-save",function () {
			}	
			$data.professorId = userid;
			var s=$(this).parents(".txtExpForm").find(".StartMonth").val();
			var st=$(this).parents(".txtExpForm").find(".StopMonth").val();
			$data.startMonth = s.substr(0,4)+s.substr(5,6);			
			$data.stopMonth =  st.substr(0,4)+st.substr(5,6);
			var st=$(this).parents(".txtExpForm").find(".StopMonth").val();	
			if(s){
				$data.startMonth = s.substr(0,4)+s.substr(5,6);	
			}
			if(st){
				if(st=="至今"){				
				}else{
					$data.stopMonth =  st.substr(0,4)+st.substr(5,6);	
				}
			}
			
			
					
			$data.name = $(this).parents(".txtExpForm").find(".projectName").val()
			$data.descp = $(this).parents(".txtExpForm").find(".projectDescp").val()
			$.ajax({
@@ -1366,7 +1499,7 @@ var papFil=function(select){
		string += '<div class="edu date-box clearfix">'
		string += '<div class="txtType floatL">发表时间</div>'
		string += '<div class="txtExp floatL">'
		string += '<input type="text" class="date-btn input-txt edu-txt paperYear" flag="2" value="">'
		string += '<input type="text" class="date-btn input-txt edu-txt paperYear" flag="1" value="">'
		string += '<div class="mr_calendar_ym clearfix" style="wclassth: 180px; display: none;">'
		string += '<ul class="full_year">'
		string += '</ul>'
@@ -1383,7 +1516,7 @@ var papFil=function(select){
		string += '</div>'
		string += '<div class="btnbox">'
		string += '<input type="hidden" class="paperId">'
		string += '<input type="button" value="保存" class="infor-save btn" class="paperSave">'
		string += '<input type="button" value="添加" class="infor-save btn" class="paperSave">'
		string += '<input type="button" value="取消" class="close1 close2 btn">'		
		string += '</div></form></div></li>'
		$(""+select+"").prepend(string);
@@ -1402,8 +1535,8 @@ var papFil=function(select){
				$("#paperShow").find(".listnone1").toggle(100);
			});
			$("#paperShow").on("click", "em", function() {
				$(this).parent().hide();
				$(this).parent().siblings().show();
				$(this).parent().parent().hide();
				$(this).parent().parent().siblings().show();
				//$(this).parent().parent().children(".")
			});
			$("#paperShow").on("click", ".close", function() {
@@ -1493,7 +1626,7 @@ var delPaper = function(data){
		string += '<div class="edu date-box clearfix">'
		string += '<div class="txtType floatL">发表时间</div>'
		string += '<div class="txtExp floatL">'
		string += '<input type="text" class="date-btn input-txt edu-txt patentYear" flag="3" value="">'
		string += '<input type="text" class="date-btn input-txt edu-txt patentYear" flag="1" value="">'
		string += '<div class="mr_calendar_ym clearfix" style="width: 180px; display: none;">'
		string += '<ul class="full_year">'				
		string += '</ul>'
@@ -1509,7 +1642,7 @@ var delPaper = function(data){
		string += '<div class="txtExp floatL"><input type="text" class="input-txt edu-txt patentDescp"></div>'
		string += '</div>'
		string += '<div class="btnbox">'
		string += '<input type="button" value="保存" class="infor-save btn">'
		string += '<input type="button" value="添加" class="infor-save btn">'
		string += '<input type="button" value="取消" class="close1 close2 btn">'		
		string += '</div>'
		string += '</form>'
@@ -1525,8 +1658,8 @@ var delPaper = function(data){
		$("#patentShow").find(".listnone1").toggle(100);
	});
	$("#patentShow").on("click", "em", function() {
		$(this).parent().hide();
		$(this).parent().siblings().show();
		$(this).parent().parent().hide();
		$(this).parent().parent().siblings().show();
		//$(this).parent().parent().children(".")
	});
	$("#patentShow").on("click", ".close", function() {
@@ -1625,7 +1758,7 @@ $("#honorShow").on("blur", ".honorName", function() {
					string += '<div class="edu date-box clearfix">'
					string += '<div class="txtType floatL"><em class="emspace">时</em>间</div>'
					string += '<div class="txtExp floatL">'
					string += '<input type="text" class="date-btn input-txt edu-txt honorYear" flag="4" value="">'
					string += '<input type="text" class="date-btn input-txt edu-txt honorYear" flag="1" value="">'
					string += '<div class="mr_calendar_ym clearfix" style="width: 180px; display: none;">'
					string += '<ul class="full_year">'
					string += '</ul>'
@@ -1633,7 +1766,7 @@ $("#honorShow").on("blur", ".honorName", function() {
					string += '</div>'
					string += '</div>'
					string += '<div class="btnbox">'
					string += '<input type="button" value="保存" class="infor-save btn">'
					string += '<input type="button" value="添加" class="infor-save btn">'
					string += '<input type="button" value="取消" class="close1 close2 btn">'
					string += '</div>'
					string += '</form>'
@@ -1649,8 +1782,8 @@ $("#honorShow").on("blur", ".honorName", function() {
				$("#honorShow").find(".listnone1").toggle(100);
			});
			$("#honorShow").on("click", "em", function() {
				$(this).parent().hide();
				$(this).parent().siblings().show();
				$(this).parent().parent().hide();
				$(this).parent().parent().siblings().show();
				//$(this).parent().parent().children(".")
			});
			$("#honorShow").on("click", ".close", function() {