Explorar el Código

1.咨询列表头像
2.咨询分页bug

xiaoai_123 %!s(int64=8) %!d(string=hace) años
padre
commit
a28e5d2836
Se han modificado 3 ficheros con 70 adiciones y 50 borrados
  1. 4 4
      src/main/webapp/consult.html
  2. 0 1
      src/main/webapp/js/common.js
  3. 66 45
      src/main/webapp/js/consult.js

+ 4 - 4
src/main/webapp/consult.html

@ -43,8 +43,8 @@
43 43
                </form>
44 44
             </div>   
45 45
             
46
            <div class="workselectcon" id="workContainer">
47
                
46
            <div class="workselectcon">
47
                <div id="workContainer"></div>
48 48
                <div class="tcdPageCode getConsultPage"></div>
49 49
            </div>
50 50
        </div>
@ -86,8 +86,8 @@
86 86
                </form>
87 87
             </div>   
88 88
             
89
            <div class="workselectcon" id="workContainer2">
90
                
89
            <div class="workselectcon" >
90
                <div id="workContainer2"></div>
91 91
                <div class="tcdPageCode getReplyPage"></div>
92 92
            </div>
93 93
        </div>

+ 0 - 1
src/main/webapp/js/common.js

@ -196,7 +196,6 @@ function concultProInfo(professorId){
196 196
					$("#proModify").removeClass("displayNone");
197 197
				}
198 198
				
199
				
200 199
				//没有头像
