找资源和找专家中咨询的bug修改

src/main/webapp/diloags.html

@@ -8,11 +8,16 @@
        </div>
        <div class="dialogcontain">
        	<div class="dialoginfo">
                <div class="dialoginfotype"><span class="dialogtit" id="dialog_consultTitle">咨询主题：</span><span id="dial_consultTitle"></span></div>
                <div class="dialoginfotype"><span class="dialogtit" id="dialog_consultType">咨询类型：</span><span id="dial_consultType"></span></div>
                <div class="dialoginfotype">
	                <span class="dialogtit" id="">咨询主题：</span>
	                <span id="dialog_consultTitle"></span>
                </div>
                <div class="dialoginfotype">
                	<span class="dialogtit" id="">咨询类型：</span>
                	<span id="dialog_consultType"></span></div>
                <div class="dialoginfotype dialogbtnbox">
	                <div class="dialogsurebtn displayNone" id="dial_confirmFinishConsult">
	                	<span>点击确认完成咨询</span>
	                <div class="dialogsurebtn displayNone" >
	                	<span id="dial_confirmFinishConsult">点击确认完成咨询</span>
	                </div>
	                <div class="dialogsurebtn displayNone" id="dialog_assessBtn">
	                	<span>评价</span>
@@ -22,7 +27,7 @@
	                </div>
                </div>
                <div class="dialoginfotype">
                	<div id="showAllAssess" class="thanksblock clearfix">
                	<!-- <div id="showAllAssess" class="thanksblock clearfix">
	                	<div class="evadbox floatL">
		                	<div class="evadtit floatL">总体评价</div>
		                	<div class="evadegree floatL">
@@ -36,8 +41,8 @@
		                	</div>
	                	</div>	
	                	<div class="thankbox floatR" id="dialog_thanks">感谢金额<span id="dialog_thanksMoney"></span>元</div>
	                </div>
	                <div id="showAllAssess" class="thanksblock clearfix">
	                </div> -->
	                <div id="showAllAssess" class="thanksblock clearfix displayNone">
	                	<div class="evadbox evamargin">
		                	<div class="evadtit floatL">总体评价</div>
		                	<div class="evadegree floatL">

src/main/webapp/js/consultFlat.js

@@ -12,35 +12,45 @@ var consultIdStrByReply = {
};
//data:需要处理的数据，htmlStr:页面中需要的html字符串拼接，
//attrParams:数据中不同的参数比如:收到咨询是professorId，收到答复：consultantId
function handleData(data,htmlStr,attrParams,text,btnCls){
function handleData(data,htmlStr,attrParams,btnCls){
	var text;
	htmlStr = '';
	for(var i = 0; i < data.length;i++){
		if(data[i]["professor"]["title"] == undefined){
			data[i]["professor"]["title"] = '';
		}
		if(data[i]["professor"]["orgName"] == undefined){
			data[i]["professor"]["orgName"] = '';
		}
		if(data[i]["professor"]["department"] == undefined){
			data[i]["professor"]["department"] = '';
		}
		if(data[i]["professor"]["adress"] == undefined){
			data[i]["professor"]["adress"]  = '';
		};
		
		
		if(data[i]["consultStatus"] == 0){
			data[i]["consultStatus"] = "进行中";
		};
			text = '回复';
			};
		if(data[i]["consultStatus"] == 1){
			data[i]["consultStatus"] = "完成";
		};
		
			text = "查看";
		}
		if(data[i]["assessStatus"] == 0){
			data[i]["assessStatus"] = "未评价";
		}
		if(data[i]["assessStatus"] == 1){
			data[i]["assessStatus"] = "已评价";
		}
		
		if(data[i]["thanksStatus"] == 0){
			data[i]["thanksStatus"] = "未感谢";
		}
		if(data[i]["thanksStatus"] == 1){
			data[i]["thanksStatus"] = "已感谢";
		}
		if(attrParams == "professorId"){
			text = "回复"
		}
		else{
			text = "查看"
		}
		};
		
		htmlStr += 
			"<div class='workselectitem' id='" +data[i]["consultId"] +"' >" +
