Merge branch 'dev' of http://121.42.53.174:3000/jiapeng/portal-front.git into dev

cmp-portal/js/resourceIssue.js

@@ -378,6 +378,7 @@ $(document).ready(function() {
		var $len = $("#fileList").find("img").length;
		var reName = $("#resourceName").val();
		var oIndustry = $("#application").val();
		var oLen=$("#expertli").find(".selectAdd").length
		if($len == 0) {
			$.MsgBox.Alert('提示', '请上传资源图片。');
			return 0;
@@ -390,6 +391,10 @@ $(document).ready(function() {
			$.MsgBox.Alert('提示', '请输入应用用途。');
			return 0;
		}
		if(oLen==0) {
			$.MsgBox.Alert('提示', '至少选择一个负责人');
			return 0;
		}
	}
	/*发布函数*/
	function ajsPost(pa1, pa2) {
@@ -434,7 +439,6 @@ $(document).ready(function() {
					} else {
						$.MsgBox.Alert('提示', '资源发布成功！');
						$("#mb_msgicon").css("background", 'url("images/sign_icon_chenggong_nor.png") 0% 0% / contain');
						return;
						location.href = "resourceList.html"
					}

cmp-portal/resourceIssue.html

@@ -144,7 +144,7 @@
				</div>
				<div class="conItem">
					<div class="form-item otherBlock">
						<div class="aboutTit">负责人/联系人<span class="frmconmsg" id="linkman"></span></div>
						<div class="aboutTit">负责人/联系人<em class="requiredcon">*</em><span class="frmconmsg" id="linkman"></span></div>
						<div class="form-result addexpertRe">
							<ul class="addexpert" id="expertli">
								<li id="usid" data-id="7F26E3C720064AE8A10C7357BBBD239B">

css/genindex.css

@@ -201,10 +201,10 @@ ul.filterUl>li.filterCurrent{border-color:#e1e1e1;border-radius: 20px;color:#ff9
.listdiv ul.listitemdiv{}
ul.listitemdiv li{position:relative;min-height:132px;padding:15px 20px;}
ul.listitemdiv li:after{content: "";position: absolute;left: 0;right: 0;bottom: 0;height: 2px;background: #f7f7f8;}
ul.listitemdiv li a.linkhref{display: block;}
ul.listitemdiv li a.linkhref{display: block;width: 100%;}
ul.listitemdiv li .lefthead{position:absolute;top:50%;overflow: hidden;background-size: cover;background-position: center;}
ul.listitemdiv li .userheadt{width: 100px;height:100px;margin-top:-50px;background-image: url(../images/default-photo.jpg);}
ul.listitemdiv li .centercon{padding-left:120px;padding-right:200px;margin-top:14px;}
ul.listitemdiv li .centercon{padding-left:120px;padding-right:200px;}
ul.listitemdiv li .centercon .h1font{font-size: 16px;line-height: 28px; color:#000;}
ul.listitemdiv li .centercon .h2font{font-size: 14px;line-height: 24px; color:#666;}
ul.listitemdiv li .rightop{padding:0 24px;line-height:32px;font-size:16px;color:#FFFFFF;cursor:pointer;border-radius:4px;background:#ff9900;
@@ -214,7 +214,7 @@ ul.listitemdiv li .rightop{padding:0 24px;line-height:32px;font-size:16px;color:
ul.listitemdiv.listmorediv li{min-height: 142px;}	
ul.listitemdiv.listmorediv .resouhead{width: 164px;height: 110px;margin-top:-55px;background-image: url(../images/default-resource.jpg);}
ul.listitemdiv.listmorediv .centercon{padding-left:184px;padding-right: 10px;margin-top:16px;}
ul.listitemdiv.listmorediv .centercon{padding-left:184px;padding-right: 10px;}
ul.listitemdiv.listmorediv .margin-top:16px;{margin-top:30px;}

js/resourcePreview.js

@@ -21,7 +21,7 @@ $(document).ready(function() {
			"success": function(data) {
				console.log(data);
				if(data.success) {
					//resourceHtml(data.data);
					resourceHtml(data.data);
				}
			},
			"data": {
@@ -50,28 +50,56 @@ $(document).ready(function() {
	function resourceHtml($da) {
		$("#resourceName").text($da.resourceName); //名字
		$("#application").text($da.supportedServices); //应用用途
		if($da.editProfessor.orgName) { //所属机构
			$("#organizationName").text($da.editProfessor.orgName).parents("li").show();
		}
		$("#nameS").text($da.editProfessor.name); //"office": "", //职位 "title": "", //职称
		if($da.editProfessor.title) {
			$("#titleOffice").text($da.editProfessor.title);
		} else {
			if($da.editProfessor.office) {
				$("#titleOffice").text($da.editProfessor.office);
		if($da.editProfessor) {
			$("#person,#orgName").show();
			if($da.editProfessor.orgName) { //所属机构
				$("#organizationName").text($da.editProfessor.orgName).parents("li").show();
			}
		}
		if($da.editProfessor.orgName) {
			$("#orgType").text($da.editProfessor.orgName);
		}
		professorId = $da.editProfessor.id;
		/*if(userid!=professorId) {
			$(".goSpan").show();
		}*/
		var professorFlag = autho($da.editProfessor.authType, $da.editProfessor.orgAuth, $da.editProfessor.authStatus);
		$("#authFlag").addClass(professorFlag.sty).attr("title", professorFlag.title);
		if($da.editProfessor.hasHeadImage == 1) {
			$("#headImg").css("background-image", 'url(/images/head/' + $da.editProfessor.id + '_l.jpg)');
			$("#nameS").text($da.editProfessor.name); //"office": "", //职位 "title": "", //职称
			if($da.editProfessor.title) {
				$("#titleOffice").text($da.editProfessor.title);
			} else {
				if($da.editProfessor.office) {
					$("#titleOffice").text($da.editProfessor.office);
				}
			}
			if($da.editProfessor.orgName) {
				$("#orgType").text($da.editProfessor.orgName);
			}
			professorId = $da.editProfessor.id;
			/*if(userid!=professorId) {
				$(".goSpan").show();
			}*/
			var professorFlag = autho($da.editProfessor.authType, $da.editProfessor.orgAuth, $da.editProfessor.authStatus);
			$("#authFlag").addClass(professorFlag.sty).attr("title", professorFlag.title);
			if($da.editProfessor.hasHeadImage == 1) {
				$("#headImg").css("background-image", 'url(/images/head/' + $da.editProfessor.id + '_l.jpg)');
			}
		}else {
			$("#enterprise,#resPerson").show();
			if($da.organization.hasOrgLogo) {
						$("#Qimg").attr("style", "background-image: url(/images/org/" + $da.organization.id + ".jpg);");
					}
					if($da.organization.authStatus==3){
						$("#QauthFlag").addClass("authicon-com-ok").attr("title", "认证企业");	
					}
					$("#Qname").text($da.organization.name);
					$("#Qindustry").text($da.organization.subject);
					if($da.organization.orgType==2){
						$("#QorgType").text("上市企业");
					}else if($da.organization.orgType==3){
						$("#QorgType").text("国有企业");
					}else if($da.organization.orgType==4){
						$("#QorgType").text("合资企业");
					}else if($da.organization.orgType==5){
						$("#QorgType").text("私人企业");
					}else if($da.organization.orgType==6){
						$("#QorgType").text("外资企业");
					}else if($da.organization.orgType==7){
						$("#QorgType").text("初创企业");
					}else{
						$("#QorgType").text("");
					}
		}
		if($da.spec) { //厂商型号
			$("#modelNumber").text($da.spec).parents("li").show();

js/resourceShow.js

@@ -52,7 +52,7 @@ $(document).ready(function() {
		$("#resourceName").text($da.resourceName); //名字
		$("#application").text($da.supportedServices); //应用用途
		if($da.editProfessor) {
			$("#person").show();
			$("#person,#orgName").show();
			if($da.orgName) { //所属机构
				$("#organizationName").text($da.orgName).parents("li").show();
			}
@@ -81,24 +81,25 @@ $(document).ready(function() {
			}
		}else{
			$("#enterprise,#resPerson").show();
			if(data.data.organization.hasOrgLogo) {
						$("#Qimg").attr("style", "background-image: url(/images/org/" + data.data.organization.id + ".jpg);");
			if($da.organization.hasOrgLogo) {
						$("#Qimg").attr("style", "background-image: url(/images/org/" + $da.organization.id + ".jpg);");
					}
					if(data.data.organization.authStatus==3){
					if($da.organization.authStatus==3){
						$("#QauthFlag").addClass("authicon-com-ok").attr("title", "认证企业");	
					}
					$("#Qindustry").text( data.data.organization.subject);
					if(data.data.organization.orgType==2){
					$("#Qname").text($da.organization.name);
					$("#Qindustry").text($da.organization.subject);
					if($da.organization.orgType==2){
						$("#QorgType").text("上市企业");
					}else if(data.data.organization.orgType==3){
					}else if($da.organization.orgType==3){
						$("#QorgType").text("国有企业");
					}else if(data.data.organization.orgType==4){
					}else if($da.organization.orgType==4){
						$("#QorgType").text("合资企业");
					}else if(data.data.organization.orgType==5){
					}else if($da.organization.orgType==5){
						$("#QorgType").text("私人企业");
					}else if(data.data.organization.orgType==6){
					}else if($da.organization.orgType==6){
						$("#QorgType").text("外资企业");
					}else if(data.data.organization.orgType==7){
					}else if($da.organization.orgType==7){
						$("#QorgType").text("初创企业");
					}else{
						$("#QorgType").text("");
@@ -115,7 +116,11 @@ $(document).ready(function() {
		}
		if($da.subject) {
			var oSub = $da.subject.split(",");
			interestingResources(oSub);
			if($da.resourceType==1) {
				interestingResources(oSub,$da.professorId,0);
			}else{
				interestingResources(oSub,$da.orgId,1);
			}
			var oSt = "";
			for(var i = 0; i < oSub.length; i++) {
				oSt += '<li><p class="h2Font">' + oSub[i] + '</p></li>'
@@ -203,12 +208,26 @@ $(document).ready(function() {
	function relatedArticlesHtml($html) {
		for(var i = 0; i < $html.length; i++) {
			(function(n) {
				var oURL;
				if($html[i].article.articleType==1) {
					oURL="/ajax/professor/baseInfo/" + $html[i].article.professorId;
				}else{
					oURL="/ajax/org/" + $html[i].article.orgId;
				}
				$.ajax({
					"url": "/ajax/professor/baseInfo/" + $html[i].article.professorId,
					"url":oURL,
					"type": "GET",
					"success": function(data) {
						if(data.success) {
							var stl = autho(data.data.authType, data.data.orgAuth, data.data.authStatus);
							if($html[n].article.articleType==1) {
								var stl = autho(data.data.authType, data.data.orgAuth, data.data.authStatus);
							}else {
								if(data.data.authStatus==3) {
									var stl={};
									stl.sty="authicon-com-ok";
									stl.title="认证企业";
								}
							}
							var str = ""
							str += '<li data-id="' + $html[n].article.articleId + '">'
							if($html[n].article.articleImg) {
@@ -237,9 +256,21 @@ $(document).ready(function() {
		location.href = "articalShow.html?articleId=" + $(this).attr("data-id");
	})
	/*感兴趣的资源*/
	function interestingResources(arry) {
	function interestingResources(arry,oId,oNu) {
		var oUrl;
		var $in={};
		$in.keys= arry;
		$in.resourceId= resourceId;
		
		if(oNu==0) {
				$in.professorId= oId;
				oUrl="/ajax/resource/ralateRes";
		}else {
			$in.orgId= oId;
			oUrl="/ajax/resource/orgRalateRes";
		}
		$.ajax({
			"url": "/ajax/resource/ralateRes",
			"url": oUrl,
			"type": "GET",
			"success": function(data) {
				console.log(data);
@@ -251,11 +282,7 @@ $(document).ready(function() {
					interestingResourcesHtml(data.data);
				}
			},
			"data": {
				"keys": arry,
				"resourceId": resourceId,
				"professorId": professorId
			},
			"data":$in,
			"traditional": true,
			dataType: "json",
			'error': function() {
@@ -266,7 +293,18 @@ $(document).ready(function() {
	/*感兴趣资源的html*/
	function interestingResourcesHtml($respond) {
		for(var i = 0; i < $respond.length; i++) {
			var stl = autho($respond[i].editProfessor.authType, $respond[i].editProfessor.orgAuth, $respond[i].editProfessor.authStatus);
			if($respond[i].organization) {
				if($respond[i].organization.authStatus==3) {
					var stl={};
					stl.sty="authicon-com-ok";
					stl.title="认证企业";
				}
				var 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;
			}
			
			var oStr = '';
			if($respond[i].images.length) {
				oStr += '<li data-id="' + $respond[i].resourceId + '"><div class="madiaHead resouseHead"style="background-image: url(/data/resource/' + $respond[i].images[0].imageSrc + ')"></div>'
@@ -275,7 +313,7 @@ $(document).ready(function() {
			}
			oStr += '<div class="madiaInfo">'
			oStr += '<p class="h1Font">' + $respond[i].resourceName + '</p>'
			oStr += '<p><span class="h1Font">' + $respond[i].editProfessor.name + '</span><em class="authiconNew ' + stl.sty + '" title="' + stl.title + '"></em></p>'
			oStr += '<p><span class="h1Font">' + name + '</span><em class="authiconNew ' + stl.sty + '" title="' + stl.title + '"></em></p>'
			oStr += '<p class="h2Font ellipsisSty">用途：<span>' + $respond[i].supportedServices + '</span></p>'
			oStr += '</div></li>'
			$("#resourceList").append(oStr);

resourcePreview.html

@@ -66,7 +66,7 @@
						<!--资源详情区-->
						<div class="showMain showMain2">
							<ul>
								<li>
								<li class="displayNone" id="orgName">
									<div class="showTit">所属机构：</div>
									<div class="showCon" id="organizationName">
									</div>
@@ -101,7 +101,7 @@
				</div>
			</div>
			<div class="rightconBox floatR">
				<div class="conItem conItemG alignCenter" style="border:none;padding:30px;">
				<div class="conItem conItemG alignCenter displayNone" style="border:none;padding:30px;" id="person">
					<div class="madiaHead useHead" id="headImg" style="cursor:pointer"></div>
					<div class="proInfo">
						<div class="h3Font clearfix">
@@ -116,32 +116,23 @@
						<span class="attenSpan">关注</span>
					</div>
				</div>
				<div class="conItem conItemG" id="enterprise" style="border:none;padding:30px;">
					<a href="companybrowinfor.html?orgId=A93B9348F2094D12A6DC9A23F16E1246" class="qiyego"><div class="madiaHead cmpHead" id="Qimg" style="background-image: url(/images/org/A93B9348F2094D12A6DC9A23F16E1246.jpg);"></div></a>
				<div class="conItem conItemG displayNone" id="enterprise" style="border:none;padding:30px;">
					<a href="" class="qiyego"><div class="madiaHead cmpHead" id="Qimg" style=""></div></a>
					<div class="proInfo alignCenter">
						<div class="h3Font clearfix">
							<a href="companybrowinfor.html?orgId=A93B9348F2094D12A6DC9A23F16E1246" class="h1Font qiyego" id="Qname">北京科袖科技有限公司</a>
							<span class="authiconNew authicon-com-ok" title="认证企业" id="QauthFlag"></span>
							<a href="companybrowinfor.html?orgId=A93B9348F2094D12A6DC9A23F16E1246" class="h1Font qiyego" id="Qname"></a>
							<span class="authiconNew" title="" id="QauthFlag"></span>
						</div>
						<p class="h2Font ellipsisSty" id="Qindustry"></p>
						<p class="h2Font" id="QorgType"></p>
					</div>
				</div>
				<div class="conItem">
				<div class="conItem displayNone" id="resPerson">
					<div class="form-item otherBlock">
						<div class="aboutTit">负责人/联系人</div>
						<div class="form-result">
						<div class="form-result addexpertRe">
							<ul class="addexpert" id="expertli">
								<li id="usid" data-id="7F26E3C720064AE8A10C7357BBBD239B">
									<div class="madiaHead useHead" id="userimg" style="background-image: url(/images/head/7F26E3C720064AE8A10C7357BBBD239B_l.jpg);"></div>
									<div class="madiaInfo">
										<p class="ellipsisSty">
											<span class="h1Font" id="name">李潇远2</span><em class="authicon authicon-staff-ok" title="企业认证员工"></em>
										</p>
										<p class="h2Font ellipsisSty">职称只为</p>
									</div>
									<div class="selectAdd"></div>
								</li>
								
							</ul>
						</div>
					</div>

resourceShow.html

@@ -66,7 +66,7 @@
						<!--资源详情区-->
						<div class="showMain showMain2">
							<ul>
								<li>
								<li class="displayNone" id="orgName">
									<div class="showTit">所属机构：</div>
									<div class="showCon" id="organizationName">
									</div>

searchNew.html

@@ -95,7 +95,7 @@
				<div class="listdiv">
					<!--找人-->
					<ul class="listitemdiv">
						<li>
						<li class="flexCenter">
							<a class="linkhref" href="information-brow.html">
								<div class="lefthead userheadt userRadius"></div>
								<div class="centercon">
@@ -112,7 +112,7 @@
					</ul>
					<!--找资源-->
					<ul class="listitemdiv listmorediv">
						<li>
						<li class="flexCenter">
							<a class="linkhref" href="resourceInfo.html">
								<div class="lefthead resouhead"></div>
								<div class="centercon">
@@ -125,7 +125,7 @@
								</div>
							</a>
						</li>
						<li>
						<li class="flexCenter">
							<a class="linkhref" href="resourceInfo.html">
								<div class="lefthead resouhead"></div>
								<div class="centercon">
@@ -141,7 +141,7 @@
					</ul>
					<!--找文章-->
					<ul class="listitemdiv listmorediv">
						<li>
						<li class="flexCenter">
							<a class="linkhref" href="articalShow.html">
								<div class="lefthead articalhead"></div>
								<div class="centercon centercon2">
@@ -153,7 +153,7 @@
								</div>
							</a>
						</li>
						<li>
						<li class="flexCenter">
							<a class="linkhref" href="articalShow.html">
								<div class="lefthead articalhead"></div>
								<div class="centercon centercon2">