Merge remote-tracking branch 'origin/test'

Conflicts:
	css/genindex.css
	js/discover.js

articalIssue.html

@@ -59,7 +59,7 @@
	        					<!--未上传图片时-->
	        					<div class="upFront">
		        					<p>文章封面图片<em class="requiredcon">*</em></p>
		        					<p class="uploadtip">JPG/PNG格式，2M以内</p>
		        					<p class="uploadtip">JPG/JPEG/PNG格式，2M以内</p>
		        					<span class="upbtn">上传图片</span>
	        					</div>
	        					<!--已上传图片时-->
@@ -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

@@ -57,7 +57,7 @@
	        					<!--未上传图片时-->
	        					<div class="upFront">
		        					<p>文章封面大图<em class="requiredcon">*</em></p>
		        					<p class="uploadtip">JPG/PNG格式，2M以内</p>
		        					<p class="uploadtip">JPG/JPEG/PNG格式，2M以内</p>
		        					<span class="upbtn">上传图片</span>
	        					</div>
	        					<!--已上传图片时-->
@@ -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>
@@ -56,7 +44,7 @@
	        					<!--未上传图片时-->
	        					<div class="upFront">
		        					<p>文章封面图片<em class="requiredcon">*</em></p>
		        					<p class="uploadtip">JPG/PNG格式，2M以内</p>
		        					<p class="uploadtip">JPG/JPEG/PNG格式，2M以内</p>
		        					<span class="upbtn">上传图片</span>
	        					</div>
	        					<!--已上传图片时-->
@@ -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>
@@ -58,7 +46,7 @@
	        					<!--未上传图片时-->
	        					<div class="upFront">
		        					<p>文章封面图片<em class="requiredcon">*</em></p>
		        					<p class="uploadtip">JPG/PNG格式，2M以内</p>
		        					<p class="uploadtip">JPG/JPEG/PNG格式，2M以内</p>
		        					<span class="upbtn">上传图片</span>
	        					</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;}
