Browse Source

修复bug

lyn7568 5 years ago
parent
commit
8bf8e3b0e0
4 changed files with 94 additions and 190 deletions
  1. 8 27
      e/2.html
  2. 1 2
      js/search_h5.js
  3. 68 140
      js/teamManage.js
  4. 17 21
      unPatentIssue.html

+ 8 - 27
e/2.html

@ -44,8 +44,9 @@
44 44
45 45
		.teamName {
46 46
			margin-bottom: 35px;
47
48 47
		}
48
49
	
49 50
	</style>
50 51
51 52
</head>
@ -76,8 +77,6 @@
76 77
				</div>
77 78
			</div>
78 79
		</div>
79
80
81 80
		<div class="mainbox displayNone">
82 81
			<div class="infocon madiaBlock needList" style="border:none">
83 82
				<ul class="mui-table-view" id="demandShow">
@ -118,22 +117,18 @@
118 117
		<div class="mainbox" style="cursor: pointer;" id="goCmpBrief">
119 118
			<div class="infocontit mui-clearfix">团队介绍<em></em></div>
120 119
			<div class="infocon">
121
				<span class="breifinfo" id="breifinfo" style="display: block">
120
				<span class="breifinfo ellipsisSty" id="breifinfo" style="display: block">
122 121
					<p id="breifinfo"></p>
123 122
				</span>
124 123
			</div>
125 124
		</div>
126
127 125
		<div class="mainbox">
128 126
			<div class="infocontit">行业领域</div>
129 127
			<div class="infocon listArea">
130 128
				<ul id="industryShow">
131
132 129
				</ul>
133 130
			</div>
134 131
		</div>
135
136
137 132
		<div class="mainbox">
138 133
			<div class="infocontit">学术领域</div>
139 134
			<div class="infocon listArea">
@ -1400,14 +1395,14 @@
1400 1395
							'<div class="madiaInfo OmadiaInfo">' +
1401 1396
							'<p class="ellipsisSty-2 h1Font">' + dataStr[0].name + '</p>' +
1402 1397
							'<p class="ellipsisSty h2Font dis">' + subject + '</p>' +
1403
							'<p class="ellipsisSty h2Font org">'  + '</p>' +
1398
							'<p class="ellipsisSty h2Font org">' + '</p>' +
1404 1399
							//.substring(0, dataStr[i].authors.length - 1)    
1405 1400
							'</div>' +
1406 1401
							'</div>'
1407 1402
						document.getElementById('proUnPatent').appendChild(li);
1408
						if(dataStr[0].orgId) {
1403
						if (dataStr[0].orgId) {
1409 1404
							console.log(dataStr[0].orgId)
1410
							orgname(dataStr[0].orgId,li)
1405
							orgname(dataStr[0].orgId, li)
1411 1406
						}
1412 1407
1413 1408
@ -1459,7 +1454,7 @@
1459 1454
				"type": "GET",
1460 1455
				"success": function (data) {
1461 1456
					if (data.success) {
1462
						$('.org').html('所属机构:'+data.data.name)
1457
						$('.org').html('所属机构:' + data.data.name)
1463 1458
					}
1464 1459
				},
1465 1460
				"data": {
@ -1471,17 +1466,6 @@
1471 1466
				}
1472 1467
			});
1473 1468
		}
1474
1475
1476
1477
1478
1479
1480
1481
1482
1483
1484
1485 1469
		// 论文
1486 1470
		paperListVal = function (Id) { //论文
1487 1471
				var aimId = "paperList"
@ -1512,16 +1496,13 @@
1512 1496
				})
1513 1497
			},
1514 1498
			paperListId() //团队论文id
1515
1516
1517 1499
		teamofExperts()
1518
1519 1500
		//专家团队
