Browse Source

Merge branch 'dev' into test

XMTT 6 years ago
parent
commit
ef91be8b08

+ 3 - 2
cmp-portal/js/articalIssue.js

463
		}
463
		}
464
		expertli(); //相关专家
464
		expertli(); //相关专家
465
		resourcesli(); //相关咨询
465
		resourcesli(); //相关咨询
466
		$data.onergId = orgId;
466
		$data.ownenerId = orgId;
467
        $data.articleType = "2";
467
		if($("#companys li").length) {
468
		if($("#companys li").length) {
468
			$data.orgs = getAttrId.call($("#companys li"));
469
			$data.orgs = getAttrId.call($("#companys li"));
469
		}
470
		}
745
		$(this).parent("ul").html("")
746
		$(this).parent("ul").html("")
746
	})
747
	})
747
}
748
}
748
});
749
});

+ 5 - 5
cmp-portal/js/articalModify.js

517
			$(".imgtis").text("");
517
			$(".imgtis").text("");
518
			imgflase = true;
518
			imgflase = true;
519
		}*/
519
		}*/
520
		if(newstitle==""){
521
			$.MsgBox.Alert('提示', '请输入文章标题')
520
		if(newstitle==""){
521
			$.MsgBox.Alert('提示', '请输入文章标题')
522
			return;
522
			return;
523
		}else{
523
		}else{
524
			$("#aboutTit span").text("");
524
			$("#aboutTit span").text("");
681
		}
681
		}
682
		expertli(); //相关专家
682
		expertli(); //相关专家
683
		resourcesli(); //相关咨询
683
		resourcesli(); //相关咨询
684
		$data.onergId = orgId;
684
		$data.ownenerId = orgId;
685
		$data.articleId=articleId;
685
		$data.articleId=articleId;
686
		if($("#companys li").length) {
686
		if($("#companys li").length) {
687
			$data.orgs = getAttrId.call($("#companys li"));
687
			$data.orgs = getAttrId.call($("#companys li"));
861
 /*添加相关企业*/
861
 /*添加相关企业*/
862
relatCompanies("#company");
862
relatCompanies("#company");
863
    /*添加相关企业*/
863
    /*添加相关企业*/
864
    function  relatCompanies(sel) {
864
    function  relatCompanies(sel) {
865
	$(sel).bind({
865
	$(sel).bind({
866
		paste: function(e) {
866
		paste: function(e) {
867
			var pastedText;
867
			var pastedText;
1009
			}
1009
			}
1010
		})
1010
		})
1011
	}
1011
	}
1012
});
1012
});

+ 4 - 2
cmp-portal/js/cmp-articalList.js

38
function articalList(pageSize, pageNo, isbind, num) {
38
function articalList(pageSize, pageNo, isbind, num) {
39
	var $data = {};
39
	var $data = {};
40
	if(num == 1) {
40
	if(num == 1) {
41
		$data.onergId = orgId;
41
		$data.ownenerId = orgId;
42
        $data.articleType = "2";
42
		$data.pageSize = pageSize;
43
		$data.pageSize = pageSize;
43
		$data.pageNo = pageNo;
44
		$data.pageNo = pageNo;
44
	} else {
45
	} else {
45
		$data.onergId = orgId;
46
		$data.ownenerId = orgId;
47
        $data.articleType = "2";
46
		$data.pageSize = pageSize;
48
		$data.pageSize = pageSize;
47
		$data.pageNo = pageNo;
49
		$data.pageNo = pageNo;
48
		$data.articleTitle = $("#articleSearch").val();
50
		$data.articleTitle = $("#articleSearch").val();

+ 40 - 13
e/a.html

17
<script type="text/javascript" src="../js/public/shareLeaveWord.js"></script>	
17
<script type="text/javascript" src="../js/public/shareLeaveWord.js"></script>	
18
<script type="text/javascript" src="../js/public/openApp.js"></script>	
18
<script type="text/javascript" src="../js/public/openApp.js"></script>	
19
<script type="text/javascript">
19
<script type="text/javascript">
20
	addscript("ad_article_h5_a");
20
	addscript("ad_article_h5_a");
21
	addscript("ad_article_h5_b");
21
	addscript("ad_article_h5_b");
22
	addscript("ad_article_h5_c");
22
	addscript("ad_article_h5_c");
23
</script>
23
</script>
24
<style>
24
<style>
25
	html,body {background: #FFFFFF;}
25
	html,body {background: #FFFFFF;}
38
		<div class="h1Font hWeight" id="articleName"></div>
38
		<div class="h1Font hWeight" id="articleName"></div>
39
		<div class="madiaBlock">
39
		<div class="madiaBlock">
40
			<ul class="mui-table-view noactiveTab">
40
			<ul class="mui-table-view noactiveTab">
41
				<li>
41
				<li class="plat">
42
					<div class="flexCenter clearfix">
42
					<div class="flexCenter clearfix">
43
						<a id="personAL">
43
						<a id="personAL">
44
							<div class="madiaHead useHead" id="messImg"></div>
44
							<div class="madiaHead useHead" id="messImg"></div>
142
			if(reType=="1"){
142
			if(reType=="1"){
143
				var proId=this.getAttribute("data-id");
143
				var proId=this.getAttribute("data-id");
144
				location.href="http://" + window.location.host + "/e/p.html?id=" + proId;
144
				location.href="http://" + window.location.host + "/e/p.html?id=" + proId;
145
			}else{
145
			}else if(reType=="2"){
146
				var cmpId=this.getAttribute("data-id");
146
				var cmpId=this.getAttribute("data-id");
147
				location.href="http://" + window.location.host + "/e/c.html?id=" + cmpId;
147
				location.href="http://" + window.location.host + "/e/c.html?id=" + cmpId;
148
			}
148
			}
228
						"articleId": oArticleModule.articleId,
228
						"articleId": oArticleModule.articleId,
229
						"rows": 5
229
						"rows": 5
230
					}, "get", oArticleModule.correlationArticle);
230
					}, "get", oArticleModule.correlationArticle);
231
					document.getElementById("personAL").setAttribute("data-id",$data.professorId);
232
					oArticleModule.oAjaxGet("../ajax/professor/editBaseInfo/" + $data.professorId, "", "get", oArticleModule.professorMess);
233
				} else {
231
					document.getElementById("personAL").setAttribute("data-id",$data.ownerId);
232
					oArticleModule.oAjaxGet("../ajax/professor/editBaseInfo/" + $data.ownerId, "", "get", oArticleModule.professorMess);
233
				} else if($data.articleType == 2){
234
					oArticleModule.oAjaxGet("../ajax/article/ralateArticles", {
234
					oArticleModule.oAjaxGet("../ajax/article/ralateArticles", {
235
						"keys": arr,
235
						"keys": arr,
236
						"orgId": oArticleModule.oWner,
236
						"orgId": oArticleModule.oWner,
237
						"articleId": oArticleModule.articleId,
237
						"articleId": oArticleModule.articleId,
238
						"rows": 5
238
						"rows": 5
239
					}, "get", oArticleModule.correlationArticle);
239
					}, "get", oArticleModule.correlationArticle);
240
					document.getElementById("personAL").setAttribute("data-id",$data.onergId);
241
					oArticleModule.oAjaxGet("../ajax/org/" + $data.onergId, "", "get", oArticleModule.business);
240
					document.getElementById("personAL").setAttribute("data-id",$data.ownenerId);
241
					oArticleModule.oAjaxGet("../ajax/org/" + $data.ownenerId, "", "get", oArticleModule.business);
242
				}else if($data.articleType == 3){
243
					oArticleModule.oAjaxGet("../ajax/article/ralateArticles", {
244
						"keys": arr,
245
						"orgId": oArticleModule.oWner,
246
						"articleId": oArticleModule.articleId,
247
						"rows": 5
248
					}, "get", oArticleModule.correlationArticle);
249
					document.getElementById("personAL").setAttribute("data-id",$data.ownerId);
250
					oArticleModule.oAjaxGet("../ajax/platform/info", {id:$data.ownerId}, "get", oArticleModule.platform);
242
				}
251
				}
