ソースを参照

1、添加我的工作台链接入口
2、共享资源中,将弹出发布资源、申请资源等模块提取js,动态生成到页面上
3、专家信息浏览页面和专家修改页面添加了科研资源模块

luyanan 8 年 前
コミット
1f3fb60335

+ 18 - 13
src/main/webapp/account-set.html

@ -62,19 +62,24 @@
62 62
		<input type="text" placeholder="搜索专家、研究方向或科研机构" class="search-txt" id="hsearchContent">
63 63
		<div class="search-btn" id="hsearch"><span class="search-icon"></span></div>
64 64
	</div>
65
	<!--未登录-->
66
    <a href="login-invite-code.html"><div class="unlogin">特邀专家登录</div></a>
67
    <!--已登录-->
68
    <div class="head-portrait">
69
    	<img class="portrait-p" />
70
        <div class="personal-infor">
71
            <div class="triangleB"></div>
72
            <div class="personal-box">
73
                <!-- <a href="#"><span class="icon icon1"></span>我的主页</a> -->
74
                <a href="information.html"><span class="icon icon2"></span>修改资料</a>
75
                <a href="account-set.html"><span class="icon icon3"></span>账户设置</a>
76
                <a href="#" onClick="exit()"><span class="icon icon4"></span>退出登录</a>
77
            </div>
65
	<div class="header-right"> 
66
        <!--未登录-->
67
        <a href="login-invite-code.html"><div class="unlogin">特邀专家登录</div></a>
68
        <!--已登录-->
69
        <div class="onlogin">
70
	        <div class="head-portrait">
71
	        	<img class="portrait-p" />
72
	            <div class="personal-infor">
73
	                <div class="triangleB"></div>
74
	                <div class="personal-box">
75
	                    <!-- <a href="#"><span class="icon icon1"></span>我的主页</a> -->
76
	                    <a href="information.html"><span class="icon icon2"></span>修改资料</a>
77
	                    <a href="account-set.html"><span class="icon icon3"></span>账户设置</a>
78
	                    <a href="#" onClick="exit()"><span class="icon icon4"></span>退出登录</a>
79
	                </div>
80
	            </div>
81
	        </div>
82
	        <a class="myWorkspace" href="resources.html">我的工作台</a>
78 83
        </div>
79 84
    </div>
80 85
</div>

+ 8 - 3
src/main/webapp/css/common.css

