Home Explore Help
Register Sign In
jiapeng
/
portal-front
Watch 3
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Commits 1059 Releases 0 Wiki
Browse Source

Merge remote-tracking branch 'origin/dev' into test

luyanan 7 years ago
parent
f228bf7541 d1ea6b78eb
commit
1f81b95bc9
13 changed files with 661 additions and 23 deletions
Split View Show Diff Stats
  1. 2 2
      cmp-portal/js/articalIssue.js
  2. 7 6
      css/workspace.css
  3. 286 0
      information-brow.html
  4. 1 1
      information.html
  5. 2 2
      js/articalIssue.js
  6. 2 2
      js/cmpInforShow.js
  7. 1 0
      js/common.js
  8. 1 1
      js/consultSure.js
  9. 351 0
      js/demand.js
  10. 2 4
      js/loginNew.js
  11. 3 2
      js/needList.js
  12. 2 2
      js/tidings.js
  13. 1 1
      js/workindex.js

+ 2 - 2
cmp-portal/js/articalIssue.js
View File 

@ -5,7 +5,7 @@ $(function() {
5 5 
	var articleId;
6 6 
	var fa = false;
7 7 
    var orgId = $.cookie("orgId");
8 
    var colMgr = $.cookie("colMgr");
8 
    var colMgr = $.cookie("colMgr");
9 9 
    var hbur,hburEnd;
10 10 
  	var pr,prEnd;
11 11 
  	var re,reEnd;

@ -666,4 +666,4 @@ function getAttrId() {
666 666 
		$(this).parent("ul").html("")
667 667 
	})
668 668 
}
669 
});
669 
});

+ 7 - 6
css/workspace.css
View File 

@ -198,8 +198,8 @@ body,html{background: #f4f6f8;}
198 198 
	width:650px;
199 199 
	line-height: 24px;
200 200 
	display:block;
201 
	white-space:nowrap;
202 
	overflow:hidden;
201 
	white-space:nowrap;
202 
	overflow:hidden;
203 203 
	text-overflow:ellipsis;
204 204 
}
205 205 
@ -259,8 +259,8 @@ body,html{background: #f4f6f8;}
259 259 
.dialogcontain .dialoginfo .dialogtitTopic{ font-weight: bold;font-size:18px;}
260 260 
.dialogcontain .dialoginfo .thanksblock{/*width:400px; margin:auto;*/}
261 261 
/*.dialogcontain .dialoginfo .thankbox{ margin:2px 6px;}*/
262 
.dialogcontain .dialoginfo .evadbox{ overflow:hidden;  /*position: relative; width:164px;*/}
263 
/*.dialogcontain .dialoginfo .evadbox .evadegree{position: absolute;right: 2px;top: 2px;}
262 
.dialogcontain .dialoginfo .evadbox{ overflow:hidden;  /*position: relative; width:164px;*/}
263 
/*.dialogcontain .dialoginfo .evadbox .evadegree{position: absolute;right: 2px;top: 2px;}
264 264 
.dialogcontain .dialoginfo .evamargin{ margin:auto;}*/
265 265
266 266 
/*.dialogcontain .dialoginfo .evadtit{ margin:2px 6px;}*/
 