@@ -74,7 +84,7 @@ function handleData(data,htmlStr,attrParams,text,btnCls){
									"<div class='workhandle'>" +
										"<div class='rightopert floatR'>" +
											"<span class='replybtn "+btnCls+"' id='"+ data[i]["consultId"]+ "' assess='"+ data[i]["assessStatus"]+ "'  thanks='"+ data[i]["thanksStatus"]+ "'>" +text +"</span>" +
											"<span class='moreopert'>...</span>" +
											"<span class='moreopert complain'>...</span>" +
											"<ul class='moreopertbtn'>" +
												"<li>投诉</li>" +
											"</ul>" +
@@ -146,7 +156,6 @@ function dialogContentStrFn(data){
function clickConsultBtn(){
	//1.先ajax请求，判断是否有收到咨询消息，然后ajax-html，然后渲染数据
//	console.log(professorIdStrByconsult);
	//检查用户是否登录
	if(userid != "" && userid != null){
		$.ajax({
@@ -155,16 +164,10 @@ function clickConsultBtn(){
			//传值：登陆人id：专家id
			"data" :{"professorId":userid},
			"contentType" : "application/x-www-form-urlencoded",
			"beforeSend":function(response){
//				console.log(response)
			},
			"success":function(consultResponse){
//				console.log(consultResponse);
				//如果没有咨询数据 隐藏收到咨询
				if(consultResponse["data"]["total"] == 0){
//					alert("未收到咨询");
			        //ajax页面
			        $.ajax({
			        	"url":"consult.html",
						"dataType" : "html",
@@ -185,13 +188,11 @@ function clickConsultBtn(){
					        	"data":{"consultantId":userid},
								"dataType" : "json",
								"success":function(replyResponse){
									console.log(replyResponse)
									
									var allData = replyResponse.data;
									var replyData = allData["data"];
									
									if(replyData.length != 0 &&  replyData.length != null){
										replyTrHtml = handleData(replyData,replyTrHtml,"consultantId","查看","lookBtn");
										replyTrHtml = handleData(replyData,replyTrHtml,"consultantId","lookBtn");
										$("#workContainer2").prepend(replyTrHtml);
										
									}else{
@@ -235,8 +236,6 @@ function clickConsultBtn(){
					      timeType2 = $("#timeTypeId2").val();//时间类型值
					      sortType2 = $("#timeSortId2").val();//排序值;
					      //console.log(consultStatus,timeType,sortType+"res333");
					      //默认传值：
					      var replyInfo = {
					      		"consultantId":userid,
@@ -263,16 +262,11 @@ function clickConsultBtn(){
									"url":"/ajax/consult/pqcon",//更新下拉菜单接口
									"type":"get",
						        	"data":replyInfo,
									"beforeSend":function(response){
										console.log(response);
									},
									"success":function(response){
										$("#workContainer2 .workselectitem").remove();
										var allData = response.data;
										var replyData = allData["data"];
										replyTrHtml = handleData(replyData,replyTrHtml,"consultantId","查看","lookBtn");
										console.log(replyTrHtml);
//										$(".tcdPageCode:last").before(replyTrHtml);
										replyTrHtml = handleData(replyData,replyTrHtml,"consultantId","lookBtn");
										$("#workContainer2").prepend(replyTrHtml);
									},
@@ -316,7 +310,7 @@ function clickConsultBtn(){
							var consultTrHtml;
					        var allData = consultResponse.data;
							var consultData = allData["data"];
					        consultTrHtml = handleData(consultData,consultTrHtml,"professorId","回复","replyBtn");
					        consultTrHtml = handleData(consultData,consultTrHtml,"professorId","replyBtn");
					        $("#workContainer").prepend(consultTrHtml);
					        
					        
@@ -344,7 +338,6 @@ function clickConsultBtn(){
							consultStatus = $("#consultSelectId").val();//咨询状态值
							timeType = $("#timeTypeId").val();//时间类型值
							sortType = $("#timeSortId").val();//排序值;
//							console.log(consultStatus,timeType,sortType+"res333");
							
							//默认传值：
							var consultInfo = {
@@ -378,18 +371,14 @@ function clickConsultBtn(){
									"url":"/ajax/consult/pqpro",//更新下拉菜单接口
						        	"data":consultInfo,
						        	"type":"get",
									"beforeSend":function(response){
//										console.log(response);
									},
									"success":function(response){
										$("#workContainer .workselectitem").remove();
//										$(".tcdPageCode:first").before().empty();
										var allData = response.data;
										var consultData = allData["data"];
										console.log(consultData.length);
										consultTrHtml = handleData(consultData,consultTrHtml,"professorId","回复","replyBtn");
//										$(".tcdPageCode:first").before(consultTrHtml);
										consultTrHtml = handleData(consultData,consultTrHtml,"professorId","replyBtn");
										$("#workContainer").prepend(consultTrHtml);
										
										//给咨询页回复绑定事件
										$("#workContainer .workselectitem").find(".replyBtn").bind("click",clickReplyFn);
										
@@ -466,8 +455,6 @@ function clickConsultBtn(){
												"type":"get",
												"data":consultIdStr,
												"success":function(response){
													console.log("点击回复返回数据");
													console.log(response)
													var consultantData = response["data"];
													//对话框标题信息
													//进行中，
@@ -558,14 +545,8 @@ function clickConsultBtn(){
												"url":"/ajax/tidings/qacon",//对话内容显示接口
												"type":"get",
												"data":consultIdStr,
												"beforeSend":function(response){
													//对话发送消息失败
													//console.log(response);
												},
												"success":function(response){
													console.log()
													var dialogConData = response["data"];
													console.log(dialogConData);
													var dialogStr;
													dialogStr = dialogContentStrFn(dialogConData);
													$("#dialogContent").prepend(dialogStr);
@@ -594,12 +575,7 @@ function clickConsultBtn(){
												"url":"/ajax/tidings",
												"type":"post",
												"data":tidingStr,
												"beforeSend":function(response){
													//对话发送消息失败
													console.log(response);
												},
												"success":function(response){
													console.log(response);//返回对话内容的id
													$("#dialogContent").empty();
													dialogContentDataHandle();
												},
@@ -613,7 +589,7 @@ function clickConsultBtn(){
										$("#dialog_sendBtn").bind("click",sendDialogContentFn);
										
										
										//==============点击确认完成
										//==============发表评价
										function assessFn(){
											ConsultComment();
											if($(this).attr("id") == "dialog_thanksBtn"){
@@ -642,8 +618,8 @@ function clickConsultBtn(){
											$("#sendAssessBtn").bind("click",clickSendAssessBtn);
											
										};
										//绑定对话页面确认完成咨询
										$("#dial_confirmFinishConsult").bind("click",assessFn);
										/*//绑定对话页面确认完成咨询
										$("#dial_confirmFinishConsult").bind("click",assessFn);*/
										
										
										//点击发表评论：保存发表内容和星级
@@ -659,7 +635,7 @@ function clickConsultBtn(){
												    "assessStar":assessStar, //评价星级
												    "assessContant":assessContant //评价内容
											};
											console.log(assessContentStr);
//											console.log(assessContentStr);
											//如果未评论，提示未评论
											if(assessStar == "" || assessStar == null || assessStar == undefined){
												if(assessContant == "" || assessContant == null || assessContant == undefined){
@@ -672,13 +648,16 @@ function clickConsultBtn(){
												"type":"post",
												"data":assessContentStr,
												"success":function(response){
													console.log(response);
//													console.log(response);
													$(".blackcover").remove();
													$("body").css("position","static");
													$.MsgBox.Alert('提示',"评论成功");
													
													//评价状态改变，所以头部信息改变
													dialogHeadDataHandleFn();
													//点击确认完成
													//绑定对话页面确认完成咨询
													$("#dial_confirmFinishConsult").bind("click",assessFn);
												},
												"error":function(error){
													//发表评论失败
@@ -733,14 +712,11 @@ function clickConsultBtn(){
								},
								"success":function(replyResponse){
									//拿到收到回复数据
									console.log(replyResponse);
									var replyTrHtml;
									var allData = replyResponse.data;
									var replyData = allData["data"];
//									console.log(replyData.length);
									if(replyData.length != 0 &&  replyData.length != null){
										replyTrHtml = handleData(replyData,replyTrHtml,"consultantId","查看","lookBtn");
//										$(".tcdPageCode:last").before(replyTrHtml);	
										replyTrHtml = handleData(replyData,replyTrHtml,"consultantId","lookBtn");
										$("#workContainer2").prepend(replyTrHtml);
										
										
@@ -816,17 +792,13 @@ function clickConsultBtn(){
										"url":"/ajax/consult/pqcon",//更新下拉菜单接口
										"type":"get",
							        	"data":replyInfo,
										"beforeSend":function(response){
											console.log(response);
										},
										"success":function(response){
											$("#workContainer2 .workselectitem").remove();
//											$(".tcdPageCode:first").before().empty();
											var allData = response.data;
											var replyData = allData["data"];
											var replyTrHtml;
											replyTrHtml = handleData(replyData,replyTrHtml,"consultantId","查看","lookBtn");
//											$(".tcdPageCode:last").before(replyTrHtml);
											replyTrHtml = handleData(replyData,replyTrHtml,"consultantId","lookBtn");
											$("#workContainer2").prepend(replyTrHtml);
											
											$("#workContainer2 .workselectitem").find(".lookBtn").bind("click",clickLookBtn);
@@ -1171,8 +1143,6 @@ function clickConsultBtn(){
											
											//稍后评价、
											function noAssess(){
//												$(".blackcover").remove();
//												$("body").css("position","static");
												$.ajax({
													"url":"diloags.html",
													"dataType":"html",
@@ -1180,46 +1150,32 @@ function clickConsultBtn(){
														//console.log(data);
														$(this).attr("id");
														$(".workcon").html(result);
														
														$(".blackcover").remove();
														$("body").css("position","static");
														lookDialogHeadDataHandleFn();
														dialogContentDataHandle();
														$("#dialog_sendBtn").bind("click",sendDialogContentFn);
														
														
													},
													"error":function(error){
														//console.log(data);
														//加载对话页面失败
														console.log(error);
														$.MsgBox.Alert('提醒',"对话请求错误");
													}
												});
											};
											
										
										
										
									
									
								};//收到回复点击查看函数结束
								
								
							
							
						},
			        })
					
				}
			},
			"complete":function(response){
//				console.log(response)
			},
			"error":function(response){
				//收到咨询页面失败
//				console.log(response)
				$.MsgBox.Alert('提醒',"咨询页面请求错误");
			},
			
			
@@ -1288,7 +1244,7 @@ $(".workmenu").on("click","#consultbtn",clickConsultBtn);
										var replyData = allData["data"];
										
										if(replyData.length != 0 &&  replyData.length != null){
											replyTrHtml = handleData(replyData,replyTrHtml,"consultantId","查看","lookBtn");
											replyTrHtml = handleData(replyData,replyTrHtml,"consultantId","lookBtn");
											$("#workContainer2").prepend(replyTrHtml);
											
										}else{
@@ -1367,7 +1323,7 @@ $(".workmenu").on("click","#consultbtn",clickConsultBtn);
											$("#workContainer2 .workselectitem").remove();
											var allData = response.data;
											var replyData = allData["data"];
											replyTrHtml = handleData(replyData,replyTrHtml,"consultantId","查看","lookBtn");
											replyTrHtml = handleData(replyData,replyTrHtml,"consultantId","lookBtn");
											console.log(replyTrHtml);
//											$(".tcdPageCode:last").before(replyTrHtml);
											$("#workContainer2").prepend(replyTrHtml);
@@ -1413,7 +1369,7 @@ $(".workmenu").on("click","#consultbtn",clickConsultBtn);
								var consultTrHtml;
						        var allData = consultResponse.data;
								var consultData = allData["data"];
						        consultTrHtml = handleData(consultData,consultTrHtml,"professorId","回复","replyBtn");
						        consultTrHtml = handleData(consultData,consultTrHtml,"professorId","replyBtn");
						        $("#workContainer").prepend(consultTrHtml);
						        
						        
@@ -1484,7 +1440,7 @@ $(".workmenu").on("click","#consultbtn",clickConsultBtn);
											var allData = response.data;
											var consultData = allData["data"];
											console.log(consultData.length);
											consultTrHtml = handleData(consultData,consultTrHtml,"professorId","回复","replyBtn");
											consultTrHtml = handleData(consultData,consultTrHtml,"professorId","replyBtn");
//											$(".tcdPageCode:first").before(consultTrHtml);
											$("#workContainer").prepend(consultTrHtml);
											//给咨询页回复绑定事件
@@ -1836,7 +1792,7 @@ $(".workmenu").on("click","#consultbtn",clickConsultBtn);
										var replyData = allData["data"];
//										console.log(replyData.length);
										if(replyData.length != 0 &&  replyData.length != null){
											replyTrHtml = handleData(replyData,replyTrHtml,"consultantId","查看","lookBtn");
											replyTrHtml = handleData(replyData,replyTrHtml,"consultantId","lookBtn");
//											$(".tcdPageCode:last").before(replyTrHtml);	
											$("#workContainer2").prepend(replyTrHtml);
											
@@ -1922,7 +1878,7 @@ $(".workmenu").on("click","#consultbtn",clickConsultBtn);
												var allData = response.data;
												var replyData = allData["data"];
												var replyTrHtml;
												replyTrHtml = handleData(replyData,replyTrHtml,"consultantId","查看","lookBtn");
												replyTrHtml = handleData(replyData,replyTrHtml,"consultantId","lookBtn");
//												$(".tcdPageCode:last").before(replyTrHtml);
												$("#workContainer2").prepend(replyTrHtml);
												

src/main/webapp/js/information.brow.js

@@ -597,8 +597,7 @@ $(".subsidebar").click(function(){
	function consultHandler(){
		ConsultApply();
		//点击的发送
		var sendConsultBtn = $("#sendConsultBtn");
		sendConsultBtn.on("click",sendConsultHandler);
		$("#sendConsultBtn").on("click",sendConsultHandler);
		
		if(userid && userid != null && userid != "null"){
			$.ajax({

src/main/webapp/js/search.js

@@ -1,6 +1,5 @@
$(function(){
	    var newc=GetQueryString("lookFor");
	    console.log(newc);
	    if(newc==0||newc==""){
	       var c=0;	
	    }else{
@@ -27,7 +26,7 @@ $(function(){
					"contentType" : "application/x-www-form-urlencoded",
					"success" : function($data) {							
						if ($data.success) {
							console.log($data);
//							console.log($data);
							$("#professorList").html("");
							for(var i = 0 ; i < $data.data.data.length ; i++){
								//创建HTML标签  
@@ -183,7 +182,7 @@ $(function(){
 						}
 						
 						//找资源中点击咨询
						$(".consultbtn").bind("click",clickConsultFn);
						$(".consultbtn").bind("click",clickFindResourceConsult);
 					},				
 				});	
 			}
@@ -445,14 +444,67 @@ $(function(){
		});
	 
	 
	 //找资源中咨询处理函数
	 function clickFindResourceConsult(){
			var professorId = $(this).attr("id");
			ConsultApply();
			if(userid && userid != null && userid != "null"){
				$.ajax({
					"url" :"/ajax/professor/"+ professorId,
					"type" : "get",
					"data" : {"professorId":professorId},
					"success" : function(response) {
						if (response.success) {
//							console.log(response);
							$("#professorName").text(response.data["name"]);
							$("#professorName").attr("professorId",response.data["id"]);
							$("#professorTitle").text(response.data["title"]);
							
							if(response.data["department"] == "" || response.data["department"] == null){
								$("#profOrganization").text(response.data["organization"]["name"]);
							}else{
								$("#profDepartment").text(response.data["department"]+",");
								$("#profOrganization").text(response.data["organization"]["name"]);
								
							}
							if(response.data["adress"] == "" || response.data["adress"] == null ){
								$("#adress").html("");
							}else{
								$("#profAdress").text(response.data["adress"]);
							}
							
						} else {
							return false;
						}
					},
					"error":function(error){
						$.MsgBox.Alert("message","咨询失败");
					}
				});
			}
			else{
				
				$.MsgBox.Alert("message","请登录");
			}
			
			//点击的发送
			$("#sendConsultBtn").on("click",sendConsultHandler);
			$("ul.menucon").children().eq(1).addClass("clicknow");
			var consultTitleVal = $(this).parent().prev().find(".resouname").text();
			$("#consultTitle").val("关于"+consultTitleVal+"的咨询");
			
	};
	 
	 
	 
	//点击咨询处理函数
	 function clickConsultFn(){
			ConsultApply();
			
		 	ConsultApply();
			//点击的发送
			$("#sendConsultBtn").on("click",sendConsultHandler);
			var professorId = $(this).attr("id");
			
			if(userid && userid != null && userid != "null"){
				$.ajax({
					"url" :"/ajax/professor/"+ professorId,
@@ -483,12 +535,12 @@ $(function(){
						} else {
							$.MsgBox.Alert("message","请登录");
						}
					},
					"complete":function(){
						
					}
				});
			}
			else{
				return false;
			}
		
	 };
	 
@@ -528,7 +580,6 @@ $(function(){
					//传值：咨询类型、主题、内容、专家id、申请人id
					"data" : consultStr,				
					"contentType" : "application/x-www-form-urlencoded",
					"beforeSend":function(){console.log(this.data)},
					"dataType" : "json",
					"success" : function(response) {
						consultId = response.data;//咨询id

src/main/webapp/workindex.html

@@ -132,5 +132,5 @@
    </div>
</div>
<!-- 我的工作台 //-->
<script type="text/javascript" src="js/consultFlat.js"></script>
<!-- <script type="text/javascript" src="js/consultFlat.js"></script> -->
<script type="text/javascript" src="js/workindex.js"></script>