1、修改资源弹窗在ie中input框获取不到焦点的问题

2、添加我的工作台数据填充

src/main/webapp/account-set.html

@@ -5,6 +5,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>科袖－账号设置（个人信息）</title>
<link href="css/bootstrap.min.css" rel="stylesheet">
<link rel="stylesheet" href="css/reset.css" />
<link type="text/css" href="css/index.css" rel="stylesheet">
<link type="text/css" href="css/common.css" rel="stylesheet">

src/main/webapp/css/common.css

@@ -10,7 +10,7 @@ input{ outline:none;}
#header{width:100%;min-width:1170px; height:60px; background:rgba(255,132,0,1); position:fixed; top:0; z-index:999; }
.logo{ display:block; width:80px; height:50px; background:url(../images/logo2.png) no-repeat; margin-left:80px; margin-top:5px; float:left;}
.searchblock{ width:280px; height:35px; position:absolute; left:50%; top:50%; margin-left:-132px; margin-top:-17.5px; display:none;}
.search-txt{ width:220px; line-height: 33px; background:#fff; border:none;-moz-border-radius:10px 0 0 10px;-webkit-border-radius:10px 0 0 10px; border-radius:10px 0 0 10px; behavior:url(../js/ie-css3.htc); float:left;font-size:14px;line-height35px; padding-left:10px; color:#a3a3a3;}
.search-txt{ width:220px;/*line-height兼容*/line-height:35px; height:35px; background:#fff; border:none;-moz-border-radius:10px 0 0 10px;-webkit-border-radius:10px 0 0 10px; border-radius:10px 0 0 10px; behavior:url(../js/ie-css3.htc); float:left;font-size:14px;padding-left:10px; color:#a3a3a3;}
.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;}
.search-icon{ display:block; width:20px; height:20px; background:
url(../images/index-icon.png) no-repeat; background-position:left; margin:8px;}

src/main/webapp/css/index.css

@@ -13,7 +13,7 @@ input{ outline:none;}
.theme h2{font-size:30px;line-height:50px; color:#fff; text-align:center; text-shadow:0px 0px 10px #2d2524;}
.main-search{ width:700px; height:46px; margin:auto; margin-top:20px;}
.sear-txt{ width:530px; height:38px; background:#fff; border:none; border-radius:10px 0 0 10px; float:left;font-size:16px;line-height:40px; padding-left:20px; color:#a3a3a3;}
.sear-txt{ width:530px; height:40px; background:#fff; border:none; border-radius:10px 0 0 10px; float:left;font-size:16px;line-height:40px; padding-left:20px; color:#a3a3a3;}
.sear-btn{ width:140px; height:40px; background:#ff8400; border-radius:0 10px 10px 0; float:left; cursor:pointer;font-size:18px;line-height:40px;; color:#fff; text-align:center; }
/*寻找专家流程*/
.process{ width:806px; height:205px; margin:auto;}
@@ -26,10 +26,10 @@ input{ outline:none;}
.process p{font-size:14px;line-height:20px; color:#888; text-align:center;  }
.nextR{ width:100px; height:205px; float:left; background:url(../images/nextR.png) no-repeat center center; }
/*热门领域*/
.hot-field{ width:100%; height:540px; background:url(../images/fieldbg.jpg) no-repeat; background-size:100% 100%;padding:40px 0;}
.hh4{width:180px; height:46px;padding: 2px 20px; text-align:center; margin:auto;border:1px #fff solid; border-radius:10px;font-size:26px;line-height:46px; color:#fff; text-align:center; }
.hot-field{ width:100%;  background:url(../images/fieldbg.jpg) no-repeat; background-size:100% 100%;padding:40px 0;}
.hh4{width:180px; height:46px;padding: 2px 20px; text-align:center; margin:auto;border:1px #fff solid; border-radius:10px;font-size:26px;line-height:38px; color:#fff; text-align:center; }
.field-box{ width:856px; height:360px; margin:30px auto;}
.field{ width:164px; height:140px; padding:20px 25px; float:left;}
.field{ /*width:164px; height:140px;*/ padding:20px 25px; float:left;}
.field-name{ display:block; width:164px;font-size:18px;line-height:40px; color:#fff;  font-weight:bold;text-align:center;}
.field-icon{ display:block; width:100px; height:100px; border:2px #fff solid; border-radius:50%; margin:auto;}
.field-name:hover{color:#fff;}
@@ -44,10 +44,10 @@ input{ outline:none;}
.more{ display:block; width:132px; height:35px; margin:auto; border:1px #fff solid; border-radius:10px;font-size:14px;line-height:35px;  text-align:center; color:#fff;}
.hot-field .more{ color:#fff;}
/*热门专家*/
.hot-professor{ width:100%; height:750px; padding: 40px 0; margin-bottom: 60px; }
.hot-professor{ width:100%;  padding: 40px 0; }
.hot-professor h4{border:1px #ff8400 solid;color:#ff8400;}
.hot-professor .more{border:1px #ff8400 solid;color:#ff8400;}
.professor-box{ width:900px; height:610px; margin:40px auto;}
.professor-box{ width:900px; height:610px; margin:20px auto;}
.professor{ width:175px; height:255px; border-radius:10px; overflow:hidden; position:relative; float:left; margin:25px;}
.professor img{width:175px; height:255px;}
.professor-data{ width:100%; height:300px; position:absolute; font-size:14px;line-height:16px; text-align:center; color:#fff;top:58%; background:url(../images/p-bg.png) no-repeat;padding:25px 0; }
@@ -316,7 +316,7 @@ label.edu-radio{ float:none;font-size:16px;line-height:26px; color:#868686; }
.shareabout .morebtn .morelink{ color:#333;font-size:14px;line-height:60px;float:right; margin-right:20px;}
/*个人修改页面科研资源*/
.enterwork{ color:#333;position:absolute; bottom:10px; left:110px;}
.enterwork{ color:#333;position:absolute; bottom:10px; left:110px; cursor: pointer;}
/*机构信息页面*/
.head-org{ float:left;  position: relative;width:180px; height:180px; overflow:hidden;}

src/main/webapp/css/popup.css

@@ -10,7 +10,7 @@
.blackcover{ width:100%; height:100%;overflow-x: hidden;overflow-y: auto; position:fixed; background:rgba(0,0,0,.6); z-index:1000; }
.resoufrm p{ font-size:14px;}
/*弹窗资源信息、申请信息*/
.resouinfo{position:absolute;background:#fff;border-radius:10px;padding:30px 20px;font-size:14px;z-index:1001; margin-bottom:40px; box-shadow: 2px 4px 10px 4px #555; -webkit-box-shadow: 2px 4px 10px 4px #555; -moz-box-shadow: 2px 4px 10px 4px #555; }
.resouinfo{position:absolute;background:#fff;min-width:750px;border-radius:10px;padding:30px 20px;font-size:14px;z-index:1001; margin-bottom:40px; box-shadow: 2px 4px 10px 4px #555; -webkit-box-shadow: 2px 4px 10px 4px #555; -moz-box-shadow: 2px 4px 10px 4px #555; }
.resoutit{padding: 0 20px;font-size:16px;line-height:40px;color: #606060; border-bottom:1px solid #ff8400; position:relative; font-weight:bold;}
@@ -28,9 +28,10 @@
.requiredcon{ color:red; position:absolute;font-size:16px; top:0; right:0;}
.resouimgbox{ width:240px; margin:10px;}
.resouimg{width:100%; border:1px solid #d6d6d6; height:240px; position:relative; overflow:hidden;  }
.resouimg{width:240px; border:1px solid #d6d6d6; height:240px; position:relative; overflow:hidden;  }
.resouup{width: 100%;height:100%;position: absolute; top:0;background-color: rgba(0,0,0,0.4);font-size:14px;line-height:240px;color: #fff; text-align:center;}
#resouup{ width: 100%;height:100%;box-shadow: none;opacity:0; position: absolute;left:0;top:0px;cursor: pointer;}
.resouimgmsg{ position: relative; top:10px;left:30px;font-size: 13px;color: #aaa;}
/*资源图片上传*/
.resouimgshow{ display:none; width:100%; height:100%;}
.wrap{ height:200px;position:relative; }

src/main/webapp/css/workspace.css

@@ -31,17 +31,19 @@
.workmysrc{display:none;}
.workmysrc:first-child{display:block;}
.workmysrc .workbtn{ display:block;background:#ff8400;font-size:14px;line-height:30px;color:#fff; width:140px; padding:0 20px; border-radius:4px; cursor:pointer; margin-bottom:10px;}
.workmysrc .workbtn{ display:block;background:#ff8400;text-align: center;font-size:14px;line-height:30px;color:#fff; width:140px; padding:0 20px; border-radius:4px; cursor:pointer; margin-bottom:10px;}
.maintab{ border-bottom:1px dashed #d7d7d7; margin-top:20px; overflow:hidden;}
.maintab:last-child{border-bottom:none;}
.worktab *{ text-align:center; color:#000;}
.lefttab{ width:16%;min-width: 162px; max-height:400px; overflow:hidden;}
.resoubrief{width:100%;height:300px; overflow:hidden;}
.resoubrief tr td{ /*border-bottom:1px solid #d6d6d6;*/ min-height:200px; padding:6px 0;}
.resoubrief tr td{ /*border-bottom:1px solid #d6d6d6;*/ max-height:180px; padding:6px 0;}
.resoubrief tr td ul{max-height: 260px;overflow: hidden;}
.resoubrief tr td ul li{ width:100%; max-width:160px; text-indent:1.5em; word-break: break-all;text-align: justify; /*text-overflow:ellipsis; overflow:hidden; white-space:nowrap;*/}
.resoubrief tr td ul li:first-child{text-indent:0;font-size: 15px;color: #ff8400;}
.resoumag{ display:block; background:#ff8400;font-size:14px;line-height:30px;color:#fff; border-radius:4px; text-align:center; cursor:pointer;}
.resoubrief tr td .resoimgbox{width: 160px; height: 160px; overflow:hidden;}
.managebtn{ display:block; background:#aaa;margin:auto;width:120px;font-size:14px;line-height:30px;color:#fff; border-radius:4px; text-align:center; cursor:pointer;}
.righttab{ width:82%;}
.worktab a{ color:#333;}
.worktab a:hover{color:#ff8400;}

src/main/webapp/index.html

@@ -6,6 +6,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>科袖－首页</title>
<link href="css/bootstrap.min.css" rel="stylesheet">
<link rel="stylesheet" href="css/reset.css" />
<link type="text/css" href="css/index.css" rel="stylesheet">
<link type="text/css" href="css/common.css" rel="stylesheet">
@@ -16,7 +17,7 @@
	<div id="header">
        <a href="index.html" alt="科袖" class="logo"></a>
        <div class="searchblock" id="serc-index">
            <input type="text" placeholder="搜索专家、研究方向或科研机构" class="search-txt" id="hsearchContent" >
            <input type="text" placeholder="搜索专家、研究方向或科研机构" class="search-txt" id="hsearchContent" />
            <div class="search-btn" id="hsearch"><span class="search-icon" ></span></div>
        </div>
        <div class="header-right"> 

src/main/webapp/information.html

@@ -460,59 +460,11 @@
				</div>
				
                <div class="right-box introduction">
					<div class="right-title"><span>科研资源</span> <a href="workspaces.html" class="enterwork">进入我的工作台</a>   </div>
					<div class="right-title"><span>科研资源</span> <a  class="enterwork"id="enterwork">进入我的工作台</a>   </div>
					<div class="infor-browse">
                    	<div class="shareabout">
                            <div class="sharesrcbox">
                                <div class="sharescrollbox">
                                    <div class="sharesrc">
                                    	<div class="shareshow">
                                            <a href=""><img src="" width="100%" height="140"></a>
                                            <div class="shareopeart"></div>
                                        </div>
                                        <p>资源名称：XXXXX检测仪</p>
                                        <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>
                                    </div>
                                    <div class="sharesrc">
                                    	<div class="shareshow">
                                            <img src="" width="100%" height="140">
                                            <div class="shareopeart"></div>
                                        </div>
                                        <p>资源名称：XXXXX检测仪</p>
                                        <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>
                                    </div>
                                    <div class="sharesrc">
                                    	<div class="shareshow">
                                            <img src="" width="100%" height="140">
                                            <div class="shareopeart"></div>
                                        </div>
                                        <p>资源名称：XXXXX检测仪</p>
                                        <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>
                                    </div>
                                    <div class="sharesrc">
                                    	<div class="shareshow">
                                            <img src="" width="100%" height="140">
                                            <div class="shareopeart"></div>
                                        </div>
                                        <p>资源名称：XXXXX检测仪</p>
                                        <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>
                                    </div>
                                    <div class="sharesrc">
                                    	<div class="shareshow">
                                            <img src="" width="100%" height="140">
                                            <div class="shareopeart"></div>
                                        </div>
                                        <p>资源名称：XXXXX检测仪</p>
                                        <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>
                                    </div>
                                     <div class="sharesrc">
                                    	<div class="shareshow">
                                            <img src="" width="100%" height="140">
                                            <div class="shareopeart"></div>
                                        </div>
                                        <p>资源名称：XXXXX检测仪</p>
                                        <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>
                                    </div>
                                    
                                 </div>
                             </div>

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

@@ -508,7 +508,7 @@ $(".subsidebar").click(function(){
							if (rdata.success) {
								$.MsgBox.Alert('message','资源"'+ resName +'"申请发送成功!');
								$(".blackcover").remove();
								$("body").css("overflow","auto");
								$("body").css("position","static");
								//location.reload(true);
							} else {
								$.MsgBox.Alert('message','资源"'+ resName +'"申请发送失败，请重新申请!');
@@ -648,7 +648,7 @@ $(".subsidebar").click(function(){
				"complete":function(){
					//$(".consultapply").remove();
					$(".blackcover").remove();
					$("body").css("overflow-y","auto");
					$("body").css("position","static");
					$.MsgBox.Alert("消息","咨询申请成功");
				},
			});

src/main/webapp/js/information.js

@@ -1033,6 +1033,79 @@ getProfessorData()
				}
			});
		})
//科研资源
	$.ajax({		
		"url":"/ajax/resource/qapro",
		"type":"get",
		"data":{"professorId":userid},
		"async": true,
		"success":function(data){
			//console.log(data);
			if(data.data.length==0){
				$("#infor-browse").css("display","none");
				$(".resoubtn").css("display","none");
			}
			if(data.data.length > 0 && data.data.length <= 3){
				$("#infor-browse").css("display","block");
				$(".resoubtn").css("display","none");
			}
			var add="";
			if(data.success)
				{console.log(data);
					for(var i=0;i<data.data.length;i++){
						add='<div class="sharesrc">'
						add+='<div class="shareshow">'
	                	add+='<a href=""><img src="" width="100%" height="140"></a>'
	                 	add+='<div class="shareopeart"></div>'
	             		add+='</div>'	             
	             		add+='<p>资源名称：<span class="presou">'+ data.data[i].resourceName+'</span></p>'
	             		if(data.data[i].descp==undefined){
	             			data.data[i].descp="";
	             		}
	             		add+='<p class="briefinfor">简介:'+data.data[i].descp+'</p>'
	        			add+='</div>'
	        			$(".sharescrollbox").append(add);						
						add="";
					}
					//资源轮播
					var $content = $(".sharescrollbox");
					var childcount = $content.find(".sharesrc").length; 
					Carousel(3,3, childcount, $content, $(".resounext"), $(".resouprev"));
					
					function Carousel(inde, num, childcount, obj, next, prev) {
						next.click(function() {	
							if (!obj.is(":animated")) { 
								if (num < childcount) { 
								
									num++;
									obj.animate({
										left: "-=212px"
									}, 600);
								}
							}
						});
						prev.click(function() {
							if (!obj.is(":animated")) {
								if (num > inde) { 
									num--;
									obj.animate({
										left: "+=212px"
									}, 600);
								}
							}
						});
					}
				}
				else
				{
					$.MsgBox.Alert("消息","系统异常!");
				}
		},
		"error":function(){$.MsgBox.Alert('message','failddd')}
	});
	$("#enterwork").on("click",function(){
		location.href="workspaces.html?"+userid;
	})
//到至今选中复选框的操作
$(".present").click(function(){
	var date = $(".present").index(this);

src/main/webapp/js/popup.js

@@ -32,19 +32,20 @@ function ResourceInfo() {
		PopHtml +='<div class="resouimgbox floatL">';
		PopHtml += '<div class="resouinforcon">';
		PopHtml += '<div class="resouimg" >';
		PopHtml += '<span class="resouup"><input type="file" id="resouup" >上传资源图片</span>';
		PopHtml += '<div class="resouimgshow">';
		PopHtml += '<div class="wrap" id="jcropdiv">';
		PopHtml += '<div class="jc-demo-box" data="0"><div id="target" class="jcrop_w" ><img src="" id="resouImage" /></div></div>';
		PopHtml += '<div class="jy-up-ch">';
		PopHtml += '<span class="resouup"><input type="file" name="file" id="resouup" >上传资源图片</span>';
		PopHtml += '<div class="resouimgshow"><img width="100%" height="100%" src="" id="resouImage" /></div></div>';
		PopHtml += '<span class="resouimgmsg">尺寸240*240，大小在5M以内，<br/>JPG、PNG格式</span>';
//		PopHtml += '<div class="wrap" id="jcropdiv">';
//		PopHtml += '<div class="jc-demo-box" data="0"><div id="target" class="jcrop_w" ></div></div>';
//		PopHtml += '<div class="jy-up-ch">';
        //图像操作                                                        
		PopHtml += '<a id="idLeft" href="" class="bch bch1"></a>';
        PopHtml += '<a id="idSmall" href="" class="bch bch2"></a>';
        PopHtml += ' <a id="idBig" href="" class="bch bch3"></a>';
        PopHtml += '<a id="idRight" href="" class="bch bch4"></a>';
        PopHtml += '</div></div>';
 		PopHtml += '<input id="x" type="hidden"/><input id="y" type="hidden"/><input id="w" type="hidden"/><input id="h" type="hidden"/>';
		PopHtml += '</div></div></div></div>';
//		PopHtml += '<a id="idLeft" href="" class="bch bch1"></a>';
//        PopHtml += '<a id="idSmall" href="" class="bch bch2"></a>';
//        PopHtml += ' <a id="idBig" href="" class="bch bch3"></a>';
//        PopHtml += '<a id="idRight" href="" class="bch bch4"></a>';
       // PopHtml += '</div></div>';
// 		PopHtml += '<input id="x" type="hidden"/><input id="y" type="hidden"/><input id="w" type="hidden"/><input id="h" type="hidden"/>';
		PopHtml += '</div></div>';
		/////////////资源图片上传 结束////////////////////
		
		//按钮盒子
@@ -68,8 +69,8 @@ function ResourceInfo() {
		PopHtml += '</div></div>';
		//必须先将html添加到body，再设置Css样式
        $("body").before(PopHtml);
		$("body").css("overflow-y","hidden");
		$("body").prepend(PopHtml);
        $("body").css("position","fixed");
      //上传资源图像的hover
        // $(".resouimg").hover(function(){
        // 	$(".resouup").animate({
@@ -98,7 +99,7 @@ function ResourceInfo() {
		//关闭按钮
		$(".workclose").click(function(){
			$(".blackcover").remove();
			$("body").css("overflow","auto");
			$("body").css("position","static");
		});
		
		function resourceName()
@@ -141,21 +142,19 @@ function ResourceInfo() {
		
		//失去焦点判断	
		$("#resourceName").blur(function(){
			//alert("11111");
			resourceName();
		});
		$("#supportedServices").blur(function(){
			//alert("22222");
			supportedServices();
		});
	   //资源图像上传
		/*$(function (){
		$(function (){
			var id = $.cookie('');
			var cacheImageKey=null;
			if(id){
				$("#resouImage").attr("src","/images/resource/"+id+".jpg");
				$('#resouup').live('change',function(){ 
				$('#resouup').on('change',function(){ 
					$(".resouimgshow").show();
					$(".resouup").hide();
					$.ajaxFileUpload({
@@ -168,7 +167,7 @@ function ResourceInfo() {
								cacheImageKey =$data.data[0].cacheKey
								$("#resouImage").attr("src","/images/tmp/"+cacheImageKey);
							}else{
								alert($data.msg);
								$.MsgBox.Alert("message",$data.msg);
							}
						},
						error:function(){
@@ -179,15 +178,15 @@ function ResourceInfo() {
				
			}
			$("#inputb").on("click",function(){
				var x = parseInt($("#x").val()/395*100);
				var y = parseInt($("#y").val()/340*100);
				var w = parseInt($("#w").val()/395*100);
				var h = parseInt($("#h").val()/340*100);
//				var x = parseInt($("#x").val()/395*100);
//				var y = parseInt($("#y").val()/340*100);
//				var w = parseInt($("#w").val()/395*100);
//				var h = parseInt($("#h").val()/340*100);
				if(cacheImageKey){
					$.ajax({
						url:"../ajax/image/resource",
						type:"POST",
						data:{"id":id,"fn":cacheImageKey,"x":x,"y":y,"w":w,"h":h},
						data:{"id":id,"fn":cacheImageKey},
						dataType:"json",
						success:function($data){
							if($data.success){
@@ -201,7 +200,7 @@ function ResourceInfo() {
				}
			});
		})	*/
		})	
}
//资源信息 //
@@ -226,7 +225,7 @@ function ResourceApply(){
		PopHtml += '<tr><th class="resouinfotype"  scope="row">需求方</th><td>';
        PopHtml += '<div class="resouinforcon"><select class="frmtype" style="background:url(../images/downselect.png) no-repeat 96% center"><option>本人</option><option>所属机构</option></select></div>';
		PopHtml += '</td></tr>';
		PopHtml += '<tr><th class="resouinfotype " scope="row">交付时间</th><td><div class="resouinforcon"><input type="text" id="datepicker"class="frmtype dealTime"style="width:200px;"></div></td></tr>';
		PopHtml += '<tr><th class="resouinfotype " scope="row">交付时间</th><td><div class="resouinforcon"><input type="text" readOnly="true" id="datepicker"class="frmtype dealTime"style="width:200px;"></div></td></tr>';
		PopHtml += '<tr><th class="resouinfotype"  scope="row">具体需求</th><td><div class="resouinforcon"><textarea class="frmtype detail"></textarea></div></td></tr></table>';
		
		PopHtml += '<div class="resouimgbox floatL"><div class="resouinforcon"><div class="resouimg2" ><img src="" width="100%" height="100%"></div></div></div></div>';
@@ -269,9 +268,9 @@ function ResourceApply(){
		PopHtml += '</div>';
		
		//必须先将html添加到body，再设置Css样式
        $("body").before(PopHtml);
		$("body").css("overflow-y","hidden");
      
		$("body").prepend(PopHtml);
		$("body").css("position","fixed");
        
        var _widht = $(".blackcover").width();
        var _height = $(".blackcover").height();
		var boxWidth = $(".resouapply").width();
@@ -284,7 +283,7 @@ function ResourceApply(){
		//关闭按钮
		$(".workclose").click(function(){
			$(".blackcover").remove();
			$("body").css("overflow","auto");
			$("body").css("position","static");
		});
}
//资源申请确认 //
@@ -332,8 +331,8 @@ function CommentInfo() {
		PopHtml += '</div></div>';
	//必须先将html添加到body，再设置Css样式
        $("body").before(PopHtml);
		$("body").css("overflow-y","hidden");
		$("body").prepend(PopHtml);
		$("body").css("position","fixed");
      
        var _widht = $(".blackcover").width();
        var _height = $(".blackcover").height();
@@ -347,7 +346,7 @@ function CommentInfo() {
		//关闭按钮
		$(".workclose").click(function(){
			$(".blackcover").remove();
			$("body").css("overflow","auto");
			$("body").css("position","static");
		});
}		
@@ -373,8 +372,8 @@ function GuestbookInfo() {
		PopHtml += '</div></div>';
		//必须先将html添加到body，再设置Css样式
        $("body").before(PopHtml);
		$("body").css("overflow-y","hidden");
		$("body").prepend(PopHtml);
		$("body").css("position","fixed");
      
        var _widht = $(".blackcover").width();
        var _height = $(".blackcover").height();
@@ -388,7 +387,7 @@ function GuestbookInfo() {
		//关闭按钮
		$(".workclose").click(function(){
			$(".blackcover").remove();
			$("body").css("overflow","auto");
			$("body").css("position","static");
		});
}	
@@ -457,8 +456,8 @@ function PaymentInfo() {
                    
        //必须先将html添加到body，再设置Css样式
        $("body").before(PopHtml);
		$("body").css("overflow-y","hidden");
		$("body").prepend(PopHtml);
		$("body").css("position","fixed");
      
        var _widht = $(".blackcover").width();
        var _height = $(".blackcover").height();
@@ -472,7 +471,7 @@ function PaymentInfo() {
		//关闭按钮
		$(".workclose").click(function(){
			$(".blackcover").remove();
			$("body").css("overflow","auto");
			$("body").css("position","static");
		});           
}       
 // 款项记录//
@@ -621,8 +620,8 @@ function DetailInfo(){
		//必须先将html添加到body，再设置Css样式
        $("body").before(PopHtml);
		$("body").css("overflow-y","hidden");
		$("body").prepend(PopHtml);
		$("body").css("position","fixed");
      
        var _widht = $(".blackcover").width();
        var _height = $(".blackcover").height();
@@ -636,7 +635,7 @@ function DetailInfo(){
		//关闭按钮
		$(".workclose").click(function(){
			$(".blackcover").remove();
			$("body").css("overflow","auto");
			$("body").css("position","static");
		});           
}
@@ -682,8 +681,9 @@ function ConsultApply() {
		//必须先将html添加到body，再设置Css样式
        $("body").before(PopHtml);
		$("body").css("overflow-y","hidden");
        $("body").prepend(PopHtml);
        $("body").css("position","fixed");
		//$("body").css({"overflow-y":"hidden","-ms-overflow-y":"hidden","-webkit-overflow-y":"hidden","-moz-overflow-y":"hidden"});
		/*$("#sendConsultBtn").on("click",function(){
			alert("444");
			//sendConsult();
@@ -705,7 +705,8 @@ function ConsultApply() {
		//关闭按钮
		$(".workclose").click(function(){
			$(".blackcover").remove();
			$("body").css("overflow","auto");
			//$("body").css({"overflow-y":"auto","-ms-overflow-y":"auto","-webkit-overflow-y":"auto","-moz-overflow-y":"auto"});
			$("body").css("position","static");
		});           
}
@@ -749,8 +750,8 @@ function ConsultComment() {
		PopHtml += '</div></div>';
	//必须先将html添加到body，再设置Css样式
        $("body").before(PopHtml);
		$("body").css("overflow-y","hidden");
		$("body").prepend(PopHtml);
		$("body").css("position","fixed");
      
        var _widht = $(".blackcover").width();
        var _height = $(".blackcover").height();
@@ -764,7 +765,7 @@ function ConsultComment() {
		//关闭按钮
		$(".workclose").click(function(){
			$(".blackcover").remove();
			$("body").css("overflow","auto");
			$("body").css("position","static");
		});
}		
/****咨询专家结束评价*****/
@@ -781,8 +782,8 @@ function finish() {
	PopHtml += '</div></div>';
//必须先将html添加到body，再设置Css样式
    $("body").before(PopHtml);
	$("body").css("overflow-y","hidden");
	$("body").prepend(PopHtml);
	$("body").css("position","fixed");
  
    var _widht = $(".blackcover").width();
    var _height = $(".blackcover").height();
@@ -796,7 +797,7 @@ function finish() {
	//关闭按钮
	$(".workclose").click(function(){
		$(".blackcover").remove();
		$("body").css("overflow","auto");
		$("body").css("position","static");
	});
}		

src/main/webapp/js/sciresource.js

@@ -64,7 +64,7 @@ $(function(){
						"success" : function($data) {							
							if ($data.success) {
								$(".blackcover").remove();
								$("body").css("overflow-y","auto");	
								$("body").css("position","static");	
								getDataResource();								
							} else {
								$.MsgBox.Alert('message',$data.msg);
@@ -75,7 +75,7 @@ $(function(){
				if(resourceID){
					$("#deletedResource").on("click",function(){
						$(".blackcover").remove();
						$("body").css("overflow-y","auto");
						$("body").css("position","static");
						$.MsgBox.Confirm("消息", "执行删除后资源信息将无法恢复，确定继续吗？",delet)					
					})
					$.ajax({		
@@ -143,7 +143,7 @@ $(function(){
							{
								if(resourceID){
									$(".blackcover").remove();
									$("body").css("overflow-y","auto");
									$("body").css("position","static");
									$.MsgBox.Confirm("消息", "确定修改资源信息吗？", getDataput)
									
								}else{
@@ -154,7 +154,7 @@ $(function(){
											if (rdata.success) 
											{											
													$(".blackcover").remove();
													$("body").css("overflow-y","auto");												
													$("body").css("position","static");												
													getDataResource();
													$.MsgBox.Alert("消息","资源发布成功");										
											} 
@@ -189,11 +189,11 @@ $(function(){
					$("#consd").html("");
					for(var i=0;i<data.data.length;i++)
						{
							var add='<div class="maintab"><div class="lefttab fl"><table class="resoubrief"><tr><td><img width="100%" height="140" src=""></td>'
							var add='<div class="maintab"><div class="lefttab fl"><table class="resoubrief"><tr><td><div class="resoimgbox"><img id="resourceImg" width="100%" height="100%" src=""></div></td>'
							add+='</tr><tr><td><ul><li>'+data.data[i].resourceName+'</li><li>'+data.data[i].supportedServices+'</li> '               
							add+='<li class="li1">'+data.data[i].subject+'</li>'                   
							add+='</ul></td></tr><tr>'                
							add+='<td><span class="resoumag"">资源管理</span></td></tr></table></div>'                 
							add+='<td><span class="managebtn resoumag"">资源管理</span></td></tr></table></div>'                 
							add+='<div class="righttab fr"><table width="100%" class="worktab tablecon">'
							add+='<tr class="worktabtit"><th width="20%" height="40">申请时间</th><th width="20%">需求方</th>'    
							add+='<th width="12%">联系人</th><th width="14%">交付时间</th>'        
@@ -402,7 +402,7 @@ $("#consd").on("click",".detailmess",function(){
					"success" : function(data) {
						if (data.success) {					
							$(".blackcover").remove();
							$("body").css("overflow-y","auto");
							$("body").css("position","static");
							getDataResource();
							$.MsgBox.Alert('message',"报价成功");
						} else {
@@ -421,7 +421,7 @@ $("#consd").on("click",".detailmess",function(){
			ajaxGet(operationId);
			n=5;
			$(".blackcover").remove();
			$("body").css("overflow-y","auto");
			$("body").css("position","static");
			$.MsgBox.Confirm("消息", "确定拒绝吗？",upStatus1);
		});
	}
@@ -456,7 +456,7 @@ $("#consd").on("click",".detailmess",function(){
					"success" : function(data) {
						if (data.success) {					
							$(".blackcover").remove();
							$("body").css("overflow-y","auto");
							$("body").css("position","static");
							getDataResource();
							$.MsgBox.Alert('message',"报价成功");
						} else {
@@ -728,7 +728,7 @@ function getPay(){
			if (rdata.success) 
			{
			$(".blackcover").remove();
			$("body").css("overflow-y","auto");			
			$("body").css("position","static");			
				getPageData(6,1,false);																	
			}
			else 
@@ -753,7 +753,7 @@ function getPay1(){
			if (rdata.success) 
			{
			$(".blackcover").remove();
			$("body").css("overflow-y","auto");
			$("body").css("position","static");
				getDataResource();						
			}
			else 
@@ -1160,7 +1160,7 @@ $(".workmysrc").on("click",".detailm",function(){
								if (rdata.success){
									getPageData(6,1,false);
									$(".blackcover").remove();
									$("body").css("overflow-y","auto");
									$("body").css("position","static");
									$.MsgBox.Alert('消息',"资源申请信息修改成功");									
								} else {
									$.MsgBox.Alert('消息',"资源申请信息修改失败");
@@ -1197,13 +1197,13 @@ $(".workmysrc").on("click",".detailm",function(){
		$(".frm").click(function(){
			n=4;
			$(".blackcover").remove();
			$("body").css("overflow-y","auto");
			$("body").css("position","static");
			$.MsgBox.Confirm("消息", "确定继续吗？",upStatus);
		})
		$("#cooperation").click(function(){
			 n=3;
			 $(".blackcover").remove();
			$("body").css("overflow-y","auto");
			$("body").css("position","static");
			upStatus();
		})
	}

src/main/webapp/js/search.js

@@ -361,7 +361,7 @@ $(function(){
								if (rdata.success) {
									$.MsgBox.Alert('message','资源"'+ resName +'"申请发送成功!');
									$(".blackcover").remove();
									$("body").css("overflow","auto");
									$("body").css("position","static");
									//location.reload(true);
								} else {
									$.MsgBox.Alert('message','资源"'+ resName +'"申请发送失败，请重新申请!');

src/main/webapp/js/workindex.js

@@ -0,0 +1,41 @@
$(function(){
	var userid = $.cookie("userid");
	//获取专家的数据
	function getProfessorData(professorId){		
		$.ajax({	
		"url":"ajax/professor/"+professorId,
		"type":"get",
		"async": false,
		"success":function(data){
			if(data.success)
			{																				
			$("#nameS").text(data.data.name);
			$("#title").text(data.data.title);
			$("#deparment").text(data.data.department);
			$("#organization").text(data.data.organization.name);
			}
			else
			{
				$.MsgBox.Alert("消息","系统异常!");
			}
		},
		"error":function(){$.MsgBox.Alert('message','failddd')}
		})	
	}
	getProfessorData(userid);
	$("#allResource").on("click",function(){
		$(".worksubmenu").eq(1).addClass("subcolor").siblings().removeClass("subcolor");
		$.ajax({
			"url":"sciresource.html",
			"dataType":"html",
			"success":function(result){
				//console.log(data);
								
			$(".workcon").html(result);
			}
		
		})
		
	})
	
});

src/main/webapp/photo-set.html

@@ -24,7 +24,7 @@
                     <!--点击上传按钮-->
                     <div class="load">
                          <div class="upbtn" style="Margin:auto" ><span class="plus">+</span>本地上传<input type="file" class="filebtn"  name="file" id="uploadInput" ></div>
                         <p>只支持JPG、PNG、GIF，大小不超过5M</p>
                         <p>只支持JPG、PNG，大小不超过5M</p>
                         
                     </div>
                     <!---->

src/main/webapp/register.html

@@ -52,13 +52,13 @@
                                            <ul>
                                                <li><input class="inputtxt" type="text" placeholder="请输入常用手机号码" id="lp_phone" name="phone" autocomplete="off"></li>
                                                <li><div class="msg msgphone1"><span></span></div></li>
                                                <li class="yzmli">
                                                <!-- <li class="yzmli">
                                                    <input class="inputtxt" type="text" placeholder="请证明你不是机器人" id="lp_yzm" name="yzm" autocomplete="on">
                                                    <div class="yzmbox">
                                                        <img class="yzm" src="images/yzmimg1.png" width="100%" height="100%">
                                                        <a href="javascript:;" class="reflash"></a>
                                                    </div>
                                                </li>
                                                </li> -->
                                                <li><div class="msg msgphone2"><span></span></div></li>
                                                <li class="coderli">
                                                    <input class="inputtxt" type="text" placeholder="请输入手机验证码" id="lp_coder" name="coder" autocomplete="on">

src/main/webapp/workindex.html

@@ -14,10 +14,10 @@
                        <p class="workstat">合作<br><span>12</span>次</p>
                    </div>
                    <div class="workinfor floatL">
                        <h4><a href="" class="named" id="nameS">程学群</a><img class="modifyicon" src="images/rz.png" width="30"></h4>
                        <h5><span>副教授</span>,<span>主任</span></h5>
                        <h6><span>新材料技术研究院</span>,<span>北京科技大学</span></h6>
                        <h6>所在地：<span>北京</span></h6>
                        <h4><a href="" class="named" id="nameS"></a><img class="modifyicon" src="images/rz.png" width="30"></h4>
                        <h5><span id="title"></span><span></span></h5>
                        <h6><span id="department"></span><span id="organization"></span></h6>
                        <h6>所在地：<span></span></h6>
                        <a class="worklinkbtn" href="information.html">>>修改资料</a>
                    </div>
                </div>
@@ -90,7 +90,7 @@
            </div>
            <!--正在使用的资源-->
            <div class="workblock">
                <div class="worktit">正在使用的科研资源<a class="worklinkbtn floatR">查看全部</a></div>
                <div class="worktit">正在使用的科研资源<a class="worklinkbtn floatR"id="allResource">查看全部</a></div>
                <div class="wbcon">
                    <div class="sharesrcbox11">
                        <div class="sharesrc">
@@ -156,4 +156,5 @@
        </div>
    </div>
</div>
<!-- 我的工作台 //-->
<!-- 我的工作台 //-->
<script type="text/javascript" src="js/workindex.js"></script>

src/main/webapp/workspaces.html

@@ -132,9 +132,9 @@
<!-- <script type="text/javascript" src="js/jquery.HeadP.js"> </script>
<script type="text/javascript" src="js/jquery.Jcrop.js"> </script>
<script type="text/javascript" src="js/basic.js"> </script>
<script type="text/javascript" src="js/basic.js"> </script> -->
<script type="text/javascript" src="/js/ajaxfileupload.js"></script>
 -->
 <script src="js/jquery.page.js"></script>
<script type="text/javascript"src="js/jquery.cookie.js"></script>
<script type="text/javascript"src="js/jquery.similar.msgbox.js"></script>