Browse Source

时间偶尔调不出时间控件问题

luyanan 7 years ago
parent
commit
8e388f4eaa
3 changed files with 18 additions and 11 deletions
  1. 1 0
      css/genindex.css
  2. 3 1
      information.html
  3. 14 10
      js/information.js

+ 1 - 0
css/genindex.css

@ -697,6 +697,7 @@ div.zoomMask{position:absolute;background:url("../images/g-resource-mask.png") r
697 697
.cmpFrmList>li:after{clear: both;}
698 698
.cmpFrmList>li .frmadd {width: auto;position: absolute;right: 0;top: 0;background: #ff9900;color: #fff;border: none;padding: 6px 25px;}
699 699
.cmpFrmList>li select{padding: 0 10px;padding-right: 20px;appearance:none;-moz-appearance:none;-webkit-appearance:none;}
700
.cmpFrmList>li select.mr_btn{color:#999}
700 701
.cmpFrmList>li .mr_sj{position: absolute;right: 10px;top: 18px;display:inline-block;height: 0;width: 0;border: 6px solid #fff;border-color: #aaa transparent transparent;}
701 702
.cmpFrmList>li .col-w-10,.cmpFrmList>li .col-w-5{position: relative;}
702 703
.cmpFrmList .msgContbox{height: 200px;}

+ 3 - 1
information.html

@ -294,10 +294,11 @@
294 294
<script type="text/javascript" src="js/information.js"></script>
295 295
<script>
296 296
	$("body").on("click", ".date-btn", function() {
297
	$(".mr_calendar_ym:visible").hide();
297
		$(".mr_calendar_ym:visible").hide();
298 298
		var flag = $(this).attr("flag");				
299 299
		var c = $(this).val();
300 300
		if(flag == 1) {
301
			console.log("年插件位置")
301 302
			if(c) {
302 303
				if (c == "至今") {
303 304
					$(this).siblings(".mr_calendar_ym").show();
@ -319,6 +320,7 @@
319 320
				return false;
320 321
			}
321 322
		} else if(flag == 2) {
323
			console.log("月插件位置")
322 324
			if(c) {
323 325
				if(c == "至今") {
324 326
					$(this).siblings(".mr_calendar_ym").show();

+ 14 - 10
js/information.js

@ -131,10 +131,10 @@ $(function() {
131 131
					if($info.honors) {
132 132
						honorShow($info.honors);
133 133
					}
134
					yearAdd();
134
					//yearAdd();
135 135
					$(".StopMonth").next(".mr_calendar_ym").find(".mr_year li:first-child").before('<li class="ymli">至今</li>');
136 136
					$("#eduUl").find(".full_year li:first-child").before('<li class="ymli">至今</li>');
137
					month();
137
					//month();
138 138
						
139 139
				}
140 140
			}
@ -693,12 +693,13 @@ $(function() {
693 693
				string +='</ul></div><li>';	
694 694
				var $string=$(string)
695 695
				$("#eduUl").append($string);
696
				if(data[i].degree==""){
697
					data[i].degree=0;
698
					$string.find(".mr_btn").css("color","#999");
696
				if(data[i].degree!=0 ||data[i].degree!="" ){
697
					$string.find(".mr_btn").css("color","#666");
699 698
				}
700 699
				$string.find(".mr_btn").val(data[i].degree);
701
				$(".full_year li:first-child").before('<li class="yearli">至今</li>');
700
				yearAdd();
701
				month();
702
				//$(".full_year li:first-child").before('<li class="yearli">至今</li>');
702 703
			}
703 704
			
704 705
		}
@ -853,6 +854,8 @@ $(function() {
853 854
						string +='<button type="button" class="frmcontype btnModel fontLink">删除本条</button></div></li>'
854 855
					string +='</ul></div><li>';
855 856
				$("#timeJobShow").append(string);
857
				yearAdd();
858
				month();
856 859
			}
857 860
		}
858 861
	}
@ -963,8 +966,6 @@ $(function() {
963 966
						if($data.success) {
964 967
							$("#timeJobShow").empty("");
965 968
							timeJobShow($data.data.jobs);
966
							//yearAdd();
967
							month();
968 969
						}
969 970
					});
970 971
				} else {
@ -1022,8 +1023,9 @@ $(function() {
1022 1023
					stringHtml +='<button type="button" class="frmcontype btnModel saveGo">保存</button>'
1023 1024
					stringHtml +='<button type="button" class="frmcontype btnModel btnCancel cancelList">取消</button>'
1024 1025
					stringHtml +='<button type="button" class="frmcontype btnModel fontLink">删除本条</button></div></li>'
1025

1026 1026
				$("#projectShow").append(stringHtml);
1027
				yearAdd();
1028
				month();
1027 1029
			}
1028 1030
		}
1029 1031
	}
@ -1160,6 +1162,7 @@ $(function() {
1160 1162
						stringHtml +='<button type="button" class="frmcontype btnModel btnCancel cancelList">取消</button>'
1161 1163
						stringHtml +='<button type="button" class="frmcontype btnModel fontLink">删除本条</button></div></li>'
1162 1164
				$("#honorShow").append(stringHtml);
1165
				yearAdd();
1163 1166
			}
1164 1167
		}
1165 1168
	}
@ -1272,7 +1275,8 @@ $(function() {
1272 1275
		$(this).parents(".coninfobox").find(".listnone1").toggle(100);
1273 1276
		$(this).parents(".coninfobox").find(".showBx").show();
1274 1277
		$(this).parents(".coninfobox").find(".showBx + .modifybox").hide();
1275
		$(this).parents(".coninfobox").find(".frmcontype").val("");
1278
		$(this).parents(".coninfobox").find(".listnone1").find(".frmcontype").val("");
1279
		$(this).parents(".coninfobox").find(".listnone1").find(".mr_btn").val("0");
1276 1280
	});
1277 1281
	$(".coninfobox").on("click", ".cancelO", function() {//添加模块的取消
1278 1282
		$(this).parents(".listnone1").toggle(100);