朋涛

1.最新咨询最新回复图片ok，专家修改页面的专家个人信息完善
2.专家页面，模块没数据就不显示在页面上，没有登陆，咨询，跳转登陆页面

src/main/webapp/css/index.css

@@ -193,7 +193,7 @@ input[type='radio'].radio:checked + .radio {background:url(../images/redio.png)
.coulstblock .coulstbox{display:block; width:200px; height:100px; padding:10px; background:rgba(256,256,256,.9); border:1px solid #ccc; border-radius:4px 4px 0 0; box-shadow: -3px -2px 8px -1px rgba(0,0,0,0.2); cursor: pointer;}
.coulstblock .coulstbox .prohead{ width:80px; height:80px; border-radius:50%; overflow:hidden;}
.coulstblock .coulstbox .coulstbtn{padding:24px 10px; margin-left:10px;}
.coulstblock .coulstbox .coulstbtn span{padding:4px 10px; display:block; width:60px; border-radius:2px; text-align:center; color:#fff; background:#ff8400;}
.coulstblock .coulstbox .coulstbtn span,#conbtn span{padding:4px 10px; display:block; width:60px; border-radius:2px; text-align:center; color:#fff; background:#ff8400;cursor:pointer}
/*专家信息头部*/
.information-head{ width:1050px; margin:auto;background:#fff; border:1px  solid #eaeaea; margin-top:30px; overflow:hidden; padding:20px 50px;}
.head-left{ float:left;width:200px; height:200px; border-radius:50%;position:relative;overflow:hidden;}

src/main/webapp/information-brow.html

@@ -65,13 +65,13 @@
			<div class="head-center">
				<div class="infor-browse">
					<a href="#" class="named" id="nameS"></a><a href="#" class="modify"></a>
					<div class="position" id="titleS"></div>
					<div class="science" id="orgNameS"></div>
					<div class="industry" id="industryS"></div>
					<div class="position" ><span id="office"></span ><span id="titleS"></span ></div>				
					<div class="science"><span id="industryS"></span ><span id="orgNameS"></span ></div>			
					<div class="address" id="address"></div>					
				</div>
				<div class="coulstbtn floatL" id="conbtn"><span>咨询</span></div>
			</div>
			<div class="head-right"><a href="" id="organ"><img id="orgImage"></a></div>
			<div class="head-right"><a  id="organ"><img id="orgImage"></a></div>
		</div>
		<div class="information-content">
			<div class="content-left" >

src/main/webapp/information.html

@@ -53,9 +53,9 @@
			<div class="head-center">
				<div class="infor-browse">
					<a href="#" class="named" id="nameS"></a><a href="#" class="modify"></a><a class="edit" ></a>
					<div class="position" id="titleS"></div>
					<div class="science" id="orgNameS"></div>
					<div class="industry" id="industryS"></div>
					<div class="position" ><span id="office"></span ><span id="titleS"></span ></div>				
					<div class="science"><span id="industryS"></span ><span id="orgNameS"></span ></div>			
					<div class="address" id="address"></div>
				</div>
				<div class="modifybox">
				<div class="infor">
@@ -67,7 +67,12 @@
					</div>
				</div>
				<div class="infor">
					<span>职&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;位</span>
					<input type="text" class="input-txt" id="officeRevise">
					<span>地&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;址</span>
					<input type="text" class="input-txt" id="addressRevise">
				</div>
				<div class="infor">
					<span>部&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;门</span>
					<input type="text" class="input-txt" id="department">
@@ -80,7 +85,8 @@
				</div>
				</div>
			</div>
		<div class="head-right"><a href="organization-brow.html"><img id="orgImage"></a></div>
			<!-- href="organization-brow.html" -->
		<div class="head-right"><a ><img id="orgImage"></a></div>
		</div>
		<div class="information-content">
			<div class="content-left" >

src/main/webapp/js/information.brow.js

@@ -243,8 +243,21 @@ loginStatus();//读取用户头像
						if ($info) {
							//展示专家的信息
							$("#nameS").text($info.name);
							$("#titleS").text($info.title);
							$("#orgNameS").text($info.orgName);
							if($info.office) {
								$("#office").text($info.office+"，");
							}
							if($info.title) {
								$("#titleS").text($info.title);	
							}
							if($info.department) {
								$("#industryS").text($info.department+"，");
							}
							if($info.orgName) {
								$("#orgNameS").text($info.orgName);
							}
							if($info.address) {
								$("#address").text($info.address);
							}																			
							$("#headImage").attr("src","/images/head/"+professorId+"_l.jpg");
								$("#headImage").load(function(){									
								})
@@ -266,40 +279,83 @@ loginStatus();//读取用户头像
							//$("#organ").attr("href","organization-brow.html?orgId="+$info.orgId+"");
							//console.log($info.orgId);
							$("#orgName").val($info.orgName);
							$("#department").val($info.department);
							$("#descp").val($info.descp);
							//展示专家的学科
							subjectShow($info.subject);
							//研究方向
							if ($info.researchAreas) {
							$("#department").val($info.department);														
							if($info.descp==undefined&&$info.subject==undefined&&$info.researchAreas.length ==0&&$info.industry==undefined&&$info.edus.length ==0&&$info.jobs.length ==0&&$info.projects.length==0&&$info.papers.length ==0&&$info.patents.length ==0&&$info.honors.length ==0){								
								$("div:contains('专家信息')").parents(".menublock").hide();
							}
							if($info.descp){
								$("#descp").val($info.descp);
							}else{
								$("span:contains('个人简介')").parents(".introduction").hide();
								$("a:contains('个人简介')").hide();
							}
							
							//展示专家的学科							
							if($info.subject){
								subjectShow($info.subject);
							}else{
								$("span:contains('学术领域')").parents(".introduction").hide();
								$("a:contains('学术领域')").hide();
							}
							
							//研究方向						
							if ($info.researchAreas.length) {
								researchAreaShow($info.researchAreas,$info.researchAreaLogs);
							}else{							
								$("span:contains('研究方向')").parents(".introduction").hide();
								$("a:contains('研究方向')").hide();
							}
							//展示专家的行业
							industryShow($info.industry);
							//教育北京
							if ($info.edus) {
							//展示专家的行业							
							if($info.industry){
								industryShow($info.industry);
							}else{
								$("span:contains('应用行业')").parents(".introduction").hide();
								$("a:contains('应用行业')").hide();
							}
							
							//教育北京						
							if ($info.edus.length) {
								eduBgShow($info.edus);
							}
							else{
								$("span:contains('教育背景')").parents(".introduction").hide();
								$("a:contains('教育背景')").hide();
							}
							//兼职
							if ($info.jobs) {
							if ($info.jobs.length) {
								timeJobShow($info.jobs);
							}else{
								$("span:contains('社会兼职')").parents(".introduction").hide();
								$("a:contains('社会兼职')").hide();
							}
							//项目
							if ($info.projects) {
							if ($info.projects.length) {
								projectShow($info.projects)
							}else{
								$("span:contains('项目经历')").parents(".introduction").hide();
								$("a:contains('项目经历')").hide();
							}
							//论文
							if ($info.papers) {
							if ($info.papers.length) {
								paperShow($info.papers);
							}else{
								$("span:contains('著作、论文、文章')").parents(".introduction").hide();
								$("a:contains('著作、论文、文章')").hide();								
							}
							//专利
							if ($info.patents) {
							if ($info.patents.length) {
								patentShow($info.patents);
							}else{
								$("span:contains('专利')").parents(".introduction").hide();
								$("a:contains('专利')").hide();	
							}
							//荣誉
							if ($info.honors) {
							if ($info.honors.length) {
								honorShow($info.honors);
							}else{
								$("span:contains('荣誉及奖项')").parents(".introduction").hide();
								$("a:contains('获奖')").hide();	
							}
							 
					//下滑滚动不覆盖底部 
@@ -381,6 +437,8 @@ $(".subsidebar").click(function(){
			if(data.data.length==0){
				$("#infor-browse").css("display","none");
				$(".resoubtn").css("display","none");
				$("span:contains('科研资源')").parents(".introduction").hide();
				$("a:contains('科研资源')").hide();
			}
			if(data.data.length > 0 && data.data.length <= 3){
				$("#infor-browse").css("display","block");
@@ -614,7 +672,11 @@ $(".subsidebar").click(function(){
	
 	
	function consultHandler(){
	function consultHandler() {		
			if( userid=="null"){
			$.MsgBox.Alert("message","请先登录");
			location.href="login.html";
		}
		ConsultApply();
		//点击的发送
		$("#sendConsultBtn").click(function(){

src/main/webapp/js/information.js

@@ -150,8 +150,22 @@ $(function(){
		if ($info) {
			//展示专家的信息
			$("#nameS").text($info.name);
			$("#titleS").text($info.title);
			$("#orgNameS").text($info.orgName);
			if($info.office) {
				$("#office").text($info.office+"，");
			}
			if($info.title) {
				$("#titleS").text($info.title);	
			}
			if($info.department) {
				$("#industryS").text($info.department+"，");
			}
			if($info.orgName) {
				$("#orgNameS").text($info.orgName);
			}
			if($info.address) {
				$("#address").text($info.address);
			}					
			
			$("#headImage").attr("src", "/images/head/" + userid + "_l.jpg");
			$("#headImage").load(function() {})
				.error(function() {
@@ -168,7 +182,9 @@ $(function(){
			$("#title").val($info.title);
			$("#orgId").val($info.orgId);
			$("#orgName").val($info.orgName);
			$("#department").val($info.department);
			$("#department").val($info.department);			
			$("#officeRevise").val($info.office);
			$("#addressRevise").val($info.address);
			$("#descp").val($info.descp);
			//展示专家的学术领域
			subjectShow($info.subject);
@@ -263,7 +279,8 @@ $("#saveProfessor").on("click",function () {
	$data.orgName = $("#orgName").val();
	$data.title = $("#title").val();
	$data.department = $("#department").val();
	console.log($data);
	$data.address=$("#addressRevise").val();
	$data.office=$("#officeRevise").val();	
	var userid = $.cookie("userid");
	if (userid) {
		$data.id = userid;
@@ -271,11 +288,46 @@ $("#saveProfessor").on("click",function () {
	$.ajax({"url" : "../ajax/professor",
		"type" : userid ? "PUT" : "POST",
		"success" : function(rdata) {
			console.log(rdata);
			
			if (rdata.success) {
				if (userid) {
					location.reload(true);
				} else {
				  	$.get("/ajax/professor/info/" + userid, function($data) {
				  		if ($data.success) {		
				  			var $info = $data.data;
				  			if ($info) {
				  				//展示专家的信息
				  				$(".modifybox").css("display","none");
				  				$(".infor-browse").css("display","block");
				  							$("#nameS").text($info.name);
				  							if($info.office) {
				  								$("#office").text($info.office+"，");
				  							}
				  							if($info.title) {
				  								$("#titleS").text($info.title);	
				  							}
				  							if($info.department) {
				  								$("#industryS").text($info.department+"，");
				  							}
				  							if($info.orgName) {
				  								$("#orgNameS").text($info.orgName);
				  							}
				  							if($info.address) {
				  								$("#address").text($info.address);
				  							}														
				  							//显示专家信息到保存数据
				  							$("#name").val($info.name);
				  							$("#title").val($info.title);
				  							$("#orgId").val($info.orgId);
				  							$("#orgName").val($info.orgName);
				  							$("#department").val($info.department);
				  							$("#officeRevise").val($info.office);
				  							$("#addressRevise").val($info.address);
				  					}
				  				}
				  		})
				}
				else {
					location.href = "information.html?id="+ rdata.data;
				}
			} else {
@@ -988,7 +1040,7 @@ $("#honorList").on("click",".hon .remove",function(){
function getProfessorData(){
	$.get("/ajax/professor/info/" + userid, function($data) {
	if ($data.success) {
		console.log($data)
		
	}
	});
}

src/main/webapp/js/workindex.js

@@ -12,10 +12,11 @@ $(function(){
			$("#nameS").text(data.data.name);
			$("#allConsultCount").text(data.data.consultCount);
			if(data.data.authentication){
				$(".modifyicon")[0].src="modifyicon"
				$(".modifyicon")[0].src="images/rz.png"
			}
			else{
				$(".modifyicon").hide();
				$(".modifyicon")[0].src="images/rz.png";
				$(".modifyicon").css("background","rgba(0,0,0,0.2)")
			}
			if(data.data.office) {
				$("#office").text(data.data.office+",");
@@ -816,6 +817,11 @@ $(function(){
								+ newConsultData["createTime"].substr(8,2)+ ":" +newConsultData["createTime"].substr(10,2));
						$("#myFlatConsultTitle").html(newConsultData["consultTitle"]);
						$("#myFlatConsultContent").html(newConsultData["consultContant"]);
						if(response.data.professor.hasHeadImage){
							$("#proImage").attr("src","images/head/"+response.data.professor.id+"_m.jpg");
						}else{
							$("#proImage").attr("src","images/default-photo.jpg");
						}
					}
					else {
						$("#wbcon1").empty("");
@@ -873,6 +879,11 @@ $(function(){
						$("#myFlatRelpyTitle").html(newReplyData["consult"]["consultTitle"]);
						
						$("#myFlatRelpyContent").html(newReplyData["tidingsContant"]);
						if(response.data.professor.hasHeadImage){
							$("#proreplayImage").attr("src","images/head/"+response.data.professor.id+"_m.jpg");
						}else{
							$("#proreplayImage").attr("src","images/default-photo.jpg");
						}
					}
					else {		$("#wbcon2").empty("")
							var height=$("#wbcon1").height();							

src/main/webapp/workindex.html

@@ -45,7 +45,7 @@
                    <div class="worktit">最新咨询<a class="worklinkbtn floatR" id="lookAllConsult">查看全部</a></div>
                    <div class="wbcon" id="wbcon1">
                        <div class="leftwb floatL">
                            <a href="" class="wbimg"><img src="images/default-photo.jpg" width="100%" height="100%"></a>
                            <a href="" class="wbimg"><img src="" width="100%" height="100%" id="proImage"></a>
                            <p id="myFlatProName">专家姓名</p>
                            <p id="myFlatProTitle"><span id="myReplyProOffice"></span><span id="myReplyProTitle"></span></p>
                            <p id="myFlatProDepartment"><span id="myReplyProDepartment"></span><span id="myReplyProOrgName"></p>
@@ -70,7 +70,7 @@
                    <div class="worktit">最新回复<a class="worklinkbtn floatR" id="lookAllReply">查看全部</a></div>
                    <div class="wbcon" id="wbcon2">
                        <div class="leftwb floatL">
                            <a href="" class="wbimg"><img src="images/default-photo.jpg" width="100%" height="100%"></a>
                            <a href="" class="wbimg"><img src="" width="100%" height="100%" id="proreplayImage"></a>
                            <p id="myFlatReplyProName">专家姓名</p>
                            <p id="myFlatReplyProTitle"><span id="myProOffice"></span><span id="myProTitle"></span></p>
                            <p id="myFlatReplyProDepartment"><span id="myProDepartment"></span><span id="myProOrgName"></p>