243
				
252
				
244
			},
253
			},
268
					document.getElementById("auth").classList.add("authicon-com-ok");
277
					document.getElementById("auth").classList.add("authicon-com-ok");
269
				}
278
				}
270
			},
279
			},
280
			platform: function($data) {
281
				document.getElementById('name').innerHTML = $data.name;
282
				var mgimg="../images/default-icon.jpg";
283
				if($data.logo!=null) {
284
					mgimg="/data/platform" + $data.logo;
285
				}
286
                $(".plat").css("cursor","default");
287
                $(".goSpan").hide();
288
				document.getElementById("messImg").classList.add("cmpHead2");
289
				document.getElementById("messImg").innerHTML='<div class="boxBlock"><img class="boxBlockimg" id="companyImg" src="'+ mgimg+'"></div>'
290
			},
271
			correlationExpert: function($data) {
291
			correlationExpert: function($data) {
272
				if($data.length == 0) {
292
				if($data.length == 0) {
273
					return;
293
					return;
429
				for(var i = 0; i < $data.length; i++) {
449
				for(var i = 0; i < $data.length; i++) {
430
					var ourl, of ;
450
					var ourl, of ;
431
					if($data[i].articleType == 1) {
451
					if($data[i].articleType == 1) {
432
						ourl = "/ajax/professor/editBaseInfo/" + $data[i].professorId; of = 1;
433
					} else {
434
						ourl = "/ajax/org/" + $data[i].onergId; of = 2;
452
						ourl = "/ajax/professor/editBaseInfo/" + $data[i].ownerId; of = 1;
453
					} else if($data[i].articleType == 2) {
454
						ourl = "/ajax/org/" + $data[i].ownenerId; of = 2;
455
					} else if($data[i].articleType == 3) {
456
						ourl = "/ajax/platform/info"; of = 3;
435
					}
457
					}
436
					var arImg = "../images/default-artical.jpg";
458
					var arImg = "../images/default-artical.jpg";
437
					if($data[i].articleImg) {
459
					if($data[i].articleImg) {
440
					var title = $data[i].articleTitle;
462
					var title = $data[i].articleTitle;
441
					$.ajax({
463
					$.ajax({
442
						url:ourl,
464
						url:ourl,
465
						data:{id:$data[i].ownerId},
443
						dataType: 'json', //服务器返回json格式数据
466
						dataType: 'json', //服务器返回json格式数据
444
						type: "get", //HTTP请求类型
467
						type: "get", //HTTP请求类型
445
						timeout: 10000, //超时时间设置为10秒;
468
						timeout: 10000, //超时时间设置为10秒;
454
									var userType = autho(data.data.authType, data.data.orgAuth, data.data.authStatus);
477
									var userType = autho(data.data.authType, data.data.orgAuth, data.data.authStatus);
455
									li.setAttribute("owner-id", data.data.id);
478
									li.setAttribute("owner-id", data.data.id);
456
									li.setAttribute("data-type", 1);
479
									li.setAttribute("data-type", 1);
457
								} else {
480
								} else if( of == 2){
458
									if(data.data.forShort){
481
									if(data.data.forShort){
459
										namepo = data.data.forShort;
482
										namepo = data.data.forShort;
460
									}else{
483
									}else{
468
									}
491
									}
469
									li.setAttribute("owner-id", data.data.id);
492
									li.setAttribute("owner-id", data.data.id);
470
									li.setAttribute("data-type", 2);
493
									li.setAttribute("data-type", 2);
494
								}else if( of == 3){
495
									namepo = data.data.name;
496
									li.setAttribute("owner-id", data.data.id);
497
									li.setAttribute("data-type", 3);
471
								}
498
								}
472
								li.setAttribute("data-id", $data[i].articleId);
499
								li.setAttribute("data-id", $data[i].articleId);
473
								li.className = "mui-table-view-cell";
500
								li.className = "mui-table-view-cell";

+ 11 - 6
e/c.html

445
							}
445
							}
446
							var oURL;
446
							var oURL;
447
							if(StrData[i].articleType==1) {
447
							if(StrData[i].articleType==1) {
448
								oURL="/ajax/professor/baseInfo/"+StrData[i].professorId;
449
							}else{
450
								oURL="/ajax/org/" + StrData[i].onergId;
448
								oURL="/ajax/professor/baseInfo/"+StrData[i].ownerId;
449
							}else if(StrData[i].articleType==2){
450
								oURL="/ajax/org/" + StrData[i].ownenerId;
451
							}else if(StrData[i].articleType==3){
452
								oURL="/ajax/platform/info";
451
							}
453
							}
452
							$.ajax({
454
							$.ajax({
453
								url:oURL, 
455
								url:oURL,
456
								"data": {id:StrData[i].ownerId},
454
								"type": "GET",
457
								"type": "GET",
455
								'dataType': "json",
458
								'dataType': "json",
456
								"success": function(data) {
459
								"success": function(data) {
470
											thisAuth = userType.sty;
473
											thisAuth = userType.sty;
471
											add.setAttribute("owner-id", data.data.id);
474
											add.setAttribute("owner-id", data.data.id);
472
											add.setAttribute("data-type", 1);
475
											add.setAttribute("data-type", 1);
473
										}else {
476
										}else if(StrData[n].articleType==2){
474
											add.setAttribute("owner-id", data.data.id);
477
											add.setAttribute("owner-id", data.data.id);
475
											add.setAttribute("data-type", 2);
478
											add.setAttribute("data-type", 2);
476
											if(data.data.authStatus==3) {
479
											if(data.data.authStatus==3) {
477
												thisTitle = "科袖认证企业";
480
												thisTitle = "科袖认证企业";
478
												thisAuth = "authicon-com-ok";
481
												thisAuth = "authicon-com-ok";
479
											}
482
											}
483
										}else if(StrData[n].articleType==3){
484
											add.setAttribute("owner-id", data.data.id);
485
											add.setAttribute("data-type", 3);
480
										}
486
										}
481
										
482
										var itemlist = '<div class="flexCenter OflexCenter clearfix"><div class="madiaHead artHead" style="background-image:url('+imgL+')"></div>';
487
										var itemlist = '<div class="flexCenter OflexCenter clearfix"><div class="madiaHead artHead" style="background-image:url('+imgL+')"></div>';
483
											itemlist += '<div class="madiaInfo OmadiaInfo">';
488
											itemlist += '<div class="madiaInfo OmadiaInfo">';
484
											itemlist += '<p class="ellipsisSty-2 h1Font" id="usertitle">'+StrData[n].articleTitle+'</p>';
489
											itemlist += '<p class="ellipsisSty-2 h1Font" id="usertitle">'+StrData[n].articleTitle+'</p>';

+ 23 - 18
e/p.html

32
		<div class="mainbox displayNone">
32
		<div class="mainbox displayNone">
33
			<div class="infocon madiaBlock needList" style="border:none">
33
			<div class="infocon madiaBlock needList" style="border:none">
34
				<ul class="mui-table-view" id="demandShow">
34
				<ul class="mui-table-view" id="demandShow">
35
					<!--<li class="mui-table-view-cell">
36
						<div class="madiaInfo">
37
							<p class="h1Font ellipsisSty-2">需求主题寻求一名斯特林热机技术顾问需求主题寻求一名斯特林热机技术顾问需求主题寻求一名斯特林热机技术顾问</p>
38
							<p class="h2Font ellipsisSty-5">需求内容:我们是一家医疗器械公司,主要生产健康理疗类的电子产品,目前希望对护膝、护腰类的产品进行改进,
39
								想先找一位有资深设计经验的三维工业设计专家,通过三维建模的方式先设计出产品的三维模型,用于展示以及为后续生产做准备我们是一家医疗器械公司,主要生产健康理疗类的电子产品,目前希望对护膝、护腰类的产品进行改进,
40
								想先找一位有资深设计经验的三维工业设计专家,通过三维建模的方式先设计出</p>
41
							<div class="showli ellipsisSty">
42
								<span>北京市</span>
43
								<span>预期 1个月内</span>
44
								<span>预算 1万元以内</span>
45
								<span>有效期至 8月17日</span>
46
							</div>
47
						</div>
35
					<!--<li class="mui-table-view-cell">
36
						<div class="madiaInfo">
37
							<p class="h1Font ellipsisSty-2">需求主题寻求一名斯特林热机技术顾问需求主题寻求一名斯特林热机技术顾问需求主题寻求一名斯特林热机技术顾问</p>
38
							<p class="h2Font ellipsisSty-5">需求内容:我们是一家医疗器械公司,主要生产健康理疗类的电子产品,目前希望对护膝、护腰类的产品进行改进,
39
								想先找一位有资深设计经验的三维工业设计专家,通过三维建模的方式先设计出产品的三维模型,用于展示以及为后续生产做准备我们是一家医疗器械公司,主要生产健康理疗类的电子产品,目前希望对护膝、护腰类的产品进行改进,
40
								想先找一位有资深设计经验的三维工业设计专家,通过三维建模的方式先设计出</p>
41
							<div class="showli ellipsisSty">
42
								<span>北京市</span>
43
								<span>预期 1个月内</span>
44
								<span>预算 1万元以内</span>
45
								<span>有效期至 8月17日</span>
46
							</div>
47
						</div>
48
					</li>-->
48
					</li>-->
49
				</ul>
49
				</ul>
50
			</div>
50
			</div>
790
	//相关文章信息
790
	//相关文章信息
791
	function relevantarticalList(){
791
	function relevantarticalList(){
792
		$.ajax({
792
		$.ajax({
793
			"url" : "/ajax/article/byAssProfessor",
793
				"url" : "/ajax/article/byAssProfessor",
794
			"type" :  "GET" ,
794
			"type" :  "GET" ,
795
			"dataType" : "json",
795
			"dataType" : "json",
796
			"data" :{"id":proId},
796
			"data" :{"id":proId},
816
							}
816
							}
817
							var oURL;
817
							var oURL;
818
							if(StrData[i].articleType==1) {
818
							if(StrData[i].articleType==1) {
819
								oURL="/ajax/professor/baseInfo/"+StrData[i].professorId;
820
							}else{
821
								oURL="/ajax/org/" + StrData[i].onergId;
819
								oURL="/ajax/professor/baseInfo/"+StrData[i].ownerId;
820
							}else if(StrData[i].articleType==2){
821
								oURL="/ajax/org/" + StrData[i].ownenerId;
822
							}else if(StrData[i].articleType==3){
823
								oURL="/ajax/platform/info";
822
							}
824
							}
823
							$.ajax({
825
							$.ajax({
824
								"url":oURL,
826
								"url":oURL,
827
								"data":{id:StrData[i].ownerId},
825
								"type": "GET",
828
								"type": "GET",
826
								'dataType': "json",
829
								'dataType': "json",
827
								"success": function(data) {
830
								"success": function(data) {
835
										userType = autho(data.data.authType, data.data.orgAuth, data.data.authStatus);
838
										userType = autho(data.data.authType, data.data.orgAuth, data.data.authStatus);
836
										thisTitle = userType.title;
839
										thisTitle = userType.title;
837
										thisAuth = userType.sty;
840
										thisAuth = userType.sty;
838
									}else {
841
									}else if(StrData[n].articleType==2){
839
										if(data.data.authStatus==3) {
842
										if(data.data.authStatus==3) {
840
											thisTitle = "科袖认证企业";
843
											thisTitle = "科袖认证企业";
841
											thisAuth = "authicon-com-ok";
844
											thisAuth = "authicon-com-ok";
842
										}
845
										}
846
									}else if(StrData[n].articleType==3){
847
843
									}
848
									}
844
									var add = document.createElement("li");
849
									var add = document.createElement("li");
845
									add.className = "mui-table-view-cell flexCenter OflexCenter"; 
850
									add.className = "mui-table-view-cell flexCenter OflexCenter"; 

+ 8 - 2
e/r.html

143
		if(reType=="1"){
143
		if(reType=="1"){
144
			var proId=this.getAttribute("data-id");
144
			var proId=this.getAttribute("data-id");
145
			location.href="http://" + window.location.host + "/e/p.html?id=" + proId;
145
			location.href="http://" + window.location.host + "/e/p.html?id=" + proId;
146
		}else{
146
		}else if(reType=="2"){
147
			var cmpId=this.getAttribute("data-id");
147
			var cmpId=this.getAttribute("data-id");
148
			location.href="http://" + window.location.host + "/e/c.html?id=" + cmpId;
148
			location.href="http://" + window.location.host + "/e/c.html?id=" + cmpId;
149
		}
149
		}
329
											var stl = autho(data.data.authType, data.data.orgAuth, data.data.authStatus);
329
											var stl = autho(data.data.authType, data.data.orgAuth, data.data.authStatus);
330
											comName=data.data.name;
330
											comName=data.data.name;
331
											likeRli.setAttribute("data-type", 1);
331
											likeRli.setAttribute("data-type", 1);
332
										}else {
332
										}else if($html[n].articleType==2){
333
											var stl={};
333
											var stl={};
334
											stl.sty="";
334
											stl.sty="";
335
											stl.title="";
335
											stl.title="";
343
												comName=data.data.name;
343
												comName=data.data.name;
344
											}
344
											}
345
											likeRli.setAttribute("data-type", 2);
345
											likeRli.setAttribute("data-type", 2);
346
										}else if($html[n].articleType==3){
347
											var stl={};
348
											stl.sty="";
349
											stl.title="";
350
											comName=data.data.name;
351
											likeRli.setAttribute("data-type", 3);
346
										}
352
										}
347
										
353
										
348
										var str = ""
354
										var str = ""

+ 14 - 5
e/s.html

131
					if(reType == "1") {
131
					if(reType == "1") {
132
						var proId = this.getAttribute("data-id");
132
						var proId = this.getAttribute("data-id");
133
						location.href = "http://" + window.location.host + "/e/p.html?id=" + proId;
133
						location.href = "http://" + window.location.host + "/e/p.html?id=" + proId;
134
					} else {
134
					} else if(reType == "2"){
135
						var cmpId = this.getAttribute("data-id");
135
						var cmpId = this.getAttribute("data-id");
136
						location.href = "http://" + window.location.host + "/e/c.html?id=" + cmpId;
136
						location.href = "http://" + window.location.host + "/e/c.html?id=" + cmpId;
137
					}
137
					}
371
									(function(n) {
371
									(function(n) {
372
										var oURL;
372
										var oURL;
373
										if($html[i].articleType == 1) {
373
										if($html[i].articleType == 1) {
374
											oURL = "/ajax/professor/baseInfo/" + $html[i].professorId;
375
										} else {
376
											oURL = "/ajax/org/" + $html[i].onergId;
374
											oURL = "/ajax/professor/baseInfo/" + $html[i].ownerId;
375
										} else if($html[i].articleType == 2){
376
											oURL = "/ajax/org/" + $html[i].ownenerId;
377
										} else if($html[i].articleType == 3){
378
											oURL = "/ajax/platform/info" + $html[i].ownerId;
377
										}
379
										}
378
										$.ajax({
380
										$.ajax({
379
											url: oURL,
381
											url: oURL,
382
											data:{id:$html[i].ownerId},
380
											type: "GET",
383
											type: "GET",
381
											dataType: "json",
384
											dataType: "json",
382
											success: function(data) {
385
											success: function(data) {
391
														var stl = autho(data.data.authType, data.data.orgAuth, data.data.authStatus);
394
														var stl = autho(data.data.authType, data.data.orgAuth, data.data.authStatus);
392
														comName = data.data.name;
395
														comName = data.data.name;
393
														likeRli.setAttribute("data-type", 1);
396
														likeRli.setAttribute("data-type", 1);
394
													} else {
397
													} else if($html[n].articleType == 2) {
395
														var stl = {};
398
														var stl = {};
396
														stl.sty = "";
399
														stl.sty = "";
397
														stl.title = "";
400
														stl.title = "";
405
															comName = data.data.name;
408
															comName = data.data.name;
406
														}
409
														}
407
														likeRli.setAttribute("data-type", 2);
410
														likeRli.setAttribute("data-type", 2);
411
													} else if($html[n].articleType == 3) {
412
														var stl = {};
413
														stl.sty = "";
414
														stl.title = "";
415
														comName = data.data.name;
416
														likeRli.setAttribute("data-type", 3);
408
													}
417
													}
409

418

410
													var str = ""
419
													var str = ""

+ 3 - 2
js/articalIssue.js

360
		}
360
		}
361
		expertli(); //相关专家
361
		expertli(); //相关专家
362
		resourcesli(); //相关咨询
362
		resourcesli(); //相关咨询
363
		$data.professorId = userid;
363
		$data.ownerId = userid;
364
        $data.articleType = "1";
364
		$data.articleTitle = $("#newstitle").val();
365
		$data.articleTitle = $("#newstitle").val();
365
		$data.subject = industryAll;
366
		$data.subject = industryAll;
366
		$data.articleImg = $("#uploader").attr("data-id");
367
		$data.articleImg = $("#uploader").attr("data-id");
592
			}
593
			}
593
		}
594
		}
594
	})
595
	})
595
});
596
});

+ 4 - 2
js/articalList.js

34
function articalList(pageSize, pageNo, isbind, num) {
34
function articalList(pageSize, pageNo, isbind, num) {
35
	var $data = {};
35
	var $data = {};
36
	if(num == 1) {
36
	if(num == 1) {
37
		$data.professorId = userid;
37
		$data.ownerId = userid;
38
        $data.articleType = "1";
38
		$data.pageSize = pageSize;
39
		$data.pageSize = pageSize;
39
		$data.pageNo = pageNo;
40
		$data.pageNo = pageNo;
40
	} else {
41
	} else {
41
		$data.professorId = userid;
42
		$data.ownerId = userid;
43
        $data.articleType = "1";
42
		$data.pageSize = pageSize;
44
		$data.pageSize = pageSize;
43
		$data.pageNo = pageNo;
45
		$data.pageNo = pageNo;
44
		$data.articleTitle = $("#articleSearch").val();
46
		$data.articleTitle = $("#articleSearch").val();

+ 3 - 3
js/articalModify.js

404
			imgflase = true;
404
			imgflase = true;
405
		}*/
405
		}*/
406
		if(newstitle==""){
406
		if(newstitle==""){
407
			$.MsgBox.Alert('提示', '请输入文章标题')
407
			$.MsgBox.Alert('提示', '请输入文章标题')
408
			return;
408
			return;
409
		}else{
409
		}else{
410
			$("#aboutTit span").text("");
410
			$("#aboutTit span").text("");
526
		expertli();//相关专家
526
		expertli();//相关专家
527
		resourcesli();//相关咨询
527
		resourcesli();//相关咨询
528
	    $data.articleId = articleId;
528
	    $data.articleId = articleId;
529
		$data.professorId = userid;
529
		$data.ownerId = userid;
530
		$data.articleTitle = $("#newstitle").val();
530
		$data.articleTitle = $("#newstitle").val();
531
		$data.subject = industryAll;
531
		$data.subject = industryAll;
532
		$data.articleImg = $("#uploader").attr("data-id");
532
		$data.articleImg = $("#uploader").attr("data-id");
789
				})
789
				})
790
		}
790
		}
791
	})
791
	})
792
});
792
});

