Browse Source

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

xiaoai_123 8 years ago
parent
commit
4991514173

+ 2 - 2
src/main/webapp/css/index.css

94
.synopsis{ float:left; padding:20px 0;color:#000; width:800px;line-height:30px;}
94
.synopsis{ float:left; padding:20px 0;color:#000; width:800px;line-height:30px;}
95
.named{display:block;font-size:24px; color:#000; float:left;}
95
.named{display:block;font-size:24px; color:#000; float:left;}
96
.named:hover,.named:focus,.named:active{color:#000; text-decoration:none;}
96
.named:hover,.named:focus,.named:active{color:#000; text-decoration:none;}
97
.modify{ display:block; width:46px; height:38px; background:url(../images/rz.png); float:left; margin-left:12px;}
97
.modify{ display:block; width:26px; height:26px; background:url(../images/onauth.png) center center no-repeat; background-size:100% 100%; float:left; margin:4px;}
98
.position{ clear:both;font-size:18px; }
98
.position{ clear:both;font-size:18px; }
99
.science{font-size:14px; }
99
.science{font-size:14px; }
100
.industry{font-size:16px; }
100
.industry{font-size:16px; }
334
.subuser{ overflow:hidden;}
334
.subuser{ overflow:hidden;}
335
.subuser li{ overflow:hidden; float:left; text-align:center; padding:10px; width:24%; list-style:none;}
335
.subuser li{ overflow:hidden; float:left; text-align:center; padding:10px; width:24%; list-style:none;}
336
.subuser li .evaimg{ display:block; width:60px; height:60px; overflow:hidden; border:1px solid #999; border-radius:50%; margin:auto;}
336
.subuser li .evaimg{ display:block; width:60px; height:60px; overflow:hidden; border:1px solid #999; border-radius:50%; margin:auto;}
337

337
#evastarboxx .staspan{background: url(../images/evastar.png) 0 1px no-repeat;}
338

338

339

339


+ 4 - 46
src/main/webapp/information-brow.html

205
					<div class="right-title"><span>合作历史及评价</span>    </div>
205
					<div class="right-title"><span>合作历史及评价</span>    </div>
206
					<div class="infor-browse">
206
					<div class="infor-browse">
207
						<div class="shareabout">
207
						<div class="shareabout">
208
                        	<div class="evaluate">
209
                            	<div class="lefteva">
210
                                    <a href="" class="evaimg"><img src="" width="100%" height="100%"></a>
211
                                    <p>专家姓名</p>
212
                                    <p>职称,职位</p>
213
                                    <p>XXX学校,XXX机构</p>
214
                                </div>
215
                                <div class="righteva">
216
                                	<ul class="evasort">
217
                                   		<li>咨询时间:<span>2016-09-06</span></li>
218
                                        <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>
219
                                    </ul>
220
                                    <div class="evastarbox">
221
                                        <span class="evastar"></span>
222
                                        <span class="evastar"></span>
223
                                        <span class="evastar"></span>
224
                                        <span class="evastar"></span>
225
                                        <span class="evastar"></span>
226
                                    </div>
227
                                    <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>
228
                                </div>
229
                            </div>
230
                           	<div class="evaluate">
231
                            	<div class="lefteva">
232
                                    <a href="" class="evaimg"><img src="" width="100%" height="100%"></a>
233
                                    <p>专家姓名</p>
234
                                    <p>职称,职位</p>
235
                                    <p>XXXX学校,XXX机构</p>
236
                                </div>
237
                                <div class="righteva">
238
                                	<ul class="evasort">
239
                                    	<li>合作时间:<span>2016-09-07</span></li>
240
                                        <li>合作资源:<span>XXXXXX</span></li>
241
                                    	<li>合作内容:<span>关于立体罗伟中关于立体罗伟中关于立体罗伟中关于立体罗伟中关于立体罗伟中关于立体罗伟中</span></li>
242
                                    </ul>
243
                                    <div class="evastarbox">
244
                                        <span class="evastar"></span>
245
                                        <span class="evastar"></span>
246
                                        <span class="evastar"></span>
247
                                        <span class="evastar"></span>
248
                                        <span class="evastar"></span>
249
                                    </div>
250
                                    <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>
251
                                </div>
252
                            </div>
253
                            <div class="morebtn"><a href="" class="morelink">更多记录 >></a></div>
208
                        	
209
                        
254
                        </div>
210
                        </div>
211
                        
255
					</div>
212
					</div>
213
					
256
				</div>
214
				</div>
257
                
215
                
258
			</div>
216
			</div>

+ 80 - 6
src/main/webapp/js/information.brow.js

242
						var $info = $data.data;
242
						var $info = $data.data;
243
						if ($info) {
243
						if ($info) {
244
							//展示专家的信息
244
							//展示专家的信息
245
							console.log($data);
246
							if($info.authentication==false) {
247
								$(".modify").css("background-image","url(../images/icon-unauth.png)");
248
							}
245
							$("#nameS").text($info.name);
249
							$("#nameS").text($info.name);
246
							if($info.office) {
250
							if($info.office) {
247
								$("#office").text($info.office+",");
251
								$("#office").text($info.office+",");
425
			},1000); 
429
			},1000); 
426
		 
430
		 
427
		 })
431
		 })
428

432
var resou;
429
//科研资源
433
//科研资源
430
	$.ajax({		
434
	$.ajax({		
431
		"url":"/ajax/resource/qapro",
435
		"url":"/ajax/resource/qapro",
432
		"type":"get",
436
		"type":"get",
433
		"data":{"professorId":professorId},
437
		"data":{"professorId":professorId},
434
		"async": true,
438
		"async": false,
435
		"success":function(data){
439
		"success":function(data){
436
//			console.log(data);
440
//			console.log(data);
441
			resou=data.data.length;
437
			if(data.data.length==0){
442
			if(data.data.length==0){
438
				$("#infor-browse").css("display","none");
443
				$("#infor-browse").css("display","none");
439
				$(".resoubtn").css("display","none");
444
				$(".resoubtn").css("display","none");
668
	var userid = $.cookie("userid");//登陆人id====重复代码
673
	var userid = $.cookie("userid");//登陆人id====重复代码
669
 	var professorId = GetQueryString("professorId");//专家id====重复代码
674
 	var professorId = GetQueryString("professorId");//专家id====重复代码
670
	//点击科研资源的咨询
675
	//点击科研资源的咨询
671
 	$("#consultbtn").bind('click',consultHandler);	
676
 	$("#consultbtn,#conbtn").bind('click',consultHandler);	
672
	
677
	
673

678

674
 	
679
 	
690
			$.MsgBox.Alert("message","请登录");
695
			$.MsgBox.Alert("message","请登录");
691
		}
696
		}
692
	};
697
	};
693
	
694

695

698
	//合作历史及评价
699
	var ass;
700
	$.ajax({		
701
		"url":"/ajax/consult/pqAssessHis",
702
		"type":"get",
703
		"data":{"professorId":professorId},
704
		"async": false,
705
		"success":function(response) {		
706
			if(response.success) {				
707
				var $data=response.data.data;
708
				ass=$data.length;
709
				if($data.length==0) {
710
					$("span:contains('合作历史及评价')").parents(".introduction").hide();
711
					$("a:contains('合作历史及评价')").hide();
712
				}
713
				for(var i=0;i<$data.length;i++) {									
714
				var add="";								
715
				 var assessTime=$data[i]["assessTime"].substr(0,4) + "-" +  $data[i].assessTime.substr(4,2) + "-" +  $data[i].assessTime.substr(6,2) + " "
716
				+  $data[i].assessTime.substr(8,2)+ ":" + $data[i].assessTime.substr(10,2);
717
				add+='<div class="evaluate">'
718
                	add+='<div class="lefteva">'
719
                      add+='<a  class="evaimg">'
720
                    if($data[i].professor.hasHeadImage) {
721
                    	add+='<img src="/images/head/'+$data[i].professor.id+'_m.jpg" width="100%" height="100%">'
722
                    }else{
723
                    	add+='<img src="/images/default-photo.jpg" width="100%" height="100%">'
724
                    }
725
                      
726
                      add+='</a>'
727
                      add+='<p>'+$data[i].professor.name+'</p><p>'
728
//                      if($data[i].professor.office) {
729
//                      	 add+='<span>'+$data[i].professor.office+' ,</span>'
730
//                      }
731
//                     if($data[i].professor.title) {
732
//                     	 add+='<span>'+$data[i].professor.title+'</span>'
733
//                     }                     
734
                      add+='</p><p>'
735
//                      if($data[i].professor.department) {
736
//                      	 add+='<span>'+$data[i].professor.department+' ,</span>'
737
//                      }
738
//                     if($data[i].professor.orgName) {
739
//                     		add+='<span>'+$data[i].professor.orgName+'</span>'
740
//                     }                            
741
                      add+='</p>'
742
                      add+='</div>'
743
                      add+='<div class="righteva">'
744
                      add+='<ul class="evasort">'                     
745
                      add+='<li>咨询时间:<span>'+assessTime+'</span></li>'
746
                      add+='<li>咨询主题:<span>'+$data[i].consultTitle+'</span></li>'
747
                      add+='</ul>'                      
748
                      add+='<div class="evastarbox" id="evastarboxx">'
749
                           add+='<span class="evastar"></span>'
750
                           add+='<span class="evastar"></span>'
751
                           add+='<span class="evastar"></span>'
752
                           add+='<span class="evastar"></span>'
753
                           add+='<span class="evastar"></span>'
754
                      add+='</div>'
755
                      if($data[i].assessContant){
756
                      	 add+='<p class="evabrief">'+$data[i].assessContant+' </p>'
757
                      }                             
758
                      add+='</div>'
759
                add+='</div>'
760
                	var $add=$(add);
761
                $(".shareabout").append($add);
762
                 $add.find(".evastar:lt("+$data[i].assessStar+")").addClass('staspan');     
763
               }
764
			}
765
		}
766
})	
767
if(resou==0&&ass==0){
768
	$('div:contains("合作机会")').parents(".menublock").hide();
769
}
696
})
770
})
697

771


+ 43 - 24
src/main/webapp/js/search.js

20
 		{ 			
20
 		{ 			
21
 			if(c==0)
21
 			if(c==0)
22
 			{
22
 			{
23
 				$.ajax({"url" : "/ajax/professor/pq",
23
 				$.ajax({"url" : "/ajax/professor/pqBaseInfo",
24
					"type" : "GET",
24
					"type" : "GET",
25
					"data" : {"key":key,"subject":subject,"industry":industry,"pageSize":pageSize,"pageNo":pageNo,"address":add},
25
					"data" : {"key":key,"subject":subject,"industry":industry,"pageSize":pageSize,"pageNo":pageNo,"address":add},
26
					"contentType" : "application/x-www-form-urlencoded",
26
					"contentType" : "application/x-www-form-urlencoded",
27
					"success" : function($data) {							
27
					"success" : function($data) {							
28
						if ($data.success) {
28
						if ($data.success) {
29
//							console.log($data);
29
							console.log($data);
30
							$("#professorList").html("");
30
							$("#professorList").html("");
31
							for(var i = 0 ; i < $data.data.data.length ; i++){
31
							for(var i = 0 ; i < $data.data.data.length ; i++){
32
								//创建HTML标签  
32
								//创建HTML标签  
33
								var dataHtml = "<div class='item'>";									
33
								var dataHtml = "<div class='item'>";									
34
								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>";
34
								dataHtml += "<a  class='infoi'  href='information-brow.html?professorId="+$data.data.data[i].id+"' ><div class='photo1'>"
35
								if($data.data.data[i].hasHeadImage) {
36
									dataHtml += "<img class='images' style='width:100%;'  src='/images/head/"+$data.data.data[i].id+"_l.jpg'/></div></a>";
37
								}
38
								else {
39
									dataHtml += "<img class='images' style='width:100%;'  src='/images/default-photo.jpg'/></div></a>";
40
								}
35
								dataHtml += "<div class='synopsis'>";
41
								dataHtml += "<div class='synopsis'>";
36
								dataHtml += "<a href='information-brow.html?professorId="+$data.data.data[i].id+"' class='named'>";
42
								dataHtml += "<a href='information-brow.html?professorId="+$data.data.data[i].id+"' class='named'>";
37
								if(typeof($data.data.data[i].name) !== "undefined"){
43
								if(typeof($data.data.data[i].name) !== "undefined"){
39
								}
45
								}
40
								dataHtml += "</a><a href='information-brow.html?professorId="+$data.data.data[i].id+"' class='modify'></a>";
46
								dataHtml += "</a><a href='information-brow.html?professorId="+$data.data.data[i].id+"' class='modify'></a>";
41
								dataHtml += "<div class='position'>";
47
								dataHtml += "<div class='position'>";
42
								if(typeof($data.data.data[i].title) !== "undefined"){
43
									dataHtml += $data.data.data[i].title;
48
								if($data.data.data[i].office){
49
									dataHtml += $data.data.data[i].office+", ";
50
								}
51
								if($data.data.data[i].title){
52
									dataHtml += $data.data.data[i].title+", ";
53
								}								
54
								if($data.data.data[i].department){
55
									dataHtml += $data.data.data[i].department+", ";
44
								}
56
								}
45
								dataHtml += ",";
46
								if(typeof($data.data.data[i].department) !== "undefined"){
47
									dataHtml += $data.data.data[i].department;
57
								if($data.data.data[i].orgName){
58
									dataHtml += $data.data.data[i].orgName;
59
								}	
60
								if($data.data.data[i].address){
61
									dataHtml += " | "+$data.data.data[i].address;
48
								}
62
								}
49
								dataHtml += ",";
50
								dataHtml += $data.data.data[i].organization.name;
51
								dataHtml += "</div>";
63
								dataHtml += "</div>";
52
								dataHtml += "<div class='science'>";
64
								dataHtml += "<div class='science'>";
53
								if(typeof($data.data.data[i].subject) !== "undefined"){
65
								if(typeof($data.data.data[i].subject) !== "undefined"){
58
								if(typeof($data.data.data[i].industry) !== "undefined"){
70
								if(typeof($data.data.data[i].industry) !== "undefined"){
59
									dataHtml += $data.data.data[i].industry;
71
									dataHtml += $data.data.data[i].industry;
60
								}
72
								}
61
								if(typeof($data.data.data[i].address) !== "undefined"){
62
									dataHtml +=	"<p>"+$data.data.data[i].address+"</p>";
73
								if($data.data.data[i].researchAreas.length ){								
74
									dataHtml +=	"<p>"+$data.data.data[i].researchAreas[0].caption+"</p>";
75
									console.log($data.data.data[i].researchAreas[0].caption);
63
								}
76
								}
64
					
77
					
65
								dataHtml += "</div>";
78
								dataHtml += "</div>";
66
								dataHtml += "</div>";	
67
								dataHtml += "<div class='operbox'><span class='operbtn onlyConsultbtn' id='"+$data.data.data[i]['id']+"'>咨询</span></div>";
68
								
69
								$("#professorList").append(dataHtml);
70
							
71
								//获取头像		
72
								$(".images").load(function(){								
73
								})
74
								.error(function(){
75
									$(this).attr("src","/images/default-photo.jpg");
76
								});	
79
								dataHtml += "</div>";
80
								if($data.data.data[i].id!=userid){
81
									dataHtml += "<div class='operbox'><span class='operbtn onlyConsultbtn' id='"+$data.data.data[i]['id']+"'>咨询</span></div>";
82
								}
77
								
83
								
78
								
84
								
85
								$("#professorList").append(dataHtml);
86
								if($data.data.data[i].authentication==false) {
87
									$(".modify").eq(i).css("background-image","url(../images/icon-unauth.png)")
88
								}
79
								//点击查看当前信息
89
								//点击查看当前信息
80
								(function(i){
90
								(function(i){
81
									$('.photo1').click(function()
91
									$('.photo1').click(function()
204
 		var subjectList = function (){
214
 		var subjectList = function (){
205
 			$.get("../ajax/dataDict/"+sub,function(data){ 			
215
 			$.get("../ajax/dataDict/"+sub,function(data){ 			
206
    			if(data.success){
216
    			if(data.success){
217
    				if(data.data.length <=10) {
218
    					$(".andmore").eq(0).hide();
219
    				} 
207
    				$("#subject").find(".sub").remove();
220
    				$("#subject").find(".sub").remove();
208
    				for(var i = 0 ; i < data.data.length; i++){
221
    				for(var i = 0 ; i < data.data.length; i++){
209
    					$("#subject").append("<a href='#' class='sub'title='"+data.data[i].caption+"'>"+data.data[i].caption+"</a>");	
222
    					$("#subject").append("<a href='#' class='sub'title='"+data.data[i].caption+"'>"+data.data[i].caption+"</a>");	
217
 		}
230
 		}
218
 		var Address = function (){
231
 		var Address = function (){
219
 			$.get("../ajax/dataDict/PRO_ADDRESS",function(data){ 			
232
 			$.get("../ajax/dataDict/PRO_ADDRESS",function(data){ 			
220
    			if(data.success){    				
233
    			if(data.success){  
234
    				if(data.data.length <=10) {
235
    					$(".andmore").eq(2).hide();
236
    				} 
221
    				for(var i = 0 ; i < data.data.length; i++){
237
    				for(var i = 0 ; i < data.data.length; i++){
222
    					$("#address").append("<a href='#' title='"+data.data[i].caption+"'>"+data.data[i].caption+"</a>");	
238
    					$("#address").append("<a href='#' title='"+data.data[i].caption+"'>"+data.data[i].caption+"</a>");	
223
    					if(i>20)
239
    					if(i>20)
231
 		var industryList = function (){
247
 		var industryList = function (){
232
 			$.get("../ajax/dataDict/"+indu,function(data){ 			
248
 			$.get("../ajax/dataDict/"+indu,function(data){ 			
233
    			if(data.success){
249
    			if(data.success){
250
    				if(data.data.length <=10) {
251
    					$(".andmore").eq(1).hide();
252
    				} 
234
    				$("#industry").find(".indu").remove();
253
    				$("#industry").find(".indu").remove();
235
    				for(var i = 0 ; i < data.data.length; i++){
254
    				for(var i = 0 ; i < data.data.length; i++){
236
    					$("#industry").append("<a href='#' class='indu'title='"+data.data[i].caption+"'>"+data.data[i].caption+"</a>");	
255
    					$("#industry").append("<a href='#' class='indu'title='"+data.data[i].caption+"'>"+data.data[i].caption+"</a>");	

+ 3 - 3
src/main/webapp/js/workindex.js

12
			$("#nameS").text(data.data.name);
12
			$("#nameS").text(data.data.name);
13
			$("#allConsultCount").text(data.data.consultCount);
13
			$("#allConsultCount").text(data.data.consultCount);
14
			if(data.data.authentication){
14
			if(data.data.authentication){
15
				$(".modifyicon")[0].src="images/rz.png"
15
				$(".modifyicon")[0].src="/images/onauth.png"
16
			}
16
			}
17
			else{
17
			else{
18
				$(".modifyicon")[0].src="images/rz.png";
19
				$(".modifyicon").css("background","rgba(0,0,0,0.2)")
18
				$(".modifyicon")[0].src="/images/icon-unauth.png";
19
				
20
			}
20
			}
21
			if(data.data.office) {
21
			if(data.data.office) {
22
				$("#office").text(data.data.office+",");
22
				$("#office").text(data.data.office+",");