Merge remote-tracking branch 'origin/test'

cmp-portal/js/articalModify.js

@@ -484,8 +484,8 @@ $(function() {
			$(".imgtis").text("");
			imgflase = true;
		}*/
		if(newstitle==""){
			$.MsgBox.Alert('提示', '请输入文章标题')
		if(newstitle==""){
			$.MsgBox.Alert('提示', '请输入文章标题')
			return;
		}else{
			$("#aboutTit span").text("");
@@ -718,4 +718,4 @@ $(function() {
		return otme;
	}
});
});

e/a.html

@@ -122,6 +122,7 @@
					articleMess: function($data) {
						console.log($data);
						document.getElementById("articleName").innerHTML = $data.articleTitle;
						$("#oTime").text(commenTime($data.createTime))
						shareTitle=$data.articleTitle;
						$("#oTime").text(commenTime($data.createTime))
						document.title=$data.articleTitle;
@@ -130,10 +131,9 @@
						console.log(stt)
						if($data.articleContent) {
							document.getElementById("articleContent").innerHTML = $data.articleContent;
							
							descContent=document.getElementById("articleContent").innerText;
							console.log($data.articleContent)
							console.log(descContent)
							console.log(descContent)
						}
						if($data.subject) {
							document.getElementsByClassName("tagList")[0].style.display = "block";
@@ -170,9 +170,7 @@
							document.getElementById('name').innerHTML = $data.forShort;
						}else{
							document.getElementById('name').innerHTML = $data.name;
						}
						document.getElementById("messImg").classList.add("cmpHead");
						document.getElementById("messImg").innerHTML='<div class="boxBlock" style="width:50px;height:50px;"><img class="boxBlockimg" id="companyImg" src="../images/default-icon.jpg"></div>'
						}
						if($data.hasOrgLogo) {
							document.getElementById("companyImg").src= "/images/org/" + $data.id + ".jpg";
						}
@@ -185,11 +183,10 @@
				oArticleModule.oAjaxGet("../ajax/article/query", {
					articleId: oArticleModule.articleId
				}, "get", oArticleModule.articleMess);
				
				shareWays();//分享方式
				shareWays();//分享方式
			})
		</script>
	</body>
</html>
</html>

e/r.html

@@ -205,7 +205,6 @@ $(document).ready(function() {
						}else{
							othisName.innerHTML = mydata.organization.name;
						}
						
						if(mydata.organization.subject){
							othisOther.innerHTML = (mydata.organization.subject).replace(/,/, " | ");
						}
@@ -274,4 +273,4 @@ $(document).ready(function() {
</script>
</body>
</html>
</html>

js/articalIssue.js

@@ -546,4 +546,4 @@ $(function() {
			}
		})
	}
});
});

js/articalModify.js

@@ -482,7 +482,7 @@ $(function() {
			imgflase = true;
		}*/
		if(newstitle==""){
			$.MsgBox.Alert('提示', '请输入文章标题')
			$.MsgBox.Alert('提示', '请输入文章标题')
			return;
		}else{
			$("#aboutTit span").text("");
@@ -715,4 +715,4 @@ $(function() {
		return otme;
	}
});
});

js/articalShow.js