+ 30 - 2
js/articalPreview.js

104
					$("#tagList").text(industryShow(data.data.subject));
104
					$("#tagList").text(industryShow(data.data.subject));
105
					if(data.data.articleType==1){
105
					if(data.data.articleType==1){
106
						$("#expert").removeClass("displayNone");
106
						$("#expert").removeClass("displayNone");
107
						expert(data.data.professorId);
107
						expert(data.data.ownerId);
108
					}
108
					}
109
					if(data.data.articleType==2){
109
					if(data.data.articleType==2){
110
						$("#enterprise").removeClass("displayNone");
110
						$("#enterprise").removeClass("displayNone");
111
						cmpFun(data.data.onergId);
111
						cmpFun(data.data.ownenerId);
112
						companylist();
112
						companylist();
113
					}
113
					}
114
                    if(data.data.articleType==3){
115
                        $("#enterprise").removeClass("displayNone");
116
                        platform(data.data.ownerId);
117
                    }
114
				}
118
				}
115
				var articletitle = data.data.articleTitle + "-科袖网";
119
				var articletitle = data.data.articleTitle + "-科袖网";
116
				window.setTimeout(function() {
120
				window.setTimeout(function() {
182
			}
186
			}
183
		});
187
		});
184
	}
188
	}
189

190
	/*平台信息*/
