Browse Source

1.9.0版本相关bug

luyanan 7 years ago
parent
commit
da684516ff

+ 1 - 1
cmp-portal/js/public/common.js

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

+ 1 - 1
cmp-portal/js/resourceIssue.js

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

+ 4 - 2
css/genindex.css

691
.keyResult>ul.editUlistC>li,.keyResult>ul.editUlist>li{position:relative;padding:6px 12px;background: #fff;margin-bottom:0}
691
.keyResult>ul.editUlistC>li,.keyResult>ul.editUlist>li{position:relative;padding:6px 12px;background: #fff;margin-bottom:0}
692
.keyResult>ul.editUlist>li{float:left;}
692
.keyResult>ul.editUlist>li{float:left;}
693
.keyResult>ul.editUlistC>li{width:100%;margin-top:12px;}
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
.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
.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
.saveBtn .frmcontype{width: 120px;margin-right: 30px;margin-top: 20px;}
698
.saveBtn .frmcontype{width: 120px;margin-right: 30px;margin-top: 20px;}
746
.aboutPa ul>li.pointThis{cursor: pointer;}
747
.aboutPa ul>li.pointThis{cursor: pointer;}
747
.aboutPa .form-result>ul>li:hover{background:#FFFFFF;}
748
.aboutPa .form-result>ul>li:hover{background:#FFFFFF;}
748
.aboutPa .form-result ul.authorBox{position:relative;}
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

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

+ 1 - 1
js/articalModify.js

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

+ 1 - 1
js/common.js

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

+ 32 - 16
js/information.js

36
								proOther = $info.orgName + "," + $info.department
36
								proOther = $info.orgName + "," + $info.department
37
							}
37
							}
38
						}else{
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
					$("#proOther").text(proOther);
58
					$("#proOther").text(proOther);
518
				showDiv += "</div></li>";
534
				showDiv += "</div></li>";
519
				
535
				
520
				$("#researchAreaShow").append(showDiv);
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
			if( $("#researchAreaShow").find("li").length >= 10) {
540
			if( $("#researchAreaShow").find("li").length >= 10) {
561
			$("#researchAreaList").parents(".keyResult").siblings("div.col-w-12").hide();
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
		$("#researchArea").val("");
581
		$("#researchArea").val("");
566
	});
582
	});
567
	//研究方向删除
583
	//研究方向删除
670
					string +='<option value="其他">其他</option>'
686
					string +='<option value="其他">其他</option>'
671
					string +='</select></div></li>'
687
					string +='</select></div></li>'
672
				string += '<li><span class="col-w-2 lableSpan">毕业时间:</span><div class="col-w-9"><form action="" class="col-w-12" name="formT">'
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
				  		string +='<div class="mr_calendar_ym clearfix"><ul class="full_year"></ul></div></div>'
690
				  		string +='<div class="mr_calendar_ym clearfix"><ul class="full_year"></ul></div></div>'
675
					string +='</form></div></li>'
691
					string +='</form></div></li>'
676
				string +='<li class="saveBtn"><span class="col-w-2">&nbsp;</span><div class="col-w-10">'
692
				string +='<li class="saveBtn"><span class="col-w-2">&nbsp;</span><div class="col-w-10">'
705
				string +='<option value="其他">其他</option>'
721
				string +='<option value="其他">其他</option>'
706
				string +='</select></div></li>'
722
				string +='</select></div></li>'
707
			string += '<li><span class="col-w-2 lableSpan">毕业时间:</span><div class="col-w-9"><form action="" class="col-w-12" name="formT">'
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
			  		string +='<div class="mr_calendar_ym clearfix"><ul class="full_year"></ul></div></div>'
725
			  		string +='<div class="mr_calendar_ym clearfix"><ul class="full_year"></ul></div></div>'
710
				string +='</form></div></li>'
726
				string +='</form></div></li>'
711
			string +='<li class="saveBtn"><span class="col-w-2">&nbsp;</span><div class="col-w-10">'
727
			string +='<li class="saveBtn"><span class="col-w-2">&nbsp;</span><div class="col-w-10">'
824
					string += '<li><span class="col-w-2 lableSpan"><span class="requiredcon">* </span>职位:</span><div class="col-w-10">'
840
					string += '<li><span class="col-w-2 lableSpan"><span class="requiredcon">* </span>职位:</span><div class="col-w-10">'
825
						string += '<input type="text" class="frmcontype jobTitle" placeholder="请填写担任的职位" value="' + data[i].title + '" /></div></li>'
841
						string += '<input type="text" class="frmcontype jobTitle" placeholder="请填写担任的职位" value="' + data[i].title + '" /></div></li>'
826
					string += '<li><span class="col-w-2 lableSpan">任职时间:</span><div class="col-w-9"><form action="" class="col-w-12" name="formT">'
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
					 		string +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"></ul><ul class="mr_month"></ul></div></div>'
844
					 		string +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"></ul><ul class="mr_month"></ul></div></div>'
