Browse Source

修改样式

lyn7568 5 years ago
parent
commit
261020c50c
8 changed files with 65 additions and 38 deletions
  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
			<div class="seeMore displayNone" id="seeMoreResource"><em>查看全部 <span id="resourceNum">0</span>个</em></div>
116
			<div class="seeMore displayNone" id="seeMoreResource"><em>查看全部 <span id="resourceNum">0</span>个</em></div>
117
		</div>
117
		</div>
118
		<div class="mainbox" style="cursor: pointer;" id="goCmpBrief">
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
			<div class="infocon">
120
			<div class="infocon">
121
				<span class="breifinfo" id="breifinfo" style="display: block">
121
				<span class="breifinfo" id="breifinfo" style="display: block">
122
					<p id="breifinfo"></p>
122
					<p id="breifinfo"></p>
1487
			oAjax('/ajax/team/pro', {
1487
			oAjax('/ajax/team/pro', {
1488
				id: tId,
1488
				id: tId,
1489
				"pageSize": rows,
1489
				"pageSize": rows,
1490
				"pageNo": pageNo,
1490
				"pageNo": 30,
1491
			}, 'get', function (res) {
1491
			}, 'get', function (res) {
1492
				if (res.success && res.data) {
1492
				if (res.success && res.data) {
1493
					var data = res.data.data
1493
					var data = res.data.data
1509
								}
1509
								}
1510
							}
1510
							}
1511
						})
1511
						})
1512
1513
						// var paperN = data.total;
1512
						// var paperN = data.total;
1514
						var ExpId = data[i].professor; //传专家id
1513
						var ExpId = data[i].professor; //传专家id
1515
						// var patentN = data[i].secretary;
1514
						// var patentN = data[i].secretary;

+ 6 - 1
e/3.html

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
                                imgL = '/images/org/' + StrData.id + '.jpg'
547
                                imgL = '/images/org/' + StrData.id + '.jpg'
545
                            }
548
                            }
546
                            var add = document.createElement("li");
549
                            var add = document.createElement("li");
550
                            add.setAttribute("data-id", StrData.id);
551
547
                            add.className =
552
                            add.className =
548
                                "mui-table-view-cell flexCenter OflexCenter";
553
                                "mui-table-view-cell flexCenter OflexCenter";
549
                            var itemlist =
554
                            var itemlist =

+ 5 - 6
js/recommend.js

220
						itemlist += resIM
220
						itemlist += resIM
221
						itemlist += '<div class="centercon centercon2">';
221
						itemlist += '<div class="centercon centercon2">';
222
						itemlist += '<p class="h1font ellipsisSty">' + $info[i].name + '</p>';
222
						itemlist += '<p class="h1font ellipsisSty">' + $info[i].name + '</p>';
223
						itemlist += '<p class="h2font ellipsisSty ">' + '<span class="researchers"></span></p>';
223
						itemlist += '<p class="h2font ellipsisSty ">' + subject + '<span class="researchers"></span></p>';
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
						itemlist += '</div></a></li>';
226
						itemlist += '</div></a></li>';
228
						var $itemlist = $(itemlist);
227
						var $itemlist = $(itemlist);
229
						$("#" + aimId).append($itemlist)
228
						$("#" + aimId).append($itemlist)
230
						// queryResearcher($info[i].id, $itemlist)
229
						queryResearcher($info[i].id, $itemlist)
231
						if ($info[i].orgId) {
230
						if ($info[i].orgId) {
232
							queryReseOrgName($info[i].orgId, $itemlist)
231
							queryReseOrgName($info[i].orgId, $itemlist)
233
						}
232
						}