191
    function platform(platform) {
192
        $.ajax({
193
            "url": "/ajax/platform/info",
194
			"data":{id: platform},
195
            "type": "get",
196
            "dataType" : "json",
197
            "success": function(data) {
198
                if(data.success && data.data) {
199
                    $("#Qname").text(data.data.name);
200
                    if(data.data.logo!=null) {
201
                        $("#companyImg").attr("src", "/data/platform" + data.data.logo);
202
                    }else{
203
                        $("#companyImg").attr("src", "/images/default-plat.jpg");
204
                    }
205
                    $("#Qindustry").text(QindustryShow(data.data.industry));
206
                }
207
            },
208
            "error": function() {
209
                $.MsgBox.Alert('提示', '链接服务器超时')
210
            }
211
        });
212
    }
185
	
213
	
186
	
214
	
187
	//相关专家
215
	//相关专家

+ 103 - 16
js/articalShow.js

87
			}
87
			}
88
		});
88
		});
89
	}
89
	}
90
    //平台最近文章
91
    function platfromRecentlyArticle(obj) {
92
        $.ajax({
93
            "url" :"/ajax/article/pageQuery" ,
94
            "type" :  "GET" ,
95
            "dataType" : "json",
96
            "data" :{ownerId:obj,articleType:'3',status:'1'},
97
            "success" : function(data) {
98
                if (data.success){
99
                    var $data=data.data.data;
100
                    console.log($data);
101
                    var only=false;
102
                    if($data.length>1){
103
                        $(".recentlyList").parents(".currentBlock").removeClass("displayNone");
104
                        var oLeng=$data.length<5?$data.length:5;
105
                        for(var i=0;i<oLeng;i++) {
106
                            if(articleId==$data[i].articleId) {
107
                                only=true;
108
                                continue;
109
                            }
110
                            if(only==true) {
111
                                if(oLeng<5) {
112

113
                                }else{
114
                                    oLeng=6;
115
                                }
116
                            }
117
                            var listLi=$('<li class="flexCenter"></li>').appendTo($(".recentlyList"));
118
                            var str='<a href="/'+pageUrl('a',$data[i])+'"><p class="h2Font ellipsisSty-2"><em class="circlePre"></em>'+$data[i].articleTitle+'</p>'+
119
                                '<span class="smalltip">'+commenTime($data[i].publishTime)+'</span></a></li>'
120
                            $(str).appendTo(listLi);
121
                        }
122
                    }
123
                }
124

125
            },
126
            "error":function(){
127
                $.MsgBox.Alert('提示','链接服务器超时')
128
            }
129
        });
130
    }
90
	//初始化文章内容
131
	//初始化文章内容
