Bladeren bron

所有时间选择栏与需求文档不一致问题解决

luyanan 8 jaren geleden
bovenliggende
commit
0cdc44815b
3 gewijzigde bestanden met toevoegingen van 37 en 80 verwijderingen
  1. BIN
      src/main/webapp/images/select.png
  2. 37 28
      src/main/webapp/information.html
  3. 0 52
      src/main/webapp/js/information.js

BIN
src/main/webapp/images/select.png


+ 37 - 28
src/main/webapp/information.html

@ -9,22 +9,17 @@
9 9
<meta http-equiv="X-UA-Compatible" content="IE=edge">
10 10
<title>科袖-修改专家信息</title>
11 11
<link href="css/bootstrap.min.css" rel="stylesheet">
12
<link href="css/font-awesome.min.css" rel="stylesheet">
13
<link rel="stylesheet" type="text/css" media="all" href="css/daterangepicker-bs3.css"/>
12

14 13
<link rel="stylesheet" href="css/reset.css" />
15 14
<link rel="stylesheet" type="text/css" href="css/style.css" />
16 15
<link type="text/css" href="css/index.css" rel="stylesheet">
17 16

18 17
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
19 18

20
<script type="text/javascript" src="js/bootstrap.min.js"></script>
21
<script type="text/javascript" src="js/moment.js"></script>
22
<script type="text/javascript" src="js/daterangepicker.js"></script>
23

24 19
<script type="text/javascript" src="js/index.js"></script>
25 20
<script type="text/javascript" src="js/information.js"></script>
26
<script type="text/javascript" src="/js/jquery.cookie.js"></script>
27
<script type="text/javascript" src="/js/common.js"></script>
21
<script type="text/javascript" src="js/jquery.cookie.js"></script>
22
<script type="text/javascript" src="js/common.js"></script>
28 23
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
29 24
<script type="text/javascript">
30 25

@ -185,7 +180,7 @@
185 180
						}
186 181
						if($photos.length>0){
187 182
							for(var j =0 ; j< $photos.length;++j){
188
								showDiv += "<span class='like-people'><img src='"+servPath+"/images/head/"+$photos[j]+"_s.jpg'></span>";
183
								showDiv += "<span class='like-people'><img class='like-h' src='"+servPath+"/images/head/"+$photos[j]+"_s.jpg'></span>";
189 184
							} 
190 185
						}
191 186
						showDiv += "</div></div>";
@ -196,6 +191,12 @@
196 191
						// $("#researchAreaList").append("</span>");
197 192
						// $("#researchAreaList").append($data.caption);
198 193
						// $("#researchAreaList").append("<span class=\"remove\"><img src=\"images/move.png\"></span></div>");
194
						
195
						$(".like-h").load(function(){								
196
						})
197
						.error(function(){
198
							$(this).attr("src",servPath+"/images/default-photo.jpg");
199
						});	
199 200
					}
200 201
				}			
201 202
			}
@ -447,8 +448,8 @@
447 448
			$data.school = $("#school").val();
448 449
			$data.college = $("#college").val();
449 450
			$data.major = $("#major").val();
450
			$data.degree = 0;
451
			$data.student = $("input[name='student']:checked").val();
451
			$data.degree = $("#degree").val();
452
			$data.student = 0;