1520 1501
		function teamofExperts() {
1521 1502
			oAjax('/ajax/team/pro', {
1522 1503
				id: tId,
1523 1504
				"pageSize": rows,
1524
				"pageNo": 30,
1505
				"pageNo": 25,
1525 1506
			}, 'get', function (res) {
1526 1507
				if (res.success && res.data) {
1527 1508
					var data = res.data.data

+ 1 - 2
js/search_h5.js

@ -267,7 +267,6 @@ $(function () {
267 267
			}
268 268
			professorListVal()
269 269
		},
270

271 270
		unpatent = function () { //找非专
272 271
			var aimId = 'unpatentList'
273 272
			oAjax('/ajax/resResult/index/search', {
@ -285,7 +284,7 @@ $(function () {
285 284
					if ($info[i].pic) {
286 285
						var src = '/data/researchResult' + $info[i].pic.split(",")[0]
287 286
					}
288
					var subject = $info[i].subject == undefined ? '' : '应用介绍: ' + $info[i].subject
287
					var subject = $info[i].subject == undefined ? '' : '应用领域: ' + $info[i].subject
289 288
					var liItem = document.createElement("li");
290 289
					liItem.setAttribute("data-id", $info[i].id);
291 290
					liItem.className = "mui-table-view-cell"

+ 68 - 140
js/teamManage.js

@ -316,6 +316,7 @@ $(function () {
316 316
						unpatentArr.push($info[i].researchResult)
317 317
					}
318 318
					detailUnPat(aimId)
319
					homepageUnPatent()
319 320
				} else {
320 321
					$("#showUnPatent").parents('.otherShow').hide()
321 322
				}
@ -603,85 +604,60 @@ $(function () {
603 604
				id: unpatentArr,
604 605
			}, "get", function (data) {
605 606
				var dataStr = data.data;
607
				console.log(dataStr)
606 608
				for (var i = 0; i < dataStr.length; i++) {
607
					if (dataStr[i].status == 1) {
608
						// var $itemlist = $(strAdd);
609
						queryResearcher(dataStr[i].id, dataStr[i])
610
						// queryFeiZhuan(dataStr[i].id, $itemlist)   //研究者名称
611
						if (dataStr[i].orgId) {
612
							// queryReseOrgName(dataStr[i].orgId,)
613
						}
609
					// var $itemlist = $(strAdd);
610
					var resIM = '<div class="madiaHead patentHead"></div>'
611
					if (dataStr[i].pic) {
612
						var src = '/data/researchResult' + dataStr[i].pic.split(",")[0]
613
						resIM = '<div class="madiaHead patentHead" style="background-image:url(' + src + ')"></div>';
614 614
					}
615
					
616
					var subject = dataStr[i].subject ? '<p class="h2Font ellipsisSty ">应用领域:<span class="resOrgName">' + dataStr[i].subject + '</span></p>' : ''
617
					var orgI = dataStr[i].orgId ? '<p class="h2Font ellipsisSty ">所属机构:<span class="org">' + dataStr[i].subject + '</span></p>' : ''
615 618
619
					var strAdd = '';
620
					strAdd += '<li class="mui-table-view-cell"><a  target="_blank" href="unPatentShow.html?id=' + dataStr[i].id + '" class="flexCenter urlgo">';
621
					strAdd += resIM
622
					strAdd += '<div class="madiaInfo"><p class="h1Font ellipsisSty">' + dataStr[i].name + '</p>';
623
					strAdd += '<p class="h2Font ellipsisSty ">研究者:<span class="researchers">' + '</span></p>'
624
					strAdd += subject
625
					strAdd += orgI;
626
					strAdd += '</div>';
627
					strAdd += '</a>'
628
					strAdd += '<ul class="madiaEdit">'
629
					strAdd += '<li class="deloutPro" data-id="' + dataStr[i].id + '">取消关联</li>'
630
					strAdd += '</ul></li>'
631
					var list = $(strAdd)
632
					$('#proUnPatent').append(list);
633
					queryResearcher(dataStr[i].id, list) //研究者
634
					orgN(dataStr[i].orgId,list) // 企业
616 635
				}
617 636
			}, function () {}, false);
618 637
		},
619
		queryResearcher = function (id, dataStr, $list) {
638
		queryResearcher = function (id, $list, ) { //研究者
620 639
			if (id) {
621
				homepageUnPatent(id, dataStr) //主页非专
640
				//主页非专
622 641
				oAjax("/ajax/resResult/researcher", {
623 642
					"id": id
624 643
				}, 'get', function ($data) {
625 644
					var arr = []
626
					var show
627
					var nameShow
628
					var subject
629
					if ($data.data.length) {
630
						// $list.find('.researchers').parent().removeClass('displayNone')
631
						// $list.find('.researchers').parent().addClass('haha')
632
						for (var i = 0; i < $data.data.length; i++) {
633
							arr.push($data.data[i].name)
634
							var resIM = '<div class="madiaHead patentHead"></div>'
635
							if (dataStr.pic) {
636
								var src = '/data/researchResult' + dataStr.pic.split(",")[0]
637
								resIM = '<div class="madiaHead patentHead" style="background-image:url(' + src + ')"></div>';
638
							}
639
							if (dataStr.orgId) { //所属机构渲染
640
								show = '<p class="h2Font ellipsisSty ">所属机构:<span class="resOrgName">' + '</span></p>';
641
							} else {
642
								show = '<p class="h2Font ellipsisSty displayNone">所属机构:<span class="resOrgName">' + '</span></p>';
643
							}
644
							if (dataStr.subject) { //应用领域渲染
645
								subject = '<p class="h2Font ellipsisSty ">应用领域:<span class="">' +dataStr.subject+ '</span></p>';
646
							} else {
647
								subject = '<p class="h2Font ellipsisSty displayNone">应用领域:<span class="resOrgName">' + '</span></p>';
648
							}
649
							if ($data.data[i].name) {
650
								nameShow = '<p class="h2Font ellipsisSty ">研究者:<span class="researchers">' + $data.data[i].name + '</span></p>';
651
							} else {
652
								nameShow = '<p class="h2Font ellipsisSty  displayNone">研究者:<span class="researchers">' + $data.data[i].name + '</span></p>';
653
							}
654
							var strAdd = '';
655
							strAdd += '<li class="mui-table-view-cell"><a  target="_blank" href="unPatentShow.html?id=' + dataStr.id + '" class="flexCenter urlgo">';
656
							strAdd += resIM
657
							strAdd += '<div class="madiaInfo"><p class="h1Font ellipsisSty">' + dataStr.name + '</p>';
658
							strAdd += nameShow
659
							strAdd += subject
660
							strAdd += show;
661
							strAdd += '</div>';
662
							strAdd += '</a>'
663
							strAdd += '<ul class="madiaEdit">'
664
							strAdd += '<li class="deloutPro" data-id="' + dataStr.id + '">取消关联</li>'
665
							strAdd += '</ul></li>'
666
							var list = $(strAdd)
667
							$('#proUnPatent').append(list);
668
							orgN(dataStr.orgId, list)
669
							// if (i < 3) {
670
							// 	$("#showUnPatent").append(list)
671
							// }
672
						}
645
					for (var i = 0; i < $data.data.length; i++) {
646
						// console.log($data.data[i].name
647
						arr.push($data.data[i].name)
673 648
					}
649
					$list.find('.researchers').html(arr.join(','))
674 650
				})
675 651
			}
676 652
		},
677
		orgN = function (par, $pa) {
653
		orgN = function (par, $pa) { //企业
678 654
			$.ajax({
679 655
				"url": "ajax/org/" + par,
680 656
				"type": "GET",
681 657
				"success": function (data) {
682 658
					console.log(data)
683 659
					if (data.success) {
684
						$pa.find('.resOrgName').html("所属机构"+ data.data.name)
660
						$pa.find('.org').html( data.data.name)
685 661
					}
686 662
				},
687 663
				"data": {
@ -695,90 +671,42 @@ $(function () {
695 671
		}
696 672
697 673
	//主页非专 
698
	homepageUnPatent = function (id, dataStr) {
699
		oAjax("/ajax/resResult/researcher", {
700
			"id": id
701
		}, 'get', function ($data) {
702
			var show
703
			var nameShow
704
			var subject
705
			if ($data.data.length) {
706
				// $list.find('.researchers').parent().removeClass('displayNone')
707
				// $list.find('.researchers').parent().addClass('haha')
708
				for (var i = 0; i < $data.data.length; i++) {
709
					var resIM = '<div class="madiaHead patentHead"></div>'
710
					if (dataStr.pic) {
711
						var src = '/data/researchResult' + dataStr.pic.split(",")[0]
712
						resIM = '<div class="madiaHead patentHead" style="background-image:url(' + src + ')"></div>';
713
					}
714
					if (dataStr.orgId) { //所属机构渲染
715
						show = '<p class="h2Font ellipsisSty ">所属机构:<span class="resOrgName">' + '</span></p>';
716
					} else {
717
						show = '<p class="h2Font ellipsisSty displayNone">所属机构:<span class="resOrgName">' + '</span></p>';
718
					}
719
					if (dataStr.subject) { //所属机构渲染
720
						subject = '<p class="h2Font ellipsisSty ">应用领域:<span class="resOrgName">' +subject+ '</span></p>';
721
					} else {
722
						subject = '<p class="h2Font ellipsisSty displayNone">所属机构:<span class="resOrgName">' + '</span></p>';
723
					}
724
					if ($data.data[i].name) {
725
						nameShow = '<p class="h2Font ellipsisSty ">研究者:<span class="researchers">' + $data.data[i].name + '</span></p>';
726
					} else {
727
						nameShow = '<p class="h2Font ellipsisSty  displayNone">研究者:<span class="researchers">' + $data.data[i].name + '</span></p>';
728
					}
729
					var strAdd = '';
730
					strAdd += '<li class="mui-table-view-cell"><a  target="_blank" href="unPatentShow.html?id=' + dataStr.id + '" class="flexCenter urlgo">';
731
					strAdd += resIM
732
					strAdd += '<div class="madiaInfo"><p class="h1Font ellipsisSty">' + dataStr.name + '</p>';
733
					strAdd += nameShow
734
					strAdd += subject
735
					strAdd += show;
736
					strAdd += '</div>';
737
					strAdd += '</a>'
738
					strAdd += '<ul class="madiaEdit">'
739
					strAdd += '<li class="deloutPro" data-id="' + dataStr.id + '">取消关联</li>'
740
					strAdd += '</ul></li>'
741
					var list = $(strAdd)
742
					orgN(dataStr.orgId, list)
743
					if (i < 3) {
744
						$("#showUnPatent").append(list)
745
					}
674
	homepageUnPatent = function (obj) {
675
		oAjax("/ajax/resResult/qm", {
676
			id: unpatentArr,
677
		}, "get", function (data) {
678
			var dataStr = data.data;
679
			console.log(dataStr)
680
			for (var i = 0; i < dataStr.length; i++) {
681
				// var $itemlist = $(strAdd);
682
				var resIM = '<div class="madiaHead patentHead"></div>'
683
				if (dataStr[i].pic) {
684
					var src = '/data/researchResult' + dataStr[i].pic.split(",")[0]
685
					resIM = '<div class="madiaHead patentHead" style="background-image:url(' + src + ')"></div>';
746 686
				}
687
				var subject = dataStr[i].subject ? '<p class="h2Font ellipsisSty ">应用领域:<span class="resOrgName">' + dataStr[i].subject + '</span></p>' : ''
688
				var orgI = dataStr[i].orgId ? '<p class="h2Font ellipsisSty ">所属机构:<span class="org">' + dataStr[i].subject + '</span></p>' : ''
689
690
				var strAdd = '';
691
				strAdd += '<li class="mui-table-view-cell"><a  target="_blank" href="unPatentShow.html?id=' + dataStr[i].id + '" class="flexCenter urlgo">';
692
				strAdd += resIM
693
				strAdd += '<div class="madiaInfo"><p class="h1Font ellipsisSty">' + dataStr[i].name + '</p>';
694
				strAdd += '<p class="h2Font ellipsisSty ">研究者:<span class="researchers">' + '</span></p>'
695
				strAdd += subject
696
				strAdd += orgI;
697
				strAdd += '</div>';
698
				strAdd += '</a>'
699
				strAdd += '<ul class="madiaEdit">'
700
				strAdd += '<li class="deloutPro" data-id="' + dataStr[i].id + '">取消关联</li>'
701
				strAdd += '</ul></li>'
702
				var list = $(strAdd)
703
				$('#proUnPatent').append(list);
704
				queryResearcher(dataStr[i].id, list) //研究者
705
				orgN(dataStr[i].orgId,list) // 企业
706
				$("#showUnPatent").append(list)
747 707
			}
748
		})
749
	}
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
708
		}, function () {}, false);
709
	},
782 710
783 711
784 712

+ 17 - 21
unPatentIssue.html

@ -66,16 +66,7 @@
66 66
 									<!--<li>dd<div class="closeThis"></div></li>-->
67 67
 								</ul>
68 68
 							</div>
69
						 </li>
70
						 
71
 						<li>
72
 							<div class="aboutTit">所属部门<em class="requiredcon">*</em><span class="frmconmsg"
73
 									id="keyPrompt4" ></span></div>
74
 							<input type="text" class="frmtype frmcontype" id="department" value=""
75
 								placeholder="请输入所属部门" />
76 69
 						</li>
77
78
79 70
 						<li>
80 71
 							<div class="aboutTit">所属机构<span class="frmconmsg" id="organization"
81 72
 									style="display:none">50字以内</span></div>
@ -84,14 +75,27 @@
84 75
 							<div class="form-drop keydrop displayNone" id="departmentList">
85 76
 								<ul class="clearfix">
86 77
 									<!--<li class="clearfix">
87
									<img src="images/authsort2.png" alt="" class="floatL" style="width:50px;height:50px;"/>
88
									<p class="h2Font floatL">金属材料工程与腐蚀</p>
89
								</li>-->
78
								   <img src="images/authsort2.png" alt="" class="floatL" style="width:50px;height:50px;"/>
79
								   <p class="h2Font floatL">金属材料工程与腐蚀</p>
80
							   </li>-->
90 81
 								</ul>
91 82
 							</div>
92 83
 						</li>
84
85
86
87
 						<li>
88
 							<div class="aboutTit">所属部门<em class="requiredcon">*</em><span class="frmconmsg"
89
 									id="keyPrompt4"></span></div>
90
 							<input type="text" class="frmtype frmcontype" id="department" value=""
91
 								placeholder="请输入所属部门" />
92
 						</li>
93
94
95
93 96
 						<li class="form-item">
94
 							<div class="aboutTit">应用领域<em class="requiredcon">*</em><span class="frmconmsg" id="keyPrompt"></span></div>
97
 							<div class="aboutTit">应用领域<em class="requiredcon">*</em><span class="frmconmsg"
98
 									id="keyPrompt"></span></div>
95 99
 							<div class="col-w-12" style="position: relative;">
96 100
 								<input type="text" class="frmcontype oinput"
97 101
 									placeholder="请填写成果相关的应用领域,如:空气净化、致霾气体降解、污水处理、抗菌、自清洁" data-pro="关键词不得超过10个字"
@ -110,9 +114,6 @@
110 114
 							</div>
111 115
 						</li>
112 116
113
114
115
116 117
 						<li class="form-item">
117 118
 							<div class="aboutTit">行业领域<span class="frmconmsg" id="keyPrompt"></span></div>
118 119
 							<div class="col-w-12" style="position: relative;">
@ -121,7 +122,6 @@
121 122
 								<button type="button" class="frmcontype btnModel frmaddG addButton">添加</button>
122 123
 								<div class="form-drop keydrop">
123 124
 									<ul>
124
125 125
 									</ul>
126 126
 								</div>
127 127
 							</div>
@ -131,10 +131,6 @@
131 131
 								</ul>
132 132
 							</div>
133 133
 						</li>
134
135
136
137
138 134
 						<li>
139 135
 							<div class="aboutTit">非专利成果简介<span class="frmconmsg" id="performance"
140 136
 									style="display:none;">2000字以内</span></div>