修复bug

e/2.html

@@ -44,8 +44,9 @@
		.teamName {
			margin-bottom: 35px;
		}
	
	</style>
</head>
@@ -76,8 +77,6 @@
				</div>
			</div>
		</div>
		<div class="mainbox displayNone">
			<div class="infocon madiaBlock needList" style="border:none">
				<ul class="mui-table-view" id="demandShow">
@@ -118,22 +117,18 @@
		<div class="mainbox" style="cursor: pointer;" id="goCmpBrief">
			<div class="infocontit mui-clearfix">团队介绍<em></em></div>
			<div class="infocon">
				<span class="breifinfo" id="breifinfo" style="display: block">
				<span class="breifinfo ellipsisSty" id="breifinfo" style="display: block">
					<p id="breifinfo"></p>
				</span>
			</div>
		</div>
		<div class="mainbox">
			<div class="infocontit">行业领域</div>
			<div class="infocon listArea">
				<ul id="industryShow">
				</ul>
			</div>
		</div>
		<div class="mainbox">
			<div class="infocontit">学术领域</div>
			<div class="infocon listArea">
@@ -1400,14 +1395,14 @@
							'<div class="madiaInfo OmadiaInfo">' +
							'<p class="ellipsisSty-2 h1Font">' + dataStr[0].name + '</p>' +
							'<p class="ellipsisSty h2Font dis">' + subject + '</p>' +
							'<p class="ellipsisSty h2Font org">'  + '</p>' +
							'<p class="ellipsisSty h2Font org">' + '</p>' +
							//.substring(0, dataStr[i].authors.length - 1)    
							'</div>' +
							'</div>'
						document.getElementById('proUnPatent').appendChild(li);
						if(dataStr[0].orgId) {
						if (dataStr[0].orgId) {
							console.log(dataStr[0].orgId)
							orgname(dataStr[0].orgId,li)
							orgname(dataStr[0].orgId, li)
						}
@@ -1459,7 +1454,7 @@
				"type": "GET",
				"success": function (data) {
					if (data.success) {
						$('.org').html('所属机构:'+data.data.name)
						$('.org').html('所属机构:' + data.data.name)
					}
				},
				"data": {
@@ -1471,17 +1466,6 @@
				}
			});
		}
		// 论文
		paperListVal = function (Id) { //论文
				var aimId = "paperList"
@@ -1512,16 +1496,13 @@
				})
			},
			paperListId() //团队论文id
		teamofExperts()
		//专家团队
		function teamofExperts() {
			oAjax('/ajax/team/pro', {
				id: tId,
				"pageSize": rows,
				"pageNo": 30,
				"pageNo": 25,
			}, 'get', function (res) {
				if (res.success && res.data) {
					var data = res.data.data

js/search_h5.js

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

js/teamManage.js

@@ -316,6 +316,7 @@ $(function () {
						unpatentArr.push($info[i].researchResult)
					}
					detailUnPat(aimId)
					homepageUnPatent()
				} else {
					$("#showUnPatent").parents('.otherShow').hide()
				}
@@ -603,85 +604,60 @@ $(function () {
				id: unpatentArr,
			}, "get", function (data) {
				var dataStr = data.data;
				console.log(dataStr)
				for (var i = 0; i < dataStr.length; i++) {
					if (dataStr[i].status == 1) {
						// var $itemlist = $(strAdd);
						queryResearcher(dataStr[i].id, dataStr[i])
						// queryFeiZhuan(dataStr[i].id, $itemlist)   //研究者名称
						if (dataStr[i].orgId) {
							// queryReseOrgName(dataStr[i].orgId,)
						}
					// var $itemlist = $(strAdd);
					var resIM = '<div class="madiaHead patentHead"></div>'
					if (dataStr[i].pic) {
						var src = '/data/researchResult' + dataStr[i].pic.split(",")[0]
						resIM = '<div class="madiaHead patentHead" style="background-image:url(' + src + ')"></div>';
					}
					
					var subject = dataStr[i].subject ? '<p class="h2Font ellipsisSty ">应用领域：<span class="resOrgName">' + dataStr[i].subject + '</span></p>' : ''
					var orgI = dataStr[i].orgId ? '<p class="h2Font ellipsisSty ">所属机构：<span class="org">' + dataStr[i].subject + '</span></p>' : ''
					var strAdd = '';
					strAdd += '<li class="mui-table-view-cell"><a  target="_blank" href="unPatentShow.html?id=' + dataStr[i].id + '" class="flexCenter urlgo">';
					strAdd += resIM
					strAdd += '<div class="madiaInfo"><p class="h1Font ellipsisSty">' + dataStr[i].name + '</p>';
					strAdd += '<p class="h2Font ellipsisSty ">研究者：<span class="researchers">' + '</span></p>'
					strAdd += subject
					strAdd += orgI;
					strAdd += '</div>';
					strAdd += '</a>'
					strAdd += '<ul class="madiaEdit">'
					strAdd += '<li class="deloutPro" data-id="' + dataStr[i].id + '">取消关联</li>'
					strAdd += '</ul></li>'
					var list = $(strAdd)
					$('#proUnPatent').append(list);
					queryResearcher(dataStr[i].id, list) //研究者
					orgN(dataStr[i].orgId,list) // 企业
				}
			}, function () {}, false);
		},
		queryResearcher = function (id, dataStr, $list) {
		queryResearcher = function (id, $list, ) { //研究者
			if (id) {
				homepageUnPatent(id, dataStr) //主页非专
				//主页非专
				oAjax("/ajax/resResult/researcher", {
					"id": id
				}, 'get', function ($data) {
					var arr = []
					var show
					var nameShow
					var subject
					if ($data.data.length) {
						// $list.find('.researchers').parent().removeClass('displayNone')
						// $list.find('.researchers').parent().addClass('haha')
						for (var i = 0; i < $data.data.length; i++) {
							arr.push($data.data[i].name)
							var resIM = '<div class="madiaHead patentHead"></div>'
							if (dataStr.pic) {
								var src = '/data/researchResult' + dataStr.pic.split(",")[0]
								resIM = '<div class="madiaHead patentHead" style="background-image:url(' + src + ')"></div>';
							}
							if (dataStr.orgId) { //所属机构渲染
								show = '<p class="h2Font ellipsisSty ">所属机构：<span class="resOrgName">' + '</span></p>';
							} else {
								show = '<p class="h2Font ellipsisSty displayNone">所属机构：<span class="resOrgName">' + '</span></p>';
							}
							if (dataStr.subject) { //应用领域渲染
								subject = '<p class="h2Font ellipsisSty ">应用领域：<span class="">' +dataStr.subject+ '</span></p>';
							} else {
								subject = '<p class="h2Font ellipsisSty displayNone">应用领域：<span class="resOrgName">' + '</span></p>';
							}
							if ($data.data[i].name) {
								nameShow = '<p class="h2Font ellipsisSty ">研究者：<span class="researchers">' + $data.data[i].name + '</span></p>';
							} else {
								nameShow = '<p class="h2Font ellipsisSty  displayNone">研究者：<span class="researchers">' + $data.data[i].name + '</span></p>';
							}
							var strAdd = '';
							strAdd += '<li class="mui-table-view-cell"><a  target="_blank" href="unPatentShow.html?id=' + dataStr.id + '" class="flexCenter urlgo">';
							strAdd += resIM
							strAdd += '<div class="madiaInfo"><p class="h1Font ellipsisSty">' + dataStr.name + '</p>';
							strAdd += nameShow
							strAdd += subject
							strAdd += show;
							strAdd += '</div>';
							strAdd += '</a>'
							strAdd += '<ul class="madiaEdit">'
							strAdd += '<li class="deloutPro" data-id="' + dataStr.id + '">取消关联</li>'
							strAdd += '</ul></li>'
							var list = $(strAdd)
							$('#proUnPatent').append(list);
							orgN(dataStr.orgId, list)
							// if (i < 3) {
							// 	$("#showUnPatent").append(list)
							// }
						}
					for (var i = 0; i < $data.data.length; i++) {
						// console.log($data.data[i].name
						arr.push($data.data[i].name)
					}
					$list.find('.researchers').html(arr.join(','))
				})
			}
		},
		orgN = function (par, $pa) {
		orgN = function (par, $pa) { //企业
			$.ajax({
				"url": "ajax/org/" + par,
				"type": "GET",
				"success": function (data) {
					console.log(data)
					if (data.success) {
						$pa.find('.resOrgName').html("所属机构"+ data.data.name)
						$pa.find('.org').html( data.data.name)
					}
				},
				"data": {
@@ -695,90 +671,42 @@ $(function () {
		}
	//主页非专 
	homepageUnPatent = function (id, dataStr) {
		oAjax("/ajax/resResult/researcher", {
			"id": id
		}, 'get', function ($data) {
			var show
			var nameShow
			var subject
			if ($data.data.length) {
				// $list.find('.researchers').parent().removeClass('displayNone')
				// $list.find('.researchers').parent().addClass('haha')
				for (var i = 0; i < $data.data.length; i++) {
					var resIM = '<div class="madiaHead patentHead"></div>'
					if (dataStr.pic) {
						var src = '/data/researchResult' + dataStr.pic.split(",")[0]
						resIM = '<div class="madiaHead patentHead" style="background-image:url(' + src + ')"></div>';
					}
					if (dataStr.orgId) { //所属机构渲染
						show = '<p class="h2Font ellipsisSty ">所属机构：<span class="resOrgName">' + '</span></p>';
					} else {
						show = '<p class="h2Font ellipsisSty displayNone">所属机构：<span class="resOrgName">' + '</span></p>';
					}
					if (dataStr.subject) { //所属机构渲染
						subject = '<p class="h2Font ellipsisSty ">应用领域：<span class="resOrgName">' +subject+ '</span></p>';
					} else {
						subject = '<p class="h2Font ellipsisSty displayNone">所属机构：<span class="resOrgName">' + '</span></p>';
					}
					if ($data.data[i].name) {
						nameShow = '<p class="h2Font ellipsisSty ">研究者：<span class="researchers">' + $data.data[i].name + '</span></p>';
					} else {
						nameShow = '<p class="h2Font ellipsisSty  displayNone">研究者：<span class="researchers">' + $data.data[i].name + '</span></p>';
					}
					var strAdd = '';
					strAdd += '<li class="mui-table-view-cell"><a  target="_blank" href="unPatentShow.html?id=' + dataStr.id + '" class="flexCenter urlgo">';
					strAdd += resIM
					strAdd += '<div class="madiaInfo"><p class="h1Font ellipsisSty">' + dataStr.name + '</p>';
					strAdd += nameShow
					strAdd += subject
					strAdd += show;
					strAdd += '</div>';
					strAdd += '</a>'
					strAdd += '<ul class="madiaEdit">'
					strAdd += '<li class="deloutPro" data-id="' + dataStr.id + '">取消关联</li>'
					strAdd += '</ul></li>'
					var list = $(strAdd)
					orgN(dataStr.orgId, list)
					if (i < 3) {
						$("#showUnPatent").append(list)
					}
	homepageUnPatent = function (obj) {
		oAjax("/ajax/resResult/qm", {
			id: unpatentArr,
		}, "get", function (data) {
			var dataStr = data.data;
			console.log(dataStr)
			for (var i = 0; i < dataStr.length; i++) {
				// var $itemlist = $(strAdd);
				var resIM = '<div class="madiaHead patentHead"></div>'
				if (dataStr[i].pic) {
					var src = '/data/researchResult' + dataStr[i].pic.split(",")[0]
					resIM = '<div class="madiaHead patentHead" style="background-image:url(' + src + ')"></div>';
				}
				var subject = dataStr[i].subject ? '<p class="h2Font ellipsisSty ">应用领域：<span class="resOrgName">' + dataStr[i].subject + '</span></p>' : ''
				var orgI = dataStr[i].orgId ? '<p class="h2Font ellipsisSty ">所属机构：<span class="org">' + dataStr[i].subject + '</span></p>' : ''
				var strAdd = '';
				strAdd += '<li class="mui-table-view-cell"><a  target="_blank" href="unPatentShow.html?id=' + dataStr[i].id + '" class="flexCenter urlgo">';
				strAdd += resIM
				strAdd += '<div class="madiaInfo"><p class="h1Font ellipsisSty">' + dataStr[i].name + '</p>';
				strAdd += '<p class="h2Font ellipsisSty ">研究者：<span class="researchers">' + '</span></p>'
				strAdd += subject
				strAdd += orgI;
				strAdd += '</div>';
				strAdd += '</a>'
				strAdd += '<ul class="madiaEdit">'
				strAdd += '<li class="deloutPro" data-id="' + dataStr[i].id + '">取消关联</li>'
				strAdd += '</ul></li>'
				var list = $(strAdd)
				$('#proUnPatent').append(list);
				queryResearcher(dataStr[i].id, list) //研究者
				orgN(dataStr[i].orgId,list) // 企业
				$("#showUnPatent").append(list)
			}
		})
	}
		}, function () {}, false);
	},

unPatentIssue.html

@@ -66,16 +66,7 @@
 									<!--<li>dd<div class="closeThis"></div></li>-->
 								</ul>
 							</div>
						 </li>
						 
 						<li>
 							<div class="aboutTit">所属部门<em class="requiredcon">*</em><span class="frmconmsg"
 									id="keyPrompt4" ></span></div>
 							<input type="text" class="frmtype frmcontype" id="department" value=""
 								placeholder="请输入所属部门" />
 						</li>
 						<li>
 							<div class="aboutTit">所属机构<span class="frmconmsg" id="organization"
 									style="display:none">50字以内</span></div>
@@ -84,14 +75,27 @@
 							<div class="form-drop keydrop displayNone" id="departmentList">
 								<ul class="clearfix">
 									<!--<li class="clearfix">
									<img src="images/authsort2.png" alt="" class="floatL" style="width:50px;height:50px;"/>
									<p class="h2Font floatL">金属材料工程与腐蚀</p>
								</li>-->
								   <img src="images/authsort2.png" alt="" class="floatL" style="width:50px;height:50px;"/>
								   <p class="h2Font floatL">金属材料工程与腐蚀</p>
							   </li>-->
 								</ul>
 							</div>
 						</li>
 						<li>
 							<div class="aboutTit">所属部门<em class="requiredcon">*</em><span class="frmconmsg"
 									id="keyPrompt4"></span></div>
 							<input type="text" class="frmtype frmcontype" id="department" value=""
 								placeholder="请输入所属部门" />
 						</li>
 						<li class="form-item">
 							<div class="aboutTit">应用领域<em class="requiredcon">*</em><span class="frmconmsg" id="keyPrompt"></span></div>
 							<div class="aboutTit">应用领域<em class="requiredcon">*</em><span class="frmconmsg"
 									id="keyPrompt"></span></div>
 							<div class="col-w-12" style="position: relative;">
 								<input type="text" class="frmcontype oinput"
 									placeholder="请填写成果相关的应用领域，如：空气净化、致霾气体降解、污水处理、抗菌、自清洁" data-pro="关键词不得超过10个字"
@@ -110,9 +114,6 @@
 							</div>
 						</li>
 						<li class="form-item">
 							<div class="aboutTit">行业领域<span class="frmconmsg" id="keyPrompt"></span></div>
 							<div class="col-w-12" style="position: relative;">
@@ -121,7 +122,6 @@
 								<button type="button" class="frmcontype btnModel frmaddG addButton">添加</button>
 								<div class="form-drop keydrop">
 									<ul>
 									</ul>
 								</div>
 							</div>
@@ -131,10 +131,6 @@
 								</ul>
 							</div>
 						</li>
 						<li>
 							<div class="aboutTit">非专利成果简介<span class="frmconmsg" id="performance"
 									style="display:none;">2000字以内</span></div>