201 200
				if(myData["hasHeadImage"] == 0){
202 201
					$("#prohead").attr("src","images/default-photo.jpg");

+ 66 - 45
src/main/webapp/js/consult.js

@ -10,8 +10,9 @@ $(".workmenu").on("click","#consultbtn",clickConsultBtn);
10 10
function handleData(data,attrParams,btnCls){
11 11
	var htmlStr = '';
12 12
	for(var i = 0; i < data.length;i++){
13
		var text;
14
		var state;	
13
		//text:回复/查看,state:进行中/已完成/未评价,photoUrl:头像地址,proModify:专家认证
14
		var text,state,photoUrl,proModify;
15
		
15 16
		if(data[i]["consultStatus"] == 0){
16 17
			state = "进行中";
17 18
			text = '回复';
@ -24,7 +25,7 @@ function handleData(data,attrParams,btnCls){
24 25
				}
25 26
			} 
26 27
		}
27
	
28
		
28 29
		if(data[i]["professor"]["title"] == undefined){
29 30
			data[i]["professor"]["title"] = '';
30 31
		}
@ -39,10 +40,24 @@ function handleData(data,attrParams,btnCls){
39 40
		};
40 41
		if(data[i]["professor"]["office"] == undefined){
41 42
			data[i]["professor"]["office"] = '';
43
		};
44
		//专家头像
45
		if(data[i]["professor"]["hasHeadImage"] == 0){
46
			photoUrl = "images/default-photo.jpg"
47
			
48
		}else{
49
			photoUrl = "images/head/"+data[i]["professor"]["id"]+"_m.jpg"
50
			
51
		};
52
		//认证
53
		if(data[i]["professor"]["authentication"] == true){
54
			proModify = "display:inline-block;"
55
		}else{
56
			proModify = "display:none;"
42 57
		}
43 58
		
59
		//未读消息
44 60
		var unread = unreadConsultFn (userid,data[i]["consultId"],i);
45
	
46 61
		
47 62
		htmlStr += 
48 63
			"<div class='workselectitem' id='" +data[i]["consultId"] +"' >" +
@ -50,13 +65,13 @@ function handleData(data,attrParams,btnCls){
50 65
					"<tbody><tr>" +
51 66
						"<td width='14%' class='messagebox'>" +
52 67
							"<a class='workhead workitimg'>" +
53
								"<img src='images/default-photo.jpg' width='100%' height='100%'>" +
68
								"<img class='headPhoto' src='"+photoUrl+"'  width='100%' height='100%'>" +
54 69
							"</a>" +
55 70
							"<span class='msgprompt showUnreadMsg' style='"+unread.style+"' id='" +data[i]["consultId"] +"'>"+unread.unreadCount+"</span>" +
56 71
						"</td>" +
57 72
						"<td style='position:relative;' width='86%'>" +
58 73
							"<div class='workinfor worksitcon'>" +
59
								"<h4><a class='named' id='nameS'> " + data[i]["professor"]["name"] +" </a><img class='modifyicon' src='images/rz.png' width='30'><input type='text' class='assessStar' value='"+data[i]["assessStar"] +"' style='display: none;'></h4>" +
74
								"<h4><a class='named' id='nameS'> " + data[i]["professor"]["name"] +" </a><img class='modifyicon' style='"+proModify+"' src='images/rz.png' width='30'><input type='text' class='assessStar' value='"+data[i]["assessStar"] +"' style='display: none;'></h4>" +
60 75
								"<h6><span>职称  " + data[i]["professor"]["title"] +"  </span>,<span>职位"+data[i]["professor"]["office"]+"</span>,<span> " + data[i]["professor"]["orgName"] +"  </span>,<span> " + data[i]["professor"]["department"] +" </span>&nbsp;|&nbsp;<span> " + data[i]["professor"]["adress"] +"  </span></h6>" +
61 76
								"<h6>"+
62 77
								"<span>咨询主题:<em> " + data[i]["consultTitle"] +"  </em></span>" +
@ -90,7 +105,7 @@ function handleData(data,attrParams,btnCls){
90 105
									"</div>" +
91 106
								"</td>" +
92 107
							"</tr></tbody></table>" +
93
		"</div>";	
108
		"</div>";
94 109
		
95 110
	};
96 111

@ -222,7 +237,7 @@ function dialogContentStrFn(data){
222 237

223 238

224 239
//收到回复
225
var getMyData = function (url,pageSize,pageNo,isbind,status,timeType,sortType){
240
var getMyData = function (pageSize,pageNo,isbind,status,timeType,sortType){
226 241
	var params = {
227 242
		    "consultantId":userid, //专家ID
228 243
		    "status":status, //查询状态 0-全部,1-进行中,2-未感谢,3-未评价,4-已完成, 可以不传,默认为0
@ -233,7 +248,7 @@ var getMyData = function (url,pageSize,pageNo,isbind,status,timeType,sortType){
233 248
		};
234 249
	
235 250
	$.ajax({
236
    	url:url,//收到回复接口,//收到回复接口
251
    	url:"/ajax/consult/pqCon",//收到回复接口
237 252
		type:"get",
238 253
		data :params,
239 254
		dataType: "json",
@ -248,10 +263,10 @@ var getMyData = function (url,pageSize,pageNo,isbind,status,timeType,sortType){
248 263
				var allData = response.data;
249 264
				var myData = allData.data;
250 265
				
251
				$("#workContainer2 .workselectitem").remove();	
266
				$("#workContainer2").html("");	
252 267
				if(myData.length != 0 &&  myData.length != null){
253 268
					replyStr = handleData(myData,"consultId","lookBtn");
254
					$("#workContainer2").prepend(replyStr);
269
					$("#workContainer2").append(replyStr);
255 270
					
256 271
				}else{
257 272
					return false;
@ -262,7 +277,7 @@ var getMyData = function (url,pageSize,pageNo,isbind,status,timeType,sortType){
262 277
				        pageCount:Math.ceil(allData.total/pageSize),
263 278
				        current:allData.pageNo,
264 279
				        backFn:function(p){
265
				        	getMyData(url,pageSize,p,false,status,timeType,sortType);
280
				        	getMyData(pageSize,p,false,status,timeType,sortType);
266 281
				        }
267 282
				    });
268 283
				}
@ -278,7 +293,7 @@ var getMyData = function (url,pageSize,pageNo,isbind,status,timeType,sortType){
278 293
    });
279 294
};
280 295

281
var getConsultData = function (url,pageSize,pageNo,isbind,status,timeType,sortType){
296
var getConsultData = function (pageSize,pageNo,isbind,status,timeType,sortType){
282 297
	var params = {
283 298
		    "professorId":userid, //专家ID
284 299
		    "status":status, //查询状态 0-全部,1-进行中,2-未感谢,3-未评价,4-已完成, 可以不传,默认为0
@ -289,7 +304,7 @@ var getConsultData = function (url,pageSize,pageNo,isbind,status,timeType,sortTy
289 304
		};
290 305
	
291 306
	$.ajax({
292
    	url:url,
307
    	url:"/ajax/consult/pqPro",
293 308
		type:"get",
294 309
		//传值:登陆人id:咨询id
295 310
		data :params,
@ -297,8 +312,6 @@ var getConsultData = function (url,pageSize,pageNo,isbind,status,timeType,sortTy
297 312
		dataType: "json",
298 313
		contentType: "application/x-www-form-urlencoded",
299 314
		success:function(response){
300
			
301
			
302 315
			if(response["data"]["data"] == null || response["data"]["data"] == undefined || response["data"]["data"] == ""){
303 316
				return false;
304 317
			}
@ -306,12 +319,12 @@ var getConsultData = function (url,pageSize,pageNo,isbind,status,timeType,sortTy
306 319
				var consultStr;
307 320
				var allData = response.data;
308 321
				var myData = allData["data"];
322

309 323
				//拿到收到咨询数据
310
				$("#workContainer .workselectitem").remove();
324
				$("#workContainer").html("");
311 325
				if(myData.length != 0 &&  myData.length != null){
312 326
					consultStr = handleData(myData,"professorId","lookBtn");
313

314
					$("#workContainer").prepend(consultStr);
327
					$("#workContainer").append(consultStr);
315 328

316 329
				}else{
317 330
					return false;
@ -322,7 +335,7 @@ var getConsultData = function (url,pageSize,pageNo,isbind,status,timeType,sortTy
322 335
				        pageCount:Math.ceil(allData.total/pageSize),
323 336
				        current:allData.pageNo,
324 337
				        backFn:function(p){
325
				        	getConsultData(url,pageSize,p,false,status,timeType,sortType);
338
				        	getConsultData(pageSize,p,false,status,timeType,sortType);
326 339
				        }
327 340
				    });
328 341
				}
@ -330,7 +343,6 @@ var getConsultData = function (url,pageSize,pageNo,isbind,status,timeType,sortTy
330 343
			
331 344
		},
332 345
		error:function(response){
333
			//收到回复错误返回
334 346
			$.MsgBox.Alert('提示',"收到咨询数据请求失败");
335 347
		},
336 348
    	
@ -807,17 +819,17 @@ function clickConsultBtn(){
807 819
					
808 820

809 821
					//收到咨询
810
					getConsultData("/ajax/consult/pqpro","5",1,true,0,0,0);
822
					getConsultData("5",1,true,0,0,0);
811 823
					
812 824
			        
813 825
					//咨询点击下拉菜单
814 826
			        $(".consultOption ul").find("li").click(function(){
815 827
			        	
816
			        	getConsultData("/ajax/consult/pqpro","5",1,true,$(this).attr("tip"),$("#showTimeSort").attr("tim"),$("#timeSortId").val());
828
			        	getConsultData("5",1,true,$(this).attr("tip"),$("#showTimeSort").attr("tim"),$("#timeSortId").val());
817 829
			        	});
818 830
					$(".timeOption ul").find("li").click(function(){
819 831
	
820
						getConsultData("/ajax/consult/pqpro","5",1,true,$("#showStatus").attr("tip"),$(this).attr("tim"),$("#timeSortId").val());
832
						getConsultData("5",1,true,$("#showStatus").attr("tip"),$(this).attr("tim"),$("#timeSortId").val());
821 833
						});
822 834
					var sortFlag = true;
823 835
					$("#consultArrow").click(function(){
@ -831,9 +843,8 @@ function clickConsultBtn(){
831 843
				      		$("#timeSortId").val("0");
832 844
				      		sortFlag=true;
833 845
				      	}
834
						
835
						
836
						getConsultData("/ajax/consult/pqpro","5",1,true,$("#showStatus").attr("tip"),$("#showTimeSort").attr("tim"),$("#timeSortId").val());
846

847
						getConsultData("5",1,true,$("#showStatus").attr("tip"),$("#showTimeSort").attr("tim"),$("#timeSortId").val());
837 848
					});
838 849
					
839 850

@ -848,14 +859,14 @@ function clickConsultBtn(){
848 859
						$(".workcontit .worksamlltit3").eq(1).addClass("worksamlltitnow");
849 860
						
850 861
						//回复
851
				        getMyData("/ajax/consult/pqcon","5",1,true,0,0,0);
862
				        getMyData("5",1,true,0,0,0);
852 863
				        //回复点击下拉菜单
853 864
				        $(".replyOption ul").find("li").click(function(){
854 865
				        	
855
				        	getMyData("/ajax/consult/pqcon","5",1,true,$(this).attr("tip"),$("#showTimeSort2").attr("tim"),$("#timeSortId2").val());
866
				        	getMyData("5",1,true,$(this).attr("tip"),$("#showTimeSort2").attr("tim"),$("#timeSortId2").val());
856 867
				        	});
857 868
						$(".timeOption2 ul").find("li").click(function(){
858
							getMyData("/ajax/consult/pqcon","5",1,true,$("#showStatus2").attr("tip"),$(this).attr("tim"),$("#timeSortId2").val());
869
							getMyData("5",1,true,$("#showStatus2").attr("tip"),$(this).attr("tim"),$("#timeSortId2").val());
859 870
							});
860 871
						var sortFlag2 = true;
861 872
						$("#replyArrow").click(function(){
@ -871,7 +882,7 @@ function clickConsultBtn(){
871 882
					      		
872 883
					      		sortFlag2=true;
873 884
					      	}
874
							getMyData("/ajax/consult/pqcon","5",1,true,$("#showStatus2").attr("tip"),$("#showTimeSort2").attr("tim"),$("#timeSortId2").val());
885
							getMyData("5",1,true,$("#showStatus2").attr("tip"),$("#showTimeSort2").attr("tim"),$("#timeSortId2").val());
875 886
						});
876 887
						
877 888
				
@ -888,15 +899,15 @@ function clickConsultBtn(){
888 899
					else {
889 900
//						alert("有咨询")
890 901
						//回复
891
				        getMyData("/ajax/consult/pqcon","5",1,true,0,0,0);
902
				        getMyData("5",1,true,0,0,0);
892 903
				        
893 904
				        //回复点击下拉菜单
894 905
				        $(".replyOption ul").find("li").click(function(){
895 906
				        	
896
				        	getMyData("/ajax/consult/pqcon","5",1,true,$(this).attr("tip"),$("#showTimeSort2").attr("tim"),$("#timeSortId2").val());
907
				        	getMyData("5",1,true,$(this).attr("tip"),$("#showTimeSort2").attr("tim"),$("#timeSortId2").val());
897 908
				        	});
898 909
						$(".timeOption2 ul").find("li").click(function(){
899
							getMyData("/ajax/consult/pqcon","5",1,true,$("#showStatus2").attr("tip"),$(this).attr("tim"),$("#timeSortId2").val());
910
							getMyData("5",1,true,$("#showStatus2").attr("tip"),$(this).attr("tim"),$("#timeSortId2").val());
900 911
							});
901 912
						var sortFlag2 = true;
902 913
						$("#replyArrow").click(function(){
@ -912,7 +923,7 @@ function clickConsultBtn(){
912 923
					      		
913 924
					      		sortFlag2=true;
914 925
					      	}
915
							getMyData("/ajax/consult/pqcon","5",1,true,$("#showStatus2").attr("tip"),$("#showTimeSort2").attr("tim"),$("#timeSortId2").val());
926
							getMyData("5",1,true,$("#showStatus2").attr("tip"),$("#showTimeSort2").attr("tim"),$("#timeSortId2").val());
916 927
						});
917 928
				        
918 929
					}
@ -920,16 +931,21 @@ function clickConsultBtn(){
920 931
						
921 932
						$(".workcontit .worksamlltit3").eq(0).click(function(){
922 933
							
934
							$("#workContainer").remove();
935
							$(".getConsultPage").remove();
936
							$(".workselectcon").eq(0).append('<div id="workContainer"></div>');
937
							$(".workselectcon").eq(0).append('<div class="tcdPageCode getConsultPage"></div>');
938
							
939
							
923 940
							//收到咨询
924
							getConsultData("/ajax/consult/pqpro","5",1,true,0,0,0);
941
							getConsultData("5",1,true,0,0,0);
925 942
							//点击下拉菜单
926 943
					        $(".consultOption ul").find("li").click(function(){
927
					        	
928
					        	getConsultData("/ajax/consult/pqpro","5",1,true,$(this).attr("tip"),$("#showTimeSort").attr("tim"),$("#timeSortId").val());
944
					        	getConsultData("5",1,true,$(this).attr("tip"),$("#showTimeSort").attr("tim"),$("#timeSortId").val());
929 945
					        	});
930 946
							$(".timeOption ul").find("li").click(function(){
931 947
			
932
								getConsultData("/ajax/consult/pqpro","5",1,true,$("#showStatus").attr("tip"),$(this).attr("tim"),$("#timeSortId").val());
948
								getConsultData("5",1,true,$("#showStatus").attr("tip"),$(this).attr("tim"),$("#timeSortId").val());
933 949
								});
934 950
							var sortFlag = true;
935 951
							$("#consultArrow").click(function(){
@ -945,23 +961,28 @@ function clickConsultBtn(){
945 961
						      	}
946 962
								
947 963
								
948
								getConsultData("/ajax/consult/pqpro","5",1,true,$("#showStatus").attr("tip"),$("#showTimeSort").attr("tim"),$("#timeSortId").val());
964
								getConsultData("5",1,true,$("#showStatus").attr("tip"),$("#showTimeSort").attr("tim"),$("#timeSortId").val());
949 965
							});
950 966
							
951 967
						});
952 968
						
953 969
						
954 970
		 				$(".workcontit .worksamlltit3").eq(1).click(function(){
955
							
971

972
		 					$("#workContainer2").remove();
973
							$(".getReplyPage").remove();
974
							$(".workselectcon").eq(1).append('<div id="workContainer2"></div>');
975
							$(".workselectcon").eq(1).append('<div class="tcdPageCode getReplyPage"></div>');
976
		 					
956 977
		 					//回复
957
					        getMyData("/ajax/consult/pqcon","5",1,true,0,0,0);
978
					        getMyData("5",1,true,0,0,0);
958 979
					        //点击下拉菜单
959 980
					        $(".replyOption ul").find("li").click(function(){
960 981
					        	
961
					        	getMyData("/ajax/consult/pqcon","5",1,true,$(this).attr("tip"),$("#showTimeSort2").attr("tim"),$("#timeSortId2").val());
982
					        	getMyData("5",1,true,$(this).attr("tip"),$("#showTimeSort2").attr("tim"),$("#timeSortId2").val());
962 983
					        	});
963 984
							$(".timeOption2 ul").find("li").click(function(){
964
								getMyData("/ajax/consult/pqcon","5",1,true,$("#showStatus2").attr("tip"),$(this).attr("tim"),$("#timeSortId2").val());
985
								getMyData("5",1,true,$("#showStatus2").attr("tip"),$(this).attr("tim"),$("#timeSortId2").val());
965 986
								});
966 987
							var sortFlag2 = true;
967 988
							$("#replyArrow").click(function(){
@ -977,7 +998,7 @@ function clickConsultBtn(){
977 998
						      		
978 999
						      		sortFlag2=true;
979 1000
						      	}
980
								getMyData("/ajax/consult/pqcon","5",1,true,$("#showStatus2").attr("tip"),$("#showTimeSort2").attr("tim"),$("#timeSortId2").val());
1001
								getMyData("5",1,true,$("#showStatus2").attr("tip"),$("#showTimeSort2").attr("tim"),$("#timeSortId2").val());
981 1002
							});
982 1003
		 					
983 1004
						});