lyn7568 vor 5 Jahren
Ursprung
Commit
261020c50c
8 geänderte Dateien mit 65 neuen und 38 gelöschten Zeilen
  1. 2 3
      e/2.html
  2. 6 1
      e/3.html
  3. 5 6
      js/recommend.js
  4. 1 1
      js/teamManage.js
  5. 2 0
      js/unPatentImport.js
  6. 14 6
      js/unPatentIssue.js
  7. 9 6
      js/unPatentList.js
  8. 26 15
      unPatentIssue.html

+ 2 - 3
e/2.html

@ -116,7 +116,7 @@
116 116
			<div class="seeMore displayNone" id="seeMoreResource"><em>查看全部 <span id="resourceNum">0</span>个</em></div>
117 117
		</div>
118 118
		<div class="mainbox" style="cursor: pointer;" id="goCmpBrief">
119
			<div class="infocontit mui-clearfix">团队介绍 </div>
119
			<div class="infocontit mui-clearfix">团队介绍<em></em></div>
120 120
			<div class="infocon">
121 121
				<span class="breifinfo" id="breifinfo" style="display: block">
122 122
					<p id="breifinfo"></p>
@ -1487,7 +1487,7 @@
1487 1487
			oAjax('/ajax/team/pro', {
1488 1488
				id: tId,
1489 1489
				"pageSize": rows,
1490
				"pageNo": pageNo,
1490
				"pageNo": 30,
1491 1491
			}, 'get', function (res) {
1492 1492
				if (res.success && res.data) {
1493 1493
					var data = res.data.data
@ -1509,7 +1509,6 @@
1509 1509
								}
1510 1510
							}
1511 1511
						})
1512
1513 1512
						// var paperN = data.total;
1514 1513
						var ExpId = data[i].professor; //传专家id
1515 1514
						// var patentN = data[i].secretary;

+ 6 - 1
e/3.html

@ -231,7 +231,10 @@
231 231
232 232
233 233
234
234
            $("#researchOrganization").on("click", "li", function () {
235
                location.href = "http://" + window.location.host + "/e/c.html?id=" + $(this).attr(
236
                    "data-id");
237
            });
235 238
236 239
237 240
@ -544,6 +547,8 @@
544 547
                                imgL = '/images/org/' + StrData.id + '.jpg'
545 548
                            }
546 549
                            var add = document.createElement("li");
550
                            add.setAttribute("data-id", StrData.id);
551
547 552
                            add.className =
548 553
                                "mui-table-view-cell flexCenter OflexCenter";
549 554
                            var itemlist =

+ 5 - 6
js/recommend.js

@ -220,14 +220,13 @@ $(function () {
220 220
						itemlist += resIM
221 221
						itemlist += '<div class="centercon centercon2">';
222 222
						itemlist += '<p class="h1font ellipsisSty">' + $info[i].name + '</p>';
223
						itemlist += '<p class="h2font ellipsisSty ">' + '<span class="researchers"></span></p>';
223 224
						itemlist += '<p class="h2font ellipsisSty ">' + subject + '<span class="researchers"></span></p>';
224
						if ($info[i].orgId) {
225
							itemlist += '<p class="h2font ellipsisSty">' + department + '<span class="resOrgName"></span></p>';
226
						}
225
						itemlist += '<p class="h2font ellipsisSty">' + department + '<span class="resOrgName"></span></p>';
227 226
						itemlist += '</div></a></li>';
228 227
						var $itemlist = $(itemlist);
229 228
						$("#" + aimId).append($itemlist)
230
						// queryResearcher($info[i].id, $itemlist)
229
						queryResearcher($info[i].id, $itemlist)
231 230
						if ($info[i].orgId) {
232 231
							queryReseOrgName($info[i].orgId, $itemlist)
233 232
						}
@ -325,7 +324,7 @@ $(function () {
325 324
						for (var i = 0; i < $data.data.length; i++) {
326 325
							arr.push($data.data[i].name)
327 326
						}
328
						$list.find('.researchers').html(arr.join(','))
327
						$list.find('.researchers').html('研究者:'+arr.join(','))
329 328
					}
330 329
				})
331 330
			}