@ -387,12 +387,13 @@ border-color:#FF9900; color:#FFFFFF}
387 387 
.attentsCon .listtit3{font-size: 13px;line-height:18px; color: #888888;}/*小标题*/
388 388 
.attentList{padding:10px;display: none;}
389 389 
.attentList:first-child{display: block;}
390
390 391 
.attentList>li{padding: 10px 20px;margin:0 -20px;position: relative;}
391 392 
.attentList>li .proinfor{display: block;}
392 393 
.attentList>li:hover{background: #EFEFEF;}
393 394 
.attentList>li:first-child{margin-top:0}
394 395 
.attentList>li:after{position: absolute;bottom: 0;right: 0;left:126px;height: 1px;content: '';background-color: #c8c7cc;
395 
    -webkit-transform: scaleY(.5);
396 
    -webkit-transform: scaleY(.5);
396 397 
            transform: scaleY(.5);}
397 398 
.attentList>li:last-child:after{background: none;}
398 399 
@ -401,4 +402,4 @@ border-color:#FF9900; color:#FFFFFF}
401 402 
.resAreaCon .attentList{display: block;}
402 403 
.resAreaCon .attentList li:hover{background:none;}
403 404 
.resAreaCon .attentList li:after{left:86px;}*/
404 
.showli>li{font-size: 14px;color: #888;margin: 6px 0;padding-right:16px;float:left;text-overflow:ellipsis;white-space: nowrap;overflow: hidden;}
405 
.showli>li{font-size: 14px;color: #888;margin: 6px 0;padding-right:16px;float:left;text-overflow:ellipsis;white-space: nowrap;overflow: hidden;}

+ 286 - 0
information-brow.html
View File 

@ -0,0 +1,286 @@
1 
<!DOCTYPE html>
2 
<html>
3
4 
	<head>
5 
		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
6 
		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
7 
		<meta http-equiv="X-UA-Compatible" content="IE=edge">
8 
		<title>浏览用户信息-科袖网</title>
9 
		<link rel="shortcut icon" type="image/x-icon" href="images/favicon.png" media="screen" />
10 
		<link href="css/bootstrap.min.css" rel="stylesheet">
11 
		<link rel="stylesheet" href="css/reset.css" />
12 
		<link rel="stylesheet" type="text/css" href="css/style.css" />
13 
		<link type="text/css" href="css/common.css" rel="stylesheet">
14 
		<link type="text/css" href="css/index.css" rel="stylesheet">
15 
		<link type="text/css" href="css/workspace.css" rel="stylesheet">
16 
		<link type="text/css" href="css/popup.css" rel="stylesheet">
17 
		<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
18 
	</head>
19
20 
	<body>
21 
		<!--研究方向详情页面-->
22 
		<div class="blackcover resAreaCover" style="display: none;">
23 
			<div class="attentionBox">
24 
				<div class="researchArea" id="subArea">研究方向文字很长，之前页面显示不下，在这里就能显示完整，全部都显示出来</div>
25 
				<div class="attentsCon resAreaCon">
26 
					<p class="littip">以下用户认可了他的研究</p>
27 
					<ul class="attentList">
28 
					</ul>
29 
				</div>
30 
				<div style="height: 20px;"></div>
31 
				<span class="workclose" id="workclose"></span>
32 
			</div>
33 
		</div>
34 
		<!--头部-->
35 
		<header id="header">
36 
			<script src="js/header.js"></script>
37 
		</header>
38 
		<div id="container">
39 
			<div class="content" style="padding-bottom:120px;">
40 
				<div class="information-head clearfix">
41 
					<div class="head-left userRadius">
42 
						<a><img id="headImage"></a>
43 
					</div>
44 
					<div class="head-center">
45 
						<div class="infor-browse">
46 
							<a class="named proName" id="nameS"></a>
47 
							<a class="authiconNew proModify" style="top:0"></a>
48 
							<div class="position proPosition"><span id="office"></span ><span id="titleS"></span ></div>
49 
							<div class="science proScience"><span id="industryS"></span ><span id="orgNameS"></span ></div>
50 
							<div class="address proAddress" id="address"></div>
51 
						</div>
52 
						<div class="coulstbtn floatL" style="position: absolute;bottom: 20px;">
53 
							<span id="conbtn">咨询</span>
54 
							<span class="attentBtn" id="attentBtn"><em></em><i>关注</i></span>
55 
							<span class="shareWeixin" style="display:inline-block;position: relative;">分享至微信
56 
								<div class="shareCode clearfix">
57 
									<div class="floatL" id="qrcode"></div>
58 
									<div class="shareWord floatR">
59 
										<p>打开微信“扫一扫”，<br/>打开网页后点击屏幕右上角“分享”按钮</p>
60 
									</div>
61 
								</div>
62 
							</span>
63 
						</div>
64
65 
						</div>
66 
						<div class="head-right headRadius">
67 
							<a id="organ"><img id="orgImage"></a>
68 
						</div>
69 
					</div>
70 
					<div class="information-content">
71 
						<div class="content-left">
72 
							<div class="menublock">
73 
								<div class="left-title">个人信息</div>
74 
								<a href="#infor1" class="subsidebar">个人简介</a>
75 
								<a href="#infor2" class="subsidebar">学术领域</a>
76 
								<a href="#infor3" class="subsidebar">研究方向</a>
77 
								<a href="#infor4" class="subsidebar">应用行业</a>
78 
								<a href="#infor5" class="subsidebar">教育背景</a>
79 
								<a href="#infor6" class="subsidebar">工作经历</a>
80 
								<a href="#infor7" class="subsidebar">项目经历</a>
81 
								<a href="#infor8" class="subsidebar">著作、论文、文章</a>
82 
								<a href="#infor9" class="subsidebar">专利</a>
83 
								<a href="#infor10" class="subsidebar">荣誉及奖项</a>
84 
							</div>
85 
							<div class="menublock yesshow" style="display: none;">
86 
								<div class="left-title">合作机会</div>
87 
								<a href="#infor11" class="subsidebar">研发资源</a>
88 
								<a href="#infor12" class="subsidebar">合作历史及评价</a>
89 
							</div>
90 
						</div>
91 
						<div class="content-right">
92 
							<div class="right-box introduction" style="display: none;" id="reA">
93 
								<div class="right-title"><span>科研文章</span></div>
94 
								<div class="infor-browse">
95 
									<div class="shareabout shareabout1" style="margin: 0 30px;">
96 
										<div class="sharesrcbox" style="width:642px;">
97 
											<div class="sharescrollbox Acrollbox">
98 
												<ul class="shareshow otherRes clearfix" id="reachArticle">
99
100 
												</ul>
101 
											</div>
102 
										</div>
103 
										<span class="resouprev resoubtn articalbtn"></span>
104 
										<span class="resounext resoubtn articalbtn"></span>
105 
									</div>
106 
								</div>
107 
							</div>
108 
							<div class="right-box introduction">
109 
								<div class="right-title"><span>个人简介</span></div>
110 
								<div class="infor-browse">
111 
									<div class="editbox" id="descpS" style="width:auto; margin:0 35px;">
112
113 
									</div>
114 
								</div>
115
116 
							</div>
117 
							<div class="right-box introduction">
118 
								<div class="right-title"><span>学术领域</span></div>
119 
								<div class="infor-browse">
120 
									<div class="listbox btn-marL" id="subjectShow">
121
122 
									</div>
123 
									<div class="clear"></div>
124 
								</div>
125 
							</div>
126
127 
							<div class="right-box introduction">
128 
								<div class="right-title"><span>研究方向</span> </div>
129 
								<div class="infor-browse" id="researchAreaShow">
130
131 
								</div>
132 
								<div class="clear"></div>
133 
							</div>
134
135 
							<div class="right-box introduction">
136 
								<div class="right-title"><span>应用行业</span> </div>
137 
								<div class="infor-browse">
138 
									<ul class="edu-about showList showList2" id="industryShow">
139
140 
									</ul>
141 
								</div>
142 
							</div>
143
144 
							<div class="right-box introduction">
145 
								<div class="right-title"><span>教育背景</span> </div>
146 
								<div class="infor-browse">
147 
									<ul class="edu-about showList" id="eduBgShow">
148
149 
									</ul>
150 
								</div>
151 
							</div>
152
153 
							<div class="right-box introduction">
154 
								<div class="right-title"><span>工作经历</span> </div>
155 
								<div class="infor-browse">
156 
									<ul class="edu-about showList" id="timeJobShow">
157
158 
									</ul>
159 
								</div>
160 
							</div>
161
162 
							<div class="right-box introduction">
163 
								<div class="right-title"><span>项目经历</span> </div>
164 
								<div class="infor-browse">
165 
									<ul class="edu-about showList" id="projectShow">
166 
										 <!--<li class="paddingSpace">
167 
													<div class="h4Font h4tit">著作名称<small class="h6Font"> 2016.09 - 2016.09</small></div>
168 
													<div class="h5Font pIndent">xiangximianshu 纤细面熟xiangxixiangximianshu 纤细面熟miansxiangximianshu 纤细面熟huxiaxiangximianshu 纤细面熟ngximianshu 纤细面熟 纤细面熟</div>
169 
												</li> -->
170 
									</ul>
171 
								</div>
172 
							</div>
173
174 
							<div class="right-box introduction">
175 
								<div class="right-title"><span>著作、论文、文章</span> </div>
176 
								<div class="infor-browse">
177 
									<ul class="edu-about showList" id="paperShow">
178
179 
									</ul>
180 
								</div>
181 
							</div>
182
183 
							<div class="right-box introduction">
184 
								<div class="right-title"><span>专利</span> </div>
185 
								<div class="infor-browse">
186 
									<ul class="edu-about showList" id="patentShow">
187
188 
									</ul>
189 
								</div>
190 
							</div>
191
192 
							<div class="right-box introduction">
193 
								<div class="right-title"><span>荣誉及奖项</span> </div>
194 
								<div class="infor-browse">
195 
									<ul class="edu-about showList" id="honorShow">
196
197 
									</ul>
198 
								</div>
199 
							</div>
200
201 
							<div class="right-box introduction " style="display: none;" id="resoulis">
202 
								<div class="right-title"><span>研发资源</span> </div>
203 
								<div class="infor-browse">
204 
									<div class="shareabout shareabout1" style="margin: 0 30px;">
205 
										<div class="sharesrcbox" style="width:642px;">
206 
											<div class="sharescrollbox" id="sharescrollbox">
207
208 
											</div>
209 
										</div>
210 
										<span class="resouprev resoubtn resoubtn2"></span>
211 
										<span class="resounext resoubtn resoubtn2"></span>
212 
									</div>
213 
								</div>
214 
							</div>
215 
							<div class="right-box introduction yesshow" style="display: none;">
216 
								<div class="right-title"><span>合作历史及评价</span> </div>
217 
								<div class="infor-browse">
218 
									<div class="shareabout shareabout2">
219
220 
									</div>
221
222 
								</div>
223
224 
							</div>
225
226 
						</div>
227 
					</div>
228 
				</div>
229 
			</div>
230 
			<!--尾部-->
231 
			<footer class="footerblock">
232 
				<script type="text/javascript" src="js/footer.js"></script>
233 
			</footer>
234 
			<!--咨询模块按钮入口-->
235 
			<div class="coulstblock">
236 
				<div class="coulstbox">
237 
					<div class="prohead userRadius floatL"><img src="images/default-photo.jpg" width="100%" height="100%" id="foot_proimg"></div>
238 
					<div class="proinfomation floatL">
239 
						<div class="clearfix">
240 
							<a class="authobject named" id="foot_proname"></a>
241 
							<em class="authiconNew" id="foot_promodify" style="top: 3px;"></em>
242 
						</div>
243 
						<div class="position"><span id="foot_protitle"></span><span></span ></div>
244 
			<div class="science"><span id="foot_prodepar"></span><span id="foot_proorgname"></span ><span class="address" id="foot_proaddress"></span></div>
245 
					</div>
246 
					<div class="coulstbtn floatR">
247 
						<span id="conbtn">咨询</span>
248 
						<span class="attentBtn" id="attentBtnFoot"><em></em><i>关注</i></span>
249 
					</div>
250 
				</div>
251 
			</div>
252 
			<script type="text/javascript" src="js/jquery.cookie.js"></script>
253 
			<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
254 
			<script type="text/javascript" src="js/weixinshare/qrcode.min.js"></script>
255 
			<script type="text/javascript" src="js/common.js"></script>
256 
			<script type="text/javascript" src="js/popup.js"></script>
257 
			<script type="text/javascript" src="js/information.brow.js"></script>
258 
			<script type="text/javascript" src="js/my-attention.js"></script>
259 
			<script>
260 
				//合作历史及评价------等级星
261 
				$(".evastar").bind("click", function() {
262 
					$(this).css("background-position", "0 0");
263 
				})
264
265 
				//微信分享
266 
				var qrcode = new QRCode(document.getElementById("qrcode"), {
267 
					width: 100,
268 
					height: 100
269 
				});
270
271 
				function makeCode() {
272 
					var hurl = window.location.host;
273 
					var professorId = GetQueryString("professorId");
274 
					var elurl = "http://" + hurl + "/e/p.html?id=" + professorId;
275 
					qrcode.makeCode(elurl);
276 
				}
277 
				makeCode();
278
279 
				//分享按钮和关注按钮
280 
				$('.shareWeixin').hover(function() {
281 
					$('.shareCode').stop(true, false).fadeToggle();
282 
				});
283 
			</script>
284 
	</body>
285
286 
</html>

+ 1 - 1
information.html
View File 

@ -436,4 +436,4 @@
436 436 
</script>
437 437 
</body>
438 438
439 
</html>
439 
</html>

+ 2 - 2
js/articalIssue.js
View File 

@ -6,7 +6,7 @@ $(function() {
6 6 
	var $data = {};
7 7 
	var articleId;
8 8 
	var fa = false;
9 
  	var userid = $.cookie("userid");
9 
  	var userid = $.cookie("userid");
10 10 
  	var hbur,hburEnd;
11 11 
  	var pr,prEnd;
12 12 
  	var re,reEnd;

@ -513,4 +513,4 @@ $(function() {
513 513 
			}
514 514 
		})
515 515 
	}
516 
});
516 
});

