Inicio Explorar Ayuda
Registro Iniciar sesión
bulomakaka
/
ekexiu.com.portal
Vigilar 7
Destacar 0
Fork 0
Código Incidencias 0 Pull Requests 0 Commits 112 Releases 0 Wiki
Explorar el Código

1.咨询申请数据交互；
2.便签功能判断收到咨询和收到答复的有无和显示；
3.科研资源部分相关bug修改

xiaoai_123 %!s(int64=8) %!d(string=hace) años
padre
443605cdc3
commit
416d1b4fa2
Se han modificado 9 ficheros con 637 adiciones y 209 borrados
Dividir vista Mostrar estadísticas de diff
  1. 35 14
      src/main/webapp/consult.html
  2. 4 3
      src/main/webapp/css/workspace.css
  3. 11 4
      src/main/webapp/information-brow.html
  4. 51 0
      src/main/webapp/js/consultFlat.js
  5. 118 4
      src/main/webapp/js/information.brow.js
  6. 55 22
      src/main/webapp/js/popup.js
  7. 318 155
      src/main/webapp/js/sciresource.js
  8. 41 7
      src/main/webapp/js/workspace.js
  9. 4 0
      src/main/webapp/workspaces.html

+ 35 - 14
src/main/webapp/consult.html
Ver fichero 

@ -3,20 +3,31 @@
3 3
4 4 
<!--  // 咨询-->
5 5 
<div class="workconitem consublock">
6 
    <div class="workcontit">咨询<span class="worksamlltit worksamlltit3 worksamlltitnow">收到咨询</span><span class="worksamlltit worksamlltit3">收到回复</span><!-- <span class="workset floatR">设置</span> --></div>
6 
    <div class="workcontit">咨询<a class="worksamlltit worksamlltit3 worksamlltitnow" href="#getConsult">收到咨询</a><a class="worksamlltit worksamlltit3" href="#getReply">收到回复</a><!-- <span class="workset floatR">设置</span> --></div>
7 7 
    <div class="worksubcon">
8 
    	<div class="workmysrc workmysrc3">
8 
    	<div class="workmysrc workmysrc3" id="getConsult" style="display:block;">
9 9 
             <div class="workmenubox clearfix">
10 10 
                <form class="workmenufrm floatR">
11 11 
                    <div class="workselectbox floatL">
12 
                        <span onclick="hide('downbox')" id="showbox" class="workselectmenu" >全部</span>
12 
                       <span onclick="hide('downbox')" id="showbox" class="workselectmenu" >全部</span>
13 13 
                        <ul id="downbox" class="workdropdown" style="display:none;">
14 14 
                            <li onclick="pick('全部')" class="cur workcurrent">全部</li>
15 15 
                            <li onclick="pick('进行中')" class="cur">进行中</li>
16 16 
                            <li onclick="pick('待感谢')" class="cur">待感谢</li>
17 17 
                            <li onclick="pick('待评价')" class="cur">待评价</li>
18 18 
                            <li onclick="pick('完成的')" class="cur">完成的</li>
19 
                       </ul>
19 
                       </ul>
20
21 
                       <!-- <select class="workdropdown "  id="consultStatusID">
22 
                       		<option class="cur workcurrent" value="0">全部</option>
23 
                       		<option class="cur" value="1">进行中</option>
24 
                       		<option class="cur" value="2">待感谢</option>
25 
                       		<option class="cur" value="3">待评价</option>
26 
                       		<option class="cur" value="4">完成的</option>
27 
                       </select> -->
28
29
30
20 31 
                    </div>
21 32 
                    <div class="workselectbox floatL">
22 33 
                        <span onclick="hide('downbox1')" id="showbox1" class="workselectmenu" >按发起时间排序</span>

@ -24,7 +35,16 @@
24 35 
                            <li onclick="pick1('按发起时间排序')" class="cur workcurrent">按发起时间排序</li>
25 36 
                            <li onclick="pick1('按最后回复时间排序')" class="cur">按最后回复时间排序</li>
26 37 
                            <li onclick="pick1('按完成时间排序')" class="cur">按完成时间排序</li>
27 
                       </ul>
38 
                       </ul>
39
40 
                       <!-- <select class="workdropdown workdropdown2" id="timeSortId">
41 
                       		<option class="cur workcurrent" value="0">按发起时间排序</option>
42 
                       		<option class="cur" value="1">按最后回复时间排序</option>
43 
                       		<option class="cur" value="2">按完成时间排序</option>
44
45 
                       </select> -->
46
47
28 48 
                    </div>
29 49 
                    <div class="workselectbox floatL">
30 50 
                        <div class="orderedbtn"><div></div></div> 

@ -41,7 +61,7 @@
41 61 
                            <td width="14%" class="messagebox"><a class="workhead workitimg" href="information.html"><img src="images/default-photo.jpg" width="100%" height="100%"></a><span class="msgprompt">1</span></td>
42 62 
                            <td style="position:relative;" width="86%">
43 63 
                                <div class="workinfor worksitcon">
44 
                                    <h4><a href="" class="named" id="nameS">程学群</a><img class="modifyicon" src="images/rz.png" width="30"></h4>
64 
                                    <h4><a href="" class="named" id="nameS">1111111111111程学群</a><img class="modifyicon" src="images/rz.png" width="30"></h4>
45 65 
                                    <h6><span>职称</span>,<span>职位</span>,<span>新材料技术研究院</span>,<span>北京科技大学</span>&nbsp;|&nbsp;<span>北京</span></h6>
46 66 
                                    <h6><span>咨询主题：<em>XXXXXXXXXXXXX</em></span>&nbsp;&nbsp;&nbsp;&nbsp;<span>咨询类型：<em>技术咨询</em></span>&nbsp;&nbsp;&nbsp;&nbsp;<span>咨询发起时间：<em>2016-10-09 10:00</em></span></h6>
47 67 
                                    <p>最后回复<span class="lasttime"> ( 2016-10-10 14:20 ) </span>：</p>

@ -127,7 +147,7 @@
127 147 
            </div>
128 148 
        </div>
129 149
130 
        <div class="workmysrc workmysrc3">
150 
        <div class="workmysrc workmysrc3" id="getReply" style="display: none; ">
131 151 
             <div class="workmenubox clearfix">
132 152 
                <form class="workmenufrm floatR">
133 153 
                    <div class="workselectbox floatL">

@ -138,7 +158,8 @@
138 158 
                            <li onclick="pick('待感谢')" class="cur">待感谢</li>
139 159 
                            <li onclick="pick('待评价')" class="cur">待评价</li>
140 160 
                            <li onclick="pick('完成的')" class="cur">完成的</li>
141 
                       </ul>
161 
                       </ul>
162
142 163 
                    </div>
143 164 
                    <div class="workselectbox floatL">
144 165 
                        <span onclick="hide('downbox1')" id="showbox1" class="workselectmenu" >按发起时间排序</span>

@ -163,7 +184,7 @@
163 184 
                            <td width="14%" class="messagebox"><a class="workhead workitimg" href="information.html"><img src="images/default-photo.jpg" width="100%" height="100%"></a><span class="msgprompt">1</span></td>
164 185 
                            <td style="position:relative;" width="86%">
165 186 
                                <div class="workinfor worksitcon">
166 
                                    <h4><a href="" class="named" id="nameS">程学群</a><img class="modifyicon" src="images/rz.png" width="30"></h4>
187 
                                    <h4><a href="" class="named" id="nameS">0000000000程学群</a><img class="modifyicon" src="images/rz.png" width="30"></h4>
167 188 
                                    <h6><span>职称</span>,<span>职位</span>,<span>新材料技术研究院</span>,<span>北京科技大学</span>&nbsp;|&nbsp;<span>北京</span></h6>
168 189 
                                    <h6><span>咨询主题：<em>XXXXXXXXXXXXX</em></span>&nbsp;&nbsp;&nbsp;&nbsp;<span>咨询类型：<em>技术咨询</em></span>&nbsp;&nbsp;&nbsp;&nbsp;<span>咨询发起时间：<em>2016-10-09 10:00</em></span></h6>
169 190 
                                    <p>最后回复<span class="lasttime"> ( 2016-10-10 14:20 ) </span>：</p>

@ -192,7 +213,7 @@
192 213 
                            <td width="14%" class="messagebox"><a class="workhead workitimg" href="information.html"><img src="images/default-photo.jpg" width="100%" height="100%"></a><span class="msgprompt">1</span></td>
193 214 
                            <td style="position:relative;" width="86%">
194 215 
                                <div class="workinfor worksitcon">
195 
                                    <h4><a href="" class="named" id="nameS">程学群</a><img class="modifyicon" src="images/rz.png" width="30"></h4>
216 
                                    <h4><a href="" class="named" id="nameS">0000000000000程学群</a><img class="modifyicon" src="images/rz.png" width="30"></h4>
196 217 
                                    <h6><span>职称</span>,<span>职位</span>,<span>新材料技术研究院</span>,<span>北京科技大学</span>&nbsp;|&nbsp;<span>北京</span></h6>