91
	function articleshow(){
132
	function articleshow(){
92
		$.ajax({
133
		$.ajax({
116
					ifcollectionAbout(articleId,$("#attention").find("em"), 3)
157
					ifcollectionAbout(articleId,$("#attention").find("em"), 3)
117
					if(data.data.articleType==1){
158
					if(data.data.articleType==1){
118
						$("#expert").removeClass("displayNone");
159
						$("#expert").removeClass("displayNone");
119
						relevantarticalList(data.data.professorId,1);
120
						expert(data.data.professorId);
121
						recentlyArticle(2,{"professorId":data.data.professorId}) 
160
						relevantarticalList(data.data.ownerId);
161
						expert(data.data.ownerId);
162
						recentlyArticle(2,{"ownerId":data.data.ownerId})
122
					}
163
					}
123
					if(data.data.articleType==2){
164
					if(data.data.articleType==2){
124
						$("#enterprise").removeClass("displayNone");
165
						$("#enterprise").removeClass("displayNone");
125
						relevantarticalList(data.data.orgId,2);
126
						cmpFun(data.data.onergId);
166
						relevantarticalList(data.data.ownerId);
167
						cmpFun(data.data.ownenerId);
127
						companylist();
168
						companylist();
128
						recentlyArticle(1,{"onergId":data.data.onergId});
169
						recentlyArticle(1,{"ownenerId":data.data.ownenerId});
170
					}
171
					if(data.data.articleType==3){
172
						$("#enterprise").removeClass("displayNone");
173
						relevantarticalList(data.data.ownerId);
174
						platform(data.data.ownerId);
175
                        platfromRecentlyArticle(data.data.ownerId);
129
					}
176
					}
130
					var weibotitle = data.data.articleTitle;
177
					var weibotitle = data.data.articleTitle;
131
					var weibourl =window.location.href;
178
					var weibourl =window.location.href;
237
			}
284
			}
238
		});
285
		});
239
	}
286
	}
287
    function platform(platformId) {
288
        $.ajax({
289
            "url": "/ajax/platform/info",
290
			"data":{id:platformId},
291
            "type": "get",
292
            "dataType" : "json",
293
            "success": function(data) {
294
                if(data.success && data.data) {
295
                    $(".userimg").removeClass("useHead");
296
					$("#Qname,.username").text(data.data.name);
297
                    $("#Qname").attr("dataid",data.data.id);
298
                    $(".qiyego,.useurl").attr("href", "javascript:void(0)");
299
                    $(".qiyego,.useurl").css("cursor", "default");
300
                    if(data.data.logo!=null) {
301
                        $(".userimg").attr("style", "background: #fff;");
302
                        $(".userimg").html('<div class="boxBlock" style="width:50px;height:50px"><img class="boxBlockimg" src="" id="companyImg2"></div>');
303
                        $("#companyImg,#companyImg2").attr("src", "/data/platform" + data.data.logo);
304
                    }else{
305
                        $("#companyImg,#companyImg2").attr("src", "/images/default-plat.jpg");
306
                    }
307
                    $("#Qindustry").text(QindustryShow(data.data.industry));
308
                    $("#enterprise").find(".attenSpan").hide();
309
                }
310
            },
311
            "error": function() {
312
                $.MsgBox.Alert('提示', '链接服务器超时')
313
            }
314
        });
315
    }
240

316

241
	//相关专家
317
	//相关专家
242
	function relevantExperts(){
318
	function relevantExperts(){
579
	
655
	
580
	}
656
	}
581
	//相关文章信息
657
	//相关文章信息
582
	function relevantarticalList(id,num){
658
	function relevantarticalList(id){
583
	    keysli();
659
	    keysli();
584
		if(num==1){
585
			var data = {"keys":experarray,"professorId":id,"articleId":articleId,"rows":10}	
586
		}
587
		if(num==2){
588
			var data = {"keys":experarray,"orgId":id,"articleId":articleId,"rows":10}	
589
		}
660
		var data = {"keys":experarray,"ownerId":id,"articleId":articleId,"rows":10}
590
		$.ajax({
661
		$.ajax({
591
			"url" : "/ajax/article/ralateArticles",
662
			"url" : "/ajax/article/ralateArticles",
592
			"type" :  "GET" ,
663
			"type" :  "GET" ,
618
							$itemlist.find(".time").text(commenTime(datalist.publishTime))
689
							$itemlist.find(".time").text(commenTime(datalist.publishTime))
619
							if(datalist.articleType==1){
690
							if(datalist.articleType==1){
620
								$.ajax({
691
								$.ajax({
621
									"url" : "/ajax/professor/baseInfo/"+datalist.professorId,
692
									"url" : "/ajax/professor/baseInfo/"+datalist.ownerId,
622
									"type" :  "GET" ,
693
									"type" :  "GET" ,
623
									"dataType" : "json",
694
									"dataType" : "json",
624
									"async":false,
695
									"async":false,
635
							}
706
							}
636
							if(datalist.articleType==2){
707
							if(datalist.articleType==2){
637
								$.ajax({
708
								$.ajax({
638
									"url" : "/ajax/org/"+datalist.onergId,
709
									"url" : "/ajax/org/"+datalist.ownenerId,
639
									"type" :  "GET" ,
710
									"type" :  "GET" ,
640
									"dataType" : "json",
711
									"dataType" : "json",
641
									"async":false,
712
									"async":false,
642
									"success" : function($data) {
713
									"success" : function($data) {
643
										console.log($data)
644
										if ($data.success && $data.data){
714
										if ($data.success && $data.data){
645
											if($data.data.forShort){
715
											if($data.data.forShort){
646
												$itemlist.find(".username2").text($data.data.forShort);
716
												$itemlist.find(".username2").text($data.data.forShort);
654
									}
724
									}
655
								});
725
								});
656
							}
726
							}
727
							if(datalist.articleType==3){
728
								$.ajax({
729
									"url" : "/ajax/platform/info",
730
									"data":{id:datalist.ownerId},
731
									"type" :  "GET" ,
732
									"dataType" : "json",
733
									"async":false,
734
									"success" : function($data) {
735
										if ($data.success && $data.data){
736
											$itemlist.find(".username2").text($data.data.name);
737
										}
738
									},
739
									"error":function(){
740
										$.MsgBox.Alert('提示','链接服务器超时')
741
									}
742
								});
743
							}
657
							
744
							
658
					}
745
					}
659
				}
746
				}

+ 109 - 17
js/articalShow2.js

88
			}
88
			}
89
		});
89
		});
90
	}
90
	}
91
    //平台最近文章
92
    function platfromRecentlyArticle(obj) {
93
        $.ajax({
94
            "url" :"/ajax/article/pageQuery" ,
95
            "type" :  "GET" ,
96
            "dataType" : "json",
97
            "data" :{ownerId:obj,articleType:'3',status:'1'},
98
            "success" : function(data) {
99
                if (data.success){
100
                    var $data=data.data.data;
101
                    var only=false;
102
                    if($data.length>1){
103
                        $(".recentlyList").parents(".currentBlock").removeClass("displayNone");
104
                        var oLeng=$data.length<5?$data.length:5;
105
                        for(var i=0;i<oLeng;i++) {
106
                            if(articleId==$data[i].articleId) {
107
                                only=true;
108
                                continue;
109
                            }
110
                            if(only==true) {
111
                                if(oLeng<5) {
112

113
                                }else{
114
                                    oLeng=6;
115
                                }
116

117
                            }
118
                            var listLi=$('<li class="flexCenter"></li>').appendTo($(".recentlyList"));
119
                            var str='<a href="/'+pageUrl('a',$data[i])+'"><p class="h2Font ellipsisSty-2"><em class="circlePre"></em>'+$data[i].articleTitle+'</p>'+
120
                                '<span class="smalltip">'+commenTime($data[i].publishTime)+'</span></a></li>'
121
                            $(str).appendTo(listLi);
122
                        }
123
                    }
124
                }
125

126
            },
127
            "error":function(){
128
                $.MsgBox.Alert('提示','链接服务器超时')
129
            }
130
        });
131
    }
91
	//初始化文章内容
132
	//初始化文章内容
92
	function articleshow(){
133
	function articleshow(){
93
		$("#articleContent").html(window.staticPageData.articleContent);
134
		$("#articleContent").html(window.staticPageData.articleContent);
117
					ifcollectionAbout(articleId,$("#attention").find("em"), 3)
158
					ifcollectionAbout(articleId,$("#attention").find("em"), 3)
118
					if(data.data.articleType==1){
159
					if(data.data.articleType==1){
119
						$("#expert").removeClass("displayNone");
160
						$("#expert").removeClass("displayNone");
120
						relevantarticalList(data.data.professorId,1);
121
						expert(data.data.professorId);
122
						recentlyArticle(2,{"professorId":data.data.professorId}) 
161
						relevantarticalList(data.data.ownerId);
162
						expert(data.data.ownerId);
163
						recentlyArticle(2,{"ownerId":data.data.ownerId})
123
					}
164
					}
124
					if(data.data.articleType==2){
165
					if(data.data.articleType==2){
125
						$("#enterprise").removeClass("displayNone");
166
						$("#enterprise").removeClass("displayNone");
126
						relevantarticalList(data.data.orgId,2);
127
						cmpFun(data.data.onergId);
167
						relevantarticalList(data.data.ownerId);
168
						cmpFun(data.data.ownenerId);
128
						companylist();
169
						companylist();
129
						recentlyArticle(1,{"onergId":data.data.onergId});
170
						recentlyArticle(1,{"ownenerId":data.data.ownenerId});
130
					}
171
					}
172
                    if(data.data.articleType==3){
173
                        $("#enterprise").removeClass("displayNone");
174
                        relevantarticalList(data.data.ownerId);
175
                        platform(data.data.ownerId);
176
                        platfromRecentlyArticle(data.data.ownerId);
177
                    }
131
					var weibotitle = data.data.articleTitle;
178
					var weibotitle = data.data.articleTitle;
132
					var weibourl =window.location.href;
179
					var weibourl =window.location.href;
133
					var weibopic ="http://"+window.location.host+"/data/article/" + data.data.articleImg;
180
					var weibopic ="http://"+window.location.host+"/data/article/" + data.data.articleImg;
238
			}
285
			}
239
		});