+ 2 - 2
js/cmpInforShow.js
View File 

@ -303,7 +303,7 @@ $(function() {
303 303 
							if(data.data.data[i].articleImg) {
304 304 
								madiaHead = '/data/article/' + data.data.data[i].articleImg;
305 305 
							}
306 
							var sowU=""
306 
							var sowU='';
307 307 
							if(data.data.data[i].pageViews!=0){
308 308 
								if(data.data.data[i].articleAgree!=0){
309 309 
									sowU='<li><span>阅读量 '+data.data.data[i].pageViews+'</span></li><li><span>赞 '+data.data.data[i].articleAgree+'</span></li>'
 
@ -763,4 +763,4 @@ $(function() {
763 763 
	})
764 764
765 765
766 
})
766 
})

+ 1 - 0
js/common.js
View File 

@ -1138,6 +1138,7 @@ var r64 = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D",
1138 1138 
			return out;
1139 1139 
		}
1140 1140
1141
1141 1142 
//发现上方轮播
1142 1143 
var bannerRotate = {// banner rotating
1143 1144 
	_time: 3000,

+ 1 - 1
js/consultSure.js
View File 

@ -200,4 +200,4 @@ function submtbut(consultId, sendId, newtemp) {
200 200 
			$.MsgBox.Alert('提示', "服务器链接超时");
201 201 
		}
202 202 
	});
