Home Explore Help
Register Sign In
bulomakaka
/
ekexiu.com.portal
Watch 7
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Commits 288 Releases 0 Wiki
Browse Source

修改资源轮播箭头显示与否

luyanan 8 years ago
parent
cba9e4944e
commit
2d832b3115
14 changed files with 122 additions and 152 deletions
Split View Show Diff Stats
  1. 3 3
      src/main/webapp/css/common.css
  2. 9 7
      src/main/webapp/css/index.css
  3. 2 2
      src/main/webapp/css/popup.css
  4. 11 11
      src/main/webapp/css/workspace.css
  5. 4 4
      src/main/webapp/diloags.html
  6. BIN
      src/main/webapp/images/logo.png
  7. BIN
      src/main/webapp/images/logo2.png
  8. 4 3
      src/main/webapp/information.html
  9. 39 1
      src/main/webapp/js/common.js
  10. 1 1
      src/main/webapp/js/consult.js
  11. 10 1
      src/main/webapp/js/index.js
  12. 6 28
      src/main/webapp/js/information.brow.js
  13. 2 61
      src/main/webapp/js/information.js
  14. 31 30
      src/main/webapp/js/search.js

+ 3 - 3
src/main/webapp/css/common.css
View File 

@ -19,7 +19,7 @@
19 19 
/*头像、资源圆角*/
20 20 
.headRadius{border-radius: 4px;}
21 21 
/*底板背景圆角*/
22 
.bgRadius{border-radius: 6px; overflow:hidden;}
22 
.bgRadius{border-radius: 6px;}
23 23 
/* 表单样式 */
24 24 
.frmtype{ width:100%; border-radius:5px; border:1px #dadada solid; padding:0 10px; min-height:30px;font-size:14px;line-height:30px;}
25 25 
.frmtype:focus{ border:1px solid #ff8500;}

@ -31,7 +31,7 @@ html, body{}
31 31 
input{ outline:none;}
32 32 
/*header部分*/
33 33 
#header{width:100%;min-width:1050px; height:60px; background:rgba(255,153,0,1); position:fixed; top:0; z-index:999; }
34 
.logo{ display:block; width:80px; height:50px; background:url(../images/logo2.png) no-repeat; margin-left:80px; margin-top:5px; float:left;}
34 
.logo{ display:block; width:80px; height:40px; background:url(../images/logo2.png) no-repeat;background-size:100% 100%;  margin-left:80px; margin-top:10px; float:left;}
35 35 
.searchblock{ width:280px; height:35px; position:absolute; left:50%; top:50%; margin-left:-132px; margin-top:-17.5px; display:none;}
36 36 
.search-txt{ width:220px;line-height:35px; height:35px; background:#fff; border:none;-moz-border-radius:6px 0 0 6px;-webkit-border-radius:6px 0 0 6px; border-radius:6px 0 0 6px; behavior:url(../js/ie-css3.htc); float:left;font-size:14px;padding-left:10px; color:#a3a3a3;}
37 37 
.search-btn{ width:35px; height:35px; background:#fff; border-radius:0 6px 6px 0;-moz-border-radius:0 6px 6px 0;-webkit-border-radius:0 6px 6px 0; float:left; cursor:pointer; behavior:url(../js/ie-css3.htc);cursor:pointer;}

@ -68,7 +68,7 @@ url(../images/index-icon.png) no-repeat; background-position:left; margin:8px;}
68 68 
#footer{ min-width:1050px;clear:both; height:250px; background:#ff9900;}
69 69 
.footer-top{ width:1050px; padding: 20px 10px; overflow: hidden; margin:auto;}
70 70 
.footerL{ float:left; }
71 
.footer-logo{ width:80px; height:50px; background:url(../images/logo2.png) no-repeat; background-size:100% 100%; margin:24px 0;}
71 
.footer-logo{ width:80px; height:40px; background:url(../images/logo2.png) no-repeat; background-size:100% 100%; margin:24px 0;}
72 72 
.link{ color:#fff;padding-bottom:15px;display:none;  }
73 73 
.link a{font-size:13px; line-height:20px; color:#fff; }
74 74 
.customer{font-size:14px; line-height:20px; color:#fff; }

+ 9 - 7
src/main/webapp/css/index.css
View File 

@ -97,7 +97,7 @@ input{ outline:none;}
97 97 
.item{ width:99%;overflow: hidden; background:#f8f8f8; border:1px #f0f0f0 solid;/*box-shadow:1px 1px 1px #ff9900 inset;*/ border-radius:6px; margin:10px auto; position:relative;min-height:120px; }
98 98 
.operbox{float: left;position: absolute;padding: 10px 20px;margin: 20px;right: 10px; top:50%; margin-top:-20px;}
99 99 
.operbtn{ padding:4px 20px; font-size:13px; margin:0 2px; border: 1px solid #efefef;border-radius: 6px; background:#ff9900; color:#fff; cursor:pointer;}
100 
.photo1{width:100px;height:100px;margin:10px 20px;float:left; overflow:hidden;}
100 
.photo1{width:100px;height:100px;margin:20px;float:left; overflow:hidden;}
101 101 
.item:hover{/* border:1px solid #ff9900; */ box-shadow: 0 1px 6px 2px #e0e0e0;}
102 102
103 103 
/*专家简介*/

@ -106,17 +106,19 @@ input{ outline:none;}
106 106 
.named:hover,.named:focus,.named:active{color:#333; text-decoration:none;}
107 107 
.modify{ display:block; width:16px; height:16px; background:url(../images/onauth.png) center center no-repeat; background-size:100% 100%; float:left; margin:4px;}
108 108 
.position{ clear:both;font-size:16px;  color:#666; }
109 
.science{font-size:14px; color:#999;  }
110 
.industry,.address{font-size:15px; color:#888;  }
109 
.science{font-size:14px; color:#999;}
110 
.ellipsisbox p{text-overflow:ellipsis; overflow:hidden; white-space:nowrap;}
111 
.industry,.address{font-size:14px; color:#999;  }
111 112 
/*资源简介*/
112 113 
.remess{ cursor:pointer;}
113 
.resourcephoto{width:100px;height:100px;margin:10px 20px;float:left;overflow:hidden; }
114 
.resourcephoto{width:100px;height:100px;margin:20px;float:left;overflow:hidden; }
114 115 
.resouname{font-size:18px; color:#333;}
115 116 
.belongname{ font-size:17px; color:#333; }
116 117 
.modicon{ margin:0 6px;}
117 118 
.positionbox{ font-size:16px;  color:#666; }
118 119 
.sciencebox,.provideservice{font-size:14px; color:#999; }
119 
.industrybox{font-size:15px; color:#888;  }
120 
/* .provideservice p{display: -webkit-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;word-break: break-all;overflow: hidden;} */
121 
.industrybox{font-size:14px; color:#999;  }
120 122 
/*------------------------------------------------------------------------------------*/
121 123 
/*账号设置*/
122 124 
.account{ width:1050px; min-height:100px; margin:auto; padding: 40px 0;}

@ -313,9 +315,9 @@ label.edu-radio{ float:none;font-size:16px;line-height:26px; color:#868686; }
313 315 
.shareopeart{ position:absolute; bottom:0px; left:0px; z-index:100; overflow:hidden; width:100%;}
314 316 
.sharebtn{ display:block; text-align:center; float:left; cursor:pointer; width:50%; height:30px;font-size:14px;line-height:30px; background:rgba(0,0,0,.2); color:#fff; border:1px solid #d6d6d6;}
315 317 
.sharebtn:hover{ color:#fff; background:#ff9900;}
316 
.resoubtn{ position:absolute;top:40%;display:block; width:30px; height:41px; background:#ccc; border:1px 1px 0 1px; cursor:pointer;}
318 
.resoubtn{ position:absolute;top:40%; width:30px; height:41px; background:#ccc; border-width:1px 1px 0 1px; display:none; cursor:pointer;}
317 319 
.resouprev{left:-4px;background:url(../images/arrows.png) -30px 0 no-repeat;}
318 
.resounext{right:-4px;background:url(../images/arrows.png) 0 0 no-repeat;}
320 
.resounext{right:-4px;background:url(../images/arrows.png) 0 0 no-repeat;\}
319 321 
.resouprev:hover{ background:url(../images/arrows.png) -30px -41px no-repeat;}
320 322 
.resounext:hover{ background:url(../images/arrows.png) 0 -41px no-repeat;}
321 323

+ 2 - 2
src/main/webapp/css/popup.css
View File 

@ -50,7 +50,7 @@
50 50 
.teamwork .righteva  .teamname{ position:relative;}
51 51 
.teamwork .righteva .teamname .teamtime{ position:absolute; right:0;}
52 52 
.teamwork .righteva .evastarbox{ overflow:hidden;}
53 
.teamwork .righteva .evastar{ display:block; width:20px; height:20px; cursor:pointer; float:left; background:url(../images/evastar.png) 0 -22px no-repeat;}
53 
.teamwork .righteva .evastar{ display:block; width:19px; height:19px; cursor:pointer; float:left; background:url(../images/evastar.png) 0 -22px no-repeat;}
54 54 
.teamwork .righteva .evabrief{ display:block; margin-top:10px; max-height:80px; overflow:hidden; }
55 55
56 56 
.resoutit .stateinfor{ position:absolute; bottom:-20px; right: -28px;background: #ff9900; color: #fff; padding: 0 40px;border-radius: 20px 0 0 20px;z-index: 2; cursor:pointer;}

@ -84,7 +84,7 @@
84 84 
.noconmment{ line-height:120px;}
85 85
86 86 
.evastarbox2{ overflow:hidden;}
87 
.evastar2{ display:block; width:20px; height:20px; cursor:pointer; float:left; background:url(../images/evastar.png) 0 -21px no-repeat;}
87 
.evastar2{ display:block; width:19px; height:19px; cursor:pointer; float:left; background:url(../images/evastar.png) 0 -21px no-repeat;}
88 88
89 89 
/*留言*/
90 90 
.guestbookinfo{position:absolute;background:#fff;border-radius:10px;padding:20px;font-size:14px; z-index:1001;  margin-bottom:40px;box-shadow: 2px 4px 10px 4px #555; -webkit-box-shadow: 2px 4px 10px 4px #555; -moz-box-shadow: 2px 4px 10px 4px #555;}

+ 11 - 11
src/main/webapp/css/workspace.css
View File 

@ -11,7 +11,7 @@
11 11 
.workmenu{ float:left; width:12%; height:300px; background: #fafafa;border-radius: 6px;overflow: hidden;}
12 12 
.workmenutit{height: 60px;padding: 0 20px;font-size:16px;line-height:60px; border-bottom:1px #ff9900 solid;cursor:pointer;}
13 13 
.worksubmenu{width:100%; height:40px; margin:10px 0; padding-left:30px;font-size:15px;line-height:40px; color:#313131; cursor:pointer;}
14 
.worksubmenu .subcolor{ background:#ff9900; color:#fff;}
14 
.worksubmenu.subcolor{ background:#ff9900; color:#fff;}
15 15
16 16 
/*右侧内容*/
17 17 
.workcon{float:right; margin-left:10px; width:87%; min-height:800px; background: #fafafa;border-radius:6px;overflow: hidden;}

@ -61,7 +61,7 @@
61 61 
.workhs{ width:34%; overflow:hidden;}
62 62 
.workconleft{/*  width:82%; */ width:100%;}
63 63 
.workhead{ display:block; margin:10px auto 2px auto; width:60%; overflow:hidden;}
64 
.workstat{ float:left; width:100%; text-align:center;}
64 
.workstat{font-size: 12px; float:left; width:100%; text-align:center;}
65 65 
.workstat span{font-size:18px;line-height:30px;margin: 0 4px;}
66 66
67 67 
.workinfor{width:64%; margin-top:20px; padding:10px 16px;min-height:140px;}

@ -172,31 +172,32 @@
172 172
173 173 
/*咨询对话*/
174 174
175 
.consultdialogbox{ width:100%; padding:20px; }
175 
.consultdialogbox{ width:100%; padding:20px;color:#666;font-size:14px; }
176 176 
.dialoghead{ padding:20px; border-radius:10px 10px 0 0; text-align:center; border-bottom:1px #d6d6d6 solid; background-color:#F3F3F3; position:relative;}
177 177 
.dialoghead .backupbtn{ background:url(../images/backup.png) no-repeat center center; width:24px; height:24px; padding:20px; position:absolute; top:50%; left:16px; margin-top:-16px; cursor:pointer;}
178 
.dialoghead .dheadtit{width:680px; margin:auto;}
179 
.dialoghead .dheadtit .dialogpro{ padding:0 10px; font: 16px/30px; font-weight:600;}
178 
.dialoghead .dheadtit{width:680px; margin:auto; font-size: 13px; }
179 
.dialoghead .dheadtit .dialogpro{ padding:0 10px; font-size: 16px; color:#333;}
180 180
181 181 
.dialogcontain{ background:#fff; text-align:center; border-bottom:1px #d6d6d6 solid; position:relative;}
182 182 
.dialogcontain .dialoginfo{ max-width:460px; padding:10px;  margin:auto;}
183 
.dialogcontain .dialoginfo .dialoginfotype{ padding: 2px 10px;}
184 
.dialogcontain .dialoginfo .dialogtit{ font-weight:600;}
183 
.dialogcontain .dialoginfo .dialoginfotype{ padding: 1px 10px;}
184 
.dialogcontain .dialoginfo .dialogtit{ color: #333;font-size:14px;}
185 185 
.dialogcontain .dialoginfo .thanksblock{width:400px; margin:auto;}
186 186 
.dialogcontain .dialoginfo .thankbox{ margin:2px 6px;}
187 
.dialogcontain .dialoginfo .evadbox{ overflow:hidden; width:200px;}
187 
.dialogcontain .dialoginfo .evadbox{ overflow:hidden;  position: relative; width:164px;}
188 
.dialogcontain .dialoginfo .evadbox .evadegree{position: absolute;right: 2px;top: -2px;}
188 189 
.dialogcontain .dialoginfo .evamargin{ margin:auto;}
189 190
190 191 
.dialogcontain .dialoginfo .evadtit{ margin:2px 6px;}
191 192 
.dialogcontain .dialoginfo .thankbox{ width:190px;}
192 
.dialogcontain .dialoginfo .thankbox span{ padding:0 12px; font-weight:600;}
193 
.dialogcontain .dialoginfo .thankbox span{ padding:0 12px;}
193 194 
.dialogcontain .dialoginfo .dialogsurebtn{margin: 10px auto;}
194 195 
.dialogcontain .dialoginfo .dialogsurebtn span {padding:6px 20px; border-radius:6px; background:#ff9900;color:#fff; cursor:pointer; }
195 196
196 197 
.dialogcontain .dialogstatus{ position:absolute; top:-20px; right: -8px;background: #ff9900; color: #fff; padding: 0 60px;border-radius: 20px 0 0 20px;z-index: 2; line-height: 40px; }
197 198 
.dialogcontain .dialogstatus em{position: absolute;width: 0px; height: 0px;border-top: 0px solid  rgb(180, 60, 6);border-bottom: 6px solid transparent;border-left: 8px solid  rgb(180, 60, 6); border-right: 0px solid transparent;right: 0px; bottom: -5px;}
198 199
199 
.dialogbody{ padding:20px; background:#FFF1DD; border-bottom:1px #d6d6d6 solid; min-height: 320px; overflow-y:auto;}
200 
.dialogbody{ padding:20px; background:#E8F5FF; border-bottom:1px #d6d6d6 solid; min-height: 320px; overflow-y:auto;}
200 201 
.dialog{max-height: 500px;}
201 202 
.dialogbody .scrollBar{position: absolute; top: 0;width: 4px; height: 100%; border-radius: 2px;overflow: hidden;}
202 203 
.dialogbody .scrollBar .bar{ position: absolute;left: 0; width: 100%; height: 40%;border-radius: 2px; background:#888; overflow: hidden; cursor: pointer;}

@ -251,7 +252,6 @@
251 252 
	width:440px;
252 253 
	height:auto;
253 254 
	position:relative;
254 
	color:black;
255 255 
}
256 256 
#dialog_consultContent {
257 257

+ 4 - 4
src/main/webapp/diloags.html
View File 

@ -48,11 +48,11 @@
48 48 
		               				<span class="evastar2"></span>
49 49 
		               			</div>
50 50 
		                	</div>
51 
		                	<div class="displayNone" id="dialog_assessContent">
52 
		                		评价内容:
53 
		                		<span id="dialog_assessContentText" ></span>
54 
		                	</div>
55 51 
	                	</div>
52 
	                	<div class="displayNone" id="dialog_assessContent">
53 
	                		评价内容:
54 
	                		<span id="dialog_assessContentText" ></span>
55 
	                	</div>
56 56 
	                	<div class="thankbox  evamargin displayNone" id="dialog_thanks">
57 57 
		                	感谢金额
58 58 
		                	<span id="dialog_thanksMoney"></span>元

BIN
src/main/webapp/images/logo.png
View File


BIN
src/main/webapp/images/logo2.png
View File


+ 4 - 3
src/main/webapp/information.html
View File 

@ -7,9 +7,10 @@
7 7 
<title>科袖－修改专家信息</title>
8 8 
<link href="css/bootstrap.min.css" rel="stylesheet">
9 9 
<link rel="stylesheet" href="css/reset.css" />
10 
<link rel="stylesheet" type="text/css" href="css/style.css" />
11 
<link type="text/css" href="css/index.css" rel="stylesheet">
12 10 
<link type="text/css" href="css/common.css" rel="stylesheet">
11 
<!-- <link rel="stylesheet" type="text/css" href="css/style.css" /> -->
12 
<link type="text/css" href="css/index.css" rel="stylesheet">
13
13 14
14 15 
</head>
15 16 


@ -448,7 +449,7 @@
448 449 
				</div>
449 450
450 451 
                <div class="right-box introduction">
451 
					<div class="right-title"><span>科研资源</span> <a  class="enterwork"id="enterwork">进入我的工作台</a>   </div>
452 
					<div class="right-title"><span>科研资源</span> <div class="enterwork" id="enterwork" style="color:#333;position:absolute; bottom:10px; left:102px; cursor: pointer;">进入我的工作台</div>   </div>
452 453 
					<div class="infor-browse">
453 454 
                    	<div class="shareabout">
454 455 
                            <div class="sharesrcbox">

+ 39 - 1
src/main/webapp/js/common.js
View File 

@ -139,7 +139,45 @@ var hash={
139 139 
    '188.com': 'http://www.188.com/',
140 140 
    'foxmail.coom': 'http://www.foxmail.com'
141 141 
};
142
142 
//轮播滚动函数
143 
function Carousel(inde, num,show, childcount, obj, next, prev) {
144 
	var tapnum=0; //按钮可点击次数
145 
	if( childcount > num ){
146 
		next.css("display","block");
147 
	}
148 
	next.click(function() {
149 
		if (!obj.is(":animated")) {
150 
			if (num < childcount) {
151 
				tapnum++;
152 
				prev.css("display","block");
153 
				if(tapnum == childcount-show){
154 
					next.css("display","none");
155
156 
				}
157 
				num++;
158 
				obj.animate({
159 
					left: "-=212px"
160 
				}, 600);
161 
			}
162 
		}
163 
	});
164 
	prev.click(function() {
165
166 
		if (!obj.is(":animated")) {
167 
			if (num > inde) {
168 
				tapnum--;
169 
				next.css("display","block");
170 
				if(tapnum == 0){
171 
					prev.css("display","none");
172 
				}
173 
				num--;
174 
				obj.animate({
175 
					left: "+=212px"
176 
				}, 600);
177 
			}
178 
		}
179 
	});
180 
}
143 181
144 182 
//评价字数限制
145 183 
//字数限制函数

+ 1 - 1
src/main/webapp/js/consult.js
View File 

@ -83,7 +83,7 @@ function handleData(data,attrParams,btnCls){
83 83 
						"</td>" +
84 84 
						"<td style='position:relative;' width='86%'>" +
85 85 
							"<div class='workinfor worksitcon'>" +
86 
								"<h4><a class='named' id='nameS'> " + data[i]["professor"]["name"] +" </a><img class='modifyicon' style='"+proModify+"' src='images/rz.png' width='30'><input type='text' class='assessStar' value='"+data[i]["assessStar"] +"' style='display: none;'></h4>" +
86 
								"<h4><a class='named' id='nameS'> " + data[i]["professor"]["name"] +" </a><img class='modifyicon' style='"+proModify+"' src='images/onauth.png'><input type='text' class='assessStar' value='"+data[i]["assessStar"] +"' style='display: none;'></h4>" +
87 87 
								"<h6><span>职称  " + data[i]["professor"]["title"] +"  </span>,<span>职位"+data[i]["professor"]["office"]+"</span>,<span> " + data[i]["professor"]["orgName"] +"  </span>,<span> " + data[i]["professor"]["department"] +" </span>&nbsp;|&nbsp;<span> " + data[i]["professor"]["adress"] +"  </span></h6>" +
88 88 
								"<h6>"+
89 89 
								"<span>咨询主题：<em> " + data[i]["consultTitle"] +"  </em></span>" +

+ 10 - 1
src/main/webapp/js/index.js
View File 

@ -88,7 +88,7 @@ $("#search").on("click", function() {
88 88 
});
89 89
90 90 
//enter绑定时间
91 
$("input").keydown(function(e){
91 
$("#searchContent").keydown(function(e){
92 92 
	if(e.which==13) {
93 93 
		synContent(2);
94 94 
		synContent(1);		

@ -97,6 +97,15 @@ $("input").keydown(function(e){
97 97 
	}
98 98
99 99 
})
100 
$("#hsearchContent").keydown(function(e){
101 
	if(e.which==13) {
102 
		synContent(1);
103 
		synContent(2);
104 
		var searchContent = $("#hsearchContent").val();
105 
		location.href = "search.html?searchContent=" + encodeURI(searchContent);
106 
	}
107 
})
108
100 109 
$("#hsearch").on("click", function() {
101 110 
	var searchContent = $("#hsearchContent").val();
102 111 
	location.href = "search.html?searchContent=" + encodeURI(searchContent);

+ 6 - 28
src/main/webapp/js/information.brow.js
View File 

@ -441,14 +441,15 @@ var resou;
441 441 
			resou=data.data.length;
442 442 
			if(data.data.length==0){
443 443 
				$("#infor-browse").css("display","none");
444 
				$(".resoubtn").css("display","none");
445 444 
				$("span:contains('科研资源')").parents(".introduction").hide();
446 445 
				$("a:contains('科研资源')").hide();
447 446 
			}
448 
			if(data.data.length > 0 && data.data.length <= 3){
447 
			if(data.data.length > 3){
449 448 
				$("#infor-browse").css("display","block");
450 
				$(".resoubtn").css("display","none");
449 
				$(".resoubtn").css("display","block");
451 450 
			}
451
452
452 453 
			var add="";
453 454 
			if(data.success)
454 455 
				{

@ -475,33 +476,10 @@ var resou;
475 476 
					//资源轮播
476 477 
					var $content = $(".sharescrollbox");
477 478 
					var childcount = $content.find(".sharesrc").length;
478 
					Carousel(3,3, childcount, $content, $(".resounext"), $(".resouprev"));
479 
					Carousel(3,3,3,childcount, $content, $(".resounext"), $(".resouprev"));
479 480 
					//科研资源中点咨询
480 481 
					$(".introduction").find(".resourceConsult").bind("click",clickResourceConsult);
481
482 
					function Carousel(inde, num, childcount, obj, next, prev) {
483 
						next.click(function() {
484 
							if (!obj.is(":animated")) {
485 
								if (num < childcount) {
486
487 
									num++;
488 
									obj.animate({
489 
										left: "-=212px"
490 
									}, 600);
491 
								}
492 
							}
493 
						});
494 
						prev.click(function() {
495 
							if (!obj.is(":animated")) {
496 
								if (num > inde) {
497 
									num--;
498 
									obj.animate({
499 
										left: "+=212px"
500 
									}, 600);
501 
								}
502 
							}
503 
						});
504 
					}
482
505 483 
				}
506 484 
				else
507 485 
				{

+ 2 - 61
src/main/webapp/js/information.js
View File 

@ -198,7 +198,7 @@ $.get("/ajax/professor/info/" + userid, function($data) {
198 198 
			subjectShow($info.subject);
199 199 
			//研究方向
200 200 
			if ($info.researchAreas) {
201 
				researchAreaShow($info.researchAreas, $info.researchAreaLogs);
201 
				researchAreaShow($info.researchAreas, $info.editResearchAreaLogs);
202 202 
			}
203 203 
			//应用行业
204 204 
			industryShow($info.industry);

@ -373,36 +373,6 @@ $(".subsidebar").click(function(){
373 373 
			},1000);
374 374
375 375 
		 });
376 
//科研资源
377
378 
	var $content = $(".sharescrollbox");
379 
	var childcount = $content.find(".sharesrc").length;
380 
	Carousel(3,3, childcount, $content, $(".resounext"), $(".resouprev"));
381
382 
	function Carousel(inde, num, childcount, obj, next, prev) {
383 
		next.click(function() {
384 
			if (!obj.is(":animated")) {
385 
				if (num < childcount) {
386
387 
					num++;
388 
					obj.animate({
389 
						left: "-=212px"
390 
					}, 600);
391 
				}
392 
			}
393 
		});
394 
		prev.click(function() {
395 
			if (!obj.is(":animated")) {
396 
				if (num > inde) {
397 
					num--;
398 
					obj.animate({
399 
						left: "+=212px"
400 
					}, 600);
401 
				}
402 
			}
403 
		});
404 
	}
405
406 376 
//放在编辑上面添加一个class和减少一个class
407 377 
$("#container .edit").hover(function(){
408 378 
	$(this).addClass("edit-position-left")	

@ -1104,11 +1074,6 @@ getProfessorData()
1104 1074 
			//console.log(data);
1105 1075 
			if(data.data.length==0){
1106 1076 
				$("#infor-browse").css("display","none");
1107 
				$(".resoubtn").css("display","none");
1108 
			}
1109 
			if(data.data.length > 0 && data.data.length <= 3){
1110 
				$("#infor-browse").css("display","block");
1111 
				$(".resoubtn").css("display","none");
1112 1077 
			}
1113 1078 
			var add="";
1114 1079 
			if(data.success)

@ -1137,31 +1102,7 @@ getProfessorData()
1137 1102 
					//资源轮播
1138 1103 
					var $content = $(".sharescrollbox");
1139 1104 
					var childcount = $content.find(".sharesrc").length;
1140 
					Carousel(3,3, childcount, $content, $(".resounext"), $(".resouprev"));
1141
1142 
					function Carousel(inde, num, childcount, obj, next, prev) {
1143 
						next.click(function() {
1144 
							if (!obj.is(":animated")) {
1145 
								if (num < childcount) {
1146
1147 
									num++;
1148 
									obj.animate({
1149 
										left: "-=212px"
1150 
									}, 600);
1151 
								}
1152 
							}
1153 
						});
1154 
						prev.click(function() {
1155 
							if (!obj.is(":animated")) {
1156 
								if (num > inde) {
1157 
									num--;
1158 
									obj.animate({
1159 
										left: "+=212px"
1160 
									}, 600);
1161 
								}
1162 
							}
1163 
						});
1164 
					}
1105 
					Carousel(3,3,3,childcount, $content, $(".resounext"), $(".resouprev"));
1165 1106 
				}
1166 1107 
				else
1167 1108 
				{

+ 31 - 30
src/main/webapp/js/search.js
View File 

@ -7,23 +7,24 @@ $(function(){
7 7 
//	       $(".lookwho option[value='1']").attr("selected","selected");
8 8 
	       $("#div_select").text("找资源");
9 9 
	    }
10
11 
//	    var lookFor2 = 0;
12 
//	    $("#lookFor2 ul li").on("click",function(){
13 
//	    	lookFor2=$(this).index();
14 
//	    	 console.log(lookFor2);
15 
//	    });
16 
//	  //enter绑定时间
17 
//	    $("#lookFor2 #searchContent").keydown(function(e){
18 
//	    	if(e.which==13) {
19 
//	    		synContent(2);
20 
//	    		synContent(1);
21 
//	    	 var searchContent = $("#searchContent").val();
22 
//	    	   console.log(lookFor2);
23 
//	    		location.href = "search.html?searchContent=" + encodeURI(searchContent)+"&lookFor=" + lookFor2;
24 
//	    	}
25 
//
26 
//	    })
10 
/*
11 
	    var lookFor2 = 0;
12 
	    $("#lookFor2 ul li").on("click",function(){
13 
	    	lookFor2=$(this).index();
14 
	    });
15 
	  //enter绑定时间
16 
	    $("#searchContent").keydown(function(e){
17 
	    	if(e.which==13) {
18 
	    		synContent(2);
19 
	    		synContent(1);
20 
	    		var searchContent = $("#searchContent").val();
21 
	    		if(lookFor2 = 1){
22 
	    			$("#div_select").text("找资源");
23 
	    			location.href = "search.html?searchContent=" + encodeURI(searchContent);
24 
	    		}
25 
	    	}
26
27 
	    })*/
27 28
28 29 
		var userid = $.cookie("userid");
29 30 
		var  subject;

@ -46,7 +47,7 @@ $(function(){
46 47 
					"contentType" : "application/x-www-form-urlencoded",
47 48 
					"success" : function($data) {
48 49 
						if ($data.success) {
49 
							console.log($data);
50 
							//console.log($data);
50 51 
							$("#professorList").html("");
51 52 
							for(var i = 0 ; i < $data.data.data.length ; i++){
52 53 
								//创建HTML标签  

@ -81,18 +82,18 @@ $(function(){
81 82 
									dataHtml += " | "+$data.data.data[i].address;
82 83 
								}
83 84 
								dataHtml += "</div>";
84 
								dataHtml += "<div class='science'>";
85 
								dataHtml += "<div class='ellipsisbox science'>";
85 86 
								if(typeof($data.data.data[i].subject) !== "undefined"){
86 
									dataHtml += $data.data.data[i].subject
87 
									dataHtml +="<p>学术领域："+ $data.data.data[i].subject +"</p>";
87 88 
								}
88 89 
								dataHtml += "</div>";
89 
								dataHtml += "<div class='industry'>";
90 
								dataHtml += "<div class='ellipsisbox industry'>";
90 91 
								if(typeof($data.data.data[i].industry) !== "undefined"){
91 
									dataHtml += $data.data.data[i].industry;
92 
									dataHtml += "<p>应用行业："+ $data.data.data[i].industry +"</p>";
92 93 
								}
93 94 
								if($data.data.data[i].researchAreas.length ){
94 
									dataHtml +=	"<p>"+$data.data.data[i].researchAreas[0].caption+"</p>";
95 
									console.log($data.data.data[i].researchAreas[0].caption);
95 
									dataHtml +=	"<p>研究方向："+$data.data.data[i].researchAreas[0].caption +"</p>";
96 
									//console.log($data.data.data[i].researchAreas[0].caption);
96 97 
								}
97 98
98 99 
								dataHtml += "</div>";

@ -120,7 +121,7 @@ $(function(){
120 121 
								)(i);
121 122 
								//点击查看当前信息
122 123 
								(function(i){
123 
									$('.synopsis').click(function()
124 
									$('.synopsis').eq(i).click(function()
124 125 
								{
125 126 
									if(userid==$data.data.data[i].id)
126 127 
									{	

@ -171,8 +172,8 @@ $(function(){
171 172 
 							for(var i=0;i<$da.length;i++)
172 173 
 							{
173 174 
 								var add='<div class="item">'
174 
 			                    add+='<a class="resourcephoto bgRadius" ><img src="" class="resourceImg remess" width="100%" height="100%" resourceId='+$da[i].resourceId+'></a>'
175 
 			                    add+='<div class="synopsis">'
175 
 			                    add+='<a class="resourcephoto headRadius" ><img src="" class="resourceImg remess" width="100%" height="100%" resourceId='+$da[i].resourceId+'></a>'
176 
 			                    add+='<div class="synopsis" style="width:66%;">'
176 177 
 			                     add+='<div class="cousultName"><a class="resouname" href="javascript:void();">'+$da[i].resourceName+'</a></div>'
177 178 
 			                     if($da[i].professor.name){
178 179 
 			                    	 add+='<div class="belongname">'+$da[i].professor.name+'<img class="modicon" src="images/onauth.png" width="14" ></div>'  

@ -189,15 +190,15 @@ $(function(){
189 190 
 			                    add+='<div class="positionbox">'+$da[i].professor.title+$da[i].professor.department+$da[i].professor.orgName+'</div>'
190 191 
 			                    if($da[i].subject)
191 192 
 			                    {
192 
 			                    	add+='<div class="sciencebox">'+$da[i].subject+'</div>'
193 
 			                    	add+='<div class="ellipsisbox sciencebox"><p>学术领域：'+$da[i].subject+'</p></div>'
193 194 
 			    				}
194 195 
 								if($da[i].industry)
195 196 
 								{
196 
 									add+='<div class="industrybox">'+$da[i].industry+'</div>'
197 
 									add+='<div class="ellipsisbox industrybox"><p>应用行业：'+$da[i].industry+'</p></div>'
197 198 
 								}
198 199 
 								if($da[i].supportedServices)
199 200 
 								{
200 
 									 add+='<div class="provideservice">可提供服务：'+$da[i].supportedServices+'</div></div>'
201 
 									 add+='<div class="ellipsisbox provideservice"><p>应用用途：'+$da[i].supportedServices+'</p></div></div>'
201 202 
 								}
202 203 
 			                    add+='<div class="operbox"><span class="operbtn consultbtn" id="'+$da[i]["professor"]["id"]+'">咨询</span><span class="operbtn applybtn appl" resourceId='+$da[i].resourceId+' resourceName='+$da[i].resourceName+' professor='+$da[i].professor.name+'>申请</span></div>'
203 204 
 			                	add+='</div>'