Explorar el Código

工作台关注与收藏需求列表

luyanan %!s(int64=7) %!d(string=hace) años
padre
commit
721b5c52c3
Se han modificado 7 ficheros con 61 adiciones y 71 borrados
  1. 7 4
      css/genindex.css
  2. 14 11
      css/workspace.css
  3. 34 31
      js/attention-list.js
  4. 1 1
      js/paperShow.js
  5. 1 1
      js/patentShow.js
  6. 2 13
      patentShow.html
  7. 2 10
      workspaces.html

+ 7 - 4
css/genindex.css

@ -392,6 +392,8 @@ ul.artAbout .frmadd{width:auto;position:absolute;right:0;top:0;background: #ff99
392 392
.showMain{font-size:16px;color:#333;line-height:28px;}
393 393
.showMain img{max-width: 100%;}
394 394
.showMain p{margin-bottom:16px;text-align:justify}
395
.showMain .showStatus{margin:40px 0 20px;text-align: center;color:#ff9900}
396
.showStatus .btnModel{width: 140px;margin: auto;}
395 397
ul.tagList{margin:20px 0 -10px;overflow: hidden;}
396 398
ul.tagList>li{float: left;margin-right:10px;margin-bottom:10px;padding:0 12px;color: #999;border: 1px solid #E5E5E5;border-radius: 20px;cursor: pointer;}
397 399
ul.tagList>li .h2Font{color:#666}
@ -463,7 +465,7 @@ ul.tagList>li .h2Font{color:#666}
463 465
.commentsArea ul.commentList>li .operateSpan .callBack{position:relative;padding-left:20px;margin-right:40px;}
464 466
.commentsArea ul.commentList>li .operateSpan .callBack:before{position:absolute;content:url(../images/g_article_button_huifu_nor.png);top:50%;left:0;margin-top:-8px;}
465 467
466
.rightconBox .conItem.conItemG .madiaHead{width: 100px; height: 100px;border:1px solid #E5E5E5;margin:0 auto 10px;background-position:center;background-size:cover;}
468
.rightconBox .conItem.conItemG .madiaHead{display:block;width: 100px; height: 100px;border:1px solid #E5E5E5;margin:0 auto 10px;background-position:center;background-size:cover;}
467 469
.rightconBox .conItem.conItemG .madiaHead.useHead{background-image:url(../images/default-photo.jpg);border-radius: 50%;}
468 470
.rightconBox .conItem.conItemG .madiaHead.cmpHead{background:#fff;border:none;width: 200px;height:120px;}
469 471
.rightconBox .conItem.conItemG .madiaHead.cmpHead .boxBlock{width:198px;height:118px;}
@ -500,6 +502,7 @@ ul.tagList>li .h2Font{color:#666}
500 502
.itemListCon .form-result>ul>li .madiaEdit .closeThis{color:#FF0000;}
501 503
.itemListCon .form-result>ul>li .madiaEdit{display:none;overflow:hidden;position:absolute;top:50%;margin-top:-16px;right:0;}
502 504
.itemListCon .form-result>ul>li:hover .madiaEdit{display: block;}
505
.itemListCon .form-result>ul>li .madiaEdit span{display:inline-block;width:60px;height:32px;font-size:15px;letter-spacing:0.1em;background:#ff9900;color:#fff;line-height: 32px;text-align: center;border-radius: 4px;}
503 506
504 507
.itemListCon li.draftList .madiaInfo{padding-top:4px;}
505 508
@ -836,8 +839,8 @@ div.zoomMask{position:absolute;background:url("../images/g-resource-mask.png") r
836 839
/*.needList.form-item .madiaInfo{padding-left:0;}*/
837 840
.needList.form-item ul .h1Font{font-size: 18px;margin-bottom: 10px;line-height:24px;}
838 841
.needList.form-item ul .h2Font{font-size: 14px;line-height:24px;margin:8px 0;}
839
.needList.form-item ul .h3Font{font-size: 14px;color:#999;}
842
.needList.form-item ul .h3Font{font-size: 14px;color:#888;}
840 843
.needList.form-item>ul>li{padding:10px 30px;margin:0 -30px;}
841 844
.needList.form-item>ul>li:hover{background: #EEEEEE;}
842
.showli>li{margin: 6px 0;width:25%;padding-right:16px;float:left;text-overflow:ellipsis;white-space: nowrap;overflow: hidden;}
843
.showliTop>li{margin-bottom: 4px;float:left;padding-right:16px;}
845
.showli>li{font-size: 14px;color: #888;margin: 6px 0;width:25%;padding-right:16px;float:left;text-overflow:ellipsis;white-space: nowrap;overflow: hidden;}
846
.showliTop>li{font-size: 14px;color: #888;margin-bottom: 4px;float:left;padding-right:16px;}

+ 14 - 11
css/workspace.css

@ -243,13 +243,15 @@ body,html{background: #f4f6f8;}
243 243
244 244
/*咨询对话*/
245 245
246
.consultdialogbox{ width:100%;padding: 20px 20px 80px 20px;color:#666;font-size:15px;line-height: 28px;}
247
.dialoghead{ padding:20px; border-radius:10px 10px 0 0; text-align:center; border-bottom:1px #d6d6d6 solid; background-color:#F3F3F3; position:relative;}
246
.consultdialogbox{ width:100%;padding:20px;color:#666;font-size:15px;line-height: 28px;}
247
.consultdialog{box-shadow: 1px 1px 10px 0 rgba(204,204,204,.8);
248
    border-radius: 10px;padding-bottom: 20px;}
249
.dialoghead{ padding:20px; border-radius:10px 10px 0 0; text-align:center; border-bottom:1px #E5E5E5 solid; background-color:#F3F3F3; position:relative;}
248 250
.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;}
249 251
.dialoghead .dheadtit{width:680px; margin:auto; font-size: 18px;line-height: 18px; }
250 252
.dialoghead .dheadtit .dialogpro{ padding:0 10px; font-size: 20px; color:#333;}
251 253
252
.dialogcontain{ background:#fff; /*text-align:center;*/ border-bottom:1px #d6d6d6 solid; position:relative;}
254
.dialogcontain{ background:#fff; /*text-align:center;*/ border-bottom:1px #E5E5E5 solid; position:relative;}
253 255
.dialogcontain .dialoginfo{ /*max-width:460px; */padding: 30px 10px 20px 10px;/*  margin:auto;*/}
254 256
.dialogcontain .dialoginfo .dialoginfotype{ padding: 1px 10px; color: #777;}
255 257
.dialogcontain .dialoginfo .dialogtit{ color: #333;font-size:15px;max-width:90%;}
@ -269,7 +271,7 @@ body,html{background: #f4f6f8;}
269 271
.dialogcontain .dialogstatus{ position:absolute;min-width:100px; top:-20px; right: -8px;background: #ff9900; color: #fff; padding: 0 60px;border-radius: 20px 0 0 20px;z-index: 2; line-height: 40px; }
270 272
.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;}
271 273
272
.dialogbody{ padding:20px; background:#E8F5FF; border-bottom:1px #d6d6d6 solid; min-height: 320px; overflow-y:auto;}
274
.dialogbody{ padding:20px; background:#E8F5FF; border-bottom:1px #E5E5E5 solid; min-height: 320px; overflow-y:auto;}
273 275
.dialog{max-height: 500px;}
274 276
.dialogbody .scrollBar{position: absolute; top: 0;width: 4px; height: 100%; border-radius: 2px;overflow: hidden;}
275 277
.dialogbody .scrollBar .bar{ position: absolute;left: 0; width: 100%; height: 40%;border-radius: 2px; background:#888; overflow: hidden; cursor: pointer;}
@ -292,7 +294,7 @@ body,html{background: #f4f6f8;}
292 294
293 295
294 296
.dialogfoot{ padding:20px; background:#fff; border-radius:0 0 10px 10px;}
295
.dialogfoot .sendbox_area .W_input { width: 100%; height: 32px; padding: 5px 12px 0; box-shadow: 0px 1px 3px 0px rgba(0,0,0,0.10) inset;margin: 0px; padding: 5px 12px;font-size: 12px; word-wrap: break-word; line-height: 20px;outline: none; border-radius:4px; }
297
.dialogfoot .sendbox_area .W_input { width: 100%; height: 32px; padding: 5px 12px 0; box-shadow: 0px 1px 3px 0px rgba(0,0,0,0.10) inset;margin: 0px; padding: 5px 12px;font-size: 14px; word-wrap: break-word; line-height: 20px;outline: none; border-radius:4px; }
296 298
.dialogfoot .sendbox_bar { overflow:hidden;margin:10px 0;}
297 299
.dialogfoot .sendbox_bar .sendtype { overflow:hidden;}
298 300
.dialogfoot .sendbox_bar .sendtype a{ float:left;width:30px; height:30px;  margin:0 10px; background-image:url(../images/linkicon.png); background-repeat:no-repeat;}
@ -384,15 +386,16 @@ border-color:#FF9900; color:#FFFFFF}
384 386
.attentsCon .listtit3{font-size: 13px;line-height:18px; color: #888888;}/*小标题*/
385 387
.attentList{padding:10px;display: none;}
386 388
.attentList:first-child{display: block;}
387
.attentList li{padding: 10px 14px;margin:6px 0;position: relative;}
388
.attentList li .proinfor{display: block;}
389
.attentList li:hover{background: #EFEFEF;}
390
.attentList li:first-child{margin-top:0}
391
.attentList li:after{position: absolute;bottom: 0;right: 0;left:126px;height: 1px;content: '';background-color: #c8c7cc;
389
.attentList>li{padding: 10px 20px;margin:0 -20px;position: relative;}
390
.attentList>li .proinfor{display: block;}
391
.attentList>li:hover{background: #EFEFEF;}
392
.attentList>li:first-child{margin-top:0}
393
.attentList>li:after{position: absolute;bottom: 0;right: 0;left:126px;height: 1px;content: '';background-color: #c8c7cc;
392 394
    -webkit-transform: scaleY(.5);
393 395
            transform: scaleY(.5);}
394
.attentList li:last-child:after{background: none;}
396
.attentList>li:last-child:after{background: none;}
395 397
398
.attentList .showliTop>li{margin-bottom: 4px;float:left;padding-right:16px;}
396 399
/*.resAreaCon .proinfor .headimg{width: 60px;}
397 400
.resAreaCon .attentList{display: block;}
398 401
.resAreaCon .attentList li:hover{background:none;}

+ 34 - 31
js/attention-list.js

@ -181,6 +181,7 @@ $(function() {
181 181
			type: 'get', //http请求类型
182 182
			success: function(data) {
183 183
				if(data.success && data.data.data != "") {
184
					console.log(data)
184 185
					var $info=data.data.data;
185 186
					for(var i = 0; i < $info.length; i++) {
186 187
						var img='../images/default-artical.jpg';
@ -374,7 +375,7 @@ $(function() {
374 375
								'<span class="listtit" id="orgOther"></span>' +
375 376
								'</div></a></li>';
376 377
								var $itemlist=$(li);
377
								$("#company").append(li);
378
								$("#company").append($itemlist);
378 379
								$itemlist.find("a").attr("href", "cmpInforShow.html?orgId=" + $data[i].id );
379 380
									if($data[i].hasOrgLogo) {
380 381
										$itemlist.find("#proHead").attr("src", "/images/org/" + $data[i].id + ".jpg" );
@ -432,7 +433,7 @@ $(function() {
432 433
						arr[i]=data.data.data[i].watchObject;
433 434
					}
434 435
					$.ajax({
435
						url: "/ajax/org/qm",
436
						url: "/ajax/demand/qm",
436 437
						data: {
437 438
							id:arr,
438 439
						},
@ -446,36 +447,20 @@ $(function() {
446 447
								console.log($data);
447 448
								for(var i=0;i<$data.length;i++) {
448 449
									var li = document.createElement('li');
449
									
450
								li.innerHTML = '<a class="proinfor clearfix" target="_blank"  href="">' +
451
								'<div class="headblock floatL ResImgBox"><img id="proHead" class="resImg" src=""></div>' +
452
								'<div class="mediaBody">' +
453
								'<p><span class="listtit">'+$data[i].name+'<em class="authiconNew" title=""></em></span></p>'+
454
								'<span class="listtit" id="orgTit"></span>' +
455
								'<span class="listtit" id="orgOther"></span>' +
456
								'</div></a></li>';
457
								var $itemlist=$(li);
458
								$("#demands").append(li);
459
								$itemlist.find("a").attr("href", "cmpInforShow.html?orgId=" + $data[i].id );
460
									if($data[i].hasOrgLogo) {
461
										$itemlist.find("#proHead").attr("src", "/images/org/" + $data[i].id + ".jpg" );
462
									}else{
463
										$itemlist.find("#proHead").attr("src", "/images/default-icon.jpg" );
464
									}
465
									if($data[i].authStatus == 3) {
466
										$itemlist.find(".authiconNew").addClass("authicon-com-ok").attr("title", "科袖认证企业");;	
450
									var sowU="";
451
									if($data[i].pageViews!=0){
452
										sowU='<li><span>浏览量 '+$data[i].pageViews+'</span></li>'
467 453
									}
468
									console.log($data[i])
469
								var orgOther = "";
470
								
471
								if($data[i].industry) {
472
									orgOther = $data[i].industry.replace(/,/gi, " | ");
473
								}
474
								$itemlist.find("#orgOther").text(orgOther);
475
								
476
								if($data[i].orgType == "2") {
477
									$itemlist.find("#orgTit").html(orgTypeShow[$data[i].orgType] + "<span style='margin-right:10px;'></span>");
478
								}
454
									li.innerHTML = '<a class="proinfor clearfix" target="_blank"  href="../demandShow.html?demandId='+$data[i].id+'">' +
455
									'<div class="mediaBody">' +
456
									'<p><span class="listtit ellipsisSty">'+$data[i].title+'</span></p>/p>'+
457
									'<ul class="showliTop listtit2 clearfix">'+
458
									'<li><span>发布于 '+commenTime($data[i].createTime)+'</span></li>'+ sowU +
459
									'<li><span class="creator"></span></li></ul>'+
460
									'</div></a></li>';
461
									var $itemlist=$(li);
462
									$("#demands").append($itemlist);
463
									userFun($data[i].creator,$itemlist);
479 464
								}
480 465
								
481 466
							}
@ -492,4 +477,22 @@ $(function() {
492 477
		});
493 478
	}
494 479
	demands();
480
	function userFun(id,$listItem) {
481
		$.ajax({
482
			"url": "/ajax/professor/editBaseInfo/" + id,
483
			"type": "get",
484
			"async": true,
485
			"data":{
486
				"id":id
487
			},
488
			"success": function(data) {
489
				if(data.success && data.data) {
490
					$listItem.find(".creator").text(data.data.name);
491
				}
492
			},
493
			"error": function() {
494
				$.MsgBox.Alert('提示', '链接服务器超时')
495
			}
496
		});
497
	}
495 498
})

+ 1 - 1
js/paperShow.js

@ -4,7 +4,7 @@ $(document).ready(function() {
4 4
	var userName = $.cookie("userName");
5 5
	var paperId = GetQueryString("paperId");
6 6

7
	ifcollectionAbout(paperId,$(".attenSpan").eq(0), 5)
7
	ifcollectionAbout(paperId,$("#collectBtn"), 5)
8 8
	getPaperMe();
9 9
	pageViewsVal();
10 10
	if(userid && userid != "null" && userid != null){

+ 1 - 1
js/patentShow.js

@ -6,7 +6,7 @@ $(document).ready(function() {
6 6
	}
7 7
	Patent.prototype.init = function() {
8 8
		loginStatus();
9
		ifcollectionAbout(GetQueryString("patentId"),$(".attenSpan").eq(0),4);
9
		ifcollectionAbout(GetQueryString("patentId"),$("#collectBtn"),4);
10 10
		this.ajax({
11 11
			url: "/ajax/ppatent/qo",
12 12
			data: {

+ 2 - 13
patentShow.html

@ -181,7 +181,7 @@
181 181
					</div>
182 182
				</div>
183 183
			</div>
184
			</div>
184
			
185 185
		</div>
186 186
	</div>
187 187
</div>
@ -214,18 +214,7 @@
214 214
		qrcode.makeCode(elurl);
215 215
	}
216 216
	makeCode();
217
	//用户头像
218
//	var qrcodeUser = new QRCode(document.getElementById("qrcodeUser"), {
219
//		width : 100,
220
//		height : 100
221
//	});
222
//	function makeCodeUser(){
223
//		var hurl = window.location.host;
224
//		var professorId =  GetQueryString("professorId");
225
//		var elurl = "http://" + hurl + "/e/p.html?id=" + professorId ; 
226
//		qrcodeUser.makeCodeUser(elurl);
227
//	}
228
//	makeCodeUser();
217

229 218
	
230 219
</script>
231 220
</body>

+ 2 - 10
workspaces.html

@ -15,6 +15,7 @@
15 15
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
16 16
<style type="text/css">
17 17
	.repalyf{width:100%}
18
	#demands>li:after {left: 20px;}
18 19
	
19 20
	.emspace{letter-spacing: 2em;}
20 21
	/*.recommendBlock{position:relative;overflow:hidden;background: #FFF;padding:20px 30px;margin-bottom:20px;}
@ -277,18 +278,9 @@
277 278
<script type="text/javascript" src="js/jquery.cookie.js"></script>
278 279
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
279 280
<script type="text/javascript" src="js/common.js"></script>
280
<script src="js/public/swiper.min.js" type="text/javascript" charset="utf-8"></script>
281 281
<script type="text/javascript" src="js/popup.js"></script>
282 282
<script type="text/javascript" src="js/workindex.js"></script>
283 283
<script type="text/javascript" src="js/attention-list.js"></script>
284
<script type="text/javascript">
285
	 var swiper = new Swiper('.swiper-container', {
286
        pagination: '.swiper-pagination',
287
        slidesPerView: 3,
288
        paginationClickable: true,
289
        spaceBetween: 30,
290
        freeMode: true
291
    });
292
</script>
284
293 285
</body>
294 286
</html>