Explorar el Código

Merge branch 'test' of http://121.42.53.174:3000/jiapeng/portal-front into test

Conflicts:
	e/search.html
	searchNew.html
root %!s(int64=5) %!d(string=hace) años
padre
commit
80da7a4008
Se han modificado 8 ficheros con 564 adiciones y 67 borrados
  1. 163 0
      e/search.html
  2. 66 25
      js/teamInforShow.js
  3. 79 38
      js/teamManage.js
  4. 3 2
      js/unPatentIssue.js
  5. 2 2
      js/unPatentList.js
  6. 209 0
      searchNew.html
  7. 21 0
      teamInfoShow.html
  8. 21 0
      teamManage.html

+ 163 - 0
e/search.html

@ -1,3 +1,4 @@
1
<<<<<<< HEAD
1 2
<!DOCTYPE html>
2 3
<html style="max-width: 640px;margin: auto;">
3 4
@ -158,4 +159,166 @@
158 159
159 160
</body>
160 161
162
=======
163
<!DOCTYPE html>
164
<html style="max-width: 640px;margin: auto;">
165

166
<head>
167
<meta charset="UTF-8">
168
<title>搜索-科袖网</title>
169
<meta name="viewport" content="width=device-width,initial-scale=1,minimum-scale=1,maximum-scale=1,user-scalable=no" />
170
<link rel="stylesheet" href="../css/bootstrap.min.css" />
171
<link rel="stylesheet" href="../css/reset.css" />
172
<link rel="stylesheet" href="../css/common.css" />
173
<link rel="stylesheet" href="../css/swiper.min.css" />
174
<link rel="stylesheet" href="../css/mmenu.css" />
175
<link rel="stylesheet" href="../css/share.css" />
176
<script type="text/javascript" src="../js/jquery-1.11.1.js"></script>
177
<script type="text/javascript" src="../js/public/swiper.min.js"></script>
178
<script type="text/javascript" src="../js/public/jquery.mmenu.js"></script>	
179
<script type="text/javascript">
180
	$(function() {
181
		$("nav#menu").mmenu();
182
		var myscrollFil;
183
	    function loaded(){
184
	        setTimeout(function(){
185
	            myscrollFil=new iScroll("wrapper",{
186
	            	mouseWheel: true,
187
					onScrollMove:function(){
188
						myscrollFil.refresh()
189
					}
190
	            });
191
	            
192
	        },100 );
193
	    }
194
	    window.addEventListener("load",loaded,false);
195
		document.addEventListener('touchmove', function (e) { e.preventDefault(); }, false);
196
	});
197
	
198
</script>
199

200
</head>
201
<<<<<<< HEAD
202
=======
203
<!-- 1111 -->
204
>>>>>>> dev
205
<!-- 111 -->
206
<body>
207
<div class="bomb-box"></div>
208
<div class="contentBody2" id="page">
209
	<div class="fixedBlock">
210
		<div class="searchBox">
211
			<form action="" onsubmit="return false;" id="searB" class="searchboxNewT">
212
	      		<input type="search" class="form-control" placeholder="请输入关键词" id="searchval" />
213
	      	</form>
214
	        <a href="#menu" class="rightnav" id="sele">
215
				<div class="serchicon icon-filter"><span class="badge" id="seler"></span></div>筛选
216
			</a>
217
	    </div>
218
	    <div class="tabBox">
219
			<div class="swiper-container-tab">
220
				<div class="swiper-wrapper swiper-wrapper-tab tr">
221
					<div class="swiper-slide swiper-slide-tab active-tab" data-tab="1">找专家</div>
222
					<div class="swiper-slide swiper-slide-tab" data-tab="7">找服务</div>
223
					<div class="swiper-slide swiper-slide-tab" data-tab="2">找资源</div>
224
					<div class="swiper-slide swiper-slide-tab" data-tab="4">找专利</div>
225
					<div class="swiper-slide swiper-slide-tab" data-tab="5">找论文</div>
226
					<!-- <div class="swiper-slide swiper-slide-tab" data-tab="3">找文章</div> -->
227
					<div class="swiper-slide swiper-slide-tab" data-tab="6">找企业</div>
228
				</div>
229
			</div>
230
		</div>
231
	</div>
232
	<div class="swiper-container madiaBlock swiper-container-main">
233
		<!--<div class="refreshtip">下拉可以刷新</div>-->
234
		<div class="swiper-wrapper swiper-wrapper-main w">
235
			<div class="swiper-slide d">
236
				<!--<div class="init-loading list-group-item" style="display: none;">下拉可以刷新</div>-->
237
				<div class="swiper-container2">
238
					<div class="swiper-wrapper">
239
						<div class="swiper-slide list-group">
240
							<ul class="mui-table-view" id="proList">
241
	
242
							</ul>
243
						</div>
244
						<div class="swiper-slide list-group">
245
							<ul class="mui-table-view" id="serviceList">
246
	
247
							</ul>
248
						</div>
249
						<div class="swiper-slide list-group">
250
							<ul class="mui-table-view" id="resourceList">
251
	
252
							</ul>
253
						</div>
254
						<div class="swiper-slide list-group">
255
							<ul class="mui-table-view" id="patentList">
256
	
257
							</ul>
258
						</div>
259
						<div class="swiper-slide list-group">
260
							<ul class="mui-table-view" id="paperList">
261
	
262
							</ul>
263
						</div>
264
						<!-- <div class="swiper-slide list-group">
265
							<ul class="mui-table-view" id="articleList">
266
	
267
							</ul>
268
						</div> -->
269
						<div class="swiper-slide list-group">
270
							<ul class="mui-table-view" id="companyList">
271
	
272
							</ul>
273
						</div>
274
					</div>
275
				</div>
276
			</div>
277
		</div>
278
		<div class="loadtip">上拉加载更多</div>
279
		<div class="swiper-scrollbar"></div>
280
	</div>
281
	<nav id="menu">
282
		<div class="filterCon">
283
			<h1 class="toptit">“找专家”</h1>
284
			<div id="wrapper">
285
				<div class="midCon" id="scroller">
286
					<div class="filterListNew">
