浏览代码

修改1.9版本bug

luyanan 7 年之前
父节点
当前提交
553813b8b8
共有 6 个文件被更改,包括 25 次插入20 次删除
  1. 1 1
      cmp-portal/cmp-updateinfo.html
  2. 1 1
      cmp-portal/css/common.css
  3. 1 1
      css/common.css
  4. 4 2
      js/cmpInforShow.js
  5. 16 13
      js/information.js
  6. 2 2
      js/userInforShow.js

+ 1 - 1
cmp-portal/cmp-updateinfo.html

208
											<span class="col-w-2 lableSpan">企业资质:</span>
208
											<span class="col-w-2 lableSpan">企业资质:</span>
209
											<div class="col-w-10">
209
											<div class="col-w-10">
210
												<div class="col-w-12" style="position: relative;">
210
												<div class="col-w-12" style="position: relative;">
211
													<input type="text" class="frmcontype oinput" placeholder="请填写企业获得的资质,如:ISO9000认证、高新技术企业认证" data-pro="企业资质不得超过20个字" data-num="10" data-fontSizeN="20"/>
211
													<input type="text" class="frmcontype oinput" placeholder="请填写企业获得的资质,如:ISO9000认证、高新技术企业认证" data-pro="企业资质不得超过50个字" data-num="10" data-fontSizeN="50"/>
212
													<button type="button" class="frmcontype btnModel frmadd" style="display:none">添加</button>
212
													<button type="button" class="frmcontype btnModel frmadd" style="display:none">添加</button>
213
												</div>
213
												</div>
214
												<div class="form-result keyResult allResult" style="margin-right: -10px;">
214
												<div class="form-result keyResult allResult" style="margin-right: -10px;">

+ 1 - 1
cmp-portal/css/common.css

