Etusivu Tutki Apua
Rekisteröidy Kirjaudu sisään
jiapeng
/
portal-front
Tarkkaile 3
Äänestä 0
Fork 0
Koodi Ongelmat 0 Pull-pyynnöt 0 Commitit 677 Julkaisut 0 Wiki
Selaa lähdekoodia

1.9.0版本相关bug

luyanan 7 vuotta sitten
vanhempi
4c43c50c24
commit
da684516ff
9 muutettua tiedostoa jossa 61 lisäystä ja 27 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 1 1
      cmp-portal/js/public/common.js
  2. 1 1
      cmp-portal/js/resourceIssue.js
  3. 4 2
      css/genindex.css
  4. 1 1
      js/articalIssue.js
  5. 1 1
      js/articalModify.js
  6. 1 1
      js/common.js
  7. 32 16
      js/information.js
  8. 1 1
      js/resourceIssue.js
  9. 19 3
      js/userInforShow.js

+ 1 - 1
cmp-portal/js/public/common.js
Näytä tiedosto 

@ -268,7 +268,7 @@ function hotKey(sel) {
268 268 
								} else {
269 269 
									$this.siblings(".keydrop").removeClass("displayNone");
270 270 
									var oSr = "";
271 
									for(var i = 0; i < data.data.length; i++) {
271 
									for(var i = 0; i < 5; i++) {
272 272 
										oSr += '<li>' + data.data[i].caption + '<div class="closeThis"></div></li>';
273 273 
									}
274 274 
									$this.siblings(".keydrop").find("ul").html(oSr);

+ 1 - 1
cmp-portal/js/resourceIssue.js
Näytä tiedosto 

@ -230,7 +230,7 @@ $(document).ready(function() {
230 230 
								}else{
231 231 
									$("#keyList").removeClass("displayNone");
232 232 
								var oSr = "";
233 
								for(var i = 0; i < data.data.length; i++) {
233 
								for(var i = 0; i < 5; i++) {
234 234 
									oSr += '<li><p class="h2Font">' + data.data[i].caption + '</p></li>'
235 235 
								}
236 236 
								$("#keyList ul").html(oSr);

+ 4 - 2
css/genindex.css
Näytä tiedosto 

@ -691,7 +691,8 @@ div.zoomMask{position:absolute;background:url("../images/g-resource-mask.png") r
691 691 
.keyResult>ul.editUlistC>li,.keyResult>ul.editUlist>li{position:relative;padding:6px 12px;background: #fff;margin-bottom:0}
692 692 
.keyResult>ul.editUlist>li{float:left;}
693 693 
.keyResult>ul.editUlistC>li{width:100%;margin-top:12px;}
694 
.keyResult>ul.editUlistC>li.yjlist{display:inline-block;width:auto;text-align:left;border-radius:0;line-height: 26px;padding:0 12px 0 0;}
694 
.keyResult>ul.editUlistC>li.yjlist{margin:10px 0 0 0;width:100%;text-align:left;border-radius:0;line-height: 26px;border:none;background: none;padding:0 12px 0 0;}
695 
.keyResult>ul.editUlistC>li.yjlist>div{width: auto; position:relative;border: 1px solid #E5E5E5;background: #fff;display: inline-block;padding:0 12px 0 0;}
695 696 
.keyResult>ul.editUlistC>li.yjlist .like{ display:inline-block;float: left;text-align:center; min-width:28px;padding:0 6px;background:#ff9900; color:#fff;font-size:10px;margin-right:5px;}
696 697
697 698 
.saveBtn .frmcontype{width: 120px;margin-right: 30px;margin-top: 20px;}
 
@ -746,4 +747,5 @@ div.zoomMask{position:absolute;background:url("../images/g-resource-mask.png") r
746 747 
.aboutPa ul>li.pointThis{cursor: pointer;}
747 748 
.aboutPa .form-result>ul>li:hover{background:#FFFFFF;}
748 749 
.aboutPa .form-result ul.authorBox{position:relative;}
749 
.aboutPa .form-result ul.authorBox.removeHe{height:auto;}
750 
.aboutPa .form-result ul.authorBox>li>a{max-width:80%;}
751

+ 1 - 1
js/articalIssue.js
Näytä tiedosto 

@ -280,7 +280,7 @@ $(function() {
280 280 
						var itemlist = '';
281 281 
						$("#keydropList").html("");
282 282 
						$(".keydrop").show();
283 
						for(var i = 0; i < data.data.length; i++) {
283 
						for(var i = 0; i < 5; i++) {
284 284 
							var itemlist = '<li><p class="h2Font"></p></li>';
285 285 
							$itemlist = $(itemlist);
286 286 
							$("#keydropList").append($itemlist);

+ 1 - 1
js/articalModify.js
Näytä tiedosto 

@ -302,7 +302,7 @@ $(function() {
302 302 
						var itemlist = '';
303 303 
						$("#keydropList").html("");
304 304 
						$(".keydrop").show();
305 
						for(var i = 0; i < data.data.length; i++) {
305 
						for(var i = 0; i < 5; i++) {
306 306 
							var itemlist = '<li><p class="h2Font"></p></li>';
307 307 
							$itemlist = $(itemlist);
308 308 
							$("#keydropList").append($itemlist);

+ 1 - 1
js/common.js
Näytä tiedosto 

@ -765,7 +765,7 @@ function hotKey(sel, num) {
765 765 
								} else {
766 766 
									$this.siblings(".keydrop").removeClass("displayNone");
767 767 
									var oSr = "";
768 
									for(var i = 0; i < data.data.length; i++) {
768 
									for(var i = 0; i < 5; i++) {
769 769 
										oSr += '<li>' + data.data[i].caption + '<div class="closeThis"></div></li>';
770 770 
									}
771 771 
									$this.siblings(".keydrop").find("ul").html(oSr);

+ 32 - 16
js/information.js
Näytä tiedosto 

@ -36,7 +36,23 @@ $(function() {
36 36 
								proOther = $info.orgName + "，" + $info.department
37 37 
							}
38 38 
						}else{
39 
							proOther = $info.orgName
39 
							if($info.office){
40 
								proOther = $info.orgName +"，" + $info.office
41 
							}else{
42 
								proOther = $info.orgName
43 
							}
44 
						}
45 
					}else{
46 
						if($info.department){
47 
							if($info.office){
48 
								proOther =  $info.department + "，" + $info.office
49 
							}else{
50 
								proOther =  $info.department
51 
							}
52 
						}else{
53 
							if($info.office){
54 
								proOther = $info.office
55 
							}
40 56 
						}
41 57 
					}
42 58 
					$("#proOther").text(proOther);

@ -518,7 +534,7 @@ $(function() {
518 534 
				showDiv += "</div></li>";
519 535
520 536 
				$("#researchAreaShow").append(showDiv);
521 
				$("#researchAreaList").append("<li class='yjlist'><span class='like'>" + $data.count + "</span><span class='ra'>" + $data.caption + "</span><span class='closeThis'></span></li>");
537 
				$("#researchAreaList").append("<li class='yjlist'><div><span class='like'>" + $data.count + "</span><span class='ra'>" + $data.caption + "</span><span class='closeThis'></span></div></li>");
522 538
523 539 
			}
524 540 
			if( $("#researchAreaShow").find("li").length >= 10) {

@ -561,7 +577,7 @@ $(function() {
561 577 
			$("#researchAreaList").parents(".keyResult").siblings("div.col-w-12").hide();
562 578 
		}
563 579
564 
		$("#researchAreaList").append("<li class='yjlist'><span class='like'>0</span><span class='ra'>" + researchArea + "</span><span class='closeThis'></span></li>");
580 
		$("#researchAreaList").append("<li class='yjlist'><div><span class='like'>0</span><span class='ra'>" + researchArea + "</span><span class='closeThis'></span></div></li>");
565 581 
		$("#researchArea").val("");
566 582 
	});
567 583 
	//研究方向删除

@ -670,7 +686,7 @@ $(function() {
670 686 
					string +='<option value="其他">其他</option>'
671 687 
					string +='</select></div></li>'
672 688 
				string += '<li><span class="col-w-2 lableSpan">毕业时间：</span><div class="col-w-9"><form action="" class="col-w-12" name="formT">'
673 
					string +='<div class="col-w-5" style="position:relative"><em class="mr_sj"></em><input type="text" class="date-btn frmcontype year" flag="1" placeholder="请选择毕业时间" value="' + data[i].year + '" />'
689 
					string +='<div class="col-w-5" style="position:relative"><em class="mr_sj"></em><input type="text" class="date-btn frmcontype year" flag="1" placeholder="请选择毕业时间" value="' + data[i].year + '" readonly />'
674 690 
				  		string +='<div class="mr_calendar_ym clearfix"><ul class="full_year"></ul></div></div>'
675 691 
					string +='</form></div></li>'
676 692 
				string +='<li class="saveBtn"><span class="col-w-2">&nbsp;</span><div class="col-w-10">'

@ -705,7 +721,7 @@ $(function() {
705 721 
				string +='<option value="其他">其他</option>'
706 722 
				string +='</select></div></li>'
707 723 
			string += '<li><span class="col-w-2 lableSpan">毕业时间：</span><div class="col-w-9"><form action="" class="col-w-12" name="formT">'
708 
				string +='<div class="col-w-5" style="position:relative"><em class="mr_sj"></em><input type="text" class="date-btn frmcontype year" flag="1" placeholder="请选择毕业时间" />'
724 
				string +='<div class="col-w-5" style="position:relative"><em class="mr_sj"></em><input type="text" class="date-btn frmcontype year" flag="1" placeholder="请选择毕业时间" readonly/>'
709 725 
			  		string +='<div class="mr_calendar_ym clearfix"><ul class="full_year"></ul></div></div>'
710 726 
				string +='</form></div></li>'
711 727 
			string +='<li class="saveBtn"><span class="col-w-2">&nbsp;</span><div class="col-w-10">'

@ -824,10 +840,10 @@ $(function() {
824 840 
					string += '<li><span class="col-w-2 lableSpan"><span class="requiredcon">* </span>职位：</span><div class="col-w-10">'
825 841 
						string += '<input type="text" class="frmcontype jobTitle" placeholder="请填写担任的职位" value="' + data[i].title + '" /></div></li>'
826 842 
					string += '<li><span class="col-w-2 lableSpan">任职时间：</span><div class="col-w-9"><form action="" class="col-w-12" name="formT">'
827 
						string += '<div class="col-w-5" style="position:relative"><input type="text" class="date-btn frmcontype StartMonth" flag="2" difference="1" placeholder="请选择起始时间" value="' + sDateV + '" />'
843 
						string += '<div class="col-w-5" style="position:relative"><input type="text" class="date-btn frmcontype StartMonth" flag="2" difference="1" placeholder="请选择起始时间" readonly value="' + sDateV + '" />'
828 844 
					 		string +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"></ul><ul class="mr_month"></ul></div></div>'
829 845 
						string +='<div class="col-w-1 alignCenter">至</div>'
830 
						string +='<div class="col-w-5" style="position:relative"><input type="text" class="date-btn frmcontype StopMonth" flag="2" difference="2" placeholder="请选择结束时间" value="' + eDateV + '" />'
846 
						string +='<div class="col-w-5" style="position:relative"><input type="text" class="date-btn frmcontype StopMonth" flag="2" difference="2" placeholder="请选择结束时间" readonly value="' + eDateV + '" />'
831 847 
					  		string +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"></ul><ul class="mr_month"></ul></div></div>'
832 848 
						string +='</form></div></li>'
833 849 
					string +='<li class="saveBtn"><span class="col-w-2">&nbsp;</span><div class="col-w-10">'

@ -848,10 +864,10 @@ $(function() {
848 864 
			string += '<li><span class="col-w-2 lableSpan"><span class="requiredcon">* </span>职位：</span><div class="col-w-10">'
849 865 
				string += '<input type="text" class="frmcontype jobTitle" placeholder="请填写担任的职位" /></div></li>'
850 866 
			string += '<li><span class="col-w-2 lableSpan">任职时间：</span><div class="col-w-9"><form action="" class="col-w-12" name="formT">'
851 
				string += '<div class="col-w-5" style="position:relative"><input type="text" class="date-btn frmcontype StartMonth" flag="2" difference="1" placeholder="请选择起始时间" />'
867 
				string += '<div class="col-w-5" style="position:relative"><input type="text" class="date-btn frmcontype StartMonth" flag="2" difference="1" placeholder="请选择起始时间" readonly />'
852 868 
			 		string +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"></ul><ul class="mr_month"></ul></div></div>'
853 869 
				string +='<div class="col-w-1 alignCenter">至</div>'
854 
				string +='<div class="col-w-5" style="position:relative"><input type="text" class="date-btn frmcontype StopMonth" flag="2" difference="2" placeholder="请选择结束时间" />'
870 
				string +='<div class="col-w-5" style="position:relative"><input type="text" class="date-btn frmcontype StopMonth" flag="2" difference="2" placeholder="请选择结束时间" readonly />'
855 871 
			  		string +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"> </ul><ul class="mr_month"></ul></div></div>'
856 872 
				string +='</form></div></li>'
857 873 
			string +='<li class="saveBtn"><span class="col-w-2">&nbsp;</span><div class="col-w-10">'

@ -993,10 +1009,10 @@ $(function() {
993 1009 
				stringHtml += '<li><span class="col-w-2 lableSpan"><span class="requiredcon">* </span>项目名称：</span><div class="col-w-10">'
994 1010 
					stringHtml += '<input type="text" class="frmcontype projectName" placeholder="请填写项目名称" value="' + data[i].name + '" /><input type="hidden" class="projectId"  value="' + data[i].id + '"></div></li>'
995 1011 
				stringHtml += '<li><span class="col-w-2 lableSpan">项目时间：</span><div class="col-w-9"><form action="" class="col-w-12" name="formT">'
996 
					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 + '" />'
1012 
					stringHtml += '<div class="col-w-5" style="position:relative"><input type="text" class="date-btn frmcontype project StartMonth" flag="2" difference="1" placeholder="请选择起始时间" readonly value="' +sDateV + '" />'
997 1013 
				 		stringHtml +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"></ul><ul class="mr_month"></ul></div></div>'
998 1014 
					stringHtml +='<div class="col-w-1 alignCenter">至</div>'
999 
					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 + '" />'
1015 
					stringHtml +='<div class="col-w-5" style="position:relative"><input type="text" class="date-btn frmcontype project StopMonth" flag="2" difference="2" placeholder="请选择结束时间" readonly value="' + eDateV + '" />'
1000 1016 
				  		stringHtml +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"> </ul><ul class="mr_month"></ul></div></div>'
1001 1017 
					stringHtml +='</form></div></li>'
1002 1018 
				stringHtml += '<li><span class="col-w-2 lableSpan">项目描述：</span><div class="col-w-10">'

@ -1016,10 +1032,10 @@ $(function() {
1016 1032 
			string += '<li><span class="col-w-2 lableSpan"><span class="requiredcon">* </span>项目名称：</span><div class="col-w-10">'
1017 1033 
				string += '<input type="text" class="frmcontype projectName" placeholder="请填写项目名称" /><input type="hidden" class="projectId"></div></li>'
1018 1034 
			string += '<li><span class="col-w-2 lableSpan">项目时间：</span><div class="col-w-9"><form action="" class="col-w-12" name="formT">'
1019 
				string += '<div class="col-w-5" style="position:relative"><input type="text" class="date-btn frmcontype project StartMonth" flag="2" difference="1" placeholder="请选择起始时间" />'
1035 
				string += '<div class="col-w-5" style="position:relative"><input type="text" class="date-btn frmcontype project StartMonth" flag="2" difference="1" readonly placeholder="请选择起始时间" />'
1020 1036 
			 		string +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"></ul><ul class="mr_month"></ul></div></div>'
1021 1037 
				string +='<div class="col-w-1 alignCenter">至</div>'
1022 
				string +='<div class="col-w-5" style="position:relative"><input type="text" class="date-btn frmcontype project StopMonth" flag="2" difference="2" placeholder="请选择结束时间" />'
1038 
				string +='<div class="col-w-5" style="position:relative"><input type="text" class="date-btn frmcontype project StopMonth" flag="2" difference="2" readonly placeholder="请选择结束时间" />'
1023 1039 
			  		string +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"> </ul><ul class="mr_month"></ul></div></div>'
1024 1040 
				string +='</form></div></li>'
1025 1041 
			string += '<li><span class="col-w-2 lableSpan">项目描述：</span><div class="col-w-10">'

@ -1132,7 +1148,7 @@ $(function() {
1132 1148 
					stringHtml += '<li><span class="col-w-2 lableSpan"><span class="requiredcon">* </span>奖项名称：</span><div class="col-w-10">'
1133 1149 
						stringHtml += '<input type="text" class="frmcontype honorName" placeholder="请填写奖项名称" value="' + data[i].name + '" /><input type="hidden" class="honorId"  value="' + data[i].id + '"></div></li>'
1134 1150 
					stringHtml += '<li><span class="col-w-2 lableSpan">获奖时间：</span><div class="col-w-9"><form action="" class="col-w-12" name="formT">'
1135 
						stringHtml +='<div class="col-w-5" style="position:relative"><input type="text" class="date-btn frmcontype project honorYear" placeholder="请填写奖项时间" flag="1" value="' + data[i].year + '" />'
1151 
						stringHtml +='<div class="col-w-5" style="position:relative"><input type="text" class="date-btn frmcontype project honorYear" placeholder="请填写奖项时间" readonly flag="1" value="' + data[i].year + '" />'
1136 1152 
					  		stringHtml +='<div class="mr_calendar_ym clearfix"><ul class="full_year"></ul></div></div>'
1137 1153 
						stringHtml +='</form></div></li>'
1138 1154 
					stringHtml += '<li><span class="col-w-2 lableSpan">获奖描述：</span><div class="col-w-10">'

@ -1150,7 +1166,7 @@ $(function() {
1150 1166 
			string += '<li><span class="col-w-2 lableSpan"><span class="requiredcon">* </span>奖项名称：</span><div class="col-w-10">'
1151 1167 
				string += '<input type="text" class="frmcontype honorName" placeholder="请填写奖项名称" /><input type="hidden" class="honorId"></div></li>'
1152 1168 
			string += '<li><span class="col-w-2 lableSpan">项目时间：</span><div class="col-w-9"><form action="" class="col-w-12" name="formT">'
1153 
				string +='<div class="col-w-5" style="position:relative"><input type="text" class="date-btn frmcontype honorYear" flag="1" placeholder="请选择获奖时间" />'
1169 
				string +='<div class="col-w-5" style="position:relative"><input type="text" class="date-btn frmcontype honorYear" flag="1" readonly placeholder="请选择获奖时间" />'
1154 1170 
			  		string +='<div class="mr_calendar_ym clearfix"><ul class="full_year"></ul></div></div>'
1155 1171 
				string +='</form></div></li>'
1156 1172 
			string += '<li><span class="col-w-2 lableSpan">获奖描述：</span><div class="col-w-10">'

@ -1227,7 +1243,7 @@ $(function() {
1227 1243 
	$(".headconBox").on("click",".proEdit",function() {
1228 1244 
		$(this).parents(".coninfocon").siblings(".modifybox").show();
1229 1245 
		$(this).parents(".coninfocon").hide();
1230 
		$(".head-left").css("top","30px");
1246 
		$(".head-left").css("top","100px");
1231 1247 
		//点击取消的操作
1232 1248 
		$(".btnCancel").click(function() {
1233 1249 
			$(".head-left").css("top","");

+ 1 - 1
js/resourceIssue.js
Näytä tiedosto 

@ -237,7 +237,7 @@ $(document).ready(function() {
237 237 
								}else{
238 238 
									$("#keyList").removeClass("displayNone");
239 239 
									var oSr="";
240 
									for(var i=0;i<data.data.length;i++) {
240 
									for(var i=0;i<5;i++) {
241 241 
										oSr+='<li><p class="h2Font">'+data.data[i].caption+'</p></li>'
242 242 
									}
243 243 
									$("#keyList ul").html(oSr);

+ 19 - 3
js/userInforShow.js
Näytä tiedosto 

@ -2,7 +2,7 @@ $(function() {
2 2 
	loginStatus();//判断个人是否登录
3 3 
	var userid = $.cookie("userid");
4 4 
	var professorId = GetQueryString("professorId");
5
5 
	var oArray=[];
6 6 
	if(userid != professorId) {
7 7 
		ifcollectionAbout(professorId, 1)
8 8 
		$(".goSpan").show();
 
@ -268,6 +268,7 @@ $(function() {
268 268 
			success: function(data) {
269 269 
				var $info = data.data;
270 270 
				if(data.success) {
271 
					console.log(data)
271 272 
					if($info.hasHeadImage){
272 273 
						$("#proHead").css("background-image","url(/images/head/"+ $info.id +"_l.jpg)");
273 274 
					}
 
@ -286,7 +287,23 @@ $(function() {
286 287 
								proOther = $info.orgName + "，" + $info.department
287 288 
							}
288 289 
						}else{
289 
							proOther = $info.orgName
290 
							if($info.office){
291 
								proOther = $info.orgName +"，" + $info.office
292 
							}else{
293 
								proOther = $info.orgName
294 
							}
295 
						}
296 
					}else{
297 
						if($info.department){
298 
							if($info.office){
299 
								proOther =  $info.department + "，" + $info.office
300 
							}else{
301 
								proOther =  $info.department
302 
							}
303 
						}else{
304 
							if($info.office){
305 
								proOther = $info.office
306 
							}
290 307 
						}
291 308 
					}
292 309 
					$("#proOther").text(proOther);
 
@ -381,7 +398,6 @@ $(function() {
381 398 
	}
382 399
383 400 
	function researchAreaShow($datas, $datarecords) {
384 
		var oArray=[];
385 401 
		if($datas != undefined && $datas.length != 0) {
386 402 
			var html = [];
387 403 
			for(var i = 0; i < $datas.length; ++i) {