287
						<div class="rightbtn">所在城市<span class="spantext">不限</span><em class="foldtr"></em></div>
288
						<ul class="filterUl fourUl" id="address">
289
							
290
				       	</ul>
291
					</div>
292
					<div class="filterListNew">
293
						<div class="rightbtn">学术领域<span class="spantext">不限</span><em class="foldtr"></em></div>
294
						<ul class="filterUl threeUl" id="subject">
295
							
296
				       	</ul>
297
					</div>
298
					<div class="filterListNew">
299
						<div class="rightbtn">行业领域<span class="spantext">不限</span><em class="foldtr"></em></div>
300
						<ul class="filterUl threeUl" id="industry">
301
							
302
				       	</ul>
303
					</div>
304
				</div>
305
			</div>
306
			<div class="submitBtn clearfix">
307
				<span class="floatL topWord" id="oRes">重置</span>
308
				<span class="floatR topWord" id="com">完成</span>
309
			</div>
310
		</div>
311
	</nav>
312
</div>
313

314

315
<script type="text/javascript" src="../js/public/baseUtil.js"></script>	
316
<script type="text/javascript" src="../js/public/shareCom.js"></script>	
317
<script type="text/javascript" src="../js/public/cacheUtil.js"></script>
318
<script type="text/javascript" src="../js/public/iscroll.js"></script>	
319
<script src="../js/search_h5.js" type="text/javascript" charset="utf-8"></script>
320

321
</body>
322

323
>>>>>>> 81b6af0036f1c4830d171b3b878a3e3b91c2eac6
161 324
</html>

+ 66 - 25
js/teamInforShow.js

