添加所属机构

e/2.html

@@ -1380,13 +1380,13 @@
					if (dataStr.length > 0) {
						var src = "../images/default-resource.jpg";
						var subject;
						if(dataStr[0].pic) {
							 src = '/data/researchResult' + dataStr[0].pic.split(",")[0]
						if (dataStr[0].pic) {
							src = '/data/researchResult' + dataStr[0].pic.split(",")[0]
						}
						
						if (dataStr[0].subject) {
							 subject = '应用领域:' + dataStr[0].subject
						}else{
							subject = '应用领域:' + dataStr[0].subject
						} else {
							subject = ''
						}
						var department = dataStr[0].department == undefined ? '' : '所属部门: ' + dataStr[0].department
@@ -1400,12 +1400,17 @@
							'<div class="madiaInfo OmadiaInfo">' +
							'<p class="ellipsisSty-2 h1Font">' + dataStr[0].name + '</p>' +
							'<p class="ellipsisSty h2Font dis">' + subject + '</p>' +
							'<p class="ellipsisSty h2Font ">' + department + '</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) {
							console.log(dataStr[0].orgId)
							orgname(dataStr[0].orgId,li)
						}
						$("#" + obj).append(strAdd)
						console.log(dataStr.length)
						if (dataStr.length <= 1) {
@@ -1448,6 +1453,35 @@
				})
			}
		orgname = function (par, $pa) {
			$.ajax({
				"url": "/ajax/org/" + par,
				"type": "GET",
				"success": function (data) {
					if (data.success) {
						$('.org').html('所属机构:'+data.data.name)
					}
				},
				"data": {
					"id": par
				},
				dataType: "json",
				'error': function () {
					// $.MsgBox.Alert('提示', '服务器连接超时！');
				}
			});
		}
		// 论文
		paperListVal = function (Id) { //论文
				var aimId = "paperList"

js/recommend.js

@@ -132,11 +132,7 @@ $(function () {
						} else {
							subject = ''
						}
						if ($info[i].department) {
							department = '所属部门:' + $info[i].department
						} else {
							department = ''
						}
					
						var resIM = '<div class="lefthead patenthead"></div>'
						if ($info[i].pic) {
@@ -148,11 +144,12 @@ $(function () {
						itemlist += resIM
						itemlist += '<div class="centercon centercon2">';
						itemlist += '<p class="h1font ellipsisSty">' + $info[i].name + '</p>';
						itemlist += '<p class="h2font ellipsisSty ">' + subject + '<span class="researchers"></span></p>';
						itemlist += '<p class="h2font ellipsisSty ">' + department + '<span class="researchers"></span></p>';
						// if ($info[i].orgId) {
						// 	itemlist += '<p class="h2font ellipsisSty">所属机构：<span class="resOrgName"></span></p>';
						// }
						itemlist += '<p class="h2font ellipsisSty ">' + '<span class="researchers"></span></p>';
						itemlist += '<p class="h2font ellipsisSty ">' + subject + '</p>';
						// itemlist += '<p class="h2font ellipsisSty ">' + department + '<span class="researchers"></span></p>';
						if ($info[i].orgId) {
							itemlist += '<p class="h2font ellipsisSty">所属机构：<span class="resOrgName"></span></p>';
						}
						itemlist += '</div></a></li>';
						var $itemlist = $(itemlist);
						$("#" + aimId).append($itemlist)
@@ -186,11 +183,17 @@ $(function () {
				$("#" + aimId).parent().find(".js-load-more").removeClass("active");
			})
		},
		recommendUnpatent = function () {
		recommendUnpatent = function () {   
			var aimId = "table-item-0"
			oAjax("/ajax/resResult/pq", {
				"status": ['1'],
				"pageSize": 5,
				"pageSize": 20,
				"pageNo": 1
			}, "get", function (res) {
				var $info = res.data.data;
@@ -204,11 +207,11 @@ $(function () {
						} else {
							subject = ''
						}
						if ($info[i].department) {
							department = '所属部门:' + $info[i].department
						} else {
							department = ''
						}
						// if ($info[i].department) {
						// 	department = '所属部门:' + $info[i].department
						// } else {
						// 	department = ''
						// }
						var resIM = '<div class="lefthead patenthead"></div>'
						if ($info[i].pic) {
@@ -221,8 +224,11 @@ $(function () {
						itemlist += '<div class="centercon centercon2">';
						itemlist += '<p class="h1font ellipsisSty">' + $info[i].name + '</p>';
						itemlist += '<p class="h2font ellipsisSty ">' + '<span class="researchers"></span></p>';
						itemlist += '<p class="h2font ellipsisSty ">' + subject + '<span class="researchers"></span></p>';
						itemlist += '<p class="h2font ellipsisSty">' + department + '<span class="resOrgName"></span></p>';
						itemlist += '<p class="h2font ellipsisSty ">' + subject + '</p>';
						// itemlist += '<p class="h2font ellipsisSty">' + department + '<span class="resOrgName"></span></p>';
						if ($info[i].orgId) {
							itemlist += '<p class="h2font ellipsisSty">所属机构：<span class="resOrgName"></span></p>';
						}
						itemlist += '</div></a></li>';
						var $itemlist = $(itemlist);
						$("#" + aimId).append($itemlist)

js/search_h5.js

@@ -278,14 +278,13 @@ $(function () {
			}, 'get', function (res) {
				var $info = res.data
				if ($info.length > 0) {
					dataO.unpCreateTime = $info[$info.length-1].createTime;   //获取最后一个数据的创建时间
					dataO.unpCreateTime = $info[$info.length - 1].createTime; //获取最后一个数据的创建时间
					dataO.unpId = $info[$info.length - 1].id;
				}
				for (var i = 0; i < $info.length; i++) {
					if ($info[i].pic) {
						var src = '/data/researchResult' + $info[i].pic.split(",")[0]
					}
					var department = $info[i].department == undefined ? '' : '所属部门: ' + $info[i].department
					var subject = $info[i].subject == undefined ? '' : '应用介绍: ' + $info[i].subject
					var liItem = document.createElement("li");
					liItem.setAttribute("data-id", $info[i].id);
@@ -295,7 +294,10 @@ $(function () {
					itemlist += '<div class="madiaInfo OmadiaInfo">';
					itemlist += '<p class="ellipsisSty-2 h1Font">' + $info[i].name + '</p>';
					itemlist += '<p class="h2Font ellipsisSty"><span class="ownerName">' + subject + '</span><em class="authiconNew ownerSty"></em></p>'
					itemlist += '<p class="h2Font ellipsisSty">' + department + '</p>'
					if ($info[i].orgId) {
						itemlist += '<p class="h2Font ellipsisSty org">所属机构'+ '</p>'
					}
					itemlist += '</div>'
					itemlist += '</div>';
					liItem.innerHTML = itemlist;
@@ -303,6 +305,10 @@ $(function () {
					document.getElementById(aimId).appendChild(liItem)
					// unPerson($info[i].id, $itemlist)
					removeNodata(aimId);
					if($info[i].orgId) {
						noOrgname($info[i].orgId,$itemlist)
					}
					var liLen = document.getElementById(aimId).querySelectorAll("li").length;
					if ($info.length == 0 && liLen == 0) {
@@ -318,12 +324,30 @@ $(function () {
						return;
					}
				}
			})
		}
	noOrgname = function (par, $pa) { //非专企业
		$.ajax({
			"url": "/ajax/org/" + par,
			"type": "GET",
			"success": function (data) {
				if (data.success) {
					$pa.find('.org').html("所属机构: "+data.data.name)
				}
			},
			"data": {
				"id": par
			},
			dataType: "json",
			'error': function () {
				// $.MsgBox.Alert('提示', '服务器连接超时！');
			}
		});
	}
	//研究人
	unPerson = function (id, $list) {

js/teamInforShow.js

@@ -365,6 +365,7 @@ $(function () {
			});
		},
		detailUnPat = function (obj) {
			homepageUnPatent()
			oAjax("/ajax/resResult/qm", {
				id: unpatentArr,
			}, "get", function (data) {
@@ -378,11 +379,52 @@ $(function () {
					} else {
						subject = ''
					}
					if (dataStr[i].department) {
						department = '所属部门:' + dataStr[i].department
				
					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 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 ">'+ subject+ '<span class="researchers"></span></p>';
					strAdd += '<p class="h2Font ellipsisSty org">'+ '<span class="researchers"></span></p>';
					// if (dataStr[i].orgId) {
					// 	strAdd += '<p class="h2Font ellipsisSty">所属机构：<span class="resOrgName"></span></p>';
					// }
					strAdd += '</div>';
					strAdd += '</a></li>';
					var $itemlist = $(strAdd);
					$("#" + obj).append($itemlist);
					orgN(dataStr[i].orgId, $itemlist)
					// if (i < 3) {
					// 	$("#showUnPatent").append(strAdd)
					// }
					// queryResearcher(dataStr[i].id, $itemlist)
					// if (dataStr[i].orgId) {
					// 	queryReseOrgName(dataStr[i].orgId, $itemlist)
					// }
				}
			});
		},
		homepageUnPatent = function () {
			oAjax("/ajax/resResult/qm", {
				id: unpatentArr,
			}, "get", function (data) {
				var dataStr = data.data;
				var subject = '',
					department = ''
				for (var i = 0; i < dataStr.length; i++) {
					if (dataStr[i].subject) {
						subject = "应用领域:" + dataStr[i].subject
					} else {
						department = ''
						subject = ''
					}
				
					var resIM = '<div class="madiaHead patentHead"></div>'
					if (dataStr[i].pic) {
						var src = '/data/researchResult' + dataStr[i].pic.split(",")[0]
@@ -393,25 +435,71 @@ $(function () {
					strAdd += resIM
					strAdd += '<div class="madiaInfo"><p class="h1Font ellipsisSty">' + dataStr[i].name + '</p>';
					strAdd += '<p class="h2Font ellipsisSty ">'+ subject+ '<span class="researchers"></span></p>';
					strAdd += '<p class="h2Font ellipsisSty ">'+ department+ '<span class="researchers"></span></p>';
					strAdd += '<p class="h2Font ellipsisSty org">'+ '<span class="researchers"></span></p>';
					// if (dataStr[i].orgId) {
					// 	strAdd += '<p class="h2Font ellipsisSty">所属机构：<span class="resOrgName"></span></p>';
					// }
					strAdd += '</div>';
					strAdd += '</a></li>';
					var $itemlist = $(strAdd);
					$("#" + obj).append(strAdd);
					// $("#" + obj).append($itemlist);
					if (i < 3) {
						$("#showUnPatent").append(strAdd)
						$("#showUnPatent").append($itemlist)
					}
					var $itemlist = $(strAdd);
					orgN(dataStr[i].orgId, $itemlist)
					// queryResearcher(dataStr[i].id, $itemlist)
					if (dataStr[i].orgId) {
						queryReseOrgName(dataStr[i].orgId, $itemlist)
					// if (dataStr[i].orgId) {
					// 	queryReseOrgName(dataStr[i].orgId, $itemlist)
					// }
				}
			});
		}
		orgN = function (par, $pa) {
			$.ajax({
				"url": "ajax/org/" + par,
				"type": "GET",
				"success": function (data) {
					console.log(data)
					if (data.success) {
						$pa.find('.org').html('所属机构:'+data.data.name)
					}
				},
				"data": {
					"id": par
				},
				dataType: "json",
				'error': function () {
					$.MsgBox.Alert('提示', '服务器连接超时！');
				}
			});
		},
		}
		queryResearcher = function (id, $list) {
			if (id) {
				oAjax("/ajax/resResult/researcher", {

js/teamManage.js

@@ -163,7 +163,7 @@ $(function () {
					       
					// console.log($info[i])
					if (ff) {
						detailPro(aimIdF, 1)
@@ -283,7 +283,6 @@ $(function () {
						itemlist += li4
						itemlist += '</ul>'
						itemlist += '</li>';
						$("#" + aimId).append(itemlist)
					}
				} else {
@@ -303,14 +302,12 @@ $(function () {
				var $info = res.data.data;
				$("#showUnPatent").html("")
				if ($info.length > 0) {
					if (res.data.total > 0 && res.data.total < 99) {
						$("#unpatCount").text(res.data.total);
						if (res.data.total == 0 || res.data.total == 1) {
							$("#unpatCount").text('');
						}
					}
					if (res.data.total > 99) {
						// $("#unpatCount").text("99+");
					}
@@ -346,7 +343,7 @@ $(function () {
				$("#" + aimId).parent().find(".js-load-more").removeClass("active");
			})
		},
		searchUnPatent = function () {
		searchUnPatent = function () { //收缩
			var keyt = $('#searchUnPatentKey').val()
			if (keyt === '') {
				return
@@ -390,7 +387,8 @@ $(function () {
						itemlist += '</li>';
						var $itemlist = $(itemlist);
						$("#" + aimId).append($itemlist)
						queryResearcher($info[i].id, $itemlist)
						console.log($info[i])
						queryResearcher($info[i].id, $info[i])
						if ($info[i].orgId) {
							queryReseOrgName($info[i].orgId, $itemlist)
						}
@@ -601,16 +599,14 @@ $(function () {
			})
		},
		detailUnPat = function (obj) {
			oAjax("/ajax/resResult/qm", {
				id: unpatentArr,
			}, "get", function (data) {
				var dataStr = data.data;
				for (var i = 0; i < dataStr.length; i++) {
					if (dataStr[i].status == 1) {
						// var $itemlist = $(strAdd);
						queryResearcher(dataStr[i].id, dataStr[i], )
						queryResearcher(dataStr[i].id, dataStr[i])
						// queryFeiZhuan(dataStr[i].id, $itemlist)   //研究者名称
						if (dataStr[i].orgId) {
							// queryReseOrgName(dataStr[i].orgId,)
@@ -622,14 +618,15 @@ $(function () {
		},
		queryResearcher = function (id, dataStr, $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++) {
@@ -640,10 +637,15 @@ $(function () {
								resIM = '<div class="madiaHead patentHead" style="background-image:url(' + src + ')"></div>';
							}
							if (dataStr.orgId) { //所属机构渲染
								show = '<p class="h2Font ellipsisSty ">所属机构：<span class="resOrgName">' + dataStr.orgId + '</span></p>';
								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 {
@@ -654,21 +656,124 @@ $(function () {
							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>'
							$('#proUnPatent').append(strAdd);
							if (i < 3) {
								$("#showUnPatent").append(strAdd)
							}
							var list = $(strAdd)
							$('#proUnPatent').append(list);
							orgN(dataStr.orgId, list)
							// if (i < 3) {
							// 	$("#showUnPatent").append(list)
							// }
						}
					}
				})
			}
		},
		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)
					}
				},
				"data": {
					"id": par
				},
				dataType: "json",
				'error': function () {
					$.MsgBox.Alert('提示', '服务器连接超时！');
				}
			});
		}
	//主页非专 
	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)
					}
				}
			}
		})
	}
@@ -679,7 +784,7 @@ $(function () {
		queryReseOrgName = function (id, $list) {
	queryReseOrgName = function (id, $list) {
			if (id) {
				cacheModel.getCompany(id, function (sc, value) {
					if (sc) {

js/unPatentImport.js

@@ -122,7 +122,7 @@ $(document).ready(function () {
							'<p class="h1Font ellipsisSty">' + $data.name + '</p>' +
							'<p class="h2Font ellipsisSty">' + oSpec + '</p>' +
							'<p class="h2Font ellipsisSty">应用领域：' + $data.subject + '</p>' +
							'<p class="h2Font ellipsisSty">所属部门：' + $data.department + '</p>' +
							// '<p class="h2Font ellipsisSty">所属部门：' + $data.department + '</p>' +
							'<p class="h2Font ellipsisSty">' + '</p>' +
							'</div>' +
							'</a>' +
@@ -132,12 +132,45 @@ $(document).ready(function () {
							'<span class="importSpan-3">已导入</span>' +*/
							'</div>' +
							'</li>'
						var list = $(oString)
						$(".importUl").append(oString);
						console.log($data.orgId)
						if($data.orgId) {
							orgname($data.orgId,list)
						}
					}
				})
			}
		})
	}
	//所属机构
	function orgname(par, $pa) {
		$.ajax({
			"url": "ajax/org/" + par,
			"type": "GET",
			"success": function (data) {
				console.log(par)
				if (data.success) {
					$pa.find('.hu1').append('<li>所属机构：' + data.data.name+ '</li>')
				}
			},
			"data": {
				"id": par
			},
			dataType: "json",
			'error': function () {
				$.MsgBox.Alert('提示', '服务器连接超时！');
			}
		});
	}
	/*输入资源名称限制字数*/
	$("#resouceName").bind({
		keyup: function () {

js/unPatentList.js

@@ -66,6 +66,7 @@ $(document).ready(function () {
	function resourceHtml($data) {
		console.log($data)
		for (var i = 0; i < $data.length; i++) {
			var oTime, pageview = "",
@@ -110,6 +111,7 @@ $(document).ready(function () {
			$("#patentList").append($oStr);
			if ($data[i].status == '1') {
				proList($data[i].id, $oStr, $data[i].orgId,$data[i].subject,$data[i].department || '')
				console.log($data[i])
			}
			$oStr.find(".editThis").attr("data-state", $data[i].status);
		}
@@ -134,12 +136,13 @@ $(document).ready(function () {
						}
						$pa.find('.hu2').append('<li>研究者：' + arr.join(',') + '</li>')
						$pa.find('.hu2').append('<li>应用领域：' + subject + '</li>')
						$pa.find('.hu2').append('<li>所属部门：' + department + '</li>')
						$pa.find('.hu2>li').css({'float':'none' , 'margin-bottom':'0px'})
						$('.itemListBolck .itemListCon .madiaInfo').css('padding-top','0px')
						
						if (p3)
							orgname(p3, $pa)
						orgname(p3, $pa)
						console.log(p3)
						if (p3){
							
						}
						$.ajax({
							'url': '/ajax/resResult/selectbyidandPid',
							'type': 'get',
@@ -150,7 +153,6 @@ $(document).ready(function () {
							'success': function (res) {
								var $info = res.data
								for (var i = 0; i < $info.length; i++) {
									console.log($info[i].name)
									if ($info[i].name == '######' || $info[i].status == 0) {
										$pa.find('.deteleThis3').css('display', 'none')
									} else {
@@ -178,8 +180,9 @@ $(document).ready(function () {
			"url": "ajax/org/" + par,
			"type": "GET",
			"success": function (data) {
				console.log(data)
				if (data.success) {
					$pa.find('.hu1').append('<li>所属机构：' + data.data.name + '</li>')
					$pa.find('.hu1').append('<li>所属机构：' + data.data.name+ '</li>')
				}
			},
			"data": {