286
		});
240
	}
287
	}
288
    function platform(platformId) {
289
        $.ajax({
290
            "url": "/ajax/platform/info",
291
            "data":{id:platformId},
292
            "type": "get",
293
            "dataType" : "json",
294
            "success": function(data) {
295
                if(data.success && data.data) {
296
                    $(".userimg").removeClass("useHead");
297
                    if(data.data.forShort) {
298
                        $("#Qname,.username").text(data.data.forShort);
299
                    }else{
300
                        $("#Qname,.username").text(data.data.name);
301
                    }
302
                    $("#Qname").attr("dataid",data.data.id);
303
                    $(".qiyego,.useurl").attr("href", "javascript:void(0)");
304
                    $(".qiyego,.useurl").css("cursor", "default");
305
                    if(data.data.logo!=null) {
306
                        $(".userimg").attr("style","background: #fff;")
307
                        $(".userimg").html('<div class="boxBlock" style="width:50px;height:50px"><img class="boxBlockimg" src="" id="companyImg2"></div>');
308
                        $("#companyImg,#companyImg2").attr("src", "/data/platform" + data.data.logo);
309
                    }else{
310
                        $("#companyImg,#companyImg2").attr("src", "/images/default-plat.jpg");
311
                    }
312
                    $("#Qindustry").text(QindustryShow(data.data.industry));
313
                    $("#enterprise").find(".attenSpan").hide();
314
                }
315
            },
316
            "error": function() {
317
                $.MsgBox.Alert('提示', '链接服务器超时')
318
            }
319
        });
320
    }
241

321

242
	//相关专家
322

323
    //相关专家