@ -180,6 +180,7 @@ $(function() {
180 180
				pageNo: pageNo,
181 181
			}, "get", function(res){
182 182
				var $info = res.data.data;
183
				$("#showPatent").html("")
183 184
				if($info.length > 0) {
184 185
					if(res.data.total>0 && res.data.total<99){
185 186
						$("#patCount").text(res.data.total);
@ -192,6 +193,8 @@ $(function() {
192 193
						patentArr.push($info[i].patent)
193 194
					}
194 195
					detailPat(aimId)
196
				} else {
197
					$("#showPatent").parents('.otherShow').hide()
195 198
				}
196 199
				var liLen=document.getElementById(aimId).querySelectorAll("li").length;
197 200
                removeNodata(aimId);
@ -225,6 +228,7 @@ $(function() {
225 228
				pageNo: pageNo,
226 229
			}, "get", function(res){
227 230
				var $info = res.data.data;
231
				$("#showUnPatent").html("")
228 232
				if($info.length > 0) {
229 233
					if(res.data.total>0 && res.data.total<99){
230 234
						$("#unpatCount").text(res.data.total);
@ -240,6 +244,8 @@ $(function() {
240 244
						unpatentArr.push($info[i].researchResult)
241 245
					}
242 246
					detailUnPat(aimId)
247
				}else {
248
					$("#showUnPatent").parents('.otherShow').hide()
243 249
				}
244 250
				var liLen=document.getElementById(aimId).querySelectorAll("li").length;
245 251
                removeNodata(aimId);
@ -273,6 +279,7 @@ $(function() {
273 279
				pageNo: pageNo,
274 280
			}, "get", function(res){
275 281
				var $info = res.data.data;
282
				$("#showPaper").html("")
276 283
				if($info.length > 0) {
277 284
					if(res.data.total>0 && res.data.total<99){
278 285
						$("#parCount").text(res.data.total);
@ -285,6 +292,8 @@ $(function() {
285 292
						paperArr.push($info[i].paper)
286 293
					}
287 294
					detailPer(aimId)
295
				}else {
296
					$("#showPaper").parents(".otherShow").hide()
288 297
				}
289 298
                if(isbind){
290 299
                	$("#"+aimId).parent().find(".js-load-more").unbind("click").on("click",function(){
@ -310,18 +319,19 @@ $(function() {
310 319
			},"get",function(data){
311 320
				var dataStr=data.data;
312 321
				for(var i = 0; i < dataStr.length; i++) {
313
					var li = document.createElement("li");
314
					li.className = "mui-table-view-cell";
322
					
315 323
					var strAdd = '';
316
						strAdd += '<a  target="_blank" href="/'+ pageUrl("pt",dataStr[i]) +'" class="flexCenter urlgo">';
324
						strAdd += '<li class="mui-table-view-cell"><a  target="_blank" href="/'+ pageUrl("pt",dataStr[i]) +'" class="flexCenter urlgo">';
317 325
						strAdd += '<div class="madiaHead patentHead"></div>';
318 326
						strAdd += '<div class="madiaInfo"><p class="h1Font ellipsisSty">'+ dataStr[i].name +'</p>';
319 327
						strAdd += '<p class="h2Font ellipsisSty">发明人:'+ dataStr[i].authors.substring(0, dataStr[i].authors.length - 1) +'</p>';
320 328
						strAdd += '<p class="h2Font ellipsisSty">申请人:'+ dataStr[i].reqPerson +'</p>';
321 329
						strAdd += '</div>';
322
						strAdd += '</a>';
323
					li.innerHTML = strAdd
324
					document.getElementById(obj).appendChild(li);
330
						strAdd += '</a></li>';
331
						$("#"+obj).append(strAdd)
332
						if (i < 3) {
333
							$("#showPatent").append(strAdd);
334
						}
325 335
				}
326 336
			});
327 337
		},
@ -331,15 +341,14 @@ $(function() {
331 341
			},"get",function(data){
332 342
				var dataStr=data.data;
333 343
				for(var i = 0; i < dataStr.length; i++) {
334
					var li = document.createElement("li");
335
					li.className = "mui-table-view-cell";
344
					
336 345
					var resIM='<div class="madiaHead patentHead"></div>'
337 346
					if (dataStr[i].pic) {
338 347
						var src = '/data/researchResult' + dataStr[i].pic.split(",")[0]
339 348
						resIM = '<div class="madiaHead patentHead" style="background-image:url('+ src +')"></div>';
340 349
					}
341 350
					var strAdd = '';
342
						strAdd += '<a  target="_blank" href="unPatentShow.html?id='+dataStr[i].id+'" class="flexCenter urlgo">';
351
						strAdd += '<li class="mui-table-view-cell"><a  target="_blank" href="unPatentShow.html?id='+dataStr[i].id+'" class="flexCenter urlgo">';
343 352
						strAdd += resIM
344 353
						strAdd += '<div class="madiaInfo"><p class="h1Font ellipsisSty">'+ dataStr[i].name +'</p>';
345 354
						strAdd += '<p class="h2Font ellipsisSty displayNone">研究者:<span class="researchers"></span></p>';
@ -347,10 +356,13 @@ $(function() {
347 356
							strAdd += '<p class="h2Font ellipsisSty">所属机构:<span class="resOrgName"></span></p>';
348 357
						}
349 358
						strAdd += '</div>';
350
						strAdd += '</a>';
351
					li.innerHTML = strAdd
352
					document.getElementById(obj).appendChild(li);
353
					var $itemlist = $(li);
359
						strAdd += '</a></li>';
360
			
361
						$("#"+obj).append(strAdd);
362
						if (i < 3) {
363
							$("#showUnPatent").append(strAdd)
364
						}
365
					var $itemlist = $(strAdd);
354 366
					queryResearcher(dataStr[i].id, $itemlist)
355 367
					if (dataStr[i].orgId) {
356 368
						queryReseOrgName(dataStr[i].orgId, $itemlist)
@ -405,18 +417,19 @@ $(function() {
405 417
					}
406 418
					moreInf = dataStr[i].cn4periodical+ " " +dataStr[i].en4periodical+ " " +dataStr[i].pubDay
407 419
					
408
					var li = document.createElement("li");
409
					li.className = "mui-table-view-cell";
420
					
410 421
					var strAdd = '';
411
						strAdd += '<a  target="_blank" href="/'+ pageUrl("pp",dataStr[i]) +'" class="flexCenter urlgo">';
422
						strAdd += '<li class="mui-table-view-cell"><a  target="_blank" href="/'+ pageUrl("pp",dataStr[i]) +'" class="flexCenter urlgo">';
412 423
						strAdd += '<div class="madiaHead paperHead"></div>';
413 424
						strAdd += '<div class="madiaInfo"><p class="h1Font ellipsisSty">'+ dataStr[i].name +'</p>';
414 425
						strAdd += '<p class="h2Font ellipsisSty">作者:'+ dataStr[i].authors.substring(0, dataStr[i].authors.length - 1) +'</p>';
415 426
						strAdd += '<p class="h2Font ellipsisSty">期刊:'+ moreInf +'</p>';
416 427
						strAdd += '</div>';
417
						strAdd += '</a>';
418
					li.innerHTML = strAdd
419
					document.getElementById(obj).appendChild(li);
428
						strAdd += '</a></li>';
429
						if(i < 3) {
430
							$('#showPaper').append(strAdd)
431
						}
432
						$('#'+obj).append(strAdd)
420 433
				}
421 434
			});
422 435
		},
@ -428,8 +441,6 @@ $(function() {
428 441
			}
429 442
			for(item in memberArr) {
430 443
				if (item!={}){
431
				    li= document.createElement("li");
432
					li.className = "mui-table-view-cell";
433 444
				
434 445
					var dataStr = memberArr[item]
435 446
					var dImg = "../images/default-photo.jpg"
@ -446,15 +457,19 @@ $(function() {
446 457
						li2 += '<span>首席专家</span>'
447 458
					}
448 459
					var strAdd = '';
449
						strAdd += '<a target="_blank" href="userInforShow.html?professorId='+ dataStr.id +'" class="flexCenter urlgo" style="min-height: 60px">';
460
						strAdd += '<li class="mui-table-view-cell"><a target="_blank" href="userInforShow.html?professorId='+ dataStr.id +'" class="flexCenter urlgo" style="min-height: 60px">';
450 461
						strAdd += '<div class="madiaHead useHead" style="background-image:url(' + dImg + ')"></div>';
451 462
						strAdd += '<div class="madiaInfo"><p class="h1Font ellipsisSty">'+ dataStr.name +'</p>';
452 463
						strAdd += '<p class="h2Font ellipsisSty">'+ dataStr.title|| dataStr.orgName ||'' +'</p>';
453 464
						strAdd += '</div>';
454 465
						strAdd += '<div class="tag-show">'+li2+'</div>'
455
						strAdd += '</a>';
456
					li.innerHTML = strAdd
457
					document.getElementById(obj).appendChild(li);
466
						strAdd += '</a></li>';
467
						if(chiefId===dataStr.id) {
468
					
469
							$("#"+obj).prepend(strAdd)
470
						} else {
471
							$("#"+obj).append(strAdd)
472
						}
458 473
				}
459 474
			}
460 475
	    },
@ -549,11 +564,37 @@ $(function() {
549 564
			})
550 565
	
551 566
		}
567
		$('#seeMoreF,#seeMoreZ').unbind("click").on("click",function(){
568
			$(".leftconItem").hide();
569
			var activeTab = $('#item6user').attr("rel");
570
			$("#item6user").show()
571
			$("ul.mainNavUl li").removeClass("liNow");
572
			$('#tab6user').addClass("liNow");
573
			$(".moreNav").hide();
574
			
575
			var pa=$(".moreNavUl.wendaUl>li.liNow").attr("rel")
576
			$("#"+pa).find("ul").html("")
577
			$("#"+pa).find(".js-load-more").show();
578
			
579
			$(".wendaNav li").eq(0).addClass("liNow").siblings().removeClass("liNow");
580
			$("#item6drop1").show()
581
			$("#item6more").show()
582
			unpatentListVal(true);
583
		})
584
		$('#seeMoreL').unbind("click").on("click",function(){
585
			$(".leftconItem").hide();
586
			var activeTab = $('#item5user').attr("rel");
587
			$("#item5user").show()
588
			$("ul.mainNavUl li").removeClass("liNow");
589
			$('#tab5user').addClass("liNow");
590
			$(".moreNav").hide();
591
		})
552 592
	ifcollectionAbout(tId,$(".goSpan").find(".attenSpan"), 13)
553 593
	getUserInfo(); //获取详细信息
554 594
	professorListVal(true);
555 595
	patentListVal(true);
556 596
	paperListVal(true);
597
	unpatentListVal(true);
557 598
	bindClickFun();	
558 599
})
559 600

+ 79 - 38
js/teamManage.js

@ -163,6 +163,7 @@ $(function() {
163 163
							chiefId = $info[i].professor
164 164
						}
165 165
					}
166
					console.log($info[i])
166 167
					if (ff) {
167 168
						detailPro(aimIdF, 1)	
168 169
					} else {
@ -296,6 +297,7 @@ $(function() {
296 297
				pageNo: pagePerNo,
297 298
			}, "get", function(res){
298 299
				var $info = res.data.data;
300
				$("#showUnPatent").html("")
299 301
				if($info.length > 0) {
300 302
					if(res.data.total>0 && res.data.total<99){
301 303
						$("#unpatCount").text(res.data.total);
@ -308,6 +310,8 @@ $(function() {
308 310
						unpatentArr.push($info[i].researchResult)
309 311
					}
310 312
					detailUnPat(aimId)
313
				}else {
314
					$("#showUnPatent").parents('.otherShow').hide()
311 315
				}
312 316
				var liLen=document.getElementById(aimId).querySelectorAll("li").length;
313 317
                removeNodata(aimId);
@ -356,14 +360,14 @@ $(function() {
356 360
						if (unpatentArr.indexOf($info[i].id)>-1) {
357 361
							li4 = '<li class="added">已添加</li>'
358 362
						}else{
359
							li4 = '<li class="addThis" data-id="'+$info[i].id+'" data-flag="1">添加</li>'	
363
							li4 = '<li class="addThis" data-id="'+$info[i].id+'" data-flag="1" style="cursor:pointer;">添加</li>'	
360 364
						}
361 365
						var resIM='<div class="madiaHead patentHead"></div>'
362 366
						if ($info[i].pic) {
363 367
							var src = '/data/researchResult' + $info[i].pic.split(",")[0]
364 368
							resIM = '<div class="madiaHead patentHead" style="background-image:url('+ src +')"></div>';
365 369
						}
366
						var itemlist = '<li>';
370
						var itemlist = '<li style="position:relative;">';
367 371
							itemlist += '<a target="_blank" href="unPatentShow.html?id='+$info[i].id+'" class="flexCenter urlgo">';
368 372
							itemlist += resIM
369 373
							itemlist += '<div class="madiaInfo">';
@ -395,6 +399,7 @@ $(function() {
395 399
				pageSize:rows,
396 400
				pageNo: pagePerNo,
397 401
			}, "get", function(res){
402
				$("#showPatent").html("")
398 403
				var $info = res.data.data;
399 404
				if($info.length > 0) {
400 405
					if(res.data.total>0 && res.data.total<99){
@ -408,6 +413,8 @@ $(function() {
408 413
						patentArr.push($info[i].patent)
409 414
					}
410 415
					detailPat(aimId)
416
				} else {
417
					$("#showPatent").parents('.otherShow').hide()
411 418
				}
412 419
				var liLen=document.getElementById(aimId).querySelectorAll("li").length;
413 420
                removeNodata(aimId);
@ -454,9 +461,9 @@ $(function() {
454 461
						if (patentArr.indexOf($info[i].id)>-1) {
455 462
							li4 = '<li class="added">已添加</li>'
456 463
						}else{
457
							li4 = '<li class="addThis" data-id="'+$info[i].id+'" data-flag="1">添加</li>'	
464
							li4 = '<li class="addThis" data-id="'+$info[i].id+'" data-flag="1" style="cursor:pointer;">添加</li>'	
458 465
						}
459
						var itemlist = '<li>';
466
						var itemlist = '<li style="position:relative;">';
460 467
							itemlist += '<a target="_blank" href="/' + pageUrl("pt",$info[i]) +'" class="flexCenter urlgo"><div class="madiaHead patentHead"></div>';
461 468
							itemlist += '<div class="madiaInfo">';
462 469
							itemlist += '<p class="h1Font ellipsisSty">'+ $info[i].name +'</p>';
@ -483,6 +490,7 @@ $(function() {
483 490
				pageNo: pagePerNo
484 491
			}, "get", function(res){
485 492
				var $info = res.data.data;
493
				$("#showPaper").html("")
486 494
				if($info.length > 0) {
487 495
					if(res.data.total>0 && res.data.total<99){
488 496
						$("#parCount").text(res.data.total);
@ -500,6 +508,8 @@ $(function() {
500 508
						paperArr.push($info[i].paper)
501 509
					}
502 510
					detailPer(aimId)
511
				} else {
512
					$("#showPaper").parents(".otherShow").hide()
503 513
				}
504 514
				var liLen=document.getElementById(aimId).querySelectorAll("li").length;
505 515
                removeNodata(aimId);
@ -546,7 +556,7 @@ $(function() {
546 556
						if (paperArr.indexOf($info[i].id)>-1) {
547 557
							li4 = '<li class="added">已添加</li>'
548 558
						}else{
549
							li4 = '<li class="addThis" data-id="'+$info[i].id+'" data-flag="1">添加</li>'	
559
							li4 = '<li class="addThis" data-id="'+$info[i].id+'" data-flag="1" style="cursor:pointer;">添加</li>'	
550 560
						}
551 561
						var moreInf=""
552 562
						if(!$info[i].cn4periodical){
@ -560,7 +570,7 @@ $(function() {
560 570
						}
561 571
						moreInf = $info[i].cn4periodical+ " " +$info[i].en4periodical+ " " +$info[i].pubDay;
562 572
						
563
						var itemlist = '<li>';
573
						var itemlist = '<li style="position: relative;">';
564 574
						itemlist += '<a target="_blank" href="/' + pageUrl("pp",$info[i]) +'" class="flexCenter urlgo"><div class="madiaHead paperHead"></div>';
565 575
						itemlist += '<div class="madiaInfo">';
566 576
						itemlist += '<p class="h1Font ellipsisSty">'+ $info[i].name +'</p>';
@ -585,15 +595,14 @@ $(function() {
585 595
			},"get",function(data){
586 596
				var dataStr=data.data;
587 597
				for(var i = 0; i < dataStr.length; i++) {
588
					var li = document.createElement("li");
589
					li.className = "mui-table-view-cell";
598
590 599
					var resIM='<div class="madiaHead patentHead"></div>'
591 600
					if (dataStr[i].pic) {
592 601
						var src = '/data/researchResult' + dataStr[i].pic.split(",")[0]
593 602
						resIM = '<div class="madiaHead patentHead" style="background-image:url('+ src +')"></div>';
594 603
					}
595 604
					var strAdd = '';
596
						strAdd += '<a  target="_blank" href="unPatentShow.html?id='+dataStr[i].id+'" class="flexCenter urlgo">';
605
						strAdd += '<li class="mui-table-view-cell"><a  target="_blank" href="unPatentShow.html?id='+dataStr[i].id+'" class="flexCenter urlgo">';
597 606
						strAdd += resIM
598 607
						strAdd += '<div class="madiaInfo"><p class="h1Font ellipsisSty">'+ dataStr[i].name +'</p>';
599 608
						strAdd += '<p class="h2Font ellipsisSty displayNone">研究者:<span class="researchers"></span></p>';
@ -602,10 +611,13 @@ $(function() {
602 611
						strAdd += '</a>'
603 612
						strAdd += '<ul class="madiaEdit">'
604 613
						strAdd += '<li class="deloutPro" data-id="'+dataStr[i].id+'">取消关联</li>'
605
						strAdd += '</ul>'
606
					li.innerHTML = strAdd
607
					document.getElementById(obj).appendChild(li);
608
					var $itemlist = $(li);
614
						strAdd += '</ul></li>'
615
				
616
					$("#"+obj).append(strAdd);
617
					if (i < 3) {
618
						$("#showUnPatent").append(strAdd)
619
					}
620
					var $itemlist = $(strAdd);
609 621
					queryResearcher(dataStr[i].id, $itemlist)
610 622
					if (dataStr[i].orgId) {
611 623
						queryReseOrgName(dataStr[i].orgId, $itemlist)
@ -649,10 +661,8 @@ $(function() {
649 661
			},"get",function(data){
650 662
				var dataStr=data.data;
651 663
				for(var i = 0; i < dataStr.length; i++) {
652
					var li = document.createElement("li");
653
					li.className = "mui-table-view-cell";
654 664
					var strAdd = '';
655
						strAdd += '<a  target="_blank" href="/'+ pageUrl("pt",dataStr[i]) +'" class="flexCenter urlgo">';
665
						strAdd += '<li class="mui-table-view-cell"><a  target="_blank" href="/'+ pageUrl("pt",dataStr[i]) +'" class="flexCenter urlgo">';
656 666
						strAdd += '<div class="madiaHead patentHead"></div>';
657 667
						strAdd += '<div class="madiaInfo"><p class="h1Font ellipsisSty">'+ dataStr[i].name +'</p>';
658 668
						strAdd += '<p class="h2Font ellipsisSty">发明人:'+ dataStr[i].authors.substring(0, dataStr[i].authors.length - 1) +'</p>';
@ -661,9 +671,11 @@ $(function() {
661 671
						strAdd += '</a>';
662 672
						strAdd += '<ul class="madiaEdit">'
663 673
						strAdd += '<li class="deloutPro" data-id="'+dataStr[i].id+'">取消关联</li>'
664
						strAdd += '</ul>'
665
					li.innerHTML = strAdd
666
					document.getElementById(obj).appendChild(li);
674
						strAdd += '</ul></li>'
675
					$("#"+obj).append(strAdd)
676
					if (i < 3) {
677
						$("#showPatent").append(strAdd);
678
					}
667 679
				}
668 680
			});
669 681
		},
@ -685,10 +697,8 @@ $(function() {
685 697
					}
686 698
					moreInf = dataStr[i].cn4periodical+ " " +dataStr[i].en4periodical+ " " +dataStr[i].pubDay
687 699
					
688
					var li = document.createElement("li");
689
					li.className = "mui-table-view-cell";
690 700
					var strAdd = '';
691
						strAdd += '<a target="_blank" href="/'+ pageUrl("pp",dataStr[i]) +'" class="flexCenter urlgo">';
701
						strAdd += '<li class="mui-table-view-cell"><a target="_blank" href="/'+ pageUrl("pp",dataStr[i]) +'" class="flexCenter urlgo">';
692 702
						strAdd += '<div class="madiaHead paperHead"></div>';
693 703
						strAdd += '<div class="madiaInfo"><p class="h1Font ellipsisSty">'+ dataStr[i].name +'</p>';
694 704
						strAdd += '<p class="h2Font ellipsisSty">作者:'+ dataStr[i].authors.substring(0, dataStr[i].authors.length - 1) +'</p>';
@ -697,10 +707,11 @@ $(function() {
697 707
						strAdd += '</a>';
698 708
						strAdd += '<ul class="madiaEdit">'
699 709
						strAdd += '<li class="deloutPro" data-id="'+dataStr[i].id+'">取消关联</li>'
700
						strAdd += '</ul>'
701
						
702
					li.innerHTML = strAdd
703
					document.getElementById(obj).appendChild(li);
710
						strAdd += '</ul></li>'
711
					if(i < 3) {
712
						$('#showPaper').append(strAdd)
713
					}
714
					$('#'+obj).append(strAdd)
704 715
				}
705 716
			});
706 717
		},
@ -712,16 +723,14 @@ $(function() {
712 723
			}
713 724
			for(item in memberArr) {
714 725
				if (item!={}){
715
				    li= document.createElement("li");
716
					li.className = "mui-table-view-cell";
717
				
718 726
					var dataStr = memberArr[item]
719 727
					var dImg = "../images/default-photo.jpg"
720 728
					if (dataStr.hasHeadImage){
721 729
						dImg = "/images/head/" + dataStr.id + "_l.jpg"
722 730
					}
723 731
					var li2 = '',li4=""
724
					if (flag) {
732
					var tatu;
733
					if (flag === 1) {
725 734
						if(chiefId===dataStr.id) {
726 735
							li4 += '<li class="authTeamSta cancelTeamSta" style="cursor:pointer">首席专家</li>'
727 736
						}else{
@ -757,7 +766,7 @@ $(function() {
757 766
						orgName = orgName;
758 767
					}
759 768
					var strAdd = '';
760
					strAdd += '<a target="_blank" href="userInforShow.html?professorId='+ dataStr.id +'" class="flexCenter urlgo" style="min-height: 60px">';
769
					strAdd += '<li class="mui-table-view-cell"><a target="_blank" href="userInforShow.html?professorId='+ dataStr.id +'" class="flexCenter urlgo" style="min-height: 60px">';
761 770
					strAdd += '<div class="madiaHead useHead" style="background-image:url(' + dImg + ')"></div>';
762 771
					strAdd += '<div class="madiaInfo"><p class="h1Font ellipsisSty">'+ dataStr.name +'</p>';
763 772
					strAdd += '<p class="h2Font ellipsisSty">'+ttitle+orgName +'</p>';
@ -766,9 +775,16 @@ $(function() {
766 775
					strAdd += '</a>';
767 776
					strAdd += '<ul class="madiaEdit">'
768 777
					strAdd += li4
769
					strAdd += '</ul>'
770
					li.innerHTML = strAdd
771
					document.getElementById(obj).appendChild(li);
778
					strAdd += '</ul></li>'
779
					console.log(chiefId)
780
					if(chiefId===dataStr.id) {
781
					
782
						$("#"+obj).prepend(strAdd)
783
					} else {
784
						$("#"+obj).append(strAdd)
785
					}
786
					
787
					
772 788
				}
773 789
			}
774 790
	    },
@ -914,6 +930,7 @@ $(function() {
914 930
915 931
			//==== paper =====//
916 932
			$('#item5user').on('click', '.steptit>a', function(){
933
				console.log(124)
917 934
				$('#item5user .steptit>a').removeClass('active')
918 935
				$(this).addClass('active')
919 936
				var st = $(this).attr("data-index")
@ -947,7 +964,7 @@ $(function() {
947 964
					})
948 965
				}
949 966
			})
950
			$('#item5user').on('click', '.deloutPro',function() {
967
			$('#item5user,#showPaper').on('click', '.deloutPro',function() {
951 968
				var pid = $(this).attr("data-id")
952 969
				$.MsgBox.Confirm("提示", "确定取消关联该论文?", function(){
953 970
					oAjax("/ajax/team/deletePaper", {
@ -1000,7 +1017,7 @@ $(function() {
1000 1017
					})
1001 1018
				}
1002 1019
			})
1003
			$('#item6drop2').on('click', '.deloutPro',function() {
1020
			$('#item6drop2,#showPatent').on('click', '.deloutPro',function() {
1004 1021
				var pid = $(this).attr("data-id")
1005 1022
				$.MsgBox.Confirm("提示", "确定取消关联该专利成果?", function(){
1006 1023
					oAjax("/ajax/team/deletePatent", {
@ -1053,7 +1070,7 @@ $(function() {
1053 1070
					})
1054 1071
				}
1055 1072
			})
1056
			$('#item6drop1').on('click', '.deloutPro',function() {
1073
			$('#item6drop1,#showUnPatent').on('click', '.deloutPro',function() {
1057 1074
				var pid = $(this).attr("data-id")
1058 1075
				$.MsgBox.Confirm("提示", "确定取消关联该非专利成果?", function(){
1059 1076
					oAjax("/ajax/team/deleteResResult", {
@ -1070,7 +1087,31 @@ $(function() {
1070 1087
				});
1071 1088
			})
1072 1089
			//==== unpatent =====//
1073
1090
			$('#seeMoreF,#seeMoreZ').unbind("click").on("click",function(){
1091
				$(".leftconItem").hide();
1092
				var activeTab = $('#item6user').attr("rel");
1093
				$("#item6user").show()
1094
				$("ul.mainNavUl li").removeClass("liNow");
1095
				$('#tab6user').addClass("liNow");
1096
				$(".moreNav").hide();
1097
				
1098
				var pa=$(".moreNavUl.wendaUl>li.liNow").attr("rel")
1099
				$("#"+pa).find("ul").html("")
1100
				$("#"+pa).find(".js-load-more").show();
1101
				
1102
				$(".wendaNav li").eq(0).addClass("liNow").siblings().removeClass("liNow");
1103
				$("#item6drop1").show()
1104
				$("#item6more").show()
1105
				unpatentListVal(true);
1106
			})
1107
			$('#seeMoreL').unbind("click").on("click",function(){
1108
				$(".leftconItem").hide();
1109
				var activeTab = $('#item5user').attr("rel");
1110
				$("#item5user").show()
1111
				$("ul.mainNavUl li").removeClass("liNow");
1112
				$('#tab5user').addClass("liNow");
1113
				$(".moreNav").hide();
1114
			})
1074 1115
			$("#tab6user").unbind("click").on("click",function(){
1075 1116
				var pa=$(".moreNavUl.wendaUl>li.liNow").attr("rel")
1076 1117
				$("#"+pa).find("ul").html("")

+ 3 - 2
js/unPatentIssue.js

@ -1,5 +1,5 @@
1 1
$(document).ready(function() {
2
	var resourceId=GetQueryString("resourceId");
2
	var resourceId=GetQueryString("id");
3 3
	if(resourceId) {
4 4
		$("#deleteResource").removeClass("disableLi").addClass("deleteResource");
5 5
		getRecourceMe();
@ -102,7 +102,7 @@ $(document).ready(function() {
102 102
			$("#indicator").val($da.indicator);
103 103
		}
104 104
		if($da.benefit) {//合作备注
105
			$("#benefit").val($da.indicator);
105
			$("#benefit").val($da.benefit);
106 106
		}
107 107
		if($da.department) {//合作备注
108 108
			$("#department").val($da.department);
@ -477,6 +477,7 @@ $(document).ready(function() {
477 477
			}
478 478
			oSum+='<li class="orgList"><img src="'+oImg+'" class="floatL" /><p class="h2Font floatL" data-id="'+$html[i].id+'">'+$html[i].name+'</p></li>'
479 479
		}
480
		
480 481
		$("#departmentList ul").html(oSum);
481 482
	}
482 483
	$("#departmentList ul").on("click","li",function(){

+ 2 - 2
js/unPatentList.js

@ -106,7 +106,7 @@ $(document).ready(function(){
106 106
			"data": {
107 107
				id: par
108 108
			},
109
			"success": function(data) {
109
			"success": function(data) {	
110 110
				if(data.success) {
111 111
					var $da = data.data
112 112
					if($da.length) {
@ -149,7 +149,7 @@ $(document).ready(function(){
149 149
	}
150 150
	/*点击修改跳转修改页面*/
151 151
	$("#patentList").on("click",".editThis",function(){
152
		location.href="unPatentIssue.html?resourceId="+$(this).attr("data-id")+"&flag="+$(this).attr("data-state");
152
		location.href="unPatentIssue.html?id="+$(this).attr("data-id")+"&flag="+$(this).attr("data-state");
153 153
	})
154 154
	/*点击删除跳转修改页面*/
155 155
	$("#patentList").on("click",".deteleThis2",function(){

+ 209 - 0
searchNew.html

@ -1,3 +1,4 @@
1
<<<<<<< HEAD
1 2
 <!DOCTYPE html>
2 3
<html>
3 4
<head>
@ -204,3 +205,211 @@ $(function () {
204 205
</script>
205 206
</body>
206 207
</html>
208
=======
209
 <!DOCTYPE html>
210
<html>
211
<head>
212
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
213
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
214
<meta http-equiv="X-UA-Compatible" content="IE=edge">
215
<title>搜索-科袖网</title>
216
<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />
217
<link href="css/bootstrap.min.css" rel="stylesheet">
218
<link type="text/css" href="css/common.css" rel="stylesheet">
219
<link type="text/css" href="css/genindex.css" rel="stylesheet">
220
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
221
<script>
222
	var _hmt = _hmt || [];
223
	(function() {
224
	  var hm = document.createElement("script");
225
	  hm.src = "https://hm.baidu.com/hm.js?d3db502c8cee2d618c01fe7aa6518602";
226
	  var s = document.getElementsByTagName("script")[0]; 
227
	  s.parentNode.insertBefore(hm, s);
228
	})();
229
</script>
230
<style>
231
.steptit{
232
	background: #ffffff;
233
	padding-left: 20px;
234
	margin-bottom: 10px;
235
}
236
.steptit>a{
237
	display: inline-block;
238
	font-size: 14px;
239
	margin-right:20px;
240
	line-height: 40px;
241
	cursor: pointer;
242
}
243
.steptit>a.active{
244
	color: #ff9900;
245
    border-bottom: 2px solid #ff9900;
246
}
247
</style>
248
</head>
249

250
<body>
251
<header id="header">
252
	<script src="js/header.js"></script>
253
</header>
254
<div id="container">
255
	<div class="containerCon">
256
		<div class="contentCon clearfix">
257
			<div class="leftconBox searchWon floatL" style="background: none;margin-bottom: 0;">
258
				<div class="searchdiv">
259
					<input type="search" name="searchsome" class="searchsome col-w-12" placeholder="请输入专家姓名、机构、研究方向或相关关键词" />
260
					<span class="searchgo">搜索</span>
261
				</div>
262
				<ul class="choosediv clearfix filterdiv">
263
					<li id="tabUser" rel="itemUser" class="liactive" data-id="1">找专家</li>
264
					<!-- <li id="tabTeam" rel="itemTeam" data-id="8">找团队</li> -->
265
					<li id="tabSer" rel="itemSer" data-id="7">找服务</li>
266
					<li id="tabRes" rel="itemRes" data-id="2">找资源</li>
267
					<li id="tabPat" rel="itemPat" data-id="5">找成果</li>
268
					<li id="tabPar" rel="itemPar" data-id="6">找论文</li>
269
					<!-- <li id="tabArt" rel="itemArt" data-id="3">找文章</li> -->
270
					<li id="tabCmp" rel="itemCmp" data-id="4">找企业</li>
271
				</ul>
272
				<div class="listdiv">
273
					<!--找人-->
274
					<div class="listbox" id="itemUser">
275
						<ul class="filterListNew clearfix">
276
							<li>
277
								<span class="leftsort">学术领域:</span>
278
								<ul class="filterUl academicField" id="academicField1">
279
									
280
									</ul>
281
									<span class="rightbtn">全部<em class="foldtr"></em></span>
282
								</li>
283
								<li>
284
								<span class="leftsort">行业领域:</span>
285
								<ul class="filterUl applicationIndustry" id="applicationIndustry1">
286
									
287
									</ul>
288
									<span class="rightbtn">全部<em class="foldtr"></em></span>
289
								</li>
290
								<li>
291
								<span class="leftsort">所在城市:</span>
292
								<ul class="filterUl cityList" id="cityList1">
293
									
294
								</ul>
295
								<span class="rightbtn">全部<em class="foldtr"></em></span>
296
							</li>
297
						</ul>
298
						<div class="searchCon">
299
							<ul class="listitemdiv" id="expertList"></ul>
300
							<button class="js-load-more"></button>	
301
					    </div>
302
					</div>
303
					<!--找团队-->
304
					<div class="listbox" id="itemTeam">
305
						<ul class="filterListNew clearfix">
306
							<li>
307
								<span class="leftsort">学术领域:</span>
308
								<ul class="filterUl academicField" id="academicField2">
309
									
310
									</ul>
311
									<span class="rightbtn">全部<em class="foldtr"></em></span>
312
								</li>
313
								<li>
314
								<span class="leftsort">行业领域:</span>
315
								<ul class="filterUl applicationIndustry" id="applicationIndustry2">
316
									
317
									</ul>
318
									<span class="rightbtn">全部<em class="foldtr"></em></span>
319
								</li>
320
								<li>
321
								<span class="leftsort">所在城市:</span>
322
								<ul class="filterUl cityList" id="cityList2">
323
									
324
								</ul>
325
								<span class="rightbtn">全部<em class="foldtr"></em></span>
326
							</li>
327
						</ul>
328
						<div class="searchCon">
329
							<ul class="listitemdiv" id="teamList"></ul>
330
							<button class="js-load-more"></button>	
331
						</div>
332
					</div>
333
					<!--找企业-->
334
					<div class="listbox" id="itemCmp">
335
						<div class="searchCon">
336
							<ul class="listitemdiv listmorediv" id="companyList"></ul>
337
							<button class="js-load-more"></button>
338
					    </div>
339
					</div>
340
					<!--找资源-->
341
					<div class="listbox" id="itemRes">
342
						<div class="searchCon">
343
							<ul class="listitemdiv listmorediv" id="resourceList"></ul>
344
							<button class="js-load-more"></button>
345
					    </div>
346
					</div>
347
					<!--找专利-->
348
					<div class="listbox" id="itemPat">
349
						<div class="steptit">
350
							<a data-index='0' class="active">非专利</a>
351
							<a data-index='1'>专利</a>
352
						</div>
353
						<div class="searchCon">
354
							<ul class="listitemdiv listmorediv" id="unpatentList"></ul>
355
							<button class="js-load-more"></button>	
356
						</div>
357
						<div class="searchCon displayNone">
358
							<ul class="listitemdiv listmorediv" id="patentList"></ul>
359
							<button class="js-load-more"></button>
360
					    </div>
361
					</div>
362
					<!--找论文-->
363
					<div class="listbox" id="itemPar">
364
						<div class="searchCon">
365
							<ul class="listitemdiv listmorediv" id="paperList"></ul>
366
							<button class="js-load-more"></button>
367
					    </div>
368
					</div>
369
					<!--找文章-->
370
					<!-- <div class="listbox" id="itemArt">
371
						<div class="searchCon">
372
							<ul class="listitemdiv listmorediv" id="articalList"></ul>
373
							<button class="js-load-more"></button>
374
					  	</div>
375
					</div> -->
376
					<!--找服务-->
377
					<div class="listbox" id="itemSer">
378
						<div class="searchCon">
379
							<ul class="listitemdiv listmorediv" id="serviceList"></ul>
380
							<button class="js-load-more"></button>
381
					    </div>
382
					</div>
383
				</div>
384
			</div>
385
			<div class="rightconBox floatR">
386
				<div id="scroll-fixed-ad">
387
					<div class="conItem advertBox advertItem advertItem-A"></div>
388
					<div class="conItem advertBox advertItem advertItem-B"></div>
389
				</div>
390
			</div>
391
		</div>
392
	</div>
393
</div>
394
<script type="text/javascript" src="js/correctBack.js"></script>
395
<footer>
396
	<script type="text/javascript" src="js/footer.js"></script>
397
</footer>
398

399
<script type="text/javascript" src="js/tabCom.js"></script>
400
<script type="text/javascript" src="js/jquery.cookie.js"></script>
401
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
402
<script type="text/javascript" src="js/public/baseUtil.js"></script>
403
<script type="text/javascript" src="js/public/genCom.js"></script>
404
<script type="text/javascript" src="js/public/cacheUtil.js"></script>
405
<script type="text/javascript" src="js/scrollfix.js"></script>
406
<script type="text/javascript" src="js/searchNew.js"></script>
407
<script type="text/javascript">
408
$(function () {
409
	addscript("ad_search_a");
410
	addscript("ad_search_b");
411
});
412
</script>
413
</body>
414
</html>
415
>>>>>>> 81b6af0036f1c4830d171b3b878a3e3b91c2eac6

+ 21 - 0
teamInfoShow.html

@ -119,6 +119,27 @@
119 119
								</ul>
120 120
							</div>
121 121
						</div>
122
						<div class="coninfobox form-item otherShow">
123
							<div class="coninfotit">非专 <span class="seeMore" id="seeMoreF">查看全部<em></em></span></div>
124
							<div class="coninfocon form-result aboutRes">
125
								<ul id="showUnPatent">
126
								</ul>
127
							</div>
128
						</div>
129
						<div class="coninfobox form-item otherShow">
130
							<div class="coninfotit">专利 <span class="seeMore" id="seeMoreZ">查看全部<em></em></span></div>
131
							<div class="coninfocon form-result aboutRes">
132
								<ul id="showPatent">	
133
								</ul>
134
							</div>
135
						</div>
136
						<div class="coninfobox form-item otherShow">
137
							<div class="coninfotit">论文 <span class="seeMore" id="seeMoreL">查看全部<em></em></span></div>
138
							<div class="coninfocon form-result aboutRes">
139
								<ul id="showPaper">
140
								</ul>
141
							</div>
142
						</div>
122 143
					</div>
123 144
					<div id="item5user" class="leftconItem">
124 145
						<div class="coninfobox form-item otherShow">

+ 21 - 0
teamManage.html

@ -202,6 +202,27 @@
202 202
								</ul>
203 203
							</div>
204 204
						</div>
205
						<div class="coninfobox form-item otherShow">
206
							<div class="coninfotit">非专 <span class="seeMore" id="seeMoreF">查看全部<em></em></span></div>
207
							<div class="coninfocon form-result aboutRes">
208
								<ul id="showUnPatent">
209
								</ul>
210
							</div>
211
						</div>
212
						<div class="coninfobox form-item otherShow">
213
							<div class="coninfotit">专利 <span class="seeMore" id="seeMoreZ">查看全部<em></em></span></div>
214
							<div class="coninfocon form-result aboutRes">
215
								<ul id="showPatent">	
216
								</ul>
217
							</div>
218
						</div>
219
						<div class="coninfobox form-item otherShow">
220
							<div class="coninfotit">论文 <span class="seeMore" id="seeMoreL">查看全部<em></em></span></div>
221
							<div class="coninfocon form-result aboutRes">
222
								<ul id="showPaper">
223
								</ul>
224
							</div>
225
						</div>
205 226
					</div>
206 227
					<div id="item5user" class="leftconItem">
207 228
						<div class="steptit">