@ -405,7 +404,7 @@ $(function () {
405 404
	recommendUnpatent()
406 405
	patentListVal(true, true)
407 406
	navmenu();
408
	// hotUnpatentList();
407
	hotUnpatentList();
409 408
410 409
	if (userid && userid != null && userid != "null") {
411 410
		$(".privateInfo .onlogined").removeClass("displayNone")

+ 1 - 1
js/teamManage.js

@ -129,7 +129,7 @@ $(function () {
129 129
				newStr = ""
130 130
			oAjax("/ajax/team/pro", {
131 131
				id: tId,
132
				pageSize: rowsTen,
132
				pageSize: 30,
133 133
				pageNo: pageNo,
134 134
			}, "get", function (res) {
135 135
				var $info = res.data.data;

+ 2 - 0
js/unPatentImport.js

@ -121,6 +121,8 @@ $(document).ready(function () {
121 121
							'<div class="madiaInfo">' +
122 122
							'<p class="h1Font ellipsisSty">' + $data.name + '</p>' +
123 123
							'<p class="h2Font ellipsisSty">' + oSpec + '</p>' +
124
							'<p class="h2Font ellipsisSty">应用领域:' + $data.subject + '</p>' +
125
							'<p class="h2Font ellipsisSty">所属部门:' + $data.department + '</p>' +
124 126
							'<p class="h2Font ellipsisSty">' + '</p>' +
125 127
							'</div>' +
126 128
							'</a>' +

+ 14 - 6
js/unPatentIssue.js

@ -16,6 +16,19 @@ $(document).ready(function () {
16 16
	$('#KeyWord3').blur(function () {
17 17
		$('#keyPrompt').html('')
18 18
	})
19
	//department
20
21
	$('#department').focus(function () {
22
		$('#keyPrompt4').html('所属部门不能为空')
23
	})
24
25
	$('#department').blur(function () {
26
		$('#keyPrompt4').html('')
27
	})
28
29
30
31
19 32
	/*获取资源信息*/
20 33
	function getRecourceMe() {
21 34
		$.ajax({
@ -40,7 +53,6 @@ $(document).ready(function () {
40 53
			}
41 54
		});
42 55
	}
43
44 56
	function proList(par) {
45 57
		$.ajax({
46 58
			"url": "/ajax/resResult/researcher",
@ -71,10 +83,6 @@ $(document).ready(function () {
71 83
			}
72 84
		});
73 85
	}
74
75
76
77
78 86
	function orgname(par) {
79 87
		$.ajax({
80 88
			"url": "ajax/org/" + par,
@ -290,7 +298,7 @@ $(document).ready(function () {
290 298
	//校验关键字
291 299
	$("#KeyWord,#KeyWord1").on({
292 300
		focus: function () {
293
			$(this).parents('.form-item').find('.frmconmsg').text("最多可添加20个关键词,每个关键词15字以内");
301
			$(this).parents('.form-item').find('.frmconmsg').text("最多可添加20个关键词,每个关键词15字以内。内容不能为空");
294 302
		},
295 303
		blur: function () {
296 304
			$(this).parents('.form-item').find('.frmconmsg').text("");

+ 9 - 6
js/unPatentList.js

@ -72,7 +72,7 @@ $(document).ready(function () {
72 72
				draftLable = "",
73 73
				oHtml, oLi = '',
74 74
				gl = ''
75
			mg = '';
75
				mg = '';
76 76
			if ($data[i].pic)
77 77
				var imgSrc = "/data/researchResult" + $data[i].pic.split(",")[0];
78 78
			if ($data[i].status == '2') {
@ -96,7 +96,7 @@ $(document).ready(function () {
96 96
				'<ul class="showliTop h2Font clearfix hu2">' +
97 97
				mg +
98 98
				'</ul>' +
99
				'<ul class="showliTop h2Font clearfix hu1">' +
99
				'<ul class="showliTop h2Font  hu1">' +
100 100
				'</ul>' +
101 101
				'</div>' +
102 102
				'</a>' +
@ -109,15 +109,13 @@ $(document).ready(function () {
109 109
			var $oStr = $(oStr);
110 110
			$("#patentList").append($oStr);
111 111
			if ($data[i].status == '1') {
112
				proList($data[i].id, $oStr, $data[i].orgId || '')
113
112
				proList($data[i].id, $oStr, $data[i].orgId,$data[i].subject,$data[i].department || '')
114 113
			}
115 114
			$oStr.find(".editThis").attr("data-state", $data[i].status);
116
117 115
		}
118 116
	}
119 117
120
	function proList(par, $pa, p3) {
118
	function proList(par, $pa, p3,subject,department) {
121 119
		$.ajax({
122 120
			"url": "/ajax/resResult/researcher",
123 121
			"type": "GET",
@ -135,6 +133,11 @@ $(document).ready(function () {
135 133
							dom.push($da[i].id)
136 134
						}
137 135
						$pa.find('.hu2').append('<li>研究者:' + arr.join(',') + '</li>')
136
						$pa.find('.hu2').append('<li>应用领域:' + subject + '</li>')
137
						$pa.find('.hu2').append('<li>所属部门:' + department + '</li>')
138
						$pa.find('.hu2>li').css({'float':'none' , 'margin-bottom':'0px'})
139
						$('.itemListBolck .itemListCon .madiaInfo').css('padding-top','0px')
140
						
138 141
						if (p3)
139 142
							orgname(p3, $pa)
140 143
						$.ajax({

+ 26 - 15
unPatentIssue.html

@ -66,7 +66,16 @@
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="请输入所属部门" />
69 76
 						</li>
77
78
70 79
 						<li>
71 80
 							<div class="aboutTit">所属机构<span class="frmconmsg" id="organization"
72 81
 									style="display:none">50字以内</span></div>
@ -81,17 +90,12 @@
81 90
 								</ul>
82 91
 							</div>
83 92
 						</li>
84
 						<li>
85
 							<div class="aboutTit">所属部门<span class="frmconmsg" id="resourceNamePrompt"
86
 									style="display:none;">50字以内</span></div>
87
 							<input type="text" class="frmtype frmcontype" id="department" value=""
88
 								placeholder="请输入所属部门" />
89
 						</li>
90 93
 						<li class="form-item">
91
 							<div class="aboutTit">行业领域<span class="frmconmsg" id="keyPrompt"></span></div>
94
 							<div class="aboutTit">应用领域<em class="requiredcon">*</em><span class="frmconmsg" id="keyPrompt"></span></div>
92 95
 							<div class="col-w-12" style="position: relative;">
93
 								<input type="text" class="frmcontype oinput" placeholder="请填写成果相关的行业领域,如:制造业、互联网、新材料"
94
 									data-pro="关键词不得超过10个字" data-num="20" data-fontSizeN="15" id="KeyWord" />
96
 								<input type="text" class="frmcontype oinput"
97
 									placeholder="请填写成果相关的应用领域,如:空气净化、致霾气体降解、污水处理、抗菌、自清洁" data-pro="关键词不得超过10个字"
98
 									data-num="20" data-fontSizeN="15" id="KeyWord1" />
95 99
 								<button type="button" class="frmcontype btnModel frmaddG addButton">添加</button>
96 100
 								<div class="form-drop keydrop">
97 101
 									<ul>
@ -100,17 +104,20 @@
100 104
 								</div>
101 105
 							</div>
102 106
 							<div class="form-result keyResult" style="margin-top: -10px;">
103
 								<ul class="ulspace editUlist clearfix" id="keyWordlist">
107
 								<ul class="ulspace editUlist clearfix" id="keyWordlist1">
104 108
 									<!--<li>dd<div class="closeThis"></div></li>-->
105 109
 								</ul>
106 110
 							</div>
107 111
 						</li>
112
113
114
115
108 116
 						<li class="form-item">
109
 							<div class="aboutTit">应用领域<span class="frmconmsg" id="keyPrompt"></span></div>
117
 							<div class="aboutTit">行业领域<span class="frmconmsg" id="keyPrompt"></span></div>
110 118
 							<div class="col-w-12" style="position: relative;">
111
 								<input type="text" class="frmcontype oinput"
112
 									placeholder="请填写成果相关的应用领域,如:空气净化、致霾气体降解、污水处理、抗菌、自清洁" data-pro="关键词不得超过10个字"
113
 									data-num="20" data-fontSizeN="15" id="KeyWord1" />
119
 								<input type="text" class="frmcontype oinput" placeholder="请填写成果相关的行业领域,如:制造业、互联网、新材料"
120
 									data-pro="关键词不得超过10个字" data-num="20" data-fontSizeN="15" id="KeyWord" />
114 121
 								<button type="button" class="frmcontype btnModel frmaddG addButton">添加</button>
115 122
 								<div class="form-drop keydrop">
116 123
 									<ul>
@ -119,11 +126,15 @@
119 126
 								</div>
120 127
 							</div>
121 128
 							<div class="form-result keyResult" style="margin-top: -10px;">
122
 								<ul class="ulspace editUlist clearfix" id="keyWordlist1">
129
 								<ul class="ulspace editUlist clearfix" id="keyWordlist">
123 130
 									<!--<li>dd<div class="closeThis"></div></li>-->
124 131
 								</ul>
125 132
 							</div>
126 133
 						</li>
134
135
136
137
127 138
 						<li>
128 139
 							<div class="aboutTit">非专利成果简介<span class="frmconmsg" id="performance"
129 140
 									style="display:none;">2000字以内</span></div>