203 
}
203 
}

+ 351 - 0
js/demand.js
View File 

@ -0,0 +1,351 @@
1 
//用户id
2 
var userid = $.cookie("userid");
3
4 
//getConsultData参数
5 
var pageSize = 5;
6 
var pageNo, isbind, status, timeType, sortType;
7
8 
getMyData(pageSize, 1, true, 0, 1, 0);
9 
myRequirePullDownMenu();
10
11 
function getMyData(pageSize, pageNo, isbind, status, timeType, sortType) {
12 
	var params = {
13 
		"consultantId": userid, //专家ID
14 
		"status": status, //查询状态 0-全部，1-进行中，2-未感谢，3-未评价，4-已完成， 可以不传，默认为0
15 
		"timeType": timeType, //排序目的 0-按发起时间，1-按最后回复时间，2-按完成时间 默认为0
16 
		"sortType": sortType, //排序目的 0-倒序，1-正序 默认为0
17 
		"pageSize": pageSize, //每页记录数 默认为5
18 
		"pageNo": pageNo //当前页码 默认为1
19 
	};
20
21 
	$.ajax({
22 
		url: "/ajax/consult/pqCon", //收到回复接口
23 
		type: "get",
24 
		data: params,
25 
		dataType: "json",
26 
		contentType: "application/x-www-form-urlencoded",
27 
		success: function(response) {
28 
			//数据为空时
29 
			if(response["data"]["data"] == null || response["data"]["data"] == undefined || response["data"]["data"] == "") {
30 
				return;
31 
			} else {
32 
				//拿到收到回复数据
33 
				var replyStr;
34 
				var allData = response.data;
35 
				var myData = allData.data;
36
37 
				$("#workContainer2").html("");
38 
				if(myData.length != 0 && myData.length != null) {
39 
					replyStr = handleData(myData, "consultId", "lookBtn");
40 
					$("#workContainer2").append(replyStr);
41
42 
				} else {
43 
					return false;
44 
				};
45 
				//分页
46 
				if(isbind == true) {
47 
					$(".getReplyPage").createPage({
48 
						pageCount: Math.ceil(allData.total / pageSize),
49 
						current: allData.pageNo,
50 
						backFn: function(p) {
51 
							getMyData(pageSize, p, false, status, timeType, sortType);
52 
						}
53 
					});
54 
				}
55
56 
			}
57
58 
		},
59 
		error: function(response) {
60 
			//收到回复错误返回
61 
			$.MsgBox.Alert('提示', "收到回复数据请求失败");
62 
		},
63
64 
	});
65 
};
66
67 
//data:需要处理的数据，htmlStr:页面中需要的html字符串拼接，
68 
//attrParams:数据中不同的参数比如:收到咨询是professorId，收到答复：consultantId
69 
function handleData(data, attrParams, btnCls) {
70 
	var htmlStr = '';
71 
	var title,
72 
		office,
73 
		orgName,
74 
		department,
75 
		address;
76
77 
	for(var i = 0; i < data.length; i++) {
78 
		//text:回复/查看，state:进行中/已完成/未评价，photoUrl：头像地址，proModify：专家认证
79 
		var text, state, stateStyle, photoUrl, proModify;
80 
		var modifyclass = '';
81 
		if(data[i]["professor"]) { //过滤没有专家对象的数据
82
83 
			if(data[i]["consultStatus"] == 0) {
84 
				state = "进行中";
85 
				stateStyle = 'status-1';
86 
				text = '回复';
87 
			} else if(data[i]["consultStatus"] == 1) {
88 
				text = "查看";
89 
				state = "已完成";
90 
				stateStyle = 'status-3';
91 
				if(attrParams == 'consultId') {
92 
					if(data[i]["assessStatus"] == 0) {
93 
						state = "待评价";
94 
						stateStyle = 'status-2';
95 
					}
96 
				}
97 
			} else if(data[i]["consultStatus"] == 2) {
98 
				text = "查看";
99 
				state = "待回复";
100 
				stateStyle = 'status-4';
101 
			} else if(data[i]["consultStatus"] == 3) {
102 
				text = "查看";
103 
				state = "被谢绝";
104 
				stateStyle = 'status-5';
105 
			} else if(data[i]["consultStatus"] == undefined) {
106 
				text = "";
107 
				state = "";
108 
			}
109
110 
			//专家头像
111 
			if(data[i]["professor"]["hasHeadImage"] == 0) {
112 
				photoUrl = "images/default-photo.jpg"
113
114 
			} else {
115 
				photoUrl = "images/head/" + data[i]["professor"]["id"] + "_l.jpg"
116
117 
			};
118 
			//认证
119 
			//			if(data[i]["professor"]["authentication"] == true){
120 
			//				proModify = "display:inline-block;"
121 
			//			}else{
122 
			//				proModify = "display:none;"
123 
			//			}
124
125 
			if(data[i]["professor"].authType) { //专家
126 
				modifyclass = 'authicon authicon-cu';
127
128 
			} else { //普通用户
129 
				if(data[i]["professor"].authStatus == 3) {
130 
					if(data[i]["professor"].authentication == 1) { //科研工作者
131 
						modifyclass = "authicon2 authicon-mana";
132
133 
					} else if(data[i]["professor"].authentication == 2) { //企业专家
134 
						modifyclass = "authicon2 authicon-staff";
135
136 
					} else { //学生
137 
						modifyclass = "authicon2 authicon-stu";
138 
					}
139 
				}
140 
			};
141 
			//未读消息
142 
			var unread = unreadConsultFn(userid, data[i]["consultId"], i);
143
144 
			htmlStr += "<div class='workselectitem' id='" + data[i]["consultId"] + "' >" +
145 
				"<table width='100%'><tbody><tr><td width='14%' class='messagebox'>" +
146 
				"<a class='workhead workitimg headRadius'>" +
147 
				"<img class='headPhoto' src='" + photoUrl + "'  width='100%' height='100%'>" +
148 
				"</a>" +
149 
				"<span class='msgprompt showUnreadMsg' style='" + unread.style + "' id='" + data[i]["consultId"] + "'>" + unread.unreadCount + "</span>" +
150 
				"</td>" +
151 
				"<td style='position:relative;top:20px;' width='86%'>" +
152 
				"<div class='workinfor worksitcon'><h4><a class='named' id='nameS'> " + data[i]["professor"]["name"] + " </a>" +
153 
				"<a class='modifyicon " + modifyclass + "'></a><input type='text' class='assessStar' value='" + data[i]["assessStar"] + "' style='display: none;'></h4><h6 class='h3Font'>";
154
155 
			if(data[i]["professor"]["title"]) {
156 
				htmlStr += "<span>" + data[i]["professor"]["title"] + "</span>, ";
157 
			};
158 
			if(data[i]["professor"]["office"]) {
159 
				if(data[i]["professor"]["orgName"] || data[i]["professor"]["department"]) {
160 
					htmlStr += "<span>" + data[i]["professor"]["office"] + "</span>, ";
161 
				} else {
162 
					htmlStr += "<span>" + data[i]["professor"]["office"] + "</span>";
163 
				}
164
165 
			};
166 
			if(data[i]["professor"]["orgName"]) {
167 
				if(data[i]["professor"]["department"]) {
168 
					htmlStr += "<span>" + data[i]["professor"]["orgName"] + "</span>, ";
169 
				} else {
170 
					htmlStr += "<span>" + data[i]["professor"]["orgName"] + "</span>";
171 
				}
172
173 
			};
174 
			if(data[i]["professor"]["department"]) {
175 
				htmlStr += "<span>" + data[i]["professor"]["department"] + "</span>";
176 
			};
177 
			if(data[i]["professor"]["address"]) {
178 
				htmlStr += ' | ' + "<span>" + data[i]["professor"]["address"] + "</span>";
179 
			};
180 
			htmlStr += "</h6><h6 style='position:relative;'>" +
181 
				"<div class='titList'>咨询主题：<em class='h4Font'> " + data[i]["consultTitle"] + "  </em></div>" +
182 
				"<span class='lasttime rightTime'>" + lastReplyFn(userid, data[i]["consultId"])["lastReplyTime"] + "</span>" +
183
184 
				"<div style='height:70px;'><p class='rebackcon lastReplyCon' >" + lastReplyFn(userid, data[i]["consultId"])["lastReplyCon"] + "</p></div>" +
185 
				"</h6></div>" +
186 
				"<div class='workhandle'>" +
187 
				"<div class='rightopert floatR'>" +
188 
				"<span   attrP='" + attrParams + "' class='replybtn " + btnCls + "' id='" + data[i]["consultId"] + "' consultStatus='" + data[i]["consultStatus"] + "' assess='" + data[i]["assessStatus"] + "' thanks='" + data[i]["thanksStatus"] +
189 
				"' onclick='clickLookBtn2(\"" + userid + "\",\"" + attrParams + "\",\"" + data[i]["consultId"] + "\"," + data[i]["consultStatus"] + "," + data[i]["assessStatus"] + "," + data[i]["thanksStatus"] + ");'>" +
190 
				text +
191 
				"</span>" +
192 
				"<span class='moreopert complain'>...</span>" +
193 
				"<ul class='moreopertbtn'>" +
194 
				"<li>投诉</li>" +
195 
				"</ul>" +
196 
				"</div>" +
197 
				"<div class='leftstate floatR'>" +
198 
				"<span class='coultstate  " + stateStyle + "'><i>" + state + "</i></span>" +
199 
				"</div>" +
200 
				"<div class='leftstate floatR'>" +
201 
				"<span class='coultstate coulstAim status-4'><i>" + data[i]["consultType"] + "</i></span>" +
202 
				"</div>" +
203 
				"</div>" +
204 
				"</td>" +
205 
				"</tr></tbody></table>" +
206 
				"</div>";
207
208 
		}
209
210 
	};
211
212 
	return htmlStr;
213 
};
214
215 
//未读信息接口
216 
function unreadConsultFn(senderId, consultId, i) {
217 
	var unreadCount, style;
218 
	var params = {
219 
		"senderId": senderId, //发送者ID
220 
		"consultId": consultId //咨询ID
221 
	};
222 
	$.ajax({
223 
		url: "/ajax/tidings/qaNotReadTidings",
224 
		type: "get",
225 
		async: false,
226 
		data: params,
227 
		success: function(response) {
228 
			unreadCount = response["data"];
229 
			console.log()
230 
			if(unreadCount == 0) {
231 
				style = "display:none;"
232 
			} else {
233 
				style = "display:block;"
234
235 
			}
236 
		},
237 
		error: function(error) {
238 
			$.MsgBox.Alert('提示', "未读消息请求失败");
239 
		}
240
241 
	});
242 
	return {
243 
		"unreadCount": unreadCount,
244 
		"style": style
245 
	}
246
247 
};
248
249 
//列表最后回复
250 
function lastReplyFn(sendId, consultId) {
251
252 
	var lastReplyTimeData, lastReplyTime, lastReplyCon;
253 
	$.ajax({
254 
		url: "/ajax/tidings/qaLastRevovery",
255 
		async: false,
256 
		data: {
257 
			"consultId": consultId, //咨询ID
258 
			"senderId": sendId //登录者ID
259 
		},
260 
		success: function(response) {
261 
			//			console.log(response)
262 
			if(response["data"] == null || response["data"] == "" || response["data"] == undefined) {
263 
				lastReplyTimeData = '';
264 
				lastReplyTime = '';
265 
				lastReplyCon = '';
266 
			} else {
267 
				lastReplyTimeData = response["data"]["createTime"];
268 
				lastReplyTime = lastReplyTimeData.substr(0, 4) + "-" + lastReplyTimeData.substr(4, 2) + "-" + lastReplyTimeData.substr(6, 2) + " " + lastReplyTimeData.substr(8, 2) + ":" + lastReplyTimeData.substr(10, 2)
269 
				lastReplyCon = response["data"]["tidingsContant"];
270 
			}
271
272 
		},
273 
		error: function(error) {
274 
			$.MsgBox.Alert('提示', "最后回复数据失败");
275 
		}
276
277 
	});
278
279 
	return {
280 
		"lastReplyTime": lastReplyTime,
281 
		"lastReplyCon": lastReplyCon
282
283 
	};
284 
};
285
286 
//我的咨询下拉菜单处理函数
287 
function myRequirePullDownMenu() {
288 
	//点击下拉菜单
289 
	$(".replyOption ul").find("li").click(function() {
290
291 
		status = $(this).attr("tip");
292 
		timeType = $("#showTimeSort2").attr("tim");
293 
		sortType = $("#timeSortId2").val();
294
295 
		$("#workContainer2").remove();
296 
		$("#wode").append('<div id="workContainer2"></div>')
297 
		$(".getReplyPage").remove();
298 
		$("#wode").append('<div class="tcdPageCode getReplyPage"></div>');
299
300 
		console.log(status + timeType + sortType);
301
302 
		getMyData(pageSize, 1, true, status, timeType, sortType);
303 
	});
304 
	$(".timeOption2 ul").find("li").click(function() {
305
306 
		status = $("#showStatus2").attr("tip");
307 
		timeType = $(this).attr("tim");
308 
		sortType = $("#timeSortId2").val();
309
310 
		$("#workContainer2").remove();
311 
		$("#wode").append('<div id="workContainer2"></div>')
312 
		$(".getReplyPage").remove();
313 
		$("#wode").append('<div class="tcdPageCode getReplyPage"></div>');
314
315 
		console.log(status + timeType + sortType);
316
317 
		getMyData(pageSize, 1, true, status, timeType, sortType);
318 
	});
319 
	var sortFlag2 = true;
320 
	$("#replyArrow").click(function() {
321
322 
		if(sortFlag2 == true) {
323 
			$(this).find("div").css("background-position", "-20px 1px");
324 
			$("#timeSortId2").val("1");
325 
			sortFlag2 = false;
326
327 
		} else {
328 
			$(this).find("div").css("background-position", "0px 1px");
329 
			$("#timeSortId2").val("0");
330
331 
			sortFlag2 = true;
332 
		};
333
334 
		status = $("#showStatus2").attr("tip");
335 
		timeType = $("#showTimeSort2").attr("tim");
336 
		sortType = $("#timeSortId2").val();
337
338 
		$("#workContainer2").remove();
339 
		$("#wode").append('<div id="workContainer2"></div>')
340 
		$(".getReplyPage").remove();
341 
		$("#wode").append('<div class="tcdPageCode getReplyPage"></div>');
342
343 
		console.log(status + timeType + sortType);
344 
		getMyData(pageSize, 1, true, status, timeType, sortType);
345 
	});
346 
};
347
348 
//咨询和回复中点击查看或者回复
349 
function clickLookBtn2(sendId, attrParams, consultId, consultStatus, assessStatus, thanksStatus) {
350 
	window.location.href = "diloags.html?sendId=" + sendId + "&attrParams=" + attrParams + "&consultId=" + consultId + "&consultStatus=" + consultStatus + "&assessStatus=" + assessStatus + "&thanksStatus=" + thanksStatus;
351 
}