452 453
			$.ajax({
453 454
				"url" : "/ajax/edu",
454 455
				"type" : $id ? "PUT" : "POST",
@ -624,6 +625,7 @@
624 625
	<!-- <a href="login-invite-code.html"><div class="unlogin">特邀专家登录</div></a> -->
625 626
	<!--已登录-->
626 627
	<div class="head-portrait">
628
    	<img class="portrait-p" />
627 629
		<div class="personal-infor">
628 630
			<div class="triangleB"></div>
629 631
			<div class="personal-box">
@ -803,16 +805,17 @@
803 805
					</div>
804 806
					<div class="infor edu btn-marL date-box">
805 807
						<b class="star">&nbsp;</b> 毕业年份
806
                        <input type="number" class="date-btn input-txt" id="year" value="2016" />
808
                        <!--<input type="number" class="date-btn input-txt" id="year" value="2016" />-->
809
                        <input type="text"  maxLength="4" class="date-btn input-txt" id="year"  onKeypress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="2016">
807 810

808 811
						<!--<input type="text" class="date-btn input-txt" id="year" />-->
809 812
					</div>
810 813
					<div class="infor edu btn-marL">
811
						<b class="star">*</b>院&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;系
814
						<b class="star">&nbsp;&nbsp;</b>院&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;系
812 815
						<input type="text" class="input-txt edu-txt" id="college">
813 816
					</div>
814 817
					<div class="infor edu btn-marL">
815
						<b class="star">*</b>专&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;业
818
						<b class="star">&nbsp;&nbsp;</b>专&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;业
816 819
						<input type="text" class="input-txt edu-txt" id="major">
817 820
					</div>
818 821
					<div class="infor edu btn-marL edu-h">
@ -862,10 +865,10 @@
862 865
					<div class="infor edu btn-marL datebox">
863 866
						<b class="star">&nbsp;&nbsp;</b>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间
864 867
						<div class="check checkbox"><input type="checkbox" class="present" />至今</div>
865
                        <input type="text" class="form-control date-btn input-txt" id="startMonth" ress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="08/05/2016" />
868
                        <input type="text"  maxLength="6" class="date-btn input-txt" id="startMonth"  onKeypress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" ress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="201608">
866 869
						<!--<input class="date-btn input-txt" id="startMonth"/>-->
867 870
						<hr class="ago">
868
                        <input type="text" class="form-control date-btn input-txt" id="stopMonth" ress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="08/05/2016" />
871
                        <input type="text"  maxLength="6" class="date-btn input-txt" id="stopMonth"  onKeypress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" ress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="201608">
869 872
						<!--<input class="date-btn input-txt ago" id="stopMonth" />-->
870 873
                        
871 874
					</div>
@ -898,13 +901,15 @@
898 901
						<b class="star">&nbsp;&nbsp;</b>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间
899 902
						<div class="check checkbox"><input type="checkbox" class="present" >至今</div>
900 903
						<!--<input class="date-btn input-txt" id="projectStartMonth"/>-->
901
                        <input type="text" class="form-control date-btn input-txt" id="projectStartMonth" value="08/05/2016" />
904
                        
905
                        <input type="text"  maxLength="6" class="date-btn input-txt" id="projectStartMonth"  onKeypress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="201608">
902 906
						<hr class="ago">
903 907
						<!--<input class="date-btn input-txt ago" id="projectStopMonth"/>-->
904
                        <input type="text" class="form-control date-btn input-txt" id="projectStopMonth" ress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="08/05/2016" />
908
                        <input type="text"  maxLength="6" class="date-btn input-txt" id="projectStopMonth"  onKeypress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" ress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="201608">
909
                        
905 910
					</div>
906 911
					<div class="infor edu btn-marL">
907
						<b class="star">*</b>描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述
912
						<b class="star">&nbsp;&nbsp;</b>描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述
908 913
						<!-- <textarea class="reedit" id="projectDescp"></textarea> -->
909 914
						<input type="text" class="input-txt edu-txt" id="projectDescp">
910 915
					</div>
@ -931,9 +936,10 @@
931 936
						<input type="text" class="input-txt edu-txt" id="paperName">
932 937
					</div>
933 938
					<div class="infor edu btn-marL date-box">
934
						<b class="star">&nbsp;&nbsp;</b>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
939
						<b class="star">&nbsp;&nbsp;</b>发表时
935 940
						<!--<input type="text" class="date-btn input-txt" id="paperYear">-->
936
                        <input type="text" class="form-control date-btn input-txt" id="paperYear" ress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="08/05/2016" />
941
                        <input type="text"  maxLength="4" class="date-btn input-txt" id="paperYear"  onKeypress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" ress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="2016">
942
                        
937 943
					</div>
938 944
					<!--<div class="infor edu btn-marL datebox">
939 945
						<b class="star">&nbsp;&nbsp;</b>年&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;份
@ -941,11 +947,11 @@
941 947
						
942 948
					</div>-->
943 949
					<div class="infor edu btn-marL">
944
						<b class="star">*</b>描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述
950
						<b class="star">&nbsp;&nbsp;</b>描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述
945 951
						<input type="text" class="input-txt edu-txt" id="paperDescp">
946 952
					</div>
947 953
					<div class="infor edu btn-marL">
948
						<b class="star">*</b>链&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;接
954
						<b class="star">&nbsp;&nbsp;</b>链&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;接
949 955
						<input type="text" class="input-txt edu-txt" id="paperUrl">
950 956
					</div>
951 957
					<input type="button" value="保存" class="infor-save btn btn-marL" id="paperSave">
@ -971,9 +977,10 @@
971 977
						<input type="text" class="input-txt edu-txt" id="patentName">
972 978
					</div>
973 979
					<div class="infor edu btn-marL date-box">
974
						<b class="star">&nbsp;&nbsp;</b>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
980
						<b class="star">&nbsp;&nbsp;</b>发表时
975 981
						<!--<input type="text" class="date-btn input-txt" id="patentYear">-->
976
                        <input type="text" class="form-control date-btn input-txt" id="patentYear" ress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="08/05/2016" />
982
                         <input type="text"  maxLength="4" class="date-btn input-txt" id="patentYear"  onKeypress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" ress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="2016">
983
                        
977 984
					</div>
978 985
					<!--
979 986
					<div class="infor edu btn-marL datebox">
@ -982,11 +989,11 @@
982 989
						
983 990
					</div>-->
984 991
					<div class="infor edu btn-marL">
985
						<b class="star">*</b>链&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;接
992
						<b class="star">&nbsp;&nbsp;</b>链&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;接
986 993
						<input type="text" class="input-txt edu-txt" id="patentUrl">
987 994
					</div>
988 995
					<div class="infor edu btn-marL">
989
						<b class="star">*</b>描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述
996
						<b class="star">&nbsp;&nbsp;</b>描&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;述
990 997
						<input type="text" class="input-txt edu-txt" id="patentDescp">
991 998
					</div>
992 999
					<input type="button" value="保存" class="infor-save btn btn-marL" id="patentSave">
@ -1014,7 +1021,9 @@
1014 1021
					<div class="infor edu btn-marL date-box">
1015 1022
						<b class="star">&nbsp;&nbsp;</b>时&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;间
1016 1023
						<!--<input type="text" class="date-btn input-txt" id="honorYear">-->
1017
                        <input type="text" class="form-control date-btn input-txt" id="honorYear" value="08/05/2016" />
1024
                      
1025
                        <input type="text"  maxLength="4" class="date-btn input-txt" id="honorYear"  onKeypress="if (event.keyCode < 48 || event.keyCode > 57) event.returnValue = false;" value="2016">
1026
                        
1018 1027
					</div>
1019 1028
				<!--	<div class="infor edu btn-marL datebox">
1020 1029
						<b class="star">&nbsp;&nbsp;</b>年&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;份

+ 0 - 52
src/main/webapp/js/information.js

@ -414,55 +414,3 @@ $(".present").click(function(){
414 414
})
415 415

416 416
/*ÈÕÆÚ*/
417
$(document).ready(function() {
418
	$('#year').daterangepicker({
419
		singleDatePicker: true
420
	},
421
	function(start, end, label) {
422
		console.log(start.toISOString(), end.toISOString(), label);
423
	});
424
	$('#startMonth').daterangepicker({
425
		singleDatePicker: true
426
	},
427
	function(start, end, label) {
428
		console.log(start.toISOString(), end.toISOString(), label);
429
	});
430
	$('#stopMonth').daterangepicker({
431
		singleDatePicker: true
432
	},
433
	function(start, end, label) {
434
		console.log(start.toISOString(), end.toISOString(), label);
435
	});
436
	$('#projectStartMonth').daterangepicker({
437
		singleDatePicker: true
438
	},
439
	function(start, end, label) {
440
		console.log(start.toISOString(), end.toISOString(), label);
441
	});
442
	$('#projectStopMonth').daterangepicker({
443
		singleDatePicker: true
444
	},
445
	function(start, end, label) {
446
		console.log(start.toISOString(), end.toISOString(), label);
447
	});
448

449
	$('#paperYear').daterangepicker({
450
		singleDatePicker: true
451
	},
452
	function(start, end, label) {
453
		console.log(start.toISOString(), end.toISOString(), label);
454
	});
455
	$('#patentYear').daterangepicker({
456
		singleDatePicker: true
457
	},
458
	function(start, end, label) {
459
		console.log(start.toISOString(), end.toISOString(), label);
460
	});
461
	
462
	$('#honorYear').daterangepicker({
463
		singleDatePicker: true
464
	},
465
	function(start, end, label) {
466
		console.log(start.toISOString(), end.toISOString(), label);
467
	});
468
});