Merge remote-tracking branch 'origin/dev' into test

Conflicts:
	js/common.js

articalIssue.html

@@ -250,14 +250,14 @@ var uploader = WebUploader.create({
    	},
    accept: {// 只允许选择图片文件。
        title: 'Images',
        extensions: 'gif,jpg,jpeg,bmp,png',
        mimeTypes: 'image/gif,image/jpg,image/jpeg,image/bmp,image/png'
        extensions: 'jpg,jpeg,png',
        mimeTypes: 'image/jpg,image/jpeg,image/png'
    }
   
});
uploader.onError = function(code) {
	if(code=="F_EXCEED_SIZE"){
		$.MsgBox.Alert('提示', '请上传jpg、png格式的图片，大小不超过2M')	
		$.MsgBox.Alert('提示', '请上传jpg、jpeg、png格式的图片，大小不超过2M')	
	}
};
// 当有文件添加进来的时候
@@ -274,8 +274,14 @@ uploader.on( 'fileQueued', function( file ) {
// 文件上传成功，给item添加成功class, 用样式标记上传成功。
cacheImageKey="";
uploader.on( 'uploadSuccess', function(file,data) {
	cacheImageKey =data.data[0].cacheKey;
	$("#uploader").attr("data-id",cacheImageKey);
	if(data.success) {
		cacheImageKey =data.data[0].cacheKey;
		$("#uploader").attr("data-id",cacheImageKey);
	}else{
		$.MsgBox.Alert('提示', '只支持jpeg/jpg/png格式的图片');
		$("#uploader").css("background-image","url('')");
	}
	
});
</script>

articalModify.html

@@ -256,14 +256,14 @@ var uploader = WebUploader.create({
    // 只允许选择图片文件。
    accept: {
        title: 'Images',
        extensions: 'gif,jpg,jpeg,bmp,png',
        mimeTypes: 'image/gif,image/jpg,image/jpeg,image/bmp,image/png'
        extensions: 'jpg,jpeg,png',
        mimeTypes: 'image/jpg,image/jpeg,image/png'
    }
   
});
uploader.onError = function(code) {
	if(code=="F_EXCEED_SIZE"){
		$.MsgBox.Alert('提示', '请上传jpg、png格式的图片，大小不超过2M')	
		$.MsgBox.Alert('提示', '请上传jpg、jpeg、png格式的图片，大小不超过2M')	
	}
};
// 当有文件添加进来的时候
@@ -280,8 +280,13 @@ uploader.on( 'fileQueued', function( file ) {
// 文件上传成功，给item添加成功class, 用样式标记上传成功。
cacheImageKey="";
uploader.on( 'uploadSuccess', function(file,data) {
	cacheImageKey =data.data[0].cacheKey;
	$("#uploader").attr("data-id",cacheImageKey);
	if(data.success) {
		cacheImageKey =data.data[0].cacheKey;
		$("#uploader").attr("data-id",cacheImageKey);
	}else{
		$.MsgBox.Alert('提示', '只支持jpeg/jpg/png格式的图片');
		$("#uploader").css("background-image","url('')");
	}
});
</script>

articalShow.html

@@ -181,9 +181,6 @@
				</div>
			</div>
			
			
		
		</div>
	</div>
</div>
@@ -219,16 +216,11 @@
		makeCode();
	});
	//留言分享操作栏	
	setTimeout(function() {
		var oShareW = $('.share-nav').outerWidth(true);
		$('.shareBlock').scrollFix( {
	        startTop:'body',
	        bottom: '0',
	        endPos : '.share-bottom',
			width: oShareW ,
	        zIndex : 997
	    });	
	},300);
		
		
	
	
</script>
</body>
</html>

cmp-portal/articalIssue.html

@@ -6,7 +6,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<title>发布文章-科袖网</title>
<link rel="shortcut icon" href="images/favicon.ico "/>
<link href="../css/bootstrap.min.css" rel="stylesheet">
<link href="css/bootstrap.min.css" rel="stylesheet">
<link type="text/css" href="../css/webuploader/webuploader.css" rel="stylesheet">
<link type="text/css" rel="stylesheet" href="../css/datetimepicker.css">
<link type="text/css" href="css/common.css" rel="stylesheet">
@@ -22,22 +22,10 @@
<div class="setTimeBlock modelContain">
	<span class="mb_tit">提示</span>
	<a class="mb_close"></a>
	<div class="mb_msg">
		<p style="margin: 10px;">请设置文章发布的时间：</p>
		        <div class="formTime">
		        <!--<div class="form-group">
		            <div class='input-group date' id='datetimepicker6'>
		                <input type='text' class="form-control" />
		                <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
		            </div>
		        </div>-->
		        <div class="form-group">
		             <input size="16" type="text" value="" readonly class="form-control form_datetime">
		        </div>
		</div>
	<div class="mb_msg" id="promotTh">
	</div>
	<div class="mb_btnbox">
		<input class="mb_btn mb_btnOk" type="button" value="确定">
	<div class="mb_btnbox" id="promotGt">
		<input class="mb_btn mb_btnNo" type="button" value="取消">
	</div>
</div>
@@ -46,7 +34,7 @@
<input type="hidden" id="hidearticleId" value="" />
<div id="container">
	<div class="containerCon">
		<div class="contentCon clearfix conBlock">
		<div class="contentCon clearfix conBlock" style="padding-top:20px">
			<div class="leftconBox floatL">
				<ul class="artAbout">
					<li>
@@ -205,39 +193,6 @@ $(function () {
		$('html,body').animate({ scrollTop:0});
	});
	
	var currentdate;
    $(".form_datetime").datetimepicker({
    	format: 'yyyy-mm-dd hh:ii',
    	forceParse: true,
    	autoclose: true,
       // todayBtn: true
    });
    function getNowFormatDate() {
	    var date = new Date();
	    var seperator1 = "-";
	    var seperator2 = ":";
	    var month = date.getMonth() + 1;
	    var strDate = date.getDate();
	    var getHours = date.getHours();
	    var getMinutes = date.getMinutes();
	    if (month >= 1 && month <= 9) {
	        month = "0" + month;
	    }
	    if (strDate >= 0 && strDate <= 9) {
	        strDate = "0" + strDate;
	    }
	    if (getMinutes >= 0 && getMinutes <= 9) {
	        getMinutes = "0" + getMinutes;
	    }
	     if (getHours >= 0 && getHours <= 9) {
	        getHours = "0" + getHours;
	    }
	    var currentdate = date.getFullYear() + seperator1 + month + seperator1 + strDate
	            + " " + getHours + seperator2 + getMinutes
	           
	    return currentdate;
	}
    $(".form_datetime").val(getNowFormatDate(currentdate));
});
//Model模态框打开关闭
@@ -261,14 +216,14 @@ var uploader = WebUploader.create({
    	},
    accept: {// 只允许选择图片文件。
        title: 'Images',
        extensions: 'gif,jpg,jpeg,bmp,png',
        mimeTypes: 'image/gif,image/jpg,image/jpeg,image/bmp,image/png'
        extensions: 'jpg,jpeg,png',
        mimeTypes: 'image/jpg,image/jpeg,image/png'
    }
   
});
uploader.onError = function(code) {
	if(code=="F_EXCEED_SIZE"){
		$.MsgBox.Alert('提示', '请上传jpg、png格式的图片，大小不超过2M')	
		$.MsgBox.Alert('提示', '请上传jpg、jpeg、png格式的图片，大小不超过2M')	
	}
};
// 当有文件添加进来的时候
@@ -285,8 +240,13 @@ uploader.on( 'fileQueued', function( file ) {
// 文件上传成功，给item添加成功class, 用样式标记上传成功。
cacheImageKey="";
uploader.on( 'uploadSuccess', function(file,data) {
	cacheImageKey =data.data[0].cacheKey;
	$("#uploader").attr("data-id",cacheImageKey);
	if(data.success) {
		cacheImageKey =data.data[0].cacheKey;
		$("#uploader").attr("data-id",cacheImageKey);
	}else{
		$.MsgBox.Alert('提示', '只支持jpeg/jpg/png格式的图片');
		$("#uploader").css("background-image","url('')");
	}
});
</script>

cmp-portal/articalModify.html

@@ -26,22 +26,10 @@
<div class="setTimeBlock modelContain">
	<span class="mb_tit">提示</span>
	<a class="mb_close"></a>
	<div class="mb_msg">
		<p style="margin: 10px;">请设置文章发布的时间：</p>
		        <div class="formTime">
		        <!--<div class="form-group">
		            <div class='input-group date' id='datetimepicker6'>
		                <input type='text' class="form-control" />
		                <span class="input-group-addon"><span class="glyphicon glyphicon-calendar"></span></span>
		            </div>
		        </div>-->
		        <div class="form-group">
		             <input size="16" type="text" value="" readonly class="form-control form_datetime">
		        </div>
		</div>
	<div class="mb_msg" id="promotTh">
	</div>
	<div class="mb_btnbox">
		<input class="mb_btn mb_btnOk" type="button" value="确定">
	<div class="mb_btnbox" id="promotGt">
		<input class="mb_btn mb_btnNo" type="button" value="取消">
	</div>
</div>
@@ -206,39 +194,6 @@ $(function () {
		$('html,body').animate({ scrollTop:0});
	});
	
	var currentdate;
    $(".form_datetime").datetimepicker({
    	format: 'yyyy-mm-dd hh:ii',
    	forceParse: true,
    	autoclose: true,
        //todayBtn: true
    });
    function getNowFormatDate() {
	    var date = new Date();
	    var seperator1 = "-";
	    var seperator2 = ":";
	    var month = date.getMonth() + 1;
	    var strDate = date.getDate();
	    var getHours = date.getHours();
	    var getMinutes = date.getMinutes();
	    if (month >= 1 && month <= 9) {
	        month = "0" + month;
	    }
	    if (strDate >= 0 && strDate <= 9) {
	        strDate = "0" + strDate;
	    }
	    if (getMinutes >= 0 && getMinutes <= 9) {
	        getMinutes = "0" + getMinutes;
	    }
	     if (getHours >= 0 && getHours <= 9) {
	        getHours = "0" + getHours;
	    }
	    var currentdate = date.getFullYear() + seperator1 + month + seperator1 + strDate
	            + " " + getHours + seperator2 + getMinutes
	           
	    return currentdate;
	}
    $(".form_datetime").val(getNowFormatDate(currentdate));
});
//Model模态框打开关闭
@@ -271,14 +226,14 @@ var uploader = WebUploader.create({
    // 只允许选择图片文件。
    accept: {
        title: 'Images',
        extensions: 'gif,jpg,jpeg,bmp,png',
        mimeTypes: 'image/gif,image/jpg,image/jpeg,image/bmp,image/png'
        extensions: 'jpg,jpeg,png',
        mimeTypes: 'image/jpg,image/jpeg,image/png'
    }
   
});
uploader.onError = function(code) {
	if(code=="F_EXCEED_SIZE"){
		$.MsgBox.Alert('提示', '请上传jpg、png格式的图片，大小不超过2M');
		$.MsgBox.Alert('提示', '请上传jpg、jpeg、png格式的图片，大小不超过2M');
	}
};
// 当有文件添加进来的时候
@@ -295,8 +250,13 @@ uploader.on( 'fileQueued', function( file ) {
// 文件上传成功，给item添加成功class, 用样式标记上传成功。
cacheImageKey="";
uploader.on( 'uploadSuccess', function(file,data) {
	cacheImageKey =data.data[0].cacheKey;
	$("#uploader").attr("data-id",cacheImageKey);
	if(data.success) {
		cacheImageKey =data.data[0].cacheKey;
		$("#uploader").attr("data-id",cacheImageKey);
	}else{
		$.MsgBox.Alert('提示', '只支持jpeg/jpg/png格式的图片');
		$("#uploader").css("background-image","url('')");
	}
});
</script>

cmp-portal/css/cmpindex.css

@@ -44,6 +44,7 @@ a.worksubmenu.cmpBg{color: #FFFFFF;}
.needUlist li{position:relative;overflow: hidden;padding:4px 0;margin:6px 0;}
.needUlist li:after{content: '';background: #E6E6E6;height:1px;position: absolute;bottom: 0;right: 0;left:64px;}
.needUlist li:last-child:after{background: none;}
.needUlist li .leftlogo>.h4Font{display: inline-block;width: 100%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;}
.staffDlist{overflow: hidden;}
.staffDlist h2{float:left;width: 58px; text-align: right;line-height: 60px;}
.staffDlist dl{width: 78%;float: right;}
@@ -368,7 +369,7 @@ ul.artAbout .frmadd{width:auto;position:absolute;right:0;top:0;background: #28b8
.form-result{margin:18px -15px 0 -15px;}
.form-result>ul>li{position:relative;padding:12px 15px;min-height: 76px;}
.form-result>ul>li .deleteThis{display:none;position:absolute;top:50%;margin-top:-16px;right:28px;width:32px;height:32px;background:url(../../images/g_article_button_shanchu_hig.png);background-size:cover;cursor:pointer;}
.form-result>ul>li .deleteThis{display:none;position:absolute;top:50%;margin-top:-16px;right:14px;width:32px;height:32px;background:url(../../images/g_article_button_shanchu_hig.png);background-size:cover;cursor:pointer;}
.form-result>ul>li:hover{background: #EEEEEE;}
.form-result>ul>li:hover .deleteThis{display:block;}
@@ -426,6 +427,8 @@ ul.tagList>li .h2Font{color:#666}
.itemListBolck .itemListCon .form-result{margin:20px 0 30px;border-top:1px solid #E5E5E5;}
.itemListBolck .itemListCon .madiaHead{width:120px;height:80px;margin-top:-40px;}
.itemListBolck .itemListCon .madiaInfo>ul>li{float: left;margin-left:20px;}
.itemListBolck .itemListCon .madiaInfo .column{color:#666;}
.itemListBolck .itemListCon .madiaInfo>ul>li>.column{border:1px solid #28b8fa;padding:2px 4px;font-size: 12px;color:#28b8fa;border-radius:4px;}
.itemListBolck .itemListCon .madiaInfo>ul>li:first-child{margin-left:0;}
.itemListBolck .itemListCon .madiaInfo{padding-left:140px;min-height: 80px;padding-top:15px;}
.itemListCon.form-item ul .h1Font{font-size:18px;}
@@ -449,8 +452,10 @@ ul.tagList>li .h2Font{color:#666}
.setTimeBlock{z-index: 999999; width: 400px; position: fixed; background-color: white; border-radius: 6px; box-shadow: rgb(102, 102, 102) 1px 1px 20px 4px;top:50%;left:50%;margin:-167px 0 0 -200px;}
.setTimeBlock .mb_tit{display: block; font-size: 18px; color: rgb(255, 255, 255); background-color:#28b8fa; line-height: 60px; text-align: center; border-radius: 6px 6px 0 0; }
.setTimeBlock .mb_close{display: block; position: absolute; right: 20px; top: 18px; background: url(../../images/sign_icon_guanbi_nor.png) center center no-repeat; width: 20px; height: 20px; cursor: pointer;}
.setTimeBlock .mb_msg{position: relative; padding: 30px 20px 20px; line-height: 24px; text-align: center; font-size: 16px;}
.setTimeBlock .formTime{padding:10px 24px;}
.setTimeBlock .mb_msg{position: relative; padding: 30px 40px 20px; line-height: 24px; text-align: center; font-size: 16px;}
.setTimeBlock .mb_msg .mb-list{margin:6px 6px 12px 6px}
.setTimeBlock .mb_msg .mb-list p{margin:6px;}
/*.setTimeBlock .formTime,.setTimeBlock .form-control{padding:10px 24px;}*/
.setTimeBlock .mb_btnbox{margin: 0px auto 30px; text-align: center; position: relative;}
.setTimeBlock .mb_btn{width: 100px; font-size: 14px; height: 32px; color: white; border: none; background-image: none; padding: 0px; margin: 0px 10px; border-radius: 6px;}
.setTimeBlock .mb_btnOk{ background-color:#28b8fa;}

cmp-portal/css/common.css

@@ -196,7 +196,7 @@ button.btnModelBig:hover{
.nodatabox .noContip{font-size:18px;color: #999;line-height:40px;}
.nodatabox .keyword{font-size:22px; padding:0 6px;color:#555555;}
/***********************缺省页面*******************/
#container{margin-top:90px;}
#container{padding-top:90px;}
.containerCon{width:1120px;padding:0 10px;position:relative; margin:auto;}
.containerCon:before,.containerCon:after{display:table;content:" "}
.containerCon:after{clear: both;}
@@ -221,7 +221,7 @@ footer .weixincode{background-image: url(../images/home_bg_guanzhu_nor.png);}
footer .weixincode span{background-image:url(../images/home_code_weixin.jpg);background-size: cover;}
/*新版header*/
header{ position:fixed; top:0;left:0;right: 0; z-index:1000;font-size:16px;line-height:32px;}
header{ position:fixed; top:0;left:0;right: 0; z-index:1012;font-size:16px;line-height:32px;}
header .navheader{background:#FFFFFF;height:62px;border-bottom: 2px solid #e5e5e5;}
header .navheader.navhdown{background: rgba(256,256,256,1);border-color:#E5E5E5;box-shadow: 0px 2px 12px 0px rgba(204, 204, 204, 0.6);-webkit-box-shadow: 0px 2px 12px 0px rgba(204, 204, 204, 0.6);}
header .navheader.navhdown li a{color:#666;}

cmp-portal/js/articalIssue.js

@@ -5,6 +5,11 @@ $(function() {
	var articleId;
	var fa = false;
    var orgId = $.cookie("orgId");
    var colMgr = $.cookie("colMgr");
    var hbur,hburEnd;
  	var pr,prEnd;
  	var re,reEnd;
  	var orgr,orgrEnd;
    if(orgId == "" || orgId == null || orgId == "null"){
    	location.href = "cmp-settled-log.html";
    }
@@ -32,17 +37,26 @@ $(function() {
			$("#keyPrompt").text("");
		},
		keyup: function() {
			if($(this).val()==""){
			var ti=$(this).val();
			hbur=ti;
			if(ti==""){
				$(".frmadd").addClass("displayNone");
				$(".keydrop ul").html("");
				$(".keydrop").addClass("displayNone");
				return;
			}else{
				$(".frmadd").removeClass("displayNone");
			}
			if($(this).val().length > 15) {
				$(this).val($(this).val().substr(0, 15));
			}
			KeyWordList();
			setTimeout(function(){
				if( ti===hbur && ti!== hburEnd) {
					KeyWordList(ti);
				}
				
			},500)
			
		}
	})
@@ -105,8 +119,8 @@ $(function() {
			$("#keyWordlist").append("<li class='delkeylist'><p class='h2Font'>" + keyWord + "</p><div class='closeThis'></div></li>");
		}
	}
	
	function KeyWordList() {
	function KeyWordList(seValue) {
		hburEnd=seValue;
		$.ajax({
			"url": "/ajax/dataDict/qaHotKey",
			"type": "get",
@@ -115,19 +129,21 @@ $(function() {
			},
			"success": function(data) {
				console.log(data);
				if(data.success && data.data != "") {
					var itemlist = '';
					$("#keydropList").html("");
					for(var i = 0; i < 5; i++) {
						var itemlist = '<li><p class="h2Font"></p></li>';
						$itemlist = $(itemlist);
						$("#keydropList").append($itemlist);
						$itemlist.find(".h2Font").text(data.data[i].caption);
				if(data.success) {
					if(hburEnd == seValue){
						var itemlist = '';
						$("#keydropList").html("");
						for(var i = 0; i < Math.min(data.data.length,5); i++) {
							var itemlist = '<li><p class="h2Font"></p></li>';
							$itemlist = $(itemlist);
							$("#keydropList").append($itemlist);
							$itemlist.find(".h2Font").text(data.data[i].caption);
						}
						$(".keydrop").removeClass("displayNone");
					}
					$(".keydrop").removeClass("displayNone");
				} else {
					$(".keydrop").addClass("displayNone");
					$(".keydrop ul").html("");
					//$(".keydrop").addClass("displayNone");
					//$(".keydrop ul").html("");
				}
			},
			"error": function() {
@@ -135,7 +151,6 @@ $(function() {
			}
		});
	}
	
	//校验右侧专家和资源
	$("#checkZj").on("focus", function() {
		$(this).prev().find("span").text("最多选择5位专家");
@@ -151,12 +166,34 @@ $(function() {
	$("#checkZj").on("keyup", function() {
		var _this = this;
		checkZj(_this);
		var ti=$(this).val();
		pr=ti;
		if($(this).val()=="") {
			return;
		}
		setTimeout(function(){
				if( ti===pr && ti!== prEnd) {
					checkZj(_this,ti);
				}
				
			},500)
		
	})
	$("#checkZy").on("keyup", function() {
		var ti=$(this).val();
		re=ti;
		if($(this).val()=="") {
			return;
		}
		var _this = this;
		checkZy(_this);
		setTimeout(function(){
				if( ti===re && ti!== reEnd) {
					checkZy(_this,ti);
				}
				
			},500)
		
	})
	$("#expertlist").on("click", "li", function() {
@@ -201,7 +238,8 @@ $(function() {
		$(this).parent().remove();
	})
	function checkZj(_this) {
	function checkZj(_this,prd) {
		prEnd=prd;
		$.ajax({
			"url": "/ajax/professor/qaByName",
			"type": "get",
@@ -213,26 +251,28 @@ $(function() {
				console.log(data);
				if(data.success) {
					if(data.data != "") {
						$(_this).next().removeClass("displayNone");
						var itemlist = '';
						$("#expertlist").html("");
						for(var i = 0; i < data.data.length; i++) {
							var itemlist = '<li id="usid" class="flexCenter">';
							itemlist += '<div class="madiaHead useHead" id="userimg"></div>';
							itemlist += '<div class="madiaInfo">';
							itemlist += '<p class="ellipsisSty"><span class="h1Font" id="name"></span><span class="h2Font" style="margin-left:10px;" id="title"></span></p>';
							itemlist += '<p class="h2Font ellipsisSty" id="orgName"></p>';
							itemlist += '</div><div class="deleteThis"></div></li>';
							$itemlist = $(itemlist);
							$("#expertlist").append($itemlist);
							var datalist = data.data[i];
							$itemlist.attr("data-id", datalist.id);
							$itemlist.find("#name").text(datalist.name);
							$itemlist.find("#title").text(datalist.title);
							$itemlist.find("#orgName").text(datalist.orgName);
							if(datalist.hasHeadImage == 1) {
								$itemlist.find("#userimg").attr("style", "background-image: url(/images/head/" + datalist.id + "_l.jpg);");
							}
							if(prEnd == prd){
								$(_this).next().removeClass("displayNone");
								var itemlist = '';
								$("#expertlist").html("");
								for(var i = 0; i < data.data.length; i++) {
									var itemlist = '<li id="usid" class="flexCenter">';
									itemlist += '<div class="madiaHead useHead" id="userimg"></div>';
									itemlist += '<div class="madiaInfo">';
									itemlist += '<p class="ellipsisSty"><span class="h1Font" id="name"></span><span class="h2Font" style="margin-left:10px;" id="title"></span></p>';
									itemlist += '<p class="h2Font ellipsisSty" id="orgName"></p>';
									itemlist += '</div><div class="deleteThis"></div></li>';
									$itemlist = $(itemlist);
									$("#expertlist").append($itemlist);
									var datalist = data.data[i];
									$itemlist.attr("data-id", datalist.id);
									$itemlist.find("#name").text(datalist.name);
									$itemlist.find("#title").text(datalist.title);
									$itemlist.find("#orgName").text(datalist.orgName);
									if(datalist.hasHeadImage == 1) {
										$itemlist.find("#userimg").attr("style", "background-image: url(/images/head/" + datalist.id + "_l.jpg);");
									}
							}		
						}
					} else {
						$(_this).next().addClass("displayNone");
@@ -247,7 +287,8 @@ $(function() {
		});
	}
	function checkZy(_this) {
	function checkZy(_this,prd) {
		reEnd=prd;
		$.ajax({
			"url": "/ajax/resource/qaByName",
			"type": "get",
@@ -259,30 +300,32 @@ $(function() {
				console.log(data);
				if(data.success) {
					if(data.data != "") {
						$(_this).next().removeClass("displayNone");
						var itemlist = '';
						$("#resouselist").html("");
						for(var i = 0; i < data.data.length; i++) {
							var itemlist = '<li id="usid" class="flexCenter">';
							itemlist += '<div class="madiaHead resouseHead" id="userimg"></div>';
							itemlist += '<div class="madiaInfo">';
							itemlist += '<p class="h1Font ellipsisSty" id="resourceName"></p>';
							itemlist += '<p class="h2Font ellipsisSty" id="name"></p>';
							itemlist += '</div><div class="deleteThis"></div></li>';
							$itemlist = $(itemlist);
							$("#resouselist").append($itemlist);
							var datalist = data.data[i];
							$itemlist.attr("data-id", datalist.resourceId);
							$itemlist.find("#resourceName").text(datalist.resourceName);
							if(datalist.resourceType==1){
								$itemlist.find("#name").text(datalist.professor.name);
							}else{
								$itemlist.find("#name").text(datalist.organization.name);
							}
							if(datalist.images.length > 0) {
								$itemlist.find("#userimg").attr("style", "background-image: url(/data/resource/" + datalist.images[0].imageSrc + ");");
							}
						}
						if(reEnd==prd) {
								$(_this).next().removeClass("displayNone");
								var itemlist = '';
								$("#resouselist").html("");
								for(var i = 0; i < data.data.length; i++) {
									var itemlist = '<li id="usid" class="flexCenter">';
									itemlist += '<div class="madiaHead resouseHead" id="userimg"></div>';
									itemlist += '<div class="madiaInfo">';
									itemlist += '<p class="h1Font ellipsisSty" id="resourceName"></p>';
									itemlist += '<p class="h2Font ellipsisSty" id="name"></p>';
									itemlist += '</div><div class="deleteThis"></div></li>';
									$itemlist = $(itemlist);
									$("#resouselist").append($itemlist);
									var datalist = data.data[i];
									$itemlist.attr("data-id", datalist.resourceId);
									$itemlist.find("#resourceName").text(datalist.resourceName);
									if(datalist.resourceType==1){
										$itemlist.find("#name").text(datalist.professor.name);
									}else{
										$itemlist.find("#name").text(datalist.organization.name);
									}
									if(datalist.images.length > 0) {
										$itemlist.find("#userimg").attr("style", "background-image: url(/data/resource/" + datalist.images[0].imageSrc + ");");
									}
								}
							}	
					} else {
						$(_this).next().addClass("displayNone");
					}
@@ -339,12 +382,37 @@ $(function() {
		});
		return $.unique(resourcesarray);
	}
	
	var seleClum ='<div class="mb-list mb-listL"><p>请选择文章发布的栏目：</p>'+
		'<select class="form-control form-column" id="seletColum"></select></div>';
	var seleTime = '<div class="mb-list mb-listR"><p>请设置文章发布的时间：</p>'+
		'<div class="formTime"><div class="form-group">'+
        '<input size="16" type="text" value="" readonly class="form-control form_datetime">'+
    	'</div></div></div>';
	//文章发布
	$("#release").on("click", function() {
		noTitleImg();
		if(imgflase && titleflase) {
			$.MsgBox.Confirm("提示", "确认发布该文章?", newsAdd);
			console.log(colMgr)
			if(colMgr=="true"){
				$(".blackcover2").fadeIn();
				var btnOk='<input class="mb_btn mb_btnOk mb_btnOkpub" type="button" value="确定">'
				$(".mb_btnOk").remove(); $("#promotGt").prepend(btnOk);
				$(".modelContain").show(); $("body").addClass("modelOpen");
				$(".mb-listR").remove();
				$(".mb-listL").remove();
				$("#promotTh").prepend(seleClum);
				fillColum(7);//填充select栏目
				$(".mb_btnOkpub").on("click", function() {
					$(".blackcover2").fadeOut();
					$(".modelContain").hide();
					$("body").removeClass("modelOpen");
					$.MsgBox.Confirm("提示", "确认发布该文章?", newsAdd);
				})
			}else{
				$.MsgBox.Confirm("提示", "确认发布该文章?", newsAdd);
			}
			
		}
	})
@@ -353,17 +421,29 @@ $(function() {
		noTitleImg();
		if(imgflase && titleflase) {
			$(".blackcover2").fadeIn();
			$(".modelContain").show();
			$("body").addClass("modelOpen");
			$(".mb_btnOk").on("click", function() {
			var btnOk='<input class="mb_btn mb_btnOk mb_btnOkset" type="button" value="确定">'
			$(".mb_btnOk").remove(); $("#promotGt").prepend(btnOk);
			$(".modelContain").show(); $("body").addClass("modelOpen");
			$(".mb-listR").remove(); $("#promotTh").append(seleTime);//时间选择器
			$(".mb-listR .form_datetime").datetimepicker({
				format: 'yyyy-mm-dd hh:ii',
				forceParse: true,
				autoclose: true,
			});
			$(".mb-listR .form_datetime").val(getNowFormatDate(currentdate));
			if(colMgr=="true"){
				$(".mb-listL").remove();
				$("#promotTh").prepend(seleClum);
				fillColum(7);//填充select栏目
			}
			$(".mb_btnOkset").on("click", function() {
				var publishTime = $(".form_datetime").val();
				console.log(st6(publishTime));
				setTimeIssue(st6(publishTime));
			})
		}
	})
	
	//文章存草稿
	$("#draft").on("click", function() {
		noTitleImg();
@@ -400,12 +480,17 @@ function getAttrId() {
		$data.articleContent = ue.getContent();
		$data.professors = experarray;
		$data.resources = resourcesarray;
		if(colMgr=="true"){
			$data.colNum = $("#seletColum").val();
			if(publishTime!="") {
				$data.publishTime = publishTime;
			}
		}else{
			$data.colNum=2;
		}
		if($("#hidearticleId").val().length != 0) {
			$data.articleId = $("#hidearticleId").val();
		}
		if($(".form_datetime").val().length != 0) {
			$data.publishTime = publishTime;
		}
		console.log($data);
	}
@@ -579,33 +664,40 @@ function getAttrId() {
			$(this).siblings(".aboutTit").find("span").text("最多选择3家企业");
		},
		keyup: function(e) {
			 var ti=$(this).val();
			 orgr=ti;
			 var $this=$(this);
			if($(this).val().trim()) {
				var lNum = $.trim($(this).val()).length;
				if(0 < lNum) {
					var $this = $(this)
					setTimeout(function(){
						if( ti===orgr && ti!== orgrEnd) {
							var tt=ti;
							orgrEnd=tt;
					$("#companylist").parent().show();
					console.log($(this).val())
					$.ajax({
						"url": "/ajax/org/qr",
						"type": "GET",
						"data":{
							kw: $(this).val(),
							kw: $this.val(),
							limit:3
						},
						"success": function(data) {
							console.log(data);
							if(data.success) {
								if(data.data.length == 0) {
									$this.siblings(".form-drop").addClass("displayNone");
									$this.siblings(".form-drop").find("ul").html("");
								} else {
									$this.siblings(".form-drop").removeClass("displayNone");
									var oSr = "";
									for(var i = 0; i < data.data.length; i++) {
										var busName=(data.data[i].forShort)?data.data[i].forShort:data.data[i].name;
										oSr += '<li style="min-height:40px;position:static;"data-id="'+data.data[i].id+'">' + busName + '</li>';
								if(orgrEnd==tt) {
									if(data.data.length == 0) {
										$this.siblings(".form-drop").addClass("displayNone");
										$this.siblings(".form-drop").find("ul").html("");
									} else {
										$this.siblings(".form-drop").removeClass("displayNone");
										var oSr = "";
										for(var i = 0; i < data.data.length; i++) {
											var busName=(data.data[i].forShort)?data.data[i].forShort:data.data[i].name;
											oSr += '<li style="min-height:40px;position:static;"data-id="'+data.data[i].id+'">' + busName + '</li>';
										}
										$this.siblings(".form-drop").find("ul").html(oSr);
									}
									$this.siblings(".form-drop").find("ul").html(oSr);
								}
							} else {
								$this.siblings(".form-drop").addClass("displayNone");
@@ -617,6 +709,8 @@ function getAttrId() {
							$.MsgBox.Alert('提示', '服务器连接超时！');
						}
					});
					}
					},500)
				}
			} else {
				$(this).siblings(".form-drop").addClass("displayNone");
@@ -633,7 +727,7 @@ function getAttrId() {
				return;
			}
		}
		$(this).parents(".form-drop").siblings(".form-result").find("ul").append('<li style="min-height:40px;" data-id="'+$(this).attr("data-id")+'">' + oValue + '<div class="deleteThis" style="right:0px;"></div></li>');
		$(this).parents(".form-drop").siblings(".form-result").find("ul").append('<li class="ellipsisSty" style="min-height:40px;padding-right:42px;" data-id="'+$(this).attr("data-id")+'">' + oValue + '<div class="deleteThis"></div></li>');
		$(this).parents(".form-drop").siblings("input").val("");
		if(oJudge.length == 4) {
			$(this).parents(".form-drop").siblings("input").val("");

cmp-portal/js/articalModify.js

@@ -6,9 +6,14 @@ $(function() {
    var modifyTimeval;
    var settime = false;
	var orgId = $.cookie("orgId");
	var colMgr = $.cookie("colMgr");
	if(orgId == "" || orgId == null || orgId == "null"){
    	location.href = "cmp-settled-log.html";
    }
	var hbur,hburEnd;
  	var pr,prEnd;
  	var re,reEnd;
  	var orgr,orgrEnd;
	articleshow();
	relevantExperts();
	relevantResources();
@@ -37,20 +42,28 @@ $(function() {
			$("#keyPrompt").text("");
		},
		keyup: function() {
			if($(this).val()==""){
			var ti=$(this).val();
			hbur=ti;
			if(ti==""){
				$(".frmadd").addClass("displayNone");
				$(".keydrop ul").html("");
				$(".keydrop").addClass("displayNone");
				return;
			}else{
				$(".frmadd").removeClass("displayNone");
			}
			if($(this).val().length > 15) {
				$(this).val($(this).val().substr(0, 15));
			}
			KeyWordList();
			setTimeout(function(){
				if( ti===hbur && ti!== hburEnd) {
					KeyWordList(ti);
				}
				
			},500)
			
		}
	})
	//添加关键字
	$("#addkeyWord").on("click", function() {
		var keyWord = $("#KeyWord").val();
@@ -111,7 +124,8 @@ $(function() {
		}
	}
	
	function KeyWordList() {
	function KeyWordList(seValue) {
		hburEnd=seValue;
		$.ajax({
			"url": "/ajax/dataDict/qaHotKey",
			"type": "get",
@@ -121,19 +135,21 @@ $(function() {
			"success": function(data) {
				console.log(data);
				if(data.success && data.data != "") {
					var itemlist = '';
					$("#keydropList").html("");
					for(var i = 0; i < 5; i++) {
						var itemlist = '<li><p class="h2Font"></p></li>';
						$itemlist = $(itemlist);
						$("#keydropList").append($itemlist);
						$itemlist.find(".h2Font").text(data.data[i].caption);
					if(hburEnd == seValue){
						var itemlist = '';
						$("#keydropList").html("");
						for(var i = 0; i < 5; i++) {
							var itemlist = '<li><p class="h2Font"></p></li>';
							$itemlist = $(itemlist);
							$("#keydropList").append($itemlist);
							$itemlist.find(".h2Font").text(data.data[i].caption);
						}
						$(".keydrop").removeClass("displayNone");
					} else {
						$(".keydrop").addClass("displayNone");
						$(".keydrop ul").html("");
					}
					$(".keydrop").removeClass("displayNone");
				} else {
					$(".keydrop").addClass("displayNone");
					$(".keydrop ul").html("");
				}
				}	
			},
			"error": function() {
				$.MsgBox.Alert('提示', '链接服务器超时')
@@ -175,12 +191,34 @@ $(function() {
	
	$("#checkZj").on("keyup", function() {
		var _this = this;
		checkZj(_this);
		var ti=$(this).val();
		pr=ti;
		if($(this).val()=="") {
			return;
		}
		setTimeout(function(){
				if( ti===pr && ti!== prEnd) {
					checkZj(_this,ti);
				}
				
			},500)
		
	})
	$("#checkZy").on("keyup", function() {
		var ti=$(this).val();
		re=ti;
		if($(this).val()=="") {
			return;
		}
		var _this = this;
		checkZy(_this);
		setTimeout(function(){
				if( ti===re && ti!== reEnd) {
					checkZy(_this,ti);
				}
				
			},500)
		
	})
	
	$("#expertlist").on("click","li",function(){
@@ -225,43 +263,46 @@ $(function() {
		$(this).parent().remove();
	})
	
	function checkZj(_this){
	function checkZj(_this,prd) {
		prEnd=prd;
		$.ajax({
			"url": "/ajax/professor/qaByName",
			"type": "get",
			"data": {
				"name": $("#checkZj").val(),
				"total":3
				"total": 3
			},
			"success": function(data) {
				console.log(data);
				if(data.success ) {
					if(data.data != ""){
						$(_this).next().removeClass("displayNone");
						var itemlist = '';
						$("#expertlist").html("");
						for(var i = 0; i < data.data.length; i++) {
							var itemlist = '<li id="usid" class="flexCenter">';
							itemlist += '<div class="madiaHead useHead" id="userimg"></div>';
							itemlist += '<div class="madiaInfo">';
							itemlist += '<p class="ellipsisSty"><span class="h1Font" id="name"></span><span class="h2Font" style="margin-left:10px;" id="title"></span></p>';
							itemlist += '<p class="h2Font ellipsisSty" id="orgName"></p>';
							itemlist += '</div><div class="deleteThis"></div></li>';
							$itemlist = $(itemlist);
							$("#expertlist").append($itemlist);
							var datalist = data.data[i];
							$itemlist.attr("data-id",datalist.id);
							$itemlist.find("#name").text(datalist.name);
							$itemlist.find("#title").text(datalist.title);
							$itemlist.find("#orgName").text(datalist.orgName);
							if(datalist.hasHeadImage==1) {
								$itemlist.find("#userimg").attr("style", "background-image: url(/images/head/" + datalist.id + "_l.jpg);");
							}
				if(data.success) {
					if(data.data != "") {
							if(prEnd == prd){
								$(_this).next().removeClass("displayNone");
								var itemlist = '';
								$("#expertlist").html("");
								for(var i = 0; i < data.data.length; i++) {
									var itemlist = '<li id="usid" class="flexCenter">';
									itemlist += '<div class="madiaHead useHead" id="userimg"></div>';
									itemlist += '<div class="madiaInfo">';
									itemlist += '<p class="ellipsisSty"><span class="h1Font" id="name"></span><span class="h2Font" style="margin-left:10px;" id="title"></span></p>';
									itemlist += '<p class="h2Font ellipsisSty" id="orgName"></p>';
									itemlist += '</div><div class="deleteThis"></div></li>';
									$itemlist = $(itemlist);
									$("#expertlist").append($itemlist);
									var datalist = data.data[i];
									$itemlist.attr("data-id", datalist.id);
									$itemlist.find("#name").text(datalist.name);
									$itemlist.find("#title").text(datalist.title);
									$itemlist.find("#orgName").text(datalist.orgName);
									if(datalist.hasHeadImage == 1) {
										$itemlist.find("#userimg").attr("style", "background-image: url(/images/head/" + datalist.id + "_l.jpg);");
									}
							}		
						}
					}else{
					} else {
						$(_this).next().addClass("displayNone");
					}
				}else{
				} else {
					$(_this).next().addClass("displayNone");
				}
			},
@@ -270,8 +311,9 @@ $(function() {
			}
		});
	}
	
		function checkZy(_this) {
	function checkZy(_this,prd) {
		reEnd=prd;
		$.ajax({
			"url": "/ajax/resource/qaByName",
			"type": "get",
@@ -283,30 +325,32 @@ $(function() {
				console.log(data);
				if(data.success) {
					if(data.data != "") {
						$(_this).next().removeClass("displayNone");
						var itemlist = '';
						$("#resouselist").html("");
						for(var i = 0; i < data.data.length; i++) {
							var itemlist = '<li id="usid" class="flexCenter">';
							itemlist += '<div class="madiaHead resouseHead" id="userimg"></div>';
							itemlist += '<div class="madiaInfo">';
							itemlist += '<p class="h2Font ellipsisSty" id="resourceName"></p>';
							itemlist += '<p class="h1Font ellipsisSty" id="name"></p>';
							itemlist += '</div><div class="deleteThis"></div></li>';
							$itemlist = $(itemlist);
							$("#resouselist").append($itemlist);
							var datalist = data.data[i];
							$itemlist.attr("data-id", datalist.resourceId);
							$itemlist.find("#resourceName").text(datalist.resourceName);
							if(datalist.resourceType==1){
								$itemlist.find("#name").text(datalist.professor.name);
							}else{
								$itemlist.find("#name").text(datalist.organization.name);
							}
							if(datalist.images.length > 0) {
								$itemlist.find("#userimg").attr("style", "background-image: url(/data/resource/" + datalist.images[0].imageSrc + ");");
							}
						}
						if(reEnd==prd) {
								$(_this).next().removeClass("displayNone");
								var itemlist = '';
								$("#resouselist").html("");
								for(var i = 0; i < data.data.length; i++) {
									var itemlist = '<li id="usid" class="flexCenter">';
									itemlist += '<div class="madiaHead resouseHead" id="userimg"></div>';
									itemlist += '<div class="madiaInfo">';
									itemlist += '<p class="h1Font ellipsisSty" id="resourceName"></p>';
									itemlist += '<p class="h2Font ellipsisSty" id="name"></p>';
									itemlist += '</div><div class="deleteThis"></div></li>';
									$itemlist = $(itemlist);
									$("#resouselist").append($itemlist);
									var datalist = data.data[i];
									$itemlist.attr("data-id", datalist.resourceId);
									$itemlist.find("#resourceName").text(datalist.resourceName);
									if(datalist.resourceType==1){
										$itemlist.find("#name").text(datalist.professor.name);
									}else{
										$itemlist.find("#name").text(datalist.organization.name);
									}
									if(datalist.images.length > 0) {
										$itemlist.find("#userimg").attr("style", "background-image: url(/data/resource/" + datalist.images[0].imageSrc + ");");
									}
								}
							}	
					} else {
						$(_this).next().addClass("displayNone");
					}
@@ -388,7 +432,7 @@ $(function() {
					var itemlist = '';
					var itemlist = '<li id="usid">';
						itemlist += '<div class="madiaHead useHead" id="userimg"></div>';
						itemlist += '<div class="madiaInfo">';
						itemlist += '<div class="madiaInfo" style="padding-right:42px">';
						itemlist += '<p class="ellipsisSty"><span class="h1Font" id="name"></span><span class="h2Font" style="margin-left:10px;" id="title"></span></p>';
						itemlist += '<p class="h2Font ellipsisSty" id="orgName"></p>';
						itemlist += '</div><div class="deleteThis"></div></li>';
@@ -444,7 +488,7 @@ $(function() {
				if (data.success && data.data){
					var itemlist = '<li id="usid">';
						itemlist += '<div class="madiaHead resouseHead" id="userimg"></div>';
						itemlist += '<div class="madiaInfo">';
						itemlist += '<div class="madiaInfo" style="padding-right:42px">';
						itemlist += '<p class="h1Font ellipsisSty" id="resourceName"></p>';
						itemlist += '<p class="h2Font" id="name"></p>';
						itemlist += '</div><div class="deleteThis"></div></li>';
@@ -506,12 +550,60 @@ $(function() {
		return $.unique(resourcesarray);
	}
	
	var seleClum ='<div class="mb-list mb-listL"><p>请选择文章发布的栏目：</p>'+
		'<select class="form-control form-column" id="seletColum"></select></div>';
	var seleTime = '<div class="mb-list mb-listR"><p>请设置文章发布的时间：</p>'+
		'<div class="formTime"><div class="form-group">'+
        '<input size="16" type="text" value="" readonly class="form-control form_datetime">'+
    	'</div></div></div>';
	//文章发布
	$("#release").on("click",function(){
	$("#release").on("click", function() {
		noTitleImg();
		if(titleflase){
			$.MsgBox.Confirm("提示","确认发布该文章?",newsAdd);	
		if(titleflase) {
			$(".blackcover2").fadeIn();
			var btnOk='<input class="mb_btn mb_btnOk mb_btnOkpub" type="button" value="确定">'
			$(".mb_btnOk").remove(); $("#promotGt").prepend(btnOk);
			$(".modelContain").show(); $("body").addClass("modelOpen");
			$(".mb-listR").remove();
			if(colMgr=="true"){
				$(".mb-listL").remove();
				$("#promotTh").prepend(seleClum);
				fillColum(7);//填充select栏目
			}
			$(".mb_btnOkpub").on("click", function() {
				$(".blackcover2").fadeOut();
				$(".modelContain").hide();
				$("body").removeClass("modelOpen");
				$.MsgBox.Confirm("提示", "确认发布该文章?", newsAdd);
			})
		}
	})
	//定时文章发布
	$("#setTimeIssue").on("click", function() {
		noTitleImg();
		if(titleflase) {
			$(".blackcover2").fadeIn();
			var btnOk='<input class="mb_btn mb_btnOk mb_btnOkset" type="button" value="确定">'
			$(".mb_btnOk").remove(); $("#promotGt").prepend(btnOk);
			$(".modelContain").show(); $("body").addClass("modelOpen");
			$(".mb-listR").remove(); $("#promotTh").append(seleTime);//时间选择器
			$(".mb-listR .form_datetime").datetimepicker({
				format: 'yyyy-mm-dd hh:ii',
				forceParse: true,
				autoclose: true,
			});
			$(".mb-listR .form_datetime").val(getNowFormatDate(currentdate));
			if(colMgr=="true"){
				$(".mb-listL").remove();
				$("#promotTh").prepend(seleClum);
				fillColum(7);//填充select栏目
			}
			$(".mb_btnOkset").on("click", function() {
				var publishTime = $(".form_datetime").val();
				console.log(st6(publishTime));
				setTimeIssue(st6(publishTime));
			})
		}
	})
	
@@ -536,21 +628,7 @@ $(function() {
		$.MsgBox.Confirm("提示","确认删除该文章？",newsDelet);
	})
	
	//定时文章发布
	$("#setTimeIssue").on("click", function() {
		//$(".form_datetime").val(timeGeshi(modifyTimeval));
		noTitleImg();
		if(titleflase) {
			$(".blackcover2").fadeIn();
			$(".modelContain").show();
			$("body").addClass("modelOpen");
			$(".mb_btnOk").on("click", function() {
				var modifyTimeval = $(".form_datetime").val();
				settime = true;
				setTimeIssue(st6(modifyTimeval),settime);
			})
		}
	})
	
	function getAttrId() {
		var arr=[];
		this.each(function(){
@@ -559,23 +637,26 @@ $(function() {
		return arr;
	}
	/*获取数据*/
	function getdata(publishTime,settime) {
		expertli();//相关专家
		resourcesli();//相关咨询
	    $data.articleId = articleId;
	function getdata(publishTime) {
		expertli(); //相关专家
		resourcesli(); //相关咨询
		$data.orgId = orgId;
		if($("#companys li").length) {
			$data.orgs = getAttrId.call($("#companys li"));
		}
		
		$data.articleTitle = $("#newstitle").val();
		$data.subject = captiureSubInd("keyWordlist .delkeylist");
		$data.articleImg = $("#uploader").attr("data-id");
		$data.articleContent = ue.getContent();
		$data.professors = experarray;
		$data.resources = resourcesarray;
		if(settime) {
			$data.publishTime = publishTime;
		if(colMgr=="true"){
			$data.colNum = $("#seletColum").val();
			if(publishTime!="") {
				$data.publishTime = publishTime;
			}
		}else{
			$data.colNum=2;
		}
		console.log($data);
	}
@@ -753,33 +834,40 @@ relatCompanies("#company");
			$(this).siblings(".aboutTit").find("span").text("最多选择3家企业");
		},
		keyup: function(e) {
			 var ti=$(this).val();
			 orgr=ti;
			 var $this=$(this);
			if($(this).val().trim()) {
				var lNum = $.trim($(this).val()).length;
				if(0 < lNum) {
					var $this = $(this)
					setTimeout(function(){
						if( ti===orgr && ti!== orgrEnd) {
							var tt=ti;
							orgrEnd=tt;
					$("#companylist").parent().show();
					console.log($(this).val())
					$.ajax({
						"url": "/ajax/org/qr",
						"type": "GET",
						"data":{
							kw: $(this).val(),
							kw: $this.val(),
							limit:3
						},
						"success": function(data) {
							console.log(data);
							if(data.success) {
								if(data.data.length == 0) {
									$this.siblings(".form-drop").addClass("displayNone");
									$this.siblings(".form-drop").find("ul").html("");
								} else {
									$this.siblings(".form-drop").removeClass("displayNone");
									var oSr = "";
									for(var i = 0; i < data.data.length; i++) {
										var busName=(data.data[i].forShort)?data.data[i].forShort:data.data[i].name;
										oSr += '<li style="min-height:40px;position:static;"data-id="'+data.data[i].id+'">' + busName + '</li>';
								if(orgrEnd==tt) {
									if(data.data.length == 0) {
										$this.siblings(".form-drop").addClass("displayNone");
										$this.siblings(".form-drop").find("ul").html("");
									} else {
										$this.siblings(".form-drop").removeClass("displayNone");
										var oSr = "";
										for(var i = 0; i < data.data.length; i++) {
											var busName=(data.data[i].forShort)?data.data[i].forShort:data.data[i].name;
											oSr += '<li style="min-height:40px;position:static;"data-id="'+data.data[i].id+'">' + busName + '</li>';
										}
										$this.siblings(".form-drop").find("ul").html(oSr);
									}
									$this.siblings(".form-drop").find("ul").html(oSr);
								}
							} else {
								$this.siblings(".form-drop").addClass("displayNone");
@@ -791,6 +879,8 @@ relatCompanies("#company");
							$.MsgBox.Alert('提示', '服务器连接超时！');
						}
					});
					}
					},500)
				}
			} else {
				$(this).siblings(".form-drop").addClass("displayNone");
@@ -807,7 +897,7 @@ relatCompanies("#company");
				return;
			}
		}
		$(this).parents(".form-drop").siblings(".form-result").find("ul").append('<li style="min-height:40px;" data-id="'+$(this).attr("data-id")+'">' + oValue + '<div class="deleteThis" style="right:0px;"></div></li>');
		$(this).parents(".form-drop").siblings(".form-result").find("ul").append('<li class="ellipsisSty" style="min-height:40px;padding-right:42px;" data-id="'+$(this).attr("data-id")+'">' + oValue + '<div class="deleteThis"></div></li>');
		$(this).parents(".form-drop").siblings("input").val("");
		if(oJudge.length == 4) {
			$(this).parents(".form-drop").siblings("input").val("");
@@ -853,7 +943,7 @@ relatCompanies("#company");
			success: function(data) {
				if(data.success) {
					var oValue=data.data.forShort?data.data.forShort:data.data.name;
				this.append('<li style="min-height:40px;" data-id="'+data.data.id+'">' + oValue + '<div class="deleteThis" style="right:0px;"></div></li>')	
				this.append('<li class="ellipsisSty" style="min-height:40px;padding-right:42px;" data-id="'+data.data.id+'">' + oValue + '<div class="deleteThis"></div></li>')	
				
				}
			},

cmp-portal/js/cmp-articalList.js

@@ -1,5 +1,6 @@
/*文章个人列表*/
var orgId = $.cookie("orgId");
var colMgr = $.cookie("colMgr");
if(orgId == "" || orgId == null || orgId == "null"){
	location.href = "cmp-settled-log.html";
}
@@ -62,7 +63,7 @@ function articalList(pageSize, pageNo, isbind, num) {
				for(var i = 0; i < data.data.data.length; i++) {
					if(data.data.data[i].status == 1) {
						var li = '<li class="newbox"><a href="" target="_blank" class="newurl">';
						var li2 = '<ul class="h2Font clearfix"><li><span class="time"></span></li><li><span id="pageViews"></span></li><li><span id="articleAgree"></span></li><li><span id="comment"></span></li></ul>';
						var li2 = '<ul class="h2Font clearfix"><li><span class="column"></span></li><li><span class="time"></span></li><li><span id="pageViews"></span></li><li><span id="articleAgree"></span></li><li><span id="comment"></span></li></ul>';
						var li3 = '';
						var li4 = '';
					} else if(data.data.data[i].status == 0) {
@@ -73,7 +74,7 @@ function articalList(pageSize, pageNo, isbind, num) {
					} else if(data.data.data[i].status == 2) {
						var li = '<li class="newbox draftList"><a href="" class="newurl">';
						var li2 = '<ul class="h2Font clearfix"><li><span class="time"></span></li></ul>';
						var li3 = '<span class="draftLable" id="dsfbtime"></span>';
						var li3 = '<span class="draftLable" id="dsfbtime"></span><span class="column" style="margin-left:20px;"></span>';
						var li4 = '<li><a class="editThis" target="_blank"></a></li>';
					}
					var itemlist = li;
@@ -97,6 +98,12 @@ function articalList(pageSize, pageNo, isbind, num) {
					if(datalist.articleImg) {
						$itemlist.find("#artimg").attr("style", "background-image: url(/data/article/" + datalist.articleImg + ");");
					}
					if(datalist.colNum>2){
						$itemlist.find(".column").text(columnType[datalist.colNum].fullName);
					}else{
						$itemlist.find(".column").css({"border":"none","padding":"0"})
						$itemlist.find(".time").parent().css("margin-left","0");
					}
					if(datalist.status == 1) {//发布
						$itemlist.find(".time").text("发布于 " + TimeTr(datalist.publishTime));
						$itemlist.find(".newurl").attr("href", "../articalShow.html?articleId=" + datalist.articleId);

cmp-portal/js/cmp-updateinfo.js

@@ -280,7 +280,7 @@ $(document).ready(function() {
		accept: {
			title: 'Images',
			extensions: 'jpg,jpeg,png',
			mimeTypes: 'image/gif,image/jpg,image/jpeg,image/bmp,image/png'
			mimeTypes: 'image/jpg,image/jpeg,image/png'
		}
	});

cmp-portal/js/cmp-workspaces.js

@@ -14,6 +14,7 @@ $(document).ready(function() {
			beforeSend: function() {},
			success: function(data, textState) {
				if(data.success) {
					$.cookie("colMgr",data.data.colMgr);
					var $data = data.data;
					var otext, oguimo;
					console.log(data);

cmp-portal/js/public/bootstrap-datetimepicker.js

@@ -638,7 +638,7 @@
        top = offset.top + this.height;
      }
	  
	  top = top - containerOffset.top+40;
	  top = top - containerOffset.top+42;
      left = left - containerOffset.left;

cmp-portal/js/public/common.js

@@ -1,6 +1,5 @@
$(document).ready(function() {
	$(".unlogin").removeClass("displayNone");
	var footerHeight = $("footer").outerHeight(true);
	$('#container').css("padding-bottom", footerHeight + "px");
	//窗口大小变更事件
@@ -250,11 +249,18 @@ function hotKey(sel) {
			$(this).siblings(".keydrop").show();
		},
		keyup: function(e) {
			 var ti=$(this).val();
			 var $t=this;
			 $t.comr=ti;
			 var $this=$(this);
			if($(this).val().trim()) {
				$(this).siblings("button").show();
				var lNum = $.trim($(this).val()).length;
				if(0 < lNum) {
					var $this = $(this)
					setTimeout(function(){
						if( ti===$t.comr && ti!== $t.comrEnd) {
							var tt=ti;
							$t.comrEnd=tt;
					$("#addKeyword").show();
					$.ajax({
						"url": "/ajax/dataDict/qaHotKey",
@@ -262,30 +268,34 @@ function hotKey(sel) {
						"success": function(data) {
							console.log(data);
							if(data.success) {
								if(data.data.length == 0) {
									$this.siblings(".keydrop").addClass("displayNone");
									$this.siblings(".keydrop").find("ul").html("");
								} else {
									$this.siblings(".keydrop").removeClass("displayNone");
									var oSr = "";
									for(var i = 0; i < 5; i++) {
										oSr += '<li>' + data.data[i].caption + '<div class="closeThis"></div></li>';
								if($t.comrEnd==tt) {
									if(data.data.length == 0) {
										$this.siblings(".keydrop").addClass("displayNone");
										$this.siblings(".keydrop").find("ul").html("");
									} else {
										$this.siblings(".keydrop").removeClass("displayNone");
										var oSr = "";
										for(var i = 0; i < Math.min(data.data.length,5); i++) {
											oSr += '<li>' + data.data[i].caption + '<div class="closeThis"></div></li>';
										}
										$this.siblings(".keydrop").find("ul").html(oSr);
									}
									$this.siblings(".keydrop").find("ul").html(oSr);
								}
								}	
							} else {
								$this.siblings(".keydrop").addClass("displayNone");
								$this.siblings(".keydrop").find("ul").html("");
							}
						},
						"data": {
							"key": $(this).val()
							"key": $this.val()
						},
						dataType: "json",
						'error': function() {
							$.MsgBox.Alert('提示', '服务器连接超时！');
						}
					});
					}
					},500);
				}
			} else {
				$(this).siblings("button").hide();
@@ -410,3 +420,77 @@ function TimeTr(dealtime) {
	}
	return formatTime;
}
//栏目
var columnType = {
	"1":{
		fullName:"个人原创",
		shortName:"原创"
	},
	"2":{
		fullName:"企业原创",
		shortName:"原创"
	},
	"3":{
		fullName:"前沿动态",
		shortName:"前沿"
	},
	"4":{
		fullName:"学术经验",
		shortName:"经验"
	},
	"5":{
		fullName:"分析检测",
		shortName:"检测"
	},
	"6":{
		fullName:"会议培训",
		shortName:"会议"
	},
	"7":{
		fullName:"科袖访谈",
		shortName:"访谈"
	},
	"8":{
		fullName:"招聘招生",
		shortName:"招聘"
	},
	"9":{
		fullName:"重大新闻",
		shortName:"新闻"
	}	
}
 function fillColum(allnum){//填充栏目选项
	var zCount=allnum+3;
	for(var i=3;i<zCount;i++){
		var colum=$('<option value="'+i+'">'+columnType[i].fullName+'</option>')
		$(".form-column").append(colum);
	}
}
var currentdate;
function getNowFormatDate() {
    var date = new Date();
    var seperator1 = "-";
    var seperator2 = ":";
    var month = date.getMonth() + 1;
    var strDate = date.getDate();
    var getHours = date.getHours();
    var getMinutes = date.getMinutes();
    if (month >= 1 && month <= 9) {
        month = "0" + month;
    }
    if (strDate >= 0 && strDate <= 9) {
        strDate = "0" + strDate;
    }
    if (getMinutes >= 0 && getMinutes <= 9) {
        getMinutes = "0" + getMinutes;
    }
     if (getHours >= 0 && getHours <= 9) {
        getHours = "0" + getHours;
    }
    var currentdate = date.getFullYear() + seperator1 + month + seperator1 + strDate
            + " " + getHours + seperator2 + getMinutes
           
    return currentdate;
}

cmp-portal/js/resourceIssue.js

@@ -11,6 +11,7 @@ $(document).ready(function() {
	var temp = [];
	var array = [];
	var oProfessor=[];
	var hbur,hburEnd;
	ue = UE.getEditor('editor', {});
	/*获取资源信息*/
	function getRecourceMe() {
@@ -167,11 +168,15 @@ $(document).ready(function() {
	});
	uploader.onError = function(code) {
		console.log(code)
		$.MsgBox.Alert('提示', '请上传jpg、png格式的图片，大小不超过2M')
		$.MsgBox.Alert('提示', '请上传jpg、jpeg、png格式的图片，大小不超过2M')
	};
	uploader.on('uploadSuccess', function(file, data) {
		uploader.removeFile(fileId);
		var cacheImageKey = temp.push(data.data[0].cacheKey);
		if(data.success) {
				uploader.removeFile(fileId);
				var cacheImageKey = temp.push(data.data[0].cacheKey);
		}else{
			$.MsgBox.Alert('提示', '只支持jpeg/jpg/png格式的图片');
		}
	});
	/*删除图片*/
	$("#fileList").on("click", ".cancel", function() {
@@ -210,47 +215,60 @@ $(document).ready(function() {
			$("#keywordPrompt").show().text('最多可添加5个关键词，每个关键词15字以内');
		},
		blur: function() {
			$("#keywordPrompt").hide();
			$("#keywordPrompt").text('');
		},
		keyup: function() {
			var ti=$(this).val();
			hbur=ti;
			var lNum=$.trim($(this).val()).length;
			console.log(lNum);
			if(lNum > 15) {
				$(this).val($(this).val().substr(0, 15));
			} else if(0 < lNum && lNum < 15) {
				$("#addKeyword").show();
				$.ajax({
					"url": "/ajax/dataDict/qaHotKey",
					"type": "GET",
					"success": function(data) {
						console.log(data);
						if(data.success) {
							if(data.data.length==0) {
									$("#keyList").addClass("displayNone");
									$("#keyList ul").html("");
								}else{
									$("#keyList").removeClass("displayNone");
								var oSr = "";
								for(var i = 0; i < 5; i++) {
									oSr += '<li><p class="h2Font">' + data.data[i].caption + '</p></li>'
								}
								$("#keyList ul").html(oSr);
			} else if(0 < lNum&& lNum < 15) {
					$("#addKeyword").show();
					setTimeout(function(){
						if( ti===hbur && ti!== hburEnd) {
							var tt=ti;
							hburEnd=tt;
						$.ajax({
						"url": "/ajax/dataDict/qaHotKey",
						"type": "GET",
						"success": function(data) {
							console.log(data);
							if(data.success) {
								if(hburEnd == tt){
									if(data.data.length==0) {
										$("#keyList").addClass("displayNone");
										$("#keyList ul").html("");
									}else{
										$("#keyList").removeClass("displayNone");
										var oSr="";
										for(var i=0;i<Math.min(data.data.length,5);i++) {
											oSr+='<li><p class="h2Font">'+data.data[i].caption+'</p></li>'
										}
										$("#keyList ul").html(oSr);
									}
								}	
							}else {
								$("#keyList ul").html("");
							}
						},
						"data": {
							"key":$('#keywordName').val()
						},
						dataType: "json",
						'error':function() {
							$.MsgBox.Alert('提示', '服务器连接超时！');
						}
					},
					"data": {
						"key": $(this).val()
								},
					dataType: "json",
					'error': function() {
						$.MsgBox.Alert('提示', '服务器连接超时！');
					}
				});
			}if(lNum == 0){
				}
				},500)
			}else if(lNum == 0){
				 $("#addKeyword").hide();
				 $("#keyList ul").html("");
			}
		}
	})
	});
	$("#keyList ul").on("click","li",function(){
		 keyWord($(this).find("p").text());
		 $("#keyList ul").html("");

cmpInforShow.html

@@ -190,7 +190,7 @@
				<div class="conBlock conItem displayNone">
					<div class="form-item">
						<div class="aboutTit">相关文章</div>
						<div class="form-result form-M0 currentArt">
						<div class="form-result form-M0 currentArt currentArt2">
							<ul id="relateArt">
							</ul>
						</div>

css/common.css

@@ -141,7 +141,7 @@ input{ outline:none;}
/***********************缺省页面*******************/
.nodatatip{width:40%;margin:100px auto;overflow:hidden;height:100px; font-size:16px; text-align:center;color:#aaa;}
.nodatabox{/*width:100%;*/height: 100%;padding:40px; margin:20px auto;text-align: center;}
.nodatabox{/*width:100%;*//*height: 100%;*/padding:40px; margin:20px auto;text-align: center;}
.nodatabox .nodata{overflow:hidden; width:50%; margin:20px auto;}
.nodatabox .picbox{margin:8px auto;display:inline-block;width:140px;height:140px;background-position: center;background-repeat: no-repeat;background-size:cover;}
.nodatabox .picbox.picNull{background-image:url(../images/points_icon_ku_nor.png);}

css/genindex.css

@@ -142,23 +142,65 @@ ul.loginWaySort li.liactive{border-bottom: 2px solid #ff9900;}
/*--------------发现--------------*/
.contentCon{padding-top:80px;}
.leftconBox{width:820px;padding-bottom:20px;margin-bottom:20px;background: #FFFFFF;}
.table-item{/*padding:10px;*/}
.table-item>li{position:relative;padding:25px 20px;}
.table-item>li:after{content:"";position:absolute; left:0; right:0; bottom:0;height: 2px;background: #f7f7f8;}
.table-item-media{height: 40px;margin-bottom:20px;}
.table-item-media .table-item-logo{position:absolute;border:1px solid #f2f3f4;display: inline-block;width: 40px; height:40px;z-index:4;}
.table-item-media .table-item-name{position:relative;width:90%;padding-left:50px;}
.table-item-media .table-item-name .nameSpan{color:#000;font-size: 16px;line-height: 18px;}
.table-item-media .table-item-name .timeLabel{color:#AAAAAA;}
.table-item-media .authicon{bottom:9px;}
.table-item-cell{position:relative;font-size:16px;color:#000;cursor: pointer;}
.table-item-cell a{display:block;min-height: 110px;color:#000;}
.table-item-cell a:hover{background: #f4f6f8;color:#5c99d8;}
.table-item-cell .table-item-img{position:absolute;border:1px solid #f2f3f4;width: 164px;height: 110px;top:50%;left:0;margin-top:-55px;}
.table-item-cell .table-item-img.artical-default{background:url(../images/default-artical.jpg) center center;background-size:cover;}
.table-item-cell .table-item-img.resource-default{background:url(../images/default-resource.jpg) center center;background-size:cover;}
.table-item-cell .table-item-body{position:absolute;top:50%;width:100%;margin-top:-28px;padding-left:184px;padding-right: 10px;}
/*顶部轮播*/
.slide-box{/*background:#f4f6f8;*/margin-bottom: 20px;width:820px;height: 300px;}
.slide-list {position: relative;width:760px;height: 300px;overflow: hidden;
	    background-image: linear-gradient(to bottom right,rgba(0,0,0,.3),#000);}
.slide-list .slide-item {position: absolute;width: 100%;height: 100%;opacity: 0; transition-property: opacity; transition-duration: .8s;z-index: 1;}
.slide-list .slide-item>a {display: block;width: 100%;height: 100%;background-size:cover;background-position: center;}
.slide-list .slide-item-active{opacity: 1;z-index: 10;}
.slide-tab {width: 60px;height: 300px;color: #fff;font-size: 14px;background-color: #444;padding:10px 0;}
.slide-tab-item {position: relative;cursor: pointer; text-align: center;line-height:46px;margin:8px 0;}
.slide-tab-item-active, .slide-tab-item:hover { background: #ff9900;background: rgba(255,153,0,.9);z-index: 11;}
.slide-tab-item-active:before, .slide-tab-item:hover:before{
	content: "";position:absolute;top:50%;margin-top: -8px;left:-8px;width:0;height: 0;
	border-top:8px transparent solid;
	border-bottom:8px transparent solid;
	border-right:8px #ff9900 solid;}
.slide-list .slide-item .title {position: absolute;left: 0;bottom: 0;width: 100%;height: 44px;
	line-height: 44px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;
	padding-left: 22px;color: #fff;font-size: 20px;font-weight: 700;
	background-image: linear-gradient(-180deg,transparent,rgba(0,0,0,.8)); box-sizing: border-box;}
/*栏目分类导航*/
.table-tab{width: 100%;margin: 6px auto 10px;background: #fff;}
.table-tab-item{position: relative;z-index: 20;}
.table-tab-item>li{position:relative;color:#666;float: left;width:16.666666666666664%;text-align: center;font-size: 16px;line-height:60px;cursor: pointer;margin-bottom: -3px;}
.table-tab-item>li.rightbtn:hover{color:#ff9900}
.table-tab-item>li.rightbtn .foldtr{top:27px;right:46px;}
.table-tab-item>li.rightbtn .unfoldtr{top:34px;right:46px;}
.table-tab-slide {text-align: center;font-size: 16px;line-height:60px;cursor: pointer; }
.table-tab-slide:hover{color:#ff9900}
.table-tab-slide:hover:after{position: absolute;left: 30px;right: 30px;bottom: 0;content:"";height:3px;background:#ff9900;}
.table-tab-item .table-tab-slide-active{color:#ff9900}
.table-tab-item .table-tab-slide-active:after{position: absolute;left: 30px;right: 30px;bottom: 0;content:"";height:3px;background:#ff9900;}
.table-drop{display: none;z-index: 40;position: absolute;width: 130px;height:120px;top: 56px;right: 2px;background: #fff;
    	box-shadow: 0px 0px 10px 0px rgba(204,204,204,.8);
    	-webkit-box-shadow: 0px 0px 10px 0px rgba(204,204,204,.8);}
.table-drop>li{position:relative;color: #333;border-bottom:1px solid #ddd;}
.table-drop>li:last-child{border: none;}
.table-drop>li.table-tab-slide-active{border:none}
/*列表*/
.table-body {position: relative;min-height: 200px;background: #fff;margin-top:20px;margin-bottom: -20px;padding-bottom: 20px;}
.table-body .table-item-list{display: none;}
.table-body .table-item-list:first-child{display: block;}
.columTag{position: absolute;background: rgba(0,0,0,.6);color:#fff;padding:4px 10px;bottom:6px;left: 6px;font-size: 13px;}
/*.table-item{position: relative;min-height:500px;}
.table-item>li{position:relative;padding:25px 20px;}
.table-item>li:after{content:"";position:absolute; left:0; right:0; bottom:0;height: 2px;background: #f7f7f8;}
.table-item-media{height: 40px;margin-bottom:20px;}
.table-item-media .table-item-logo{position:absolute;border:1px solid #f2f3f4;display: inline-block;width: 40px; height:40px;z-index:4;}
.table-item-media .table-item-name{position:relative;width:90%;padding-left:50px;}
.table-item-media .table-item-name .nameSpan{color:#000;font-size: 16px;line-height: 18px;}
.table-item-media .table-item-name .timeLabel{color:#AAAAAA;}
.table-item-media .authicon{bottom:9px;}
.table-item-cell{position:relative;font-size:16px;color:#000;cursor: pointer;}
.table-item-cell a{display:block;min-height: 110px;color:#000;}
.table-item-cell a:hover{background: #f4f6f8;color:#5c99d8;}
.table-item-cell .table-item-img{position:absolute;border:1px solid #f2f3f4;width: 164px;height: 110px;top:50%;left:0;margin-top:-55px;}
.table-item-cell .table-item-img.artical-default{background:url(../images/default-artical.jpg) center center;background-size:cover;}
.table-item-cell .table-item-img.resource-default{background:url(../images/default-resource.jpg) center center;background-size:cover;}
.table-item-cell .table-item-body{position:absolute;top:50%;width:100%;margin-top:-28px;padding-left:184px;padding-right: 10px;}*/
.cmplogohead{ background: #fff;background-size: cover;border-radius:4px;}
.cmplogohead .boxBlock{width:38px;height:38px;}
@@ -167,7 +209,7 @@ ul.loginWaySort li.liactive{border-bottom: 2px solid #ff9900;}
.cmpLable.articalLabel{border-color:#ff6b57;color:#ff6b57;}
.cmpLable.resourceLabel{border-color:#28b8fa;color:#28b8fa;}
/*发现右侧新闻*/
.advertBox{min-height: 100px;margin-left: 20px;}
.rightconBox .conItem.advertBox{min-height: 100px;padding:0}
.advertItem li{width: 260px;margin-bottom:20px;}
.advertItem li img{width: 100%;}
@@ -188,12 +230,12 @@ ul.filterListNew>li:last-child:after{height: 0;}
.filterListNew .leftsort{position: absolute;left: 0;top:12px;color:#666;}
.filterListNew .rightbtn{position: absolute;right:0;padding-right:32px;top:12px;color:#999;cursor: pointer;}
/*展开fold关闭unfold三角*/
.filterListNew .rightbtn .foldtr{position: absolute;top:8px;right: 42px;}
.filterListNew .rightbtn .foldtr:after{ border:solid transparent;border-top-color:#fff;border-width:5px;content:" ";position:absolute;top:100%;left:20px;}
.filterListNew .rightbtn .foldtr:before{border:solid transparent;border-top-color:#ff9900;border-width:7px;content:" ";position:absolute;top:100%;left:18px;}
.filterListNew .rightbtn .unfoldtr{position: absolute;top:15px;right: 42px;}
.filterListNew .rightbtn .unfoldtr:after{ border:solid transparent;border-bottom-color:#fff;border-width:5px;content:" ";position:absolute;bottom:100%;left:20px;}
.filterListNew .rightbtn .unfoldtr:before{border:solid transparent;border-bottom-color:#ff9900;border-width:7px;content:" ";position:absolute;bottom:100%;left:18px;}
.rightbtn .foldtr{position: absolute;top:8px;right: 42px;}
.rightbtn .foldtr:after{ border:solid transparent;border-top-color:#fff;border-width:5px;content:" ";position:absolute;top:100%;left:20px;}
.rightbtn .foldtr:before{border:solid transparent;border-top-color:#ff9900;border-width:7px;content:" ";position:absolute;top:100%;left:18px;}
.rightbtn .unfoldtr{position: absolute;top:15px;right: 42px;}
.rightbtn .unfoldtr:after{ border:solid transparent;border-bottom-color:#fff;border-width:5px;content:" ";position:absolute;bottom:100%;left:20px;}
.rightbtn .unfoldtr:before{border:solid transparent;border-bottom-color:#ff9900;border-width:7px;content:" ";position:absolute;bottom:100%;left:18px;}
ul.filterUl{overflow: hidden;width: 100%;height:26px;overflow:hidden;margin:10px 0;padding-left:64px;padding-right: 60px;}
ul.filterUl.filterUlactive{height:auto;}
@@ -254,7 +296,6 @@ ul.artAbout .uploadFile input.upInp[type="file"]{position:absolute;height: 46px;
ul.artAbout .uploadFile .upbtn{display:inline-block;padding:7px 23px;background: #E5E5E5;color:#333333;margin-top:30px;}
ul.artAbout .uploadFile .uploadblock .upBackbtn{position:absolute;bottom:30px;left:50%;margin-left:-55px;background:rgba(0,0,0,.5);color:#FFFFFF;z-index:10;display: none;}
.conBlock .aboutTit{font-size:16px;line-height:40px;color:#666666;margin-top:18px;}
/*ul.artAbout .editBlock{height:320px;border:1px solid #E5E5E5;}*/
ul.artAbout #filePicker{position:absolute;left:50%; bottom:25px; margin-left:-52px;opacity:0; z-index:88;}
ul.artAbout .frmadd{width:auto;position:absolute;right:0;top:0;background: #ff9900;color:#fff;border:none;padding:6px 25px; z-index:4;}
@@ -284,14 +325,6 @@ ul.artAbout .frmadd{width:auto;position:absolute;right:0;top:0;background: #ff99
.conItem .aboutTit{margin-top:-10px;}
.conItem .otherBlock{padding-bottom: 30px;border-bottom:1px dashed #E5E5E5;margin-bottom: 30px;text-align: left;}
.conItem .otherBlock:last-child{padding:0;margin:0;border: 0;}
.rightconBox .conItem .currentArt.form-result{margin-top:0}
.rightconBox .conItem .currentArt.form-result li{padding:6px 20px;min-height:62px;}
#relateArt li{min-height: 40px;}
.rightconBox .conItem.conItemG .currentArt.form-result .ellipsisSty-2{max-height:42px;line-height: 20px;}
.rightconBox .conItem.conItemG .currentArt.form-result .smalltip{display:inline-block;color:#999;margin-top:6px}
.rightconBox .conItem.conItemG .currentBlock{margin-top:30px;padding-top:16px;border-top:1px solid #E5E5E5}
.rightconBox .conItem.conItemG .currentBlock .madiaHead{width:50px;height: 50px;margin-top:-25px}
.conItem .otherBlock.currentBlock{border:none;margin-bottom: 0;padding-bottom: 0;}
.flexCenter{position: relative;width: 100%; min-height:90px;
		    display: -webkit-box;
@@ -314,7 +347,8 @@ ul.artAbout .frmadd{width:auto;position:absolute;right:0;top:0;background: #ff99
.form-item .madiaHead.artHead{background-image: url(../images/default-artical.jpg);border-radius:0;}
.form-item .madiaInfo{width:100%;padding-left:62px;margin:2px 0;}
.form-item ul .h1Font{font-size:16px;color:#333;line-height: 20px;margin-bottom:4px;}
.form-item ul .h2Font{font-size:14px;color:#666;line-height: 22px;}
.form-item ul .h2Font,.form-item ol .h2Font{font-size:14px;color:#666;line-height: 22px;}
.form-item ul .time{font-size:14px;color:#666;line-height: 22px;}
.form-item ul .h3Font{font-size:13px;color:#999;line-height:20px;}
.form-item ul .circlePre{display: inline-block;content:"";width:5px;height: 5px;border-radius: 50%;background:#ff9900;position: relative;top:-3px;margin-right:5px;}
.form-drop>ul>li{position:relative;min-height:76px;padding:12px;cursor:pointer;background: #FFFFFF;}
@@ -336,13 +370,27 @@ ul.artAbout .frmadd{width:auto;position:absolute;right:0;top:0;background: #ff99
.keyResult>ul>li .closeThis{display:none;position:absolute;top:-8px;right:-12px;width:28px;height:28px;background:url(../images/g_article_button_guanbi_hig.png);background-size:cover;cursor:pointer;}
.keyResult>ul>li:hover{background: #E5E5E5;}
.keyResult>ul>li:hover .closeThis{display:block;}
.rightconBox .conItem .currentArt.form-result{margin-top:0}
.rightconBox .conItem .currentArt.form-result li{padding:6px 20px;min-height:62px;}
.rightconBox .conItem .currentArt2.form-result li{min-height: 40px;}
.rightconBox .conItem.conItemG .currentArt.form-result .ellipsisSty-2{max-height:42px;line-height: 20px;}
.rightconBox .conItem .smalltip{display:inline-block;color:#999;margin-top:6px}
.rightconBox .conItem.conItemG .currentBlock{margin-top:30px;padding-top:16px;border-top:1px solid #E5E5E5}
.rightconBox .conItem.conItemG .currentBlock .madiaHead{width:50px;height: 50px;margin-top:-25px}
.conItem .otherBlock.currentBlock{border:none;margin-bottom: 0;padding-bottom: 0;}
.rightconBox .hotList{list-style-type:none;counter-reset:li;}
.rightconBox .hotList>li a {position: relative;display: block;padding: 4px 2px;padding-left:26px;color: #444;width: 100%;}
.rightconBox .hotList>li a::before {content: counter(li);counter-increment: li;
	position: absolute;left: 0;top: 4px;background:#ccc;width: 20px;height: 20px;line-height: 22px;text-align: center;}
.rightconBox .hotList>li:nth-child(1) a::before,.rightconBox .hotList>li:nth-child(2) a::before,.rightconBox .hotList>li:nth-child(3) a::before{background: #FF9e3a;}
/*文章浏览*/
.showDetail .h1Font{font-size: 20px;line-height:32px;color:#000;}
.showDetail .h2Font{font-size:14px;color:#999;}
.showDetail .readNum{margin-left: 20px;}
.showDetail .showBigOpen{width:100%;height:300px;margin:24px 0;background-position:center;background-size:cover;background-repeat:no-repeat;}
.showMain{font-size:16px;color:#333;line-height: 30px;/*text-indent: 2em;*/}
.showMain img{max-width: 100%;/*margin-left:-32px;*/}
.showMain{font-size:16px;color:#333;line-height: 30px;}
.showMain img{max-width: 100%;}
.showMain p{margin-bottom:10px;text-align:justify}
ul.tagList{margin:20px 0 -10px;overflow: hidden;}
ul.tagList>li{float: left;margin-right:10px;margin-bottom:10px;padding:0 12px;color: #999;border: 1px solid #E5E5E5;border-radius: 20px;cursor: pointer;}

css/share.css

@@ -73,6 +73,7 @@ html,body {outline: 0;margin:0;padding:0px;background: #efeff4;-webkit-text-size
.showDetail .h1Font{font-size:20px;margin:8px 0;line-height:30px;color:#333;}
.showDetail .showFont{font-size:16px;margin-top:-4px; line-height:24px;color:#333;}
.showDetail .h2Font{font-size:14px;color:#666; line-height:16px;}
.showDetail .madiaInfo .h2Font{font-size:14px;color:#999;}
.showDetail .h3Font{font-size:13px;color:#999; line-height:24px;}
.showDetail .showMain{font-size:15px;color:#333;line-height:28px;}
.showDetail .showMain img{max-width: 100%;}
@@ -104,6 +105,7 @@ ul.tagList>li .h2Font{color: #666;}
.madiaBlock .flexCenter.OflexCenter{min-height:72px;}
.madiaBlock .madiaInfo .h1Font{font-size: 16px;margin:0;line-height:24px;}
.madiaBlock .madiaInfo .ellipsisSty-2{max-height: 44px;}
.madiaBlock .madiaInfo .time{font-size:14px;color:#999;}
/*点赞模块*/
.thumbBlock{text-align: center;margin:30px 0;}
.thumbBlock .thumbBtn{display:inline-block;position:relative;padding:10px 24px;padding-left:44px;font-size:16px;color:#fff;background:url(../images/g_article_icon_dianzan_nor.png) no-repeat 24px center;background-size:16px 16px;background-color:#ff9900;border-radius:30px;cursor: pointer;}
@@ -195,7 +197,7 @@ ul.tagList>li .h2Font{color: #666;}
.infocon ul{ padding:0; margin: 0; overflow: hidden;}
.infocon ul>li{list-style: none;}
ul.mui-table-view>li{position: relative;overflow: hidden; padding: 11px 0px;}
ul.mui-table-view>li:after{position: absolute;right: 0;bottom: 0;left:0px;height: 1px;content: '';-webkit-transform: scaleY(.5);transform: scaleY(.5); background-color: #c8c7cc;}
ul.mui-table-view>li:after{position: absolute;right: 0;bottom: 0;left:0px;height: 1px;content: '';-webkit-transform: scaleY(.5);transform: scaleY(.5); background-color: #E5E5E5;}
ul.mui-table-view>li:last-child:after{background: none;}
.infocon.listArea>ul{overflow: hidden;margin-right: -10px;margin-top:-10px;}
.infocon.listArea>ul>li{float: left;margin-right: 10px;margin-top:10px;border:1px solid #E5E5E5;border-radius:6px;padding:2px 12px;}

discover.html

@@ -1,4 +1,4 @@
 <!DOCTYPE html>
 <!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -10,9 +10,8 @@
<link type="text/css" href="css/common.css" rel="stylesheet">
<link type="text/css" href="css/genindex.css" rel="stylesheet">
<script type="text/javascript" src="js/jquery-1.11.1.js"></script>
<script type="text/javascript" src="js/public/swiper.min.js"></script>
</head>
<body>
<header id="header">
	<script src="js/header.js"></script>
@@ -20,14 +19,85 @@
<div id="container">
	<div class="containerCon">
		<div class="contentCon clearfix">
			<div class="leftconBox floatL">
				<ul class="table-item" id="table-item" style="position: relative;min-height:500px;"></ul>
				<div class="tcdPageCode"></div>
			<div class="leftconBox floatL" style="background: #f4f6f8;">
				<div class="slide-box clearfix">
				</div>
				<div class="table-box">
					<div class="table-tab">
						<ul class="table-tab-item clearfix">
							<li class="table-tab-slide table-tab-slide-active">最新文章</li>
							<li class="table-tab-slide">前沿动态</li>
							<li class="table-tab-slide">学术经验</li>
							<li class="table-tab-slide">分析检测</li>
							<li class="table-tab-slide">会议培训</li>
							<li class="rightbtn"><span>更多栏目</span><em class="foldtr"></em>
								<ul class="table-drop">
									<li class="table-tab-slide">科袖访谈</li>
									<li class="table-tab-slide">招聘招生</li>
								</ul>
							</li>
							
						</ul>
					</div>
					<div class="table-body">
					    <div class="haveData">
					    	<div class="table-item-list">
					    		<ul class="listitemdiv listmorediv" id="table-item-0"></ul>
								<div class="tcdPageCode"></div>
					    	</div>
					    	<div class="table-item-list">
					    		<ul class="listitemdiv listmorediv" id="table-item-1"></ul>
								<div class="tcdPageCode"></div>
					    	</div>
					    	<div class="table-item-list">
					    		<ul class="listitemdiv listmorediv" id="table-item-2"></ul>
								<div class="tcdPageCode"></div>
					    	</div>
					    	<div class="table-item-list">
					    		<ul class="listitemdiv listmorediv" id="table-item-3"></ul>
								<div class="tcdPageCode"></div>
					    	</div>
					    	<div class="table-item-list">
					    		<ul class="listitemdiv listmorediv" id="table-item-4"></ul>
								<div class="tcdPageCode"></div>
					    	</div>
					    	<div class="table-item-list">
					    		<ul class="listitemdiv listmorediv" id="table-item-5"></ul>
								<div class="tcdPageCode"></div>
					    	</div>
					    	<div class="table-item-list">
					    		<ul class="listitemdiv listmorediv" id="table-item-6"></ul>
								<div class="tcdPageCode"></div>
					    	</div>
					    </div>
					</div>
				</div>
			</div>
			<div class="advertBox floatR">
				<ul class="advertItem">
					<li><a href="download.html" target="_blank"><img src="images/find_img_xiazai_nor.png" /></a></li>
				</ul>
			<div class="rightconBox floatR">
				<div class="conItem conBlock displayNone">
					<div class="form-item otherBlock">
						<div class="aboutTit">重大新闻</div>
						<div class="form-result currentArt currentArt2">
							<ul id="importNews">
							</ul>
						</div>
					</div>	
				</div>
				<div class="conItem advertBox">
					<ul class="advertItem">
						<li><a href="download.html" target="_blank"><img src="images/find_img_xiazai_nor.png" /></a></li>
					</ul>
				</div>
				<div class="conItem conBlock displayNone">
					<div class="form-item otherBlock">
						<div class="aboutTit">热门文章</div>
						<div class="form-result currentArt currentArt2">
							<ol class="hotList" id="hotNews">
							</ol>
						</div>
					</div>	
				</div>
			</div>
		</div>
	</div>
@@ -41,6 +111,5 @@
<script type="text/javascript" src="js/jquery.page.js"></script>
<script type="text/javascript" src="js/common.js"></script>
<script type="text/javascript" src="js/discover.js"></script>
</body>
</html>

e/a.html

@@ -312,26 +312,28 @@
						userType.sty = "authicon-com-ok"
					} 
				}
				var rImg = "/data/resource/" + $data.images[0].imageSrc;
				var rImg = "../images/default-resource.jpg";
				if($data.images.length>0){
					rImg = "/data/resource/" + $data.images[0].imageSrc;
				}
				var li = document.createElement("li");
				li.setAttribute("data-id", $data.resourceId);
				li.innerHTML = '<div class="flexCenter OflexCenter clearfix">' +
					' <div class="madiaHead resouseHead" style="background-image:url(' + rImg + ')"></div>' +
					'<div class="madiaInfo OmadiaInfo">' +
					'<p class="ellipsisSty h1Font">' + $data.resourceName + '</p>' +
					'<p class="ellipsisSty h2Font">用途：' + $data.supportedServices + '</p>' +
					'<p><span class="h2Font">' + namepo + '</span><em class="authiconNew ' + userType.sty + '" title="科袖认证专家"></em></p>' +
					'<p class="ellipsisSty-2 h2Font">用途：' + $data.supportedServices + '</p>' +
					'</div>' +
					'</div>'
				document.getElementById("resourceList").appendChild(li);
			},
			correlationArticle: function($data) {
	
				if($data.length == 0) {
					return;
				}
				document.getElementById('article').classList.remove("displayNone");
				for(var i = 0; i < 5; i++) {
				for(var i = 0; i < $data.length; i++) {
					var ourl, of ;
					if($data[i].articleType == 1) {
						ourl = "/ajax/professor/editBaseInfo/" + $data[i].professorId; of = 1;
@@ -375,13 +377,15 @@
									li.setAttribute("data-type", 2);
								}
								li.setAttribute("data-id", $data[i].articleId);
								li.className = "mui-table-view-cell";
								li.innerHTML = '<div class="flexCenter OflexCenter clearfix">' +
									'<div class="madiaHead artHead" style="background-image:url(' + arImg + ')"></div>' +
									'<div class="madiaInfo OmadiaInfo">' +
									'<p class="ellipsisSty-2 h1Font">' + title + '</p>' +
									'<p><span class="h2Font" style="margin-right:10px;">' + namepo + '</span><span class="time">'+commenTime($html[n].publishTime)+'</span></p>'+
									'<p><span class="h2Font" style="margin-right:10px">'+namepo+'</span><span class="time">'+commenTime($data[i].publishTime)+'</span></p>'+
									'</div>' +
									'</div>'
								
								document.getElementById("articleList").appendChild(li);
							}
						},

e/r.html

@@ -435,8 +435,8 @@ $(document).ready(function() {
										add.setAttribute("data-id",$respond[n].resourceId);
										var itemlist = '<div class="flexCenter OflexCenter"><div class="madiaHead resourceHead" style="background-image:url('+imgL+')"></div>';
											itemlist += '<div class="madiaInfo OmadiaInfo">';
											itemlist += '<p class="ellipsisSty h2Font" id="usertitle">'+$respond[n].resourceName+'</p>';
											itemlist += '<p><span class="h1Font">'+thisName+'</span><em class="authiconNew '+thisAuth+'" title="'+thisTitle+'"></em></p>';
											itemlist += '<p class="ellipsisSty-2 h1Font" id="usertitle">'+$respond[n].resourceName+'</p>';
											itemlist += '<p><span class="h2Font">'+thisName+'</span><em class="authiconNew '+thisAuth+'" title="'+thisTitle+'"></em></p>';
											itemlist += '</div></div>';
											
										add.innerHTML=itemlist;

js/articalIssue.js

@@ -7,6 +7,9 @@ $(function() {
	var articleId;
	var fa = false;
  	var userid = $.cookie("userid");
  	var hbur,hburEnd;
  	var pr,prEnd;
  	var re,reEnd;
	//校验标题
	$("#newstitle").on({
		focus: function() {
@@ -31,17 +34,26 @@ $(function() {
			$("#keyPrompt").text("");
		},
		keyup: function() {
			if($(this).val()==""){
			var ti=$(this).val();
			hbur=ti;
			if(ti==""){
				$(".frmadd").addClass("displayNone");
				$(".keydrop ul").html("");
				$(".keydrop").addClass("displayNone");
				return;
			}else{
				$(".frmadd").removeClass("displayNone");
			}
			if($(this).val().length > 15) {
				$(this).val($(this).val().substr(0, 15));
			}
			KeyWordList();
			setTimeout(function(){
				if( ti===hbur && ti!== hburEnd) {
					KeyWordList(ti);
				}
				
			},500)
			
		}
	})
@@ -105,7 +117,8 @@ $(function() {
		}
	}
	
	function KeyWordList() {
	function KeyWordList(seValue) {
		hburEnd=seValue;
		$.ajax({
			"url": "/ajax/dataDict/qaHotKey",
			"type": "get",
@@ -114,19 +127,21 @@ $(function() {
			},
			"success": function(data) {
				console.log(data);
				if(data.success && data.data != "") {
					var itemlist = '';
					$("#keydropList").html("");
					for(var i = 0; i < 5; i++) {
						var itemlist = '<li><p class="h2Font"></p></li>';
						$itemlist = $(itemlist);
						$("#keydropList").append($itemlist);
						$itemlist.find(".h2Font").text(data.data[i].caption);
				if(data.success) {
					if(hburEnd == seValue){
						var itemlist = '';
						$("#keydropList").html("");
						for(var i = 0; i < Math.min(data.data.length,5); i++) {
							var itemlist = '<li><p class="h2Font"></p></li>';
							$itemlist = $(itemlist);
							$("#keydropList").append($itemlist);
							$itemlist.find(".h2Font").text(data.data[i].caption);
						}
						$(".keydrop").removeClass("displayNone");
					}
					$(".keydrop").removeClass("displayNone");
				} else {
					$(".keydrop").addClass("displayNone");
					$(".keydrop ul").html("");
					//$(".keydrop").addClass("displayNone");
					//$(".keydrop ul").html("");
				}
			},
			"error": function() {
@@ -145,18 +160,38 @@ $(function() {
	})
	$("#checkZj,#checkZy").on("blur", function() {
		$(this).prev().find("span").text("");
		//$(this).val("");
		//$(this).parents(".otherBlock").find(".form-drop").addClass("displayNone");
	})
	$("#checkZj").on("keyup", function() {
		var _this = this;
		checkZj(_this);
		var ti=$(this).val();
		pr=ti;
		if($(this).val()=="") {
			return;
		}
		setTimeout(function(){
				if( ti===pr && ti!== prEnd) {
					checkZj(_this,ti);
				}
				
			},500)
		
	})
	$("#checkZy").on("keyup", function() {
		var ti=$(this).val();
		re=ti;
		if($(this).val()=="") {
			return;
		}
		var _this = this;
		checkZy(_this);
		setTimeout(function(){
				if( ti===re && ti!== reEnd) {
					checkZy(_this,ti);
				}
				
			},500)
		
	})
	$("#expertlist").on("click", "li", function() {
@@ -201,7 +236,8 @@ $(function() {
		$(this).parent().remove();
	})
	function checkZj(_this) {
	function checkZj(_this,prd) {
		prEnd=prd;
		$.ajax({
			"url": "/ajax/professor/qaByName",
			"type": "get",
@@ -213,26 +249,28 @@ $(function() {
				console.log(data);
				if(data.success) {
					if(data.data != "") {
						$(_this).next().removeClass("displayNone");
						var itemlist = '';
						$("#expertlist").html("");
						for(var i = 0; i < data.data.length; i++) {
							var itemlist = '<li id="usid" class="flexCenter">';
							itemlist += '<div class="madiaHead useHead" id="userimg"></div>';
							itemlist += '<div class="madiaInfo">';
							itemlist += '<p class="ellipsisSty"><span class="h1Font" id="name"></span><span class="h2Font" style="margin-left:10px;" id="title"></span></p>';
							itemlist += '<p class="h2Font ellipsisSty" id="orgName"></p>';
							itemlist += '</div><div class="deleteThis"></div></li>';
							$itemlist = $(itemlist);
							$("#expertlist").append($itemlist);
							var datalist = data.data[i];
							$itemlist.attr("data-id", datalist.id);
							$itemlist.find("#name").text(datalist.name);
							$itemlist.find("#title").text(datalist.title);
							$itemlist.find("#orgName").text(datalist.orgName);
							if(datalist.hasHeadImage == 1) {
								$itemlist.find("#userimg").attr("style", "background-image: url(/images/head/" + datalist.id + "_l.jpg);");
							}
							if(prEnd == prd){
								$(_this).next().removeClass("displayNone");
								var itemlist = '';
								$("#expertlist").html("");
								for(var i = 0; i < data.data.length; i++) {
									var itemlist = '<li id="usid" class="flexCenter">';
									itemlist += '<div class="madiaHead useHead" id="userimg"></div>';
									itemlist += '<div class="madiaInfo">';
									itemlist += '<p class="ellipsisSty"><span class="h1Font" id="name"></span><span class="h2Font" style="margin-left:10px;" id="title"></span></p>';
									itemlist += '<p class="h2Font ellipsisSty" id="orgName"></p>';
									itemlist += '</div><div class="deleteThis"></div></li>';
									$itemlist = $(itemlist);
									$("#expertlist").append($itemlist);
									var datalist = data.data[i];
									$itemlist.attr("data-id", datalist.id);
									$itemlist.find("#name").text(datalist.name);
									$itemlist.find("#title").text(datalist.title);
									$itemlist.find("#orgName").text(datalist.orgName);
									if(datalist.hasHeadImage == 1) {
										$itemlist.find("#userimg").attr("style", "background-image: url(/images/head/" + datalist.id + "_l.jpg);");
									}
							}		
						}
					} else {
						$(_this).next().addClass("displayNone");
@@ -247,7 +285,8 @@ $(function() {
		});
	}
	function checkZy(_this) {
	function checkZy(_this,prd) {
		reEnd=prd;
		$.ajax({
			"url": "/ajax/resource/qaByName",
			"type": "get",
@@ -259,30 +298,32 @@ $(function() {
				console.log(data);
				if(data.success) {
					if(data.data != "") {
						$(_this).next().removeClass("displayNone");
						var itemlist = '';
						$("#resouselist").html("");
						for(var i = 0; i < data.data.length; i++) {
							var itemlist = '<li id="usid" class="flexCenter">';
							itemlist += '<div class="madiaHead resouseHead" id="userimg"></div>';
							itemlist += '<div class="madiaInfo">';
							itemlist += '<p class="h1Font ellipsisSty" id="resourceName"></p>';
							itemlist += '<p class="h2Font ellipsisSty" id="name"></p>';
							itemlist += '</div><div class="deleteThis"></div></li>';
							$itemlist = $(itemlist);
							$("#resouselist").append($itemlist);
							var datalist = data.data[i];
							$itemlist.attr("data-id", datalist.resourceId);
							$itemlist.find("#resourceName").text(datalist.resourceName);
							if(datalist.resourceType==1){
								$itemlist.find("#name").text(datalist.professor.name);
							}else{
								$itemlist.find("#name").text(datalist.organization.name);
							}
							if(datalist.images.length > 0) {
								$itemlist.find("#userimg").attr("style", "background-image: url(/data/resource/" + datalist.images[0].imageSrc + ");");
							}
						}
						if(reEnd==prd) {
								$(_this).next().removeClass("displayNone");
								var itemlist = '';
								$("#resouselist").html("");
								for(var i = 0; i < data.data.length; i++) {
									var itemlist = '<li id="usid" class="flexCenter">';
									itemlist += '<div class="madiaHead resouseHead" id="userimg"></div>';
									itemlist += '<div class="madiaInfo">';
									itemlist += '<p class="h1Font ellipsisSty" id="resourceName"></p>';
									itemlist += '<p class="h2Font ellipsisSty" id="name"></p>';
									itemlist += '</div><div class="deleteThis"></div></li>';
									$itemlist = $(itemlist);
									$("#resouselist").append($itemlist);
									var datalist = data.data[i];
									$itemlist.attr("data-id", datalist.resourceId);
									$itemlist.find("#resourceName").text(datalist.resourceName);
									if(datalist.resourceType==1){
										$itemlist.find("#name").text(datalist.professor.name);
									}else{
										$itemlist.find("#name").text(datalist.organization.name);
									}
									if(datalist.images.length > 0) {
										$itemlist.find("#userimg").attr("style", "background-image: url(/data/resource/" + datalist.images[0].imageSrc + ");");
									}
								}
							}	
					} else {
						$(_this).next().addClass("displayNone");
					}
@@ -391,6 +432,7 @@ $(function() {
		$data.articleContent = ue.getContent();
		$data.professors = experarray;
		$data.resources = resourcesarray;
		$data.colNum=1;
		if($("#hidearticleId").val().length != 0) {
			$data.articleId = $("#hidearticleId").val();
		}

js/articalModify.js

@@ -7,7 +7,9 @@ $(function() {
    var $data = {};
    var modifyTimeval;
    var settime = false;
	
	var hbur,hburEnd;
  	var pr,prEnd;
  	var re,reEnd;
	articleshow();
	relevantExperts();
	relevantResources();
@@ -36,17 +38,25 @@ $(function() {
			$("#keyPrompt").text("");
		},
		keyup: function() {
			var ti=$(this).val();
			hbur=ti;
			if($(this).val()==""){
				$(".frmadd").addClass("displayNone");
				$(".keydrop ul").html("");
				$(".keydrop").addClass("displayNone");
				return;
			}else{
				$(".frmadd").removeClass("displayNone");
			}
			if($(this).val().length > 15) {
				$(this).val($(this).val().substr(0, 15));
			}
			KeyWordList();
			setTimeout(function(){
				if( ti===hbur && ti!== hburEnd) {
					KeyWordList(ti);
				}
				
			},500)
		}
	})
@@ -109,8 +119,8 @@ $(function() {
			$("#keyWordlist").append("<li class='delkeylist'><p class='h2Font'>" + keyWord + "</p><div class='closeThis'></div></li>");
		}
	}
	
	function KeyWordList() {
	function KeyWordList(seValue) {
		hburEnd=seValue;
		$.ajax({
			"url": "/ajax/dataDict/qaHotKey",
			"type": "get",
@@ -119,19 +129,21 @@ $(function() {
			},
			"success": function(data) {
				console.log(data);
				if(data.success && data.data != "") {
					var itemlist = '';
					$("#keydropList").html("");
					for(var i = 0; i < 5; i++) {
						var itemlist = '<li><p class="h2Font"></p></li>';
						$itemlist = $(itemlist);
						$("#keydropList").append($itemlist);
						$itemlist.find(".h2Font").text(data.data[i].caption);
				if(data.success) {
					if(hburEnd == seValue){
						var itemlist = '';
						$("#keydropList").html("");
						for(var i = 0; i < Math.min(data.data.length,5); i++) {
							var itemlist = '<li><p class="h2Font"></p></li>';
							$itemlist = $(itemlist);
							$("#keydropList").append($itemlist);
							$itemlist.find(".h2Font").text(data.data[i].caption);
						}
						$(".keydrop").removeClass("displayNone");
					}
					$(".keydrop").removeClass("displayNone");
				} else {
					$(".keydrop").addClass("displayNone");
					$(".keydrop ul").html("");
					//$(".keydrop").addClass("displayNone");
					//$(".keydrop ul").html("");
				}
			},
			"error": function() {
@@ -174,12 +186,32 @@ $(function() {
	
	$("#checkZj").on("keyup", function() {
		var _this = this;
		checkZj(_this);
		var ti=$(this).val();
		pr=ti;
		if($(this).val()=="") {
			return;
		}
		setTimeout(function(){
				if( ti===pr && ti!== prEnd) {
					checkZj(_this,ti);
				}
				
			},500)
	})
	$("#checkZy").on("keyup", function() {
		var ti=$(this).val();
		re=ti;
		if($(this).val()=="") {
			return;
		}
		var _this = this;
		checkZy(_this);
		setTimeout(function(){
				if( ti===re && ti!== reEnd) {
					checkZy(_this,ti);
				}
				
			},500)
	})
	
	$("#expertlist").on("click","li",function(){
@@ -224,43 +256,46 @@ $(function() {
		$(this).parent().remove();
	})
	
	function checkZj(_this){
	function checkZj(_this,prd) {
		prEnd=prd;
		$.ajax({
			"url": "/ajax/professor/qaByName",
			"type": "get",
			"data": {
				"name": $("#checkZj").val(),
				"total":3
				"total": 3
			},
			"success": function(data) {
				console.log(data);
				if(data.success ) {
					if(data.data != ""){
						$(_this).next().removeClass("displayNone");
						var itemlist = '';
						$("#expertlist").html("");
						for(var i = 0; i < data.data.length; i++) {
							var itemlist = '<li id="usid" class="flexCenter">';
							itemlist += '<div class="madiaHead useHead" id="userimg"></div>';
							itemlist += '<div class="madiaInfo">';
							itemlist += '<p class="ellipsisSty"><span class="h1Font" id="name"></span><span class="h2Font" style="margin-left:10px;" id="title"></span></p>';
							itemlist += '<p class="h2Font ellipsisSty" id="orgName"></p>';
							itemlist += '</div><div class="deleteThis"></div></li>';
							$itemlist = $(itemlist);
							$("#expertlist").append($itemlist);
							var datalist = data.data[i];
							$itemlist.attr("data-id",datalist.id);
							$itemlist.find("#name").text(datalist.name);
							$itemlist.find("#title").text(datalist.title);
							$itemlist.find("#orgName").text(datalist.orgName);
							if(datalist.hasHeadImage==1) {
								$itemlist.find("#userimg").attr("style", "background-image: url(/images/head/" + datalist.id + "_l.jpg);");
							}
				if(data.success) {
					if(data.data != "") {
							if(prEnd == prd){
								$(_this).next().removeClass("displayNone");
								var itemlist = '';
								$("#expertlist").html("");
								for(var i = 0; i < data.data.length; i++) {
									var itemlist = '<li id="usid" class="flexCenter">';
									itemlist += '<div class="madiaHead useHead" id="userimg"></div>';
									itemlist += '<div class="madiaInfo">';
									itemlist += '<p class="ellipsisSty"><span class="h1Font" id="name"></span><span class="h2Font" style="margin-left:10px;" id="title"></span></p>';
									itemlist += '<p class="h2Font ellipsisSty" id="orgName"></p>';
									itemlist += '</div><div class="deleteThis"></div></li>';
									$itemlist = $(itemlist);
									$("#expertlist").append($itemlist);
									var datalist = data.data[i];
									$itemlist.attr("data-id", datalist.id);
									$itemlist.find("#name").text(datalist.name);
									$itemlist.find("#title").text(datalist.title);
									$itemlist.find("#orgName").text(datalist.orgName);
									if(datalist.hasHeadImage == 1) {
										$itemlist.find("#userimg").attr("style", "background-image: url(/images/head/" + datalist.id + "_l.jpg);");
									}
							}		
						}
					}else{
					} else {
						$(_this).next().addClass("displayNone");
					}
				}else{
				} else {
					$(_this).next().addClass("displayNone");
				}
			},
@@ -269,8 +304,9 @@ $(function() {
			}
		});
	}
	
		function checkZy(_this) {
	function checkZy(_this,prd) {
		reEnd=prd;
		$.ajax({
			"url": "/ajax/resource/qaByName",
			"type": "get",
@@ -282,30 +318,32 @@ $(function() {
				console.log(data);
				if(data.success) {
					if(data.data != "") {
						$(_this).next().removeClass("displayNone");
						var itemlist = '';
						$("#resouselist").html("");
						for(var i = 0; i < data.data.length; i++) {
							var itemlist = '<li id="usid" class="flexCenter">';
							itemlist += '<div class="madiaHead resouseHead" id="userimg"></div>';
							itemlist += '<div class="madiaInfo">';
							itemlist += '<p class="h1Font ellipsisSty" id="resourceName"></p>';
							itemlist += '<p class="h2Font ellipsisSty" id="name"></p>';
							itemlist += '</div><div class="deleteThis"></div></li>';
							$itemlist = $(itemlist);
							$("#resouselist").append($itemlist);
							var datalist = data.data[i];
							$itemlist.attr("data-id", datalist.resourceId);
							$itemlist.find("#resourceName").text(datalist.resourceName);
							if(datalist.resourceType==1){
								$itemlist.find("#name").text(datalist.professor.name);
							}else{
								$itemlist.find("#name").text(datalist.organization.name);
							}
							if(datalist.images.length > 0) {
								$itemlist.find("#userimg").attr("style", "background-image: url(/data/resource/" + datalist.images[0].imageSrc + ");");
							}
						}
						if(reEnd==prd) {
								$(_this).next().removeClass("displayNone");
								var itemlist = '';
								$("#resouselist").html("");
								for(var i = 0; i < data.data.length; i++) {
									var itemlist = '<li id="usid" class="flexCenter">';
									itemlist += '<div class="madiaHead resouseHead" id="userimg"></div>';
									itemlist += '<div class="madiaInfo">';
									itemlist += '<p class="h1Font ellipsisSty" id="resourceName"></p>';
									itemlist += '<p class="h2Font ellipsisSty" id="name"></p>';
									itemlist += '</div><div class="deleteThis"></div></li>';
									$itemlist = $(itemlist);
									$("#resouselist").append($itemlist);
									var datalist = data.data[i];
									$itemlist.attr("data-id", datalist.resourceId);
									$itemlist.find("#resourceName").text(datalist.resourceName);
									if(datalist.resourceType==1){
										$itemlist.find("#name").text(datalist.professor.name);
									}else{
										$itemlist.find("#name").text(datalist.organization.name);
									}
									if(datalist.images.length > 0) {
										$itemlist.find("#userimg").attr("style", "background-image: url(/data/resource/" + datalist.images[0].imageSrc + ");");
									}
								}
							}	
					} else {
						$(_this).next().addClass("displayNone");
					}
@@ -564,6 +602,7 @@ $(function() {
		$data.articleContent = ue.getContent();
		$data.professors = experarray;
		$data.resources = resourcesarray;
		$data.colNum=1;
		if(settime) {
			$data.publishTime = publishTime;
		}

js/articalPreview.js

@@ -16,7 +16,11 @@ $(function() {
				if (data.success){
					$("#articleTitle").text(data.data.articleTitle);
					$("#articleContent").html(data.data.articleContent);
					$("#articleImg").attr("style", "background-image: url(/data/article/" + data.data.articleImg + ");");
					if(data.data.articleImg){
						$("#articleImg").attr("style", "background-image: url(/data/article/" + data.data.articleImg + ")");
					}else{
						$("#articleImg").attr("style", "background-image: url(../images/default-artical.jpg)");
					}
					$("#tagList").text(industryShow(data.data.subject));
					if(data.data.articleType==1){
						$("#expert").removeClass("displayNone");

js/articalShow.js

@@ -44,10 +44,10 @@ $(function() {
								}
								
							}
							var str='<li>'+
								'<a href="articalShow.html?articleId='+$data[i].articleId+'"><p class="h2Font ellipsisSty-2"><em class="circlePre"></em>'+$data[i].articleTitle+'</p>'+
							var listLi=$('<li class="flexCenter"></li>').appendTo($(".recentlyList"));
							var str='<a href="articalShow.html?articleId='+$data[i].articleId+'"><p class="h2Font ellipsisSty-2"><em class="circlePre"></em>'+$data[i].articleTitle+'</p>'+
								'<span class="smalltip">'+commenTime($data[i].publishTime)+'</span></a></li>'
							$(".recentlyList").append(str);	
							$(str).appendTo(listLi);
						}
					}
				}
@@ -73,7 +73,11 @@ $(function() {
					$("#pageViews").text("阅读量 "+data.data.pageViews);
					$("#publishTime").text(commenTime(data.data.publishTime));
					$("#articleContent").html(data.data.articleContent);
					$("#articleImg").attr("style", "background-image: url(/data/article/" + data.data.articleImg + ");");
					if(data.data.articleImg){
						$("#articleImg").attr("style", "background-image: url(/data/article/" + data.data.articleImg + ")");
					}else{
						$("#articleImg").attr("style", "background-image: url(../images/default-artical.jpg)");
					}
					$("#tagList").text(industryShow(data.data.subject));
					if (userid && userid != "null" && userid != null) {
						isAgree(data.data.articleAgree)//文章点赞
@@ -101,9 +105,18 @@ $(function() {
				}
				
				var articletitle = data.data.articleTitle + "-科袖网";
				document.title = articletitle;
				window.setTimeout(function() {
					document.title = articletitle;
				}, 500);
					$('body').scrollTop(4);
					var oShareW = $('.share-nav').outerWidth(true);
					$('.shareBlock').scrollFix( {
				        startTop:'body',
				        bottom: '0',
				        endPos : '.share-bottom',
						width: oShareW ,
				        zIndex : 997
				    });	
				}, 300);
			},
			"error":function(){
				$.MsgBox.Alert('提示','链接服务器超时')
@@ -477,7 +490,7 @@ $(function() {
							itemlist += '<div class="madiaHead artHead" id="userimg"></div>';
							itemlist += '<div class="madiaInfo">';
							itemlist += '<p class="h1Font ellipsisSty" id="resourceName"></p>';
							itemlist += '<p><span class="h2Font username2"></span><em class="authiconNew" id="relatedLabels" title="科袖认证专家"></em></p>';
							itemlist += '<p><span class="h2Font username2" style="margin-right:10px"></span><span class="time"></span></p>';
							itemlist += '</div></a></li>';
							$itemlist = $(itemlist);
							$("#abutartical").append($itemlist);
@@ -487,6 +500,7 @@ $(function() {
							if(datalist.articleImg!=undefined){
								$itemlist.find("#userimg").attr("style", "background-image: url(/data/article/" + datalist.articleImg + ");");
							}
							$itemlist.find(".time").text(commenTime(datalist.publishTime))
							if(datalist.articleType==1){
								$.ajax({
									"url" : "/ajax/professor/baseInfo/"+datalist.professorId,
@@ -496,9 +510,7 @@ $(function() {
									"success" : function($data) {
										if ($data.success && $data.data){
											$itemlist.find(".username2").text($data.data.name);
											var userType = autho($data.data.authType, $data.data.orgAuth, $data.data.authStatus);
											$itemlist.find("#relatedLabels").attr("title", userType.title);
											$itemlist.find("#relatedLabels").addClass(userType.sty);
											
										}
									},
									"error":function(){
@@ -520,9 +532,6 @@ $(function() {
											}else{
												$itemlist.find(".username2").text($data.data.name);
											}
											if($data.data.authStatus==3){
												$itemlist.find("#relatedLabels").addClass("authicon-com-ok").attr("title", "认证企业");
											}
										}
									},
									"error":function(){

js/cmpInforShow.js

@@ -238,7 +238,7 @@ $(function() {
							}
						}
						if(isbind == true) {
							$(".resoucePageCode").createPage({
							$(".resoucePageCode").off("click").createPage({
								pageCount: Math.ceil(data.data.total / 10),
								current: data.data.pageNo,
								backFn: function(p) {
@@ -312,7 +312,7 @@ $(function() {
						}
						if(isbind == true) {
							$(".expertPageCode").createPage({
							$(".expertPageCode").off("click").createPage({
								pageCount: Math.ceil(data.data.total / 10),
								current: data.data.pageNo,
								backFn: function(p) {
@@ -535,7 +535,7 @@ $(function() {
				if (data.success && data.data!=""){
					$("#relateCmp").parents(".conBlock").removeClass("displayNone");
					var itemlist = '<li class="flexCenter"><a traget="_blank" href="" class="urlgo">';
						itemlist += '<div class="madiaHead cmpHead" style="width:50px;height:36px;margin-top:-18px;"><div class="boxBlock" style="width: 48px;height: 34px;">';
						itemlist += '<div class="madiaHead cmpHead" style="width:50px;height:36px;margin-top:-18px;"><div class="boxBlock" style="width: 50px;height: 36px;">';
						itemlist += '<img class="boxBlockimg" id="userimg" src="" /></div></div>';
						itemlist += '<div class="madiaInfo">';
						itemlist += '<p class="clearfix"><span class="h1Font ellipsisSty floatL" style="display:block;max-width:136px" id="userName"></span><em class="authiconNew floatL" title=""></em></p>';

js/common.js

@@ -706,6 +706,45 @@ var eduDegree = {
	"4": "大专",
	"5": "其他"
}
//栏目
var columnType = {
	"1":{
		fullName:"个人原创",
		shortName:"原创"
	},
	"2":{
		fullName:"企业原创",
		shortName:"原创"
	},
	"3":{
		fullName:"前沿动态",
		shortName:"前沿"
	},
	"4":{
		fullName:"学术经验",
		shortName:"经验"
	},
	"5":{
		fullName:"分析检测",
		shortName:"检测"
	},
	"6":{
		fullName:"会议培训",
		shortName:"会议"
	},
	"7":{
		fullName:"科袖访谈",
		shortName:"访谈"
	},
	"8":{
		fullName:"招聘招生",
		shortName:"招聘"
	},
	"9":{
		fullName:"重大新闻",
		shortName:"新闻"
	}	
}
//反馈意见成功
function backSuccessed(){
	$(".correctCon").val("");
@@ -758,11 +797,18 @@ function hotKey(sel, num) {
			$(this).siblings(".keydrop").show();
		},
		keyup: function(e) {
			 var ti=$(this).val();
			 var $t=this;
			 $t.comr=ti;
			 var $this=$(this);
			if($(this).val().trim()) {
				$(this).siblings("button").show();
				var lNum = $.trim($(this).val()).length;
				if(0 < lNum) {
					var $this = $(this)
					setTimeout(function(){
						if( ti===$t.comr && ti!== $t.comrEnd) {
							var tt=ti;
							$t.comrEnd=tt;
					$("#addKeyword").show();
					$.ajax({
						"url": "/ajax/dataDict/qaHotKey",
@@ -770,30 +816,34 @@ function hotKey(sel, num) {
						"success": function(data) {
							console.log(data);
							if(data.success) {
								if(data.data.length == 0) {
									$this.siblings(".keydrop").addClass("displayNone");
									$this.siblings(".keydrop").find("ul").html("");
								} else {
									$this.siblings(".keydrop").removeClass("displayNone");
									var oSr = "";
									for(var i = 0; i < 5; i++) {
										oSr += '<li>' + data.data[i].caption + '<div class="closeThis"></div></li>';
								if($t.comrEnd==tt) {
									if(data.data.length == 0) {
										$this.siblings(".keydrop").addClass("displayNone");
										$this.siblings(".keydrop").find("ul").html("");
									} else {
										$this.siblings(".keydrop").removeClass("displayNone");
										var oSr = "";
										for(var i = 0; i < Math.min(data.data.length,5); i++) {
											oSr += '<li>' + data.data[i].caption + '<div class="closeThis"></div></li>';
										}
										$this.siblings(".keydrop").find("ul").html(oSr);
									}
									$this.siblings(".keydrop").find("ul").html(oSr);
								}
								}	
							} else {
								$this.siblings(".keydrop").addClass("displayNone");
								$this.siblings(".keydrop").find("ul").html("");
							}
						},
						"data": {
							"key": $(this).val()
							"key": $this.val()
						},
						dataType: "json",
						'error': function() {
							$.MsgBox.Alert('提示', '服务器连接超时！');
						}
					});
					}
					},500);
				}
			} else {
				$(this).siblings("button").hide();
@@ -1015,3 +1065,43 @@ var r64 = ["0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "A", "B", "C", "D",
			return out;
		}
//发现上方轮播
var bannerRotate = {// banner rotating
	_time: 3000,
	_i: 0,
	_interval: null,
	_navId: "#slide-tab",
	_navBox: "#slide-list",
	bannerShow: function() {
		$(this._navId).find("li").removeClass("slide-tab-item-active");
		$(this._navId).find("li:eq("+this._i+")").addClass("slide-tab-item-active");
		
		$(this._navBox).find("li").removeClass("slide-item-active");
		$(this._navBox).find("li:eq("+this._i+")").addClass("slide-item-active");
	},
	bannerStart:function() {
		var _this = this;
		_this._interval = setInterval(function() {
			if(_this._i >= 4) {
				_this._i = 0;
			}
			else {
				_this._i++;
			}
			_this.bannerShow();
		}, _this._time);
	},
	bannerInit: function() {
		var _this = this;
		_this.bannerStart();
		
		$(_this._navId).find("li").bind("mouseover", function() {
			clearInterval(_this._interval);
			_this._i = $(this).index();
			_this.bannerShow();
			_this.bannerStart();
		});
	}
};

js/discover.js

@@ -3,126 +3,286 @@ $(function() {
	$(".headnav li").eq(1).addClass("navcurrent");
	loginStatus();//判断个人是否登录
	var userid = $.cookie("userid");
	discover(10, 1,true);
	/*发现列表显示*/
	function discover(pageSize, pageNo,isbind) {
	importNews();
	hotNews();
	var linkNum=0;//栏目类别导航
	if(linkNum==0){
		listShow(1,0,true);
	}
	$(document).bind("click",function(e){ 
		var target = $(e.target); 
		if(target.closest(".table-tab-item").length == 0){ 
			$(".table-drop").hide(); 
			$(".rightbtn").find("em").removeClass("unfoldtr").addClass("foldtr");
		} 
	})
	$(".table-tab-item").on("mouseenter","li.rightbtn",function(){
		$(this).find(".table-drop").show();
		$(this).find("em").removeClass("foldtr").addClass("unfoldtr");
	}).on("mouseleave","li.rightbtn",function(){
		$(this).find("em").removeClass("unfoldtr").addClass("foldtr");
		$(this).find(".table-drop").hide();
	})
	
	$(".table-drop").on("click","li",function(){
		$(".rightbtn").find("span").html($(this).text());
	})
	$(".table-tab-item").on("click","li",function(){
		if($(this).is('.table-tab-slide')){
			linkNum = $(this).index(".table-tab-slide");
			$(".table-tab-slide").removeClass("table-tab-slide-active");
			$(this).addClass("table-tab-slide-active");
			$(".table-drop").fadeOut(1000);
			$(".rightbtn").find("em").removeClass("unfoldtr").addClass("foldtr");
			$(".table-item-list").eq(linkNum).show().siblings().hide();
			if($(".rightbtn").find("li").is(".table-tab-slide-active")){
				$(".rightbtn").addClass("table-tab-slide-active");
			}else{
				$(".rightbtn").removeClass("table-tab-slide-active");
			}
			if(linkNum==0){
				listShow(1,0,true);
			}else{
				var thisNum=linkNum+2;
				listShow(1,thisNum,true);
			}
		}else{
			$(this).find(".table-drop").show();
		}
	})
	
	//轮播加载页面
	$.ajax({
		"url":"/data/inc/col_banner.html",
		"dataType":"html",
		"success":function(result){
			$(".slide-box").html(result);
			bannerRotate.bannerInit();// 轮播
		}
	
	})
	//重大新闻
	function importNews() {
		$.ajax({
			"url": "/ajax/article/findHot",
			"type": "get",
			"async": true,
			"data": {
				"pageSize": pageSize,
				"pageNo": pageNo
			"url" :"/ajax/article/find",
			"type" :  "GET" ,
			"dataType" : "json",
			"data" :{
				"col":9,//重大新闻
				"pageSize":5,
				"pageNo":1
			},
			"success" : function(data) {
				if (data.success){
					console.log(data)
					var $data=data.data.data;
					if($data.length>0){
						$("#importNews").parents(".conItem").removeClass("displayNone");
						var oLeng=$data.length<5?$data.length:5;
						for(var i=0;i<oLeng;i++) {
							var listLi=$('<li class="flexCenter"></li>').appendTo($("#importNews"));
							var str='<a href="articalShow.html?articleId='+$data[i].articleId+'"><p class="h2Font ellipsisSty-2"><em class="circlePre"></em>'+$data[i].articleTitle+'</p>'+
								'<span class="smalltip">'+commenTime($data[i].publishTime)+'</span></a></li>'
							$(str).appendTo(listLi);
						}
					}
				}
			},
			"error":function(){
				$.MsgBox.Alert('提示','链接服务器超时')
			}
		});
	}
	//热门文章
	function hotNews(){
		$.ajax({
			"url" :"/ajax/article/lastestPublished",
			"type" :  "GET" ,
			"dataType" : "json",
			"success" : function(data) {
				if (data.success){
					console.log(data)
					var $data=data.data;
					if($data.length>0){
						$("#hotNews").parents(".conItem").removeClass("displayNone");
						var oLeng=$data.length<10?$data.length:10;
						for(var i=0;i<oLeng;i++) {
							var listLi=$('<li class="flexCenter"></li>').appendTo($("#hotNews"));
							var str='<a href="articalShow.html?articleId='+$data[i].articleId+'"><p class="h2Font ellipsisSty-2">'+$data[i].articleTitle+'</p></a>'
							$(str).appendTo(listLi);		
						}
					}
				}
			},
			"error":function(){
				$.MsgBox.Alert('提示','链接服务器超时')
			}
		});
	}
	//栏目列表
	function listShow(pageNo,colNum,isbind){
		$.ajax({
			"url" :"/ajax/article/find",
			"type" :  "GET" ,
			"dataType" : "json",
			"data" :{
				"col":colNum,
				"pageSize":10,
				"pageNo":pageNo
			},
			"beforeSend": function() {
				$("#table-item").append('<img src="../images/loading.gif" class="loading"  style="position: absolute;left: 50%; top: 50%;" />');
			},
			"success": function(data) {
				 
				if(data.success && data.data != null) {
					var itemlist = '';
					$("#table-item").html("");
					for(var i = 0; i < data.data.data.length; i++) {
						var itemlist = '<li><div class="table-item-media">';
						itemlist += '<a href="" target="_blank" class="table-item-logo" id="userimg"></a>';
						itemlist += '<div class="table-item-name clearfix">';
						itemlist += '<a href="" target="_blank" id="userUrl"><span class="nameSpan" id="nameSpan"></span></a><em class="authiconNew " title=""></em>';
						itemlist += '<p><span class="timeLabel" id="time"></span></p></div></div>';
						itemlist += '<div class="table-item-cell"><a href="" target="_blank" id="newsurl">';
						itemlist += '<div class="table-item-img" id="newsimg"></div>';
						itemlist += '<div class="table-item-body">';
						itemlist += '<p class="ellipsisSty" id="centent"></p>';
						itemlist += '<p><em class="cmpLable" id="newstype"></em></p>';
						itemlist += '</div></a></div></li>';
						$itemlist = $(itemlist);
						$("#table-item").append($itemlist);
						var datalist = data.data.data[i];
						var type = datalist.type;
						$itemlist.find("#centent").text(datalist.name);
						$itemlist.find("#time").text(commenTime(datalist.createTime));
						if(type == 1) { //专家文章
							$itemlist.find("#newstype").text("文章");
							$itemlist.find("#newstype").addClass("articalLabel");
							$itemlist.find("#newsimg").addClass("artical-default");
							$itemlist.find("#userimg").addClass("userhead");
							$itemlist.find("#newsurl").attr("href", "articalShow.html?articleId=" + datalist.id );
							if(datalist.image) {
								$itemlist.find("#newsimg").attr("style", "background-image: url(/data/article/" + datalist.image + ");");
							}
							userFun(datalist.owner, $itemlist);
						} else if(type == 2) { //企业文章
							$itemlist.find("#newstype").text("文章");
							$itemlist.find("#newstype").addClass("articalLabel");
							$itemlist.find("#newsimg").addClass("artical-default");
							$itemlist.find("#userimg").addClass("cmplogohead");
							$itemlist.find("#newsurl").attr("href", "articalShow.html?oFlag=1&articleId=" + datalist.id );
							if(datalist.image) {
								$itemlist.find("#newsimg").attr("style", "background-image: url(/data/article/" + datalist.image + ");");
							}
							cmpFun(datalist.owner, $itemlist)
						} else if(type == 3) { //专家资源
							$itemlist.find("#newstype").text("资源");
							$itemlist.find("#newstype").addClass("resourceLabel");
							$itemlist.find("#newsimg").addClass("resource-default");
							$itemlist.find("#userimg").addClass("userhead");
							$itemlist.find("#newsurl").attr("href", "resourceShow.html?resourceId=" + datalist.id);
							if(datalist.image) {
								$itemlist.find("#newsimg").attr("style", "background-image: url(/data/resource/" + datalist.image + ");");
							}
							userFun(datalist.owner, $itemlist);
						} else if(type == 4) { //企业资源
							$itemlist.find("#newstype").text("资源");
							$itemlist.find("#newstype").addClass("resourceLabel");
							$itemlist.find("#newsimg").addClass("resource-default");
							$itemlist.find("#userimg").addClass("cmplogohead");
							$itemlist.find("#newsurl").attr("href", "resourceShow.html?resourceId=" + datalist.id);
							if(datalist.image) {
								$itemlist.find("#newsimg").attr("style", "background-image: url(/data/resource/" + datalist.image + ");");
			"success" : function(data) {
				if (data.success){
					console.log(data)
					var idItem=0;
					if(colNum>0){
						idItem=colNum-2;
					}
					console.log(idItem)
					$("#table-item-"+idItem).html("");
					var strNo='<div class="nodatabox"><div class="nodata"><div class="picbox picNull"></div>'
						strNo+='<div class="txtbox"><p class="noContip">该栏目暂时没有任何动态</p></div></div></div>/div>'
					var dataStr=data.data.data;
					if(dataStr.length>0){
						for(var i=0;i<dataStr.length;i++) {
							if(colNum>0){
								var listLi=$('<li class="flexCenter"></li>').appendTo($("#table-item-"+idItem));
								otherColum(dataStr[i],listLi);
							}else{
								var listLi=$('<li class="flexCenter"></li>').appendTo($("#table-item-0"));
								lastestColum(dataStr[i],listLi);
							}
							cmpFun(datalist.owner, $itemlist)
						}
					}else{
						$("#table-item-"+idItem).html(strNo);
						$("#table-item-"+idItem).parent().find(".tcdPageCode").hide();
					}
					//分页
					if(isbind==true){
						$(".tcdPageCode").createPage({
						$("#table-item-"+idItem).parent().find(".tcdPageCode").off("click").createPage({
							pageCount: Math.ceil(data.data.total / 10),
							current: data.data.pageNo,
							backFn: function(p) {
								$("#table-item").html("");
								discover(10, p,false);
								$("#table-item-"+idItem).html("");
								listShow(p,colNum,false);
								document.body.scrollTop = document.documentElement.scrollTop = 0;
							}
						});
					}
					$(".loading").remove();
				}
			},
			"error":function(){
				$.MsgBox.Alert('提示','链接服务器超时')
			}
		});
	}
	function lastestColum(dataStr,listLi){
		var madiaHead="../images/default-artical.jpg";
		if(dataStr.articleImg) {
			madiaHead ='/data/article/' + dataStr.articleImg ;
		}
		var sowU="";
		if(dataStr.pageViews!=0){
			if(dataStr.articleAgree!=0){
				sowU='<span>阅读量 '+dataStr.pageViews+'</span><span>赞 '+dataStr.articleAgree+'</span>'
			}else{
				sowU='<span>阅读量 '+dataStr.pageViews+'</span>'
			}
		}
		var columTag='';
		if(dataStr.colNum>0){
			columTag='<span class="columTag">'+columnType[dataStr.colNum].shortName+'</span>';
		}
		var strAdd = '';
		strAdd += '<a traget="_blank" href="articalShow.html?articleId='+ dataStr.articleId +'" class="flexCenter urlgo">';
		strAdd += '<div class="lefthead articalhead" style="background-image:url('+ madiaHead +')">'+columTag+'</div>';
		strAdd += '<div class="centercon centercon2"><p class="h1font ellipsisSty-2">'+ dataStr.articleTitle +'</p>';
		strAdd += '<div class="h2font showInfo clearfix">';
		strAdd += '<span class="ownerName"></span>';
		strAdd += '<span class="time">'+ commenTime(dataStr.publishTime) +'</span>';
		strAdd += sowU
		strAdd += '<span class="comment"></span>';
		strAdd += '</div></div>';
		strAdd += '</a>';
		
		var $strAdd = $(strAdd);
		listLi.append( $strAdd);
		commentnum(dataStr.articleId, $strAdd) //文章评论数	
		if(dataStr.articleType==1){
			userFun(dataStr.professorId, $strAdd);
		}else{
			cmpFun(dataStr.orgId, $strAdd);
		}
	}
	
	function otherColum(dataStr,listLi){
		var madiaHead="../images/default-artical.jpg";
		if(dataStr.articleImg) {
			madiaHead ='/data/article/' + dataStr.articleImg ;
		}
		var sowU="";
		if(dataStr.pageViews!=0){
			if(dataStr.articleAgree!=0){
				sowU='<span>阅读量 '+dataStr.pageViews+'</span><span>赞 '+dataStr.articleAgree+'</span>'
			}else{
				sowU='<span>阅读量 '+dataStr.pageViews+'</span>'
			}
		}
		var strAdd = '';
		strAdd += '<a traget="_blank" href="articalShow.html?articleId='+ dataStr.articleId +'" class="flexCenter urlgo">';
		strAdd += '<div class="lefthead articalhead" style="background-image:url('+ madiaHead +')"></div>';
		strAdd += '<div class="centercon centercon2"><p class="h1font ellipsisSty-2">'+ dataStr.articleTitle +'</p>';
		strAdd += '<div class="h2font showInfo clearfix">';
		strAdd += '<span class="ownerName"></span>';
		strAdd += '<span class="time">'+ commenTime(dataStr.publishTime) +'</span>';
		strAdd += sowU
		strAdd += '<span class="comment"></span>';
		strAdd += '</div></div>';
		strAdd += '</a>';
		
		var $strAdd = $(strAdd);
		listLi.append($strAdd);
		commentnum(dataStr.articleId, $strAdd) //文章评论数	
		if(dataStr.articleType==1){
			userFun(dataStr.professorId, $strAdd);
		}else{
			cmpFun(dataStr.orgId, $strAdd);
		}
	}
	//查文章留言数
	function commentnum(articleId, $itemlist) {
		$.ajax({
			"url": "/ajax/leaveWord/lwCount",
			"type": "GET",
			"dataType": "json",
			"async": false,
			"data": {
				"articleId": articleId
			},
			"success": function(data) {
				if(data.success) {
					if(data.data>0){
						$itemlist.find(".comment").text("留言 " + data.data);
					}
				}
			},
			"error": function() {
				$.MsgBox.Alert('提示', '链接服务器超时')
			}
		});
	}
	/*用户信息*/
	function userFun(id, $itemlist) {
	function userFun(id,$listItem) {
		$.ajax({
			"url": "/ajax/professor/baseInfo/" + id,
			"type": "get",
			"async": true,
			"success": function(data) {
				 
				if(data.success && data.data) {
					$itemlist.find("#nameSpan").text(data.data.name);
					if(data.data.hasHeadImage == 1) {
						$itemlist.find("#userimg").attr("style", "background-image: url(/images/head/" + data.data.id + "_m.jpg);");
					}
					$itemlist.find("#userimg").attr("href", "userInforShow.html?professorId=" + data.data.id);
					$itemlist.find("#userUrl").attr("href", "userInforShow.html?professorId=" + data.data.id);
					var userType = autho(data.data.authType, data.data.orgAuth, data.data.authStatus);
					$itemlist.find(".authiconNew").attr("title", userType.title);
					$itemlist.find(".authiconNew").addClass(userType.sty);
					$listItem.find(".ownerName").text(data.data.name);
				}
			},
			"error": function() {
@@ -130,9 +290,8 @@ $(function() {
			}
		});
	}
	/*企业用户信息*/
	function cmpFun(id, $itemlist) {
	function cmpFun(id,$listItem) {
		$.ajax({
			"url": "/ajax/org/" + id,
			"type": "get",
@@ -140,25 +299,10 @@ $(function() {
			"success": function(data) {
				if(data.success && data.data) {
					if(data.data.forShort) {
						$itemlist.find("#nameSpan").text(data.data.forShort);
						$listItem.find(".ownerName").text(data.data.forShort);
					}else{
						$itemlist.find("#nameSpan").text(data.data.name);
						$listItem.find(".ownerName").text(data.data.name);
					}
					$itemlist.find("#userimg").attr("style", "background:#fff");
					$itemlist.find("#userimg").html('<div class="boxBlock"><img class="boxBlockimg companyImg" src=""></div>');
					if(data.data.hasOrgLogo) {
						$itemlist.find(".companyImg").attr("src", "/images/org/" + data.data.id + ".jpg");
					}else{
						$itemlist.find(".companyImg").attr("src", "/images/default-icon.jpg");
					}
					$itemlist.find("#userimg").attr("href", "cmpInforShow.html?orgid=" + data.data.id);
					$itemlist.find("#userUrl").attr("href", "cmpInforShow.html?orgid=" + data.data.id);
					if(data.data.authStatus==3){
						$itemlist.find(".authiconNew").addClass("authicon-com-ok").attr("title", "认证企业");;	
					}/*else{
						$itemlist.find(".authiconNew").addClass("authicon-com-no").attr("title", "未认证企业");;
					}*/
				
				}
			},
			"error": function() {
@@ -166,7 +310,4 @@ $(function() {
			}
		});
	}
	
})

js/paperList.js

@@ -122,7 +122,7 @@ function lewordNum(pId) {
						'<div class="madiaInfo">'+					
							'<p class="h1Font ellipsisSty">'+$data[i].name+'</p>'+						
							'<ul class="h2Font clearfix">'+
								'<li><span>'+oTime+'</span></li>'+pageview+thub+lew
								'<li><span>'+oTime+'</span></li>'+pageview+thub+lew+
							'</ul>'+
						'</div>'+
				'</a>'+

js/paperModify.js

@@ -101,7 +101,7 @@ $(document).ready(function() {
											var str="";
											str +='<li class="flexCenter" data-id="'+ showPro.id +'">'
											str +='<div class="madiaHead useHead" style="background-image:url('+ imgbg +')"></div>'
											str +='<div class="madiaInfo" style="margin-top:-8px">'
											str +='<div class="madiaInfo" style="margin-top:-4px">'
											str +='<p class="ellipsisSty"><span class="h1Font">'+ showPro.name +'</span><em class="authiconNew '+ authTy +'" title="'+ authTit +'"></em></p>'
											str +='<p class="h2Font ellipsisSty">'+ baseInfo +'</p>'
											str +='</div></li>';

js/paperShow.js

@@ -165,7 +165,7 @@ $(document).ready(function() {
											var str="";
											str +='<li class="flexCenter"><a href="" class="'+ ifPoint +'" data-id="'+ showPro.id +'">'
											str +='<div class="madiaHead useHead" style="background-image:url('+ imgbg +')"></div>'
											str +='<div class="madiaInfo" style="margin-top:-8px" >'
											str +='<div class="madiaInfo" style="margin-top:-4px" >'
											str +='<p class="ellipsisSty"><span class="h1Font">'+ showPro.name +'</span><em class="authiconNew '+ authTy +'" title="'+ authTit +'"></em></p>'
											str +='<p class="h2Font ellipsisSty">'+ baseInfo +'</p>'
											str +='</div></a>';

js/patentList.js

@@ -122,7 +122,7 @@ function lewordNum(pId) {
						'<div class="madiaInfo">'+					
							'<p class="h1Font ellipsisSty">'+$data[i].name+'</p>'+						
							'<ul class="h2Font clearfix">'+
								'<li><span>'+oTime+'</span></li>'+pageview+thub+lew
								'<li><span>'+oTime+'</span></li>'+pageview+thub+lew+
							'</ul>'+
						'</div>'+
				'</a>'+

js/patentShow.js

@@ -236,7 +236,7 @@ $(document).ready(function() {
		oId = $data.id;
		var otr = '<li class="flexCenter"><a href="" data-id="' + oId + '">' +
			'<div class="madiaHead useHead" id="userimg" style="background-image:url(' + img + ')"></div>' +
			'<div class="madiaInfo" style="margin-top:-8px">' +
			'<div class="madiaInfo" style="margin-top:-4px">' +
			'<p class="ellipsisSty">' +
			'<span class="h1Font" id="name">' + $data.name + '</span><em class="authiconNew ' + oClass.sty + '" title="' + oClass.title + '"></em>' +
			'</p>' +

js/resourceIssue.js

@@ -9,6 +9,7 @@ $(document).ready(function() {
	var userid = $.cookie("userid");
	var temp = [];
	var array=[];
	var hbur,hburEnd;
	ue = UE.getEditor('editor', {});
	/*获取资源信息*/
	function getRecourceMe() {
@@ -173,11 +174,15 @@ $(document).ready(function() {
	});
	uploader.onError = function(code) {
		console.log(code)
		$.MsgBox.Alert('提示', '请上传jpg、png格式的图片，大小不超过2M')
		$.MsgBox.Alert('提示', '请上传jpg、jpeg、png格式的图片，大小不超过2M')
	};
	uploader.on('uploadSuccess', function(file, data) {
		uploader.removeFile(fileId);
		var cacheImageKey = temp.push(data.data[0].cacheKey);
		if(data.success) {
				uploader.removeFile(fileId);
				var cacheImageKey = temp.push(data.data[0].cacheKey);
		}else{
			$.MsgBox.Alert('提示', '只支持jpeg/jpg/png格式的图片');
		}
	});
	/*删除图片*/
	$("#fileList").on("click", ".cancel", function() {
@@ -219,41 +224,51 @@ $(document).ready(function() {
			$("#keywordPrompt").text('');
		},
		keyup: function() {
			var ti=$(this).val();
			hbur=ti;
			var lNum=$.trim($(this).val()).length;
			console.log(lNum);
			if(lNum > 15) {
				$(this).val($(this).val().substr(0, 15));
			} else if(0 < lNum&& lNum < 15) {
					$("#addKeyword").show();
					setTimeout(function(){
						if( ti===hbur && ti!== hburEnd) {
							var tt=ti;
							hburEnd=tt;
						$.ajax({
						"url": "/ajax/dataDict/qaHotKey",
						"type": "GET",
						"success": function(data) {
							console.log(data);
							if(data.success) {
								if(data.data.length==0) {
									$("#keyList").addClass("displayNone");
									$("#keyList ul").html("");
								}else{
									$("#keyList").removeClass("displayNone");
									var oSr="";
									for(var i=0;i<5;i++) {
										oSr+='<li><p class="h2Font">'+data.data[i].caption+'</p></li>'
								if(hburEnd == tt){
									if(data.data.length==0) {
										$("#keyList").addClass("displayNone");
										$("#keyList ul").html("");
									}else{
										$("#keyList").removeClass("displayNone");
										var oSr="";
										for(var i=0;i<Math.min(data.data.length,5);i++) {
											oSr+='<li><p class="h2Font">'+data.data[i].caption+'</p></li>'
										}
										$("#keyList ul").html(oSr);
									}
									$("#keyList ul").html(oSr);
								}
								}	
							}else {
								$("#keyList ul").html("");
							}
						},
						"data": {
							"key":$(this).val()
							"key":$('#keywordName').val()
						},
						dataType: "json",
						'error':function() {
							$.MsgBox.Alert('提示', '服务器连接超时！');
						}
				});
				}
				},500)
			}else if(lNum == 0){
				 $("#addKeyword").hide();
				 $("#keyList ul").html("");

js/resourceShow.js

@@ -133,6 +133,8 @@ $(document).ready(function() {
			$("#authFlag").addClass(professorFlag.sty).attr("title", professorFlag.title);
			if($da.editProfessor.hasHeadImage == 1) {
				$("#headImg").css("background-image", 'url(/images/head/' + $da.editProfessor.id + '_l.jpg)');
			}else{
				$("#headImg").css("background-image", 'url(../images/default-photo.jpg)');
			}
			recentlyRe(2,{"professorId":professorId}) 
		}else{
@@ -176,9 +178,7 @@ $(document).ready(function() {
				oSt += '<li><p class="h2Font">' + oSub[i] + '</p></li>'
			}
			$(".tagList").html(oSt);
		} else {
			$(".aboutTit:contains('您可能感兴趣的资源')").parent().hide();
		}
		} 
		if($da.descp) { //编辑器
			$("#descp").html($da.descp).parents("li").show();
		}
@@ -304,7 +304,7 @@ $(document).ready(function() {
					}
					str += '<div class="madiaInfo"  style="margin-top:18px;padding-bottom:8px">'
					str += '<p class="h1Font ellipsisSty">' + $html.articleTitle + '</p>'
					str += '<p><span class="h2Font">' + cmpname + '</span><em class="authiconNew ' + stl.sty + '" title="' + stl.title + '"></em></p>'
					str += '<p><span class="h2Font" style="margin-right:10px">'+ cmpname +'</span><span class="time">'+commenTime($html.publishTime)+'</span></p>'
					str += '</div></a></li>'
					$("#oArticle").append(str);
				}

js/scrollfix.js

@@ -26,6 +26,7 @@
			var originalZIndex;
			var lastOffsetLeft = -1;
			var isUnfixed = true;
			var o_h =(window.document.body || window.document.documentElement).scrollHeight;
			//如果没有找到节点，不进行处理
			if (obj.length <= 0) {
				return;
@@ -191,11 +192,28 @@
			resetScroll();
			// }
			$(window).on("scroll", function() {
				var n_h=(window.document.body || window.document.documentElement).scrollHeight;
				if (Timer) {
					clearTimeout(Timer);
				}
				Timer = setTimeout(onScroll, 0);
				if(n_h === o_h){
					Timer = setTimeout(onScroll, 0);
				}else{
					o_h = n_h;
					Timer = setTimeout(function(){
						isUnfixed=false;
						resetScroll();
						onScroll();
					},0);
				}
					
			});
//			$(window).on("scroll", function() {
//				if (Timer) {
//					clearTimeout(Timer);
//				}
//				Timer = setTimeout(onScroll, 0);
//			});
			// 当发现调整屏幕大小时，重新执行代码
			$(window).on("resize", function() {
				if (Timer) {

js/searchNew.js

@@ -13,6 +13,7 @@ $(function() {
		expertListVal(keyt,subject,industry,address,authType,20,1,true);
	}else{
		num = tagnum;
		keyt=searchContent;
		if(num==1){
			$(".choosediv.filterdiv li").eq(0).addClass("liactive").siblings().removeClass("liactive");
			$(".listdiv .listbox").eq(0).show().siblings().hide();
@@ -22,27 +23,27 @@ $(function() {
			$(".choosediv.filterdiv li").eq(2).addClass("liactive").siblings().removeClass("liactive");
			$(".listdiv .listbox").eq(2).show().siblings().hide();
			$(".searchsome").attr("placeholder","请输入资源名称、用途、发布者或相关关键词");
			resourceListVal(20, 1,true);
			resourceListVal(keyt,20, 1,true);
		}else if(num==3){
			$(".choosediv.filterdiv li").eq(5).addClass("liactive").siblings().removeClass("liactive");
			$(".listdiv .listbox").eq(5).show().siblings().hide();
			$(".searchsome").attr("placeholder","请输入文章标题、作者或相关关键词");
			articalListVal(20, 1,true);
			articalListVal(keyt,20, 1,true);
		}else if(num==4){
			$(".choosediv.filterdiv li").eq(1).addClass("liactive").siblings().removeClass("liactive");
			$(".listdiv .listbox").eq(1).show().siblings().hide();
			$(".searchsome").attr("placeholder","请输入企业名称、产品名称或相关关键词");
			companyListVal(20,1,true);
			companyListVal(keyt,20,1,true);
		}else if(num==5){
			$(".choosediv.filterdiv li").eq(3).addClass("liactive").siblings().removeClass("liactive");
			$(".listdiv .listbox").eq(3).show().siblings().hide();
			$(".searchsome").attr("placeholder","请输入专利名称、发明人或相关关键词");
			patentListVal(20, 1,true);
			patentListVal(keyt,20, 1,true);
		}else if(num==6){
			$(".choosediv.filterdiv li").eq(4).addClass("liactive").siblings().removeClass("liactive");
			$(".listdiv .listbox").eq(4).show().siblings().hide();
			$(".searchsome").attr("placeholder","请输入论文题目、作者或相关关键词");
			paperListVal(20, 1,true);
			paperListVal(keyt,20, 1,true);
		}
	}
	
@@ -103,33 +104,34 @@ $(function() {
			if(num==1){
				expertBox();
			}else if(num==2){
				resourceListVal(20, 1,true);
				resourceListVal(keyt,20, 1,true);
			}else if(num==3){
				articalListVal(20, 1,true);
				articalListVal(keyt,20, 1,true);
			}else if(num==4){
				companyListVal(20, 1,true);
				companyListVal(keyt,20, 1,true);
			}else if(num==5){
				patentListVal(20, 1,true);
				patentListVal(keyt,20, 1,true);
			}else if(num==6){
				paperListVal(20, 1,true);
				paperListVal(keyt,20, 1,true);
			}
		}
	})
	
	$(".searchgo").on("click",function(e) {
		num = $(".liactive").attr("data-id");
		keyt =$(".searchsome").val()
		if(num==1){
			expertBox();
		}else if(num==2){
			resourceListVal(20, 1,true);
			resourceListVal(keyt,20, 1,true);
		}else if(num==3){
			articalListVal(20, 1,true);
			articalListVal(keyt,20, 1,true);
		}else if(num==4){
			companyListVal(20, 1,true);
			companyListVal(keyt,20, 1,true);
		}else if(num==5){
			patentListVal(20, 1,true);
			patentListVal(keyt,20, 1,true);
		}else if(num==6){
			paperListVal(20, 1,true);
			paperListVal(keyt,20, 1,true);
		}
	})
	
@@ -139,7 +141,7 @@ $(function() {
	function expertBox(){
		keyt = $(".searchsome").val();
		keyt = keyt;
		var  subjectVal= $("#academicField li.filterCurrent").text();
		if(subjectVal=="不限"){
			subject = "";
@@ -176,19 +178,19 @@ $(function() {
				expertBox();
				$(".searchsome").attr("placeholder","请输入专家姓名、机构、研究方向或相关关键词");
			}else if(index==1){
				companyListVal(20, 1,true);
				companyListVal(keyt,20, 1,true);
				$(".searchsome").attr("placeholder","请输入企业名称、产品名称或相关关键词");
			}else if(index==2){
				resourceListVal(20, 1,true);
				resourceListVal(keyt,20, 1,true);
				$(".searchsome").attr("placeholder","请输入资源名称、用途、发布者或相关关键词");
			}else if(index==3){
				patentListVal(20, 1,true);
				patentListVal(keyt,20, 1,true);
				$(".searchsome").attr("placeholder","请输入专利名称、发明人或相关关键词");
			}else if(index==4){
				paperListVal(20, 1,true);
				paperListVal(keyt,20, 1,true);
				$(".searchsome").attr("placeholder","请输入论文题目、作者或相关关键词");
			}else if(index==5){
				articalListVal(20, 1,true);
				articalListVal(keyt,20, 1,true);
				$(".searchsome").attr("placeholder","请输入文章标题、作者或相关关键词");
			}
	   });
@@ -393,7 +395,7 @@ $(function() {
						}
						//分页
						if(isexpert==true){
							$(".expertPageCode").createPage({
							$(".expertPageCode").off("click").createPage({
								pageCount: Math.ceil(data.data.total / 20),
								current: data.data.pageNo,
								backFn: function(p) {
@@ -418,13 +420,13 @@ $(function() {
		});
	}
	//企业
	function companyListVal(pageSize,pageNo,isbind) {
	function companyListVal(keyt,pageSize,pageNo,isbind) {
		$.ajax({
			"url": "/ajax/org/find/pq",
			"type": "get",
			"async": true,
			"data": {
				"kw":$(".searchsome").val(),
				"kw":keyt,
				"pageSize": pageSize,
				"pageNo": pageNo
			},
@@ -478,12 +480,12 @@ $(function() {
						}
						//分页
						if(isbind==true){
							$(".companyPageCode").createPage({
							$(".companyPageCode").off("click").createPage({
								pageCount: Math.ceil(data.data.total / 20),
								current: data.data.pageNo,
								backFn: function(p) {
									$("#companyList").html("");
									companyListVal(20, p,false);
									companyListVal(keyt,20, p,false);
									document.body.scrollTop = document.documentElement.scrollTop = 0;
								}
							});
@@ -503,13 +505,13 @@ $(function() {
		});
	}
	//文章
	function articalListVal(pageSize, pageNo,isbind) {
	function articalListVal(keyt,pageSize, pageNo,isbind) {
		$.ajax({
			"url": "/ajax/article/firstpq",
			"type": "get",
			"async": true,
			"data": {
				"key":$(".searchsome").val(),
				"key":keyt,
				"pageSize": pageSize,
				"pageNo": pageNo
			},
@@ -569,12 +571,12 @@ $(function() {
						}
						//分页
						if(isbind==true){
							$(".articalPageCode").createPage({
							$(".articalPageCode").off("click").createPage({
								pageCount: Math.ceil(data.data.total / 20),
								current: data.data.pageNo,
								backFn: function(p) {
									$("#articalList").html("");
									articalListVal(20, p,false);
									articalListVal(keyt,20, p,false);
									document.body.scrollTop = document.documentElement.scrollTop = 0;
								}
							});
@@ -616,13 +618,13 @@ $(function() {
		});
	}
	//资源
	function resourceListVal(pageSize, pageNo,isresource) {
	function resourceListVal(keyt,pageSize, pageNo,isresource) {
		$.ajax({
			"url": "/ajax/resource/firstpq",
			"type": "get",
			"async": true,
			"data": {
				"key":$(".searchsome").val(),
				"key":keyt,
				"pageSize": pageSize,
				"pageNo": pageNo
			},
@@ -676,12 +678,12 @@ $(function() {
						}
						//分页
						if(isresource==true){
							$(".resourcePageCode").createPage({
							$(".resourcePageCode").off("click").createPage({
								pageCount: Math.ceil(data.data.total / 20),
								current: data.data.pageNo,
								backFn: function(p) {
									$("#resourceList").html("");
									resourceListVal(20, p,false);
									resourceListVal(keyt,20, p,false);
									document.body.scrollTop = document.documentElement.scrollTop = 0;
								}
							});
@@ -701,13 +703,13 @@ $(function() {
		});
	}
	//专利
	function patentListVal(pageSize, pageNo,isbind) {
	function patentListVal(keyt,pageSize, pageNo,isbind) {
		$.ajax({
			"url": "/ajax/ppatent/pq",
			"type": "get",
			"async": true,
			"data": {
				"qw":$(".searchsome").val(),
				"qw":keyt,
				"pageSize": pageSize,
				"pageNo": pageNo
			},
@@ -736,12 +738,12 @@ $(function() {
						}
						//分页
						if(isbind==true){
							$(".patentPageCode").createPage({
							$(".patentPageCode").off("click").createPage({
								pageCount: Math.ceil(data.data.total / 20),
								current: data.data.pageNo,
								backFn: function(p) {
									$("#patentList").html("");
									patentListVal(20, p,false);
									patentListVal(keyt,20, p,false);
									document.body.scrollTop = document.documentElement.scrollTop = 0;
								}
							});
@@ -761,13 +763,13 @@ $(function() {
		});
	}
	//论文
	function paperListVal(pageSize, pageNo,isbind) {
	function paperListVal(keyt,pageSize, pageNo,isbind) {
		$.ajax({
			"url": "/ajax/ppaper/pq",
			"type": "get",
			"async": true,
			"data": {
				"qw":$(".searchsome").val(),
				"qw":keyt,
				"pageSize": pageSize,
				"pageNo": pageNo
			},
@@ -808,12 +810,12 @@ $(function() {
						}
						//分页
						if(isbind==true){
							$(".paperPageCode").createPage({
							$(".paperPageCode").off("click").createPage({
								pageCount: Math.ceil(data.data.total / 20),
								current: data.data.pageNo,
								backFn: function(p) {
									$("#paperList").html("");
									paperListVal(20, p,false);
									paperListVal(keyt,20, p,false);
									document.body.scrollTop = document.documentElement.scrollTop = 0;
								}
							});

js/ueditor/lang/zh-cn/zh-cn.js

@@ -69,7 +69,7 @@ UE.I18N['zh-cn'] = {
    },
    'autoupload': {
        'exceedSizeError': '文件大小超出限制',
        'exceedTypeError': '文件格式不允许',
        'exceedTypeError': '只能上传jpeg/jpg/png/bmp/gif格式的图片',
        'jsonEncodeError': '服务器返回格式错误',
        'loading':"正在上传...",
        'loadError':"上传错误",
@@ -77,7 +77,7 @@ UE.I18N['zh-cn'] = {
    },
    'simpleupload':{
        'exceedSizeError': '文件大小超出限制',
        'exceedTypeError': '文件格式不允许',
        'exceedTypeError': '只能上传jpeg/jpg/png/bmp/gif格式的图片',
        'jsonEncodeError': '服务器返回格式错误',
        'loading':"正在上传...",
        'loadError':"上传错误",
@@ -297,7 +297,7 @@ UE.I18N['zh-cn'] = {
        'errorNotSupport': 'WebUploader 不支持您的浏览器！如果你使用的是IE浏览器，请尝试升级 flash 播放器。',
        'errorLoadConfig': '后端配置项没有正常加载，上传插件不能正常使用！',
        'errorExceedSize':'文件大小超出',
        'errorFileType':'文件格式不允许',
        'errorFileType':'只能上传jpeg/jpg/png/bmp/gif格式的图片',
        'errorInterrupt':'文件传输中断',
        'errorUploadRetry':'上传失败，请重试',
        'errorHttp':'http请求错误',
@@ -334,7 +334,7 @@ UE.I18N['zh-cn'] = {
        'errorNotSupport': 'WebUploader 不支持您的浏览器！如果你使用的是IE浏览器，请尝试升级 flash 播放器。',
        'errorLoadConfig': '后端配置项没有正常加载，上传插件不能正常使用！',
        'errorExceedSize':'文件大小超出',
        'errorFileType':'文件格式不允许',
        'errorFileType':'只能上传jpeg/jpg/png/bmp/gif格式的图片',
        'errorInterrupt':'文件传输中断',
        'errorUploadRetry':'上传失败，请重试',
        'errorHttp':'http请求错误',
@@ -420,7 +420,7 @@ UE.I18N['zh-cn'] = {
        'errorNotSupport': 'WebUploader 不支持您的浏览器！如果你使用的是IE浏览器，请尝试升级 flash 播放器。',
        'errorLoadConfig': '后端配置项没有正常加载，上传插件不能正常使用！',
        'errorExceedSize':'文件大小超出',
        'errorFileType':'文件格式不允许',
        'errorFileType':'只能上传jpeg/jpg/png/bmp/gif格式的图片',
        'errorInterrupt':'文件传输中断',
        'errorUploadRetry':'上传失败，请重试',
        'errorHttp':'http请求错误',

js/ueditor/ueditor.all.js

@@ -23830,6 +23830,7 @@ UE.plugin.register('autoupload', function (){
                if (json.state == 'SUCCESS' && json.url) {
                    successHandler(json);
                } else {
                	alert(1111);
                    errorHandler(json.state);
                }
            }catch(er){
@@ -24533,7 +24534,12 @@ UE.plugin.register('simpleupload', function (){
                            loader.removeAttribute('id');
                            domUtils.removeClasses(loader, 'loadingclass');
                        } else {
                            showErrorLoader && showErrorLoader(json.state);
                        	if(json.state=="文件大小超出限制") {
                        		showErrorLoader && showErrorLoader("文件大小不能超过2M");
                        	}else{
                        		showErrorLoader && showErrorLoader(json.state);
                        	}
                            
                        }
                    }catch(er){
                        showErrorLoader && showErrorLoader(me.getLang('simpleupload.loadError'));

js/userInforShow.js

@@ -703,7 +703,7 @@ $(function() {
						}
						//分页
						if(isbind==true){
							$("#proResource").siblings(".tcdPageCode").createPage({
							$("#proResource").siblings(".tcdPageCode").off("click").createPage({
								pageCount: Math.ceil(data.data.total / 10),
								current: data.data.pageNo,
								backFn: function(p) {
@@ -747,6 +747,7 @@ $(function() {
							if(dataStr[i].articleImg) {
								madiaHead ='/data/article/' + dataStr[i].articleImg ;
							}
							var sowU="";
							if(dataStr[i].pageViews!=0){
								if(dataStr[i].articleAgree!=0){
									sowU='<li><span>阅读量 '+dataStr[i].pageViews+'</span></li><li><span>赞 '+dataStr[i].articleAgree+'</span></li>'
@@ -778,7 +779,7 @@ $(function() {
						}
						//分页
						if(isbind==true){
							$("#proArticel").siblings(".tcdPageCode").createPage({
							$("#proArticel").siblings(".tcdPageCode").off("click").createPage({
								pageCount: Math.ceil(data.data.total / 10),
								current: data.data.pageNo,
								backFn: function(p) {
@@ -843,7 +844,7 @@ $(function() {
						}
						//分页
						if(isbind==true){
							$("#proPatent").siblings(".tcdPageCode").createPage({
							$("#proPatent").siblings(".tcdPageCode").off("click").createPage({
								pageCount: Math.ceil(data.data.total / 10),
								current: data.data.pageNo,
								backFn: function(p) {
@@ -914,7 +915,7 @@ $(function() {
						}
						//分页
						if(isbind==true){
							$("#proPaper").siblings(".tcdPageCode").createPage({
							$("#proPaper").siblings(".tcdPageCode").off("click").createPage({
								pageCount: Math.ceil(data.data.total / 10),
								current: data.data.pageNo,
								backFn: function(p) {

userInforShow.html

@@ -317,7 +317,7 @@
				<div class="conBlock conItem displayNone">
					<div class="form-item">
						<div class="aboutTit">相关文章</div>
						<div class="form-result form-M0 currentArt">
						<div class="form-result form-M0 currentArt currentArt2">
							<ul id="relateArt">
							</ul>
						</div>