鹏涛:

专家搜索页面的图片兼容问题，标点符号问题，搜索条件没有更多就隐藏问题已经ok,认证问题ok,未显示部分隐藏问题ok,新的模块合作历史与评价ok;

src/main/webapp/css/index.css

@@ -94,7 +94,7 @@ input{ outline:none;}
.synopsis{ float:left; padding:20px 0;color:#000; width:800px;line-height:30px;}
.named{display:block;font-size:24px; color:#000; float:left;}
.named:hover,.named:focus,.named:active{color:#000; text-decoration:none;}
.modify{ display:block; width:46px; height:38px; background:url(../images/rz.png); float:left; margin-left:12px;}
.modify{ display:block; width:26px; height:26px; background:url(../images/onauth.png) center center no-repeat; background-size:100% 100%; float:left; margin:4px;}
.position{ clear:both;font-size:18px; }
.science{font-size:14px; }
.industry{font-size:16px; }
@@ -334,6 +334,6 @@ label.edu-radio{ float:none;font-size:16px;line-height:26px; color:#868686; }
.subuser{ overflow:hidden;}
.subuser li{ overflow:hidden; float:left; text-align:center; padding:10px; width:24%; list-style:none;}
.subuser li .evaimg{ display:block; width:60px; height:60px; overflow:hidden; border:1px solid #999; border-radius:50%; margin:auto;}
#evastarboxx .staspan{background: url(../images/evastar.png) 0 1px no-repeat;}

src/main/webapp/information-brow.html

@@ -205,54 +205,12 @@
					<div class="right-title"><span>合作历史及评价</span>    </div>
					<div class="infor-browse">
						<div class="shareabout">
                        	<div class="evaluate">
                            	<div class="lefteva">
                                    <a href="" class="evaimg"><img src="" width="100%" height="100%"></a>
                                    <p>专家姓名</p>
                                    <p>职称，职位</p>
                                    <p>XXX学校，XXX机构</p>
                                </div>
                                <div class="righteva">
                                	<ul class="evasort">
                                   		<li>咨询时间：<span>2016-09-06</span></li>
                                        <li>咨询主题：<span>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo co Proin gravida dolor sit amet lacus accumsa</span></li>
                                    </ul>
                                    <div class="evastarbox">
                                        <span class="evastar"></span>
                                        <span class="evastar"></span>
                                        <span class="evastar"></span>
                                        <span class="evastar"></span>
                                        <span class="evastar"></span>
                                    </div>
                                    <p class="evabrief">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo co Proin gravida dolor sit amet lacus accumsan etiverra justo co Proin gravida dolor sit amet lacus accumsan et iverra justo co Proin gravida dolor sit amet lacus accumsan et iverra justo co Proin gravida dolor sit amet lacus accumsan et  </p>
                                </div>
                            </div>
                           	<div class="evaluate">
                            	<div class="lefteva">
                                    <a href="" class="evaimg"><img src="" width="100%" height="100%"></a>
                                    <p>专家姓名</p>
                                    <p>职称，职位</p>
                                    <p>XXXX学校，XXX机构</p>
                                </div>
                                <div class="righteva">
                                	<ul class="evasort">
                                    	<li>合作时间：<span>2016-09-07</span></li>
                                        <li>合作资源：<span>XXXXXX</span></li>
                                    	<li>合作内容：<span>关于立体罗伟中关于立体罗伟中关于立体罗伟中关于立体罗伟中关于立体罗伟中关于立体罗伟中</span></li>
                                    </ul>
                                    <div class="evastarbox">
                                        <span class="evastar"></span>
                                        <span class="evastar"></span>
                                        <span class="evastar"></span>
                                        <span class="evastar"></span>
                                        <span class="evastar"></span>
                                    </div>
                                    <p class="evabrief">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo co Proin gravida dolor sit amet lacus accumsan etiverra justo co Proin gravida dolor sit amet lacus accumsan et iverra justo co Proin gravida dolor sit amet lacus accumsan et iverra justo co Proin gravida dolor sit amet lacus accumsan et  </p>
                                </div>
                            </div>
                            <div class="morebtn"><a href="" class="morelink">更多记录 >></a></div>
                        	
                        
                        </div>
                        
					</div>
					
				</div>
                
			</div>

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

@@ -242,6 +242,10 @@ loginStatus();//读取用户头像
						var $info = $data.data;
						if ($info) {
							//展示专家的信息
							console.log($data);
							if($info.authentication==false) {
								$(".modify").css("background-image","url(../images/icon-unauth.png)");
							}
							$("#nameS").text($info.name);
							if($info.office) {
								$("#office").text($info.office+"，");
@@ -425,15 +429,16 @@ $(".subsidebar").click(function(){
			},1000); 
		 
		 })
var resou;
//科研资源
	$.ajax({		
		"url":"/ajax/resource/qapro",
		"type":"get",
		"data":{"professorId":professorId},
		"async": true,
		"async": false,
		"success":function(data){
//			console.log(data);
			resou=data.data.length;
			if(data.data.length==0){
				$("#infor-browse").css("display","none");
				$(".resoubtn").css("display","none");
@@ -668,7 +673,7 @@ $(".subsidebar").click(function(){
	var userid = $.cookie("userid");//登陆人id====重复代码
 	var professorId = GetQueryString("professorId");//专家id====重复代码
	//点击科研资源的咨询
 	$("#consultbtn").bind('click',consultHandler);	
 	$("#consultbtn,#conbtn").bind('click',consultHandler);	
	
 	
@@ -690,8 +695,77 @@ $(".subsidebar").click(function(){
			$.MsgBox.Alert("message","请登录");
		}
	};
	
	//合作历史及评价
	var ass;
	$.ajax({		
		"url":"/ajax/consult/pqAssessHis",
		"type":"get",
		"data":{"professorId":professorId},
		"async": false,
		"success":function(response) {		
			if(response.success) {				
				var $data=response.data.data;
				ass=$data.length;
				if($data.length==0) {
					$("span:contains('合作历史及评价')").parents(".introduction").hide();
					$("a:contains('合作历史及评价')").hide();
				}
				for(var i=0;i<$data.length;i++) {									
				var add="";								
				 var assessTime=$data[i]["assessTime"].substr(0,4) + "-" +  $data[i].assessTime.substr(4,2) + "-" +  $data[i].assessTime.substr(6,2) + " "
				+  $data[i].assessTime.substr(8,2)+ ":" + $data[i].assessTime.substr(10,2);
				add+='<div class="evaluate">'
                	add+='<div class="lefteva">'
                      add+='<a  class="evaimg">'
                    if($data[i].professor.hasHeadImage) {
                    	add+='<img src="/images/head/'+$data[i].professor.id+'_m.jpg" width="100%" height="100%">'
                    }else{
                    	add+='<img src="/images/default-photo.jpg" width="100%" height="100%">'
                    }
                      
                      add+='</a>'
                      add+='<p>'+$data[i].professor.name+'</p><p>'
//                      if($data[i].professor.office) {
//                      	 add+='<span>'+$data[i].professor.office+' ，</span>'
//                      }
//                     if($data[i].professor.title) {
//                     	 add+='<span>'+$data[i].professor.title+'</span>'
//                     }                     
                      add+='</p><p>'
//                      if($data[i].professor.department) {
//                      	 add+='<span>'+$data[i].professor.department+' ，</span>'
//                      }
//                     if($data[i].professor.orgName) {
//                     		add+='<span>'+$data[i].professor.orgName+'</span>'
//                     }                            
                      add+='</p>'
                      add+='</div>'
                      add+='<div class="righteva">'
                      add+='<ul class="evasort">'                     
                      add+='<li>咨询时间：<span>'+assessTime+'</span></li>'
                      add+='<li>咨询主题：<span>'+$data[i].consultTitle+'</span></li>'
                      add+='</ul>'                      
                      add+='<div class="evastarbox" id="evastarboxx">'
                           add+='<span class="evastar"></span>'
                           add+='<span class="evastar"></span>'
                           add+='<span class="evastar"></span>'
                           add+='<span class="evastar"></span>'
                           add+='<span class="evastar"></span>'
                      add+='</div>'
                      if($data[i].assessContant){
                      	 add+='<p class="evabrief">'+$data[i].assessContant+' </p>'
                      }                             
                      add+='</div>'
                add+='</div>'
                	var $add=$(add);
                $(".shareabout").append($add);
                 $add.find(".evastar:lt("+$data[i].assessStar+")").addClass('staspan');     
               }
			}
		}
})	
if(resou==0&&ass==0){
	$('div:contains("合作机会")').parents(".menublock").hide();
}
})

src/main/webapp/js/search.js

@@ -20,18 +20,24 @@ $(function(){
 		{ 			
 			if(c==0)
 			{
 				$.ajax({"url" : "/ajax/professor/pq",
 				$.ajax({"url" : "/ajax/professor/pqBaseInfo",
					"type" : "GET",
					"data" : {"key":key,"subject":subject,"industry":industry,"pageSize":pageSize,"pageNo":pageNo,"address":add},
					"contentType" : "application/x-www-form-urlencoded",
					"success" : function($data) {							
						if ($data.success) {
//							console.log($data);
							console.log($data);
							$("#professorList").html("");
							for(var i = 0 ; i < $data.data.data.length ; i++){
								//创建HTML标签  
								var dataHtml = "<div class='item'>";									
								dataHtml += "<a  class='infoi'  href='information-brow.html?professorId="+$data.data.data[i].id+"' ><div class='photo1'><img class='images' style='width:100%;'  src='/images/head/"+$data.data.data[i].id+"_l.jpg'/></div></a>";
								dataHtml += "<a  class='infoi'  href='information-brow.html?professorId="+$data.data.data[i].id+"' ><div class='photo1'>"
								if($data.data.data[i].hasHeadImage) {
									dataHtml += "<img class='images' style='width:100%;'  src='/images/head/"+$data.data.data[i].id+"_l.jpg'/></div></a>";
								}
								else {
									dataHtml += "<img class='images' style='width:100%;'  src='/images/default-photo.jpg'/></div></a>";
								}
								dataHtml += "<div class='synopsis'>";
								dataHtml += "<a href='information-brow.html?professorId="+$data.data.data[i].id+"' class='named'>";
								if(typeof($data.data.data[i].name) !== "undefined"){
@@ -39,15 +45,21 @@ $(function(){
								}
								dataHtml += "</a><a href='information-brow.html?professorId="+$data.data.data[i].id+"' class='modify'></a>";
								dataHtml += "<div class='position'>";
								if(typeof($data.data.data[i].title) !== "undefined"){
									dataHtml += $data.data.data[i].title;
								if($data.data.data[i].office){
									dataHtml += $data.data.data[i].office+", ";
								}
								if($data.data.data[i].title){
									dataHtml += $data.data.data[i].title+", ";
								}								
								if($data.data.data[i].department){
									dataHtml += $data.data.data[i].department+", ";
								}
								dataHtml += ",";
								if(typeof($data.data.data[i].department) !== "undefined"){
									dataHtml += $data.data.data[i].department;
								if($data.data.data[i].orgName){
									dataHtml += $data.data.data[i].orgName;
								}	
								if($data.data.data[i].address){
									dataHtml += " | "+$data.data.data[i].address;
								}
								dataHtml += ",";
								dataHtml += $data.data.data[i].organization.name;
								dataHtml += "</div>";
								dataHtml += "<div class='science'>";
								if(typeof($data.data.data[i].subject) !== "undefined"){
@@ -58,24 +70,22 @@ $(function(){
								if(typeof($data.data.data[i].industry) !== "undefined"){
									dataHtml += $data.data.data[i].industry;
								}
								if(typeof($data.data.data[i].address) !== "undefined"){
									dataHtml +=	"<p>"+$data.data.data[i].address+"</p>";
								if($data.data.data[i].researchAreas.length ){								
									dataHtml +=	"<p>"+$data.data.data[i].researchAreas[0].caption+"</p>";
									console.log($data.data.data[i].researchAreas[0].caption);
								}
					
								dataHtml += "</div>";
								dataHtml += "</div>";	
								dataHtml += "<div class='operbox'><span class='operbtn onlyConsultbtn' id='"+$data.data.data[i]['id']+"'>咨询</span></div>";
								
								$("#professorList").append(dataHtml);
							
								//获取头像		
								$(".images").load(function(){								
								})
								.error(function(){
									$(this).attr("src","/images/default-photo.jpg");
								});	
								dataHtml += "</div>";
								if($data.data.data[i].id!=userid){
									dataHtml += "<div class='operbox'><span class='operbtn onlyConsultbtn' id='"+$data.data.data[i]['id']+"'>咨询</span></div>";
								}
								
								
								$("#professorList").append(dataHtml);
								if($data.data.data[i].authentication==false) {
									$(".modify").eq(i).css("background-image","url(../images/icon-unauth.png)")
								}
								//点击查看当前信息
								(function(i){
									$('.photo1').click(function()
@@ -204,6 +214,9 @@ $(function(){
 		var subjectList = function (){
 			$.get("../ajax/dataDict/"+sub,function(data){ 			
    			if(data.success){
    				if(data.data.length <=10) {
    					$(".andmore").eq(0).hide();
    				} 
    				$("#subject").find(".sub").remove();
    				for(var i = 0 ; i < data.data.length; i++){
    					$("#subject").append("<a href='#' class='sub'title='"+data.data[i].caption+"'>"+data.data[i].caption+"</a>");	
@@ -217,7 +230,10 @@ $(function(){
 		}
 		var Address = function (){
 			$.get("../ajax/dataDict/PRO_ADDRESS",function(data){ 			
    			if(data.success){    				
    			if(data.success){  
    				if(data.data.length <=10) {
    					$(".andmore").eq(2).hide();
    				} 
    				for(var i = 0 ; i < data.data.length; i++){
    					$("#address").append("<a href='#' title='"+data.data[i].caption+"'>"+data.data[i].caption+"</a>");	
    					if(i>20)
@@ -231,6 +247,9 @@ $(function(){
 		var industryList = function (){
 			$.get("../ajax/dataDict/"+indu,function(data){ 			
    			if(data.success){
    				if(data.data.length <=10) {
    					$(".andmore").eq(1).hide();
    				} 
    				$("#industry").find(".indu").remove();
    				for(var i = 0 ; i < data.data.length; i++){
    					$("#industry").append("<a href='#' class='indu'title='"+data.data[i].caption+"'>"+data.data[i].caption+"</a>");	

src/main/webapp/js/workindex.js

@@ -12,11 +12,11 @@ $(function(){
			$("#nameS").text(data.data.name);
			$("#allConsultCount").text(data.data.consultCount);
			if(data.data.authentication){
				$(".modifyicon")[0].src="images/rz.png"
				$(".modifyicon")[0].src="/images/onauth.png"
			}
			else{
				$(".modifyicon")[0].src="images/rz.png";
				$(".modifyicon").css("background","rgba(0,0,0,0.2)")
				$(".modifyicon")[0].src="/images/icon-unauth.png";
				
			}
			if(data.data.office) {
				$("#office").text(data.data.office+",");