首页 探索 帮助
注册 登录
bulomakaka
/
ekexiu.com.portal
关注 7
点赞 0
派生 0
代码 工单管理 0 合并请求 0 提交历史 114 版本发布 0 Wiki
浏览代码

1、修改资源列表读取bug
2、专家信息列表全刷洗问题

luyanan 8 年之前
父节点
d6c838cc13
当前提交
6c996b2d2e
共有 10 个文件被更改，包括 345 次插入 和 175 次删除
分列视图 显示文件统计
  1. 1 1
      src/main/webapp/css/common.css
  2. 2 1
      src/main/webapp/css/popup.css
  3. 12 10
      src/main/webapp/css/workspace.css
  4. 二进制
      src/main/webapp/images/progressing.png
  5. 1 1
      src/main/webapp/information.html
  6. 155 34
      src/main/webapp/js/information.js
  7. 5 5
      src/main/webapp/js/jquery.similar.msgbox.js
  8. 121 107
      src/main/webapp/js/sciresource.js
  9. 48 12
      src/main/webapp/sciproject.html
  10. 0 4
      src/main/webapp/workspaces.html

+ 1 - 1
src/main/webapp/css/common.css
查看文件 

@ -38,7 +38,7 @@ url(../images/index-icon.png) no-repeat; background-position:left; margin:8px;}
38 38
39 39 
.myWorkspace{font-size: 14px;line-height:40px; text-align: center;float: left; margin-top: 10px;color: #fff;}
40 40 
/*主体部分*/
41 
#container{ min-width:1000px; background:#fff;overflow: hidden;}
41 
#container{ min-width:1170px; background:#fff;overflow: hidden;}
42 42
43 43 
/*分页*/
44 44 
.tcdPageCode{padding: 14px 20px;text-align: left;color: #000;text-align:center;font-size:14px;line-height:24px; }

+ 2 - 1
src/main/webapp/css/popup.css
查看文件 

@ -135,7 +135,8 @@
135 135 
.paymentbox1 table tr{border-bottom:1px dotted #ccc; }
136 136 
.paymentbox1 table tr:nth-child(1){border-bottom:none;}
137 137 
.paymentbox1 table tr th{ background:#f2f2f2;}
138 
.paymentbox1 table tr th,.paymentbox table tr td{ padding:10px 4px; text-align:center; }
138 
.paymentbox1 table tr th,.paymentbox1 table tr td{ padding:10px 4px; text-align:center; }
139 
.paymentbox1 #paytit tr td:nth-child(even){background:#f6f6f6;}
139 140 
.paymentbox1 table .paytit th{ background:#ff8400; color:#fff;}
140 141
141 142 
.combtn{color:#ff8400; cursor:pointer;}

+ 12 - 10
src/main/webapp/css/workspace.css
查看文件 

@ -43,7 +43,7 @@
43 43 
.righttab{ width:82%;}
44 44 
.worktab a{ color:#333;}
45 45 
.worktab a:hover{color:#ff8400;}
46 
.worktab tr td{ padding:0 4px;max-width:60px;/*text-overflow:ellipsis; overflow:hidden; white-space:nowrap;*/}
46 
.worktab tr td{ padding:0 4px;max-width:60px;word-break:break-all;/*text-overflow:ellipsis; overflow:hidden; white-space:nowrap;*/}
47 47 
.worktab .worktabtit{ height:40px;background:#fff9ef;border-bottom:1px #D8D8D8 solid;}
48 48 
.worktab .workitem{ border-bottom:1px #D8D8D8 solid;height:110px; padding:10px 0;}
49 49 
.worktab .workitem:nth-child(odd){background:#fff;}

@ -97,10 +97,10 @@
97 97 
.sharesrcbox11 .shareopeart{ position:absolute;background:rgba(0,0,0,.4); line-height:30px; text-align:center; bottom:-30px; left:0px; z-index:100; overflow:hidden; width:100%; cursor:pointer;}
98 98
99 99 
.objectsrcbox{ overflow:hidden; width:100%; padding:10px; height:160px;}
100 
.objectsrc{float:left;  width:28%; margin:10px 20px;  height:120px; background:rgba(0,0,0,.03); /*border:1px dashed #e5e5e5;*/ padding:30px 10px; cursor:pointer; }
101 
.objectsrc:hover{ background:rgba(0,0,0,.04);}
100 
.objectsrc{float:left;  width:28%; margin:10px 20px;  height:120px; border-radius:4px; background:#fbeed5; /*border:1px dashed #e5e5e5;*/ padding:30px 10px; cursor:pointer; }
101 
.objectsrc:hover{ background:#F1D299;}
102 102 
.objectsrc p{ line-height:24px; text-align:center;}
103 
.objectsrc .objectstate{ background:url(../images/progressing.png) 52px 2px no-repeat;}
103 
.objectsrc .objectstate{/* background:url(../images/progressing.png) 52px 2px no-repeat;*/}
104 104 
/*公告*/
105 105 
.workconright{ width:17%;}
106 106 
.worknotice{ width:100%; height:200px; border:1px solid #d6d6d6; margin:1px;}

@ -121,7 +121,7 @@
121 121 
.orderedbtn div{width:20px; height:20px; background:url(../images/order.png) no-repeat 0 1px #ff8400 ; border-radius:4px;}
122 122
123 123 
.workselectcon{ padding:10px;}
124 
.workselectitem{ overflow:hidden; margin:6px 0;}
124 
.workselectitem{/*  overflow:hidden; */ margin:6px 0;}
125 125 
.workselectitem:nth-child(odd){background:#fff;}
126 126 
.workselectitem table tr .workcheck{ text-align:center;}
127 127 
.worksitcon{ width:100%;margin-top:0; overflow:hidden; cursor:pointer; }

@ -147,11 +147,13 @@
147 147
148 148 
.workobjcon{ overflow:hidden; background:#fff; min-height:600px; margin-top:10px; padding:20px;}
149 149 
.workobjcon .objectsrc{ width:20%; height:200px; /*border:1px solid #e5e5e5;*/ }
150 
.workobjcon .objectsrc div{ margin-top:24px;}
151 
.workobjcon .objectsrc .objectstate{ background:url(../images/progressing.png) 40px 2px no-repeat;}
152 
.workobjcon .newobjects{ border:2px dashed #e5e5e5; line-height:80px; background:none;}
153 
.workobjcon .newobjects .newobjecticon{ line-height:100px; font-size:40px;}
154
150 
.workobjcon .objectsrc div{ margin:20px 4px;}
151 
.workobjcon .objectsrc .objectstate{/* background:url(../images/progressing.png) 40px 2px no-repeat; */margin:20px;}
152 
.workobjcon .newobjects{ border:2px dashed #e5e5e5;background:#F5F5F5;}
153 
.workobjcon .newobjects ul li{ float:left;}
154 
.workobjcon .newobjects .newobjectbox{ margin: 10px 30px;}
155 
.workobjcon .newobjects .newobjecticon{ line-height:100px; font-size:30px;}
156 
.workobjcon .newobjects .newobjectword{ line-height:106px;}
155 157
156 158
157 159

二进制
src/main/webapp/images/progressing.png
查看文件


+ 1 - 1
src/main/webapp/information.html
查看文件 

@ -132,7 +132,7 @@
132 132 
					<div class="modifybox">
133 133 
					<div class="select-sele">
134 134 
					<div class="select btn-marL" >
135 
					  	<input type="text" class="input-txt edu-txt" id="subject"/>
135 
					  	<input type="text" class="input-txt" id="subject"/>
136 136 
					</div>
137 137
138 138 
						<div class="add">

+ 155 - 34
src/main/webapp/js/information.js
查看文件 

@ -215,7 +215,7 @@ $(function(){
215 215 
			//下滑滚动不覆盖底部
216 216 
			var d;
217 217 
			var t;
218 
			$(function() {
218
219 219 
				/*向下滚动时，header背景变半透明*/
220 220 
				var top5=$(".content-left").height();
221 221 
				var top4 = $("#container").height();

@ -247,7 +247,7 @@ $(function(){
247 247 
					}
248 248
249 249 
				})
250 
			});
250
251 251 
			//下滑滚动不覆盖底部 结束
252 252 
		}
253 253 
	}

@ -255,6 +255,7 @@ $(function(){
255 255 
}
256 256 
else {
257 257 
	location.href = "login.html";
258 
	return;
258 259 
}
259 260
260 261 
	 //搜索框

@ -364,10 +365,9 @@ $("#container .edit").click(function(){
364 365 
	//点击取消的操作
365 366 
	$(".close").click(function(){
366 367 
	$(".modifybox").eq(edit).hide();
367 
	$(".infor-browse").eq(edit).show();
368 
	location.reload(true);
368 
	$(".infor-browse").eq(edit).show();
369 369 
	});
370 
	//个人简介保存
370 
});	//个人简介保存
371 371 
 $("#saveDescp").on("click", function() {
372 372 
 	$.ajax({
373 373 
 		"url": "../ajax/professor/descp",

@ -378,14 +378,17 @@ $("#container .edit").click(function(){
378 378 
 		},
379 379 
 		"contentType": "application/x-www-form-urlencoded",
380 380 
 		"success": function($data) {
381 
 			//debugger;;
381 382 
 			if ($data.success) {
382 
 				location.href = "information.html?id=" + new Date().getTime();
383 
 				$(".infor-browse").css("display","block");
384 
 				$(".modifybox").css("display","none");
385 
 				$("#descpS").text($("#descp").val());
383 386 
 			} else {
384 387 
 				$.MsgBox.Alert("message", $data.msg);
385 388 
 			}
386 389 
 		}
387 
 	});
388 
 });
390 
 	})
391 
 })
389 392 
//学术领域添加
390 393 
$("#subjectAdd").click(function(){
391 394 
	var val=$("#subject").val();

@ -411,8 +414,13 @@ $("#subjectList").on("click",".remove",function(){
411 414 
				"data" : {"id":userid,"subject":subjectAll},
412 415 
				"contentType" : "application/x-www-form-urlencoded",
413 416 
				"success" : function($data) {
414 
					if ($data.success) {
415 
						location.reload(true);
417 
					if ($data.success) {
418 
						$("#subject").val("");
419 
						$("#subjectShow").empty();
420 
						$("#subjectList").empty();
421 
						$(".modifybox").css("display","none");
422 
						$(".infor-browse").css("display","block");
423 
						subjectShow(subjectAll);
416 424 
					} else {
417 425 
						$.MsgBox.Alert("message",$data.msg);
418 426 
					}

@ -445,7 +453,12 @@ $("#industryList").on("click",".remove",function(){
445 453 
				"contentType" : "application/x-www-form-urlencoded",
446 454 
				"success" : function($data) {
447 455 
					if ($data.success) {
448 
						location.reload(true);
456 
						$("#industry").val("");
457 
						$("#industryShow").empty();
458 
						$("#industryList").empty();
459 
						$(".modifybox").css("display","none");
460 
						$(".infor-browse").css("display","block");
461 
						industryShow(industryAll);
449 462 
					} else {
450 463 
						$.MsgBox.Alert("message",$data.msg);
451 464 
					}

@ -458,7 +471,6 @@ $("#researchAreaAdd").click(function(){
458 471 
	$("#researchAreaList").append("<div class='list'><span class='like'>0</span><span class='ra'>"+ researchArea +"</span><span class='remove'><img src='images/move.png'></span></div>")
459 472 
	});
460 473
461 
 })
462 474 
//研究方向删除
463 475 
$("#researchAreaList").on("click",".remove",function(){
464 476 
	$(this).parent().remove();

@ -483,9 +495,24 @@ $("#researchAreaList").on("click",".remove",function(){
483 495 
				"data" : $has ? JSON.stringify($data) : null,
484 496 
				"contentType" : $has ? "application/json": "application/x-www-form-urlencoded",
485 497 
				"success" : function($data) {
486 
					if ($data.success) {
487 
						location.reload(true);
488 
					} else {
498 
					if ($data.success)
499 
					{
500 
						$("#researchArea").val("");
501 
						$("#researchAreaList").empty();
502 
						$("#researchAreaShow").empty();
503 
						$(".modifybox").css("display","none");
504 
						$(".infor-browse").css("display","block");
505 
						$.get("/ajax/professor/info/" + userid, function($data)
506 
								{
507 
								if ($data.success)
508 
								{
509 
									researchAreaShow($data.data.researchAreas, $data.data.researchAreaLogs);
510 
								}
511 
							});
512
513 
					}
514 
					else
515 
					{
489 516 
						$.MsgBox.Alert("message",$data.msg);
490 517 
					}
491 518 
				}

@ -535,8 +562,7 @@ var delEdu = function(data){
535 562 
		"url" : "/ajax/edu/" + data,
536 563 
		"type" : "DELETE",
537 564 
		"success" : function($data) {
538 
			if ($data.success) {
539 
				location.reload(true);
565 
			if ($data.success) {
540 566 
			} else {
541 567 
				alert($data.msg);
542 568 
			}

@ -544,6 +570,7 @@ var delEdu = function(data){
544 570 
	});
545 571 
}
546 572 
$("#eduBgList").on("click",".eg .remove",function(){
573 
	$(this).parent().remove();
547 574 
	delEdu($(this)[0].title);
548 575 
})
549 576 
//教育背景保存

@ -567,9 +594,24 @@ $("#eduBgList").on("click",".eg .remove",function(){
567 594 
				"contentType" : $id ? "application/json"
568 595 
						: "application/x-www-form-urlencoded",
569 596 
				"success" : function($data) {
570 
					if ($data.success) {
571 
						location.reload(true);
572 
					} else {
597 
					if ($data.success)
598 
					{
599 
						$("#school").val("");
600 
						$("#college").val("");
601 
						$("#major").val("");
602 
						$("#eduBgShow").empty();
603 
						$("#eduBgList").empty();
604 
						$(".modifybox").css("display","none");
605 
						$(".infor-browse").css("display","block");
606 
						$.get("/ajax/professor/info/" + userid, function($data)
607 
						{
608 
						if ($data.success) {
609 
									eduBgShow($data.data.edus);
610 
											}
611 
							});
612 
					}
613 
					else
614 
					{
573 615 
						$.MsgBox.Alert("message",$data.msg);
574 616 
					}
575 617 
				}

@ -608,7 +650,6 @@ var delTimeJob = function(data){
608 650 
		"type" : "DELETE",
609 651 
		"success" : function($data) {
610 652 
			if ($data.success) {
611 
				location.reload(true);
612 653 
			} else {
613 654 
				alert($data.msg);
614 655 
			}

@ -616,6 +657,7 @@ var delTimeJob = function(data){
616 657 
	});
617 658 
}
618 659 
$("#timeJobList").on("click",".tj .remove",function(){
660 
	$(this).parent().remove();
619 661 
	delTimeJob($(this)[0].title);
620 662 
})
621 663 
//社会兼职保存	

@ -637,9 +679,23 @@ $("#timeJobList").on("click",".tj .remove",function(){
637 679 
				"contentType" : $id ? "application/json"
638 680 
						: "application/x-www-form-urlencoded",
639 681 
				"success" : function($data) {
640 
					if ($data.success) {
641 
						location.reload(true);
642 
					} else {
682 
					if ($data.success)
683 
					{
684 
						$("#jobCompany").val("");
685 
						$("#jobTitle").val("");
686 
						$("#timeJobList").empty();
687 
						$("#timeJobShow").empty();
688 
						$(".modifybox").css("display","none");
689 
						$(".infor-browse").css("display","block");
690 
						$.get("/ajax/professor/info/" + userid, function($data)
691 
						{
692 
						if ($data.success) {
693 
							timeJobShow($data.data.jobs);
694 
											}
695 
							});
696 
					}
697 
					else
698 
					{
643 699 
						$.MsgBox.Alert("message",$data.msg);
644 700 
					}
645 701 
				}

@ -686,6 +742,7 @@ var delProject = function(data){
686 742 
	});
687 743 
}
688 744 
$("#projectList").on("click",".pro .remove",function(){
745 
	$(this).parent().remove();
689 746 
	delProject($(this)[0].title);
690 747 
})
691 748 
//项目经历保存		

@ -708,7 +765,18 @@ $("#projectList").on("click",".pro .remove",function(){
708 765 
						: "application/x-www-form-urlencoded",
709 766 
				"success" : function($data) {
710 767 
					if ($data.success) {
711 
						location.reload(true);
768 
						$("#projectName").val("");
769 
						$("#projectDescp").val("");
770 
						$("#projectList").empty();
771 
						$("#projectShow").empty();
772 
						$(".modifybox").css("display","none");
773 
						$(".infor-browse").css("display","block");
774 
						$.get("/ajax/professor/info/" + userid, function($data)
775 
						{
776 
						if ($data.success) {
777 
							projectShow($data.data.projects);
778 
											}
779 
							});
712 780 
					} else {
713 781 
						$.MsgBox.Alert("message",$data.msg);
714 782 
					}

@ -748,7 +816,7 @@ var delPaper = function(data){
748 816 
		"type" : "DELETE",
749 817 
		"success" : function($data) {
750 818 
			if ($data.success) {
751 
				location.reload(true);
819
752 820 
			} else {
753 821 
				alert($data.msg);
754 822 
			}

@ -756,6 +824,7 @@ var delPaper = function(data){
756 824 
	});
757 825 
}
758 826 
$("#paperList").on("click",".pap .remove",function(){
827 
	$(this).parent().remove();
759 828 
	delPaper($(this)[0].title);
760 829 
})
761 830 
//著作 论文 文章 保存

@ -778,7 +847,19 @@ $("#paperList").on("click",".pap .remove",function(){
778 847 
						: "application/x-www-form-urlencoded",
779 848 
				"success" : function($data) {
780 849 
					if ($data.success) {
781 
						location.reload(true);
850 
						$("#paperName").val("");
851 
						$("#paperDescp").val("");
852 
						$("#paperUrl").val("");
853 
						$("#paperList").empty();
854 
						$("#paperShow").empty();
855 
						$(".modifybox").css("display","none");
856 
						$(".infor-browse").css("display","block");
857 
						$.get("/ajax/professor/info/" + userid, function($data)
858 
						{
859 
						if ($data.success) {
860 
							paperShow($data.data.papers);
861 
											}
862 
							});
782 863 
					} else {
783 864 
						$.MsgBox.Alert("message",$data.msg);
784 865 
					}

@ -818,7 +899,7 @@ var delPatent = function(data){
818 899 
		"type" : "DELETE",
819 900 
		"success" : function($data) {
820 901 
			if ($data.success) {
821 
				location.reload(true);
902
822 903 
			} else {
823 904 
				alert($data.msg);
824 905 
			}

@ -826,6 +907,7 @@ var delPatent = function(data){
826 907 
	});
827 908 
}
828 909 
$("#patentList").on("click",".pat .remove",function(){
910 
	$(this).parent().remove();
829 911 
	delPatent($(this)[0].title);
830 912 
})
831 913 
//专利保存	

@ -848,7 +930,19 @@ $("#patentList").on("click",".pat .remove",function(){
848 930 
						: "application/x-www-form-urlencoded",
849 931 
				"success" : function($data) {
850 932 
					if ($data.success) {
851 
						location.reload(true);
933 
						$("#patentName").val("");
934 
						$("#patentUrl").val("");
935 
						$("#patentDescp").val("");
936 
						$("#patentList").empty();
937 
						$("#patentShow").empty();
938 
						$(".modifybox").css("display","none");
939 
						$(".infor-browse").css("display","block");
940 
						$.get("/ajax/professor/info/" + userid, function($data)
941 
						{
942 
						if ($data.success) {
943 
							patentShow($data.data.patents);
944 
											}
945 
							});
852 946 
					} else {
853 947 
						$.MsgBox.Alert("message",$data.msg);
854 948 
					}

@ -886,8 +980,7 @@ var delHonor = function(data){
886 980 
		"url" : "/ajax/honor/" + data,
887 981 
		"type" : "DELETE",
888 982 
		"success" : function($data) {
889 
			if ($data.success) {
890 
				location.reload(true);
983 
			if ($data.success) {
891 984 
			} else {
892 985 
				alert($data.msg);
893 986 
			}

@ -895,8 +988,20 @@ var delHonor = function(data){
895 988 
	});
896 989 
}
897 990 
$("#honorList").on("click",".hon .remove",function(){
991 
	$(this).parent().remove();
898 992 
	delHonor($(this)[0].title);
899 993 
})
994
995 
function getProfessorData(){
996 
	$.get("/ajax/professor/info/" + userid, function($data) {
997 
	if ($data.success) {
998 
		console.log($data)
999 
	}
1000 
	});
1001 
}
1002 
getProfessorData()
1003
1004
900 1005 
//荣誉及奖项保存
901 1006 
		$("#honorSave").on("click",function () {
902 1007 
			var $data = {};

@ -915,9 +1020,22 @@ $("#honorList").on("click",".hon .remove",function(){
915 1020 
				"contentType" : $id ? "application/json"
916 1021 
						: "application/x-www-form-urlencoded",
917 1022 
				"success" : function($data) {
918 
					if ($data.success) {
919 
						location.reload(true);
920 
					} else {
1023 
					if ($data.success)
1024 
					{
1025 
						$("#honorName").val("");
1026 
						$("#honorList").empty();
1027 
						$("#honorShow").empty();
1028 
						$(".modifybox").css("display","none");
1029 
						$(".infor-browse").css("display","block");
1030 
						$.get("/ajax/professor/info/" + userid, function($data)
1031 
						{
1032 
						if ($data.success) {
1033 
							honorShow($data.data.honors);
1034 
											}
1035 
							});
1036 
					}
1037 
					else
1038 
					{
921 1039 
						$.MsgBox.Alert("message",$data.msg);
922 1040 
					}
923 1041 
				}

@ -956,4 +1074,7 @@ function exit(){
956 1074 
		$.cookie('userAuth', null);
957 1075 
		location.href="login.html"
958 1076 
	}
1077
1078 
//获取数据填充页面
1079
959 1080 
/*����*/

+ 5 - 5
src/main/webapp/js/jquery.similar.msgbox.js
查看文件 

@ -37,19 +37,19 @@
37 37 
        });
38 38 
        $("#mb_tit").css({ display: 'block', fontSize: '14px', color: '#444', padding: '10px 15px',
39 39 
            backgroundColor: '#DDD', borderRadius: '6px 6px 0 0',
40 
            borderBottom: '3px solid #ff8400', fontWeight: 'bold',fontFamily: '微软雅黑'
40 
            borderBottom: '3px solid #ff8400', fontWeight: 'bold',fontFamily: 'Microsoft Yahei,Hiragino Sans GB, PingFang SC,Helvetica Neue,WenQuanYi Micro Hei,sans-serif'
41 41 
        });
42 42 
        $("#mb_msg").css({ padding: '20px', lineHeight: '20px',
43 
            borderBottom: '1px dashed #DDD', fontSize: '14px',fontFamily: '微软雅黑'
43 
            borderBottom: '1px dashed #DDD', fontSize: '14px',fontFamily: 'Microsoft Yahei,Hiragino Sans GB, PingFang SC,Helvetica Neue,WenQuanYi Micro Hei,sans-serif'
44 44 
        });
45 45 
        $("#mb_ico").css({ display: 'block', position: 'absolute', right: '10px', top: '9px',
46 46 
            border: '1px solid #666', width: '20px', height: '20px', textAlign: 'center',
47 
            lineHeight: '16px', cursor: 'pointer', borderRadius: '12px',color:'#666', fontFamily: '微软雅黑',fontSize: '16px'
47 
            lineHeight: '16px', cursor: 'pointer', borderRadius: '12px',color:'#666', fontFamily: 'Microsoft Yahei,Hiragino Sans GB, PingFang SC,Helvetica Neue,WenQuanYi Micro Hei,sans-serif',fontSize: '16px'
48 48 
        });
49 49 
        $("#mb_btnbox").css({ margin: '15px 0 10px 0', textAlign: 'center' });
50 50 
        $("#mb_btn_ok,#mb_btn_no").css({ width: '85px', height: '30px', color: 'white', border: 'none' });
51 
        $("#mb_btn_ok").css({backgroundImage:'none', padding:'0',margin:'0', backgroundColor: '#ff8400',borderRadius: '6px',fontFamily: '微软雅黑'});
52 
        $("#mb_btn_no").css({backgroundImage:'none', padding:'0',margin:'0', backgroundColor: 'gray', marginLeft: '20px',borderRadius: '6px',fontFamily: '微软雅黑' });
51 
        $("#mb_btn_ok").css({backgroundImage:'none', padding:'0',margin:'0', backgroundColor: '#ff8400',borderRadius: '6px',fontFamily: 'Microsoft Yahei,Hiragino Sans GB, PingFang SC,Helvetica Neue,WenQuanYi Micro Hei,sans-serif'});
52 
        $("#mb_btn_no").css({backgroundImage:'none', padding:'0',margin:'0', backgroundColor: 'gray', marginLeft: '20px',borderRadius: '6px',fontFamily: 'Microsoft Yahei,Hiragino Sans GB, PingFang SC,Helvetica Neue,WenQuanYi Micro Hei,sans-serif' });
53 53 
        //右上角关闭按钮hover样式
54 54 
        $("#mb_ico").hover(function () {
55 55 
            $(this).css({ backgroundColor: '#ff8400', color: 'White',border:'1px solid #ff8400'  });

+ 121 - 107
src/main/webapp/js/sciresource.js
查看文件 

@ -207,7 +207,7 @@ $(function(){
207 207 
								$(".li5").eq(mm1).css({"display":"none"});
208 208 
							}else{
209 209 
								$(".li5").eq(mm1).text("备注：" +data.data[mm1].cooperationNotes)
210 
								alert(data.data[mm1].cooperationNotes);
210 
								//alert(data.data[mm1].cooperationNotes);
211 211 
							}
212 212 
					}
213 213 
					else

@ -261,99 +261,101 @@ $(function(){
261 261 
							$('.resoumag').eq(i+1).attr("resourceId",data.data[i].resourceId);
262 262 
							(function(i){
263 263 
								$.ajax({
264 
									"url":"/ajax/operation/qares",
264 
									"url":"/ajax/operation/pqres",
265 265 
									"type":"get",
266 266 
									"async": true,
267 267 
									"data":{"resourceId":$('.resoumag').eq(i+1).attr("resourceId")},
268 268 
									"success":function(data){
269 
										//alert("资源id");
270
269 271 
										if(data.success)
270 
											{console.log(data);
272 
											{//console.log(data);
271 273 
												for(var j=0;j<data.data.length;j++){
272 
													if(data.data[j].dealPrice==undefined)
274 
													if(data.data.data[j].dealPrice==undefined)
273 275 
													{
274 
														data.data[j].dealPrice=0;
276 
														data.data.data[j].dealPrice=0;
275 277 
													}
276 
													if(data.data[j].payMethod==undefined){
277 
														data.data[j].payMethod="";
278 
													if(data.data.data[j].payMethod==undefined){
279 
														data.data.data[j].payMethod="";
278 280 
													}
279 
													var inquiry=inquiryGetPaidMoney(data.data[j].operationId);
281 
													var inquiry=inquiryGetPaidMoney(data.data.data[j].operationId);
280 282 
													var addString='<tr class="workitem">'
281 
									                    addString+='<td>'+data.data[j].dealTime+'</td>'
282 
									                     addString+='<td class="workitemsrc">'+data.data[j].applysquare+'</td>'
283 
									                      addString+='<td> <a class="worktel" href="">'+data.data[j].professor.name+'<span class="worktelbtn"></span></a></td>'
284 
									                      addString+='<td>'+data.data[j].deliverTime+'</td>'
285 
									                       addString+='<td class="price1">'+data.data[j].dealPrice+'</td>'
286 
									                        addString+='<td>'+data.data[j].payMethod+'</td>'
287 
									                       addString+='<td><span>'+inquiry+'</span>/<span>'+data.data[j].dealPrice+'</span><br></td>'
283 
									                    addString+='<td>'+data.data.data[j].dealTime+'</td>'
284 
									                     addString+='<td class="workitemsrc">'+data.data.data[j].applysquare+'</td>'
285 
									                      addString+='<td> <a class="worktel" href="">'+data.data.data[j].professor.name+'<span class="worktelbtn"></span></a></td>'
286 
									                      addString+='<td>'+data.data.data[j].deliverTime+'</td>'
287 
									                       addString+='<td class="price1">'+data.data.data[j].dealPrice+'</td>'
288 
									                        addString+='<td>'+data.data.data[j].payMethod+'</td>'
289 
									                       addString+='<td><span>'+inquiry+'</span>/<span>'+data.data.data[j].dealPrice+'</span><br></td>'
288 290 
									                        addString+='<td><div class="modification"></div></td> </tr>'
289 291 
									                        	$(".tablecon").eq(i).append(addString);
290 292 
																if($(".price1").eq(k).text()==0){
291 293 
																	$(".price1").eq(k).text("");
292 294 
																}
293 
																switch(data.data[j].operationStatus)
295 
																switch(data.data.data[j].operationStatus)
294 296 
																{
295 297 
																case 1:
296 298 
																	var string='<span>新的申请</span><br/>'
297 299 
																	string+='<a class="operatebtn">'
298 
																	string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>回复申请</span><br />'
300 
																	string+='<span class="detailmess"resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+'>回复申请</span><br />'
299 301 
																	string+='</a>'
300 302 
																	$(".modification").eq(k).html(string)
301 303 
																  break;
302 304 
																case 2:
303 305 
																	var string='<span>发送报价待对方确认</span><br/>'
304 306 
																	string+='<a class="operatebtn">'
305 
																	string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus="2" operationId='+data.data[j].operationId+'>修改报价</span><br />'
307 
																	string+='<span class="detailmess"resourId='+data.data.data[j].resource.resourceId+' operationStatus="2" operationId='+data.data.data[j].operationId+'>修改报价</span><br />'
306 308 
																	string+='</a>'
307 309 
																	$(".modification").eq(k).html(string);
308 310 
																  break;
309 311 
																case 3:
310 312 
																	var string='<span>对方发来报价合作进行中</span><br/>'
311 313 
																	string+='<a class="operatebtn">'
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 />'
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 />'
314 
																	string+='<span resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>投诉</span>'
314 
																		string+='<span class="detailmess"resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+' dealPrice='+data.data.data[j].dealPrice+'>查看详情</span><br />'
315 
																	string+='<span class="drawback"resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+' dealPrice='+data.data.data[j].dealPrice+'>退款</span><br />'
316 
																	string+='<span resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+'>投诉</span>'
315 317 
																	string+='</a>'
316 318 
																	$(".modification").eq(k).html(string);
317 319 
																  break;
318 320 
																case 4:
319 321 
																	var string='<span>对方拒绝报价，合作结束</span><br/>'
320 322 
																	string+='<a class="operatebtn">'
321 
																	string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>查看详情</span><br />'
323 
																	string+='<span class="detailmess"resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+'>查看详情</span><br />'
322 324 
																	string+='</a>'
323 325 
																	$(".modification").eq(k).html(string);
324 326 
																  break;
325 327 
																case 5:
326 328 
																	var string='<span>本人拒绝合作</span><br/>'
327 329 
																	string+='<a class="operatebtn">'
328 
																	string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>查看详情</span><br />'
330 
																	string+='<span class="detailmess"resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+'>查看详情</span><br />'
329 331 
																	string+='</a>'
330 332 
																	$(".modification").eq(k).html(string);
331 333 
																  break;
332 334 
																case 6:
333 335 
																		var string='<span>对方中止合作合作结束</span><br/>'
334 336 
																		string+='<a class="operatebtn">'
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 />'
338 
																		string+='<span class="complain"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>投诉</span>'
337 
																			string+='<span class="detailmess"resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+' dealPrice='+data.data.data[j].dealPrice+'>查看详情</span><br />'
338 
																		//string+='<span class="discuss" dataStatus="1"resourceId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+'>评价</span><br />'
339 
																		string+='<span class="drawback"resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+' dealPrice='+data.data.data[j].dealPrice+'>退款</span><br />'
340 
																		string+='<span class="complain"resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+'>投诉</span>'
339 341 
																		string+='</a>'
340 342 
																		$(".modification").eq(k).html(string);
341 343 
																  break;
342 344 
																case 7:
343 345 
																	var string='<span>合作进行中</span><br/>'
344 346 
																	string+='<a class="operatebtn">'
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 />'
346 
																	string+='<span class="acknowledgement"resourceId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>确认完成</span><br />'
347 
																	string+='<span class="complain"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>投诉</span>'
347 
																		string+='<span class="detailmess"resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+' dealPrice='+data.data.data[j].dealPrice+'>查看详情</span><br />'
348 
																	string+='<span class="acknowledgement"resourceId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+'>确认完成</span><br />'
349 
																	string+='<span class="complain"resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+'>投诉</span>'
348 350 
																	string+='</a>'
349 351 
																	$(".modification").eq(k).html(string);
350 352 
																  break;
351 353 
																case 8:
352 354 
																	var string='<span>完成</span><br/>'
353 355 
																	string+='<a class="operatebtn">'
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 />'
356 
																	string+='<span class="complain"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>投诉</span>'
356 
																		string+='<span class="detailmess"resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+' dealPrice='+data.data.data[j].dealPrice+'>查看详情</span><br />'
357 
																	//string+='<span class="discuss" dataStatus="1"resourceId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+'>评价</span><br />'
358 
																	string+='<span class="complain"resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+'>投诉</span>'
357 359 
																	string+='</a>'
358 360 
																	$(".modification").eq(k).html(string);
359 361 
																  break;

@ -392,6 +394,7 @@ $(function(){
392 394 
				if(data.success)
393 395 
					{var add='';
394 396 
					var k=0;
397
395 398 
					oLength=data.data.length;
396 399 
					for(var i=0;i<data.data.length;i++)
397 400 
						{

@ -426,99 +429,99 @@ $(function(){
426 429 
							//资源所对应的记录
427 430 
							(function(i){
428 431 
								$.ajax({
429 
									"url":"/ajax/operation/qares",
432 
									"url":"/ajax/operation/pqres",
430 433 
									"type":"get",
431 434 
									"async": true,
432 435 
									"data":{"resourceId":$('.resoumag').eq(i+1).attr("resourceId")},
433 436 
									"success":function(data){
434 437 
										if(data.success)
435 
											{console.log(data);
436 
												for(var j=0;j<data.data.length;j++){
437 
													if(data.data[j].dealPrice==undefined)
438 
											{//console.log(data);
439 
												for(var j=0;j<data.data.data.length;j++){
440 
													if(data.data.data[j].dealPrice==undefined)
438 441 
													{
439 
														data.data[j].dealPrice=0;
442 
														data.data.data[j].dealPrice=0;
440 443 
													}
441 
													if(data.data[j].payMethod==undefined){
442 
														data.data[j].payMethod="";
444 
													if(data.data.data[j].payMethod==undefined){
445 
														data.data.data[j].payMethod="";
443 446 
													}
444 
													var inquiry=inquiryGetPaidMoney(data.data[j].operationId);
447 
													var inquiry=inquiryGetPaidMoney(data.data.data[j].operationId);
445 448 
													var addString='<tr class="workitem">'
446 
									                    addString+='<td>'+data.data[j].dealTime+'</td>'
447 
									                     addString+='<td class="workitemsrc">'+data.data[j].applysquare+'</td>'
448 
									                      addString+='<td> <a class="worktel" href="">'+data.data[j].professor.name+'<span class="worktelbtn"></span></a></td>'
449 
									                      addString+='<td>'+data.data[j].deliverTime+'</td>'
450 
									                       addString+='<td class="price1">'+data.data[j].dealPrice+'</td>'
451 
									                        addString+='<td>'+data.data[j].payMethod+'</td>'
452 
									                       addString+='<td><span>'+inquiry+'</span>/<span>'+data.data[j].dealPrice+'</span><br></td>'
449 
									                    addString+='<td>'+data.data.data[j].dealTime+'</td>'
450 
									                     addString+='<td class="workitemsrc">'+data.data.data[j].applysquare+'</td>'
451 
									                      addString+='<td> <a class="worktel" href="">'+data.data.data[j].professor.name+'<span class="worktelbtn"></span></a></td>'
452 
									                      addString+='<td>'+data.data.data[j].deliverTime+'</td>'
453 
									                       addString+='<td class="price1">'+data.data.data[j].dealPrice+'</td>'
454 
									                        addString+='<td>'+data.data.data[j].payMethod+'</td>'
455 
									                       addString+='<td><span>'+inquiry+'</span>/<span>'+data.data.data[j].dealPrice+'</span><br></td>'
453 456 
									                        addString+='<td><div class="modification"></div></td> </tr>'
454 457 
									                        	$(".tablecon").eq(i).append(addString);
455 458 
																if($(".price1").eq(k).text()==0){
456 459 
																	$(".price1").eq(k).text("");
457 460 
																}
458 
																switch(data.data[j].operationStatus)
461 
																switch(data.data.data[j].operationStatus)
459 462 
																{
460 463 
																case 1:
461 464 
																	var string='<span>新的申请</span><br/>'
462 465 
																	string+='<a class="operatebtn">'
463 
																	string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>回复申请</span><br />'
466 
																	string+='<span class="detailmess"resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+'>回复申请</span><br />'
464 467 
																	string+='</a>'
465 468 
																	$(".modification").eq(k).html(string)
466 469 
																  break;
467 470 
																case 2:
468 471 
																	var string='<span>发送报价待对方确认</span><br/>'
469 472 
																	string+='<a class="operatebtn">'
470 
																	string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus="2" operationId='+data.data[j].operationId+'>修改报价</span><br />'
473 
																	string+='<span class="detailmess"resourId='+data.data.data[j].resource.resourceId+' operationStatus="2" operationId='+data.data.data[j].operationId+'>修改报价</span><br />'
471 474 
																	string+='</a>'
472 475 
																	$(".modification").eq(k).html(string);
473 476 
																  break;
474 477 
																case 3:
475 478 
																	var string='<span>对方发来报价合作进行中</span><br/>'
476 479 
																	string+='<a class="operatebtn">'
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 />'
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 />'
479 
																	string+='<span resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>投诉</span>'
480 
																		string+='<span class="detailmess"resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+' dealPrice='+data.data.data[j].dealPrice+'>查看详情</span><br />'
481 
																	string+='<span class="drawback"resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+' dealPrice='+data.data.data[j].dealPrice+'>退款</span><br />'
482 
																	string+='<span resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+'>投诉</span>'
480 483 
																	string+='</a>'
481 484 
																	$(".modification").eq(k).html(string);
482 485 
																  break;
483 486 
																case 4:
484 487 
																	var string='<span>对方拒绝报价，合作结束</span><br/>'
485 488 
																	string+='<a class="operatebtn">'
486 
																	string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>查看详情</span><br />'
489 
																	string+='<span class="detailmess"resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+'>查看详情</span><br />'
487 490 
																	string+='</a>'
488 491 
																	$(".modification").eq(k).html(string);
489 492 
																  break;
490 493 
																case 5:
491 494 
																	var string='<span>本人拒绝合作</span><br/>'
492 495 
																	string+='<a class="operatebtn">'
493 
																	string+='<span class="detailmess"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>查看详情</span><br />'
496 
																	string+='<span class="detailmess"resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+'>查看详情</span><br />'
494 497 
																	string+='</a>'
495 498 
																	$(".modification").eq(k).html(string);
496 499 
																  break;
497 500 
																case 6:
498 501 
																		var string='<span>对方中止合作合作结束</span><br/>'
499 502 
																		string+='<a class="operatebtn">'
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 />'
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 />'
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 />'
503 
																		string+='<span class="complain"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>投诉</span>'
503 
																			string+='<span class="detailmess"resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+' dealPrice='+data.data.data[j].dealPrice+'>查看详情</span><br />'
504 
																		//string+='<span class="discuss" dataStatus="1"resourceId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+'>评价</span><br />'
505 
																		string+='<span class="drawback"resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+' dealPrice='+data.data.data[j].dealPrice+'>退款</span><br />'
506 
																		string+='<span class="complain"resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+'>投诉</span>'
504 507 
																		string+='</a>'
505 508 
																		$(".modification").eq(k).html(string);
506 509 
																  break;
507 510 
																case 7:
508 511 
																	var string='<span>合作进行中</span><br/>'
509 512 
																	string+='<a class="operatebtn">'
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 />'
511 
																	string+='<span class="acknowledgement"resourceId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>确认完成</span><br />'
512 
																	string+='<span class="complain"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>投诉</span>'
513 
																		string+='<span class="detailmess"resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+' dealPrice='+data.data.data[j].dealPrice+'>查看详情</span><br />'
514 
																	string+='<span class="acknowledgement"resourceId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+'>确认完成</span><br />'
515 
																	string+='<span class="complain"resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+'>投诉</span>'
513 516 
																	string+='</a>'
514 517 
																	$(".modification").eq(k).html(string);
515 518 
																  break;
516 519 
																case 8:
517 520 
																	var string='<span>完成</span><br/>'
518 521 
																	string+='<a class="operatebtn">'
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 />'
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 />'
521 
																	string+='<span class="complain"resourId='+data.data[j].resource.resourceId+' operationStatus='+data.data[j].operationStatus+' operationId='+data.data[j].operationId+'>投诉</span>'
522 
																		string+='<span class="detailmess"resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+' dealPrice='+data.data.data[j].dealPrice+'>查看详情</span><br />'
523 
																	//string+='<span class="discuss" dataStatus="1"resourceId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+'>评价</span><br />'
524 
																	string+='<span class="complain"resourId='+data.data.data[j].resource.resourceId+' operationStatus='+data.data.data[j].operationStatus+' operationId='+data.data.data[j].operationId+'>投诉</span>'
522 525 
																	string+='</a>'
523 526 
																	$(".modification").eq(k).html(string);
524 527 
																  break;

@ -558,7 +561,7 @@ $("#consd").on("click",".detailmess",function(){
558 561 
	var operationId=$(this).attr("operationId");
559 562 
	var operationStatus=$(this).attr("operationStatus");
560 563 
	var priceDifference=$(this).attr("dealPrice");
561 
	console.log(priceDifference);
564 
	//console.log(priceDifference);
562 565 
	flag=0;
563 566
564 567 
	if(flag==0&&operationStatus==1)

@ -596,7 +599,7 @@ $("#consd").on("click",".detailmess",function(){
596 599 
						if (data.success) {
597 600 
							location.reload(true);
598 601 
						} else {
599 
							alert(data.msg);
602 
							$.MsgBox.Alert('message',data.msg);
600 603 
						}
601 604 
					},
602 605 
				"beforeSend":function(){

@ -646,7 +649,7 @@ $("#consd").on("click",".detailmess",function(){
646 649 
						if (data.success) {
647 650 
							location.reload(true);
648 651 
						} else {
649 
							alert(data.msg);
652 
							$.MsgBox.Alert('message',data.msg);
650 653 
						}
651 654 
					},
652 655 
				"beforeSend":function(){

@ -731,98 +734,102 @@ if(flag==0&&operationStatus==8){
731 734
732 735 
//我的需求查询
733 736 
$.ajax({
734 
	"url":"/ajax/operation/qapro",
737 
	"url":"/ajax/operation/pqdem",
735 738 
	"type":"get",
736 739 
	"async": true,
737 740 
	"data":{"demandId":userid},
738 741 
	"success":function(data){
739 742 
		if(data.success)
740 743 
			{
741 
				for(var i=0;i<data.data.length;i++)
742 
					{	var inq=inquiryGetPaidMoney(data.data[i].operationId);
743 
					if(data.data[i].dealPrice==undefined){
744 
						data.data[i].dealPrice=0;
744 
			//console.log(data);
745 
			//alert(data.data.data.length);
746 
				for(var i=0;i<data.data.data.length;i++)
747 
					{
748
749 
					var inq=inquiryGetPaidMoney(data.data.data[i].operationId);
750 
					if(data.data.data[i].dealPrice==undefined){
751 
						data.data.data[i].dealPrice=0;
745 752 
					}
746 
					if(data.data[i].payMethod==undefined){
747 
						data.data[i].payMethod="";
753 
					if(data.data.data[i].payMethod==undefined){
754 
						data.data.data[i].payMethod="";
748 755 
					}
749 756 
					var stringContent="";
750 757 
						stringContent +='<tr class="workitem">'
751 
	                    stringContent +='<td>'+data.data[i].dealTime+'</td>'
752 
	                    stringContent +='<td class="workitemsrc">'+data.data[i].resource.resourceName+'</td>'
753 
	                    stringContent +='<td> <a class="worktel" href="">'+data.data[i].resource.professor.name+'<span class="worktelbtn"></span></a></td>'
754 
	                    stringContent +='<td>'+data.data[i].deliverTime+'</td>'
755 
	                    stringContent +='<td class="price2">'+data.data[i].dealPrice+'</td>'
756 
	                    stringContent +='<td>'+data.data[i].payMethod+'</td>'
757 
	                    stringContent +='<td><span>'+inq+'</span>/<span>'+data.data[i].dealPrice+'</span><br></td>'
758 
	                    stringContent +='<td>'+data.data.data[i].dealTime+'</td>'
759 
	                    stringContent +='<td class="workitemsrc">'+data.data.data[i].resource.resourceName+'</td>'
760 
	                    stringContent +='<td> <a class="worktel" href="">'+data.data.data[i].resource.professor.name+'<span class="worktelbtn"></span></a></td>'
761 
	                    stringContent +='<td>'+data.data.data[i].deliverTime+'</td>'
762 
	                    stringContent +='<td class="price2">'+data.data.data[i].dealPrice+'</td>'
763 
	                    stringContent +='<td>'+data.data.data[i].payMethod+'</td>'
764 
	                    stringContent +='<td><span>'+inq+'</span>/<span>'+data.data.data[i].dealPrice+'</span><br></td>'
758 765 
	                    stringContent +='<td><div class="loginStatus"></div></td></tr>'
759 766 
	                   $(".worktabb").append( stringContent);
760 767 
									if($(".price2").eq(i).text()==0){
761 768 
										$(".price2").eq(i).text("");
762 769 
									}
763 
							switch(data.data[i].operationStatus)
770 
							switch(data.data.data[i].operationStatus)
764 771 
							{
765 772 
							case 1:
766 773 
								var string='<span>申请已发送待对方确认</span><br/>'
767 774 
								string+='<a class="opbtn">'
768 
								string+='<span class="detailm"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>修改申请</span><br />'
775 
								string+='<span class="detailm"resourId='+data.data.data[i].resource.resourceId+' operationStatus='+data.data.data[i].operationStatus+' operationId='+data.data.data[i].operationId+'>修改申请</span><br />'
769 776 
								string+='</a>'
770 777 
									$(".loginStatus").eq(i).html(string);
771 778 
							  break;
772 779 
							case 2:
773 780 
								var string='<span>对方发来报价</span><br/>'
774 781 
								string+='<a class="opbtn">'
775 
								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.data[i].resource.resourceId+' operationStatus='+data.data.data[i].operationStatus+' operationId='+data.data.data[i].operationId+'>回复报价</span><br />'
776 783 
								string+='</a>'
777 784 
								$(".loginStatus").eq(i).html(string);
778 785 
							  break;
779 786 
							case 3:
780 787 
								var string='<span>合作进行中</span><br/>'
781 788 
								string+='<a class="opbtn">'
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 />'
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 />'
784 
								string+='<span class="stopcoo"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>中止合作</span>'
789 
								string+='<span class="detailm"resourId='+data.data.data[i].resource.resourceId+' operationStatus='+data.data.data[i].operationStatus+' operationId='+data.data.data[i].operationId+' dealPrice='+data.data.data[i].dealPrice+'>查看详情</span><br />'
790 
								string+='<span class="payMonety"resourId='+data.data.data[i].resource.resourceId+' operationStatus='+data.data.data[i].operationStatus+' operationId='+data.data.data[i].operationId+' dealPrice='+data.data.data[i].dealPrice+'>付款</span><br />'
791 
								string+='<span class="stopcoo"resourId='+data.data.data[i].resource.resourceId+' operationStatus='+data.data.data[i].operationStatus+' operationId='+data.data.data[i].operationId+'>中止合作</span>'
785 792 
								string+='</a>'
786 793 
								$(".loginStatus").eq(i).html(string);
787 794 
							  break;
788 795 
							case 4:
789 796 
								var string='<span>本人拒绝合作</span><br/>'
790 797 
								string+='<a class="opbtn">'
791 
								string+='<span class="detailm"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>查看详情</span><br />'
798 
								string+='<span class="detailm"resourId='+data.data.data[i].resource.resourceId+' operationStatus='+data.data.data[i].operationStatus+' operationId='+data.data.data[i].operationId+'>查看详情</span><br />'
792 799 
								string+='</a>'
793 800 
								$(".loginStatus").eq(i).html(string);
794 801 
							  break;
795 802 
							case 5:
796 803 
								var string='<span>对方拒绝合作，合作结束</span><br/>'
797 804 
								string+='<a class="opbtn">'
798 
								string+='<span class="detailm"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>查看详情</span><br />'
805 
								string+='<span class="detailm"resourId='+data.data.data[i].resource.resourceId+' operationStatus='+data.data.data[i].operationStatus+' operationId='+data.data.data[i].operationId+'>查看详情</span><br />'
799 806 
								string+='</a>'
800 807 
								$(".loginStatus").eq(i).html(string);
801 808 
							  break;
802 809 
							case 6:
803 810 
								var string='<span>本人中止合作</span><br/>'
804 811 
								string+='<a class="opbtn">'
805 
								string+='<span class="detailm"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>查看详情</span><br />'
806 
								//string+='<span class=" discuss"dataStatus="0"resourceId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>评价</span><br />'
807 
								string+='<span class="complain"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>投诉</span>'
812 
								string+='<span class="detailm"resourId='+data.data.data[i].resource.resourceId+' operationStatus='+data.data.data[i].operationStatus+' operationId='+data.data.data[i].operationId+'>查看详情</span><br />'
813 
								//string+='<span class=" discuss"dataStatus="0"resourceId='+data.data.data[i].resource.resourceId+' operationStatus='+data.data.data[i].operationStatus+' operationId='+data.data.data[i].operationId+'>评价</span><br />'
814 
								string+='<span class="complain"resourId='+data.data.data[i].resource.resourceId+' operationStatus='+data.data.data[i].operationStatus+' operationId='+data.data.data[i].operationId+'>投诉</span>'
808 815 
								string+='</a>'
809 816 
								$(".loginStatus").eq(i).html(string);
810 817 
							  break;
811 818 
							case 7:
812 819 
								var string='<span>合作进行中</span><br/>'
813 820 
								string+='<a class="opbtn">'
814 
								string+='<span class="detailm"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>查看详情</span><br />'
815 
								string+='<span class="acknowledgement"resourceId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>确认完成</span><br />'
816 
								string+='<span class="complain"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>投诉</span>'
821 
								string+='<span class="detailm"resourId='+data.data.data[i].resource.resourceId+' operationStatus='+data.data.data[i].operationStatus+' operationId='+data.data.data[i].operationId+'>查看详情</span><br />'
822 
								string+='<span class="acknowledgement"resourceId='+data.data.data[i].resource.resourceId+' operationStatus='+data.data.data[i].operationStatus+' operationId='+data.data.data[i].operationId+'>确认完成</span><br />'
823 
								string+='<span class="complain"resourId='+data.data.data[i].resource.resourceId+' operationStatus='+data.data.data[i].operationStatus+' operationId='+data.data.data[i].operationId+'>投诉</span>'
817 824 
								string+='</a>'
818 825 
								$(".loginStatus").eq(i).html(string);
819 826 
							  break;
820 827 
							case 8:
821 828 
								var string='<span>完成</span><br/>'
822 829 
								string+='<a class="opbtn">'
823 
								string+='<span class="detailm"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>查看详情</span><br />'
824 
								//string+='<span class="discuss"dataStatus="0"resourceId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>评价</span><br />'
825 
								string+='<span class="complain"resourId='+data.data[i].resource.resourceId+' operationStatus='+data.data[i].operationStatus+' operationId='+data.data[i].operationId+'>投诉</span>'
830 
								string+='<span class="detailm"resourId='+data.data.data[i].resource.resourceId+' operationStatus='+data.data.data[i].operationStatus+' operationId='+data.data.data[i].operationId+'>查看详情</span><br />'
831 
								//string+='<span class="discuss"dataStatus="0"resourceId='+data.data.data[i].resource.resourceId+' operationStatus='+data.data.data[i].operationStatus+' operationId='+data.data.data[i].operationId+'>评价</span><br />'
832 
								string+='<span class="complain"resourId='+data.data.data[i].resource.resourceId+' operationStatus='+data.data.data[i].operationStatus+' operationId='+data.data.data[i].operationId+'>投诉</span>'
826 833 
								string+='</a>'
827 834 
								$(".loginStatus").eq(i).html(string);
828 835 
							  break;

@ -856,7 +863,7 @@ $(".workmysrc").on("click",".drawback",function(){
856 863 
	 var op=$(this).attr("operationId");
857 864 
	 var $price=$(this).attr("dealPrice");
858 865 
	 $("#totalPrice").text($price);
859 
	 console.log($price);
866 
	 //console.log($price);
860 867 
	 discussGetPaidMoney(op,$price);
861 868
862 869 
	 

@ -908,11 +915,15 @@ $(".workmysrc").on("click",".payMonety",function(){
908 915 
					"success" : function(rdata)
909 916 
					{
910 917 
						if (rdata.success)
911 
						{
912 
								location.reload(true);
918 
						{
919 
							alert($("#isOnline").find("option:selected").val());
920
921 
						$.MsgBox.Alert('消息',"此次付款成功!");
922 
								//location.reload(true);
913 923 
						}
914 924 
						else
915 925 
						{
926 
							$.MsgBox.Alert('消息',"付款失败!");
916 927 
							//alert("jjj");
917 928 
						}
918 929 
					},

@ -923,6 +934,9 @@ $(".workmysrc").on("click",".payMonety",function(){
923 934 
					dataType : "json"
924 935 
				});
925 936 
			 }
937 
			 if(aa>bb){
938 
				 $.MsgBox.Alert('消息',"所付款项已经超出预计款项!");
939 
			 }
926 940 
			 if(aa==bb){
927 941 
				 //console.log("jjjj");
928 942 
					 $.ajax({"url" : "/ajax/payhistory",

@ -932,8 +946,8 @@ $(".workmysrc").on("click",".payMonety",function(){
932 946 
							{
933 947 
								if (rdata.success)
934 948 
								{
935 
									 location.reload(true);
936
949 
									// location.reload(true);
950 
									 $.MsgBox.Alert('消息',"款项已经全部付清!");
937 951
938 952 
								}
939 953 
								else 

@ -1010,7 +1024,7 @@ function discussGetPaidMoney(operationId,priceDifference){
1010 1024 
				PopHtml += '<td><div class="resouinforcon resou"></div></td>';
1011 1025 
				PopHtml += '<td><div class="resouinforcon to"></div></td>';
1012 1026 
				PopHtml += '<td><div class="resouinforcon resta"></div></td>';
1013 
				PopHtml += '<td><div class="resouinforcon">之后尾款另行支付</div></td>';
1027 
				PopHtml += '<td><div class="resouinforcon">'+$data[i].remark+'</div></td>';
1014 1028 
				PopHtml += '</tr>';
1015 1029 
				$("#paytit").append(PopHtml);
1016 1030 
				if($data[i].paidMoney==undefined)

@ -1497,7 +1511,7 @@ function ajaxGet1(operationId){
1497 1511
1498 1512 
		"success":function(data){
1499 1513 
			if(data.success)
1500 
				{console.log(data);
1514 
				{//console.log(data);
1501 1515 
					$(".log").text(data.data.resource.resourceName);
1502 1516 
					$(".timelog").text(data.data.deliverTime);
1503 1517 
					$(".contration").text(data.data.operationId);

+ 48 - 12
src/main/webapp/sciproject.html
查看文件 

@ -1,44 +1,80 @@
1 1 
<!-- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> -->
2 2 
<!--  // 科研项目-->
3 3 
<div class="workconitem">
4 
    <div class="workcontit">科研项目<span class="worksamlltit worksamlltit2 worksamlltitnow">我发起的项目</span><span class="worksamlltit worksamlltit2">我参与的项目</span></div>
4 
    <div class="workcontit">科研项目<!-- <span class="worksamlltit worksamlltit2 worksamlltitnow">我发起的项目</span><span class="worksamlltit worksamlltit2">我参与的项目</span> --></div>
5 5 
    <div class="worksubcon">
6 6
7 7 
         <!--// 我发起的项目-->
8 8 
        <div class="workmysrc workmysrc2 clearfix">
9 
            <div class="workmysrctit"><span class="workbtn resoumag">发起新项目</span></div>
9 
            <!-- <div class="workmysrctit"><span class="workbtn resoumag">发起新项目</span></div> -->
10 
            <div class="workmenubox clearfix">
11 
                <form class="workmenufrm floatR">
12 
               	 	<div class="workselectbox floatL">
13 
                        <span onclick="hide('downbox2')" id="showbox2" class="workselectmenu" >全部</span>
14 
                        <ul id="downbox2" class="workdropdown" style="display:none;">
15 
                            <li onclick="pick2('全部')" class="cur workcurrent">全部</li>
16 
                            <li onclick="pick2('我发起的')" class="cur">我发起的</li>
17 
                            <li onclick="pick2('我参与的')" class="cur">我参与的</li>
18 
                       </ul>
19 
                    </div>
20 
                    <div class="workselectbox floatL">
21 
                        <span onclick="hide('downbox3')" id="showbox3" class="workselectmenu" >全部</span>
22 
                        <ul id="downbox3" class="workdropdown" style="display:none;">
23 
                            <li onclick="pick3('全部')" class="cur workcurrent">全部</li>
24 
                            <li onclick="pick3('进行中的')" class="cur">进行中的</li>
25 
                            <li onclick="pick3('已中止的')" class="cur">已中止的</li>
26 
                            <li onclick="pick3('已完成的')" class="cur">已完成的</li>
27 
                       </ul>
28 
                    </div>
29 
                    <div class="workselectbox floatL">
30 
                        <span onclick="hide('downbox1')" id="showbox1" class="workselectmenu" >按发起时间排序</span>
31 
                        <ul id="downbox1" class="workdropdown workdropdown2" style="display:none;">
32 
                            <li onclick="pick1('按发起时间排序')" class="cur workcurrent">按发起时间排序</li>
33 
                            <li onclick="pick1('按最后回复时间排序')" class="cur">按最后回复时间排序</li>
34 
                            <li onclick="pick1('按完成时间排序')" class="cur">按完成时间排序</li>
35 
                       </ul>
36 
                    </div>
37 
                    <div class="workselectbox floatL">
38 
                        <div class="orderedbtn"><div></div></div>
39 
                    </div>
40
41 
                </form>
42 
             </div>
10 43 
            <div class="workobjcon">
11 44 
                <div class="objectsrc newobjects">
12 
                    <p><span class="newobjecticon"> + </span>发布新项目</p>
45 
                    <ul class="newobjectbox clearfix">
46 
	                    <li><span class="newobjecticon"> + </span></li>
47 
	                    <li><span class="newobjectword">发布新项目</span></li>
48 
                    </ul>
13 49 
                </div>
14 50 
                <div class="objectsrc">
15 51 
                    <div>
16 52 
                        <p>项目名项目名项目名项目名项目名项目名项目名称</p>
17 
                        <p class="objectstate">进行中</p>
53 
                        <p class="objectstate"><img src="images/progressing.png"> 进行中</p>
18 54 
                    </div>
19 55 
                </div>
20 56 
                <div class="objectsrc">
21 57 
                    <div>
22 58 
                        <p>项目名称</p>
23 
                        <p class="objectstate">进行中</p>
59 
                        <p class="objectstate"><img src="images/progressing.png"> 进行中</p>
24 60 
                    </div>
25 61 
                </div>
26 62 
                <div class="objectsrc">
27 63 
                    <div>
28 64 
                        <p>项目名称</p>
29 
                        <p class="objectstate">进行中</p>
65 
                        <p class="objectstate"><img src="images/progressing.png"> 进行中</p>
30 66 
                    </div>
31 67 
                </div>
32 68 
                <div class="objectsrc">
33 69 
                    <div>
34 70 
                        <p>项目名称</p>
35 
                        <p class="objectstate">进行中</p>
71 
                        <p class="objectstate"><img src="images/progressing.png"> 进行中进行中进行中进行中</p>
36 72 
                    </div>
37 73 
                </div>
38 74 
                <div class="objectsrc">
39 75 
                    <div>
40 76 
                        <p>项目名称</p>
41 
                        <p class="objectstate">进行中</p>
77 
                        <p class="objectstate"><img src="images/progressing.png"> 进行中</p>
42 78 
                    </div>
43 79 
                </div>
44 80 
                

@ -48,7 +84,7 @@
48 84 
        <!--我发起的项目 //-->
49 85
50 86 
        <!--// 我参与的项目-->
51 
        <div class="workmysrc workmysrc2">
87 
        <!-- <div class="workmysrc workmysrc2">
52 88 
            <div class="workmysrctit"></div>
53 89 
            <div class="workobjcon">
54 90 
                <div class="objectsrc">

@ -82,7 +118,7 @@
82 118 
                    </div>
83 119 
                </div>
84 120 
            </div>
85 
        </div>
121 
        </div> -->
86 122 
        <!--我参与的项目 //-->
87 123 
    </div>
88 124 
</div>

@ -91,11 +127,11 @@
91 127
92 128 
<script>
93 129 
/* /*科研项目菜单点击切换*/
94 
/* $(".worksamlltit2").click(function(){
130 
/*  $(".worksamlltit2").click(function(){
95 131 
	var index = $(this).index();
96 132 
	$(this).addClass("worksamlltitnow").siblings().removeClass("worksamlltitnow");
97 133 
	$(".workmysrc2").eq(index).show().siblings().hide();
98 
}); */
134 
}); */
99 135 
</script>
100 136
101 137

+ 0 - 4
src/main/webapp/workspaces.html
查看文件 

@ -11,7 +11,6 @@
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">
15 14 
<link type="text/css" href="css/bootstrap.min.css" rel="stylesheet">
16 15 
<link type="text/css" href="css/reset.css" rel="stylesheet" />
17 16 
<link type="text/css" href="css/common.css" rel="stylesheet">

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

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