Browse Source

科研文章显示浏览【专家浏览】、【我的工作台】、【科研文章】

luyanan 8 years ago
parent
commit
8f28278a18
8 changed files with 53 additions and 44 deletions
  1. 5 0
      css/index.css
  2. 2 0
      css/workspace.css
  3. 12 18
      information-brow.html
  4. 17 16
      js/information.brow.js
  5. 13 8
      js/news-list.js
  6. 1 1
      js/workindex.js
  7. 3 0
      news-list.html
  8. 0 1
      newsciresource.html

+ 5 - 0
css/index.css

@ -453,6 +453,11 @@ label.edu-radio{ float:none;font-size:16px;line-height:26px; color:#868686; }
453 453
.otherRes li a{display: block;}
454 454
.otherRes li .resoumag .resourceImgBox{ max-width:168px;width:168px;height: 168px;}
455 455
.otherRes li .resoumag h2{color: #666666; text-align: center; padding:10px;}
456
/*科研文章*/
457
.otherRes.shareshow{height:220px;overflow:hidden;width:100%;padding:10px 0;margin-right:-12px;}
458
.otherRes.shareshow li{ width: 202px;float:left;border: 1px solid #e4e5e7;margin:0 14px 14px 0;border-radius: 6px;cursor: pointer;}
459
.otherRes.shareshow li:last-child{margin:0 0 12px 0;}
460

456 461
/*文章详细信息页面*/
457 462
.resBrief2{width: 98%;margin: auto;min-height:100px;}
458 463
.resBrief2 .subtit{line-height: 42px; }

+ 2 - 0
css/workspace.css

@ -132,6 +132,8 @@
132 132
	-webkit-background-size:cover;}
133 133
.tagsBox{padding:4%; overflow: hidden;text-overflow: ellipsis; white-space: nowrap;}
134 134
.tagsBox span{color:#666;margin:0 2px;font-size: 13px;}
135
.art_topicBox2 .art_img{width:226px;height:200px;}
136
#newsbox .addworkbtn,#newsbox .addworkbtn-list{height:242px;}
135 137
136 138
/*公告*/
137 139
.workconright{ width:29%;}

+ 12 - 18
information-brow.html

@ -138,20 +138,14 @@
138 138
								<div class="infor-browse">
139 139
									<div class="shareabout shareabout1" style="margin: 0 30px;">
140 140
										<div class="sharesrcbox" style="width:642px;">
141
											<div class="sharescrollbox" id="reachArticle">
142
												<!--<li>
143
													<a href="articalInfo.html?newsid=86065F821242478E9D8AAB51692C06BE">
144
														<div class="art_topicBox">
145
															<div class="art_img" style="background: url(/data/article/20170209/86065F821242478E9D8AAB51692C06BE.jpg) 0 0 no-repeat;background-size:cover;"></div>
146
															<div class="art_topicbox">
147
																<h6 id="artical_topic">路雅楠:文章一</h6></div>
148
														</div>
149
														<div class="tagsBox"><span>测试</span></div>
150
													</a>
151
												</li>-->
152
141
											<div class="sharescrollbox Acrollbox">
142
												<ul class="shareshow otherRes clearfix" id="reachArticle">
143
												
144
												</ul>
153 145
											</div>
154 146
										</div>
147
										<span class="resouprev resoubtn articalbtn"></span>
148
										<span class="resounext resoubtn articalbtn"></span>
155 149
									</div>
156 150
								</div>
157 151
							</div>
@ -215,10 +209,10 @@
215 209
								<div class="right-title"><span>项目经历</span> </div>
216 210
								<div class="infor-browse">
217 211
									<ul class="edu-about edu-infor" id="projectShow">
218
										<!-- <li class="paddingSpace">
219
								<div class="h4Font h4tit">著作名称<small class="h6Font"> 2016.09 - 2016.09</small></div>
220
								<div class="h5Font pIndent">xiangximianshu 纤细面熟xiangxixiangximianshu 纤细面熟miansxiangximianshu 纤细面熟huxiaxiangximianshu 纤细面熟ngximianshu 纤细面熟 纤细面熟</div>
221
							</li> -->
212
										 <!--<li class="paddingSpace">
213
													<div class="h4Font h4tit">著作名称<small class="h6Font"> 2016.09 - 2016.09</small></div>
214
													<div class="h5Font pIndent">xiangximianshu 纤细面熟xiangxixiangximianshu 纤细面熟miansxiangximianshu 纤细面熟huxiaxiangximianshu 纤细面熟ngximianshu 纤细面熟 纤细面熟</div>
215
												</li> -->
222 216
									</ul>
223 217
								</div>
224 218
							</div>
@ -259,8 +253,8 @@
259 253
260 254
											</div>
261 255
										</div>
262
										<span class="resouprev resoubtn"></span>
263
										<span class="resounext resoubtn"></span>
256
										<span class="resouprev resoubtn resoubtn2"></span>
257
										<span class="resounext resoubtn resoubtn2"></span>
264 258
									</div>
265 259
								</div>
266 260
							</div>

+ 17 - 16
js/information.brow.js

@ -602,23 +602,24 @@ $(function() {
602 602
		success: function(data) {
603 603
			console.log(JSON.stringify(data))
604 604
			if(data.success) {
605
				var $data = data.data;
606 605
				for(var i = 0; i < data.data.length; i++) {
607
					var articleImg = $data[i].articleImg;
608
					(!articleImg)? articleImg = "../images/default-artical.jpg" : articleImg = '/data/article/' + $data[i].articleImg;
609
610
//					var add = '<div class="sharesrc">'
611
//					add += '<div class="shareshow">'
612
//					add += '<a href="articalInfo.html?articleId=' + data.data[i].articleId + '" style="display:block;">'
613
//					add += '<div class="ResImgBox" style="max-width:200px;width:200px;height: 200px;">'
614
//					add += '<img class="resImg headRadius resourceImg" src="' + articleImg + '" />'
615
//					add += '</div></a>'
616
//					add += '</div>'
617
//					add += '<p class="restit">文章名称:<span class="presou consultTitleVal" resourceConsultTitle = "">' + data.data[i].articleTitle + '</span></p>'
618
//					add += '</div>'
619
					<li><a href="articalInfo.html?newsid=86065F821242478E9D8AAB51692C06BE"><div class="art_topicBox"><div class="art_img" style="background: url(/data/article/20170209/86065F821242478E9D8AAB51692C06BE.jpg) 0 0 no-repeat;background-size:cover;"></div><div class="art_topicbox"><h6 id="artical_topic">路雅楠:文章一</h6></div></div><div class="tagsBox"><span>测试</span></div></a></li>
620
					$("#reachArticle").append(add);
606
					var add = '<li><a href="articalInfo.html?articleId=' + data.data[i].articleId + '" style="display:block;">'
607
					add += '<div class="art_topicBox"><div class="art_img" style=""></div>'
608
					add += '<div class="art_topicbox"><h6 id="artical_topic" >' + data.data[i].articleTitle + '</h6></div>'
609
					add += '</div><div class="tagsBox"><span></span></div>'
610
					add += '</a></li>';
611
					$add = $(add);
612
					$("#reachArticle").append($add);
613
					$add.find('.tagsBox span').text(data.data[i].industry); //data.data[i].subject
614
					if(data.data[i].articleImg) {
615
						$add.find(".art_img").attr("style", "background: url(/data/article/"+data.data[i].articleImg+") 0 0 no-repeat;background-size:cover;");
616
					}
617
					
621 618
				}
619
				//资源轮播
620
				var $content2 = $(".sharescrollbox.Acrollbox");
621
				var childcount2 = $content2.find(".otherRes.shareshow li").length;
622
				Carousel(3, 3, 3, childcount2, $content2, $(".articalbtn.resounext"), $(".articalbtn.resouprev"));
622 623
			}
623 624
		},
624 625
		error: function() {
@ -675,7 +676,7 @@ $(function() {
675 676
				//资源轮播
676 677
				var $content = $(".sharescrollbox");
677 678
				var childcount = $content.find(".sharesrc").length;
678
				Carousel(3, 3, 3, childcount, $content, $(".resounext"), $(".resouprev"));
679
				Carousel(3, 3, 3, childcount, $content, $(".resoubtn2.resounext"), $(".resoubtn2.resouprev"));
679 680
				//科研资源中点咨询
680 681
				$(".introduction").find(".resourceConsult").bind("click", clickResourceConsult);
681 682

+ 13 - 8
js/news-list.js

@ -43,17 +43,22 @@ $(function() {
43 43
					var addbut = ' <div class="addworkbtn newsadd" ></div>';
44 44
					$("#newsbox").append(addbut);
45 45
					for(var i = 0; i < data.data.length; i++) {
46
						var add = '<div class="addworkbtn-list addworkbtn-list2" > <div class="resoumag" data-title="">'
47
						add += '<div class="ResImgBox" style="max-width:226px;width:226px;height: 226px;"><img class="resImg headRadius resourceImg" src="" /></div>'
48
						add += '<h2>' + data.data[i].articleTitle + '</h2>'
49
						add += '</div></div>';
46
						var add = '<div class="addworkbtn-list addworkbtn-list2" ><a href="articalInfo.html?newsid=' + data.data[i].articleId + '">'
47
						add += '<div class="art_topicBox art_topicBox2"><div class="art_img" style=""></div>'
48
						add += '<div class="art_topicbox"><h6 id="artical_topic" >'+ data.data[i].articleTitle + '</h6></div>'
49
						add += '</div><div class="tagsBox"><span></span></div>'
50
						add += '</a></div>';
50 51
						$add = $(add);
51 52
						$("#newsbox").append($add);
52
						$add.find('.resoumag').attr("data-title", data.data[i].articleId);
53
//						$add.find('.resoumag').attr("data-title", data.data[i].articleId);
54
//						if(data.data[i].articleImg) {
55
//							$add.find(".resourceImg").attr("src", "data/article/" + data.data[i].articleImg);
56
//						} else {
57
//							$add.find(".resourceImg").attr("src", "/images/default-artical.jpg");
58
//						}
59
						$add.find('.tagsBox span').text(data.data[i].industry);
53 60
						if(data.data[i].articleImg) {
54
							$add.find(".resourceImg").attr("src", "data/article/" + data.data[i].articleImg);
55
						} else {
56
							$add.find(".resourceImg").attr("src", "/images/default-artical.jpg");
61
							$add.find(".art_img").attr("style", "background: url(/data/article/"+data.data[i].articleImg+") 0 0 no-repeat;background-size:cover;");
57 62
						}
58 63

59 64
						$(".loading").remove();

+ 1 - 1
js/workindex.js

@ -1066,7 +1066,7 @@ $(function(){
1066 1066
					for(var i = 0; i < data.data.length; i++) {
1067 1067
						var add = '<li><a href="articalInfo.html?newsid=' + data.data[i].articleId + '">'
1068 1068
						add += '<div class="art_topicBox"><div class="art_img" style=""></div>'
1069
						add += '<div class="art_topicbox"><h6 id="artical_topic" >' + $.cookie("userName") + ':' + data.data[i].articleTitle + '</h6></div>'
1069
						add += '<div class="art_topicbox"><h6 id="artical_topic" >' + data.data[i].articleTitle + '</h6></div>'
1070 1070
						add += '</div><div class="tagsBox"><span></span></div>'
1071 1071
						add += '</a></li>';
1072 1072
						$add = $(add);

+ 3 - 0
news-list.html

@ -1,4 +1,7 @@
1 1
<!--科研文章-->
2
<style type="text/css">
3
	
4
</style>
2 5
<div class="workconitem">
3 6
	<div class="workcontit">科研文章</div>
4 7
	<div class="worksubcon">

+ 0 - 1
newsciresource.html

@ -1,4 +1,3 @@
1
<!-- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -->
2 1

3 2
<!--// 科研资源-->
4 3
<div class="workconitem">