@@ -180,6 +180,7 @@ $(function() {
						$itemlist = $(itemlist);
						$("#relevantExperts").append($itemlist);
						if(data.data.title) {
							if(data.data.department) {
								$itemlist.find("#usertitle").text(data.data.title +" , "+ data.data.department);
							}else{
@@ -194,13 +195,12 @@ $(function() {
								}
							}else{
								if(data.data.department) {
									$itemlist.find("#usertitle").text(data.data.department);
									$itemlist.find("#usertitle").text(data.data.department);
								}
							}
						}
						$itemlist.find("#userName").text(data.data.name);
						
						$itemlist.find(".urlgo").attr("href", "userInforShow.html?professorId="+data.data.id);
						$itemlist.find("#userName").text(data.data.name);				
						$itemlist.find(".urlgo").attr("href", "userInforShow.html?professorId="+data.data.id);
						/*获取研究方向信息*/
						var researchAreas = data.data.researchAreas;
						if(researchAreas != ""){

js/common.js

@@ -514,10 +514,8 @@ $(".msgContbox textarea").focus(function() {
}).blur(function() {
	$(this).parent().css("border-color", "#E5E5E5");
})
//时间显示规则
function commenTime(startTime) {
	//console.log(startTime)
	var nowTimg = new Date();
	var startdate = new Date();
	startdate.setFullYear(parseInt(startTime.substring(0, 4)));

js/discover.js

@@ -143,7 +143,7 @@ $(function() {
					if(data.data.forShort) {
						$itemlist.find("#nameSpan").text(data.data.forShort);
					}else{
						$itemlist.find("#nameSpan").text(data.data.name);
						$itemlist.find("#nameSpan").text(data.data.name);
					}
					$itemlist.find("#userimg").attr("style", "background:#fff");
					$itemlist.find("#userimg").html('<div class="boxBlock"><img class="boxBlockimg companyImg" src=""></div>');
@@ -170,4 +170,4 @@ $(function() {
	
})
})

js/information.brow.js

@@ -195,6 +195,7 @@ $(function() {
				}
			}
		}
		var oarray=[];
		var researchAreaShow = function($datas, $datarecords) {
			if($datas != undefined && $datas.length != 0) {
				var html = [];
@@ -210,11 +211,12 @@ $(function() {
						if(userid == $photos[j].id)
							isAgree++;
					}
					oarray[i]=$data.caption;
					if(professorId != userid) {
						if(isAgree) {
							var showDiv = "<div class='listbox listbox-browse clear'><div class='list-browse favorBox' caption='" + $data.caption + "'><span class='like'>" + $data.count + "</span>" + $data.caption + "</div><span class='plus ' data-pid='" + $data.professorId + "' data-caption='" + $data.caption + "' data-isagree='" + isAgree + "' ></span><div class='like-num favorBox' caption='" + $data.caption + "'>";
							var showDiv = "<div class='listbox listbox-browse clear'><div class='list-browse favorBox' caption='" + $data.caption + "'><span class='like'>" + $data.count + "</span>" + $data.caption + "</div><span class='plus ' data-pid='" + $data.professorId + "' data-caption='" + i + "' data-isagree='" + isAgree + "' ></span><div class='like-num favorBox' caption='" +$data.caption + "'>";
						} else {
							var showDiv = "<div class='listbox listbox-browse clear'><div class='list-browse favorBox' caption='" + $data.caption + "'><span class='like'>" + $data.count + "</span>" + $data.caption + "</div><span class='plus' style=' background-position-y:-26px' data-pid='" + $data.professorId + "' data-caption='" + $data.caption + "' data-isagree='" + isAgree + "' ></span><div class='like-num favorBox' caption='" + $data.caption + "'>";
							var showDiv = "<div class='listbox listbox-browse clear'><div class='list-browse favorBox' caption='" + $data.caption + "'><span class='like'>" + $data.count + "</span>" + $data.caption + "</div><span class='plus' style=' background-position-y:-26px' data-pid='" + $data.professorId + "' data-caption='" + i + "' data-isagree='" + isAgree + "' ></span><div class='like-num favorBox' caption='" + $data.caption + "'>";
						}
					} else {
						var showDiv = "<div class='listbox listbox-browse clear'><div class='list-browse favorBox' caption='" + $data.caption + "'><span class='like'>" + $data.count + "</span>" + $data.caption + "</div><div class='like-num favorBox' caption='" + $data.caption + "'>";
@@ -281,7 +283,7 @@ $(function() {
						"type": "POST",
						"data": {
							"targetId": $(this).data("pid"),
							"targetCaption": $(this).data("caption"),
							"targetCaption": oarray[$(this).data("caption")],
							"opId": userid
						},
						"contentType": "application/x-www-form-urlencoded",

js/resourceShow.js

@@ -672,4 +672,4 @@ $(document).ready(function() {
	})
	
	
})
})