197 218 
                                    <h6><span>咨询主题：<em>XXXXXXXXXXXXX</em></span>&nbsp;&nbsp;&nbsp;&nbsp;<span>咨询类型：<em>技术咨询</em></span>&nbsp;&nbsp;&nbsp;&nbsp;<span>咨询发起时间：<em>2016-10-09 10:00</em></span></h6>
198 219 
                                    <p>最后回复<span class="lasttime"> ( 2016-10-10 14:20 ) </span>：</p>

@ -223,7 +244,7 @@
223 244 
</div>
224 245 
<!--  咨询 // -->
225 246
226
247 
<script type="text/javascript" src="js/consultFlat.js"></script>
227 248
228 249 
<script>
229 250 
	/*对话列表和对话框的切换*/

@ -288,11 +309,11 @@
288 309 
	})
289 310
290 311 
	/*咨询菜单点击切换*/
291 
	$(".worksamlltit3").click(function(){
312 
	    /* $(".worksamlltit3").click(function(){
292 313 
		var index = $(this).index();
293 314 
		$(this).addClass("worksamlltitnow").siblings().removeClass("worksamlltitnow");
294 
		$(".workmysrc3").eq(index).show().siblings().hide();
295 
	});
315 
		$(".workmysrc3").eq(index).show().siblings().hide();
316 
	}); */
296 317
297 318
298 319

+ 4 - 3
src/main/webapp/css/workspace.css
Ver fichero 

@ -26,10 +26,11 @@
26 26 
.workmysrc{ margin-bottom:30px;}
27 27 
.workmysrctit{font-size:16px;line-height:30px;position:relative;}
28 28 
.worksamlltit{ font-size:13px;line-height:30px; margin:0 10px; padding:10px;cursor:pointer;}
29 
.worksamlltitnow{ border-bottom:1px solid #ff8400; color:#ff8400;}
29 
.worksamlltitnow{ border-bottom:1px solid #ff8400; color:#ff8400;text-decoration: none;}
30 
.workcontit a:link{color:#313131;}
30 31
31 
.workmysrc{display:none;}
32 
.workmysrc:first-child{display:block;}
32 
/* .workmysrc{display:none;}
33 
.workmysrc:first-child{display:block;} */
33 34 
.workmysrc .workbtn{ display:block;background:#ff8400;font-size:14px;line-height:30px;color:#fff; width:140px; padding:0 20px; border-radius:4px; cursor:pointer; margin-bottom:10px;}
34 35 
.maintab{ border-bottom:1px dashed #d7d7d7; margin-top:20px; overflow:hidden;}
35 36 
.maintab:last-child{border-bottom:none;}

+ 11 - 4
src/main/webapp/information-brow.html
Ver fichero 

@ -12,14 +12,17 @@
12 12 
<link type="text/css" href="css/common.css" rel="stylesheet">
13 13 
<link type="text/css" href="css/workspace.css" rel="stylesheet">
14 14 
<link type="text/css" href="css/popup.css" rel="stylesheet">
15 
<link rel="stylesheet" href="//apps.bdimg.com/libs/jqueryui/1.10.4/css/jquery-ui.min.css">
16
15 17 
</head>
16 18
17 19 
<body>
18 
<!--咨询模块按钮入口-->
20
21 
	<!--咨询模块按钮入口-->
19 22 
<div class="coulstblock">
20 
    <div class="coulstbox" onclick="ConsultApply();">
23 
    <div class="coulstbox" >
21 24 
    	<div class="prohead floatL"><img src="images/default-photo.jpg" width="100%" height="100%"></div>
22 
        <div class="coulstbtn floatL"><span>咨询</span></div>
25 
        <div class="coulstbtn floatL" id="consultbtn"><span>咨询</span></div>
23 26 
    </div>
24 27 
</div>
25 28 


@ -283,8 +286,11 @@
283 286 
	<div class="footer-btm">本站由 阿里云 提供计算与安全服务 Copyright © 2016~2017 科袖 | 京ICP备12345678号 | 京ICP证123456号 | 京公网安备11010800011111号 | 网站联盟安全认证</div>
284 287 
</div>
285 288 
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
286 
<script type="text/javascript" src="js/index.js"></script>
289 
<script src="//apps.bdimg.com/libs/jquery/1.10.2/jquery.min.js"></script>
290 
<script src="//apps.bdimg.com/libs/jqueryui/1.10.4/jquery-ui.min.js"></script>
287 291 
<script type="text/javascript" src="js/popup.js"></script>
292 
<script type="text/javascript" src="js/index.js"></script>
293
288 294 
<script type="text/javascript" src="js/information.brow.js"></script>
289 295 
<script type="text/javascript" src="js/common.js"></script>
290 296 
<script type="text/javascript" src="/js/jquery.cookie.js"></script>

@ -296,6 +302,7 @@
296 302 
		$(this).css("background-position","0 0");
297 303
298 304 
	})
305
299 306
300 307 
 </script>
301 308 
</body>

+ 51 - 0
src/main/webapp/js/consultFlat.js
Ver fichero 

@ -0,0 +1,51 @@
1 
/**
2 
 *
3 
 */
4
5 
$(document).ready(function(){
6 
	//咨询状态：状态值（type=0、1、2、3、4）（默认全部信息、发起时间倒叙）
7 
	//全部/进行中/待付款/待评价/完成的
8
9 
	var consultStateCon =  $("#showbox").text();
10 
	var consultState;
11 
//	if(consultStateCon == "全部"){
12 
//		consultState = 0;
13 
//	};
14 
//	if(consultStateCon == "进行中"){
15 
//		consultState = 1;
16 
//	};
17 
//	if(consultStateCon == "待感谢"){
18 
//		consultState = 2;
19 
//	};
20 
//	if(consultStateCon == "待评价"){
21 
//		consultState = 3;
22 
//	};
23 
//	if(consultStateCon == "完成的"){
24 
//		consultState = 4;
25 
//	};
26
27 
	var consultStatusVal;
28 
	var timeSortVal;
29 
	$("#consultStatusId").bind("change",function(){
30 
		consultStatusVal = $(this).val();
31 
	    console.log(consultStatusVal);
32 
	  });
33 
	$("#timeSortId").bind("change",function(){
34 
		timeSortVal = $(this).val();
35 
	    console.log(timeSortVal);
36 
	  });
37
38
39
40
41
42 
	//全部
43 
	//进行中 ====回复
44 
	//待付款/待评价/完成的  ======查看
45
46
47
48
49
50
51 
})

+ 118 - 4
src/main/webapp/js/information.brow.js
Ver fichero 

@ -442,6 +442,8 @@ $(".subsidebar").click(function(){
442 442 
				//console.log(data);
443 443 
				$("option")[0].value=data.data.name;
444 444 
				$("option")[1].value=data.data.organization.name;
445 
				//console.log($("option")[0].value);
446 
				//console.log($("option")[1].value);
445 447 
			}
446 448 
			else
447 449 
			{

@ -454,6 +456,7 @@ $(".subsidebar").click(function(){
454 456
455 457 
	$('.introduction').on("click",'.applicant',function(){
456 458 
		ResourceApply();//调用资源申请HTML创建函数
459
457 460 
		//console.log(name);
458 461 
		$(".timelo").css("display","none");
459 462 
		$(".namecon").text(name);

@ -474,16 +477,16 @@ $(".subsidebar").click(function(){
474 477 
					$data.demandId = userid;
475 478 
					$data.resourceId=resourceID;
476 479 
					$data.detailDemand=$(".detail").val();
477 
					$data.dealTime=$(".dealTime").val();
480 
					$data.deliverTime=$(".dealTime").val();
478 481 
					$data.operationStatus=1;
479 
					$data.applysquare=$("select option:selected").val();
480
482 
					$data.applysquare=$("select option:selected").val();
483 
					//console.log($data.applysquare);
481 484 
					$.ajax({
482 485 
						"url" : "/ajax/operation",
483 486 
						"type" : "POST",
484 487 
						"success" : function(rdata) {
485 488 
							if (rdata.success) {
486 
								location.reload(true);
489 
								//location.reload(true);
487 490 
							} else {
488 491 
								alert("jjj");
489 492 
							}

@ -497,5 +500,116 @@ $(".subsidebar").click(function(){
497 500 
	});
498 501
499 502
503 
	//=====================================
504 
	//事件封装
505 
/*	function addEvent(obj,type,handler){
506 
	    if(obj.addEventListener){
507 
	        obj.addEventListener(type,handler,false);
508 
	    }else if(obj.attachEvent){
509 
	        obj.attachEvent('on'+type,handler);
510 
	    }
511 
	}
512
513 
	function removeEvent(obj,type,handler){
514 
	    if(obj.removeEventListener){
515 
	        obj.removeEventListener(type,handler,false);
516 
	    }else if(obj.detachEvent){
517 
	        obj.detachEvent("on"+type,handler);
518 
	    }
519 
	}*/
520
521
522 
	//===============点击咨询==============
523 
	var consultBtn = $("#consultbtn");
524 
	var userid = $.cookie("userid");//登陆人id====重复代码
525 
 	var professorId = GetQueryString("professorId");//专家id====重复代码
526
527 
	function consultHandler(){
528 
		ConsultApply();
529 
		//点击的发送
530 
		var sendConsultBtn = $("#sendConsultBtn");
531 
		sendConsultBtn.on("click",sendConsultHandler);
532
533 
		if(userid && userid != null && userid != "null"){
534 
			$.ajax({
535 
				"url" :"/ajax/professor/"+ professorId,
536 
				"type" : "get",
537 
				"data" : {"professorId":professorId},
538 
				"contentType" : "application/x-www-form-urlencoded",
539 
				"success" : function(response) {
540 
					if (response.success) {
541 
						console.log(response);
542 
						$("#professorName").text(response.data["name"]);
543 
						$("#professorTitle").text(response.data["title"]);
544
545 
						if(response.data["department"] == "" || response.data["department"] == null){
546 
							$("#profOrganization").text(response.data["organization"]["name"]);
547 
						}else{
548 
							$("#profDepartment").text(response.data["department"]+",");
549 
							$("#profOrganization").text(response.data["organization"]["name"]);
550
551 
						}
552 
						if(response.data["adress"] == "" || response.data["adress"] == null ){
553 
							$("#adress").html("");
554 
						}else{
555 
							$("#profAdress").text(response.data["adress"]);
556 
						}
557
558
559 
					} else {
560 
						$.MsgBox.Alert("message","请登录");
561 
					}
562 
				},
563 
				"complete":function(){
564
565 
				}
566 
			});
567 
		}
568 
	};
569
570 
	//点击咨询
571 
	consultBtn.on('click',consultHandler);
572
573 
	//发送咨询申请处理函数
574 
	function sendConsultHandler(){
575 
		var consult_type = $(".clicknow").text();//咨询类型
576 
		var consult_title = $("#consultTitle").val();//咨询主题
577 
		var consult_content = $("#consultContent").val();//咨询内容
578 
		var consult = {
579 
				consultType:consult_type,
580 
				consultTitle:consult_title,
581 
				consultContent:consult_content,
582 
				professorId:professorId,
583 
				userid:userid
584 
		};
585 
		var consultStr = JSON.stringify(consult);
586 
		console.log(consultStr);
587
588 
		if(consult_type == '' || consult_title == '' || consult_content == ''){
589 
			$.MsgBox.Alert("message","请填写完整");
590 
		};
591
592 
		if(userid && userid != null && userid != "null"){
593 
			$.ajax({
594 
				"url" :"/ajax/consult",
595 
				"type" : "post",
596 
				//传值：咨询类型、主题、内容、专家id、申请人id
597 
				"data" : {"consult":consultStr},
598 
				"contentType" : "application/x-www-form-urlencoded",
599 
				"success" : function(response) {
600 
					console.log(response);
601 
				},
602 
				"complete":function(){
603
604 
				}
605 
			});
606 
		}
607
608 
	}
609
610
611
612
613
500 614 
})
501 615

+ 55 - 22
src/main/webapp/js/popup.js
Ver fichero 

@ -171,11 +171,11 @@ function ResourceApply(){
171 171 
		PopHtml += '</tr>';
172 172 
		PopHtml += '<tr class="timelo"><th class="resouinfotype "  scope="row">申请时间</th><td><div class="resouinforcon timelog">2016-08-01</div></td></tr>';
173 173 
		PopHtml += '<tr><th class="resouinfotype "  scope="row">需求资源</th><td><div class="resouinforcon log"></div></td> </tr>';
174 
		PopHtml += '<tr><th class="resouinfotype"  scope="row">资源发布者</th><td><div class="resouinforcon namecon" id="professor3"><!--<a href="" class="worktel">联系ta</a>--></div></td></tr>';
174 
		PopHtml += '<tr><th class="resouinfotype resouinfotype2"  scope="row">资源发布者</th><td><div class="resouinforcon namecon" id="professor3"><!--<a href="" class="worktel">联系ta</a>--></div></td></tr>';
175 175 
		PopHtml += '<tr><th class="resouinfotype"  scope="row">需求方</th><td>';
176 176 
        PopHtml += '<div class="resouinforcon"><select class="frmtype" style="background:url(../images/downselect.png) no-repeat 96% center"><option>本人</option><option>所属机构</option></select></div>';
177 177 
		PopHtml += '</td></tr>';
178 
		PopHtml += '<tr><th class="resouinfotype " scope="row">交付时间</th><td><div class="resouinforcon"><input type="text" class="frmtype dealTime"></div></td></tr>';
178 
		PopHtml += '<tr><th class="resouinfotype " scope="row">交付时间</th><td><div class="resouinforcon"><input type="text" id="datepicker"class="frmtype dealTime"style="width:200px;"></div></td></tr>';
179 179 
		PopHtml += '<tr><th class="resouinfotype"  scope="row">具体需求</th><td colspan="2"><div class="resouinforcon"><textarea class="frmtype detail"></textarea></div></td></tr></table>';
180 180
181 181 
		//相关文件上传

@ -195,7 +195,7 @@ function ResourceApply(){
195 195
196 196
197 197 
		/*//发送报价模块*/
198 
		PopHtml += '<div class="applyblock applysure"><div class="resoutit">发送报价<div class="stateinfor"><em></em>报价中</div></div>';
198 
		PopHtml += '<div class="applyblock applysure"><div class="resoutit">发送报价</div>';
199 199 
		PopHtml += '<div class="resoubox"><table class="resoutab applysure">';
200 200 
		PopHtml += '<tr><th class="resouinfotype"  scope="row">付款方式</th><td><div class="resouinforcon"><input type="text" class="frmtype" id="payMethod"></div></td><td ><div class="resouinforcon"></div></td></tr>';
201 201 
		PopHtml += '<tr><th class="resouinfotype" scope="row">费用</th><td><div class="resouinforcon"><input type="text" class="frmtype" id="dealPrice"></div></td><td ><div class="resouinforcon"></div></td></tr>';

@ -226,7 +226,7 @@ function ResourceApply(){
226 226
227 227 
		//让提示框居中
228 228 
		$(".resouapply").css({top:"40px", left: (_widht - boxWidth) / 2 + "px" });
229
229 
//		$( "#datepicker" ).datepicker({ "dateFormat":" yy-mm-dd"});
230 230
231 231 
		//关闭按钮
232 232 
		$(".workclose").click(function(){

@ -443,20 +443,20 @@ function DetailInfo(){
443 443 
		//资源申请信息
444 444 
		PopHtml += '<td rowspan="5"><div class="resouinforcon"><div class="resoushowimg1" ><img src="" width="100%" height="100%"></div></div></td>';
445 445 
		PopHtml += '</tr>';
446 
		PopHtml += '<tr class="timelo"><th class="resouinfotype "  scope="row">申请时间</th><td><div class="resouinforcon timelog">2016-08-01</div></td></tr>';
446 
		PopHtml += '<tr class="timelo"><th class="resouinfotype  "  scope="row">申请时间</th><td><div class="resouinforcon dealTime">2016-08-01</div></td></tr>';
447 447 
		PopHtml += '<tr><th class="resouinfotype "  scope="row">需求资源</th><td><div class="resouinforcon log">xxx检测仪</div></td> </tr>';
448 
		PopHtml += '<tr><th class="resouinfotype"  scope="row">资源发布者</th><td><div class="resouinforcon namecon">张三 <a href="" class="worktel">联系ta</a></div></td></tr>';
448 
		PopHtml += '<tr style="display:none"><th class="resouinfotype"  scope="row">资源发布者</th><td><div class="resouinforcon namecon">张三 <a href="" class="worktel">联系ta</a></div></td></tr>';
449 449 
		PopHtml += '<tr><th class="resouinfotype"  scope="row">需求方</th><td>';
450 
        PopHtml += '<div class="resouinforcon">李四</div>';
450 
        PopHtml += '<div class="resouinforcon sname">李四</div>';
451 451 
		PopHtml += '</td></tr>';
452 
		PopHtml += '<tr><th class="resouinfotype"  scope="row">具体需求</th><td colspan="2"><div class="resouinforcon"> 89fufhyury8fruijkfhjhdf </div></td></tr>';
453 
		PopHtml += '<tr><th class="resouinfotype " scope="row">交付时间</th><td colspan="2"><div class="resouinforcon dealTime">2016-10-30</div></td></tr>';
452 
		PopHtml += '<tr><th class="resouinfotype "  scope="row">具体需求</th><td colspan="2"><div class="resouinforcon detail"> 89fufhyury8fruijkfhjhdf </div></td></tr>';
453 
		PopHtml += '<tr><th class="resouinfotype " scope="row">交付时间</th><td colspan="2"><div class="resouinforcon timelog">2016-10-30</div></td></tr>';
454 454
455 455 
		/*//报价模块*/
456 456 
		//PopHtml += '<table class="resoutab1 applysure">';
457 
		PopHtml += '<tr><th class="resouinfotype"  scope="row">付款方式</th><td><div class="resouinforcon">一次性付清</div></td><td ><div class="resouinforcon"></div></td></tr>';
458 
		PopHtml += '<tr><th class="resouinfotype" scope="row">费用</th><td><div class="resouinforcon">￥10000</div></td><td ><div class="resouinforcon"></div></td></tr>';
459 
		PopHtml += '<tr><th class="resouinfotype" scope="row">备注</th><td colspan="2"><div class="resouinforcon">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvin</div></td></tr></table>';
457 
		PopHtml += '<tr><th class="resouinfotype"  scope="row">付款方式</th><td><div class="resouinforcon"id="payMethod">一次性付清</div></td><td ><div class="resouinforcon"></div></td></tr>';
458 
		PopHtml += '<tr><th class="resouinfotype" scope="row">费用</th><td><div class="resouinforcon"id="dealPrice">￥10000</div></td><td ><div class="resouinforcon"></div></td></tr>';
459 
		PopHtml += '<tr><th class="resouinfotype" scope="row">备注</th><td colspan="2"><div class="resouinforcon"id="consultContent">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvin</div></td></tr></table>';
460 460 
		PopHtml += '</table>';
461 461 
		//文件
462 462 
		PopHtml += '<div class="filebox"> ';

@ -607,19 +607,19 @@ function ConsultApply() {
607 607 
		PopHtml += ' <div class="consultright floatL">';
608 608 
		//专家信息
609 609 
		PopHtml += '<div class="probrief">';
610 
		PopHtml += '<div class="proname"><a href="" class="name">程学群</a><img class="modifyicon" src="images/rz.png" width="30"></div>';
611 
		PopHtml += '<div class="phh2"><span>副教授</span>,<span>主任</span></div>';
612 
		PopHtml += '<div class="phh4"><span>新材料技术研究院</span>,<span>北京科技大学</span></div>';
613 
		PopHtml += '<div class="phh4">所在地：<span>北京</span></div>';
610 
		PopHtml += '<div class="proname"><a href="" class="name" id="professorName"></a><img class="modifyicon" src="images/rz.png" width="30"></div>';
611 
		PopHtml += '<div class="phh2" id="professorTitle"></div>';
612 
		PopHtml += '<div class="phh4"><span id="profDepartment"> </span><span id="profOrganization"></span></div>';
613 
		PopHtml += '<div class="phh4" id="adress">所在地：<span id="profAdress"></span></div>';
614 614 
		PopHtml += '</div>';
615 615 
		//发送咨询主题与内容
616 616 
		PopHtml += '<div class="sendmsg">';
617 617 
		PopHtml += '<div class="sendmsgtit">发送信息</div>';
618 618 
		PopHtml += '<form class="resoufrm"><ul class="sendmsgcon">';
619 
		PopHtml += '<li><span>*</span><label>主题</label><input type="text" class="frmtype"></li>';
620 
		PopHtml += '<li><span>*</span><label>内容</label><textarea class="frmtype"></textarea></li>';
619 
		PopHtml += '<li><span>*</span><label>主题</label><input type="text" id="consultTitle" class="frmtype"></li>';
620 
		PopHtml += '<li><span>*</span><label>内容</label><textarea class="frmtype" id="consultContent"></textarea></li>';
621 621 
		PopHtml += '<li class="rightline">请不要超过500个字</li>';
622 
		PopHtml += '<li class="rightline"><input type="button" class="frmtype frmbtn" value="发送"></li>';
622 
		PopHtml += '<li class="rightline"><input type="button" id="sendConsultBtn"class="frmtype frmbtn" value="发送"></li>';
623 623 
		PopHtml += '</ul></form></div>';
624 624 
		//关闭按钮
625 625 
		PopHtml += '</div></div>';

@ -630,7 +630,11 @@ function ConsultApply() {
630 630 
		//必须先将html添加到body，再设置Css样式
631 631 
        $("body").before(PopHtml);
632 632 
		$("body").css("overflow-y","hidden");
633
633 
		/*$("#sendConsultBtn").on("click",function(){
634 
			alert("444");
635 
			//sendConsult();
636
637 
		})*/;
634 638 
        var _widht = $(".blackcover").width();
635 639 
        var _height = $(".blackcover").height();
636 640 
		var boxWidth = $(".consultapply").width();

@ -710,7 +714,36 @@ function ConsultComment() {
710 714 
		});
711 715 
}
712 716 
/****咨询专家结束评价*****/
713
714
717 
/****是否确定完成*****/
718
719 
function finish() {
720 
	var PopHtml="";
721
722 
	PopHtml += '<div class="blackcover">';
723 
	PopHtml += '<div class="commentinfo">';
724 
	PopHtml += '<div class="com">确定完成？？</div>';
725 
	PopHtml += '<div class="com1">确定</div>';
726 
	PopHtml += '<span class="workclose"></span>';
727 
	PopHtml += '</div></div>';
728
729 
//必须先将html添加到body，再设置Css样式
730 
    $("body").before(PopHtml);
731 
	$("body").css("overflow-y","hidden");
732
733 
    var _widht = $(".blackcover").width();
734 
    var _height = $(".blackcover").height();
735 
	var boxWidth = $(".commentinfo").width();
736 
	var boxHeight = $(".commentinfo").height();
737
738 
	//让提示框居中
739 
	$(".commentinfo").css({top:"40px", left: (_widht - boxWidth) / 2 + "px" });
740
741
742 
	//关闭按钮
743 
	$(".workclose").click(function(){
744 
		$(".blackcover").remove();
745 
		$("body").css("overflow","auto");
746 
	});
747 
}
715 748
716 749

+ 318 - 155
src/main/webapp/js/sciresource.js
Ver fichero 

@ -69,51 +69,7 @@ $(function(){
69 69 
//
70 70
71 71
72 
//判断是修改还是发布
73 
//$(".resoumag").click(function()
74 
//{var resourceID=$(this).attr("resourceId")
75 
//	$(".blackcover").show();
76 
//	$(".resouinfo").show();
77 
//	$("#inputb").on("click",function()
78 
//			{	var $data = {};
79 
//					$data.resourceName = $("#resourceName").val();
80 
//					$data.supportedServices = $("#supportedServices").val();
81 
//					$data.professorId = userid;
82 
//					$data.hopePayMethod = $("#hopePayMethod").val();
83 
//					$data.cooperationNotes = $("#cooperationNotes").val();
84 
//					$data.subject=$("#subject").val();
85 
//					$data.industry=$("#industry").val();
86 
//					$data.descp=$("#descp").val();
87 
//					console.log($data);
88 
////				resourceName();
89 
////				professor();
90 
////				supportedServices();
91 
//				if(resourceNamePass && professorPass && supportedServicesPass)
92 
//				{
93 
//					$.ajax(
94 
//					{		"url":"/ajax/resource",
95 
//							"type":"post",
96 
//							"data":$data,
97 
//							"async": true,
98 
//							"success":function(data)
99 
//							{
100 
//								if(data.success){
101 
//									$.MsgBox.Alert('message','发布资源成功');
102 
//								}else{
103 
//
104 
//									 alert("系统异常!");
105 
//								}
106 
//							},
107 
//							error:function(){$.MsgBox.Alert('message','fail')},
108 
//							contentType :"application/x-www-form-urlencoded",
109 
//						 	dataType: "json",
110 
//						 	beforeSend:function(){
111 
//						 		console.log(this.data);
112 
//						 	}
113 
//					})
114 
//				}
115 
//			});
116 
//});
72
117 73 
//我的资源的删除，修改
118 74 
	$("#workmysrc").on("click",".resoumag",function()
119 75 
			{ 

@ -311,28 +267,29 @@ $(function(){
311 267 
									"data":{"resourceId":$('.resoumag').eq(i+1).attr("resourceId")},
312 268 
									"success":function(data){
313 269 
										if(data.success)
314 
											{
315 
											console.log(data);
270 
											{console.log(data);
316 271 
												for(var j=0;j<data.data.length;j++){
317 
													if(data.data[j].dealPrice==undefined){
318 
														console.log(data.data[j].dealPrice);
319 
														data.data[j].dealPrice="";
320 
													}
272 
													if(data.data[j].dealPrice==undefined)
273 
													{
274 
														data.data[j].dealPrice=0;
275 
													}
321 276 
													if(data.data[j].payMethod==undefined){
322 277 
														data.data[j].payMethod="";
323 278 
													}
324 
													var inquiry=inquiryGetPaidMoney(data.data[j].operationId)
279 
													var inquiry=inquiryGetPaidMoney(data.data[j].operationId);
325 280 
													var addString='<tr class="workitem">'
326 
									                    addString+='<td>'+data.data[j].deliverTime+'</td>'
281 
									                    addString+='<td>'+data.data[j].dealTime+'</td>'
327 282 
									                     addString+='<td class="workitemsrc">'+data.data[j].applysquare+'</td>'
328 283 
									                      addString+='<td> <a class="worktel" href="">'+data.data[j].professor.name+'<span class="worktelbtn"></span></a></td>'
329 
									                      addString+='<td>'+data.data[j].dealTime+'</td>'
330 
									                       addString+='<td>'+data.data[j].dealPrice+'</td>'
284 
									                      addString+='<td>'+data.data[j].deliverTime+'</td>'
285 
									                       addString+='<td class="price1">'+data.data[j].dealPrice+'</td>'
331 286 
									                        addString+='<td>'+data.data[j].payMethod+'</td>'
332 287 
									                       addString+='<td><span>'+inquiry+'</span>/<span>'+data.data[j].dealPrice+'</span><br></td>'
333 288 
									                        addString+='<td><div class="modification"></div></td> </tr>'
334 289 
									                        	$(".tablecon").eq(i).append(addString);
335
290 
																if($(".price1").eq(k).text()==0){
291 
																	$(".price1").eq(k).text("");
292 
																}
336 293 
																switch(data.data[j].operationStatus)
337 294 
																{
338 295 
																case 1:

@ -345,14 +302,14 @@ $(function(){
345 302 
																case 2:
346 303 
																	var string='<span>发送报价待对方确认</span><br/>'
347 304 
																	string+='<a class="operatebtn">'
348 
																	string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus="1" operationId='+data.data[j].operationId+'>修改报价</span><br />'
305 
																	string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus="2" operationId='+data.data[j].operationId+'>修改报价</span><br />'
349 306 
																	string+='</a>'
350 307 
																	$(".modification").eq(k).html(string);
351 308 
																  break;
352 309 
																case 3:
353 310 
																	var string='<span>对方发来报价合作进行中</span><br/>'
354 311 
																	string+='<a class="operatebtn">'
355 
																	string+='<span class="detailm"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>查看详情</span><br />'
312 
																		string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+' dealPrice='+data.data[j].dealPrice+'>查看详情</span><br />'
356 313 
																	string+='<span class="drawback"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+' dealPrice='+data.data[j].dealPrice+'>退款</span><br />'
357 314 
																	string+='<span resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>投诉</span>'
358 315 
																	string+='</a>'

@ -375,9 +332,9 @@ $(function(){
375 332 
																case 6:
376 333 
																		var string='<span>对方中止合作合作结束</span><br/>'
377 334 
																		string+='<a class="operatebtn">'
378 
																		string+='<span class="detailm"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>查看详情</span><br />'
379 
																		//string+='<span class="discuss"dataStatus="1"resourceId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>评价</span><br />'
380 
																		string+='<span class="drawback"resourceId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>退款</span><br />'
335 
																			string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+' dealPrice='+data.data[j].dealPrice+'>查看详情</span><br />'
336 
																		//string+='<span class="discuss" dataStatus="1"resourceId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>评价</span><br />'
337 
																		string+='<span class="drawback"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+' dealPrice='+data.data[j].dealPrice+'>退款</span><br />'
381 338 
																		string+='<span class="complain"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>投诉</span>'
382 339 
																		string+='</a>'
383 340 
																		$(".modification").eq(k).html(string);	

@ -385,7 +342,7 @@ $(function(){
385 342 
																case 7:
386 343 
																	var string='<span>合作进行中</span><br/>'
387 344 
																	string+='<a class="operatebtn">'
388 
																	string+='<span class="detailm"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>查看详情</span><br />'
345 
																		string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+' dealPrice='+data.data[j].dealPrice+'>查看详情</span><br />'
389 346 
																	string+='<span class="acknowledgement"resourceId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>确认完成</span><br />'
390 347 
																	string+='<span class="complain"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>投诉</span>'
391 348 
																	string+='</a>'

@ -394,8 +351,8 @@ $(function(){
394 351 
																case 8:
395 352 
																	var string='<span>完成</span><br/>'
396 353 
																	string+='<a class="operatebtn">'
397 
																	string+='<span class="detailm"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>查看详情</span><br />'
398 
																	//string+='<span class="discuss"dataStatus="1"resourceId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>评价</span><br />'
354 
																		string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+' dealPrice='+data.data[j].dealPrice+'>查看详情</span><br />'
355 
																	//string+='<span class="discuss" dataStatus="1"resourceId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>评价</span><br />'
399 356 
																	string+='<span class="complain"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>投诉</span>'
400 357 
																	string+='</a>'
401 358 
																	$(".modification").eq(k).html(string);

@ -475,28 +432,29 @@ $(function(){
475 432 
									"data":{"resourceId":$('.resoumag').eq(i+1).attr("resourceId")},
476 433 
									"success":function(data){
477 434 
										if(data.success)
478 
											{
479 
											console.log(data);
435 
											{console.log(data);
480 436 
												for(var j=0;j<data.data.length;j++){
481 
													if(data.data[j].dealPrice==undefined){
482 
														console.log(data.data[j].dealPrice);
483 
														data.data[j].dealPrice="";
484 
													}
437 
													if(data.data[j].dealPrice==undefined)
438 
													{
439 
														data.data[j].dealPrice=0;
440 
													}
485 441 
													if(data.data[j].payMethod==undefined){
486 442 
														data.data[j].payMethod="";
487 443 
													}
488 
													var inquiry=inquiryGetPaidMoney(data.data[j].operationId)
444 
													var inquiry=inquiryGetPaidMoney(data.data[j].operationId);
489 445 
													var addString='<tr class="workitem">'
490 
									                    addString+='<td>'+data.data[j].deliverTime+'</td>'
446 
									                    addString+='<td>'+data.data[j].dealTime+'</td>'
491 447 
									                     addString+='<td class="workitemsrc">'+data.data[j].applysquare+'</td>'
492 448 
									                      addString+='<td> <a class="worktel" href="">'+data.data[j].professor.name+'<span class="worktelbtn"></span></a></td>'
493 
									                      addString+='<td>'+data.data[j].dealTime+'</td>'
494 
									                       addString+='<td>'+data.data[j].dealPrice+'</td>'
449 
									                      addString+='<td>'+data.data[j].deliverTime+'</td>'
450 
									                       addString+='<td class="price1">'+data.data[j].dealPrice+'</td>'
495 451 
									                        addString+='<td>'+data.data[j].payMethod+'</td>'
496 452 
									                       addString+='<td><span>'+inquiry+'</span>/<span>'+data.data[j].dealPrice+'</span><br></td>'
497 453 
									                        addString+='<td><div class="modification"></div></td> </tr>'
498 454 
									                        	$(".tablecon").eq(i).append(addString);
499
455 
																if($(".price1").eq(k).text()==0){
456 
																	$(".price1").eq(k).text("");
457 
																}
500 458 
																switch(data.data[j].operationStatus)
501 459 
																{
502 460 
																case 1:

@ -509,14 +467,14 @@ $(function(){
509 467 
																case 2:
510 468 
																	var string='<span>发送报价待对方确认</span><br/>'
511 469 
																	string+='<a class="operatebtn">'
512 
																	string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus="1" operationId='+data.data[j].operationId+'>修改报价</span><br />'
470 
																	string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus="2" operationId='+data.data[j].operationId+'>修改报价</span><br />'
513 471 
																	string+='</a>'
514 472 
																	$(".modification").eq(k).html(string);
515 473 
																  break;
516 474 
																case 3:
517 475 
																	var string='<span>对方发来报价合作进行中</span><br/>'
518 476 
																	string+='<a class="operatebtn">'
519 
																	string+='<span class="detailm"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>查看详情</span><br />'
477 
																		string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+' dealPrice='+data.data[j].dealPrice+'>查看详情</span><br />'
520 478 
																	string+='<span class="drawback"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+' dealPrice='+data.data[j].dealPrice+'>退款</span><br />'
521 479 
																	string+='<span resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>投诉</span>'
522 480 
																	string+='</a>'

@ -539,9 +497,9 @@ $(function(){
539 497 
																case 6:
540 498 
																		var string='<span>对方中止合作合作结束</span><br/>'
541 499 
																		string+='<a class="operatebtn">'
542 
																		string+='<span class="detailm"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>查看详情</span><br />'
500 
																			string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+' dealPrice='+data.data[j].dealPrice+'>查看详情</span><br />'
543 501 
																		//string+='<span class="discuss" dataStatus="1"resourceId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>评价</span><br />'
544 
																		string+='<span class="drawback"resourceId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>退款</span><br />'
502 
																		string+='<span class="drawback"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+' dealPrice='+data.data[j].dealPrice+'>退款</span><br />'
545 503 
																		string+='<span class="complain"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>投诉</span>'
546 504 
																		string+='</a>'
547 505 
																		$(".modification").eq(k).html(string);	

@ -549,7 +507,7 @@ $(function(){
549 507 
																case 7:
550 508 
																	var string='<span>合作进行中</span><br/>'
551 509 
																	string+='<a class="operatebtn">'
552 
																	string+='<span class="detailm"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>查看详情</span><br />'
510 
																		string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+' dealPrice='+data.data[j].dealPrice+'>查看详情</span><br />'
553 511 
																	string+='<span class="acknowledgement"resourceId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>确认完成</span><br />'
554 512 
																	string+='<span class="complain"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>投诉</span>'
555 513 
																	string+='</a>'

@ -558,7 +516,7 @@ $(function(){
558 516 
																case 8:
559 517 
																	var string='<span>完成</span><br/>'
560 518 
																	string+='<a class="operatebtn">'
561 
																	string+='<span class="detailm"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>查看详情</span><br />'
519 
																		string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+' dealPrice='+data.data[j].dealPrice+'>查看详情</span><br />'
562 520 
																	//string+='<span class="discuss" dataStatus="1"resourceId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>评价</span><br />'
563 521 
																	string+='<span class="complain"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>投诉</span>'
564 522 
																	string+='</a>'

@ -595,79 +553,178 @@ $(function(){
595 553 
	}
596 554
597 555 
//我的资源状态的回复
598 
$("#consd").on("click",".detailmess",function(){
599 
	ResourceApply();
556 
$("#consd").on("click",".detailmess",function(){
600 557 
	$(".stateinfor span").text("回复申请");
601 558 
	var operationId=$(this).attr("operationId");
602 
	//console.log(operationId);
603 559 
	var operationStatus=$(this).attr("operationStatus");
604 
	//console.log(operationStatus);
560 
	var priceDifference=$(this).attr("dealPrice");
561 
	console.log(priceDifference);
605 562 
	flag=0;
606 
	ajaxGet(operationId);
563
607 564 
	if(flag==0&&operationStatus==1)
608 
	{
565 
	{	ResourceApply();
566 
		ajaxGet(operationId);
567 
		$(".dealTime").replaceWith("<span class='dealTime'></span>");
568 
		$(".detail").replaceWith("<span class='detail'></span>");
569 
		$("select").replaceWith("<span class='sname'></span>")
609 570 
		$(".btnboxdown").css({"display":"none"});
610 571 
		$(".applysure").css({"display":"none"});
572 
		$(".resouinfotype2").text("");
611 573 
		$("#nextStep").click(function(){
612 
		$(".btnboxup").css({"display":"none"});
613 
		$(".btnboxdown").css({"display":"block"});
614 
		$(".applysure").css({"display":"block"});
615 
		$(".bag").css("display","none");
616 
		$(".frm").click(function(){
617 
			var $date = {};
618 
			$date.detailDemand=$(".detail").val();
619 
			$date.dealTime=$(".dealTime").val();
620 
			$date.dealPrice = $("#dealPrice").val();
621 
			$date.payMethod = $("#payMethod").val();
622 
			$date.replyNotes = $("#consultContent").val();
623 
			$date.operationId=operationId;
624 
			$date.operationStatus=2;
625 
			$.ajax({
626 
				"url" : "/ajax/operation",
627 
				"type" : "put",
628 
				"data" :JSON.stringify($date),
629 
				"contentType" :"application/json",
630 
				"success" : function(data) {
631 
					if (data.success) {
632 
						location.reload(true);
633 
						//alert("jjjjjjjjjjjjjj");
634 
						//console.log(data);
635 
					} else {
636 
						alert(data.msg);
637 
					}
574 
			$(".stateinfor span").text("报价中");
575 
			$(".btnboxup").css({"display":"none"});
576 
			$(".btnboxdown").css({"display":"block"});
577 
			$(".applysure").css({"display":"block"});
578 
			$(".bag").css("display","none");
579
580 
			$(".frm").click(function(){
581 
				var $date = {};
582 
				$date.detailDemand=$(".detail").val();
583 
				$date.deliverTime=$(".dealTime").val();
584 
				$date.dealPrice = $("#dealPrice").val();
585 
				$date.payMethod = $("#payMethod").val();
586 
				$date.replyNotes = $("#consultContent").val();
587 
				$date.applysquare = $(".sname").text();
588 
				$date.operationId=operationId;
589 
				$date.operationStatus=2;
590 
				$.ajax({
591 
					"url" : "/ajax/operation",
592 
					"type" : "put",
593 
					"data" :JSON.stringify($date),
594 
					"contentType" :"application/json",
595 
					"success" : function(data) {
596 
						if (data.success) {
597 
							location.reload(true);
598 
						} else {
599 
							alert(data.msg);
600 
						}
601 
					},
602 
				"beforeSend":function(){
603 
					//console.log(this.data);
638 604 
				},
639 
			"beforeSend":function(){
640 
				//console.log(this.data);
641 
			},
642 
			});
643 
		})
605 
				});
606 
			})
644 607
645 608 
		})
646 609 
		$("#refuses").click(function(){
610 
			ResourceApply();
611 
			ajaxGet(operationId);
647 612 
			upStatus(operationId,5);
648 613 
		});
649 614 
	}
650 615 
	if(flag==0&&operationStatus==2){
651 
		$(".btnboxup").css({"display":"none"});
616 
		ResourceApply();
617 
		ajaxGet(operationId);
618 
		$(".dealTime").replaceWith("<span class='dealTime'></span>");
619 
		$(".detail").replaceWith("<span class='detail'></span>");
620 
		$("select").replaceWith("<span class='sname'></span>")
652 621 
		$(".btnboxdown").css({"display":"none"});
653 
		ajaxGet(operationId);
622 
		$(".applysure").css({"display":"none"});
623 
		$(".resouinfotype2").text("");
624 
			$(".stateinfor span").text("修改报价中");
625 
			$(".btnboxup").css({"display":"none"});
626 
			$(".btnboxdown").css({"display":"block"});
627 
			$(".applysure").css({"display":"block"});
628 
			$(".bag").css("display","none");
629
630 
			$(".frm").click(function(){
631 
				var $date = {};
632 
				$date.detailDemand=$(".detail").val();
633 
				$date.deliverTime=$(".dealTime").val();
634 
				$date.dealPrice = $("#dealPrice").val();
635 
				$date.payMethod = $("#payMethod").val();
636 
				$date.replyNotes = $("#consultContent").val();
637 
				$date.applysquare = $(".sname").text();
638 
				$date.operationId=operationId;
639 
				$date.operationStatus=2;
640 
				$.ajax({
641 
					"url" : "/ajax/operation",
642 
					"type" : "put",
643 
					"data" :JSON.stringify($date),
644 
					"contentType" :"application/json",
645 
					"success" : function(data) {
646 
						if (data.success) {
647 
							location.reload(true);
648 
						} else {
649 
							alert(data.msg);
650 
						}
651 
					},
652 
				"beforeSend":function(){
653 
					//console.log(this.data);
654 
				},
655 
				});
656 
			})
654 657 
	}
655 658 
	if(flag==0&&operationStatus==3){
656 
		$(".btnboxup").css({"display":"none"});
657 
		$(".btnboxdown").css({"display":"none"});
658 
		ajaxGet(operationId);
659
660 
		DetailInfo();
661 
		$("#totalPrice").text(priceDifference);
662 
		$(".liuyaninfo").css("display","none");
663 
		$(".pingjiainfo").css("display","none");
664 
		ajaxGet1(operationId);
665 
		$(".payaddbox1").css("display","none");
666 
		discussGetPaidMoney(operationId,priceDifference)
659 667 
	}
660 668 
	if(flag==0&&operationStatus==5){
661 
		$(".btnboxup").css({"display":"none"});
669 
		ResourceApply();
670 
		ajaxGet(operationId);
671 
		$(".dealTime").replaceWith("<span class='dealTime'></span>");
672 
		$(".detail").replaceWith("<span class='detail'></span>");
673 
		$("select").replaceWith("<span class='sname'></span>")
662 674 
		$(".btnboxdown").css({"display":"none"});
663 675 
		$(".applysure").css({"display":"none"});
664 
		ajaxGet(operationId);
676 
		$(".resouinfotype2").text("");
677 
		$(".addrebtn").css("display","none");
665 678 
	}
666 679 
	if(flag==0&&operationStatus==4){
667 
		$(".btnboxup").css({"display":"none"});
680 
		ResourceApply();
681 
		ajaxGet1(operationId);
682 
		$(".dealTime").replaceWith("<span class='dealTime'></span>");
683 
		$(".detail").replaceWith("<span class='detail'></span>");
684 
		$("select").replaceWith("<span class='sname'></span>")
668 685 
		$(".btnboxdown").css({"display":"none"});
669 
		ajaxGet(operationId);
686 
		$(".applysure").css({"display":"none"});
687 
		$(".resouinfotype2").text("");
688 
			$(".stateinfor span").text("详情");
689 
			$(".btnboxup").css({"display":"none"});
690 
			$(".btnboxdown").css({"display":"block"});
691 
			$(".applysure").css({"display":"block"});
692 
			$(".bag").css("display","none");
693 
			$(".addrebtn").css("display","none");
694 
			$("#payMethod").replaceWith("<span id='payMethod'><span>");
695 
			$("#dealPrice").replaceWith("<span id='dealPrice'><span>");
696 
			$("#consultContent").replaceWith("<span id='consultContent'><span>");
697 
			}
698 
if(flag==0&&operationStatus==6){
699
700 
		DetailInfo();
701 
		$("#totalPrice").text(priceDifference);
702 
		$(".liuyaninfo").css("display","none");
703 
		$(".pingjiainfo").css("display","none");
704 
		ajaxGet1(operationId);
705 
		$(".payaddbox1").css("display","none");
706 
		discussGetPaidMoney(operationId,priceDifference)
670 707 
	}
708 
if(flag==0&&operationStatus==7){
709
710 
	DetailInfo();
711 
	$("#totalPrice").text(priceDifference);
712 
	$(".liuyaninfo").css("display","none");
713 
	$(".pingjiainfo").css("display","none");
714 
	ajaxGet1(operationId);
715 
	$(".payaddbox1").css("display","none");
716 
	discussGetPaidMoney(operationId,priceDifference)
717 
}
718 
if(flag==0&&operationStatus==8){
719
720 
	DetailInfo();
721 
	$("#totalPrice").text(priceDifference);
722 
	$(".liuyaninfo").css("display","none");
723 
	$(".pingjiainfo").css("display","none");
724 
	ajaxGet1(operationId);
725 
	$(".payaddbox1").css("display","none");
726 
	discussGetPaidMoney(operationId,priceDifference)
727 
}
671 728 
})
672 729
673 730 


@ -684,22 +741,25 @@ $.ajax({
684 741 
				for(var i=0;i<data.data.length;i++)
685 742 
					{	var inq=inquiryGetPaidMoney(data.data[i].operationId);
686 743 
					if(data.data[i].dealPrice==undefined){
687 
						data.data[i].dealPrice="";
744 
						data.data[i].dealPrice=0;
688 745 
					}
689 746 
					if(data.data[i].payMethod==undefined){
690 747 
						data.data[i].payMethod="";
691 748 
					}
692 749 
					var stringContent="";
693 750 
						stringContent +='<tr class="workitem">'
694 
	                    stringContent +='<td>'+data.data[i].deliverTime+'</td>'
751 
	                    stringContent +='<td>'+data.data[i].dealTime+'</td>'
695 752 
	                    stringContent +='<td class="workitemsrc">'+data.data[i].resource.resourceName+'</td>'
696 753 
	                    stringContent +='<td> <a class="worktel" href="">'+data.data[i].resource.professor.name+'<span class="worktelbtn"></span></a></td>'
697 
	                    stringContent +='<td>'+data.data[i].dealTime+'</td>'
698 
	                    stringContent +='<td>'+data.data[i].dealPrice+'</td>'
754 
	                    stringContent +='<td>'+data.data[i].deliverTime+'</td>'
755 
	                    stringContent +='<td class="price2">'+data.data[i].dealPrice+'</td>'
699 756 
	                    stringContent +='<td>'+data.data[i].payMethod+'</td>'
700 757 
	                    stringContent +='<td><span>'+inq+'</span>/<span>'+data.data[i].dealPrice+'</span><br></td>'
701 758 
	                    stringContent +='<td><div class="loginStatus"></div></td></tr>'
702 
	                   $(".worktabb").append( stringContent);
759 
	                   $(".worktabb").append( stringContent);
760 
									if($(".price2").eq(i).text()==0){
761 
										$(".price2").eq(i).text("");
762 
									}
703 763 
							switch(data.data[i].operationStatus)
704 764 
							{
705 765 
							case 1:

@ -719,7 +779,7 @@ $.ajax({
719 779 
							case 3:
720 780 
								var string='<span>合作进行中</span><br/>'
721 781 
								string+='<a class="opbtn">'
722 
								string+='<span class="detailm"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>查看详情</span><br />'
782 
								string+='<span class="detailm"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+' dealPrice='+data.data[i].dealPrice+'>查看详情</span><br />'
723 783 
								string+='<span class="payMonety"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+' dealPrice='+data.data[i].dealPrice+'>付款</span><br />'
724 784 
								string+='<span class="stopcoo"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>中止合作</span>'
725 785 
								string+='</a>'

@ -779,8 +839,13 @@ $.ajax({
779 839 
});
780 840 
//确认完成
781 841 
$(".workmysrc").on("click",".acknowledgement",function(){
782 
	 var op=$(this).attr("operationId");
783 
	 upStatus(op,8);
842 
	finish();
843 
	 var op=$(this).attr("operationId");
844 
	$(".com1").click(function(){
845
846 
		 upStatus(op,8);
847 
	})
848
784 849 
})
785 850 
//退款
786 851 
$(".workmysrc").on("click",".drawback",function(){

@ -791,6 +856,7 @@ $(".workmysrc").on("click",".drawback",function(){
791 856 
	 var op=$(this).attr("operationId");
792 857 
	 var $price=$(this).attr("dealPrice");
793 858 
	 $("#totalPrice").text($price);
859 
	 console.log($price);
794 860 
	 discussGetPaidMoney(op,$price);
795 861
796 862 
	 

@ -1191,22 +1257,24 @@ if(data.success)
1191 1257 
$(".workmysrc").on("click",".detailm",function(){
1192 1258 
//	$(".blackcover").show();
1193 1259 
//	$(".resouapply").show();
1194 
	ResourceApply();
1260
1261 
	//DetailInfo()
1195 1262 
	var resourceId=$(this).attr("resourId");
1196 1263 
	var operationStatus=$(this).attr("operationStatus");
1197 1264 
	var operationId=$(this).attr("operationId");
1265 
	var priceDifference=$(this).attr("dealPrice");
1198 1266 
	flag=1;
1199 1267 
	if(flag==1&&operationStatus==1)
1200 1268 
	{
1269 
		ResourceApply();
1201 1270 
		$(".stateinfor span").text("修改申请中");
1202 1271 
		$(".btnboxup").css({"display":"none"});
1203 1272 
		$(".applysure").css({"display":"none"});
1204 
//		$(".dealTime").replaceWith("<input type='text'colspan='2'class='dealTime'>");
1205 1273 
		ajaxGet(operationId);
1206 1274 
		//if($(".dealTime").val()!=""&&$(".detail").val()!="")
1207 1275 
		//{
1208 1276 
			$("#del").on("click",function()
1209 
					{	//console.log($(".dealTime").val());
1277 
					{
1210 1278 
						var $data = {};
1211 1279 
						$data.operationId=operationId;
1212 1280 
						$data.detailDemand=$(".detail").val();

@ -1233,11 +1301,29 @@ $(".workmysrc").on("click",".detailm",function(){
1233 1301 
	}
1234 1302 
	if(flag==1&&operationStatus==2)
1235 1303 
	{
1236 
		$(".btnboxup").css({"display":"none"});
1237 
		$(".btnboxdown1").css({"display":"none"});
1304 
		//ResourceApply();
1305 
		//$(".btnboxup").css({"display":"none"});
1306 
		//$(".btnboxdown1").css({"display":"none"});
1307 
		ResourceApply();
1308 
		ajaxGet1(operationId);
1309 
		$(".dealTime").replaceWith("<span class='dealTime'></span>");
1310 
		$(".detail").replaceWith("<span class='detail'></span>");
1311 
		$("select").replaceWith("<span class='sname'></span>")
1312 
		$(".btnboxdown").css({"display":"none"});
1313 
		$(".applysure").css({"display":"none"});
1314 
		$(".resouinfotype2").text("");
1315 
			$(".stateinfor span").text("详情");
1316 
			$(".btnboxup").css({"display":"none"});
1317 
			$(".btnboxdown").css({"display":"block"});
1318 
			$(".applysure").css({"display":"block"});
1319 
			$(".bag").css("display","none");
1320 
			//$(".addrebtn").css("display","none");
1321 
			$("#payMethod").replaceWith("<span id='payMethod'><span>");
1322 
			$("#dealPrice").replaceWith("<span id='dealPrice'><span>");
1323 
			$("#consultContent").replaceWith("<span id='consultContent'><span>");
1238 1324 
		$(".frm")[0].value="直接拒绝";
1239 1325 
		$("#cooperation")[0].value="合作";
1240 
		ajaxGet(operationId);
1326 
		//ajaxGet(operationId);
1241 1327 
		$(".frm").click(function(){
1242 1328 
			$.ajax({"url" : "../ajax/operation/operationStatus",
1243 1329 
				"type" : "POST",

@ -1262,27 +1348,71 @@ $(".workmysrc").on("click",".detailm",function(){
1262 1348 
		})
1263 1349 
	}
1264 1350 
	if(flag==1&&operationStatus==3){
1265 
		$(".btnboxup").css({"display":"none"});
1266 
		$(".btnboxdown").css({"display":"none"});
1267 
		ajaxGet(operationId);
1351 
		DetailInfo();
1352 
		$("#totalPrice").text(priceDifference);
1353 
		$(".liuyaninfo").css("display","none");
1354 
		$(".pingjiainfo").css("display","none");
1355 
		ajaxGet1(operationId);
1356 
		$(".payaddbox1").css("display","none");
1357 
		discussGetPaidMoney(operationId,priceDifference);
1268 1358 
	}
1269 1359 
	if(flag==1&&operationStatus==4){
1270 
		$(".btnboxup").css({"display":"none"});
1271 
		$(".btnboxdown").css({"display":"none"});
1360 
		ResourceApply();
1272 1361 
		ajaxGet(operationId);
1362 
		$(".stateinfor").find("span").text("合作结束");
1363 
		$(".dealTime").replaceWith("<span class='dealTime'></span>");
1364 
		$(".detail").replaceWith("<span class='detail'></span>");
1365 
		$("select").replaceWith("<span class='sname'></span>")
1366 
		$(".btnboxdown").css({"display":"none"});
1367 
		$(".applysure").css({"display":"none"});
1368 
		$(".resouinfotype2").text("");
1369 
		$(".addrebtn").css("display","none");
1273 1370 
	}
1274 1371 
	if(flag==1&&operationStatus==5){
1275 
		$(".btnboxup").css({"display":"none"});
1372 
		ResourceApply();
1373 
		ajaxGet1(operationId);
1374 
		$(".dealTime").replaceWith("<span class='dealTime'></span>");
1375 
		$(".detail").replaceWith("<span class='detail'></span>");
1376 
		$("select").replaceWith("<span class='sname'></span>")
1276 1377 
		$(".btnboxdown").css({"display":"none"});
1277 1378 
		$(".applysure").css({"display":"none"});
1278 
		ajaxGet(operationId);
1379 
		$(".resouinfotype2").text("");
1380 
			$(".stateinfor span").text("详情");
1381 
			$(".btnboxup").css({"display":"none"});
1382 
			$(".btnboxdown").css({"display":"block"});
1383 
			$(".applysure").css({"display":"block"});
1384 
			$(".bag").css("display","none");
1385 
			$(".addrebtn").css("display","none");
1386 
			$("#payMethod").replaceWith("<span id='payMethod'><span>");
1387 
			$("#dealPrice").replaceWith("<span id='dealPrice'><span>");
1388 
			$("#consultContent").replaceWith("<span id='consultContent'><span>");
1279 1389 
	}
1280 1390 
	if(flag==1&&operationStatus==6){
1281 
		$(".btnboxup").css({"display":"none"});
1282 
		$(".btnboxdown").css({"display":"none"});
1283 
		$(".applysure").css({"display":"none"});
1284 
		ajaxGet(operationId);
1285 
		discussGetContent(operationId);
1391 
		DetailInfo();
1392 
		$("#totalPrice").text(priceDifference);
1393 
		$(".liuyaninfo").css("display","none");
1394 
		$(".pingjiainfo").css("display","none");
1395 
		ajaxGet1(operationId);
1396 
		$(".payaddbox1").css("display","none");
1397 
		discussGetPaidMoney(operationId,priceDifference)
1398 
	}
1399 
	if(flag==1&&operationStatus==7){
1400 
		DetailInfo();
1401 
		$("#totalPrice").text(priceDifference);
1402 
		$(".liuyaninfo").css("display","none");
1403 
		$(".pingjiainfo").css("display","none");
1404 
		ajaxGet1(operationId);
1405 
		$(".payaddbox1").css("display","none");
1406 
		discussGetPaidMoney(operationId,priceDifference)
1407 
	}
1408 
	if(flag==1&&operationStatus==8){
1409 
		DetailInfo();
1410 
		$("#totalPrice").text(priceDifference);
1411 
		$(".liuyaninfo").css("display","none");
1412 
		$(".pingjiainfo").css("display","none");
1413 
		ajaxGet1(operationId);
1414 
		$(".payaddbox1").css("display","none");
1415 
		discussGetPaidMoney(operationId,priceDifference)
1286 1416 
	}
1287 1417 
})
1288 1418 
//获取评论

@ -1338,8 +1468,9 @@ function ajaxGet(operationId){
1338 1468 
					$(".log").text(data.data.resource.resourceName);
1339 1469 
					$(".timelog").text(data.data.deliverTime);
1340 1470 
					$(".contration").text(data.data.operationId);
1341 
					$(".detail").val(data.data.detailDemand);
1342 
					$(".dealTime").val(data.data.dealTime);
1471 
					$(".detail").text(data.data.detailDemand);
1472 
					$(".dealTime").text(data.data.dealTime);
1473 
					$(".sname").text(data.data.applysquare);
1343 1474 
					if(data.data.payMethod){
1344 1475 
						$("#payMethod").val(data.data.payMethod);
1345 1476 
					}

@ -1358,7 +1489,39 @@ function ajaxGet(operationId){
1358 1489 
		"error":function(){$.MsgBox.Alert('message','failddd')}
1359 1490 
	});
1360 1491 
}
1492 
function ajaxGet1(operationId){
1493 
	$.ajax({
1494 
		"url":"/ajax/operation/"+operationId,
1495 
		"type":"get",
1496 
		"async": true,
1361 1497
1498 
		"success":function(data){
1499 
			if(data.success)
1500 
				{console.log(data);
1501 
					$(".log").text(data.data.resource.resourceName);
1502 
					$(".timelog").text(data.data.deliverTime);
1503 
					$(".contration").text(data.data.operationId);
1504 
					$(".detail").text(data.data.detailDemand);
1505 
					$(".dealTime").text(data.data.dealTime);
1506 
					$(".sname").text(data.data.applysquare);
1507 
					if(data.data.payMethod){
1508 
						$("#payMethod").text(data.data.payMethod);
1509 
					}
1510 
					if(data.data.dealPrice){
1511 
						$("#dealPrice").text(data.data.dealPrice);
1512 
					}
1513 
					if(data.data.replyNotes){
1514 
						$("#consultContent").text(data.data.replyNotes);
1515 
					}
1516 
				}
1517 
				else
1518 
				{
1519 
					//console.log("系统异常!");
1520 
				}
1521 
		},
1522 
		"error":function(){$.MsgBox.Alert('message','failddd')}
1523 
	});
1524 
}
1362 1525
1363 1526 
	/*科研资源菜单点击切换*/
1364 1527 
	$(".worksamlltit1").click(function(){

+ 41 - 7
src/main/webapp/js/workspace.js
Ver fichero 

@ -1,5 +1,4 @@
1 1 
// JavaScript Document
2
3 2 
	$.ajax({
4 3 
		"url":"workindex.html",
5 4 
		"dataType":"html",

@ -23,18 +22,53 @@
23 22
24 23 
		})
25 24 
	})
25
26
27
26 28 
	$(".workmenu").on("click","#consultbtn",function(){
29
27 30 
		$.ajax({
28 31 
			"url":"consult.html",
29 32 
			"dataType":"html",
30 33 
			"success":function(result){
31 34 
				//console.log(data);
32
33 
			$(".workcon").html(result);
35 
				$(".workcon").html(result);
36
37 
				//判断咨询是否有数据，有显示，没有不显示
38 
				var flag = 1;
39 
			    if(flag == 0){
40 
			        $(".worksamlltit3:first").hide();
41 
			        $(".workmysrc3:first").hide();
42 
			        $(".workmysrc3:last").fadeIn();
43 
			    }else {
44
45 
			        $(".worksamlltit3:first").addClass("active").show();
46 
			        $(".workmysrc3:first").show();
47
48 
			        //On Click Event
49 
			        $(".worksamlltit3").click(function() {
50 
			            $(".worksamlltit3").removeClass("worksamlltitnow");
51 
			            $(this).addClass("worksamlltitnow");
52
53 
			            $(".workmysrc3").hide();
54
55 
			            var activeTab = $(this).attr("href");
56 
//			            console.log(activeTab);
57 
//			            console.log($(activeTab));
58 
			            $(activeTab).fadeIn();
59 
			            return false;
60 
			        });
61
62 
			    };
63
64
34 65 
			}
35 66
36 67 
		})
68
37 69 
	})
70
71
38 72 
	$(".workmenu").on("click","#sciprojectbtn",function(){
39 73 
		$.ajax({
40 74 
			"url":"sciproject.html",

@ -74,18 +108,18 @@
74 108 
 	});
75 109
76 110 
 	/*咨询菜单点击切换*/
77 
	$(".worksamlltit3").click(function(){
111 
	/*$(".worksamlltit3").click(function(){
78 112 
		var index = $(this).index();
79 113 
		$(this).addClass("worksamlltitnow").siblings().removeClass("worksamlltitnow");
80 114 
		$(".workmysrc3").eq(index).show().siblings().hide();
81 
	});
115 
	});*/
82 116
83 117 
 	/*科研项目菜单点击切换*/
84 
 	$(".worksamlltit2").click(function(){
118 
 	/*$(".worksamlltit2").click(function(){
85 119 
 		var index = $(this).index();
86 120 
 		$(this).addClass("worksamlltitnow").siblings().removeClass("worksamlltitnow");
87 121 
 		$(".workmysrc2").eq(index).show().siblings().hide();
88 
 	});
122 
 	});*/
89 123
90 124
91 125

+ 4 - 0
src/main/webapp/workspaces.html
Ver fichero 

@ -11,6 +11,7 @@
11 11 
	}
12 12 
	#commbox .span{background: url(../images/evastar.png) 0 0px no-repeat;}
13 13 
	</style>
14 
<link rel="stylesheet" href="//apps.bdimg.com/libs/jqueryui/1.10.4/css/jquery-ui.min.css">
14 15 
<link type="text/css" href="css/bootstrap.min.css" rel="stylesheet">
15 16 
<link type="text/css" href="css/reset.css" rel="stylesheet" />
16 17 
<link type="text/css" href="css/common.css" rel="stylesheet">

@ -94,6 +95,8 @@
94 95 
	<div class="footer-btm">本站由 阿里云 提供计算与安全服务 Copyright © 2016~2017 科袖 | 京ICP备12345678号 | 京ICP证123456号 | 京公网安备11010800011111号 | 网站联盟安全认证</div>
95 96 
</div>
96 97 
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
98 
<script src="//apps.bdimg.com/libs/jquery/1.10.2/jquery.min.js"></script>
99 
<script src="//apps.bdimg.com/libs/jqueryui/1.10.4/jquery-ui.min.js"></script>
97 100 
<script type="text/javascript" src="js/common.js"></script>
98 101 
<script type="text/javascript" src="js/jquery.HeadP.js"> </script>
99 102 
<script type="text/javascript" src="js/jquery.Jcrop.js"> </script>

@ -106,5 +109,6 @@
106 109 
<script type="text/javascript" src="js/popup.js"></script>
107 110 
<script type="text/javascript" src="js/workspace.js"></script>
108 111
112
109 113 
</body>
110 114 
</html>