Parcourir la Source

历史评价调整,搜索资源加上标点符号,三中身份模块调整

jack 8 ans auparavant
Parent
commit
796932bcfa

+ 4 - 5
src/main/webapp/information.html

@ -58,8 +58,7 @@
58 58
					</div>
59 59
					<div class="head-center">
60 60
						<div class="infor-browse" style="padding:10px;">
61
							<a class="named proName" id="nameS"></a>
62
							<a href="#" class="modify proModify"></a>
61
							<a class="named proName" id="nameS"></a>							
63 62
							<a class="edit proEdit"></a>
64 63
							<div class="position proPosition"><span id="office"></span ><span id="titleS"></span ></div>				
65 64
		                    <div class="science proScience"><span id="industryS"></span ><span id="orgNameS"></span ></div>			
@ -72,7 +71,7 @@
72 71
								<input type="text" class="input-txt name" id="name">
73 72

74 73
							</div>
75
							<div class="infor">
74
							<div class="infor" id="titleNone">
76 75
								<span><em class="emspace">职</em>称</span>
77 76
								<div class="divselect">
78 77
									<input class="input-txt" type="text" value="" id="title" />
@ -81,9 +80,9 @@
81 80
								<input type="text" class="input-txt" id="officeRevise">
82 81
							</div>
83 82
							<div class="infor">
84
		                   		<span class="txtType"><b class="required_star"></b>所在机构</span>
83
		                   		<span class="txtType"><b class="required_star"></b><a id="orgUpdata">所在机构</a></span>
85 84
		                        <input type="text" class="input-txt" id="orgName">
86
		                        <span>所属部门</span>
85
		                        <span id="departmentUpdata">所属部门</span>
87 86
		                        <input type="text" class="input-txt" id="department">
88 87
		                        
89 88
		                    </div>

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

@ -304,7 +304,10 @@ loginStatus();//读取用户头像
304 304
	    				console.log($data);
305 305
	    				var $info = $data.data;
306 306
						if ($info) {
307
							
307
							if($info.authentication == 3){					
308
								$("#office").hide();
309
								$("#titleS").hide();	
310
							}
308 311
							//修改浏览器title信息
309 312
							if($info.title){
310 313
								var qtitle = " - "+$info.title;
@ -862,8 +865,7 @@ var resou;
862 865
                      add+='</div>'
863 866
                      add+='<div class="righteva">'
864 867
                      add+='<ul class="evasort">'                     
865
                      add+='<li>咨询时间:<span>'+assessTime+'</span></li>'
866
                      add+='<li>咨询主题:<span>'+$data[i].consultTitle+'</span></li>'
868
                      add+='<li>咨询时间:<span>'+assessTime+'</span></li>'                     
867 869
                      add+='</ul>'                      
868 870
                      add+='<div class="evastarbox" id="evastarboxx">'
869 871
                           add+='<span class="evastar"></span>'
@ -881,6 +883,7 @@ var resou;
881 883
                $(".shareabout2").append($add);
882 884
                 $add.find(".evastar:lt("+$data[i].assessStar+")").addClass('staspan');     
883 885
               }
886
				$(".evaluate2").eq($data.length-1).css("border-bottom","none");
884 887
			}
885 888
		}
886 889
})	

+ 11 - 5
src/main/webapp/js/information.js

@ -506,13 +506,19 @@ $.get("/ajax/professor/info/" + userid, function($data) {
506 506
	if ($data.success) {
507 507
		console.log($data);
508 508
		var $info = $data.data;
509
		if ($info) {
510
			
511
			if($info.authentication==false) {
512
				$(".modify").css("background-image","url(../images/icon-unauth.png)");
513
			}
509
		if ($info) {			
514 510
			//展示专家的信息
515 511
			$("#nameS").text($info.name);
512
			if($info.authentication == 2){
513
				$("#orgUpdata").text("所在企业")
514
			}
515
			if($info.authentication == 3){
516
				$("#orgUpdata").text("所在高校");
517
				$("#departmentUpdata").text("所属院系");
518
				$("#titleNone").hide();
519
				$("#office").hide()
520
				$("#titleS").hide();	
521
			}
516 522
			if($info.office) {
517 523
				if($info.title) {
518 524
					$("#office").text($info.office+",");

+ 17 - 1
src/main/webapp/js/search.js

@ -247,7 +247,23 @@ $(function(){
247 247
 			                 if($da[i].professor.orgName==undefined){
248 248
 			                	$da[i].professor.orgName="";
249 249
			                   }
250
 			                add+='<div style="clear:both"></div><div class="positionbox">'+$da[i].professor.title+$da[i].professor.department+$da[i].professor.orgName+'</div>'
250
 			                add+='<div style="clear:both"></div><div class="positionbox">'
251
 			                	if($da[i].professor.title&&$da[i].professor.department&&$da[i].professor.orgName){
252
 			                		add+=$da[i].professor.title+","+$da[i].professor.department+","+$da[i].professor.orgName;
253
 			                	}else if(!$da[i].professor.title&&$da[i].professor.department&&$da[i].professor.orgName){
254
 			                		add+=$da[i].professor.department+","+$da[i].professor.orgName;
255
 			                	}else if($da[i].professor.title&&!$da[i].professor.department&&$da[i].professor.orgName){
256
 			                		add+=$da[i].professor.title+","+$da[i].professor.orgName;
257
 			                	}else if($da[i].professor.title&&$da[i].professor.department&&!$da[i].professor.orgName){
258
 			                		add+=$da[i].professor.title+","+$da[i].professor.department;
259
 			                	}else if(!$da[i].professor.title&&!$da[i].professor.department&&$da[i].professor.orgName){
260
 			                		add+=$da[i].professor.orgName
261
 			                	}else if(!$da[i].professor.title&&$da[i].professor.department&&!$da[i].professor.orgName){
262
 			                		add+=$da[i].professor.department
263
 			                	}else if($da[i].professor.title&&!$da[i].professor.department&&!$da[i].professor.orgName){
264
 			                		add+=$da[i].professor.title
265
 			                	}			                	
266
 			                	add+='</div>'
251 267
 			                    if($da[i].subject)
252 268
 			                    {
253 269
 			                    	add+='<div class="ellipsisbox sciencebox"><p>学术领域:'+$da[i].subject+'</p></div>'