243
	function relevantExperts(){
324
	function relevantExperts(){
244
		$.ajax({
325
		$.ajax({
245
			"url": "/ajax/article/ralatePro",
326
			"url": "/ajax/article/ralatePro",
580
	
661
	
581
	}
662
	}
582
	//相关文章信息
663
	//相关文章信息
583
	function relevantarticalList(id,num){
664
	function relevantarticalList(id){
584
	    keysli();
665
	    keysli();
585
		if(num==1){
586
			var data = {"keys":experarray,"professorId":id,"articleId":articleId,"rows":10}	
587
		}
588
		if(num==2){
589
			var data = {"keys":experarray,"orgId":id,"articleId":articleId,"rows":10}	
590
		}
666
		var data = {"keys":experarray,"ownerId":id,"articleId":articleId,"rows":10}
591
		$.ajax({
667
		$.ajax({
592
			"url" : "/ajax/article/ralateArticles",
668
			"url" : "/ajax/article/ralateArticles",
593
			"type" :  "GET" ,
669
			"type" :  "GET" ,
619
							$itemlist.find(".time").text(commenTime(datalist.publishTime))
695
							$itemlist.find(".time").text(commenTime(datalist.publishTime))
620
							if(datalist.articleType==1){
696
							if(datalist.articleType==1){
621
								$.ajax({
697
								$.ajax({
622
									"url" : "/ajax/professor/baseInfo/"+datalist.professorId,
698
									"url" : "/ajax/professor/baseInfo/"+datalist.ownerId,
623
									"type" :  "GET" ,
699
									"type" :  "GET" ,
624
									"dataType" : "json",
700
									"dataType" : "json",
625
									"async":false,
701
									"async":false,
636
							}
712
							}
637
							if(datalist.articleType==2){
713
							if(datalist.articleType==2){
638
								$.ajax({
714
								$.ajax({
639
									"url" : "/ajax/org/"+datalist.onergId,
715
									"url" : "/ajax/org/"+datalist.ownenerId,
640
									"type" :  "GET" ,
716
									"type" :  "GET" ,
641
									"dataType" : "json",
717
									"dataType" : "json",
642
									"async":false,
718
									"async":false,
643
									"success" : function($data) {
719
									"success" : function($data) {
644
										console.log($data)
645
										if ($data.success && $data.data){
720
										if ($data.success && $data.data){
646
											if($data.data.forShort){
721
											if($data.data.forShort){
647
												$itemlist.find(".username2").text($data.data.forShort);
722
												$itemlist.find(".username2").text($data.data.forShort);
655
									}
730
									}
656
								});
731
								});
657
							}
732
							}
733
							if(datalist.articleType==3){
734
								$.ajax({
735
									"url" : "/ajax/platform/info",
736
									"data":{id:datalist.ownerId},
737
									"type" :  "GET" ,
738
									"dataType" : "json",
739
									"async":false,
740
									"success" : function($data) {
741
										if ($data.success && $data.data){
742
											$itemlist.find(".username2").text($data.data.name);
743
										}
744
									},
745
									"error":function(){
746
										$.MsgBox.Alert('提示','链接服务器超时')
747
									}
748
								});
749
							}
658
							
750
							
659
					}
751
					}
660
				}
752
				}

+ 31 - 9
js/discover.js

623
		listLi.append( $strAdd);
623
		listLi.append( $strAdd);
624
		leaveMsgCount(dataStr.articleId,1, $strAdd);
624
		leaveMsgCount(dataStr.articleId,1, $strAdd);
625
		if(dataStr.articleType==1){
625
		if(dataStr.articleType==1){
626
			userFun(dataStr.professorId, $strAdd);
627
		}else{
628
			cmpFun(dataStr.onergId, $strAdd);
626
			userFun(dataStr.ownerId, $strAdd);
627
		}else if(dataStr.articleType==2){
628
			cmpFun(dataStr.ownenerId, $strAdd);
629
		}else if(dataStr.articleType==3){
630
            platform(dataStr.ownerId, $strAdd);
629
		}
631
		}
630
	}
632
	}
631

633

676
		listLi.append($strAdd);
678
		listLi.append($strAdd);
677
		leaveMsgCount(dataStr.articleId,1, $strAdd);
679
		leaveMsgCount(dataStr.articleId,1, $strAdd);
678
		if(dataStr.articleType==1){
680
		if(dataStr.articleType==1){
679
			userFun(dataStr.professorId, $strAdd);
680
		}else{
681
			cmpFun(dataStr.onergId, $strAdd);
681
			userFun(dataStr.ownerId, $strAdd);
682
		}else if(dataStr.articleType==2){
683
			cmpFun(dataStr.ownenerId, $strAdd);
684
		}else if(dataStr.articleType==3){
685
			platform(dataStr.ownerId, $strAdd);
682
		}
686
		}
683
	}
687
	}
684
	
688
	
856
			}
860
			}
857
		});
861
		});
858
	}
862
	}
863

864
	/*平台信息*/
865
    function platform(id,$listItem) {
866
        $.ajax({
867
            "url": "/ajax/platform/info",
868
            "data":{id:id},
869
            "type": "get",
870
            "async": true,
871
            "success": function(data) {
872
                if(data.success && data.data) {
873
                    $listItem.find(".ownerName").text(data.data.name);
874
                }
875
            },
876
            "error": function() {
877
                $.MsgBox.Alert('提示', '链接服务器超时')
878
            }
879
        });
880
    }
859
	
881
	
860
	function rightAllCon(){
882
	function rightAllCon(){
861
		$.ajax({
862
			type:"get",
883
		$.ajax({
884
			type:"get",
863
			url:"/ajax/professor/editBaseInfo/"+userid,
885
			url:"/ajax/professor/editBaseInfo/"+userid,
864
			success:function(data){
886
			success:function(data){
865
				if(data.success){
887
				if(data.success){
873
							'<div class="h2Font">'+dataStr.name+'<span class="authiconNew ' + userType.sty + '" title="' + userType.title + '"></span></div>'
895
							'<div class="h2Font">'+dataStr.name+'<span class="authiconNew ' + userType.sty + '" title="' + userType.title + '"></span></div>'
874
					$(".onlogined .owener-info").html(str)
896
					$(".onlogined .owener-info").html(str)
875
				}
897
				}
876
			}
898
			}
877
		});
899
		});
878
		$.ajax({
900
		$.ajax({
879
			url: "/ajax/article/pqProPublish",
901
			url: "/ajax/article/pqProPublish",

+ 42 - 3
js/public/cacheUtil.js

1
(function(window) {
1
(function(window) {
2
	var objCache={"professor":{},"company":{}};
3
	var objHCache={"professor":{},"company":{}};//队列(processing)
2
	var objCache={"professor":{},"company":{},"platform":{}};
3
	var objHCache={"professor":{},"company":{},"platform":{}};//队列(processing)
4

4

5
	var objCacheHandler={
5
	var objCacheHandler={
6
		"professor":function(id){
6
		"professor":function(id){
50
					ha[i](false);
50
					ha[i](false);
51
				}
51
				}
52
			});
52
			});
53
		}
53
		},
54
		"platform":function (id) {
55
            jQuery.ajax({
56
                url:"/ajax/platform/info",
57
				data:{id:id},
58
                type:"GET",
59
                success:function(res){
60
                    var ha = objHCache.platform[id];//jilu
61
                    delete objHCache.platform[id];
62

63
                    if(res.success){
64
                        objCache.platform[id]=res.data;
65
                        for(var i = 0 ;i < ha.length;++i){
66
                            ha[i](true,res.data);
67
                        }
68
                    }else{
69
                        for(var i = 0 ;i < ha.length;++i){
70
                            ha[i](false);
71
                        }
72
                    }
73
                },
74
                error:function(dfd){
75
                    ha[i](false);
76
                }
77
            });
78
        }
54
	};
79
	};
55
	
80
	
56
	var cacheModel={
81
	var cacheModel={
81
					objCacheHandler.company(id);
106
					objCacheHandler.company(id);
82
				}
107
				}
83
			}
108
			}
109
		},
110
		getPlatform:function(id,cb){
111
			var val =objCache.platform[id]
112
			if(val){
113
				cb(true,val);
114
			}else{
115
				if(objHCache.platform[id]){
116
					objHCache.platform[id].push(cb);
117
				}else{
118
					objHCache.platform[id]=[];
119
					objHCache.platform[id].push(cb);
120
					objCacheHandler.platform(id);
121
				}
122
			}
84
		}
123
		}
85
	};
124
	};
86
	window.cacheModel = cacheModel;
125
	window.cacheModel = cacheModel;

+ 12 - 6
js/resourceShow.js

277
	function relatedArticlesHtml($html) {
277
	function relatedArticlesHtml($html) {
278
		var oURL;
278
		var oURL;
279
		if($html.articleType==1) {
279
		if($html.articleType==1) {
280
			oURL="/ajax/professor/baseInfo/" + $html.professorId;
281
		}else{
282
			oURL="/ajax/org/" + $html.onergId;
280
			oURL="/ajax/professor/baseInfo/" + $html.ownerId;
281
		}else if($html.articleType==2) {
282
			oURL="/ajax/org/" + $html.ownenerId;
283
		}else if($html.articleType==2) {
284
			oURL="/ajax/platform/info";
283
		}
285
		}
284
		$.ajax({
286
		$.ajax({
285
			"url":oURL,
287
			"url":oURL,
288
			"data":{id:$html.ownerId},
286
			"type": "GET",
289
			"type": "GET",
287
			"success": function(data) {
290
			"success": function(data) {
288
				if(data.success) {
291
				if(data.success) {
289
					console.log(data)
290
					var cmpname="";
292
					var cmpname="";
291
					if(data.data.forShort){
293
					if(data.data.forShort){
292
						cmpname=data.data.forShort;
294
						cmpname=data.data.forShort;
295
					}
297
					}
296
					if($html.articleType==1) {
298
					if($html.articleType==1) {
297
						var stl = autho(data.data.authType, data.data.orgAuth, data.data.authStatus);
299
						var stl = autho(data.data.authType, data.data.orgAuth, data.data.authStatus);
298
					}else {
300
					}else if($html.articleType==2){
299
						var stl={};
301
						var stl={};
300
						stl.sty="";
302
						stl.sty="";
301
						stl.title="";
303
						stl.title="";
303
							stl.sty="authicon-com-ok";
305
							stl.sty="authicon-com-ok";
304
							stl.title="认证企业";
306
							stl.title="认证企业";
305
						}
307
						}
308
					}else if($html.articleType==3){
309
						var stl={};
310
						stl.sty="";
311
						stl.title="";
306
					}
312
					}
307
					var str = ""
313
					var str = ""
308
					str += '<li data-id="' + $html.articleId + '" data-createTime="' + $html.createTime + '" data-shareId="' + $html.shareId + '"><a class="flexCenter OflexCenter">'
314
					str += '<li data-id="' + $html.articleId + '" data-createTime="' + $html.createTime + '" data-shareId="' + $html.shareId + '"><a class="flexCenter OflexCenter">'
667
	})
673
	})
668
	
674
	
669
	
675
	
670
})
676
})

+ 12 - 2
js/searchNew.js

419
							
419
							