+ 2 - 4
js/loginNew.js
View File 

@ -7,8 +7,7 @@ $(function() {
7 7 
		$(this).addClass("liactive").siblings().removeClass("liactive");
8 8 
		$(".loginWays ul").eq($(this).index()).removeClass("displayNone").siblings().addClass("displayNone");
9 9 
	})
10 
})
11 
var oTel=GetQueryString("tel");
10 
})
12 11 
 if(oTel==1) {
13 12 
 	$(".loginWaySort li").eq(2).addClass("liactive").siblings().removeClass("liactive");
14 13 
 	$(".loginWays ul").eq(2).removeClass("displayNone").siblings().addClass("displayNone");

@ -299,7 +298,6 @@ function InvitationLogin(_this) {
299 298 
			},
300 299 
			async: false,
301 300 
			success: function(data) {
302 
				 console.log(data)
303 301 
				if(data.success) {
304 302 
					if(data.data != "null" && data.data != null) {
305 303 
						if(data.data.auth == true) {

@ -328,4 +326,4 @@ function login(_this, num) {
328 326 
	} else if(num == 3) {
329 327 
		VerificationLogin(_this);
330 328 
	}
331 
}
329 
}

+ 3 - 2
js/needList.js
View File 

@ -102,5 +102,6 @@ $(document).ready(function() {
102 102 
				$.MsgBox.Alert('提示', '链接服务器超时')
103 103 
			}
104 104 
		});
105 
	}
106 
})
105 
	}
106 
})
107

+ 2 - 2
js/tidings.js
View File 

@ -19,7 +19,7 @@ $(document).ready(function() {
19 19 
	console.log(professorId)
20 20 
	console.log(userid)
21 21 
	function websocrket() {
22 
		var ws = new WebSocket("ws://192.168.3.233:8081/portal/websocket/msg?id=" + userid + "&pm=www");
22 
		var ws = new WebSocket("ws://192.168.3.233:8080/portal/websocket/msg?id=" + userid + "&pm=www");
23 23 
		ws.onopen = function() {
24 24 
			console.log(userid);
25 25 
		};

@ -657,4 +657,4 @@ $(document).ready(function() {
657 657 
			});
658 658 
		}
659 659 
	})
660 
})
660 
})

+ 1 - 1
js/workindex.js
View File 

@ -423,4 +423,4 @@ $(function() {
423 423 
//			}
424 424 
//		});
425 425 
//	}
426 
});
426 
});