234
header .headnav li{float:left;margin:0 4px; padding:14px 0;}
234
header .headnav li{float:left;margin:0 4px; padding:14px 0;}
235
header .headnav li a{ color:#666; padding:14px 18px;}
235
header .headnav li a{ color:#666; padding:14px 18px;}
236
header .headuserimg{position:relative;padding: 10px 0 10px 20px; width: 60px;height: 60px;}
236
header .headuserimg{position:relative;padding: 10px 0 10px 20px; width: 60px;height: 60px;}
237
header .headuser{overflow: hidden;border:1px solid #E5E5E5; width: 40px;height: 40px;display: table-cell; vertical-align:middle; text-align:center;cursor: pointer;}
237
header .headuser{overflow: hidden;border:1px solid #E5E5E5; width: 42px;height: 42px;display: table-cell; vertical-align:middle; text-align:center;cursor: pointer;}
238
header .headuser img{max-width: 40px;max-height: 100%;vertical-align:middle;height:auto !important; overflow-y:auto;}
238
header .headuser img{max-width: 40px;max-height: 100%;vertical-align:middle;height:auto !important; overflow-y:auto;}
239
header .headnavbtn{margin:14px 6px;}
239
header .headnavbtn{margin:14px 6px;}
240
header .headnavbtn a{color:#666;}
240
header .headnavbtn a{color:#666;}

+ 1 - 1
css/common.css

222
header .headnav li{float:left;margin:0 4px; padding:14px 0;}
222
header .headnav li{float:left;margin:0 4px; padding:14px 0;}
223
header .headnav li a{ color:#666; padding:14px 18px;}
223
header .headnav li a{ color:#666; padding:14px 18px;}
224
header .headuserimg{position:relative;padding: 10px 0 10px 20px; width: 60px;height: 60px;}
224
header .headuserimg{position:relative;padding: 10px 0 10px 20px; width: 60px;height: 60px;}
225
header .headuser{overflow: hidden;border:1px solid #E5E5E5; width: 40px;height: 40px;display: table-cell; vertical-align:middle; text-align:center;cursor: pointer;}
225
header .headuser{overflow: hidden;border:1px solid #E5E5E5; width: 42px;height: 42px;display: table-cell; vertical-align:middle; text-align:center;cursor: pointer;}
226
header .headuser img{max-width: 40px;max-height: 100%;vertical-align:middle;height:auto !important; overflow-y:auto;}
226
header .headuser img{max-width: 40px;max-height: 100%;vertical-align:middle;height:auto !important; overflow-y:auto;}
227
header .headnavbtn{margin:14px 6px;}
227
header .headnavbtn{margin:14px 6px;}
228
header .headnavbtn a{color:#666;font-size:15px;}
228
header .headnavbtn a{color:#666;font-size:15px;}

+ 4 - 2
js/cmpInforShow.js

195
					}
195
					}
196
					var proOther = "";
196
					var proOther = "";
197
					if($info.industry) {
197
					if($info.industry) {
198
						proOther = $info.industry.replace(/,/gi, " | ");
198
						proOther = $info.industry.replace(/,/gi, " | ") + "-";
199
					}
199
					}
200
					$("#proOther").text(proOther);
200
					$("#proOther").text(proOther);
201
					if($info.orgType == "2") {
201
					if($info.orgType == "2") {
202
						$("#proTit").html(orgTypeShow[$info.orgType] + "<span style='margin-right:10px;'></span>");
202
						$("#proTit").html(orgTypeShow[$info.orgType] + "<span style='margin-right:10px;'></span>");
203
					}
203
					}
204
					var llqtitle = $info.name + "-" + proOther + "-科袖网"; //修改浏览器title信息
204
					var llqtitle = $info.name + "-" + proOther + "科袖网"; //修改浏览器title信息
205
					document.title = llqtitle;
205
					document.title = llqtitle;
206
					//简介
206
					//简介
207
					if($info.descp) {
207
					if($info.descp) {
208
						$("#item1user>.nodatabox").addClass("displayNone");
208
						$("#descpS").parents(".coninfobox").removeClass("displayNone");
209
						$("#descpS").parents(".coninfobox").removeClass("displayNone");
209
						$("#descpS").text($info.descp);
210
						$("#descpS").text($info.descp);
210
					} else {
211
					} else {
212
					}
213
					}
213
					//学术领域		
214
					//学术领域		
214
					if($info.subject) {
215
					if($info.subject) {
216
						$("#item1user>.nodatabox").addClass("displayNone");
215
						$("#subjectShow").parents(".coninfobox").removeClass("displayNone");
217
						$("#subjectShow").parents(".coninfobox").removeClass("displayNone");
216
						subjectShow($info.subject);
218
						subjectShow($info.subject);
217
					} else {
219
					} else {

+ 16 - 13
js/information.js

629
					data[i].major="";
629
					data[i].major="";
630
				}
630
				}
631
				if(data[i].degree){
631
				if(data[i].degree){
632
				    degree =' - ' + eduDegree[data[i].degree]
632
				    degree =' - ' + data[i].degree
633
				     if(data[i].degree==0){
633
				     if(data[i].degree==0){
634
				     	degree =""
634
				     	degree =""
635
				     }
635
				     }
663
				string += '<li><span class="col-w-2 lableSpan">学位:</span><div class="col-w-5"><em class="mr_sj"></em>'
663
				string += '<li><span class="col-w-2 lableSpan">学位:</span><div class="col-w-5"><em class="mr_sj"></em>'
664
					string += '<select class="frmcontype mr_btn">'
664
					string += '<select class="frmcontype mr_btn">'
665
					string +='<option value="0">请选择获得的学位</option>'
665
					string +='<option value="0">请选择获得的学位</option>'
666
					string +='<option value="1">博士</option>'
667
					string +='<option value="2">硕士</option>'
668
					string +='<option value="3">学士</option>'
669
					string +='<option value="4">大专</option>'
670
					string +='<option value="5">其他</option>'
666
					string +='<option value="博士">博士</option>'
667
					string +='<option value="硕士">硕士</option>'
668
					string +='<option value="学士">学士</option>'
669
					string +='<option value="大专">大专</option>'
670
					string +='<option value="其他">其他</option>'
671
					string +='</select></div></li>'
671
					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">'
672
				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 + '" />'
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 + '" />'
698
			string += '<li><span class="col-w-2 lableSpan">学位:</span><div class="col-w-5"><em class="mr_sj"></em>'
698
			string += '<li><span class="col-w-2 lableSpan">学位:</span><div class="col-w-5"><em class="mr_sj"></em>'
699
				string += '<select class="frmcontype mr_btn">'
699
				string += '<select class="frmcontype mr_btn">'
700
				string +='<option value="0">请选择获得的学位</option>'
700
				string +='<option value="0">请选择获得的学位</option>'
701
				string +='<option value="1">博士</option>'
702
				string +='<option value="2">硕士</option>'
703
				string +='<option value="3">学士</option>'
704
				string +='<option value="4">大专</option>'
705
				string +='<option value="5">其他</option>'
701
				string +='<option value="博士">博士</option>'
702
				string +='<option value="硕士">硕士</option>'
703
				string +='<option value="学士">学士</option>'
704
				string +='<option value="大专">大专</option>'
705
				string +='<option value="其他">其他</option>'
706
				string +='</select></div></li>'
706
				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">'
707
			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="请选择毕业时间" />'
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="请选择毕业时间" />'
759
			$data.school = $(this).parents(".modifybox").find(".school").val();
759
			$data.school = $(this).parents(".modifybox").find(".school").val();
760
			$data.college = $(this).parents(".modifybox").find(".college").val();
760
			$data.college = $(this).parents(".modifybox").find(".college").val();
761
			$data.major = $(this).parents(".modifybox").find(".major").val();
761
			$data.major = $(this).parents(".modifybox").find(".major").val();
762
			$data.degree = $(this).parents(".modifybox").find(".mr_btn").val();
762
			if($(this).parents(".modifybox").find(".mr_btn").val()!=0){
763
				$data.degree = $(this).parents(".modifybox").find(".mr_btn").val();
764
			}
765
			
763
			$.ajax({
766
			$.ajax({
764
				"url": "/ajax/edu",
767
				"url": "/ajax/edu",
765
				"type": $id ? "PUT" : "POST",
768
				"type": $id ? "PUT" : "POST",
809
					}
812
					}
810
				}
813
				}
811
				var string ='<li>'
814
				var string ='<li>'
812
				string += ' <div class="showBx"><div class="h4Font h4tit">' + data[i].company + '-' + dep + '' + data[i].title + '<small class="h6Font">';
815
				string += ' <div class="showBx"><div class="h4Font h4tit">' + data[i].company  + dep + '-' + data[i].title + '<small class="h6Font">';
813
					string += sDate;
816
					string += sDate;
814
					if(eDate) string += (" - " + eDate);
817
					if(eDate) string += (" - " + eDate);
815
					string += '</small><em class="btnClick exitlist">编辑</em></div></div>';
818
					string += '</small><em class="btnClick exitlist">编辑</em></div></div>';

+ 2 - 2
js/userInforShow.js

406
					}
406
					}
407
				}
407
				}
408
				var JobHtml = '<li>';
408
				var JobHtml = '<li>';
409
				JobHtml += '<div class="h4Font h4tit">' + data[i].company + '-' + dep + '' + data[i].title + '<small class="h6Font">' + sDate + eDate + '</small></div>';
409
				JobHtml += '<div class="h4Font h4tit">' + data[i].company + dep + '-' + data[i].title + '<small class="h6Font">' + sDate + eDate + '</small></div>';
410
				JobHtml += '</li>';
410
				JobHtml += '</li>';
411
				$("#timeJobShow").append(JobHtml);
411
				$("#timeJobShow").append(JobHtml);
412
			}
412
			}
427
					data[i].major="";
427
					data[i].major="";
428
				}
428
				}
429
				if(data[i].degree){
429
				if(data[i].degree){
430
				    degree =' - ' + eduDegree[data[i].degree]
430
				    degree =' - ' + data[i].degree
431
				     if(data[i].degree==0){
431
				     if(data[i].degree==0){
432
				     	degree =""
432
				     	degree =""
433
				     }
433
				     }