420
						if($info[i].articleType=="1"){
420
						if($info[i].articleType=="1"){
421
							(function(mo){
421
							(function(mo){
422
								cacheModel.getProfessor($info[i].professorId,function(sc,value){
422
								cacheModel.getProfessor($info[i].ownerId,function(sc,value){
423
									if(sc){
423
									if(sc){
424
										mo.find(".ownerName").html(value.name);
424
										mo.find(".ownerName").html(value.name);
425
									}else{
425
									}else{
429
							})($itemlist);
429
							})($itemlist);
430
						}else if($info[i].articleType=="2"){
430
						}else if($info[i].articleType=="2"){
431
							(function(mo){
431
							(function(mo){
432
								cacheModel.getCompany($info[i].onergId,function(sc, value){
432
								cacheModel.getCompany($info[i].ownenerId,function(sc, value){
433
									if(sc){
433
									if(sc){
434
										if(value.forShort){
434
										if(value.forShort){
435
											mo.find(".ownerName").html(value.forShort)
435
											mo.find(".ownerName").html(value.forShort)
441
									}
441
									}
442
								})
442
								})
443
							})($itemlist);
443
							})($itemlist);
444
						}else if($info[i].articleType=="3"){
445
							(function(mo){
446
								cacheModel.getPlatform($info[i].ownerId,function(sc, value){
447
									if(sc){
448
										mo.find(".ownerName").html(value.name)
449
									}else{
450
										console.log("error")
451
									}
452
								})
453
							})($itemlist);
444
						}
454
						}
445
					}
455
					}
446
				}
456
				}

+ 12 - 2
js/search_h5.js

437
							
437
							
438
						if($info[i].articleType=="1"){
438
						if($info[i].articleType=="1"){
439
							(function(mo){
439
							(function(mo){
440
								cacheModel.getProfessor($info[i].professorId,function(sc,value){
440
								cacheModel.getProfessor($info[i].ownerId,function(sc,value){
441
									if(sc){
441
									if(sc){
442
										mo.find(".ownerName").html(value.name);
442
										mo.find(".ownerName").html(value.name);
443
									}else{
443
									}else{
447
							})($itemlist);
447
							})($itemlist);
448
						}else if($info[i].articleType=="2"){
448
						}else if($info[i].articleType=="2"){
449
							(function(mo){
449
							(function(mo){
450
								cacheModel.getCompany($info[i].onergId,function(sc, value){
450
								cacheModel.getCompany($info[i].ownenerId,function(sc, value){
451
									if(sc){
451
									if(sc){
452
										if(value.forShort){
452
										if(value.forShort){
453
											mo.find(".ownerName").html(value.forShort)
453
											mo.find(".ownerName").html(value.forShort)
459
									}
459
									}
460
								})
460
								})
461
							})($itemlist);
461
							})($itemlist);
462
						}else if($info[i].articleType=="3"){
463
							(function(mo){
464
								cacheModel.getPlatform($info[i].ownerId,function(sc, value){
465
									if(sc){
466
                                        mo.find(".ownerName").html(value.name);
467
									}else{
468
										console.log("error")
469
									}
470
								})
471
							})($itemlist);
462
						}
472
						}
463
					}
473
					}
464
				}
474
				}

+ 7 - 3
js/sevriceShow.js

355
							$("#oArticle").append($str);
355
							$("#oArticle").append($str);
356
							(function($str,i) {
356
							(function($str,i) {
357
								if($data[i].articleType=="1") {
357
								if($data[i].articleType=="1") {
358
									ajaxRequist("/ajax/professor/baseInfo/" + $data[i].professorId, {}, "get", function(data) {
358
									ajaxRequist("/ajax/professor/baseInfo/" + $data[i].ownerId, {}, "get", function(data) {
359
										$str.find(".name").text(data.data.name);
359
										$str.find(".name").text(data.data.name);
360
									})
360
									})
361
								}else{
362
									ajaxRequist("/ajax/org/" + $data[i].onergId, {}, "get", function(data) {
361
								}else if($data[i].articleType=="2"){
362
									ajaxRequist("/ajax/org/" + $data[i].ownenerId, {}, "get", function(data) {
363
										if(data.data.forShort) {
363
										if(data.data.forShort) {
364
											$str.find(".name").text(data.data.forShort);
364
											$str.find(".name").text(data.data.forShort);
365
										}else{
365
										}else{
366
											$str.find(".name").text(data.data.name);
366
											$str.find(".name").text(data.data.name);
367
										}
367
										}
368
									})
368
									})
369
								}else if($data[i].articleType=="3"){
370
									ajaxRequist("/ajax/platform/info", {id:$data[i].ownerId}, "get", function(data) {
371
										$str.find(".name").text(data.data.name);
372
									})
369
								}
373
								}
370
								/*if($data[i].articleAgree) {
374
								/*if($data[i].articleAgree) {
371
									$str.find(".zan").text('赞 ' + $data[i].articleAgree);
375
									$str.find(".zan").text('赞 ' + $data[i].articleAgree);

+ 20 - 10
js/userInforShow.js

241
						$(".resAreaTip").removeClass("displayNone")
241
						$(".resAreaTip").removeClass("displayNone")
242
						return;
242
						return;
243
					}
243
					}
244
					var arr=[];
245
					for(var i in $info) {
246
						arr[i]=$info[i].opreteProfessorId;
244
					var arr=[];
245
					for(var i in $info) {
246
						arr[i]=$info[i].opreteProfessorId;
247
					}
247
					}
248
					detailPro(arr,"areaCon");
248
					detailPro(arr,"areaCon");
249
				}
249
				}
1563
					document.getElementById(obj).appendChild(li);
1563
					document.getElementById(obj).appendChild(li);
1564
					if(dataItem.articleType=="1"){
1564
					if(dataItem.articleType=="1"){
1565
						(function(mo){
1565
						(function(mo){
1566
							cacheModel.getProfessor(dataItem.professorId,function(sc,value){
1566
							cacheModel.getProfessor(dataItem.ownerId,function(sc,value){
1567
								if(sc){
1567
								if(sc){
1568
									mo.find(".ownerName").html(value.name)
1568
									mo.find(".ownerName").html(value.name)
1569
								}else{
1569
								}else{
1573
						})($itemlist);
1573
						})($itemlist);
1574
					}else if(dataItem.articleType=="2"){
1574
					}else if(dataItem.articleType=="2"){
1575
						(function(mo){
1575
						(function(mo){
1576
							cacheModel.getCompany(dataItem.onergId,function(sc,value){
1576
							cacheModel.getCompany(dataItem.ownenerId,function(sc,value){
1577
								if(sc){
1577
								if(sc){
1578
									if(value.forShort){
1578
									if(value.forShort){
1579
										mo.find(".ownerName").html(value.forShort)
1579
										mo.find(".ownerName").html(value.forShort)
1585
								}
1585
								}
1586
							})
1586
							})
1587
						})($itemlist);
1587
						})($itemlist);
1588
					}else if(dataItem.articleType=="3"){
1589
						(function(mo){
1590
							cacheModel.getPlatform(dataItem.ownerId,function(sc,value){
1591
								if(sc){
1592
									mo.find(".ownerName").html(value.name)
1593
								}else{
1594
									console.log("error")
1595
								}
1596
							})
1597
						})($itemlist);
1588
					}
1598
					}
1589
				}
1599
				}
1590
			});
1600
			});
1878
				var pa=$(this).attr("rel")
1888
				var pa=$(this).attr("rel")
1879
				$("#"+pa).find("ul").html("")
1889
				$("#"+pa).find("ul").html("")
1880
				$("#"+pa).find(".js-load-more").show();
1890
				$("#"+pa).find(".js-load-more").show();
1881
				watchO={
1882
					beiTime:"",
1883
					beiProId:"",
1891
				watchO={
1892
					beiTime:"",
1893
					beiProId:"",
1884
				}
1894
				}
1885
				attentMyself(true);
1895
				attentMyself(true);
1886
			})
1896
			})
2014
	            $("#tab6user").addClass("liNow").siblings().removeClass("liNow");
2024
	            $("#tab6user").addClass("liNow").siblings().removeClass("liNow");
2015
	            $("#item1user").hide();
2025
	            $("#item1user").hide();
2016
	            $("#item6user").show();
2026
	            $("#item6user").show();
2017
	            if(userid === professorId) {
2018
	                $(".wendaNav").show();
2027
	            if(userid === professorId) {
2028
	                $(".wendaNav").show();
2019
	            }
2029
	            }
2020
	            $(".wendaNav li").eq(1).addClass("liNow").siblings().removeClass("liNow");
2030
	            $(".wendaNav li").eq(1).addClass("liNow").siblings().removeClass("liNow");
2021
	            $("#item6drop2").show().siblings().hide();
2031
	            $("#item6drop2").show().siblings().hide();