325
						for (var i = 0; i < $data.data.length; i++) {
324
						for (var i = 0; i < $data.data.length; i++) {
326
							arr.push($data.data[i].name)
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
	recommendUnpatent()
404
	recommendUnpatent()
406
	patentListVal(true, true)
405
	patentListVal(true, true)
407
	navmenu();
406
	navmenu();
408
	// hotUnpatentList();
407
	hotUnpatentList();
409
408
410
	if (userid && userid != null && userid != "null") {
409
	if (userid && userid != null && userid != "null") {
411
		$(".privateInfo .onlogined").removeClass("displayNone")
410
		$(".privateInfo .onlogined").removeClass("displayNone")

+ 1 - 1
js/teamManage.js

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

+ 2 - 0
js/unPatentImport.js

121
							'<div class="madiaInfo">' +
121
							'<div class="madiaInfo">' +
122
							'<p class="h1Font ellipsisSty">' + $data.name + '</p>' +
122
							'<p class="h1Font ellipsisSty">' + $data.name + '</p>' +
123
							'<p class="h2Font ellipsisSty">' + oSpec + '</p>' +
123
							'<p class="h2Font ellipsisSty">' + oSpec + '</p>' +
124
							'<p class="h2Font ellipsisSty">应用领域:' + $data.subject + '</p>' +
125
							'<p class="h2Font ellipsisSty">所属部门:' + $data.department + '</p>' +
124
							'<p class="h2Font ellipsisSty">' + '</p>' +
126
							'<p class="h2Font ellipsisSty">' + '</p>' +
125
							'</div>' +
127
							'</div>' +
126
							'</a>' +
128
							'</a>' +

+ 14 - 6
js/unPatentIssue.js

16
	$('#KeyWord3').blur(function () {
16
	$('#KeyWord3').blur(function () {
17
		$('#keyPrompt').html('')
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
	function getRecourceMe() {
33
	function getRecourceMe() {
21
		$.ajax({
34
		$.ajax({
40
			}
53
			}
41
		});
54
		});
42
	}
55
	}
43
44
	function proList(par) {
56
	function proList(par) {
45
		$.ajax({
57
		$.ajax({
46
			"url": "/ajax/resResult/researcher",
58
			"url": "/ajax/resResult/researcher",
71
			}
83
			}
72
		});
84
		});
73
	}
85
	}
74
75
76
77
78
	function orgname(par) {
86
	function orgname(par) {
79
		$.ajax({
87
		$.ajax({
80
			"url": "ajax/org/" + par,
88
			"url": "ajax/org/" + par,
290
	//校验关键字
298
	//校验关键字
291
	$("#KeyWord,#KeyWord1").on({
299
	$("#KeyWord,#KeyWord1").on({
292
		focus: function () {
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
		blur: function () {
303
		blur: function () {
296
			$(this).parents('.form-item').find('.frmconmsg').text("");
304
			$(this).parents('.form-item').find('.frmconmsg').text("");

+ 9 - 6
js/unPatentList.js

72
				draftLable = "",
72
				draftLable = "",
73
				oHtml, oLi = '',
73
				oHtml, oLi = '',
74
				gl = ''
74
				gl = ''
75
			mg = '';
75
				mg = '';
76
			if ($data[i].pic)
76
			if ($data[i].pic)
77
				var imgSrc = "/data/researchResult" + $data[i].pic.split(",")[0];
77
				var imgSrc = "/data/researchResult" + $data[i].pic.split(",")[0];
78
			if ($data[i].status == '2') {
78
			if ($data[i].status == '2') {
96
				'<ul class="showliTop h2Font clearfix hu2">' +
96
				'<ul class="showliTop h2Font clearfix hu2">' +
97
				mg +
97
				mg +
98
				'</ul>' +
98
				'</ul>' +
99
				'<ul class="showliTop h2Font clearfix hu1">' +
99
				'<ul class="showliTop h2Font  hu1">' +
100
				'</ul>' +
100
				'</ul>' +
101
				'</div>' +
101
				'</div>' +
102
				'</a>' +
102
				'</a>' +
109
			var $oStr = $(oStr);
109
			var $oStr = $(oStr);
110
			$("#patentList").append($oStr);
110
			$("#patentList").append($oStr);
111
			if ($data[i].status == '1') {
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
			$oStr.find(".editThis").attr("data-state", $data[i].status);
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
		$.ajax({
119
		$.ajax({
122
			"url": "/ajax/resResult/researcher",
120
			"url": "/ajax/resResult/researcher",
123
			"type": "GET",
121
			"type": "GET",
135
							dom.push($da[i].id)
133
							dom.push($da[i].id)
136
						}
134
						}
137
						$pa.find('.hu2').append('<li>研究者:' + arr.join(',') + '</li>')
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
						if (p3)
141
						if (p3)
139
							orgname(p3, $pa)
142
							orgname(p3, $pa)
140
						$.ajax({
143
						$.ajax({

+ 26 - 15
unPatentIssue.html

66
 									<!--<li>dd<div class="closeThis"></div></li>-->
66
 									<!--<li>dd<div class="closeThis"></div></li>-->
67
 								</ul>
67
 								</ul>
68
 							</div>
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
 						</li>
76
 						</li>
77
78
70
 						<li>
79
 						<li>
71
 							<div class="aboutTit">所属机构<span class="frmconmsg" id="organization"
80
 							<div class="aboutTit">所属机构<span class="frmconmsg" id="organization"
72
 									style="display:none">50字以内</span></div>
81
 									style="display:none">50字以内</span></div>
81
 								</ul>
90
 								</ul>
82
 							</div>
91
 							</div>
83
 						</li>
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
 						<li class="form-item">
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
 							<div class="col-w-12" style="position: relative;">
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
 								<button type="button" class="frmcontype btnModel frmaddG addButton">添加</button>
99
 								<button type="button" class="frmcontype btnModel frmaddG addButton">添加</button>
96
 								<div class="form-drop keydrop">
100
 								<div class="form-drop keydrop">
97
 									<ul>
101
 									<ul>
100
 								</div>
104
 								</div>
101
 							</div>
105
 							</div>
102
 							<div class="form-result keyResult" style="margin-top: -10px;">
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
 									<!--<li>dd<div class="closeThis"></div></li>-->
108
 									<!--<li>dd<div class="closeThis"></div></li>-->
105
 								</ul>
109
 								</ul>
106
 							</div>
110
 							</div>
107
 						</li>
111
 						</li>
112
113
114
115
108
 						<li class="form-item">
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
 							<div class="col-w-12" style="position: relative;">
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
 								<button type="button" class="frmcontype btnModel frmaddG addButton">添加</button>
121
 								<button type="button" class="frmcontype btnModel frmaddG addButton">添加</button>
115
 								<div class="form-drop keydrop">
122
 								<div class="form-drop keydrop">
116
 									<ul>
123
 									<ul>
119
 								</div>
126
 								</div>
120
 							</div>
127
 							</div>
121
 							<div class="form-result keyResult" style="margin-top: -10px;">
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
 									<!--<li>dd<div class="closeThis"></div></li>-->
130
 									<!--<li>dd<div class="closeThis"></div></li>-->
124
 								</ul>
131
 								</ul>
125
 							</div>
132
 							</div>
126
 						</li>
133
 						</li>
134
135
136
137
127
 						<li>
138
 						<li>
128
 							<div class="aboutTit">非专利成果简介<span class="frmconmsg" id="performance"
139
 							<div class="aboutTit">非专利成果简介<span class="frmconmsg" id="performance"
129
 									style="display:none;">2000字以内</span></div>
140
 									style="display:none;">2000字以内</span></div>