829
						string +='<div class="col-w-1 alignCenter">至</div>'
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
					  		string +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"></ul><ul class="mr_month"></ul></div></div>'
847
					  		string +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"></ul><ul class="mr_month"></ul></div></div>'
832
						string +='</form></div></li>'
848
						string +='</form></div></li>'
833
					string +='<li class="saveBtn"><span class="col-w-2">&nbsp;</span><div class="col-w-10">'
849
					string +='<li class="saveBtn"><span class="col-w-2">&nbsp;</span><div class="col-w-10">'
848
			string += '<li><span class="col-w-2 lableSpan"><span class="requiredcon">* </span>职位:</span><div class="col-w-10">'
864
			string += '<li><span class="col-w-2 lableSpan"><span class="requiredcon">* </span>职位:</span><div class="col-w-10">'
849
				string += '<input type="text" class="frmcontype jobTitle" placeholder="请填写担任的职位" /></div></li>'
865
				string += '<input type="text" class="frmcontype jobTitle" placeholder="请填写担任的职位" /></div></li>'
850
			string += '<li><span class="col-w-2 lableSpan">任职时间:</span><div class="col-w-9"><form action="" class="col-w-12" name="formT">'
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
			 		string +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"></ul><ul class="mr_month"></ul></div></div>'
868
			 		string +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"></ul><ul class="mr_month"></ul></div></div>'
853
				string +='<div class="col-w-1 alignCenter">至</div>'
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
			  		string +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"> </ul><ul class="mr_month"></ul></div></div>'
871
			  		string +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"> </ul><ul class="mr_month"></ul></div></div>'
856
				string +='</form></div></li>'
872
				string +='</form></div></li>'
857
			string +='<li class="saveBtn"><span class="col-w-2">&nbsp;</span><div class="col-w-10">'
873
			string +='<li class="saveBtn"><span class="col-w-2">&nbsp;</span><div class="col-w-10">'
993
				stringHtml += '<li><span class="col-w-2 lableSpan"><span class="requiredcon">* </span>项目名称:</span><div class="col-w-10">'
1009
				stringHtml += '<li><span class="col-w-2 lableSpan"><span class="requiredcon">* </span>项目名称:</span><div class="col-w-10">'
994
					stringHtml += '<input type="text" class="frmcontype projectName" placeholder="请填写项目名称" value="' + data[i].name + '" /><input type="hidden" class="projectId"  value="' + data[i].id + '"></div></li>'
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
				stringHtml += '<li><span class="col-w-2 lableSpan">项目时间:</span><div class="col-w-9"><form action="" class="col-w-12" name="formT">'
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
				 		stringHtml +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"></ul><ul class="mr_month"></ul></div></div>'
1013
				 		stringHtml +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"></ul><ul class="mr_month"></ul></div></div>'
998
					stringHtml +='<div class="col-w-1 alignCenter">至</div>'
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
				  		stringHtml +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"> </ul><ul class="mr_month"></ul></div></div>'
1016
				  		stringHtml +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"> </ul><ul class="mr_month"></ul></div></div>'
1001
					stringHtml +='</form></div></li>'
1017
					stringHtml +='</form></div></li>'
1002
				stringHtml += '<li><span class="col-w-2 lableSpan">项目描述:</span><div class="col-w-10">'
1018
				stringHtml += '<li><span class="col-w-2 lableSpan">项目描述:</span><div class="col-w-10">'
1016
			string += '<li><span class="col-w-2 lableSpan"><span class="requiredcon">* </span>项目名称:</span><div class="col-w-10">'
1032
			string += '<li><span class="col-w-2 lableSpan"><span class="requiredcon">* </span>项目名称:</span><div class="col-w-10">'
1017
				string += '<input type="text" class="frmcontype projectName" placeholder="请填写项目名称" /><input type="hidden" class="projectId"></div></li>'
1033
				string += '<input type="text" class="frmcontype projectName" placeholder="请填写项目名称" /><input type="hidden" class="projectId"></div></li>'
1018
			string += '<li><span class="col-w-2 lableSpan">项目时间:</span><div class="col-w-9"><form action="" class="col-w-12" name="formT">'
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
			 		string +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"></ul><ul class="mr_month"></ul></div></div>'
1036
			 		string +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"></ul><ul class="mr_month"></ul></div></div>'
1021
				string +='<div class="col-w-1 alignCenter">至</div>'
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
			  		string +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"> </ul><ul class="mr_month"></ul></div></div>'
1039
			  		string +='<div class="mr_calendar_ym clearfix"><ul class="mr_year"> </ul><ul class="mr_month"></ul></div></div>'
1024
				string +='</form></div></li>'
1040
				string +='</form></div></li>'
1025
			string += '<li><span class="col-w-2 lableSpan">项目描述:</span><div class="col-w-10">'
1041
			string += '<li><span class="col-w-2 lableSpan">项目描述:</span><div class="col-w-10">'
1132
					stringHtml += '<li><span class="col-w-2 lableSpan"><span class="requiredcon">* </span>奖项名称:</span><div class="col-w-10">'