@ -11,12 +11,15 @@ input{ outline:none;}
11 11
.search-btn{ width:35px; height:35px; background:#fff; border-radius:0 10px 10px 0;-moz-border-radius:0 10px 10px 0;-webkit-border-radius:0 10px 10px 0; float:left; cursor:pointer; behavior:url(../js/ie-css3.htc);cursor:pointer;}
12 12
.search-icon{ display:block; width:20px; height:20px; background:
13 13
url(../images/index-icon.png) no-repeat; background-position:left; margin:8px;}
14
/*顶部右边*/
15
.header-right{ float:right; margin-right:80px;}
14 16
/*未登录*/
15
.unlogin{ width:130px; height:35px; border:1px #fff solid; border-radius:10px;font:14px/35px \5FAE\8F6F\96C5\9ED1,"Microsoft YaHei"; color:#fff; text-align:center; float:right; margin-right:80px; margin-top:10px; cursor:pointer; }
17
.unlogin{ width:130px; height:35px; border:1px #fff solid; border-radius:10px;font:14px/35px \5FAE\8F6F\96C5\9ED1,"Microsoft YaHei"; color:#fff; text-align:center;  margin-right:10px; float:left;margin-top:10px; cursor:pointer; }
16 18
/*已登录*/
17
.head-portrait{ display:none; width:50px; height:50px; border-radius:50%;background-size:100% 100%;-moz-background-size:100% 100%; float:right; margin-right:80px; margin-top:5px; cursor:pointer; border:1px solid #f8f8f8; overflow:hidden; }
19
.onlogin{ display:none; position:relative;}
20
.head-portrait{width:50px; height:50px; border-radius:50%;background-size:100% 100%;-moz-background-size:100% 100%; float:left; margin-right:10px; margin-top:5px; cursor:pointer; border:1px solid #f8f8f8; overflow:hidden; }
18 21
.portrait-p{ width:100%;}
19
.personal-infor{width:202px; height:179px; position:absolute; top:42px; right:80px; display:none;}
22
.personal-infor{width:202px; height:179px; position:absolute; top:40px; right:80px; display:none;}
20 23
.triangleB{ display:block; width:0; height:0; border:8px solid transparent; border-bottom-color:#f3a36c; float:right; margin-right:20px; margin-top:15px;}
21 24
.personal-box{ width:202px; /*height:160px;*/ border-radius:10px; background:#f3a36c; clear:both; overflow:hidden;}
22 25
.personal-box a{ display:block; width:202px; height:40px;font:14px/40px \5FAE\8F6F\96C5\9ED1,"Microsoft YaHei"; color:#fff;}
@ -26,6 +29,8 @@ url(../images/index-icon.png) no-repeat; background-position:left; margin:8px;}
26 29
.icon2{ background:url(../images/index-icon.png) no-repeat; background-position:-60px 0;}
27 30
.icon3{ background:url(../images/index-icon.png) no-repeat; background-position:-40px 0;}
28 31
.icon4{ background:url(../images/index-icon.png) no-repeat; background-position:-20px 0;}
32

33
.myWorkspace{font: 14px/40px \5FAE\8F6F\96C5\9ED1,"Microsoft YaHei"; text-align: center;float: left; margin-top: 10px;color: #fff;}
29 34
/*主体部分*/
30 35
#container{ min-width:1000px; background:#fff;overflow: hidden;}
31 36


+ 10 - 10
src/main/webapp/css/workspace.css

@ -1,15 +1,14 @@
1 1
@charset "utf-8";
2 2
/* CSS Document */
3
.con-center{ width:1000px;position:relative; margin:auto; overflow:hidden;padding:20px 10px; margin-top:60px;}
4
.frmtype{ width:100%; border-radius:5px; border:1px #dadada solid; padding:0 10px; min-height:30px;font: 14px/30px \5FAE\8F6F\96C5\9ED1,"Microsoft YaHei";}
3
.con-center{ width:1200px;position:relative; margin:auto; overflow:hidden;padding:20px 10px; margin-top:60px;}
4
.frmtype{ width:100%; border-radius:5px; border:1px #dadada solid; padding:0 10px; min-height:30px;font: 14px/30px \5FAE\8F6F\96C5\9ED1,"Microsoft YaHei"; background:none;}
5 5
.frmtype:focus{ border:1px solid #ff8500;}
6 6
.frmbtn{ width:100px; margin:10px; background:#ff8400; color:#fff; border:none; }
7 7
.frmrbtn{ background:none; color:#303030; border:none; }
8 8
.updownbtn{text-decoration:underline; color:#333;}
9 9

10 10

11

12
.blackcover{ width:100%; height:100%; position:fixed; background:rgba(0,0,0,.6); z-index:1000; display:none;}
11
.blackcover{ width:100%; height:100%; position:fixed; background:rgba(0,0,0,.6); z-index:1000;}
13 12

14 13
/*左侧菜单*/
15 14
.workmenu{ float:left; width:14%; height:300px; background: #fafafa;border-radius: 6px;overflow: hidden;}
@ -26,24 +25,25 @@
26 25
.workmysrctit{ margin:10px 0;font: 16px/30px \5FAE\8F6F\96C5\9ED1; position:relative;}
27 26
.workmysrc .workbtn{ display:block; position:absolute; top:0; left:10%; background:#ff8400;font: 14px/30px \5FAE\8F6F\96C5\9ED1; color:#fff; padding:0 20px; border-radius:4px; cursor:pointer;}
28 27

29
.maintab{ border-bottom:1px dashed #d7d7d7; overflow:hidden;}
28
.maintab{ border-bottom:1px dashed #d7d7d7; overflow:hidden;width:100%;min-height:350px; margin-top:10px;}
30 29
.worktab *{ text-align:center; color:#000;}
31
.lefttab{ width:16%;}
32
.resoubrief{height:300px;}
30
.lefttab{ width:16%; overflow:hidden;}
31
.resoubrief{height:300px; overflow:hidden;}
33 32
.resoubrief tr td{ /*border-bottom:1px solid #d6d6d6;*/ min-height:200px; padding:16px 0;}
33
.resoubrief tr td ul li{ width:100%; max-width:150px; text-overflow:ellipsis; overflow:hidden; white-space:nowrap;}
34 34
.resoumag{ display:block; background:#ff8400;font: 14px/30px \5FAE\8F6F\96C5\9ED1; color:#fff; border-radius:4px; text-align:center; cursor:pointer;}
35 35
.righttab{ width:82%;}
36 36
.worktab a{ color:#333;}
37 37
.worktab a:hover{color:#ff8400;}
38
.worktab tr td{ padding:0 4px;max-width:60px;}
38
.worktab tr td{ padding:0 4px;max-width:60px;text-overflow:ellipsis; overflow:hidden; white-space:nowrap;}
39 39
.worktab .worktabtit{ height:40px;background:#fff9ef;border-bottom:1px #D8D8D8 solid;}
40 40
.worktab .workitem{ border-bottom:1px #D8D8D8 solid;height:80px; padding:10px 0;}
41 41
.worktab .workitem:nth-child(odd){background:#fff;}
42 42
.workitemsrc{ cursor:pointer; color:#702C40;}
43 43
.operatebtn{ display:block; cursor:pointer;}
44 44
/*弹窗资源信息、申请信息*/
45
.resouinfo{position:absolute;top:50%;left:50%; margin-top:-320px; margin-left:-250px; background:#fff;border-radius:10px;padding:20px;z-index:1001; display:none;}
46
.resouapply{position:absolute;top:50%;left:50%; margin-top:-320px; margin-left:-250px; background:#fff;border-radius:10px;padding:20px;z-index:1002; display:none; }
45
.resouinfo{position:fixed;top:50%;left:50%; margin-top:-320px; margin-left:-250px; background:#fff;border-radius:10px;padding:20px;z-index:1001;}
46
.resouapply{position:fixed;top:50%;left:50%; margin-top:-320px; margin-left:-250px; background:#fff;border-radius:10px;padding:20px;z-index:1002; }
47 47
.resoutit{padding: 0 20px;font: 16px/40px \5FAE\8F6F\96C5\9ED1,"Microsoft YaHei";color: #606060; border-bottom:1px solid #ff8400;}
48 48
.resoutab{ margin:20px; min-width:500px;}
49 49
.resoutab tr td{ min-width:200px; max-width:500px; padding:4px; }

+ 20 - 15
src/main/webapp/index.html

@ -21,21 +21,26 @@
21 21
            <input type="text" placeholder="搜索专家、研究方向或科研机构" class="search-txt" id="hsearchContent" >
22 22
            <div class="search-btn" id="hsearch"><span class="search-icon" ></span></div>
23 23
        </div>
24
        <!--未登录-->
25
        <a href="login-invite-code.html"><div class="unlogin">特邀专家登录</div></a>
26
        <!--已登录-->
27
        <div class="head-portrait">
28
        	<img class="portrait-p" />
29
            <div class="personal-infor">
30
                <div class="triangleB"></div>
31
                <div class="personal-box">
32
                    <!-- <a href="#"><span class="icon icon1"></span>我的主页</a> -->
33
                    <a href="information.html"><span class="icon icon2"></span>修改资料</a>
34
                    <a href="account-set.html"><span class="icon icon3"></span>账户设置</a>
35
                    <a href="resources.html"><span class="icon icon3"></span>我的工作台</a>
36
                    <a href="#" onClick="exit()"><span class="icon icon4"></span>退出登录</a>
37
                </div>
38
            </div>
24
        <div class="header-right"> 
25
	        <!--未登录-->
26
	        <a href="login-invite-code.html"><div class="unlogin">特邀专家登录</div></a>
27
	        <!--已登录-->
28
	        <div class="onlogin">
29
		        <div class="head-portrait">
30
		        	<img class="portrait-p" />
31
		            <div class="personal-infor">
32
		                <div class="triangleB"></div>
33
		                <div class="personal-box">
34
		                    <!-- <a href="#"><span class="icon icon1"></span>我的主页</a> -->
35
		                    <a href="information.html"><span class="icon icon2"></span>修改资料</a>
36
		                    <a href="account-set.html"><span class="icon icon3"></span>账户设置</a>
37
		                    <a href="#" onClick="exit()"><span class="icon icon4"></span>退出登录</a>
38
		                </div>
39
		                
40
		            </div>
41
		        </div>
42
		        <a class="myWorkspace" href="resources.html">我的工作台</a>
43
	        </div>
39 44
        </div>
40 45
    </div>
41 46
	<!--banner部分-->

+ 24 - 64
src/main/webapp/information-brow.html

@ -10,13 +10,14 @@
10 10
<link rel="stylesheet" type="text/css" href="css/style.css" />
11 11
<link type="text/css" href="css/index.css" rel="stylesheet">
12 12
<link type="text/css" href="css/common.css" rel="stylesheet">
13
<link type="text/css" href="css/workspace.css" rel="stylesheet">
13 14
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
14 15
<script type="text/javascript" src="js/index.js"></script>
16
<script type="text/javascript" src="js/popup.js"></script>
15 17
<script type="text/javascript" src="js/information.brow.js"></script>
16 18
<script type="text/javascript" src="js/common.js"></script>
17 19
<script type="text/javascript" src="/js/jquery.cookie.js"></script>
18 20
<script type="text/javascript" src="js/jquery.similar.msgbox.js"></script>
19

20 21
</head>
21 22

22 23
<body>
@ -26,20 +27,26 @@
26 27
		<input type="text" placeholder="搜索专家、研究方向或科研机构" class="search-txt" id="hsearchContent">
27 28
		<div class="search-btn" id="hsearch"><span class="search-icon"></span></div>
28 29
	</div>
29
	<!--未登录-->
30
	<a href="login-invite-code.html"><div class="unlogin">特邀专家登录</div></a>
31
	<!--已登录-->
32
	<div class="head-portrait">
33
    	<img class="portrait-p" />
34
		<div class="personal-infor">
35
			<div class="triangleB"></div>
36
			<div class="personal-box">
37
				<!-- <a href="#"><span class="icon icon1"></span>我的主页</a> -->
38
				<a href="information.html"><span class="icon icon2"></span>修改资料</a>
39
				<a href="account-set.html"><span class="icon icon3"></span>账户设置</a>
40
				<a href="#" onClick="exit()"><span class="icon icon4"></span>退出登录</a>
41
			</div>
42
		</div>
30
	<div class="header-right"> 
31
        <!--未登录-->
32
        <a href="login-invite-code.html"><div class="unlogin">特邀专家登录</div></a>
33
        <!--已登录-->
34
        <div class="onlogin">
35
	        <div class="head-portrait">
36
	        	<img class="portrait-p" />
37
	            <div class="personal-infor">
38
	                <div class="triangleB"></div>
39
	                <div class="personal-box">
40
	                    <!-- <a href="#"><span class="icon icon1"></span>我的主页</a> -->
41
	                    <a href="information.html"><span class="icon icon2"></span>修改资料</a>
42
	                    <a href="account-set.html"><span class="icon icon3"></span>账户设置</a>
43
	                    <a href="#" onClick="exit()"><span class="icon icon4"></span>退出登录</a>
44
	                </div>
45
	                
46
	            </div>
47
	        </div>
48
	        <a class="myWorkspace" href="resources.html">我的工作台</a>
49
        </div>
43 50
	</div>
44 51
</div>
45 52
<div id="container">
@ -175,55 +182,8 @@
175 182
					<div class="infor-browse">
176 183
                    	<div class="shareabout">
177 184
                            <div class="sharesrcbox">
178
                                <div class="sharescrollbox">
179
                                    <div class="sharesrc">
180
                                    	<div class="shareshow">
181
                                            <a href=""><img src="" width="100%" height="140"></a>
182
                                            <div class="shareopeart"><a class="sharebtn">咨询</a><a class="sharebtn">申请</a></div>
183
                                        </div>
184
                                        <p>资源名称:XXXXX检测仪</p>
185
                                        <p class="briefinfor">简介:Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo co</p>
186
                                    </div>
187
                                    <div class="sharesrc">
188
                                    	<div class="shareshow">
189
                                            <img src="" width="100%" height="140">
190
                                            <div class="shareopeart"><a class="sharebtn">咨询</a><a class="sharebtn">申请</a></div>
191
                                        </div>
192
                                        <p>资源名称:XXXXX检测仪</p>
193
                                        <p class="briefinfor">简介:Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo co</p>
194
                                    </div>
195
                                    <div class="sharesrc">
196
                                    	<div class="shareshow">
197
                                            <img src="" width="100%" height="140">
198
                                            <div class="shareopeart"><a class="sharebtn">咨询</a><a class="sharebtn">申请</a></div>
199
                                        </div>
200
                                        <p>资源名称:XXXXX检测仪</p>
201
                                        <p class="briefinfor">简介:Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo co</p>
202
                                    </div>
203
                                    <div class="sharesrc">
204
                                    	<div class="shareshow">
205
                                            <img src="" width="100%" height="140">
206
                                            <div class="shareopeart"><a class="sharebtn">咨询</a><a class="sharebtn">申请</a></div>
207
                                        </div>
208
                                        <p>资源名称:XXXXX检测仪</p>
209
                                        <p class="briefinfor">简介:Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo co</p>
210
                                    </div>
211
                                    <div class="sharesrc">
212
                                    	<div class="shareshow">
213
                                            <img src="" width="100%" height="140">
214
                                            <div class="shareopeart"><a class="sharebtn">咨询</a><a class="sharebtn">申请</a></div>
215
                                        </div>
216
                                        <p>资源名称:XXXXX检测仪</p>
217
                                        <p class="briefinfor">简介:Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo co</p>
218
                                    </div>
219
                                     <div class="sharesrc">
220
                                    	<div class="shareshow">
221
                                            <img src="" width="100%" height="140">
222
                                            <div class="shareopeart"><a class="sharebtn">咨询</a><a class="sharebtn">申请</a></div>
223
                                        </div>
224
                                        <p>资源名称:XXXXX检测仪</p>
225
                                        <p class="briefinfor">简介:Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo co</p>
226
                                    </div>
185
                                <div class="sharescrollbox" id="sharescrollbox">
186
                                    
227 187
                                    
228 188
                                 </div>
229 189
                             </div>

+ 20 - 14
src/main/webapp/information.html

@ -27,20 +27,26 @@
27 27
		<input type="text" placeholder="搜索专家、研究方向或科研机构" class="search-txt" id="hsearchContent">
28 28
		<div class="search-btn" id="hsearch"><span class="search-icon"></span></div>
29 29
	</div>
30
	<!--未登录-->
31
	<!-- <a href="login-invite-code.html"><div class="unlogin">特邀专家登录</div></a> -->
32
	<!--已登录-->
33
	<div class="head-portrait">
34
    	<img class="portrait-p" />
35
		<div class="personal-infor">
36
			<div class="triangleB"></div>
37
			<div class="personal-box">
38
				<!-- <a href="#"><span class="icon icon1"></span>我的主页</a> -->
39
				<a href="information.html"><span class="icon icon2"></span>修改资料</a>
40
				<a href="account-set.html"><span class="icon icon3"></span>账户设置</a>
41
				<a href="#" id='aclick'><span class="icon icon4"></span>退出登录</a>
42
			</div>
43
		</div>
30
	<div class="header-right"> 
31
        <!--未登录-->
32
        <a href="login-invite-code.html"><div class="unlogin">特邀专家登录</div></a>
33
        <!--已登录-->
34
        <div class="onlogin">
35
	        <div class="head-portrait">
36
	        	<img class="portrait-p" />
37
	            <div class="personal-infor">
38
	                <div class="triangleB"></div>
39
	                <div class="personal-box">
40
	                    <!-- <a href="#"><span class="icon icon1"></span>我的主页</a> -->
41
	                    <a href="information.html"><span class="icon icon2"></span>修改资料</a>
42
	                    <a href="account-set.html"><span class="icon icon3"></span>账户设置</a>
43
	                    <a href="#" onClick="exit()"><span class="icon icon4"></span>退出登录</a>
44
	                </div>
45
	                
46
	            </div>
47
	        </div>
48
	        <a class="myWorkspace" href="resources.html">我的工作台</a>
49
        </div>
44 50
	</div>
45 51
</div>
46 52
<div id="container">

+ 4 - 1
src/main/webapp/js/index.js

@ -1,3 +1,5 @@
1

2

1 3
$(function(){
2 4
/*向下滚动时,header背景变半透明*/
3 5
$(document).scroll(function() {
@ -42,7 +44,8 @@ $(document).scroll(function() {
42 44
var servPath = "http://121.42.53.174:81";
43 45
var userid = $.cookie("userid");
44 46
if (userid && userid != "null" && userid != null) {
45
	$(".head-portrait").show();
47
	$(".myWorkspace").attr("href","resources.html?"+userid);
48
	$(".onlogin").show();
46 49
	$(".unlogin").hide();
47 50
	$(".portrait-p").attr("src", servPath + "/images/head/" + userid + "_m.jpg");
48 51
	//判断图片是否加载,加载不成功默认有默认的图像

+ 64 - 5
src/main/webapp/js/information.brow.js

@ -359,12 +359,71 @@ $(".subsidebar").click(function(){
359 359
		 
360 360
		 })
361 361

362

363
})
364

365

366 362
//科研资源
367
$(function(){
363
	$.ajax({		
364
		"url":"/ajax/resource/qapro",
365
		"type":"get",
366
		"data":{"professorId":professorId},
367
		"async": true,
368
		"success":function(data){
369
			var add="";
370
			if(data.success)
371
				{console.log(data);
372
				for(var i=0;i<data.data.length;i++){
373
					add='<div class="sharesrc">'
374
					add+='<div class="shareshow">'
375
                	add+='<a href=""><img src="" width="100%" height="140"></a>'
376
                 	add+='<div class="shareopeart"><a class="sharebtn">咨询</a><a class="sharebtn applicant">申请</a></div>'
377
             		add+='</div>'
378
             		add+='<p>资源名称:<span class="presou">'+ data.data[i].resourceName+'</span></p>'
379
             		add+='<p class="briefinfor">简介:'+data.data[i].descp+'</p>'
380
        			add+='</div>'
381
        			$("#sharescrollbox").append(add);
382
					$('.applicant').eq(i).attr("resourceId",data.data[i].resourceId);
383
					add="";
384
				}
385
				}
386
				else
387
				{
388
					console.log("系统异常!");
389
				}
390
		},
391
		"error":function(){$.MsgBox.Alert('message','failddd')}
392
	});
393
	$('.introduction').on("click",'.applicant',function(){
394
		ResourceApply();//调用资源申请HTML创建函数
395
		$(".applysure").hide();
396
		$(".btnboxup").hide();
397
		var index1=$(this).parent().parent().parent().index();
398
		console.log(index1);
399
		var m=console.log();
400
		var resourceID=$(this).attr("resourceId");
401
		console.log(resourceID);
402
		$(".conte").eq(index1).html($('.presou').eq(index1).text());
403
		$("#sendre").on("click",function()
404
				{	
405
					var $data = {};
406
					$data.resourceName = "kkkk";
407
					$data.demandId = userid;
408
					$data.resourceId=resourceID;
409
					$data.detailDemand=$("#detailDemand").val();
410
					$.ajax({
411
						"url" : "/ajax/operation",
412
						"type" : "POST",
413
						"success" : function(rdata) {
414
							if (rdata.success) {
415
								alert("JJJDDDDD");
416
							} else {
417
								alert("jjj");
418
							}
419
						},
420
						"data" :  $data,
421
						"contentType" :  "application/x-www-form-urlencoded",
422
						dataType : "json"
423
					});
424
			});
425
	});
426
	
368 427
	var $content = $(".sharescrollbox");
369 428
	var childcount = $content.find(".sharesrc").length; 
370 429
	Carousel(3,3, childcount, $content, $(".resounext"), $(".resouprev"));

+ 102 - 0
src/main/webapp/js/popup.js

@ -0,0 +1,102 @@
1
// JavaScript Document
2

3
// 资源信息
4
function ResourceInfo() {
5
		var PopHtml="";
6
		var CoverHtml="";
7
		CoverHtml += '<div class="blackcover"></div>';
8
		PopHtml += '<div class="resouinfo"><form class="resoufrm">';
9
		PopHtml += '<div class="resoutit">资源信息</div>';
10
		PopHtml += '<table class="resoutab"><tr>';
11
		PopHtml += '<th class="resouinfotype" id="resourceName" scope="row">资源名称</th>';
12
		PopHtml += '<td><input type="text" class="frmtype"></td>';
13
		PopHtml += '<td rowspan="9"><div class="resouimg" ><img src="" width="100%" height="100%"><span class="resouup"><input type="file" id="resouup" >上传资源图片</span></div></td>';
14
		PopHtml += '</tr>';
15
		PopHtml += '<tr class="workmsgbox"><th></th><td><div class="workmsg workmsg1"></div></td></tr>';
16
		PopHtml += '<tr><th class="resouinfotype"  scope="row">资源发布者</th><td><input type="text" class="frmtype" id="professor" >  </td></tr>';
17
		PopHtml += '<tr class="workmsgbox"><th></th><td><div class="workmsg workmsg2"></div></td></tr>';
18
		PopHtml += '<tr><th class="resouinfotype"  scope="row">可提供服务</th><td><input type="text" class="frmtype" id="supportedServices"></td></tr>';
19
		PopHtml += '<tr class="workmsgbox"><th></th><td><div class="workmsg workmsg3"></div></td></tr>';
20
		PopHtml += '<tr><th class="resouinfotype"  scope="row">学术领域</th><td><input type="text" class="frmtype" id="subject"></td></tr>';
21
		PopHtml += '<tr><th class="resouinfotype"  scope="row">应用行业</th><td><input type="text" class="frmtype" id="industry"></td></tr>'; 
22
		PopHtml += '<tr><th class="resouinfotype"  scope="row">期望付款方式</th><td><input type="text" class="frmtype" placeholder="例:一次性付款" id="hopePayMethod"></td></tr>';
23
		PopHtml += '<tr><th class="resouinfotype"  scope="row">详细描述</th><td colspan="2" ><textarea class="frmtype" id="hopePayMethod"></textarea></td></tr>';
24
		PopHtml += '<tr><th class="resouinfotype" scope="row">合作备注</th><td colspan="2"><textarea class="frmtype" id="cooperationNotes"></textarea></td></tr>';
25
		PopHtml += '<tr><td colspan="3"><div class="addrebtn" style="text-align:center;"><input type="button" value="保存" class="frmtype frmbtn" id="inputb"><input type="button" value="删除资源" class="frmtype frmbtn frmrbtn" id="deletedResource"></div></td></tr>';
26
		PopHtml += '</table></form> <span class="workclose">关闭</span></div>';
27
		
28
		//必须先将_html添加到body,再设置Css样式
29
		$("body").before(CoverHtml);
30
        $("body").append(PopHtml);
31
		
32
		
33
		
34
		var _widht = document.documentElement.clientWidth;  //屏幕宽
35
		var _height = document.documentElement.clientHeight; //屏幕高
36
		var boxWidth = $(".resouinfo").width();
37
		var boxHeight = $(".resouinfo").height();
38
		//让提示框居中
39
		$(".resouinfo").css({ top: '(_height - boxHeight)/2 + "px"', left: '(_widht - boxWidth) / 2 + "px"' });
40

41

42
		//关闭按钮
43
		$(".workclose").click(function(){
44
			$(".blackcover").remove();
45
			$(".resouinfo").remove();
46
		})
47
}
48
//资源信息 //
49

50

51
// 资源申请确认
52
function ResourceApply(){
53
		var PopHtml="";
54
		var CoverHtml="";
55
		CoverHtml += '<div class="blackcover"></div>';
56
		PopHtml += '<div class="resouapply"><form class="resoufrm">';
57
		PopHtml += '<div class="resoutit">资源信息</div>';
58
		PopHtml += '<table class="resoutab"><tr>';
59
		PopHtml += '<th class="resouinfotype" scope="row">合作编号</th>';
60
		PopHtml += '<td>00001109</td>';
61
		PopHtml += '<td rowspan="5"><div class="resouimg" ><img src="" width="100%" height="100%"></div></td>';
62
		PopHtml += '</tr>';
63
		PopHtml += '<tr><th class="resouinfotype"  scope="row">申请时间</th><td>2016-08-01</td></tr>';
64
		PopHtml += '<tr><th class="resouinfotype"  scope="row">需求资源</th><td>xxx检测仪</td> </tr>';
65
		PopHtml += '<tr><th class="resouinfotype"  scope="row">资源发布者</th><td>张三 <a href="" class="worktel">联系ta</a></td></tr>';
66
		PopHtml += '<tr><th class="resouinfotype"  scope="row">需求方</th><td>';
67
        PopHtml += '<select class="frmtype"><option>本人</option><option>所属机构</option></select>';
68
		PopHtml += '</td></tr>';
69
		PopHtml += '<tr><th class="resouinfotype"  scope="row">具体需求</th><td colspan="2"><textarea class="frmtype"></textarea></td></tr>';
70
		PopHtml += ' <tr><th class="resouinfotype"  scope="row">相关文件</th><td colspan="2" ><a href="" class="updownbtn" >点击下载</a></td></tr>';
71
		PopHtml += '<tr><th class="resouinfotype" scope="row">交付时间</th><td colspan="2">2016-09-01</td></tr></table>';
72
		PopHtml += '<table class="resoutab btnboxup"><tr><td colspan="3"><div class="addrebtn" style="text-align:center;">';
73
        PopHtml += '<input type="submit" value="确认,下一步" class="frmtype frmbtn"><input type="button" value="联系ta" class="frmtype frmbtn"><input type="button" value="直接拒绝" class="frmtype frmbtn frmrbtn"></div></td></tr></table>';
74
		
75
		PopHtml += '<table class="resoutab applysure"><tr><th class="resouinfotype"  scope="row">付款方式</th><td colspan="2" ><input type="text" class="frmtype" id="payMethod"></td></tr>';
76
		PopHtml += '<tr><th class="resouinfotype" scope="row">费用</th><td colspan="2"><input type="text" class="frmtype" id="dealPrice"  ></td></tr>';
77
		PopHtml += '<tr><th class="resouinfotype" scope="row">合作协议</th><td colspan="2"><a class="updownbtn" href="">点击上传</a></td></tr>';
78
		PopHtml += '<tr><th class="resouinfotype" scope="row">备注</th><td colspan="2"><textarea class="frmtype" id="consultContent"></textarea></td></tr></table>';
79
		PopHtml += '<table class="resoutab btnboxdown"> <tr><td colspan="3"><div class="addrebtn" style="text-align:center;"><input type="button" value="发送" id="del" class="frmtype frmbtn"><input type="button" value="返回" class="frmtype frmbtn frmrbtn"></div></td></tr>';
80
		PopHtml += '</table></form><span class="workclose">关闭</span></div>';
81
		
82
		
83
		//必须先将_html添加到body,再设置Css样式
84
		$("body").before(CoverHtml);
85
        $("body").append(PopHtml);
86

87
		var _widht = document.documentElement.clientWidth;  //屏幕宽
88
		var _height = document.documentElement.clientHeight; //屏幕高
89
		var boxWidth = $(".resouapply").width();
90
		var boxHeight = $(".resouapply").height();
91
		//让提示框居中
92
		$(".resouapply").css({ top: '(_height - boxHeight)/2 + "px"', left: '(_widht - boxWidth) / 2 + "px"' });
93

94

95
		//关闭按钮
96
		$(".workclose").click(function(){
97
			$(".blackcover").remove();
98
			$(".resouapply").remove();
99
		})
100
                 	  
101
}
102
//资源申请确认 //

+ 137 - 16
src/main/webapp/js/workspace.js

@ -3,6 +3,7 @@ $(function(){
3 3
	var userid = $.cookie("userid");
4 4
	var servPath = "http://121.42.53.174:81/";
5 5
 	if(userid){
6
 		$(".myWorkspace").attr("href","resources.html?"+userid);
6 7
		$(".head-portrait").show();
7 8
		$(".unlogin").hide();
8 9
 		$(".portrait-p").attr("src",servPath+"/images/head/"+userid+"_m.jpg");
@ -150,9 +151,10 @@ $(function(){
150 151

151 152
	$("#workmysrc").on("click",".resoumag",function()
152 153
			{
153
				$(".blackcover").show();
154
				$(".resouinfo").show();
154
//				$(".blackcover").show();
155
//				$(".resouinfo").show();
155 156
				var resourceID=$(this).attr("resourceId");
157
				console.log(resourceID);
156 158
				$("#deletedResource").on("click",function(){
157 159
					$.ajax({
158 160
						"url" : "/ajax/resource/"+resourceID,
@ -161,12 +163,12 @@ $(function(){
161 163
							if ($data.success) {
162 164
								location.reload(true);
163 165
							} else {
164
								alert($data.msg);
166
								$.MsgBox.Alert('message',$data.msg);
165 167
							}
166 168
						}
167 169
					});
168 170
				})
169
				console.log(resourceID);
171
			
170 172
				if(resourceID){
171 173
					$.ajax({		
172 174
						"url":"/ajax/resource/"+resourceID,
@ -186,10 +188,10 @@ $(function(){
186 188
								}
187 189
								else
188 190
								{
189
									console.log("系统异常!");
191
									$.MsgBox.Alert('message',"系统异常!");
190 192
								}
191 193
						},
192
						"error":function(){$.MsgBox.Alert('message','failddd')}
194
						"error":function(){$.MsgBox.Alert('message','failed')}
193 195
					});
194 196
				}
195 197
				$("#inputb").on("click",function()
@ -205,13 +207,13 @@ $(function(){
205 207
								if (resourceID) {
206 208
									$data.resourceId = resourceID;
207 209
								}
208
								console.log($data);
210
								//console.log($data);
209 211
//							resourceName();
210 212
//							professor();
211 213
//							supportedServices();
212 214
							if(resourceNamePass && professorPass && supportedServicesPass)
213 215
							{
214
								$.ajax({"url" : "../ajax/resource",
216
								$.ajax({"url" : "/ajax/resource",
215 217
									"type" : resourceID ? "PUT" : "POST",
216 218
									"success" : function(rdata) {
217 219
										if (rdata.success) {
@ -221,7 +223,7 @@ $(function(){
221 223
												location.href = "resource.html?id="+ rdata.data;
222 224
											}
223 225
										} else {
224
											alert("jjj");
226
											$.MsgBox.Alert('message',"发布失败");
225 227
										}
226 228
									},
227 229
									"data" : resourceID ? JSON.stringify($data) : $data,
@ -233,20 +235,22 @@ $(function(){
233 235
			});
234 236
	
235 237
$.ajax({		
236
	"url":"/ajax/resource/qa",
238
	"url":"/ajax/resource/qapro",
237 239
	"type":"get",
238 240
	"async": true,
241
	"data":{"professorId":userid},
239 242
	"success":function(data){
240 243
		if(data.success)
241
			{
244
			{var add='';
245
			var k=0;
242 246
			for(var i=0;i<data.data.length;i++)
243 247
				{
244
					var add='<div class="myResource"style="width:100%;min-height:350px;"><div class="lefttab fl"style="overflow:hidden;"><table class="resoubrief"><tr><td><img width="100%" height="140" src=""></td>'
248
					var add='<div class="maintab"><div class="lefttab fl"><table class="resoubrief"><tr><td><img width="100%" height="140" src=""></td>'
245 249
					add+='</tr><tr><td><ul><li>资源名称:'+data.data[i].resourceName+'</li><li>发布人:'+data.data[i].professorId+'</li><li>使用用途:'+data.data[i].supportedServices+'</li> '               
246 250
					add+='<li class="li1">应用行业:'+data.data[i].subject+'</li><li class="li2">可提供服务:'+data.data[i].industry+'</li><li class="li3">期望付款方式:'+data.data[i].hopePayMethod+'</li> '                   
247 251
					add+='<li class="li4">详细描述:'+data.data[i].descp+'</li><li class="li5">备注:'+data.data[i].cooperationNotes+'</li></ul></td></tr><tr>'                
248
					add+='<td><span class="resoumag">资源管理</span></td></tr></table></div>'                 
249
					add+='<div class="righttab fr"><table width="100%" class="worktab">'
252
					add+='<td><span class="resoumag" onclick="ResourceInfo();">资源管理</span></td></tr></table></div>'                 
253
					add+='<div class="righttab fr"><table width="100%" class="worktab tablecon">'
250 254
					add+='<tr class="worktabtit"><th width="10%" height="40">申请时间</th><th width="10%">需求方</th>'    
251 255
					add+='<th width="10%">联系人</th><th width="14%">状态</th><th width="10%">交付时间</th><th width="10%">成交金额</th><th width="14%">付款方式</th>'        
252 256
					add+='<th width="12%">付款状态</th><th width="20%">操作</th></tr></table></div></div>';
@ -268,14 +272,131 @@ $.ajax({
268 272
					}
269 273
					
270 274
					$('.resoumag').eq(i+1).attr("resourceId",data.data[i].resourceId);
275
					console.log($('.resoumag').eq(i+1).attr("resourceId"));
276
					(function(i){
277
						$.ajax({		
278
							"url":"/ajax/operation/qares",
279
							"type":"get",
280
							"async": true,
281
							"data":{"resourceId":$('.resoumag').eq(i+1).attr("resourceId")},						
282
							"success":function(data){
283
								if(data.success)
284
									{
285
									console.log(data);
286
										for(var j=0;j<data.data.length;j++){
287
											var addString='<tr class="workitem">'
288
							                    addString+='<td>'+data.data[j].deliverTime+'</td>'
289
							                     addString+='<td class="workitemsrc">tt</td>'
290
							                      addString+='<td> <a class="worktel" href="">'+data.data[j].demandId+'<span class="worktelbtn"></span></a></td>'
291
							                     addString+='<td>'+data.data[j].operationStatus+'<br>回复</td>'
292
							                      addString+='<td>'+data.data[j].dealTime+'</td>'
293
							                       addString+='<td>'+data.data[j].dealPrice+'</td>'
294
							                        addString+='<td>'+data.data[j].payMethod+'</td>'
295
							                       addString+='<td>2000<br></td>'
296
							                        addString+='<td><a class="operatebtn modification" onclick="ResourceApply();">修改申请</a></td> </tr>'						                      		
297
							                        	$(".tablecon").eq(i).append(addString);
298
														$(".modification").eq(k).attr("operationId",data.data[j].operationId)
299
														k++;
300
											addString="";
301
										}
302
										 
303
									}
304
									else
305
									{
306
										$.MsgBox.Alert('message',"系统异常!");
307
									}
308
							},
309
							"error":function(){$.MsgBox.Alert('message','failed')}
310
						});
311
						
312
					})(i);
313
				
314
					add="";
271 315
				}
272 316
			}
273 317
			else
274 318
			{
275
				console.log("系统异常!");
319
				$.MsgBox.Alert('message',"系统异常!");
320
			}
321
	},
322
	"error":function(){$.MsgBox.Alert('message','failed')}
323
});
324
$("#consd").on("click",".modification",function(){
325
//	$(".blackcover").show();
326
//	$(".resouapply").show();
327
	var operationId=$(this).attr("operationId");
328
	console.log(operationId);
329
	$.ajax({	
330
		"url":"/ajax/operation/"+operationId,
331
		"type":"get",
332
		"async": true,
333
		"data":{"operationId":operationId},
334
		"success":function(data){
335
			if(data.success)
336
				{	
337
					console.log(data);
338
				}
339
				else
340
				{
341
					console.log("系统异常!");
342
				}
343
		},
344
		"error":function(){$.MsgBox.Alert('message','failddd')}
345
	});
346
	$("#del").click(function(){
347
		var $date = {};		
348
		$date.dealPrice = $("#dealPrice").val();
349
		$date.payMethod = $("#payMethod").val();
350
		$date.consultContent = $("#consultContent").val();
351
		$date.operationId=operationId;
352
		$.ajax({
353
			"url" : "/ajax/operation",
354
			"type" : "put",
355
			"data" :JSON.stringify($date),
356
			"contentType" :"application/x-www-form-urlencoded",
357
			"success" : function(data) {
358
				if (data.success) {					
359
					//location.reload(true);
360
					console.log(data);
361
				} else {
362
					alert(data.msg);
363
				}
364
			},
365
		"beforeSend":function(){
366
			console.log(this.data);
367
		},
368
		});
369
	})
370
})
371
$.ajax({		
372
	"url":"/ajax/operation/qapro",
373
	"type":"get",
374
	"async": true,
375
	"data":{"demandId":userid},
376
	"success":function(data){
377
		if(data.success)
378
			{	
379
				for(var i=0;i<data.data.length;i++)
380
					{
381
					var stringContent="";
382
						stringContent +='<tr class="workitem">'
383
	                    stringContent +='<td>'+data.data[i].deliverTime+'</td>'
384
	                    stringContent +='<td class="workitemsrc"></td>'
385
	                    stringContent +='<td> <a class="worktel" href="">张三<span class="worktelbtn"></span></a></td>'
386
	                    stringContent +='<td>'+data.data[i].operationStatus+'</td>'
387
	                    stringContent +='<td>'+data.data[i].dealTime+'</td>'      
388
	                    stringContent +='<td>'+data.data[i].dealPrice+'</td>'     
389
	                    stringContent +='<td> - </td>'       
390
	                    stringContent +='<td> - </td>'        
391
	                    stringContent +='<td>修改申请</td></tr>'
392
	                   $(".worktabb").eq(i).append( stringContent) 	
393
					}
394
			}
395
			else
396
			{
397
				$.MsgBox.Alert('message',"系统异常!");
276 398
			}
277 399
	},
278 400
	"error":function(){$.MsgBox.Alert('message','failddd')}
279 401
});
280

281 402
});

+ 25 - 305
src/main/webapp/resources.html

@ -14,34 +14,39 @@
14 14
<script type="text/javascript"src="js/jquery.cookie.js"></script>
15 15
<script type="text/javascript"src="js/jquery.similar.msgbox.js"></script>
16 16
<script type="text/javascript" src="js/index.js"></script>
17
<script type="text/javascript" src="js/popup.js"></script>
17 18
<script type="text/javascript" src="js/workspace.js"></script>
18 19
</head>
19 20

20 21
<body>
21
<div class="blackcover"></div>
22 22
<div id="header">
23 23
	<a href="index.html" alt="科袖" class="logo"></a>
24 24
	<div class="searchblock" style="display:block;">
25 25
		<input type="text" placeholder="搜索专家、研究方向或科研机构" class="search-txt" id="hsearchContent">
26 26
		<div class="search-btn" id="hsearch"><span class="search-icon"></span></div>
27 27
	</div>
28
	<!--未登录-->
29
	<a href="login-invite-code.html"><div class="unlogin">特邀专家登录</div></a>
30
	<!--已登录-->
31
	<div class="head-portrait">
32
    	<img class="portrait-p" />
33
		<div class="personal-infor">
34
			<div class="triangleB"></div>
35
			<div class="personal-box">
36
				<!-- <a href="#"><span class="icon icon1"></span>我的主页</a> -->
37
				<a href="information.html"><span class="icon icon2"></span>修改资料</a>
38
				<a href="account-set.html"><span class="icon icon3"></span>账户设置</a>
39
				<a href="#" onClick="exit()"><span class="icon icon4"></span>退出登录</a>
40
			</div>
41
		</div>
28
	<div class="header-right"> 
29
        <!--未登录-->
30
        <a href="login-invite-code.html"><div class="unlogin">特邀专家登录</div></a>
31
        <!--已登录-->
32
        <div class="onlogin">
33
	        <div class="head-portrait">
34
	        	<img class="portrait-p" />
35
	            <div class="personal-infor">
36
	                <div class="triangleB"></div>
37
	                <div class="personal-box">
38
	                    <!-- <a href="#"><span class="icon icon1"></span>我的主页</a> -->
39
	                    <a href="information.html"><span class="icon icon2"></span>修改资料</a>
40
	                    <a href="account-set.html"><span class="icon icon3"></span>账户设置</a>
41
	                    <a href="#" onClick="exit()"><span class="icon icon4"></span>退出登录</a>
42
	                </div>
43
	                
44
	            </div>
45
	        </div>
46
	        <a class="myWorkspace" href="resources.html">我的工作台</a>
47
        </div>
42 48
	</div>
43 49
</div>
44

45 50
<div id="container">
46 51
	<div class="con-center">
47 52
        <div class="workmenu">
@ -54,102 +59,16 @@
54 59
            <div class="worksubcon">
55 60
      <!--// 我的资源-->
56 61
            	<div class="workmysrc clearfix"id="workmysrc">
57
                	<div class="workmysrctit">我的资源<span class="workbtn resoumag">发布新资源</span></div>
62
                	<div class="workmysrctit">我的资源<span class="workbtn resoumag" onclick="ResourceInfo();">发布新资源</span></div>
58 63
                	<div id="consd"></div>
59
                    <!--<div class="lefttab fl">
60
                        <table class="resoubrief">
61
                            <tr>
62
                                <td><img width="100%" height="140" src=""></td>
63
                            </tr>
64
                            <tr>
65
                                <td> 
66
                                    <ul>
67
                                        <li>资源名称:XXX设备</li>
68
                                        <li>资源名称:XXX设备</li>
69
                                        <li>资源名称:XXX设备</li>
70
                                        <li>资源名称:XXX设备</li>
71
                                    </ul>
72
                                </td>
73
                            </tr>
74
                            <tr>
75
                                <td> 
76
                                    <span class="resoumag">资源管理</span>
77
                                </td>
78
                            </tr>
79
                        </table> 
80
                    </div>
81
                    <div class="righttab fr">
82
                        <table width="100%" class="worktab">
83
                            <tr class="worktabtit">
84
                                <th width="10%" height="40">申请时间</th>
85
                                <th width="10%">需求方</th>
86
                                <th width="10%">联系人</th>
87
                                <th width="14%">状态</th>
88
                                <th width="10%">交付时间</th>
89
                                <th width="10%">成交金额</th>
90
                                <th width="14%">付款方式</th>
91
                                <th width="12%">付款状态</th>
92
                                <th width="20%">操作</th>
93
                            </tr>
94
                            <tr class="workitem">
95
                                <td>8月25日</td>
96
                                <td class="workitemsrc">XXX科技有限公司</td>
97
                                 <td> <a class="worktel" href="">黄白川<span class="worktelbtn"></span></a></td>
98
                                <td>新的申请<br>回复</td>
99
                                <td>7月31日</td>
100
                                <td>¥8000</td>
101
                                <td>预付25%定金,完成后付余款</td>
102
                                <td>2000<br>/10000</td>
103
                                <td><a class="operatebtn">修改申请</a></td>
104
                            </tr>
105
                            <tr class="workitem">
106
                                <td>8月25日</td>
107
                                <td class="workitemsrc">XXX</td>
108
                                 <td> <a class="worktel" href="">张三<span class="worktelbtn"></span></a></td>
109
                                <td>对方已发来报价</td>
110
                                <td> - </td>
111
                                <td> - </td>
112
                                <td> - </td>
113
                                <td> - </td>
114
                                <td><a class="operatebtn">查看详情</a><a class="operatebtn">付款</a><a class="operatebtn">付款记录</a></td>
115
                            </tr>
116
                             <tr class="workitem">
117
                                <td>8月25日</td>
118
                                <td class="workitemsrc">XXX</td>
119
                                 <td> <a class="worktel" href="">张三<span class="worktelbtn"></span></a></td>
120
                                <td>对方已发来报价</td>
121
                                <td> - </td>
122
                                <td> - </td>
123
                                <td> - </td>
124
                                <td> - </td>
125
                                <td><a class="operatebtn">查看详情</a><a class="operatebtn">付款</a><a class="operatebtn">付款记录</a></td>
126
                            </tr>
127
                             <tr class="workitem">
128
                                <td>8月25日</td>
129
                                <td class="workitemsrc">XXX</td>
130
                                 <td> <a class="worktel" href="">张三<span class="worktelbtn"></span></a></td>
131
                                <td>对方已发来报价</td>
132
                                <td> - </td>
133
                                <td> - </td>
134
                                <td> - </td>
135
                                <td> - </td>
136
                                <td><a class="operatebtn">查看详情</a><a class="operatebtn">付款</a><a class="operatebtn">付款记录</a></td>
137
                            </tr>
138
                            <tr>
139
                                <td colspan="9">
140
                                    <div class="tcdPageCode"><span class="disabled">上一页</span><span class="current">1</span><a href="javascript:;" class="tcdNumber">2</a><a href="javascript:;" class="tcdNumber">3</a><a href="javascript:;" class="tcdNumber">4</a><span>...</span><a href="javascript:;" class="tcdNumber">26</a><a href="javascript:;" class="nextPage">下一页</a></div>
141
                                </td>
142
                            </tr>
143
                        </table>
144
                    </div>
145
                    </div>-->
64
                    
146 65
                </div>
147 66
                <!--我的资源 //-->
148 67
                
149 68
                <!--// 我的需求-->
150 69
            	<div class="workmysrc">
151 70
                	<div class="workmysrctit">我的需求</div>
152
                    <table width="100%" height="60" class="worktab">
71
                    <table width="100%" height="60" class="worktab worktabb">
153 72
                    	<tr class="worktabtit">
154 73
                            <th width="10%" height="40">申请时间</th>
155 74
                            <th width="10%">需求资源</th>
@ -161,50 +80,7 @@
161 80
                            <th width="10%">付款状态</th>
162 81
                            <th width="20%">操作</th>
163 82
                        </tr>
164
                        <tr class="workitem">
165
                        	<td>8月25日</td>
166
                            <td class="workitemsrc">XXX</td>
167
                            <td> <a class="worktel" href="">张三<span class="worktelbtn"></span></a></td>
168
                            <td>申请已发送<br>待对方确认</td>
169
                            <td> - </td>
170
                            <td> - </td>
171
                            <td> - </td>
172
                            <td> - </td>
173
                            <td>修改申请</td>
174
                        </tr>
175
                        <tr class="workitem">
176
                        	<td>8月25日</td>
177
                            <td class="workitemsrc">XXX</td>
178
                             <td> <a class="worktel" href="">张三<span class="worktelbtn"></span></a></td>
179
                            <td>对方已发来报价</td>
180
                            <td> - </td>
181
                            <td> - </td>
182
                            <td> - </td>
183
                            <td> - </td>
184
                            <td><a class="operatebtn">查看详情</a><a class="operatebtn">付款</a><a class="operatebtn">付款记录</a></td>
185
                        </tr>
186
                         <tr class="workitem">
187
                        	<td>8月25日</td>
188
                            <td class="workitemsrc">XXX</td>
189
                             <td> <a class="worktel" href="">张三<span class="worktelbtn"></span></a></td>
190
                            <td>对方已发来报价</td>
191
                            <td> - </td>
192
                            <td> - </td>
193
                            <td> - </td>
194
                            <td> - </td>
195
                            <td><a class="operatebtn">查看详情</a><a class="operatebtn">付款</a><a class="operatebtn">付款记录</a></td>
196
                        </tr>
197
                         <tr class="workitem">
198
                        	<td>8月25日</td>
199
                            <td class="workitemsrc">XXX</td>
200
                            <td> <a class="worktel" href="">张三<span class="worktelbtn"></span></a></td>
201
                            <td>对方已发来报价</td>
202
                            <td> - </td>
203
                            <td> - </td>
204
                            <td> - </td>
205
                            <td> - </td>
206
                            <td><a class="operatebtn">查看详情</a><a class="operatebtn">付款</a><a class="operatebtn">付款记录</a></td>
207
                        </tr>
83
                       
208 84
                        <tr>
209 85
                        	<td colspan="9">
210 86
                        		<div class="tcdPageCode"><span class="disabled">上一页</span><span class="current">1</span><a href="javascript:;" class="tcdNumber">2</a><a href="javascript:;" class="tcdNumber">3</a><a href="javascript:;" class="tcdNumber">4</a><span>...</span><a href="javascript:;" class="tcdNumber">26</a><a href="javascript:;" class="nextPage">下一页</a></div>
@ -213,161 +89,6 @@
213 89
                    </table>
214 90
                </div>
215 91
                <!--我的需求 //-->
216
                
217
                
218
                
219
                <!--// 资源信息-->
220
                <div class="resouinfo">
221
                    <form class="resoufrm">
222
                    	<div class="resoutit">资源信息</div>
223
                   	  <table class="resoutab">
224
                    	  <tr>
225
                    	    <th class="resouinfotype" scope="row">资源名称</th>
226
                    	    <td><input type="text" class="frmtype"id="resourceName"></td>
227
                    	    <td rowspan="9">
228
                            	<div class="resouimg" >
229
                                	<img src="" width="100%" height="100%">
230
                                    <span class="resouup"><input type="file" id="resouup" >上传资源图片</span>
231
                                </div>
232
                            </td>
233
                  	    </tr>
234
                        <tr class="workmsgbox"><th></th><td><div class="workmsg1"></div></td></tr>  
235
                    	  <tr>
236
                    	    <th class="resouinfotype"  scope="row">资源发布者</th>
237
                    	    <td><input type="text" class="frmtype"id="professor" >  </td>
238
                    	    
239
                  	    </tr>
240
						<tr class="workmsgbox"><th></th><td><div class="workmsg2"></div></td></tr>  
241
                    	  <tr>
242
                    	    <th class="resouinfotype"  scope="row">可提供服务</th>
243
                    	    <td><input type="text" class="frmtype"id="supportedServices"></td>
244
                  	    </tr>
245
						<tr class="workmsgbox"><th></th><td><div class="workmsg3"></div></td></tr>  
246
                    	  <tr>
247
                    	    <th class="resouinfotype"  scope="row">学术领域</th>
248
                    	    <td><input type="text" class="frmtype"id="subject"></td>
249
                  	    </tr>
250
                    	  <tr>
251
                    	    <th class="resouinfotype"  scope="row">应用行业</th>
252
                    	    <td><input type="text" class="frmtype"id="industry"></td>
253
                  	    </tr>
254
                    	  <tr>
255
                    	    <th class="resouinfotype"  scope="row">期望付款方式</th>
256
                    	    <td><input type="text" class="frmtype" placeholder="例:一次性付款"id="hopePayMethod"></td>
257
                  	    </tr>
258
                    	  <tr>
259
                    	    <th class="resouinfotype"  scope="row">详细描述</th>
260
                    	    <td colspan="2" ><textarea class="frmtype"id="descp"></textarea></td>
261
                   	    </tr>
262
                    	  <tr>
263
                    	    <th class="resouinfotype" scope="row">合作备注</th>
264
                    	    <td colspan="2"><textarea class="frmtype"id="cooperationNotes"></textarea></td>
265
                   	    </tr>
266
                        <tr>
267
                        	<td colspan="3">
268
                                <div class="addrebtn" style="text-align:center;">
269
                                    <input type="button" value="保存" class="frmtype frmbtn" id="inputb">
270
                                    <input type="button" value="删除资源" class="frmtype frmbtn frmrbtn"id="deletedResource">
271
                                </div>
272
                                <div class="applyrebtn" style="text-align:center;">
273
                                    <input type="submit" value="申请" class="frmtype frmbtn">
274
                                    <input type="button" value="联系ta" class="frmtype frmbtn">
275
                                </div>
276
                            </td>
277
                        	
278
                        </tr>
279
                  	  </table>
280
                    </form>
281
                    <span class="workclose">关闭</span>
282
             	 </div>
283
                <!--资源信息 //-->
284
                <!--// 资源申请确认-->
285
                <div class="resouapply">
286
                    <form class="resoufrm">
287
                    	<div class="resoutit">资源申请</div>
288
                   	  <table class="resoutab">
289
                    	  <tr>
290
                    	    <th class="resouinfotype" scope="row">合作编号</th>
291
                    	    <td>00001109</td>
292
                    	    <td rowspan="5">
293
                            	<div class="resouimg" >
294
                                	<img src="" width="100%" height="100%">
295
                                </div>
296
                            </td>
297
                  	    </tr>
298
                    	  <tr>
299
                    	    <th class="resouinfotype"  scope="row">申请时间</th>
300
                    	    <td>2016-08-01</td>
301
                    	    
302
                  	    </tr>
303
                    	  <tr>
304
                    	    <th class="resouinfotype"  scope="row">需求资源</th>
305
                    	    <td>xxx检测仪</td>
306
                  	    </tr>
307
                    	  <tr>
308
                    	    <th class="resouinfotype"  scope="row">资源发布者</th>
309
                    	    <td>张三 <a href="" class="worktel">联系ta</a></td>
310
                  	    </tr>
311
                    	  <tr>
312
                    	    <th class="resouinfotype"  scope="row">需求方</th>
313
                    	    <td>
314
                            	<select class="frmtype">
315
                                	<option>本人</option>
316
                                    <option>所属机构</option>
317
                                </select>
318
                            </td>
319
                  	    </tr>
320
                    	  <tr>
321
                    	    <th class="resouinfotype"  scope="row">具体需求</th>
322
                    	    <td colspan="2">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 pulvinar tempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla l</td>
323
                  	    </tr>
324
                    	  <tr>
325
                    	    <th class="resouinfotype"  scope="row">相关文件</th>
326
                    	    <td colspan="2" ><a href="" class="updownbtn" >点击下载</a></td>
327
                   	    </tr>
328
                    	  <tr>
329
                    	    <th class="resouinfotype" scope="row">交付时间</th>
330
                    	    <td colspan="2">2016-09-01</td>
331
                   	    </tr>
332
                        <tr>
333
                        	<td colspan="3">
334
                                <div class="addrebtn" style="text-align:center;">
335
                                    <input type="submit" value="确认,下一步" class="frmtype frmbtn">
336
                                    <input type="button" value="联系ta" class="frmtype frmbtn">
337
                                    <input type="button" value="直接拒绝" class="frmtype frmbtn frmrbtn">
338
                                </div>
339
                            </td>
340
                        </tr>
341
                          <tr>
342
                    	    <th class="resouinfotype"  scope="row">付款方式</th>
343
                    	    <td colspan="2" ><input type="text" class="frmtype" ></td>
344
                   	    </tr>
345
                    	  <tr>
346
                    	    <th class="resouinfotype" scope="row">费用</th>
347
                    	    <td colspan="2"><input type="text" class="frmtype" ></td>
348
                   	    </tr>
349
                        <tr>
350
                    	    <th class="resouinfotype" scope="row">合作协议</th>
351
                    	    <td colspan="2"><a class="updownbtn" href="">点击上传</a></td>
352
                   	    </tr>
353
                        <tr>
354
                    	    <th class="resouinfotype" scope="row">备注</th>
355
                    	    <td colspan="2"><textarea class="frmtype"></textarea></td>
356
                   	    </tr>
357
                        <tr>
358
                        	<td colspan="3">
359
                                <div class="addrebtn" style="text-align:center;">
360
                                    <input type="submit" value="发送" class="frmtype frmbtn">
361
                                    <input type="button" value="返回上一步" class="frmtype frmbtn frmrbtn">
362
                                </div>
363
                            </td>
364
                        	
365
                        </tr>
366
                  	  </table>
367
                    </form>
368
                    <span class="workclose">关闭</span>
369
             	 </div>
370
                <!--资源申请确认 //-->
371 92
            </div>
372 93
        </div>
373 94
    </div>
@ -398,6 +119,5 @@
398 119
	</div>
399 120
	<div class="footer-btm">本站由 阿里云 提供计算与安全服务 Copyright © 2016~2017 科袖 | 京ICP备12345678号 | 京ICP证123456号 | 京公网安备11010800011111号 | 网站联盟安全认证</div>
400 121
</div>
401

402 122
</body>
403 123
</html>

+ 20 - 13
src/main/webapp/search.html

@ -24,19 +24,26 @@
24 24
		<div class="search-btn" id="hsearch"><span class="search-icon"></span></div>
25 25
	</div>
26 26

27
	<a href="login-invite-code.html"><div class="unlogin">特邀专家登录</div></a>
28
	<!--登录-->
29
	<div class="head-portrait">
30
    	<img class="portrait-p" />
31
		<div class="personal-infor">
32
			<div class="triangleB"></div>
33
			<div class="personal-box">
34
				<!--<a href="index.html"><span class="icon icon1"></span>我的主页</a>-->
35
				<a href="information.html"><span class="icon icon2"></span>修改资料</a>
36
				<a href="account-set.html"><span class="icon icon3"></span>账户设置</a>
37
				<a href="#" onClick="exit()"><span class="icon icon4" ></span>退出登录</a>
38
			</div>
39
		</div>
27
	<div class="header-right"> 
28
        <!--登录-->
29
        <a href="login-invite-code.html"><div class="unlogin">特邀专家登录</div></a>
30
        <!--已登录-->
31
        <div class="onlogin">
32
	        <div class="head-portrait">
33
	        	<img class="portrait-p" />
34
	            <div class="personal-infor">
35
	                <div class="triangleB"></div>
36
	                <div class="personal-box">
37
	                    <!-- <a href="#"><span class="icon icon1"></span>我的主页</a> -->
38
	                    <a href="information.html"><span class="icon icon2"></span>修改资料</a>
39
	                    <a href="account-set.html"><span class="icon icon3"></span>账户设置</a>
40
	                    <a href="#" onClick="exit()"><span class="icon icon4"></span>退出登录</a>
41
	                </div>
42
	                
43
	            </div>
44
	        </div>
45
	        <a class="myWorkspace" href="resources.html">我的工作台</a>
46
        </div>
40 47
	</div>
41 48
	
42 49
</div>