优先显示企业简称，没有简称再显示全称

用户信息相关时间显示，样式完善

css/genindex.css

@@ -621,7 +621,8 @@ div.zoomMask{position:absolute;background:url("../images/g-resource-mask.png") r
.coninfocon.listArea>ul>li{float: left;margin-right: 10px;margin-top:10px;border:1px solid #E5E5E5;border-radius: 20px;padding:2px 12px;}
/*教育背景类型列表*/
.coninfocon.listSector>ul{}
.coninfocon.listSector>ul>li{border-left: 2px solid #efefef;padding-left:16px;margin-left:6px;}
.coninfocon.listSector>ul>li{border-left: 2px solid #efefef;padding-top:4px;padding-bottom:4px;padding-left:16px;margin-left:6px;}
.updateLeft .coninfocon.listSector>ul>li{padding-top:0;padding-bottom:0;}
.coninfocon.listSector>ul>li .showBx{padding-top:6px;}
.coninfocon.listSector>ul>li .h4tit{position:relative;padding:2px 0;}
.coninfocon.listSector>ul>li .h4tit:before{content:"";position: absolute;left:-23px;top:8px;width:12px; height:12px;background:#ff9900;border-radius: 50%;}
@@ -708,6 +709,7 @@ div.zoomMask{position:absolute;background:url("../images/g-resource-mask.png") r
.updateLeft .coninfobox{padding-bottom: 30px;position: relative;}
.updateLeft .coninfobox:after{content:"";height: 1px;background:#E5E5E5;position: absolute;left:30px;right: 30px;bottom: 0;}
.updateLeft .coninfobox:last-child:after{content:none;}
.modifybox .form-result.keyResult{margin-top: -10px;}
.listnone1 .modifybox{margin-left:-25px;}
.showBx + .modifybox{margin-left: -25px;}

js/articalShow.js

@@ -289,7 +289,11 @@ $(function() {
							$itemlist.find(".authiconNew").addClass(userType.sty);
						}
						if(datalist.resourceType==2){
							$itemlist.find(".uname").text(datalist.organization.name);
							if(datalist.organization.forShort){
								$itemlist.find(".uname").text(datalist.organization.forShort);
							}else{
								$itemlist.find(".uname").text(datalist.organization.name);
							}
							if(datalist.organization.authStatus==3){
								$itemlist.find(".authiconNew").addClass("authicon-com-ok").attr("title", "认证企业");
							}
@@ -380,7 +384,11 @@ $(function() {
									"success" : function($data) {
										console.log($data)
										if ($data.success && $data.data){
											$itemlist.find(".username2").text($data.data.name);
											if($data.data.forShort){
												$itemlist.find(".username2").text($data.data.forShort);
											}else{
												$itemlist.find(".username2").text($data.data.name);
											}
											if($data.data.authStatus==3){
												$itemlist.find("#relatedLabels").addClass("authicon-com-ok").attr("title", "认证企业");
											}

js/information.js

@@ -26,7 +26,7 @@ $(function() {
					var oStyS=autho($info.authType,$info.orgAuth,$info.authStatus);
					$("#proAuth").addClass(oStyS.sty); $("#proAuth").attr("title",oStyS.title);
					if($info.address){
						$("#proAddress").html($info.address + "<span style='margin-right:10px;'></span>");
						$("#proAddress").html($info.address);
					}
					var proOther="";
					if($info.orgName){
@@ -63,8 +63,18 @@ $(function() {
					$("#orgName").val($info.orgName);
					$("#department").val($info.department);
					$("#officeRevise").val($info.office);
					$("#Province .mr_show").text($info.province);
					$("#City .mr_show").text($info.address);
					//省
					if(!$info.province){
						$("#Province .mr_show").text("请选择省/直辖市");
					}else{
						$("#Province .mr_show").text($info.province);
					}
					//市
					if(!$info.address){
						$("#City .mr_show").text("请选择城市");
					}else{
						$("#City .mr_show").text($info.address);
					}
					//省份城市颜色
					if($("#oprovince").text()=="请选择省/直辖市"){
						$("#oprovince").removeClass("mr_select");
@@ -129,27 +139,34 @@ $(function() {
		if(Str4.length>20){$.MsgBox.Alert("提示", "所在部门不得超过20个字");return;}
		
		var loginName=$("#mobilePhone").val();
		if(trim(loginName)){
			var hunPhone = /^1[3|4|5|7|8]\d{9}$/;
			if(!hunPhone.test(loginName.trim())) {			
				$.MsgBox.Alert("提示", "联系电话格式有误，请检查后重新填写");
				return;
			}	
		}
//		if(trim(loginName)) {
//			if(loginName.length > 50) {
//				$.MsgBox.Alert('提示', '联系电话不得超过50个字');
//		if(trim(loginName)){
//			var hunPhone = /^1[3|4|5|7|8]\d{9}$/;
//			if(!hunPhone.test(loginName.trim())) {			
//				$.MsgBox.Alert("提示", "联系电话格式有误，请检查后重新填写");
//				return;
//			}
//			}	
//		}
		if(trim(loginName)) {
			if(loginName.length > 50) {
				$.MsgBox.Alert('提示', '联系电话不得超过50个字');
				return;
			}
		}
		var mail=$("#moileMail").val();
		if(trim(mail)){
		var gunf = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
			if(!gunf.test(mail.trim())) {
				$.MsgBox.Alert("提示", "联系邮箱格式有误，请检查后重新填写");
		if(mail.trim()) {
			if(mail.trim().indexOf("@")==-1) {
				$.MsgBox.Alert('提示', '联系邮箱格式有误，请检查后重新填写');
				return;
			}
		}
//		if(trim(mail)){
//		var gunf = /^([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+@([a-zA-Z0-9]+[_|\_|\.]?)*[a-zA-Z0-9]+\.[a-zA-Z]{2,3}$/;
//			if(!gunf.test(mail.trim())) {
//				$.MsgBox.Alert("提示", "联系邮箱格式有误，请检查后重新填写");
//				return;
//			}
//		}
		personUpdata();
	});
@@ -227,13 +244,22 @@ $(function() {
									$("#department").val($info.department);
									$("#officeRevise").val($info.office);
									//省
									$("#Province .mr_show").text("");
									$("#Province input[name=cho_Province]").val($info.province);
									$("#Province .mr_show").text($info.province);
									if(!$info.province){
										$("#Province .mr_show").text("请选择省/直辖市");
									}else{
										$("#Province .mr_show").text("");
										$("#Province input[name=cho_Province]").val($info.province);
										$("#Province .mr_show").text($info.province);
									}
									
									//市
									$("#City .mr_show").text("");
									$("#City input[name=cho_City]").val($info.address);
									$("#City .mr_show").text($info.address);
									if(!$info.address){
										$("#City .mr_show").text("请选择城市");
									}else{
										$("#City .mr_show").text("");
										$("#City input[name=cho_City]").val($info.address);
										$("#City .mr_show").text($info.address);
									}
									
									//省份城市颜色
									if($("#oprovince").text() == "请选择省/直辖市") {
@@ -585,11 +611,23 @@ $(function() {
				}else{
					data[i].degree="";
				}
				var timebiye="";
				if(data[i].year){
					if(trim(data[i].year)=="至今"){
						timebiye=data[i].year;
					}else{
						timebiye=data[i].year+'年';
					}
				}else{
					timebiye="";
					data[i].year="";
				}
					
				var string = '<li>'
					string += '<div class="showBx"> <div class="h4Font h4tit">' 
					string += data[i].school + college + major + degree
					string += '<small class="h6Font">' + data[i].year + '</small><em class="btnClick exitlist">编辑</em></div></div>'
					string += '<small class="h6Font">' + timebiye + '</small><em class="btnClick exitlist">编辑</em></div></div>'
				string += '<div class="modifybox"><ul class="cmpFrmList">'
				string += '<li><span class="col-w-2 lableSpan"><span class="requiredcon">* </span>学校名称：</span><div class="col-w-10">'
					string += '<input type="text" class="frmcontype school" placeholder="请填写就读的学校" value="' + data[i].school + '" /><input type="hidden" class="eduId" value="' + data[i].id + '"></div></li>'
@@ -725,8 +763,8 @@ $(function() {
		jobFil("#timeJobShow");
		if(data.length > 0) {
			for(var i = 0; i < data.length; i++) {
				var sDate = "";
				var eDate = "";
				var sDate = "",sDateV="";
				var eDate = "",eDateV="";
				if(data[i].department) {
					var dep = "-" + data[i].department;
					var depart = data[i].department;
@@ -735,18 +773,20 @@ $(function() {
					var depart = ""
				}
				if(data[i].startMonth) {
					sDate = data[i].startMonth.substr(0, 4) + "-" + data[i].startMonth.substr(4, 6);
					sDate = data[i].startMonth.substr(0, 4) + "年" + data[i].startMonth.substr(4, 6) + "月";
					sDateV = 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);
						eDate = data[i].stopMonth.substr(0, 4) + "年" + data[i].stopMonth.substr(4, 6) + "月";
						eDateV = data[i].stopMonth.substr(0, 4) + "-" + data[i].stopMonth.substr(4, 6);
					} else {
						eDate = "至今"
						eDate = "至今";
						eDateV = "至今";
					}
				}
				var string ='<li>'
				string += ' <div class="showBx"><div class="h4Font h4tit">' + data[i].company + '－' + data[i].title + '' + dep + '<small class="h6Font">';
				string += ' <div class="showBx"><div class="h4Font h4tit">' + data[i].company + '-' + data[i].title + '' + dep + '<small class="h6Font">';
					string += sDate;
					if(eDate) string += ("-" + eDate);
					if(eDate) string += (" - " + eDate);
					string += '</small><em class="btnClick exitlist">编辑</em></div></div>';
				string += '<div class="modifybox"><ul class="cmpFrmList">'
					string += '<li><span class="col-w-2 lableSpan"><span class="requiredcon">* </span>机构名称：</span><div class="col-w-10">'
@@ -756,10 +796,10 @@ $(function() {
					string += '<li><span class="col-w-2 lableSpan"><span class="requiredcon">* </span>职位：</span><div class="col-w-10">'
						string += '<input type="text" class="frmcontype jobTitle" placeholder="请填写担任的职位" value="' + data[i].title + '" /></div></li>'
					string += '<li><span class="col-w-2 lableSpan">任职时间：</span><div class="col-w-9"><form action="" class="col-w-12" name="formT">'
						string += '<div class="col-w-5" style="position:relative"><input type="text" class="date-btn frmcontype StartMonth" flag="2" difference="1" placeholder="请选择起始时间" value="' + sDate + '" />'
						string += '<div class="col-w-5" style="position:relative"><input type="text" class="date-btn frmcontype StartMonth" flag="2" difference="1" placeholder="请选择起始时间" value="' + sDateV + '" />'
					 		string +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"></ul><ul class="mr_month"></ul></div></div>'
						string +='<div class="col-w-1 alignCenter">至</div>'
						string +='<div class="col-w-5" style="position:relative"><input type="text" class="date-btn frmcontype StopMonth" flag="2" difference="2" placeholder="请选择结束时间" value="' + eDate + '" />'
						string +='<div class="col-w-5" style="position:relative"><input type="text" class="date-btn frmcontype StopMonth" flag="2" difference="2" placeholder="请选择结束时间" value="' + eDateV + '" />'
					  		string +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"></ul><ul class="mr_month"></ul></div></div>'
						string +='</form></div></li>'
					string +='<li class="saveBtn"><span class="col-w-2">&nbsp;</span><div class="col-w-10">'
@@ -900,29 +940,35 @@ $(function() {
				if(!data[i].descp) {
					data[i].descp = "";
				}
				if(!data[i].startMonth) {
					data[i].startMonth = '';
					data[i].stopMonth = '';
				} else {
					data[i].startMonth = data[i].startMonth.substr(0, 4) + "-" + data[i].startMonth.substr(4, 6) + " - "
					if(!data[i].stopMonth) {
						data[i].stopMonth = '至今';
				var sDate = "",sDateV="";
				var eDate = "",eDateV="";
				if(data[i].startMonth) {
					sDate = data[i].startMonth.substr(0, 4) + "年" + data[i].startMonth.substr(4, 6) + "月";
					sDateV = 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) + "月";
						eDateV = data[i].stopMonth.substr(0, 4) + "-" + data[i].stopMonth.substr(4, 6);
					} else {
						data[i].stopMonth = data[i].stopMonth.substr(0, 4) + "-" + data[i].stopMonth.substr(4, 6)
						eDate = "至今";
						eDateV = "至今";
					}
				}
				
				var stringHtml = '<li>';
				stringHtml += '<div class="showBx"><div class="h4Font h4tit">' + data[i].name + '<small class="h6Font">' + data[i].startMonth + '' + data[i].stopMonth + '</small><em class="btnClick exitlist">编辑</em></div>';
				stringHtml += '<div class="showBx"><div class="h4Font h4tit">' + data[i].name + '<small class="h6Font">'
				stringHtml += sDate;
				if(eDate) stringHtml += (" - " + eDate);
				stringHtml +='</small><em class="btnClick exitlist">编辑</em></div>';
				stringHtml += '<div class="h5Font">' + data[i].descp + '</div>';
				stringHtml += '</div>';
				stringHtml += '<div class="modifybox"><ul class="cmpFrmList">'
				stringHtml += '<li><span class="col-w-2 lableSpan"><span class="requiredcon">* </span>项目名称：</span><div class="col-w-10">'
					stringHtml += '<input type="text" class="frmcontype projectName" placeholder="请填写项目名称" value="' + data[i].name + '" /><input type="hidden" class="projectId"  value="' + data[i].id + '"></div></li>'
				stringHtml += '<li><span class="col-w-2 lableSpan">项目时间：</span><div class="col-w-9"><form action="" class="col-w-12" name="formT">'
					stringHtml += '<div class="col-w-5" style="position:relative"><input type="text" class="date-btn frmcontype project StartMonth" flag="2" difference="1" placeholder="请选择起始时间" value="' + data[i].startMonth.substr(0, 7) + '" />'
					stringHtml += '<div class="col-w-5" style="position:relative"><input type="text" class="date-btn frmcontype project StartMonth" flag="2" difference="1" placeholder="请选择起始时间" value="' +sDateV + '" />'
				 		stringHtml +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"></ul><ul class="mr_month"></ul></div></div>'
					stringHtml +='<div class="col-w-1 alignCenter">至</div>'
					stringHtml +='<div class="col-w-5" style="position:relative"><input type="text" class="date-btn frmcontype project StopMonth" flag="2" difference="2" placeholder="请选择结束时间" value="' + data[i].stopMonth + '" />'
					stringHtml +='<div class="col-w-5" style="position:relative"><input type="text" class="date-btn frmcontype project StopMonth" flag="2" difference="2" placeholder="请选择结束时间" value="' + eDateV + '" />'
				  		stringHtml +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"> </ul><ul class="mr_month"></ul></div></div>'
					stringHtml +='</form></div></li>'
				stringHtml += '<li><span class="col-w-2 lableSpan">项目描述：</span><div class="col-w-10">'
@@ -1041,14 +1087,17 @@ $(function() {
		hounerFil("#honorShow");
		if(data.length > 0) {
			for(var i = 0; i < data.length; i++) {
				if(!data[i].year) {
					data[i].year = "";
				var timeho="";
				if(data[i].year){
					timeho=data[i].year+'年';
				}else{
					data[i].year="";
				}
				if(!data[i].descp) {
					data[i].descp = "";
				}
				var stringHtml = '<li>';
					stringHtml += '<div class="showBx"><div class="h4Font h4tit">' + data[i].name + '<small class="h6Font">' + data[i].year + '</small><em class="btnClick exitlist">编辑</em></div>';
					stringHtml += '<div class="showBx"><div class="h4Font h4tit">' + data[i].name + '<small class="h6Font">' + timeho + '</small><em class="btnClick exitlist">编辑</em></div>';
					stringHtml += '<div class="h5Font">' + data[i].descp + '</div>';
					stringHtml += '</div>';
					stringHtml += '<div class="modifybox"><ul class="cmpFrmList">'

js/resourceShow.js

@@ -85,7 +85,7 @@ $(document).ready(function() {
			}
		}else{
			$("#enterprise,#resPerson").show();
			$(".qiyego").attr("href","userInforShow.html?orgId="+$da.organization.id);
			$(".qiyego").attr("href","cmpInforShow.html?orgId="+$da.organization.id);
			if($da.organization.hasOrgLogo) {
				$("#companyImg").attr("src", "/images/org/" + $da.organization.id + ".jpg");
			}else{
@@ -222,6 +222,12 @@ $(document).ready(function() {
					"type": "GET",
					"success": function(data) {
						if(data.success) {
							var cmpname="";
							if(data.data.forShort){
								cmpname=data.data.forShort;
							}else{
								cmpname=data.data.name;
							}
							if($html[n].article.articleType==1) {
								var stl = autho(data.data.authType, data.data.orgAuth, data.data.authStatus);
							}else {
@@ -242,7 +248,7 @@ $(document).ready(function() {
							}
							str += '<div class="madiaInfo"  style="margin-top:18px;padding-bottom:8px">'
							str += '<p class="h1Font ellipsisSty">' + $html[n].article.articleTitle + '</p>'
							str += '<p><span class="h2Font">' + data.data.name + '</span><em class="authiconNew ' + stl.sty + '" title="' + stl.title + '"></em></p>'
							str += '<p><span class="h2Font">' + cmpname + '</span><em class="authiconNew ' + stl.sty + '" title="' + stl.title + '"></em></p>'
							str += '</div></li>'
							$("#oArticle").append(str);
						}
@@ -306,7 +312,12 @@ $(document).ready(function() {
					stl.sty="authicon-com-ok";
					stl.title="认证企业";
				}
				var name= $respond[i].organization.name;
				var name="";
				if(data.data.forShort){
					name=$respond[i].organization.forShort;
				}else{
					name=$respond[i].organization.name;
				}
			}else {
				var stl = autho($respond[i].editProfessor.authType, $respond[i].editProfessor.orgAuth, $respond[i].editProfessor.authStatus);
				var name= $respond[i].editProfessor.name;

js/searchNew.js

@@ -128,8 +128,8 @@ $(function() {
	$("#academicField,#applicationIndustry,#cityList").on("click","li",function(e) {
		expertBox();
	})
	
	
	function expertBox(){
		keyt = $(".searchsome").val();
		var  subjectVal= $("#academicField li.filterCurrent").text();
@@ -152,646 +152,650 @@ $(function() {
		}
		expertListVal(keyt,subject,industry,address,authType,20,1,true);
	}
		
});
function jquerytab(name){
   var oDome=$('.' + name);
   var oSpan=oDome.find('.filterdiv li');
   var oP=oDome.find('.listdiv .listbox');
   oSpan.click(function(){
		$(this).addClass('liactive').siblings().removeClass('liactive');
		var index =oSpan.index(this);
		oP.eq(index).show().siblings().hide();
		//$(".searchsome").val("");
		if(index==0){
			//expertListVal(keyt,subject,industry,address,authType,20,1,true);
			$(".searchsome").attr("placeholder","请输入专家姓名、机构、研究方向");
		}else if(index==1){
			$(".searchsome").attr("placeholder","输入企业名称、产品名称或相关关键词");
		}else if(index==2){
			//resourceListVal(20, 1,true);
			$(".searchsome").attr("placeholder","请输入资源名称、用途、机构");
		}else if(index==3){
			$(".searchsome").attr("placeholder","输入专利名称、发明人、专利号或相关关键词");
		}else if(index==4){
			$(".searchsome").attr("placeholder","输入论文题目、作者或相关关键词");
		}else if(index==5){
			//articalListVal(20, 1,true);
			$(".searchsome").attr("placeholder","请输入文章标题、作者");
		}
   });
}
//学术领域
function academicFieldVal(subjectText){
	$.ajax({
		"url": "/ajax/dataDict/qaDictCode",
		"type": "get",
		"async": false,
		"data": {
			"dictCode":"SUBJECT",
		},
		"success": function(data) {
			console.log(data);
			if(data.success) {
				$("#academicField").html("");
				$("#academicField").append('<li class="filterCurrent">不限</li>');
				for(var i = 0; i < data.data.length; i++) {
					var itemlist = '<li class="ititle">'+data.data[i].caption+'</li>';
					$("#academicField").append(itemlist);
					if(i > 20)
						break;
				}
				$("#academicField li").each(function(i){
				    var textt = $(this).text();
				    if(textt == subjectText){
				    	$(this).addClass("filterCurrent").siblings().removeClass("filterCurrent");
				    }
				});
			}
		},
		"error": function() {
			$.MsgBox.Alert('提示', '链接服务器超时')
		}
	});
}
//应用行业
function applicationIndustryVal(){
	$.ajax({
		"url": "/ajax/dataDict/qaDictCode",
		"type": "get",
		"data": {
			"dictCode":"INDUSTRY",
		},
		"success": function(data) {
			console.log(data);
			if(data.success) {
				$("#applicationIndustry").html("");
				$("#applicationIndustry").append('<li class="filterCurrent">不限</li>');
				for(var i = 0; i < data.data.length; i++) {
					var itemlist = '<li class="ititle">'+data.data[i].caption+'</li>';
					$("#applicationIndustry").append(itemlist);
					if(i > 20)
						break;
				}
			
	
	
	function jquerytab(name){
	   var oDome=$('.' + name);
	   var oSpan=oDome.find('.filterdiv li');
	   var oP=oDome.find('.listdiv .listbox');
	   oSpan.click(function(){
			$(this).addClass('liactive').siblings().removeClass('liactive');
			var index =oSpan.index(this);
			oP.eq(index).show().siblings().hide();
			//$(".searchsome").val("");
			if(index==0){
				expertBox();
				$(".searchsome").attr("placeholder","请输入专家姓名、机构、研究方向");
			}else if(index==1){
				companyListVal(20, 1,true);
				$(".searchsome").attr("placeholder","输入企业名称、产品名称或相关关键词");
			}else if(index==2){
				resourceListVal(20, 1,true);
				$(".searchsome").attr("placeholder","请输入资源名称、用途、机构");
			}else if(index==3){
				patentListVal(20, 1,true);
				$(".searchsome").attr("placeholder","输入专利名称、发明人、专利号或相关关键词");
			}else if(index==4){
				paperListVal(20, 1,true);
				$(".searchsome").attr("placeholder","输入论文题目、作者或相关关键词");
			}else if(index==5){
				articalListVal(20, 1,true);
				$(".searchsome").attr("placeholder","请输入文章标题、作者");
			}
		},
		"error": function() {
			$.MsgBox.Alert('提示', '链接服务器超时')
		}
	});
}
//所在城市
function cityVal(){
	$.ajax({
		"url": "/ajax/dataDict/qaCity",
		"type": "get",
		"data": {
			"dictCode":"ADDRESS",
		},
		"success": function(data) {
			console.log(data);
			if(data.success) {
				$("#cityList").html("");
				$("#cityList").append('<li class="filterCurrent">不限</li>');
				for(var i = 0; i < data.data.length; i++) {
					var itemlist = '<li class="ititle">'+data.data[i].caption+'</li>';
					$("#cityList").append(itemlist);
					if(i > 20)
						break;
	   });
	}
	
	//学术领域
	function academicFieldVal(subjectText){
		$.ajax({
			"url": "/ajax/dataDict/qaDictCode",
			"type": "get",
			"async": false,
			"data": {
				"dictCode":"SUBJECT",
			},
			"success": function(data) {
				console.log(data);
				if(data.success) {
					$("#academicField").html("");
					$("#academicField").append('<li class="filterCurrent">不限</li>');
					for(var i = 0; i < data.data.length; i++) {
						var itemlist = '<li class="ititle">'+data.data[i].caption+'</li>';
						$("#academicField").append(itemlist);
						if(i > 20)
							break;
					}
					$("#academicField li").each(function(i){
					    var textt = $(this).text();
					    if(textt == subjectText){
					    	$(this).addClass("filterCurrent").siblings().removeClass("filterCurrent");
					    }
					});
				}
			},
			"error": function() {
				$.MsgBox.Alert('提示', '链接服务器超时')
			}
				    },
		"error": function() {
			$.MsgBox.Alert('提示', '链接服务器超时')
		}
	});
}
//专家点击咨询
$('#expertList').on("click",".rightop",function(){
	if (userid && userid != "null" && userid != null) {
		var professorId = $(this).attr("id");
			ConsultApply();
			//点击的发送
			$("#sendConsultBtn").click(function() {
				sendConsultHandler($(this).attr("proId"))
			});
			concultProInfo(professorId);
	}else{
		$.MsgBox.Alert('提示',"请先登录再进行咨询");
		$("#mb_btn_ok").val("去登录");
		var aele = document.createElement('a');
		$("#mb_btnbox").append(aele);
		$("#mb_btnbox a").css({
			'display': "block",
			'width': '100%',
			'height': '40px',
			'position': 'absolute',
			'bottom': '-6px',
			'left': '0'
		});
		aele.setAttribute('href', '../login.html');
	}
})
//专家
function expertListVal(keyt,subject,industry,address,authType,pageSize,pageNo,isexpert) {
	$.ajax({
		"url": "/ajax/professor/pqBaseInfo",
		"type": "get",
		"data": {
			"key":keyt,
			"subject":subject,
			"industry":industry,
			"address":address,
			"authType":authType,
			"pageSize": pageSize,
			"pageNo": pageNo
		},
		"beforeSend": function() {
			$("#expertList").append('<img src="../images/loading.gif" class="loading"  style="position: absolute;left: 50%; top: 50%;" />');
		},
		"success": function(data) {
			console.log(data);
			if(data.success) {
				if(data.data.data.length > 0){
					$("#expertList,.expertPageCode").show();
					$(".expertPage").hide();
					$("#expertList").html("");
					var itemlist = '';
					for(var i = 0; i < data.data.data.length; i++) {
						var itemlist = '<li class="flexCenter">';
						itemlist += '<a target="_blank" href="" class="expertUrl linkhref"><div class="lefthead userheadt userRadius" id="expertImg"></div>';
						itemlist += '<div class="centercon">';
						itemlist += '<p class="h1font">';
						itemlist += '<span class="nameSpan" id="Name"></span>';
						itemlist += '<em class="authiconNew" title="科袖认证专家"></em></p>';
						itemlist += '<p class="h2font ellipsisSty" id="ellipsisSty">职称/职位，所在机构</p>';
						itemlist += '<p class="h2font ellipsisSty" id="researchAreas"></p>';
						itemlist += '</div></a><span class="rightop" style="display:none"  id="">咨询</span>';
						itemlist += '</li>';
						$itemlist = $(itemlist);
						$("#expertList").append($itemlist);
						var datalist = data.data.data[i];
						$itemlist.find(".expertUrl").attr("href", "userInforShow.html?professorId=" + datalist.id );
						$itemlist.find("#Name").text(datalist.name);
						$itemlist.find(".rightop").attr("id",datalist.id);
						if(datalist.id != userid){
							$itemlist.find(".rightop").show();
						}
						var userType = autho(datalist.authType, datalist.orgAuth, datalist.authStatus);
						$itemlist.find(".authiconNew").attr("title", userType.title);
						$itemlist.find(".authiconNew").addClass(userType.sty);
						if(datalist.hasHeadImage) {
							$itemlist.find("#expertImg").attr("style", "background-image: url(/images/head/" + datalist.id + "_l.jpg);");
						}
						var title = datalist.title || "";
						var orgName = datalist.orgName || "";
						var office = datalist.office || "";
						if(title != "") {
							var ttitle = title + "，";
						}else{
							if(office!=""){
								var ttitle = office  + "，";	
							}else{
								var ttitle = office;	
							}
						}
						if(orgName != "") {
							orgName = orgName;
						}
						$itemlist.find("#ellipsisSty").text(ttitle+orgName);
						
						/*获取研究方向信息*/
						var researchAreas = datalist.researchAreas;
						if( researchAreas.length > 0){
							var rlist = '研究方向：';
							for(var n = 0; n < researchAreas.length; n++) {
								//console.log(researchAreas[n].caption);
								rlist += researchAreas[n].caption
								if(n < researchAreas.length - 1) {
									rlist += "；"
								}
							}
							$itemlist.find("#researchAreas").text(rlist);
						}
					}
					//分页
					if(isexpert==true){
						$(".expertPageCode").createPage({
							pageCount: Math.ceil(data.data.total / 20),
							current: data.data.pageNo,
							backFn: function(p) {
								$("#expertList").html("");
								expertListVal(keyt,subject,industry,address,authType,20,p,false);
								document.body.scrollTop = document.documentElement.scrollTop = 0;
							}
						});
	
	//应用行业
	function applicationIndustryVal(){
		$.ajax({
			"url": "/ajax/dataDict/qaDictCode",
			"type": "get",
			"data": {
				"dictCode":"INDUSTRY",
			},
			"success": function(data) {
				console.log(data);
				if(data.success) {
					$("#applicationIndustry").html("");
					$("#applicationIndustry").append('<li class="filterCurrent">不限</li>');
					for(var i = 0; i < data.data.length; i++) {
						var itemlist = '<li class="ititle">'+data.data[i].caption+'</li>';
						$("#applicationIndustry").append(itemlist);
						if(i > 20)
							break;
					}
					
				}else{
					$("#expertList,.expertPageCode").hide();
					$(".expertPage").show();
				}
				$(".loading").remove();
			},
			"error": function() {
				$.MsgBox.Alert('提示', '链接服务器超时')
			}
		},
		"error": function() {
			$.MsgBox.Alert('提示', '链接服务器超时')
		}
	});
}
//企业
function companyListVal(pageSize,pageNo,isbind) {
	$.ajax({
		"url": "/ajax/org/find/pq",
		"type": "get",
		"async": true,
		"data": {
			"kw":$(".searchsome").val(),
			"pageSize": pageSize,
			"pageNo": pageNo
		},
		"beforeSend": function() {
			$("#companyList").append('<img src="../images/loading.gif" class="loading"  style="position: absolute;left: 50%; top: 50%;" />');
		},
		"success": function(data) {
			console.log(data);
			if(data.success) {
				if(data.data.data.length > 0){
					$("#companyList,.companyPageCode").show();
					$(".companyPage").hide();
					var itemlist = '';
					$("#companyList").html("");
					for(var i = 0; i < data.data.data.length; i++) {
						var itemlist = '<li class="flexCenter">';
						itemlist += '<a target="_blank" href="" class="companyUrl linkhref"><div class="lefthead companyhead">';
						itemlist += '<div class="boxBlock"><img class="boxBlockimg" src="" id="companyImg"></div></div>';
						itemlist += '<div class="centercon centercon2">';
						itemlist += '<p class="h1font"><span id="orgName"></span><em class="authiconNew"></em></p>';
                		itemlist += '<p class="h2font ellipsisSty"><span id="orgTit"></span> <span id="orgOther"></span></p>';
						itemlist += '</div></a></li>';
						$itemlist = $(itemlist);
						$("#companyList").append($itemlist);
						var datalist = data.data.data[i];
						var companyType = datalist.authStatus;
						if(datalist.forShort){
							$itemlist.find("#orgName").text(datalist.forShort);
						}else{
							$itemlist.find("#orgName").text(datalist.name);
						}
						
						$itemlist.find(".companyUrl").attr("href", "cmpInforShow.html?orgId=" + datalist.id );
						if(datalist.hasOrgLogo) {
							$itemlist.find("#companyImg").attr("src", "/images/org/" + datalist.id + ".jpg" );
						}else{
							$itemlist.find("#companyImg").attr("src", "/images/default-icon.jpg" );
						}
						if(companyType == 3) {
							$itemlist.find(".authiconNew").addClass("authicon-com-ok").attr("title", "科袖认证企业");;	
						}
						var orgOther = "";
						if(datalist.industry) {
							orgOther = datalist.industry.replace(/,/gi, " | ");
						}
						$itemlist.find("#orgOther").text(orgOther);
						
						if(datalist.orgType == "2") {
							$("#orgTit").html(orgTypeShow[datalist.orgType] + "<span style='margin-right:10px;'></span>");
						}
					}
					//分页
					if(isbind==true){
						$(".companyPageCode").createPage({
							pageCount: Math.ceil(data.data.total / 20),
							current: data.data.pageNo,
							backFn: function(p) {
								$("#companyList").html("");
								articalListVal(20, p,false);
								document.body.scrollTop = document.documentElement.scrollTop = 0;
							}
						});
		});
	}
	
	//所在城市
	function cityVal(){
		$.ajax({
			"url": "/ajax/dataDict/qaCity",
			"type": "get",
			"data": {
				"dictCode":"ADDRESS",
			},
			"success": function(data) {
				console.log(data);
				if(data.success) {
					$("#cityList").html("");
					$("#cityList").append('<li class="filterCurrent">不限</li>');
					for(var i = 0; i < data.data.length; i++) {
						var itemlist = '<li class="ititle">'+data.data[i].caption+'</li>';
						$("#cityList").append(itemlist);
						if(i > 20)
							break;
					}
					
				}else{
					$("#companyList,.companyPageCode").hide();
					$(".companyPage").show();
				}
				$(".loading").remove();
			},
			"error": function() {
				$.MsgBox.Alert('提示', '链接服务器超时')
			}
		},
		"error": function() {
			$.MsgBox.Alert('提示', '链接服务器超时')
		});
	}
	
	//专家点击咨询
	$('#expertList').on("click",".rightop",function(){
		if (userid && userid != "null" && userid != null) {
			var professorId = $(this).attr("id");
				ConsultApply();
				//点击的发送
				$("#sendConsultBtn").click(function() {
					sendConsultHandler($(this).attr("proId"))
				});
				concultProInfo(professorId);
		}else{
			$.MsgBox.Alert('提示',"请先登录再进行咨询");
			$("#mb_btn_ok").val("去登录");
			var aele = document.createElement('a');
			$("#mb_btnbox").append(aele);
			$("#mb_btnbox a").css({
				'display': "block",
				'width': '100%',
				'height': '40px',
				'position': 'absolute',
				'bottom': '-6px',
				'left': '0'
			});
			aele.setAttribute('href', '../login.html');
		}
	});
}
//文章
function articalListVal(pageSize, pageNo,isbind) {
	$.ajax({
		"url": "/ajax/article/firstpq",
		"type": "get",
		"async": true,
		"data": {
			"key":$(".searchsome").val(),
			"pageSize": pageSize,
			"pageNo": pageNo
		},
		"beforeSend": function() {
			$("#articalList").append('<img src="../images/loading.gif" class="loading"  style="position: absolute;left: 50%; top: 50%;" />');
		},
		"success": function(data) {
			console.log(data);
			if(data.success) {
				if(data.data.data.length > 0){
					$("#articalList,.articalPageCode").show();
					$(".articalPage").hide();
					var itemlist = '';
					$("#articalList").html("");
					for(var i = 0; i < data.data.data.length; i++) {
						var itemlist = '<li class="flexCenter">';
						itemlist += '<a target="_blank" href="" class="artivleUrl linkhref"><div class="lefthead articalhead" id="articleImg"></div>';
						itemlist += '<div class="centercon centercon2">';
						itemlist += '<p class="h1font ellipsisSty" id="articalTitle"></p>';
						itemlist += '<p class="h2font">';
						itemlist += '<span class="nameSpan" id="userName"></span>';
						itemlist += '<em class="authiconNew" title="科袖认证专家"></em>';
						itemlist += '</p></div></a></li>';
						$itemlist = $(itemlist);
						$("#articalList").append($itemlist);
						var datalist = data.data.data[i];
						var articleType = datalist.articleType;
						$itemlist.find("#articalTitle").text(datalist.articleTitle);
						$itemlist.find(".artivleUrl").attr("href", "articalShow.html?articleId=" + datalist.articleId );
						if(datalist.articleImg) {
							$itemlist.find("#articleImg").attr("style", "background-image: url(/data/article/" + datalist.articleImg + ");");
						}
						if(articleType == 1) { //个人文章
							$itemlist.find("#userName").text(datalist.professor.name);
							var userType = autho(datalist.professor.authType, datalist.professor.orgAuth, datalist.professor.authStatus);
	})
	
	//专家
	function expertListVal(keyt,subject,industry,address,authType,pageSize,pageNo,isexpert) {
		$.ajax({
			"url": "/ajax/professor/pqBaseInfo",
			"type": "get",
			"data": {
				"key":keyt,
				"subject":subject,
				"industry":industry,
				"address":address,
				"authType":authType,
				"pageSize": pageSize,
				"pageNo": pageNo
			},
			"beforeSend": function() {
				$("#expertList").append('<img src="../images/loading.gif" class="loading"  style="position: absolute;left: 50%; top: 50%;" />');
			},
			"success": function(data) {
				console.log(data);
				if(data.success) {
					if(data.data.data.length > 0){
						$("#expertList,.expertPageCode").show();
						$(".expertPage").hide();
						$("#expertList").html("");
						var itemlist = '';
						for(var i = 0; i < data.data.data.length; i++) {
							var itemlist = '<li class="flexCenter">';
							itemlist += '<a target="_blank" href="" class="expertUrl linkhref"><div class="lefthead userheadt userRadius" id="expertImg"></div>';
							itemlist += '<div class="centercon">';
							itemlist += '<p class="h1font">';
							itemlist += '<span class="nameSpan" id="Name"></span>';
							itemlist += '<em class="authiconNew" title="科袖认证专家"></em></p>';
							itemlist += '<p class="h2font ellipsisSty" id="ellipsisSty">职称/职位，所在机构</p>';
							itemlist += '<p class="h2font ellipsisSty" id="researchAreas"></p>';
							itemlist += '</div></a><span class="rightop" style="display:none"  id="">咨询</span>';
							itemlist += '</li>';
							$itemlist = $(itemlist);
							$("#expertList").append($itemlist);
							var datalist = data.data.data[i];
							$itemlist.find(".expertUrl").attr("href", "userInforShow.html?professorId=" + datalist.id );
							$itemlist.find("#Name").text(datalist.name);
							$itemlist.find(".rightop").attr("id",datalist.id);
							if(datalist.id != userid){
								$itemlist.find(".rightop").show();
							}
							var userType = autho(datalist.authType, datalist.orgAuth, datalist.authStatus);
							$itemlist.find(".authiconNew").attr("title", userType.title);
							$itemlist.find(".authiconNew").addClass(userType.sty);
						} else if(articleType == 2) { //企业文章
							if(datalist.editOrganization.forShort) {
								$itemlist.find("#userName").text(datalist.editOrganization.forShort);
							if(datalist.hasHeadImage) {
								$itemlist.find("#expertImg").attr("style", "background-image: url(/images/head/" + datalist.id + "_l.jpg);");
							}
							var title = datalist.title || "";
							var orgName = datalist.orgName || "";
							var office = datalist.office || "";
							if(title != "") {
								var ttitle = title + "，";
							}else{
								alert(2)
								$itemlist.find("#username").text(datalist.editOrganization.name);
								if(office!=""){
									var ttitle = office  + "，";	
								}else{
									var ttitle = office;	
								}
							}
							//$itemlist.find("#userName").text(datalist.editOrganization.name);
							if(datalist.editOrganization.authStatus==3){
								$itemlist.find(".authiconNew").addClass("authicon-com-ok").attr("title", "认证企业");;	
							if(orgName != "") {
								orgName = orgName;
							}
						}
					}
					//分页
					if(isbind==true){
						$(".articalPageCode").createPage({
							pageCount: Math.ceil(data.data.total / 20),
							current: data.data.pageNo,
							backFn: function(p) {
								$("#articalList").html("");
								articalListVal(20, p,false);
								document.body.scrollTop = document.documentElement.scrollTop = 0;
							$itemlist.find("#ellipsisSty").text(ttitle+orgName);
							
							/*获取研究方向信息*/
							var researchAreas = datalist.researchAreas;
							if( researchAreas.length > 0){
								var rlist = '研究方向：';
								for(var n = 0; n < researchAreas.length; n++) {
									//console.log(researchAreas[n].caption);
									rlist += researchAreas[n].caption
									if(n < researchAreas.length - 1) {
										rlist += "；"
									}
								}
								$itemlist.find("#researchAreas").text(rlist);
							}
						});
						}
						//分页
						if(isexpert==true){
							$(".expertPageCode").createPage({
								pageCount: Math.ceil(data.data.total / 20),
								current: data.data.pageNo,
								backFn: function(p) {
									$("#expertList").html("");
									expertListVal(keyt,subject,industry,address,authType,20,p,false);
									document.body.scrollTop = document.documentElement.scrollTop = 0;
								}
							});
						}
						
					}else{
						$("#expertList,.expertPageCode").hide();
						$(".expertPage").show();
					}
					
				}else{
					$("#articalList,.articalPageCode").hide();
					$(".articalPage").show();
					$(".loading").remove();
				}
				$(".loading").remove();
	
			},
			"error": function() {
				$.MsgBox.Alert('提示', '链接服务器超时')
			}
		},
		"error": function() {
			$.MsgBox.Alert('提示', '链接服务器超时')
		}
	});
}
//资源
function resourceListVal(pageSize, pageNo,isresource) {
	$.ajax({
		"url": "/ajax/resource/firstpq",
		"type": "get",
		"async": true,
		"data": {
			"key":$(".searchsome").val(),
			"pageSize": pageSize,
			"pageNo": pageNo
		},
		"beforeSend": function() {
			$("#resourceList").append('<img src="../images/loading.gif" class="loading"  style="position: absolute;left: 50%; top: 50%;" />');
		},
		"success": function(data) {
			console.log(data);
			if(data.success) {
				if(data.data.data.length > 0){
					$("#resourceList,.resourcePageCode").show();
					$(".resourcePage").hide();
					var itemlist = '';
					$("#resourceList").html("");
					for(var i = 0; i < data.data.data.length; i++) {
						var itemlist = '<li class="flexCenter">';
						itemlist += '<a href="" target="_blank" class="resourceUrl linkhref"><div class="lefthead resouhead" id="resourceImg"></div>';
						itemlist += '<div class="centercon">';
						itemlist += '<p class="h1font" id="resourceName"></p>';
						itemlist += '<p class="h2font ellipsisSty" id="supportedServices"></p>';
						itemlist += '<p class="h2font">';
						itemlist += '<span class="nameSpan" id="username"></span>';
						itemlist += '<em class="authiconNew authicon-pro" title="科袖认证专家"></em>';
						itemlist += '</p></div></a></li>';
						$itemlist = $(itemlist);
						$("#resourceList").append($itemlist);
						var datalist = data.data.data[i];
						var resourceType = datalist.resourceType;
						$itemlist.find("#resourceName").text(datalist.resourceName);
						$itemlist.find("#supportedServices").text("用途：" + datalist.supportedServices);
						$itemlist.find(".resourceUrl").attr("href", "resourceShow.html?resourceId=" + datalist.resourceId );
						if(datalist.images.length > 0) {
							$itemlist.find("#resourceImg").attr("style", "background-image: url(/data/resource/" + datalist.images[0].imageSrc + ");");
						}
						if(resourceType == 1) { //个人资源
							$itemlist.find("#username").text(datalist.editProfessor.name);
							var userType = autho(datalist.editProfessor.authType, datalist.editProfessor.orgAuth, datalist.editProfessor.authStatus);
							$itemlist.find(".authiconNew").attr("title", userType.title);
							$itemlist.find(".authiconNew").addClass(userType.sty);
						} else if(resourceType == 2) { //企业资源
							if(datalist.organization.forShort) {
								$itemlist.find("#username").text(datalist.organization.forShort);
		});
	}
	//企业
	function companyListVal(pageSize,pageNo,isbind) {
		$.ajax({
			"url": "/ajax/org/find/pq",
			"type": "get",
			"async": true,
			"data": {
				"kw":$(".searchsome").val(),
				"pageSize": pageSize,
				"pageNo": pageNo
			},
			"beforeSend": function() {
				$("#companyList").append('<img src="../images/loading.gif" class="loading"  style="position: absolute;left: 50%; top: 50%;" />');
			},
			"success": function(data) {
				console.log(data);
				if(data.success) {
					if(data.data.data.length > 0){
						$("#companyList,.companyPageCode").show();
						$(".companyPage").hide();
						var itemlist = '';
						$("#companyList").html("");
						for(var i = 0; i < data.data.data.length; i++) {
							var itemlist = '<li class="flexCenter">';
							itemlist += '<a target="_blank" href="" class="companyUrl linkhref"><div class="lefthead companyhead">';
							itemlist += '<div class="boxBlock"><img class="boxBlockimg" src="" id="companyImg"></div></div>';
							itemlist += '<div class="centercon centercon2">';
							itemlist += '<p class="h1font"><span id="orgName"></span><em class="authiconNew"></em></p>';
	                		itemlist += '<p class="h2font ellipsisSty"><span id="orgTit"></span> <span id="orgOther"></span></p>';
							itemlist += '</div></a></li>';
							$itemlist = $(itemlist);
							$("#companyList").append($itemlist);
							var datalist = data.data.data[i];
							var companyType = datalist.authStatus;
							if(datalist.forShort){
								$itemlist.find("#orgName").text(datalist.forShort);
							}else{
								$itemlist.find("#username").text(datalist.organization.name);
								$itemlist.find("#orgName").text(datalist.name);
							}
							
							if(datalist.organization.authStatus==3){
								$itemlist.find(".authiconNew").addClass("authicon-com-ok").attr("title", "认证企业");;	
							$itemlist.find(".companyUrl").attr("href", "cmpInforShow.html?orgId=" + datalist.id );
							if(datalist.hasOrgLogo) {
								$itemlist.find("#companyImg").attr("src", "/images/org/" + datalist.id + ".jpg" );
							}else{
								$itemlist.find("#companyImg").attr("src", "/images/default-icon.jpg" );
							}
							if(companyType == 3) {
								$itemlist.find(".authiconNew").addClass("authicon-com-ok").attr("title", "科袖认证企业");;	
							}
							var orgOther = "";
							if(datalist.industry) {
								orgOther = datalist.industry.replace(/,/gi, " | ");
							}
							$itemlist.find("#orgOther").text(orgOther);
							
							if(datalist.orgType == "2") {
								$("#orgTit").html(orgTypeShow[datalist.orgType] + "<span style='margin-right:10px;'></span>");
							}
						}
						//分页
						if(isbind==true){
							$(".companyPageCode").createPage({
								pageCount: Math.ceil(data.data.total / 20),
								current: data.data.pageNo,
								backFn: function(p) {
									$("#companyList").html("");
									articalListVal(20, p,false);
									document.body.scrollTop = document.documentElement.scrollTop = 0;
								}
							});
						}
						
					}else{
						$("#companyList,.companyPageCode").hide();
						$(".companyPage").show();
					}
					//分页
					if(isresource==true){
						$(".resourcePageCode").createPage({
							pageCount: Math.ceil(data.data.total / 20),
							current: data.data.pageNo,
							backFn: function(p) {
								$("#resourceList").html("");
								resourceListVal(20, p,false);
								document.body.scrollTop = document.documentElement.scrollTop = 0;
					$(".loading").remove();
				}
	
			},
			"error": function() {
				$.MsgBox.Alert('提示', '链接服务器超时')
			}
		});
	}
	//文章
	function articalListVal(pageSize, pageNo,isbind) {
		$.ajax({
			"url": "/ajax/article/firstpq",
			"type": "get",
			"async": true,
			"data": {
				"key":$(".searchsome").val(),
				"pageSize": pageSize,
				"pageNo": pageNo
			},
			"beforeSend": function() {
				$("#articalList").append('<img src="../images/loading.gif" class="loading"  style="position: absolute;left: 50%; top: 50%;" />');
			},
			"success": function(data) {
				console.log(data);
				if(data.success) {
					if(data.data.data.length > 0){
						$("#articalList,.articalPageCode").show();
						$(".articalPage").hide();
						var itemlist = '';
						$("#articalList").html("");
						for(var i = 0; i < data.data.data.length; i++) {
							var itemlist = '<li class="flexCenter">';
							itemlist += '<a target="_blank" href="" class="artivleUrl linkhref"><div class="lefthead articalhead" id="articleImg"></div>';
							itemlist += '<div class="centercon centercon2">';
							itemlist += '<p class="h1font ellipsisSty" id="articalTitle"></p>';
							itemlist += '<p class="h2font">';
							itemlist += '<span class="nameSpan" id="userName"></span>';
							itemlist += '<em class="authiconNew" title="科袖认证专家"></em>';
							itemlist += '</p></div></a></li>';
							$itemlist = $(itemlist);
							$("#articalList").append($itemlist);
							var datalist = data.data.data[i];
							var articleType = datalist.articleType;
							$itemlist.find("#articalTitle").text(datalist.articleTitle);
							$itemlist.find(".artivleUrl").attr("href", "articalShow.html?articleId=" + datalist.articleId );
							if(datalist.articleImg) {
								$itemlist.find("#articleImg").attr("style", "background-image: url(/data/article/" + datalist.articleImg + ");");
							}
							if(articleType == 1) { //个人文章
								$itemlist.find("#userName").text(datalist.professor.name);
								var userType = autho(datalist.professor.authType, datalist.professor.orgAuth, datalist.professor.authStatus);
								$itemlist.find(".authiconNew").attr("title", userType.title);
								$itemlist.find(".authiconNew").addClass(userType.sty);
							} else if(articleType == 2) { //企业文章
								if(datalist.editOrganization.forShort) {
									$itemlist.find("#userName").text(datalist.editOrganization.forShort);
								}else{
									alert(2)
									$itemlist.find("#username").text(datalist.editOrganization.name);
								}
								//$itemlist.find("#userName").text(datalist.editOrganization.name);
								if(datalist.editOrganization.authStatus==3){
									$itemlist.find(".authiconNew").addClass("authicon-com-ok").attr("title", "认证企业");;	
								}
							}
						});
						}
						//分页
						if(isbind==true){
							$(".articalPageCode").createPage({
								pageCount: Math.ceil(data.data.total / 20),
								current: data.data.pageNo,
								backFn: function(p) {
									$("#articalList").html("");
									articalListVal(20, p,false);
									document.body.scrollTop = document.documentElement.scrollTop = 0;
								}
							});
						}
						
					}else{
						$("#articalList,.articalPageCode").hide();
						$(".articalPage").show();
					}
					
				}else{
					$("#resourceList,.resourcePageCode").hide();
					$(".resourcePage").show();
					$(".loading").remove();
				}
				$(".loading").remove();
	
			},
			"error": function() {
				$.MsgBox.Alert('提示', '链接服务器超时')
			}
		},
		"error": function() {
			$.MsgBox.Alert('提示', '链接服务器超时')
		}
	});
}
//专利
function patentListVal(pageSize, pageNo,isbind) {
	$.ajax({
		"url": "/ajax/ppatent/pq",
		"type": "get",
		"async": true,
		"data": {
			"qw":$(".searchsome").val(),
			"pageSize": pageSize,
			"pageNo": pageNo
		},
		"beforeSend": function() {
			$("#patentList").append('<img src="../images/loading.gif" class="loading"  style="position: absolute;left: 50%; top: 50%;" />');
		},
		"success": function(data) {
			console.log(data);
			if(data.success) {
				var dataStr=data.data.data
				if(dataStr.length > 0){
					$("#patentList,.patentPageCode").show();
					$(".patentPage").hide();
					var itemlist = '';
					$("#patentList").html("");
					for(var i = 0; i < dataStr.length; i++) {
						var itemlist = '<li class="flexCenter">';
						itemlist += '<a target="_blank" href="patentShow.html?patentId=' + dataStr[i].id +'" class="linkhref"><div class="lefthead patenthead"></div>';
						itemlist += '<div class="centercon centercon2">';
						itemlist += '<p class="h1font ellipsisSty">'+ dataStr[i].name +'</p>';
						itemlist += '<p class="h1font ellipsisSty">发明人：'+ dataStr[i].authors.substring(0, dataStr[i].authors.length - 1) +'</p>';
						itemlist += '<p class="h2font ellipsisSty">申请人：'+ dataStr[i].reqPerson +'</p>';
						itemlist += '</div></a></li>';
						$itemlist = $(itemlist);
						$("#patentList").append($itemlist);
					}
					//分页
					if(isbind==true){
						$(".patentPageCode").createPage({
							pageCount: Math.ceil(data.data.total / 20),
							current: data.data.pageNo,
							backFn: function(p) {
								$("#patentList").html("");
								patentListVal(20, p,false);
								document.body.scrollTop = document.documentElement.scrollTop = 0;
		});
	}
	
	//资源
	function resourceListVal(pageSize, pageNo,isresource) {
		$.ajax({
			"url": "/ajax/resource/firstpq",
			"type": "get",
			"async": true,
			"data": {
				"key":$(".searchsome").val(),
				"pageSize": pageSize,
				"pageNo": pageNo
			},
			"beforeSend": function() {
				$("#resourceList").append('<img src="../images/loading.gif" class="loading"  style="position: absolute;left: 50%; top: 50%;" />');
			},
			"success": function(data) {
				console.log(data);
				if(data.success) {
					if(data.data.data.length > 0){
						$("#resourceList,.resourcePageCode").show();
						$(".resourcePage").hide();
						var itemlist = '';
						$("#resourceList").html("");
						for(var i = 0; i < data.data.data.length; i++) {
							var itemlist = '<li class="flexCenter">';
							itemlist += '<a href="" target="_blank" class="resourceUrl linkhref"><div class="lefthead resouhead" id="resourceImg"></div>';
							itemlist += '<div class="centercon">';
							itemlist += '<p class="h1font" id="resourceName"></p>';
							itemlist += '<p class="h2font ellipsisSty" id="supportedServices"></p>';
							itemlist += '<p class="h2font">';
							itemlist += '<span class="nameSpan" id="username"></span>';
							itemlist += '<em class="authiconNew authicon-pro" title="科袖认证专家"></em>';
							itemlist += '</p></div></a></li>';
							$itemlist = $(itemlist);
							$("#resourceList").append($itemlist);
							var datalist = data.data.data[i];
							var resourceType = datalist.resourceType;
							$itemlist.find("#resourceName").text(datalist.resourceName);
							$itemlist.find("#supportedServices").text("用途：" + datalist.supportedServices);
							$itemlist.find(".resourceUrl").attr("href", "resourceShow.html?resourceId=" + datalist.resourceId );
							if(datalist.images.length > 0) {
								$itemlist.find("#resourceImg").attr("style", "background-image: url(/data/resource/" + datalist.images[0].imageSrc + ");");
							}
							if(resourceType == 1) { //个人资源
								$itemlist.find("#username").text(datalist.editProfessor.name);
								var userType = autho(datalist.editProfessor.authType, datalist.editProfessor.orgAuth, datalist.editProfessor.authStatus);
								$itemlist.find(".authiconNew").attr("title", userType.title);
								$itemlist.find(".authiconNew").addClass(userType.sty);
							} else if(resourceType == 2) { //企业资源
								if(datalist.organization.forShort) {
									$itemlist.find("#username").text(datalist.organization.forShort);
								}else{
									$itemlist.find("#username").text(datalist.organization.name);
								}
								
								if(datalist.organization.authStatus==3){
									$itemlist.find(".authiconNew").addClass("authicon-com-ok").attr("title", "认证企业");;	
								}
							}
						});
						}
						//分页
						if(isresource==true){
							$(".resourcePageCode").createPage({
								pageCount: Math.ceil(data.data.total / 20),
								current: data.data.pageNo,
								backFn: function(p) {
									$("#resourceList").html("");
									resourceListVal(20, p,false);
									document.body.scrollTop = document.documentElement.scrollTop = 0;
								}
							});
						}
						
					}else{
						$("#resourceList,.resourcePageCode").hide();
						$(".resourcePage").show();
					}
					
				}else{
					$("#patentList,.patentPageCode").hide();
					$(".patentPage").show();
					$(".loading").remove();
				}
				$(".loading").remove();
	
			},
			"error": function() {
				$.MsgBox.Alert('提示', '链接服务器超时')
			}
		},
		"error": function() {
			$.MsgBox.Alert('提示', '链接服务器超时')
		}
	});
}
//论文
function paperListVal(pageSize, pageNo,isbind) {
	$.ajax({
		"url": "/ajax/ppaper/pq",
		"type": "get",
		"async": true,
		"data": {
			"qw":$(".searchsome").val(),
			"pageSize": pageSize,
			"pageNo": pageNo
		},
		"beforeSend": function() {
			$("#paperList").append('<img src="../images/loading.gif" class="loading"  style="position: absolute;left: 50%; top: 50%;" />');
		},
		"success": function(data) {
			console.log(data);
			if(data.success) {
				var dataStr=data.data.data
				if(dataStr.length > 0){
					$("#paperList,.paperPageCode").show();
					$(".paperPage").hide();
					var itemlist = '';
					$("#paperList").html("");
					for(var i = 0; i < dataStr.length; i++) {
						var moreInf=""
						if(!dataStr[i].cn4periodical){
							dataStr[i].cn4periodical="";
						}
						if(!dataStr[i].en4periodical){
							dataStr[i].en4periodical="";
		});
	}
	//专利
	function patentListVal(pageSize, pageNo,isbind) {
		$.ajax({
			"url": "/ajax/ppatent/pq",
			"type": "get",
			"async": true,
			"data": {
				"qw":$(".searchsome").val(),
				"pageSize": pageSize,
				"pageNo": pageNo
			},
			"beforeSend": function() {
				$("#patentList").append('<img src="../images/loading.gif" class="loading"  style="position: absolute;left: 50%; top: 50%;" />');
			},
			"success": function(data) {
				console.log(data);
				if(data.success) {
					var dataStr=data.data.data
					if(dataStr.length > 0){
						$("#patentList,.patentPageCode").show();
						$(".patentPage").hide();
						var itemlist = '';
						$("#patentList").html("");
						for(var i = 0; i < dataStr.length; i++) {
							var itemlist = '<li class="flexCenter">';
							itemlist += '<a target="_blank" href="patentShow.html?patentId=' + dataStr[i].id +'" class="linkhref"><div class="lefthead patenthead"></div>';
							itemlist += '<div class="centercon centercon2">';
							itemlist += '<p class="h1font ellipsisSty">'+ dataStr[i].name +'</p>';
							itemlist += '<p class="h1font ellipsisSty">发明人：'+ dataStr[i].authors.substring(0, dataStr[i].authors.length - 1) +'</p>';
							itemlist += '<p class="h2font ellipsisSty">申请人：'+ dataStr[i].reqPerson +'</p>';
							itemlist += '</div></a></li>';
							$itemlist = $(itemlist);
							$("#patentList").append($itemlist);
						}
						if(!dataStr[i].pubDay){
							dataStr[i].pubDay="";
						//分页
						if(isbind==true){
							$(".patentPageCode").createPage({
								pageCount: Math.ceil(data.data.total / 20),
								current: data.data.pageNo,
								backFn: function(p) {
									$("#patentList").html("");
									patentListVal(20, p,false);
									document.body.scrollTop = document.documentElement.scrollTop = 0;
								}
							});
						}
						moreInf = dataStr[i].cn4periodical+ " " +dataStr[i].en4periodical+ " " +dataStr[i].pubDay;
						
						var itemlist = '<li class="flexCenter">';
						itemlist += '<a target="_blank" href="paperShow.html?paperId=' + dataStr[i].id +'" class="linkhref"><div class="lefthead paperhead"></div>';
						itemlist += '<div class="centercon centercon2">';
						itemlist += '<p class="h1font ellipsisSty">'+ dataStr[i].name +'</p>';
						itemlist += '<p class="h1font ellipsisSty">作者：'+ dataStr[i].authors.substring(0, dataStr[i].authors.length - 1) +'</p>';
						itemlist += '<p class="h2font ellipsisSty">期刊：'+ moreInf +'</p>';
						itemlist += '</div></a></li>';
						$itemlist = $(itemlist);
						$("#paperList").append($itemlist);
					}else{
						$("#patentList,.patentPageCode").hide();
						$(".patentPage").show();
					}
					//分页
					if(isbind==true){
						$(".paperPageCode").createPage({
							pageCount: Math.ceil(data.data.total / 20),
							current: data.data.pageNo,
							backFn: function(p) {
								$("#paperList").html("");
								paperListVal(20, p,false);
								document.body.scrollTop = document.documentElement.scrollTop = 0;
					$(".loading").remove();
				}
	
			},
			"error": function() {
				$.MsgBox.Alert('提示', '链接服务器超时')
			}
		});
	}
	//论文
	function paperListVal(pageSize, pageNo,isbind) {
		$.ajax({
			"url": "/ajax/ppaper/pq",
			"type": "get",
			"async": true,
			"data": {
				"qw":$(".searchsome").val(),
				"pageSize": pageSize,
				"pageNo": pageNo
			},
			"beforeSend": function() {
				$("#paperList").append('<img src="../images/loading.gif" class="loading"  style="position: absolute;left: 50%; top: 50%;" />');
			},
			"success": function(data) {
				console.log(data);
				if(data.success) {
					var dataStr=data.data.data
					if(dataStr.length > 0){
						$("#paperList,.paperPageCode").show();
						$(".paperPage").hide();
						var itemlist = '';
						$("#paperList").html("");
						for(var i = 0; i < dataStr.length; i++) {
							var moreInf=""
							if(!dataStr[i].cn4periodical){
								dataStr[i].cn4periodical="";
							}
							if(!dataStr[i].en4periodical){
								dataStr[i].en4periodical="";
							}
						});
							if(!dataStr[i].pubDay){
								dataStr[i].pubDay="";
							}
							moreInf = dataStr[i].cn4periodical+ " " +dataStr[i].en4periodical+ " " +dataStr[i].pubDay;
							
							var itemlist = '<li class="flexCenter">';
							itemlist += '<a target="_blank" href="paperShow.html?paperId=' + dataStr[i].id +'" class="linkhref"><div class="lefthead paperhead"></div>';
							itemlist += '<div class="centercon centercon2">';
							itemlist += '<p class="h1font ellipsisSty">'+ dataStr[i].name +'</p>';
							itemlist += '<p class="h1font ellipsisSty">作者：'+ dataStr[i].authors.substring(0, dataStr[i].authors.length - 1) +'</p>';
							itemlist += '<p class="h2font ellipsisSty">期刊：'+ moreInf +'</p>';
							itemlist += '</div></a></li>';
							$itemlist = $(itemlist);
							$("#paperList").append($itemlist);
						}
						//分页
						if(isbind==true){
							$(".paperPageCode").createPage({
								pageCount: Math.ceil(data.data.total / 20),
								current: data.data.pageNo,
								backFn: function(p) {
									$("#paperList").html("");
									paperListVal(20, p,false);
									document.body.scrollTop = document.documentElement.scrollTop = 0;
								}
							});
						}
						
					}else{
						$("#paperList,.paperPageCode").hide();
						$(".paperPage").show();
					}
					
				}else{
					$("#paperList,.paperPageCode").hide();
					$(".paperPage").show();
					$(".loading").remove();
				}
				$(".loading").remove();
	
			},
			"error": function() {
				$.MsgBox.Alert('提示', '链接服务器超时')
			}
		});
	}
		},
		"error": function() {
			$.MsgBox.Alert('提示', '链接服务器超时')
		}
	});
}
	
});

js/userInforShow.js

@@ -346,19 +346,19 @@ $(function() {
				if(!data[i].descp) {
					data[i].descp = "";
				}
				if(!data[i].startMonth) {
					data[i].startMonth = '';
					data[i].stopMonth = '';
				} else {
					data[i].startMonth = data[i].startMonth.substr(0, 4) + "年" + data[i].startMonth.substr(4, 6) + "月 - "
					if(!data[i].stopMonth) {
						data[i].stopMonth = '至今';
				var sDate = "";
				var eDate = "";
				if(data[i].startMonth) {
					sDate = data[i].startMonth.substr(0, 4) + "年" + data[i].startMonth.substr(4, 6) + "月";
					sDateV = 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 {
						data[i].stopMonth = data[i].stopMonth.substr(0, 4) + "年" + data[i].stopMonth.substr(4, 6)+ "月"
						eDate = " - "+ "至今";
					}
				}
				var projectHtml = '<li>';
				projectHtml += '<div class="h4Font h4tit">' + data[i].name + '<small class="h6Font">' + data[i].startMonth + '' + data[i].stopMonth + '</small></div>';
				projectHtml += '<div class="h4Font h4tit">' + data[i].name + '<small class="h6Font">' + sDate + eDate + '</small></div>';
				projectHtml += '<div class="h5Font">' + data[i].descp + '</div>';
				projectHtml += '</li>';
@@ -369,14 +369,17 @@ $(function() {
	var honorShow = function(data) {
		if(data.length > 0) {
			for(var i = 0; i < data.length; i++) {
				if(!data[i].year) {
					data[i].year = "";
				var timeho="";
				if(data[i].year){
					timeho = data[i].year+'年';
				}else{
					data[i].year="";
				}
				if(!data[i].descp) {
					data[i].descp = "";
				}
				var honorHtml = '<li>';
				honorHtml += '<div class="h4Font h4tit">' + data[i].name + '<small class="h6Font">' + data[i].year + '年</small></div>';
				honorHtml += '<div class="h4Font h4tit">' + data[i].name + '<small class="h6Font">' + timeho + '</small></div>';
				honorHtml += '<div class="h5Font">' + data[i].descp + '</div>';
				honorHtml += '</li>';
				$("#honorShow").append(honorHtml);
@@ -386,23 +389,24 @@ $(function() {
	var timeJobShow = function(data) {
		if(data.length > 0) {
			for(var i = 0; i < data.length; i++) {
				var sDate = "";
				var eDate = "";
				if(data[i].department) {
					var dep = "-" + data[i].department;
				} else {
					var dep = ""
				}
				var sDate = "";
				var eDate = "";
				if(data[i].startMonth) {
					sDate = data[i].startMonth.substr(0, 4) + "年" + data[i].startMonth.substr(4, 6) + "月 - ";
					sDate = data[i].startMonth.substr(0, 4) + "年" + data[i].startMonth.substr(4, 6) + "月";
					sDateV = 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) + "月";
						eDate =" - "+ data[i].stopMonth.substr(0, 4) + "年" + data[i].stopMonth.substr(4, 6) + "月";
					} else {
						eDate = "至今";
						eDate = " - "+ "至今";
					}
				}
				var JobHtml = '<li>';
				JobHtml += '<div class="h4Font h4tit">' + data[i].company + '-' + data[i].title + '' + dep + '<small class="h6Font">' + sDate + '' + eDate + '</small></div>';
				JobHtml += '<div class="h4Font h4tit">' + data[i].company + '-' + data[i].title + '' + dep + '<small class="h6Font">' + sDate + eDate + '</small></div>';
				JobHtml += '</li>';
				$("#timeJobShow").append(JobHtml);
			}
@@ -411,29 +415,39 @@ $(function() {
	var eduBgShow = function(data) {
		if(data.length > 0) {
			for(var i = 0; i < data.length; i++) {
				var showHtml = '<li><div class="h4Font h4tit">';
				if(data[i].college && data[i].major && data[i].degree) {
					showHtml += data[i].school + '－' + data[i].college + '－' + data[i].major + '－' + data[i].degree
				} else if(!data[i].college && data[i].major && data[i].degree) {
					showHtml += data[i].school + '－' + data[i].major + '－' + data[i].degree
				} else if(data[i].college && !data[i].major && data[i].degree) {
					showHtml += data[i].school + '－' + data[i].college + '－' + data[i].degree
				} else if(data[i].college && data[i].major && !data[i].degree) {
					showHtml += data[i].school + '－' + data[i].college + '－' + data[i].major
				} else if(!data[i].college && !data[i].major && data[i].degree) {
					showHtml += data[i].school + '－' + data[i].degree
				} else if(!data[i].college && data[i].major && !data[i].degree) {
					showHtml += data[i].school + '－' + data[i].major
				} else if(data[i].college && !data[i].major && !data[i].degree) {
					showHtml += data[i].school + '－' + data[i].college
				var college="",major="",degree=""
				if(data[i].college){
					college =' - ' + data[i].college
				}else{
					data[i].college="";
				}
				if(typeof(data[i].year) !== "undefined") {
					showHtml += '<small class="h6Font">' + data[i].year + '年</small>';
				} else {
					showHtml += "";
				if(data[i].major){
					major =' - ' + data[i].major
				}else{
					data[i].major="";
				}
				if(data[i].degree){
				    degree =' - ' + eduDegree[data[i].degree]
				     if(data[i].degree==0=0){
				     	degree =""
				     }
				}else{
					data[i].degree="";
				}
				showHtml += "</div></li>";
				var timebiye="";
				if(data[i].year){
					if(data[i].year.trim()=="至今"){
						timebiye=data[i].year;
					}else{
						timebiye=data[i].year+'年';
					}
				}else{
					timebiye="";
				}
				
				var showHtml = '<li><div class="h4Font h4tit">'
				showHtml += data[i].school + college + major + degree;
				showHtml +='<small class="h6Font">' + timebiye + '</small></div></li>';
				$("#eduBgShow").append(showHtml);
			}
		}