1148
					stringHtml += '<li><span class="col-w-2 lableSpan"><span class="requiredcon">* </span>奖项名称:</span><div class="col-w-10">'
1133
						stringHtml += '<input type="text" class="frmcontype honorName" placeholder="请填写奖项名称" value="' + data[i].name + '" /><input type="hidden" class="honorId"  value="' + data[i].id + '"></div></li>'
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
					stringHtml += '<li><span class="col-w-2 lableSpan">获奖时间:</span><div class="col-w-9"><form action="" class="col-w-12" name="formT">'
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
					  		stringHtml +='<div class="mr_calendar_ym clearfix"><ul class="full_year"></ul></div></div>'
1152
					  		stringHtml +='<div class="mr_calendar_ym clearfix"><ul class="full_year"></ul></div></div>'
1137
						stringHtml +='</form></div></li>'
1153
						stringHtml +='</form></div></li>'
1138
					stringHtml += '<li><span class="col-w-2 lableSpan">获奖描述:</span><div class="col-w-10">'
1154
					stringHtml += '<li><span class="col-w-2 lableSpan">获奖描述:</span><div class="col-w-10">'
1150
			string += '<li><span class="col-w-2 lableSpan"><span class="requiredcon">* </span>奖项名称:</span><div class="col-w-10">'
1166
			string += '<li><span class="col-w-2 lableSpan"><span class="requiredcon">* </span>奖项名称:</span><div class="col-w-10">'
1151
				string += '<input type="text" class="frmcontype honorName" placeholder="请填写奖项名称" /><input type="hidden" class="honorId"></div></li>'
1167
				string += '<input type="text" class="frmcontype honorName" placeholder="请填写奖项名称" /><input type="hidden" class="honorId"></div></li>'
1152
			string += '<li><span class="col-w-2 lableSpan">项目时间:</span><div class="col-w-9"><form action="" class="col-w-12" name="formT">'
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
			  		string +='<div class="mr_calendar_ym clearfix"><ul class="full_year"></ul></div></div>'
1170
			  		string +='<div class="mr_calendar_ym clearfix"><ul class="full_year"></ul></div></div>'
1155
				string +='</form></div></li>'
1171
				string +='</form></div></li>'
1156
			string += '<li><span class="col-w-2 lableSpan">获奖描述:</span><div class="col-w-10">'
1172
			string += '<li><span class="col-w-2 lableSpan">获奖描述:</span><div class="col-w-10">'
1227
	$(".headconBox").on("click",".proEdit",function() {
1243
	$(".headconBox").on("click",".proEdit",function() {
1228
		$(this).parents(".coninfocon").siblings(".modifybox").show();
1244
		$(this).parents(".coninfocon").siblings(".modifybox").show();
1229
		$(this).parents(".coninfocon").hide();
1245
		$(this).parents(".coninfocon").hide();
1230
		$(".head-left").css("top","30px");
1246
		$(".head-left").css("top","100px");
1231
		//点击取消的操作
1247
		//点击取消的操作
1232
		$(".btnCancel").click(function() {
1248
		$(".btnCancel").click(function() {
1233
			$(".head-left").css("top","");
1249
			$(".head-left").css("top","");

+ 1 - 1
js/resourceIssue.js

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

+ 19 - 3
js/userInforShow.js

2
	loginStatus();//判断个人是否登录
2
	loginStatus();//判断个人是否登录
3
	var userid = $.cookie("userid");
3
	var userid = $.cookie("userid");
4
	var professorId = GetQueryString("professorId");
4
	var professorId = GetQueryString("professorId");
5
5
	var oArray=[];
6
	if(userid != professorId) {
6
	if(userid != professorId) {
7
		ifcollectionAbout(professorId, 1)
7
		ifcollectionAbout(professorId, 1)
8
		$(".goSpan").show();
8
		$(".goSpan").show();
268
			success: function(data) {
268
			success: function(data) {
269
				var $info = data.data;
269
				var $info = data.data;
270
				if(data.success) {
270
				if(data.success) {
271
					console.log(data)
271
					if($info.hasHeadImage){
272
					if($info.hasHeadImage){
272
						$("#proHead").css("background-image","url(/images/head/"+ $info.id +"_l.jpg)");
273
						$("#proHead").css("background-image","url(/images/head/"+ $info.id +"_l.jpg)");
273
					}
274
					}
286
								proOther = $info.orgName + "," + $info.department
287
								proOther = $info.orgName + "," + $info.department
287
							}
288
							}
288
						}else{
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
					$("#proOther").text(proOther);
309
					$("#proOther").text(proOther);
381
	}
398
	}
382
	
399
	
383
	function researchAreaShow($datas, $datarecords) {
400
	function researchAreaShow($datas, $datarecords) {
384
		var oArray=[];
385
		if($datas != undefined && $datas.length != 0) {
401
		if($datas != undefined && $datas.length != 0) {
386
			var html = [];
402
			var html = [];
387
			for(var i = 0; i < $datas.length; ++i) {
403
			for(var i = 0; i < $datas.length; ++i) {