@@ -322,7 +323,7 @@ ul.artAbout .uploadFile .upbtn{display:inline-block;padding:7px 23px;background:
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 #filePicker{position:absolute;left:50%; bottom:22px; margin-left:-52px;opacity:0; z-index:88;}
ul.artAbout .frmadd{width:auto;position:absolute;right:0;top:0;background: #28b8fa;color:#fff;border:none;padding:6px 25px;z-index: 4;}
.conItem ul.operateBlock{overflow: hidden;margin-top:-20px;}
@@ -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:0 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;}
@@ -433,11 +436,15 @@ ul.tagList>li .h2Font{color:#666}
.itemListCon .form-result>ul>li .madiaEdit>li{float: left;margin-right: 28px;}
.itemListCon .form-result>ul>li .madiaEdit .editThis{display:inline-block;width:60px;height:32px;background:url(../images/g_article_button_xiugai_lan_hig.png);background-size:cover;cursor:pointer;}
.itemListCon .form-result>ul>li .madiaEdit .deteleThis2{display:inline-block;width:32px;height:32px;background:url(../../images/g_article_button_shanchu_hig.png);background-size:cover;cursor:pointer;}
.itemListCon .form-result>ul>li .madiaEdit .closeThis{color:#FF0000;}
.itemListCon .form-result>ul>li .madiaEdit{display:none;overflow:hidden;position:absolute;top:50%;margin-top:-16px;right:0;}
.itemListCon .form-result>ul>li:hover .madiaEdit{display: block;}
.itemListCon li.draftList .madiaInfo{padding-top:4px;}
.itemListBolck .itemListCon .form-need .madiaInfo{padding-left: 0;}
.itemListBolck .itemListCon .form-need .madiaEdit{display: block;}
/*定时发送时间选择器*/
.blackcover2{display:none;overflow-x: hidden;overflow-y:auto;position:fixed;top:0;right:0;bottom:0;left:0; background:rgba(0,0,0,.5);z-index: 1050;}
/*.modelContain{display:none;position:relative;clear:both;margin:40px auto;width:600px;background:#fff;border-radius:8px;z-index:1056; 
@@ -449,8 +456,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

@@ -1,10 +1,9 @@
@charset "utf-8";
/* CSS Document */
/*reset--base*/
p,dl,dt,dd,ul,ol,li,a,em,div,span,th,td{margin:0;padding:0; word-break:break-all; font-family: PingFang SC,Arial,Helvetica Neue,Hiragino Sans GB,Microsoft Yahei,WenQuanYi Micro Hei,sans-serif;}
form,label,button,input,select,textarea{font-size:14px; font-family: PingFang SC,Arial,Helvetica Neue,Hiragino Sans GB,Microsoft Yahei,WenQuanYi Micro Hei,sans-serif;}
h1,h2,h3,h4,h5,h6{font-size:100%;margin:0;padding:0; font-family: PingFang SC,Arial,Helvetica Neue,Hiragino Sans GB,Microsoft Yahei,WenQuanYi Micro Hei,sans-serif;}
html,body{height:100%; width:100%; margin:0;padding:0;font-family: PingFang SC,Arial,Helvetica Neue,Hiragino Sans GB,Microsoft Yahei,WenQuanYi Micro Hei,sans-serif;}
/*reset*/
p,dl,dt,dd,ul,ol,li,a,em,div,span,th,td{margin:0;padding:0; word-break:break-all; font-family: PingFang SC,Microsoft Yahei,Arial,WenQuanYi Micro Hei,Helvetica Neue,Hiragino Sans GB,sans-serif;}
form,label,button,input,select,textarea{font-size:14px; font-family: PingFang SC,Microsoft Yahei,Arial,WenQuanYi Micro Hei,Helvetica Neue,Hiragino Sans GB,sans-serif;}
h1,h2,h3,h4,h5,h6{font-size:100%;margin:0;padding:0; font-family: PingFang SC,Microsoft Yahei,Arial,WenQuanYi Micro Hei,Helvetica Neue,Hiragino Sans GB,sans-serif;}
html,body{height:100%; width:100%; margin:0;padding:0;font-family: PingFang SC,Microsoft Yahei,Arial,WenQuanYi Micro Hei,Helvetica Neue,Hiragino Sans GB,sans-serif;}
input{vertical-align:middle; outline:none;}
img{color:transparent;font-size:0;vertical-align:middle;-ms-interpolation-mode:bicubic;border:0;padding:0; margin:0;}
small{font-size:12px;}
@@ -196,7 +195,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 +220,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,33 +382,79 @@ $(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() {
		if($(this).hasClass("disableLi")){
			return;
		}
		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);
			}
			
		}
	})
	//定时文章发布
	$("#setTimeIssue").on("click", function() {
		if($(this).hasClass("disableLi")){
			return;
		}
		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() {
		if($(this).hasClass("disableLi")){
			return;
		}
		noTitleImg();
		if(imgflase && titleflase) {
			draftAdd(1);
@@ -374,6 +463,9 @@ $(function() {
	//文章预览
	$("#preview").on("click", function() {
		if($(this).hasClass("disableLi")){
			return;
		}
		noTitleImg();
		if(imgflase && titleflase) {
			draftAdd(2);
@@ -400,24 +492,36 @@ 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{
			if(publishTime!="") {
				$data.publishTime = publishTime;
			}
			$data.colNum=2;
		}
		if($("#hidearticleId").val().length != 0) {
			$data.articleId = $("#hidearticleId").val();
		}
		if($(".form_datetime").val().length != 0) {
			$data.publishTime = publishTime;
		}
		console.log($data);
	}
	/*文章发布*/
	function newsAdd() {
		getdata();
		$(".operateBlock").find("li").addClass("disableLi");
		$.ajax({
			"url": "/ajax/article/save",
			"type": "post",
			"dataType": "json",
			"data": $data,
			"traditional": true, //传数组必须加这个
			"complete":function(){
				$(".operateBlock").find("li").removeClass("disableLi");
			},
			"success": function(data) {
				console.log(data);
				if(data.success) {
@@ -444,12 +548,16 @@ function getAttrId() {
	function setTimeIssue(publishTime) {
		var opublishTime=publishTime+"01";
		getdata(opublishTime);
		$(".operateBlock").find("li").addClass("disableLi");
		$.ajax({
			"url": "/ajax/article/timing",
			"type": "post",
			"dataType": "json",
			"data": $data,
			"traditional": true, //传数组必须加这个
			"complete":function(){
				$(".operateBlock").find("li").removeClass("disableLi");
			},
			"success": function(data) {
				console.log(data);
				if(data.success) {
@@ -472,12 +580,16 @@ function getAttrId() {
	/*文章添加草稿和文章预览*/
	function draftAdd(num) {
		getdata();
		$(".operateBlock").find("li").addClass("disableLi");
		$.ajax({
			"url": "/ajax/article/draft",
			"type": "post",
			"dataType": "json",
			"data": $data,
			"traditional": true, //传数组必须加这个
			"complete":function(){
				$(".operateBlock").find("li").removeClass("disableLi");
			},
			"success": function(data) {
				console.log(data);
				if(num == 1) {
@@ -579,33 +691,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 +736,8 @@ function getAttrId() {
							$.MsgBox.Alert('提示', '服务器连接超时！');
						}
					});
					}
					},500)
				}
			} else {
				$(this).siblings(".form-drop").addClass("displayNone");
@@ -633,7 +754,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("");
@@ -642,4 +763,4 @@ function getAttrId() {
		$(this).parent("ul").html("")
	})
}
});
});

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,17 +550,78 @@ $(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() {
		if($(this).hasClass("disableLi")){
			return;
		}
		noTitleImg();
		if(titleflase){
			$.MsgBox.Confirm("提示","确认发布该文章?",newsAdd);	
		if(titleflase) {
			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);
			}
			
		}
	})
	//定时文章发布
	$("#setTimeIssue").on("click", function() {
		if($(this).hasClass("disableLi")){
			return;
		}
		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));
			})
		}
	})
	
	//文章存草稿
	$("#draft").on("click",function(){
		if($(this).hasClass("disableLi")){
			return;
		}
		noTitleImg();
		if(titleflase){
			draftAdd(1);
@@ -525,6 +630,9 @@ $(function() {
	
	//文章预览
	$("#preview").on("click",function(){
		if($(this).hasClass("disableLi")){
			return;
		}
		noTitleImg();
		if(titleflase){
			draftAdd(2);
@@ -536,21 +644,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 +653,30 @@ $(function() {
		return arr;
	}
	/*获取数据*/
	function getdata(publishTime,settime) {
		expertli();//相关专家
		resourcesli();//相关咨询
	    $data.articleId = articleId;
	function getdata(publishTime) {
		expertli(); //相关专家
		resourcesli(); //相关咨询
		$data.orgId = orgId;
		$data.articleId=articleId;
		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{
			if(publishTime!="") {
				$data.publishTime = publishTime;
			}
			$data.colNum=2;
		}
		console.log($data);
	}
@@ -584,12 +685,16 @@ $(function() {
	/*文章添加*/
	function newsAdd(){
		getdata();
		$(".operateBlock").find("li").addClass("disableLi");
		$.ajax({
			"url" : "/ajax/article/save",
			"type" :  "post" ,
			"dataType" : "json",
			"data" :$data,
			"traditional": true, //传数组必须加这个
			"complete":function(){
				$(".operateBlock").find("li").removeClass("disableLi");
			},
			"success" : function(data) {
				console.log(data);
				if (data.success){
@@ -616,12 +721,16 @@ $(function() {
	function setTimeIssue(publishTime,settime) {
		var opublishTime=publishTime+"01";
		getdata(opublishTime,settime);
		$(".operateBlock").find("li").addClass("disableLi");
		$.ajax({
			"url": "/ajax/article/timing",
			"type": "post",
			"dataType": "json",
			"data": $data,
			"traditional": true, //传数组必须加这个
			"complete":function(){
				$(".operateBlock").find("li").removeClass("disableLi");
			},
			"success": function(data) {
				console.log(data);
				if(data.success) {
@@ -644,12 +753,16 @@ $(function() {
	/*文章添加草稿和文章预览*/
	function draftAdd(num){
		getdata();
		$(".operateBlock").find("li").addClass("disableLi");
		$.ajax({
			"url" : "/ajax/article/draft",
			"type" :  "post" ,
			"dataType" : "json",
			"data" :$data,
			"traditional": true, //传数组必须加这个
			"complete":function(){
				$(".operateBlock").find("li").removeClass("disableLi");
			},
			"success" : function(data) {
				console.log(data);
				if(num==1){
@@ -752,33 +865,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");
@@ -790,6 +910,8 @@ relatCompanies("#company");
							$.MsgBox.Alert('提示', '服务器连接超时！');
						}
					});
					}
					},500)
				}
			} else {
				$(this).siblings(".form-drop").addClass("displayNone");
@@ -806,7 +928,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("");
@@ -852,7 +974,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) {
@@ -91,12 +92,22 @@ function articalList(pageSize, pageNo, isbind, num) {
					var datalist = data.data.data[i];
					$itemlist.attr("data-id", datalist.articleId);
					$itemlist.find("#arttitle").text(datalist.articleTitle);
					$itemlist.find("#articleAgree").text("点赞 " + datalist.articleAgree);
					$itemlist.find("#pageViews").text("阅读量 " + datalist.pageViews);
					if(datalist.articleAgree>0){
						$itemlist.find("#articleAgree").text("赞 " + datalist.articleAgree);
					}
					if(datalist.pageViews>0){
						$itemlist.find("#pageViews").text("阅读量 " + datalist.pageViews);
					}
					commentnum(datalist.articleId, $itemlist) //评论数
					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);
@@ -108,7 +119,11 @@ function articalList(pageSize, pageNo, isbind, num) {
					}
					if(datalist.status == 2){//定时发布
						$itemlist.find(".time").text("修改于 "+ TimeTr(datalist.modifyTime));
						$itemlist.find("#dsfbtime").text("草稿 | 将于" +TimeTr(datalist.publishTime)+ "定时发布");
						var thisColum=""
						if(datalist.colNum>2){
							thisColum=columnType[datalist.colNum].fullName;
						}
						$itemlist.find("#dsfbtime").text("草稿 | 将在 " +TimeTr(datalist.publishTime)+ " 定时发布于 " +thisColum+ " 栏目上");
						$itemlist.find(".editThis,.newurl").on("click",function(){
							var newarticleId = $(this).parents(".newbox").attr("data-id");
							$.ajax({
@@ -176,7 +191,9 @@ function articalList(pageSize, pageNo, isbind, num) {
			},
			"success": function(data) {
				if(data.success) {
					$itemlist.find("#comment").text("评论 " + data.data);
					if(data.data>0){
						$itemlist.find("#comment").text("留言 " + data.data);
					}
				}
			},
			"error": function() {

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");
	//窗口大小变更事件
@@ -45,6 +44,9 @@ $(document).ready(function() {
				$.MsgBox.Alert('提示', '服务器请求失败')
			},
		});
		$("#imglogo").on("click",function(){
			location.href="../cmpInforShow.html?orgId="+orgId;
		})
	} else {
		$(".unlogin").removeClass("displayNone");
		$(".onlogin").addClass("displayNone");
@@ -250,11 +252,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 +271,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();
@@ -394,6 +407,37 @@ function limitObj(obj,maxNum){
	});
}
//时间显示规则
function commenTime(startTime) {
	//console.log(startTime)
	var nowTimg = new Date();
	var startdate = new Date();
	startdate.setFullYear(parseInt(startTime.substring(0, 4)));
	startdate.setMonth(parseInt(startTime.substring(4, 6)) - 1);
	startdate.setDate(parseInt(startTime.substring(6, 8)));
	startdate.setHours(parseInt(startTime.substring(8, 10)));
	startdate.setMinutes(parseInt(startTime.substring(10, 12)));
	startdate.setSeconds(parseInt(startTime.substring(12, 14)));
	var date3 = nowTimg.getTime() - startdate.getTime(); //时间差的毫秒数
	var hours = parseInt((date3 % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
	var minutes = parseInt((date3 % (1000 * 60 * 60)) / (1000 * 60));
	if(date3 < 60000) {
		return "刚刚";
	} else if(date3 >= 60000 && date3 < 3600000) {
		return minutes + "分钟前";
	} else if(date3 >= 3600000 && date3 < 86400000) {
		return hours + "小时前";
	} else if(date3 >= 86400000) {
		if(nowTimg.getFullYear() == startTime.substring(0, 4)) {
			return startTime.substring(4, 6).replace(/\b(0+)/gi, "") + "月" + startTime.substring(6, 8).replace(/\b(0+)/gi, "") + "日 " + startTime.substring(8, 10) + ":" + startTime.substring(10, 12);
		} else {
			return startTime.substring(0, 4) + "年" + startTime.substring(4, 6).replace(/\b(0+)/gi, "") + "月" + startTime.substring(6, 8).replace(/\b(0+)/gi, "") + "日 " + startTime.substring(8, 10) + ":" + startTime.substring(10, 12);
		}
	}
}
/*时间转换*/
function TimeTr(dealtime) {
@@ -404,9 +448,89 @@ function TimeTr(dealtime) {
	var d = s.substr(6, 2);
	var h = s.substr(8, 2);
	var minute = s.substr(10, 2);
	var formatTime = m.replace(/\b(0+)/gi, "") + "月" + d.replace(/\b(0+)/gi, "") + "日 " + h + ":" + minute;
	if(y != myDate.getFullYear()) {
		formatTime = y + "年" + m.replace(/\b(0+)/gi, "") + "月" + d.replace(/\b(0+)/gi, "") + "日 " + h + ":" + minute;
	var formatTime;
	if(s.length <= 6) {
		formatTime = y + "年" + m.replace(/\b(0+)/gi, "") + "月";
	} else if(s.length > 6 && s.length <= 8) {
		formatTime = y + "年" + m.replace(/\b(0+)/gi, "") + "月" + d.replace(/\b(0+)/gi, "") + "日 ";
	} else {
		formatTime = m.replace(/\b(0+)/gi, "") + "月" + d.replace(/\b(0+)/gi, "") + "日 " + h + ":" + minute;
		if(y != myDate.getFullYear()) {
			formatTime = y + "年" + m.replace(/\b(0+)/gi, "") + "月" + d.replace(/\b(0+)/gi, "") + "日 " + h + ":" + minute;
		}
	}
	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("");
@@ -329,6 +347,9 @@ $(document).ready(function() {
	limitObj("#remarkContent",200)
	/*发布*/
	$(".goFabu").click(function() {
		if($(this).hasClass("disableLi")){
			return;
		}
		var oYes = term();
		if(oYes == 0) {
			return;
@@ -337,6 +358,9 @@ $(document).ready(function() {
	})
	/*预览*/
	$("#oPreview").click(function() {
		if($(this).hasClass("disableLi")){
			return;
		}
		var oYes = term();
		if(oYes == 0) {
			return;
@@ -345,6 +369,9 @@ $(document).ready(function() {
	})
	/*存草稿*/
	$("#oDraft").click(function() {
		if($(this).hasClass("disableLi")){
			return;
		}
		var oYes = term();
		if(oYes == 0) {
			return;
@@ -399,6 +426,7 @@ $(document).ready(function() {
	}
	/*发布函数*/
	function ajsPost(pa1, pa2) {
		$(".operateBlock").find("li").addClass("disableLi");
		var oUrl = "/ajax/resource/orgSave";
		if(pa1) {
			oUrl = pa1
@@ -424,6 +452,9 @@ $(document).ready(function() {
		$.ajax({
			"url": oUrl,
			"type": "POST",
			"complete":function(){
						$(".operateBlock").find("li").removeClass("disableLi");
					},
			"success": function(data) {
				console.log(data)
				if(data.success) {

cmp-portal/js/resourceList.js

@@ -74,7 +74,7 @@ $(document).ready(function(){
	 			oLi="class='draftList'"
	 		}else{
	 			oTime="发布于 "+TimeTr($data[i].publishTime);
	 			pageview='<li><span>阅读量 '+$data[i].pageViews+'</span></li>';
	 			pageview='<li><span>浏览量 '+$data[i].pageViews+'</span></li>';
	 			oHtml="../resourceShow.html"
	 		}
	 	var oStr='<li '+oLi+'>'+

cmp-portal/resourceIssue.html

@@ -33,8 +33,8 @@
			        					<!--未上传图片时-->
			        					<div class="upFront" id="uploader">
				        					<p>资源图片<em class="requiredcon">*</em></p>
				        					<p class="uploadtip">JPG/PNG格式，2M以内</p>
				            				<span class="upbtn">上传图片</span>
				        					<p class="uploadtip">JPG/JPEG/PNG格式，<br/>2M以内</p>
				            				<span class="upbtn" style="margin-top:8px">上传图片</span>
			        					</div>
				            		</div>
			        			</div>

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;}
@@ -213,7 +255,7 @@ ul.listitemdiv li .centercon{padding-left:120px;padding-right:200px;}
ul.listitemdiv li .centercon .h1font{font-size: 16px;line-height: 28px; color:#333;}
ul.listitemdiv li .centercon .h2font{font-size: 14px;line-height: 24px; color:#666;}
ul.listitemdiv li .centercon .showInfo>span{margin-right:20px}
ul.listitemdiv li .centercon .h2font.ellipsisSty-2{margin-bottom:8px;max-height: 56px;}
ul.listitemdiv li .centercon .ellipsisSty-2{margin-bottom:8px;max-height: 56px;}
ul.listitemdiv li .centercon .h2font.ellipsisSty-2{line-height: 20px;margin-top:4px;}
ul.listitemdiv li .rightop{padding:0 24px;line-height:32px;font-size:16px;color:#FFFFFF;cursor:pointer;border-radius:4px;background:#ff9900;
    box-shadow: 1px 2px 13px 0px rgba(255, 153, 0, 0.6);
@@ -254,8 +296,7 @@ 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 #filePicker{position:absolute;left:50%; bottom:22px; 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;}
.conItem ul.operateBlock{overflow: hidden;margin-top:-30px;}
@@ -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,7 @@ 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;}
@@ -337,14 +370,28 @@ 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 p{margin-bottom:10px;text-align:justify}
.showMain{font-size:16px;color:#333;line-height:28px;}
.showMain img{max-width: 100%;}
.showMain p{margin-bottom:16px;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;}
ul.tagList>li .h2Font{color:#666}
@@ -627,8 +674,8 @@ div.zoomMask{position:absolute;background:url("../images/g-resource-mask.png") r
/*统计数据*/
.statisticsBox{}
.statisticsBox span{font-size: 20px;color:#333}
.statisticsBox p{font-size: 14px;color:#999}
.goarrow{font-size:16px;display:inline-block;color: #ff9900;margin:10px 0 0;padding:0 6px;position: relative;}
.statisticsBox p{font-size: 14px;color:#999;margin-bottom:10px;}
.goarrow{font-size:16px;display:inline-block;color: #ff9900;padding:0 6px;position: relative;}
.goarrow em{position:absolute;right:0;top:-15px;}
.goarrow em:before{border: solid transparent;border-left-color: #ff9900;border-width:8px;content: " ";position: absolute;left: 100%;top: 18px;}
.goarrow em:after{border: solid transparent;border-left-color:#fff;border-width:6px;content: " ";position: absolute;left: 100%;top: 20px;}
@@ -636,7 +683,7 @@ div.zoomMask{position:absolute;background:url("../images/g-resource-mask.png") r
/*相关信息*/
.leftconItem{display: none;}
.leftconItem:first-child{display: block;}
.coninfobox{padding:30px 30px 0;}
.coninfobox{padding:30px 30px 0;background: #FFF;}
.coninfobox .coninfotit{position:relative;font-size: 18px;color:#666;margin-bottom:10px;}
.coninfobox .seeMore{cursor:pointer;font-size:14px;color:#999;padding:0 10px;position: absolute;right:12px;top:50%;margin-top:-10px;}
.coninfobox .seeMore em{position:absolute;right:0;top:-16px;}
@@ -766,3 +813,12 @@ div.zoomMask{position:absolute;background:url("../images/g-resource-mask.png") r
.aboutPa .form-result ul.authorBox{position:relative;}
.aboutPa .form-result ul.authorBox>li>a{max-width:80%;}
/*--------------新版需求相关--------------*/
.needinfobox.coninfobox{border-bottom:20px solid #F4F6F8;padding-bottom: 30px;}
.needList.form-item .madiaInfo{padding-left:0;}
.needList.form-item>ul .h1Font{font-size: 18px;margin-bottom: 10px;}
.needList.form-item>ul .h2Font{font-size: 14px;line-height:24px;margin: 10px 0;}
.needList.form-item>ul .h3Font{font-size: 14px;color:#999;}
.needList.form-item>ul>li{padding:10px 30px;margin:0 -30px;}
.needList.form-item>ul>li:hover{background: #EEEEEE;}
.needList.form-item ul .showli>li{margin: 6px 0;width:25%;padding-right:16px;float:left;text-overflow:ellipsis;white-space: nowrap;overflow: hidden;}

css/share.css

@@ -77,7 +77,7 @@ html,body {outline: 0;margin:0;padding:0px;background: #efeff4;-webkit-text-size
.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%;}
.showDetail .showMain p{margin-bottom:10px;font-size:15px;color:#333;text-align:justify}
.showDetail .showMain p{margin-bottom:16px;font-size:15px;color:#333;text-align:justify}
ul.tagList{padding:0;margin:18px 0 8px;overflow: hidden;}
ul.tagList>li{list-style:none;float: left;margin-right:10px;margin-bottom:10px;padding:4px 12px;color: #666;background:#EFEFEF;}
ul.tagList>li .h2Font{color: #666;}

discover.html

@@ -1,4 +1,4 @@
 <!DOCTYPE html>
 <!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
@@ -10,24 +10,94 @@
<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>
</header>
<div id="container">
<div id="container" style="margin-top:-20px;">
	<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/r.html

@@ -535,4 +535,4 @@ $(document).ready(function() {
</script>
</body>
</html>
</html>

information.html

@@ -300,17 +300,17 @@
		if(flag == 1) {
			console.log("年插件位置")
			if(c) {
				if (c == "至今") {
				if (c == "至今") {
					$(this).siblings(".mr_calendar_ym").show();
					$(this).siblings(".mr_calendar_ym").find(".yearli:contains('" + c + "')").addClass("active").siblings().removeClass("active");
					return false;
				} else{
					return false;
				} else{
					var ye = new Date().getFullYear();
					var sroTop = (ye - parseInt(c)) * 32;
					$(this).siblings(".mr_calendar_ym").show();
					$(this).siblings(".mr_calendar_ym").find(".full_year").scrollTop(sroTop);
					$(this).siblings(".mr_calendar_ym").find(".yearli:contains('" + c + "')").addClass("active").siblings().removeClass("active");
					return false;
					return false;
				}
				
			} else {

js/articalIssue.js

@@ -6,7 +6,10 @@ $(function() {
	var $data = {};
	var articleId;
	var fa = false;
  	var userid = $.cookie("userid");
  	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");
					}
@@ -342,6 +383,9 @@ $(function() {
	//文章发布
	$("#release").on("click", function() {
		if($(this).hasClass("disableLi")){
			return;
		}
		noTitleImg();
		if(imgflase && titleflase) {
			$.MsgBox.Confirm("提示", "确认发布该文章?", newsAdd);
@@ -350,6 +394,9 @@ $(function() {
	//定时文章发布
	$("#setTimeIssue").on("click", function() {
		if($(this).hasClass("disableLi")){
			return;
		}
		noTitleImg();
		if(imgflase && titleflase) {
			$(".blackcover2").fadeIn();
@@ -366,6 +413,9 @@ $(function() {
	//文章存草稿
	$("#draft").on("click", function() {
		if($(this).hasClass("disableLi")){
			return;
		}
		noTitleImg();
		if(imgflase && titleflase) {
			draftAdd(1);
@@ -374,6 +424,9 @@ $(function() {
	//文章预览
	$("#preview").on("click", function() {
		if($(this).hasClass("disableLi")){
			return;
		}
		noTitleImg();
		if(imgflase && titleflase) {
			draftAdd(2);
@@ -391,6 +444,7 @@ $(function() {
		$data.articleContent = ue.getContent();
		$data.professors = experarray;
		$data.resources = resourcesarray;
		$data.colNum=1;
		if($("#hidearticleId").val().length != 0) {
			$data.articleId = $("#hidearticleId").val();
		}
@@ -402,6 +456,7 @@ $(function() {
	/*文章发布*/
	function newsAdd() {
		$(".operateBlock").find("li").addClass("disableLi");
		getdata();
		$.ajax({
			"url": "/ajax/article/save",
@@ -409,6 +464,9 @@ $(function() {
			"dataType": "json",
			"data": $data,
			"traditional": true, //传数组必须加这个
			"complete":function(){
				$(".operateBlock").find("li").removeClass("disableLi");
			},
			"success": function(data) {
				console.log(data);
				if(data.success) {
@@ -435,12 +493,16 @@ $(function() {
	function setTimeIssue(publishTime) {
		var opublishTime=publishTime+"01";
		getdata(opublishTime);
		$(".operateBlock").find("li").addClass("disableLi");
		$.ajax({
			"url": "/ajax/article/timing",
			"type": "post",
			"dataType": "json",
			"data": $data,
			"traditional": true, //传数组必须加这个
			"complete":function(){
				$(".operateBlock").find("li").removeClass("disableLi");
			},
			"success": function(data) {
				if(data.success) {
					$("#hidearticleId").val(data.data);
@@ -461,6 +523,7 @@ $(function() {
	/*文章添加草稿和文章预览*/
	function draftAdd(num) {
		$(".operateBlock").find("li").addClass("disableLi");
		getdata();
		$.ajax({
			"url": "/ajax/article/draft",
@@ -468,6 +531,9 @@ $(function() {
			"dataType": "json",
			"data": $data,
			"traditional": true, //传数组必须加这个
			complete:function(){
				$(".operateBlock").find("li").removeClass("disableLi");
			},
			"success": function(data) {
				console.log(data);
				if(num == 1) {

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");
					}
@@ -509,6 +547,9 @@ $(function() {
	
	//文章发布
	$("#release").on("click",function(){
		if($(this).hasClass("disableLi")){
			return;
		}
		noTitleImg();
		if(titleflase){
			$.MsgBox.Confirm("提示","确认发布该文章?",newsAdd);	
@@ -517,6 +558,9 @@ $(function() {
	
	//文章存草稿
	$("#draft").on("click",function(){
		if($(this).hasClass("disableLi")){
			return;
		}
		noTitleImg();
		if(titleflase){
			draftAdd(1);
@@ -525,6 +569,9 @@ $(function() {
	
	//文章预览
	$("#preview").on("click",function(){
		if($(this).hasClass("disableLi")){
			return;
		}
		noTitleImg();
		if(titleflase){
			draftAdd(2);
@@ -539,6 +586,9 @@ $(function() {
	//定时文章发布
	$("#setTimeIssue").on("click", function() {
		//$(".form_datetime").val(timeGeshi(modifyTimeval));
		if($(this).hasClass("disableLi")){
			return;
		}
		noTitleImg();
		if(titleflase) {
			$(".blackcover2").fadeIn();
@@ -564,6 +614,7 @@ $(function() {
		$data.articleContent = ue.getContent();
		$data.professors = experarray;
		$data.resources = resourcesarray;
		$data.colNum=1;
		if(settime) {
			$data.publishTime = publishTime;
		}
@@ -573,6 +624,7 @@ $(function() {
	
	/*文章添加*/
	function newsAdd(){
		$(".operateBlock").find("li").addClass("disableLi");
		getdata();
		$.ajax({
			"url" : "/ajax/article/save",
@@ -580,6 +632,9 @@ $(function() {
			"dataType" : "json",
			"data" :$data,
			"traditional": true, //传数组必须加这个
			"complete":function(){
				$(".operateBlock").find("li").removeClass("disableLi");
			},
			"success" : function(data) {
				console.log(data);
				if (data.success){
@@ -606,12 +661,16 @@ $(function() {
	function setTimeIssue(publishTime,settime) {
		var opublishTime=publishTime+"01";
		getdata(opublishTime,settime);
		$(".operateBlock").find("li").addClass("disableLi");
		$.ajax({
			"url": "/ajax/article/timing",
			"type": "post",
			"dataType": "json",
			"data": $data,
			"traditional": true, //传数组必须加这个
			"complete":function(){
				$(".operateBlock").find("li").removeClass("disableLi");
			},
			"success": function(data) {
				console.log(data);
				if(data.success) {
@@ -633,6 +692,7 @@ $(function() {
	/*文章添加草稿和文章预览*/
	function draftAdd(num){
		$(".operateBlock").find("li").addClass("disableLi");
		getdata();
		$.ajax({
			"url" : "/ajax/article/draft",
@@ -640,6 +700,9 @@ $(function() {
			"dataType" : "json",
			"data" :$data,
			"traditional": true, //传数组必须加这个
			complete:function(){
				$(".operateBlock").find("li").removeClass("disableLi");
			},
			"success" : function(data) {
				console.log(data);
				if(num==1){

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

@@ -18,7 +18,7 @@ $(function() {
	}
	//最近文章
	function recentlyArticle(num,obj) {
		var ourl=num==1?"/ajax/article/qaOrgPublish":"/ajax/article/qaProPublish";
		var ourl=num==1?"/ajax/article/pqOrgPublish":"/ajax/article/pqProPublish";
		$.ajax({
			"url" :ourl ,
			"type" :  "GET" ,
@@ -26,7 +26,7 @@ $(function() {
			"data" :obj,
			"success" : function(data) {
				if (data.success){
					var $data=data.data;
					var $data=data.data.data;
					var only=false;
					if($data.length>1){
						$(".recentlyList").parents(".currentBlock").removeClass("displayNone");
@@ -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('提示','链接服务器超时')

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) {
@@ -611,4 +611,4 @@ $(function() {
	})
	
	
})
})

js/common.js

@@ -129,6 +129,9 @@ function loginStatus() {
		if(userAuth == "true" && authentication != "null") {
			$(".onlogin").show();
			$(".unlogin").hide();
			$(".portrait-p").on("click",function(){
				location.href="userInforShow.html?professorId="+userid;
			})
			$(".portrait-p").attr("src", "/images/head/" + userid + "_m.jpg");
			$(".portrait-p").load(function() { //判断图片是否加载，加载不成功默认有默认的图像									
				})
@@ -704,6 +707,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("");
@@ -756,11 +798,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",
@@ -768,30 +817,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();
@@ -1013,3 +1066,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,310 @@ $(function() {
	$(".headnav li").eq(1).addClass("navcurrent");
	loginStatus();//判断个人是否登录
	var userid = $.cookie("userid");
	discover(10, 1,true);
	/*发现列表显示*/
	function discover(pageSize, pageNo,isbind) {
	var exculdeIds=[];
	var exculdeId2s=[];
	//轮播加载页面
	$.ajax({
		"url":"/data/inc/col_banner.html",
		"dataType":"html",
		"success":function(result){
			$(".slide-box").html(result);
			bannerRotate.bannerInit();// 轮播
			for(var i=0;i<5;i++){
				var dataId=$(".slide-item").eq(i).attr("data-id");
				exculdeIds.push(dataId);
				exculdeId2s.push(dataId);
			}
			$(".slide-list").on("click",".slide-item",function(){
				var columId=$(this).attr("data-col");
				$.ajax({
					"url":"/ajax/operation/statist/bannerClick",
					"type":"POST" ,
					"dataType":"json",
					"data":{"id":columId},
					"success" : function(data) {
						console.log(data)
					}
				})
			})
		}
	})
	importNews(exculdeIds);
	hotNews();
	var linkNum=0;//栏目类别导航
	if(linkNum==0){
		listShow(exculdeId2s,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(exculdeId2s,1,0,true);
			}else{
				var thisNum=linkNum+2;
				listShow(exculdeIds,1,thisNum,true);
			}
		}else{
			$(this).find(".table-drop").show();
		}
	})
	
	//重大新闻
	function importNews(obj) {
		$.ajax({
			"url": "/ajax/article/findHot",
			"type": "get",
			"async": true,
			"data": {
				"pageSize": pageSize,
				"pageNo": pageNo
			"url" :"/ajax/article/find",
			"type" :  "GET" ,
			"dataType" : "json",
			"traditional": true,
			"async":false,
			"data" :{
				"exclude":obj,
				"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);
							exculdeId2s.push($data[i].articleId);
						}
					}
				}
			},
			"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(obj,pageNo,colNum,isbind){
		$.ajax({
			"url" :"/ajax/article/find",
			"type" :  "GET" ,
			"dataType" : "json",
			"traditional": true,
			"data" :{
				"exclude":obj,
				"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(obj,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 +314,8 @@ $(function() {
			}
		});
	}
	/*企业用户信息*/
	function cmpFun(id, $itemlist) {
	function cmpFun(id,$listItem) {
		$.ajax({
			"url": "/ajax/org/" + id,
			"type": "get",
@@ -140,25 +323,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 +334,4 @@ $(function() {
			}
		});
	}
	
})

js/paperList.js

@@ -114,15 +114,21 @@ function lewordNum(pId) {
 			oTime="导入于 "+TimeTr($data[i].assTime);
 			pageview='<li><span>阅读量 '+$data[i].pageViews+'</span></li>';
 			oHtml="paperShow.html"
 			var thub='<li><span>赞 '+isAgreeNum($data[i].id)+'</span></li>';
 			var lew='<li><span>留言 '+lewordNum($data[i].id)+'</span></li>';
 			var thub="";
 			if(isAgreeNum($data[i].id)!=0){
 				thub='<li><span>赞 '+isAgreeNum($data[i].id)+'</span></li>';
 			}
 			var lew="";
 			if(lewordNum($data[i].id)!=0){
 			    lew='<li><span>留言 '+lewordNum($data[i].id)+'</span></li>';
 			}
	 		var oStr='<li '+oLi+'>'+
				'<a href="'+oHtml+'?paperId='+$data[i].id+'" target="_blank">'+
					'<div class="madiaHead paperHead"></div>'	+						
						'<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

@@ -113,16 +113,21 @@ function lewordNum(pId) {
 			oTime="导入于 "+TimeTr($data[i].assTime);
 			pageview='<li><span>阅读量 '+$data[i].pageViews+'</span></li>';
 			oHtml="patentShow.html"
 			var thub='<li><span>赞 '+isAgreeNum($data[i].id)+'</span></li>';
 			var lew='<li><span>留言 '+lewordNum($data[i].id)+'</span></li>';
 			
 			var thub="";
 			if(isAgreeNum($data[i].id)!=0){
 				thub='<li><span>赞 '+isAgreeNum($data[i].id)+'</span></li>';
 			}
 			var lew="";
 			if(lewordNum($data[i].id)!=0){
 			    lew='<li><span>留言 '+lewordNum($data[i].id)+'</span></li>';
 			}
	 	var oStr='<li '+oLi+'>'+
				'<a href="'+oHtml+'?patentId='+$data[i].id+'" target="_blank">'+
					'<div class="madiaHead patentHead"></div>'	+						
						'<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("");
@@ -400,6 +415,9 @@ $(document).ready(function() {
	limitObj("#remarkContent",200)
	/*发布*/
	$(".goFabu").click(function(){
		if($(this).hasClass("disableLi")){
			return;
		}
		var  oYes=term();
		if(oYes==0) {
			return;
@@ -408,6 +426,9 @@ $(document).ready(function() {
	})
	/*预览*/
	$("#oPreview").click(function(){
		if($(this).hasClass("disableLi")){
			return;
		}
		var  oYes=term();
		if(oYes==0) {
			return;
@@ -416,6 +437,9 @@ $(document).ready(function() {
	})
	/*存草稿*/
	$("#oDraft").click(function(){
		if($(this).hasClass("disableLi")){
			return;
		}
		var  oYes=term();
		if(oYes==0) {
			return;
@@ -463,6 +487,7 @@ $(document).ready(function() {
	}
	/*发布函数*/
	function ajsPost(pa1,pa2) {
		$(".operateBlock").find("li").addClass("disableLi");
		var oUrl="/ajax/resource/save";
		if(pa1) {
			oUrl=pa1
@@ -488,6 +513,9 @@ $(document).ready(function() {
			$.ajax({
					"url": oUrl,
					"type": "POST",
					"complete":function(){
						$(".operateBlock").find("li").removeClass("disableLi");
					},
					"success": function(data) {
						console.log(data)
						if(data.success) {

js/resourceList.js

@@ -74,7 +74,7 @@ $(document).ready(function(){
	 			oLi="class='draftList'"
	 		}else{
	 			oTime="发布于 "+TimeTr($data[i].publishTime);
	 			pageview='<li><span>阅读量 '+$data[i].pageViews+'</span></li>';
	 			pageview='<li><span>浏览量 '+$data[i].pageViews+'</span></li>';
	 			oHtml="resourceShow.html"
	 		}
	 	var oStr='<li '+oLi+'>'+

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();
		}
@@ -640,4 +640,4 @@ $(document).ready(function() {
	})
	
	
})
})

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

@@ -691,7 +691,7 @@ $(function() {
							var strAdd = '';
							strAdd += '<li><a traget="_blank" href="resourceShow.html?resourceId='+ dataStr[i].resourceId +'" class="flexCenter urlgo">';
							strAdd += '<div class="madiaHead resouseHead" style="background-image:url('+ madiaHead +')"></div>';
							strAdd += '<div class="madiaInfo"><p class="h1Font ellipsisSty-2">'+ dataStr[i].resourceName +'</p><p class="h2Font ellipsisSty">应用用途：'+ dataStr[i].supportedServices+'</p></div>';				
							strAdd += '<div class="madiaInfo"><p class="h1Font ellipsisSty">'+ dataStr[i].resourceName +'</p><p class="h2Font ellipsisSty-2">用途：'+ dataStr[i].supportedServices+'</p></div>';				
							strAdd += '</a></li>';
							var $strAdd = $(strAdd);
							$("#proResource").append(strAdd);
@@ -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) {

resourceIssue.html

@@ -31,8 +31,8 @@
			        					<!--未上传图片时-->
			        					<div class="upFront" id="uploader">
				        					<p>资源图片<em class="requiredcon">*</em></p>
				        					<p class="uploadtip">JPG/PNG格式，2M以内</p>
				            				<span class="upbtn">上传图片</span>
				        					<p class="uploadtip">JPG/JPEG/PNG格式，<br/>2M以内</p>
				            				<span class="upbtn" style="margin-top:8px">上传图片</span>
			        					</div>
				            		</div>
			        			</div>

resourcePreview.html

@@ -111,10 +111,10 @@
						<span class="attenSpan">关注</span>
					</div>
				</div>
				<div class="conItem conItemG displayNone" id="enterprise" style="border:none;padding:30px;">
				<div class="conItem conItemG alignCenter displayNone" id="enterprise" style="border:none;padding:30px;">
					<a class="qiyego">
						<div class="madiaHead cmpHead" id="Qimg">
							<div class="boxBlock" style="width:98px;height:98px">
							<div class="boxBlock">
								<img class="boxBlockimg" src="" id="companyImg">
							</div>
						</div>

userInforShow.html

@@ -103,17 +103,17 @@
						<div class="coninfotit">研究方向</div>
						<div class="coninfocon listResearch">
							<ul class="clearfix" id="researchAreaShow">
								<!--<li>
									<div class="favorBox"><span class="like">2</span>uuuuuu</div>
									<span class="plus"></span>
									<div class="favorCount">
										<span class="like-people" style="background-image: url(../images/default-photo.jpg);"></span>
										<span class="like-people" style="background-image: url(../images/head/11342E8FFFD34E0699044BF4B4B19449_s.jpg);"></span>
										<span class="like-people" style="background-image: url(../images/default-photo.jpg);"></span>
										<span class="like-people" style="background-image: url(../images/head/11342E8FFFD34E0699044BF4B4B19449_s.jpg);"></span>
										<span class="like-people" style="background-image: url(../images/default-photo.jpg);"></span>
										<span class="like-people like-more"></span>
									</div>
								<!--<li>
									<div class="favorBox"><span class="like">2</span>uuuuuu</div>
									<span class="plus"></span>
									<div class="favorCount">
										<span class="like-people" style="background-image: url(../images/default-photo.jpg);"></span>
										<span class="like-people" style="background-image: url(../images/head/11342E8FFFD34E0699044BF4B4B19449_s.jpg);"></span>
										<span class="like-people" style="background-image: url(../images/default-photo.jpg);"></span>
										<span class="like-people" style="background-image: url(../images/head/11342E8FFFD34E0699044BF4B4B19449_s.jpg);"></span>
										<span class="like-people" style="background-image: url(../images/default-photo.jpg);"></span>
										<span class="like-people like-more"></span>
									</div>
								</li>-->
							</ul>
						</div>
@@ -130,13 +130,13 @@
						<div class="coninfotit">资源<span class="seeMore" id="seeMoreR">查看全部<em></em></span></div>
						<div class="coninfocon form-result aboutRes">
							<ul id="showResource">
								<!--<li><a href="resourceShow.html" class="flexCenter urlgo">
									<div class="madiaHead resouseHead" id="userimg"></div>
									<div class="madiaInfo">
										<p class="h1Font ellipsisSty-2" id="resourceName">习近平将对哈萨克斯坦进行国事访问并出席活动习近平将对哈萨克斯坦进行国事访问并出席活动习近平将对哈萨克斯坦进行国事访问并出席活动</p>
										<p class="h2Font ellipsisSty">应用用途：习近平将对哈萨克斯坦进行国事访问并出席活动习近平将对哈萨克斯坦进行国事访问并出席活动习近平将对哈萨克斯坦进行国事访问并出席活动</p>
									</div>
								</a>
								<!--<li><a href="resourceShow.html" class="flexCenter urlgo">
									<div class="madiaHead resouseHead" id="userimg"></div>
									<div class="madiaInfo">
										<p class="h1Font ellipsisSty-2" id="resourceName">习近平将对哈萨克斯坦进行国事访问并出席活动习近平将对哈萨克斯坦进行国事访问并出席活动习近平将对哈萨克斯坦进行国事访问并出席活动</p>
										<p class="h2Font ellipsisSty">应用用途：习近平将对哈萨克斯坦进行国事访问并出席活动习近平将对哈萨克斯坦进行国事访问并出席活动习近平将对哈萨克斯坦进行国事访问并出席活动</p>
									</div>
								</a>
								</li>-->
							</ul>
						</div>
@@ -149,21 +149,21 @@
							</ul>
						</div>
					</div>
					<div class="coninfobox form-item otherShow displayNone">
						<div class="coninfotit">专利 <span class="seeMore" id="seeMoreP">查看全部<em></em></span></div>
						<div class="coninfocon form-result aboutRes">
							<ul id="showPatent">
								
							</ul>
						</div>
					</div>
					<div class="coninfobox form-item otherShow displayNone">
						<div class="coninfotit">论文 <span class="seeMore" id="seeMoreL">查看全部<em></em></span></div>
						<div class="coninfocon form-result aboutRes">
							<ul id="showPaper">
								
							</ul>
						</div>
					<div class="coninfobox form-item otherShow displayNone">
						<div class="coninfotit">专利 <span class="seeMore" id="seeMoreP">查看全部<em></em></span></div>
						<div class="coninfocon form-result aboutRes">
							<ul id="showPatent">
								
							</ul>
						</div>
					</div>
					<div class="coninfobox form-item otherShow displayNone">
						<div class="coninfotit">论文 <span class="seeMore" id="seeMoreL">查看全部<em></em></span></div>
						<div class="coninfocon form-result aboutRes">
							<ul id="showPaper">
								
							</ul>
						</div>
					</div>
					<div class="coninfobox form-item commentsArea displayNone">
						<div class="coninfotit" style="margin-bottom:4px;">合作评价</div>
@@ -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>
@@ -332,8 +332,8 @@
						</div>
					</div>
				</div>
				<!--<ul class="advertItem">
					<li><a href="download.html" target="_blank"><img src="images/find_img_xiazai_nor.png" /></a></li>
				<!--<ul class="advertItem">
					<li><a href="download.html" target="_blank"><img src="images/find_img_xiazai_nor.png" /></a></li>
				</ul>-->
			</div>
		</div>
@@ -353,22 +353,22 @@
<script type="text/javascript" src="js/jquery.page.js"></script>
<script type="text/javascript" src="js/userInforShow.js"></script>
<script type="text/javascript" src="js/popup.js"></script>
<script>
	//微信分享
	var qrcode = new QRCode(document.getElementById("qrcode"), {
		width: 100,
		height: 100
	});
	function makeCode() {
		var hurl = window.location.host;
		var professorId = GetQueryString("professorId");
		var elurl = "http://" + hurl + "/e/p.html?id=" + professorId;
		qrcode.makeCode(elurl);
	}
	makeCode();
<script>
	//微信分享
	var qrcode = new QRCode(document.getElementById("qrcode"), {
		width: 100,
		height: 100
	});
	function makeCode() {
		var hurl = window.location.host;
		var professorId = GetQueryString("professorId");
		var elurl = "http://" + hurl + "/e/p.html?id=" + professorId;
		qrcode.makeCode(elurl);
	}
	makeCode();
	//分享关注按钮
	$('.shareWeixin').hover(function(){$('.shareCode').stop(true,false).fadeToggle();});
	
@@ -376,7 +376,7 @@
		$(this).addClass("liNow").siblings().removeClass("liNow");
		$(".leftconBox .leftconItem").eq($(this).index()).show().siblings().hide();
	})
	
	
</script>
</body>