7 年之前 · 3356a444e2
--- a/edu-article/JkEdu/LocalDB.mv.db
+++ b/edu-article/JkEdu/LocalDB.mv.db
--- a/edu-article/JkEdu/LocalDB.trace.db
+++ b/edu-article/JkEdu/LocalDB.trace.db
@ -0,0 +1,3 @@
 
				09-05 15:56:10 jdbc[4]: exception
			
 
				org.h2.jdbc.JdbcSQLException: Table "TASKTABLE" not found; SQL statement:
			
 
				SELECT count(1) FROM TaskTable [42102-187]
			
--- a/edu-article/JkEdu/WebRoot/1.txt
+++ b/edu-article/JkEdu/WebRoot/1.txt
@ -0,0 +1 @@
 
				111
			
--- a/edu-article/JkEdu/WebRoot/JkArticle/AddPcJkArticle.html
+++ b/edu-article/JkEdu/WebRoot/JkArticle/AddPcJkArticle.html
@ -0,0 +1,461 @@
 
				<!DOCTYPE html>
			
 
				<html lang="en">
			
 
				<head>
			
 
				<meta charset="utf-8" />
			
 
				<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
			
 
				<meta name="renderer" content="webkit" />
			
 
				<title>添加文章-卫计委</title>
			
 
				<link rel="stylesheet" href="../iconfont/iconfont.css" type="text/css" />
			
 
				<link rel="stylesheet" href="../cross/css/cross.css" type="text/css" />
			
 
				<link rel="stylesheet" href="../cross/css/cross.ui.css" type="text/css" />
			
 
				<link rel="stylesheet" href="../css/health-edu.css" type="text/css" />
			
 
				</head>
			
 
				<body>
			
 
				
			
 
				
			
 
					<div class="c-hidden">
			
 
						<div class="phone-part fr">
			
 
							<div class="c-t-center mb30">
			
 
								<a id="preview" href="javascript:;" onclick="preview()"
			
 
									class="c-btn bgc-ec6941 btn-w60">预览</a>
			
 
							</div>
			
 
							<div class="phone">
			
 
								<div class="phone-wrap">
			
 
									<div class="phone-header">
			
 
										<img src="../images/health-edu/top.png" class="width-100" />
			
 
										<div class="phone-tit">
			
 
											<a href="javascript:;" class="btn-return"><i
			
 
												class="iconfont icon-xiangzuo c-f12"></i> 返回</a>
			
 
											<h1>添加文章</h1>
			
 
											<a href="#" class="btn-more"><i class="iconfont icon-more"></i></a>
			
 
										</div>
			
 
									</div>
			
 
									<div class="phone-main">
			
 
										<div class="article" id="articlecp"></div>
			
 
									</div>
			
 
								</div>
			
 
							</div>
			
 
						</div>
			
 
						<div class="main-part p20">
			
 
							<div
			
 
								class="form-layout form-horizontal form-horizontal-narrow c-f14 c-666 mtb20">
			
 
								<div class="control-group">
			
 
									<label class="control-label c-t-right">分类：</label>
			
 
									<div class="control-form">
			
 
										<div class=" cus-sel cus-sel-w200 cus-sel-h33"
			
 
											id="FirstLevelCategoryId"  >
			
 
				
			
 
											<div class="cus-sel-chosed">
			
 
												<input id="p_FirstLevelCategoryId" type="text"  class="c-hide"> <span
			
 
													class="cus-sel-chosed-txt" data-value="">--请选择一级分类--</span> <span
			
 
													class="jselect-icon"></span>
			
 
											</div>
			
 
											<div class="cus-sel-list c-hide">
			
 
												<ul>
			
 
												</ul>
			
 
											</div>
			
 
										</div>
			
 
										<div class="cus-sel cus-sel-h33 ml10"  
			
 
											id="SecondLevelCategoryId">
			
 
											<div class="cus-sel-chosed">
			
 
												<input  id="p_SecondLevelCategoryId" type="text" class="c-hide"> <span
			
 
													class="cus-sel-chosed-txt" data-value="">--请选择二级分类--</span> <span
			
 
													class="jselect-icon"></span>
			
 
											</div>
			
 
											<div class="cus-sel-list c-hide">
			
 
												<ul>
			
 
												</ul>
			
 
											</div>
			
 
										</div>
			
 
									</div>
			
 
								</div>
			
 
								<div class="control-group">
			
 
									<label class="control-label c-t-right">优先级：</label>
			
 
									<div class="control-form">
			
 
										<div class="cus-sel cus-sel-h33" data-toggle="formSelect"
			
 
											id="Articlelevel">
			
 
											<div class="cus-sel-chosed">
			
 
												<input type="text" style="display:none;"> <span
			
 
													class="cus-sel-chosed-txt" data-value="">--请选择重要等级--</span> <span
			
 
													class="jselect-icon"></span>
			
 
											</div>
			
 
											<div class="cus-sel-list c-hide">
			
 
												<ul>
			
 
												</ul>
			
 
											</div>
			
 
										</div>
			
 
									</div>
			
 
								</div>
			
 
				
			
 
								<div class="control-group">
			
 
									<label class="control-label c-t-right">类型：</label>
			
 
									<div class="control-form">
			
 
										<div class="cus-sel cus-sel-h33" id="ArticleType">
			
 
											<div class="cus-sel-chosed">
			
 
												<input type="text" style="display:none;"> <span
			
 
													class="cus-sel-chosed-txt" data-value="">--请选择类型--</span> <span
			
 
													class="jselect-icon"></span>
			
 
											</div>
			
 
											<div class="cus-sel-list c-hide">
			
 
												<ul>
			
 
												</ul>
			
 
											</div>
			
 
										</div>
			
 
									</div>
			
 
								</div>
			
 
								<div class="control-group">
			
 
									<label class="control-label c-t-right">标题：</label>
			
 
									<div class="control-form">
			
 
										<input type="text" placeholder="请输入标题" maxlength="50"
			
 
											class="input-text input-text-w520" id="ArticleTitle">
			
 
										<div class="c-inline-block c-ec514f c-f12 ml10">最多输入50个字</div>
			
 
									</div>
			
 
								</div>
			
 
				
			
 
								<div class="control-group">
			
 
									<label class="control-label mt25 c-t-right">封面：</label>
			
 
									<div class="control-form">
			
 
										<div class="upload-img mr20" id="newUrl" style="display:none;">
			
 
										</div>
			
 
										<span class="btn-file btn-file-3 fileinput-button" id="fileHide">
			
 
											<i class="c-f40 c-bold">+</i> <input id="articleCoverFile"
			
 
											class="fileupload-btn" type="file" name="file" multiple="">
			
 
										</span> <span class="control-tip">注：为了前端的优质显示效果，建议图片大小控制在100kb以内，像素200x200以内（支持jpg/png/gif）</span>
			
 
									</div>
			
 
								</div>
			
 
				
			
 
								<div class="control-group">
			
 
									<label class="control-label c-t-right">内容：</label>
			
 
									<div class="control-form">
			
 
										<script id="content" name="content" type="text/plain"></script>
			
 
									</div>
			
 
								</div>
			
 
								<div class="control-group">
			
 
									<div class="control-form">
			
 
										<a href="#" class="c-btn c-btn-blue btn-w60"
			
 
											onClick="saveArticle()">保存</a> <a href="#"
			
 
											class="c-btn c-btn-white btn-w60 ml10">取消</a>
			
 
									</div>
			
 
								</div>
			
 
				
			
 
							</div>
			
 
						</div>
			
 
					</div>
			
 
					<script type="text/javascript"
			
 
						src="../widget/artDialog/4.1.7/js/artDialog.min.js"></script>
			
 
				
			
 
					<script type="text/javascript" src="../cross/js/jquery/1.8.3/jquery.js"></script>
			
 
				
			
 
					<script type="text/javascript" src="../cross/js/cross.ui.js"></script>
			
 
					<link rel="stylesheet"
			
 
						href="../widget/artDialog/4.1.7/css/artDialog.css" type="text/css" />
			
 
					<script type="text/javascript"
			
 
						src="../widget/artDialog/4.1.7/js/artDialog.js"></script>
			
 
					<script type="text/javascript"
			
 
						src="../widget/placeholder/2.0.7/js/jquery.placeholder.js"></script>
			
 
					<script type="text/javascript"
			
 
						src="../widget/nicescroll/3.6.0/js/jquery.nicescroll.min.js"></script>
			
 
					<script type="text/javascript"
			
 
						src="../widget/ueditor/1.4.3/ueditor.config2.js"></script>
			
 
					<script type="text/javascript"
			
 
						src="../widget/ueditor/1.4.3/ueditor.api.js"></script>
			
 
					<script type="text/javascript"
			
 
						src="../widget/inputSelect/1.0/js/inputSelect.js"></script>
			
 
					<script type="text/javascript"
			
 
						src="../widget/fileUpload/9.11.2/js/jquery.fileupload.js"></script>
			
 
					<script src="../cross/js/jquery/1.8.3/ajaxfileupload.js"></script>
			
 
				
			
 
					<script type="text/javascript">
			
 
				var remark1 = null;
			
 
				var articleCover = ""; //封面图
			
 
				$(function() {
			
 
					
			
 
					
			
 
				 	var articleid = getUrlParam("articleid");
			
 
				 	getrounte1();
			
 
					getrounte2();
			
 
					getArticlelevel();
			
 
					getArticleType();
			
 
				
			
 
				
			
 
					$('.phone-main').height($('.phone-wrap').height() - $('.phone-header').height());
			
 
					//ueditor
			
 
					remark1 = UE.getEditor('content');
			
 
					$("#articleCoverFile").change(function () {
			
 
						uploadImage();
			
 
				    });
			
 
				
			
 
					//预览区自定义滚动条
			
 
				    $(".phone-main").niceScroll({cursorcolor:"#a8a8a8",zindex:999});
			
 
				    var nice = $(".phone-main").getNiceScroll();
			
 
				    $(window).resize(function(){
			
 
				        nice.resize();
			
 
				    });
			
 
				    
			
 
				
			
 
				});
			
 
				function getUrlParam(name) {
			
 
					var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
			
 
					var r = window.location.search.substr(1).match(reg);
			
 
					if (r!=null) return decodeURI(r[2]); return "";
			
 
				}
			
 
				
			
 
				
			
 
				function uploadImage(){
			
 
					var val=$("#articleCoverFile").val();
			
 
					if(val==null||val==""){
			
 
						return;
			
 
					}
			
 
					$.ajaxFileUpload({
			
 
						url : '/JkEdu/file/upload', //需要链接到服务器地址  
			
 
						secureuri : false,
			
 
						fileElementId : 'articleCoverFile', //文件选择框的id属性  
			
 
						dataType : 'json',
			
 
						success : function(data, status) {
			
 
							var file = $("#articleCoverFile") ;
			
 
							file.after(file.clone().val(""));      
			
 
							file.remove(); 
			
 
							
			
 
							if (data.Code == 10000) {
			
 
								 
			
 
							 	var html = "";
			
 
						 		html += '';
			
 
					 			html += '<img src="'+(data.url.Uri==undefined?'':data.url.Uri)+'" alt="" />';
			
 
						 		html += '<i class="icon icon-close" id = "gg"></i>';
			
 
				 
			
 
				                $('#newUrl').html(html);
			
 
						 		$("#newUrl").show();//
			
 
						 		$("#fileHide").hide();//隐藏
			
 
						 		articleCover = data.url.Uri;
			
 
				 
			
 
						 		$("#gg").click(function () {
			
 
						 			uploadImage2();
			
 
						 		});
			
 
							} else if (data.Code == -10000) {
			
 
								
			
 
				
			
 
							}
			
 
						},error: function (data, status, e){
			
 
				      	     artLoading.close();
			
 
				       	     tip("请重新登录，可能网络异常");
			
 
				       }
			
 
					});	
			
 
				}
			
 
				function uploadImage2(){
			
 
						$("#newUrl").hide();
			
 
						$("#fileHide").show();
			
 
						$("#articleCoverFile").change(function () {
			
 
							uploadImage();
			
 
					    });
			
 
				}
			
 
				
			
 
				
			
 
				
			
 
				//保存文章
			
 
				function saveArticle(){
			
 
				
			
 
					var param = {};
			
 
					var remark = remark1.getContent();
			
 
					param.remark = remark;
			
 
					
			
 
					param.ArticleTitle = $('#ArticleTitle').val();
			
 
					param.ArticleType =  $('#ArticleType').formSelect('getDataKey');
			
 
					param.Articlelevel =  $('#Articlelevel').formSelect('getDataKey');
			
 
					param.newUrl = articleCover;
			
 
					param.SecondLevelCategoryId =  $('#SecondLevelCategoryId').formSelect('getDataKey');
			
 
					param.SecondLevelCategoryName =  $('#SecondLevelCategoryId').formSelect('getDataVal');
			
 
					 
			
 
					param.FirstLevelCategoryId =  $('#FirstLevelCategoryId').formSelect('getDataKey');
			
 
					param.FirstLevelCategoryName =  $('#FirstLevelCategoryId').formSelect('getDataVal');
			
 
					if("" == param.ArticleTitle){
			
 
						ask("标题不能为空");
			
 
						return;
			
 
					}
			
 
					
			
 
					$.post("/JkEdu/articlePc/saveArticle",param, function(data){
			
 
							if(data.Code==10000){
			
 
								var artBox=art.dialog({
			
 
									lock: true,
			
 
									artIcon:'error',
			
 
									opacity:0.4,
			
 
									width: 250,
			
 
									title:'提示',
			
 
									content: "保存成功",
			
 
									ok: function () {
			
 
					 					location.href ="JkArticleLibrary.html";
			
 
										//window.opener.query();
			
 
									},
			
 
									close:function(){
			
 
						   		 	}
			
 
								});
			
 
							}else{
			
 
								ask(data.Message);
			
 
							}
			
 
						});
			
 
					 
			
 
				}
			
 
				
			
 
				function ask(message){
			
 
				 	art.dialog({
			
 
						lock : true,
			
 
						artIcon : 'ask',
			
 
						opacity : 0.4,
			
 
						width : 250,
			
 
						title : '提示',
			
 
						content : message,
			
 
						ok : function() {
			
 
							
			
 
						}
			
 
					});
			
 
				 	
			
 
				 }
			
 
				 
			
 
				//一级分类下拉框
			
 
				function getrounte1(){
			
 
					
			
 
					var tempArr =new Array();
			
 
					$.ajax({
			
 
						dataType: "json",
			
 
						type: "POST",
			
 
						cache:false,
			
 
						data : {
			
 
						},
			
 
						url: "/JkEdu/configDict/getCateOne",
			
 
						success : function(result) {
			
 
							
			
 
							
			
 
							if (result.Code == 10000) {
			
 
								var list = result.result;
			
 
								
			
 
								if (list != null) {
			
 
									list.unshift({
			
 
										"categoryId" : "",
			
 
										"categoryName" : "--请选择一级分类--"
			
 
									});
			
 
									$('#FirstLevelCategoryId').formSelect({
			
 
										jsonData : list,
			
 
										jsonDataId : "categoryId",
			
 
										jsonDataText : "categoryName"
			
 
									}, null, function(dom, text, value) {// 点击某个选项回调
			
 
										$('#SecondLevelCategoryId').formSelect('resetValue');
			
 
										getrounte2();
			
 
									});
			
 
								}
			
 
							}
			
 
						}
			
 
					});
			
 
				}
			
 
				
			
 
				//二级分类下拉框
			
 
				function getrounte2(){
			
 
					var pFirstId = $("#p_FirstLevelCategoryId").val();
			
 
					var tempArr =new Array();
			
 
					$.ajax({
			
 
						dataType: "json",
			
 
						type: "POST",
			
 
						cache:false,
			
 
						data : {
			
 
							pFirstId:pFirstId,
			
 
						},
			
 
						url: "/JkEdu/configDict/getCateTwo",
			
 
						success : function(result) {
			
 
							
			
 
							
			
 
							if (result.Code == 10000) {
			
 
								var list = result.result;
			
 
								
			
 
								if (list != null) {
			
 
									list.unshift({
			
 
										"categoryId" : "",
			
 
										"categoryName" : "--请选择一级分类--"
			
 
									});
			
 
									$('#SecondLevelCategoryId').formSelect({
			
 
										jsonData : list,
			
 
										jsonDataId : "categoryId",
			
 
										jsonDataText : "categoryName"
			
 
									}, null, function(dom, text, value) {// 点击某个选项回调
			
 
										 
			
 
									});
			
 
								}
			
 
							}
			
 
						}
			
 
					});
			
 
				}
			
 
				//优先级下拉框
			
 
				function getArticlelevel(){
			
 
					
			
 
					var tempArr =new Array();
			
 
					$.ajax({
			
 
						dataType: "json",
			
 
						type: "POST",
			
 
						cache:false,
			
 
						data : {
			
 
							typeName : "prio"
			
 
				
			
 
						},
			
 
						url: "/JkEdu/configDict/getDict",
			
 
						success : function(result) {
			
 
							if (result.Code == 10000) {
			
 
								var list = result.result;
			
 
								if (list != null) {
			
 
									list.unshift({
			
 
										"code" : "",
			
 
										"codeName" : "--请选择重要等级--"
			
 
									});
			
 
									$('#Articlelevel').formSelect({
			
 
										jsonData : list,
			
 
										jsonDataId : "code",
			
 
										jsonDataText : "codeName"
			
 
									}, null, function(dom, text, value) {// 点击某个选项回调
			
 
										 
			
 
									});
			
 
								}
			
 
							}
			
 
						}
			
 
					});
			
 
				}
			
 
				//类型下拉框
			
 
				function getArticleType() {
			
 
						$.ajax({
			
 
							url: "/JkEdu/configDict/getDict",
			
 
							
			
 
				 			async : false,
			
 
							dataType: "json",
			
 
							type: "POST",
			
 
							
			
 
				 			data : {
			
 
								typeName : "aType"
			
 
							},
			
 
							success : function(result) {
			
 
								if (result.Code == 10000) {
			
 
									var list = result.result;
			
 
									if (list != null) {
			
 
										list.unshift({
			
 
											"code" : "",
			
 
											"codeName" : "--请选择类型--"
			
 
										});
			
 
										$('#ArticleType').formSelect({
			
 
											jsonData : list,
			
 
											jsonDataId : "code",
			
 
											jsonDataText : "codeName"
			
 
										}, null, function(dom, text, value) {// 点击某个选项回调
			
 
											 
			
 
										});
			
 
									}
			
 
								}
			
 
							}
			
 
						});
			
 
				}
			
 
				
			
 
				//预览
			
 
				function preview()
			
 
				{
			
 
					var remark = remark1.getContent();
			
 
				    var fatherDiv = remark;
			
 
				    var sonDiv = document.getElementById("articlecp");
			
 
				    //将fatherDiv中的所有内容 包括HTML标签 给son
			
 
				    sonDiv.innerHTML = remark;
			
 
				}
			
 
				</script>
			
 
				</body>
			
 
				</html>
			
--- a/edu-article/JkEdu/WebRoot/JkArticle/AddPcJkArticleDoctor.html
+++ b/edu-article/JkEdu/WebRoot/JkArticle/AddPcJkArticleDoctor.html
@ -0,0 +1,462 @@
 
				<!DOCTYPE html>
			
 
				<html lang="en">
			
 
				<head>
			
 
				<meta charset="utf-8" />
			
 
				<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
			
 
				<meta name="renderer" content="webkit" />
			
 
				<title>添加文章-卫计委</title>
			
 
				<link rel="stylesheet" href="../iconfont/iconfont.css" type="text/css" />
			
 
				<link rel="stylesheet" href="../cross/css/cross.css" type="text/css" />
			
 
				<link rel="stylesheet" href="../cross/css/cross.ui.css" type="text/css" />
			
 
				<link rel="stylesheet" href="../css/health-edu.css" type="text/css" />
			
 
				</head>
			
 
				<body>
			
 
				
			
 
				
			
 
					<div class="c-hidden">
			
 
						<div class="phone-part fr">
			
 
							<div class="c-t-center mb30">
			
 
								<a id="preview" href="javascript:;" onclick="preview()"
			
 
									class="c-btn bgc-ec6941 btn-w60">预览</a>
			
 
							</div>
			
 
							<div class="phone">
			
 
								<div class="phone-wrap">
			
 
									<div class="phone-header">
			
 
										<img src="../images/health-edu/top.png" class="width-100" />
			
 
										<div class="phone-tit">
			
 
											<a href="javascript:;" class="btn-return"><i
			
 
												class="iconfont icon-xiangzuo c-f12"></i> 返回</a>
			
 
											<h1>添加编辑文章</h1>
			
 
											<a href="#" class="btn-more"><i class="iconfont icon-more"></i></a>
			
 
										</div>
			
 
									</div>
			
 
									<div class="phone-main">
			
 
										<div class="article" id="articlecp"></div>
			
 
									</div>
			
 
								</div>
			
 
							</div>
			
 
						</div>
			
 
						<div class="main-part p20">
			
 
							<div
			
 
								class="form-layout form-horizontal form-horizontal-narrow c-f14 c-666 mtb20">
			
 
								<div class="control-group">
			
 
									<label class="control-label c-t-right">分类：</label>
			
 
									<div class="control-form">
			
 
										<div class=" cus-sel cus-sel-w200 cus-sel-h33"
			
 
											id="FirstLevelCategoryId"  >
			
 
				
			
 
											<div class="cus-sel-chosed">
			
 
												<input id="p_FirstLevelCategoryId" type="text"  class="c-hide"> <span
			
 
													class="cus-sel-chosed-txt" data-value="">--请选择一级分类--</span> <span
			
 
													class="jselect-icon"></span>
			
 
											</div>
			
 
											<div class="cus-sel-list c-hide">
			
 
												<ul>
			
 
												</ul>
			
 
											</div>
			
 
										</div>
			
 
										<div class="cus-sel cus-sel-h33 ml10"  
			
 
											id="SecondLevelCategoryId">
			
 
											<div class="cus-sel-chosed">
			
 
												<input  id="p_SecondLevelCategoryId" type="text" class="c-hide"> <span
			
 
													class="cus-sel-chosed-txt" data-value="">--请选择二级分类--</span> <span
			
 
													class="jselect-icon"></span>
			
 
											</div>
			
 
											<div class="cus-sel-list c-hide">
			
 
												<ul>
			
 
												</ul>
			
 
											</div>
			
 
										</div>
			
 
									</div>
			
 
								</div>
			
 
								<div class="control-group">
			
 
									<label class="control-label c-t-right">优先级：</label>
			
 
									<div class="control-form">
			
 
										<div class="cus-sel cus-sel-h33" data-toggle="formSelect"
			
 
											id="Articlelevel">
			
 
											<div class="cus-sel-chosed">
			
 
												<input type="text" style="display:none;"> <span
			
 
													class="cus-sel-chosed-txt" data-value="">--请选择重要等级--</span> <span
			
 
													class="jselect-icon"></span>
			
 
											</div>
			
 
											<div class="cus-sel-list c-hide">
			
 
												<ul>
			
 
												</ul>
			
 
											</div>
			
 
										</div>
			
 
									</div>
			
 
								</div>
			
 
				
			
 
								<div class="control-group">
			
 
									<label class="control-label c-t-right">类型：</label>
			
 
									<div class="control-form">
			
 
										<div class="cus-sel cus-sel-h33" id="ArticleType">
			
 
											<div class="cus-sel-chosed">
			
 
												<input type="text" style="display:none;"> <span
			
 
													class="cus-sel-chosed-txt" data-value="">--请选择类型--</span> <span
			
 
													class="jselect-icon"></span>
			
 
											</div>
			
 
											<div class="cus-sel-list c-hide">
			
 
												<ul>
			
 
												</ul>
			
 
											</div>
			
 
										</div>
			
 
									</div>
			
 
								</div>
			
 
								<div class="control-group">
			
 
									<label class="control-label c-t-right">标题：</label>
			
 
									<div class="control-form">
			
 
										<input type="text" placeholder="请输入标题" maxlength="50"
			
 
											class="input-text input-text-w520" id="ArticleTitle">
			
 
										<div class="c-inline-block c-ec514f c-f12 ml10">最多输入50个字</div>
			
 
									</div>
			
 
								</div>
			
 
				
			
 
								<div class="control-group">
			
 
									<label class="control-label mt25 c-t-right">封面：</label>
			
 
									<div class="control-form">
			
 
										<div class="upload-img mr20" id="newUrl" style="display:none;">
			
 
										</div>
			
 
										<span class="btn-file btn-file-3 fileinput-button" id="fileHide">
			
 
											<i class="c-f40 c-bold">+</i> <input id="articleCoverFile"
			
 
											class="fileupload-btn" type="file" name="file" multiple="">
			
 
										</span> <span class="control-tip">注：为了前端的优质显示效果，建议图片大小控制在100kb以内，像素200x200以内（支持jpg/png/gif）</span>
			
 
									</div>
			
 
								</div>
			
 
				
			
 
								<div class="control-group">
			
 
									<label class="control-label c-t-right">内容：</label>
			
 
									<div class="control-form">
			
 
										<script id="content" name="content" type="text/plain"></script>
			
 
									</div>
			
 
								</div>
			
 
								<div class="control-group">
			
 
									<div class="control-form">
			
 
										<a href="#" class="c-btn c-btn-blue btn-w60"
			
 
											onClick="saveArticle()">保存</a> <a href="#"
			
 
											class="c-btn c-btn-white btn-w60 ml10">取消</a>
			
 
									</div>
			
 
								</div>
			
 
				
			
 
							</div>
			
 
						</div>
			
 
					</div>
			
 
					<script type="text/javascript"
			
 
						src="../widget/artDialog/4.1.7/js/artDialog.min.js"></script>
			
 
				
			
 
					<script type="text/javascript" src="../cross/js/jquery/1.8.3/jquery.js"></script>
			
 
				
			
 
					<script type="text/javascript" src="../cross/js/cross.ui.js"></script>
			
 
					<link rel="stylesheet"
			
 
						href="../widget/artDialog/4.1.7/css/artDialog.css" type="text/css" />
			
 
					<script type="text/javascript"
			
 
						src="../widget/artDialog/4.1.7/js/artDialog.js"></script>
			
 
					<script type="text/javascript"
			
 
						src="../widget/placeholder/2.0.7/js/jquery.placeholder.js"></script>
			
 
					<script type="text/javascript"
			
 
						src="../widget/nicescroll/3.6.0/js/jquery.nicescroll.min.js"></script>
			
 
					<script type="text/javascript"
			
 
						src="../widget/ueditor/1.4.3/ueditor.config2.js"></script>
			
 
					<script type="text/javascript"
			
 
						src="../widget/ueditor/1.4.3/ueditor.api.js"></script>
			
 
					<script type="text/javascript"
			
 
						src="../widget/inputSelect/1.0/js/inputSelect.js"></script>
			
 
					<script type="text/javascript"
			
 
						src="../widget/fileUpload/9.11.2/js/jquery.fileupload.js"></script>
			
 
					<script src="../cross/js/jquery/1.8.3/ajaxfileupload.js"></script>
			
 
				
			
 
					<script type="text/javascript">
			
 
				var remark1 = null;
			
 
				var articleCover = ""; //封面图
			
 
				$(function() {
			
 
					
			
 
					
			
 
				 	var articleid = getUrlParam("articleid");
			
 
				 	getrounte1();
			
 
					getrounte2();
			
 
					getArticlelevel();
			
 
					getArticleType();
			
 
				
			
 
				
			
 
					$('.phone-main').height($('.phone-wrap').height() - $('.phone-header').height());
			
 
					//ueditor
			
 
					remark1 = UE.getEditor('content');
			
 
					$("#articleCoverFile").change(function () {
			
 
						uploadImage();
			
 
				    });
			
 
				
			
 
					//预览区自定义滚动条
			
 
				    $(".phone-main").niceScroll({cursorcolor:"#a8a8a8",zindex:999});
			
 
				    var nice = $(".phone-main").getNiceScroll();
			
 
				    $(window).resize(function(){
			
 
				        nice.resize();
			
 
				    });
			
 
				    
			
 
				
			
 
				});
			
 
				function getUrlParam(name) {
			
 
					var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
			
 
					var r = window.location.search.substr(1).match(reg);
			
 
					if (r!=null) return decodeURI(r[2]); return "";
			
 
				}
			
 
				
			
 
				
			
 
				function uploadImage(){
			
 
					var val=$("#articleCoverFile").val();
			
 
					if(val==null||val==""){
			
 
						return;
			
 
					}
			
 
					$.ajaxFileUpload({
			
 
						url : '/JkEdu/file/upload', //需要链接到服务器地址  
			
 
						secureuri : false,
			
 
						fileElementId : 'articleCoverFile', //文件选择框的id属性  
			
 
						dataType : 'json',
			
 
						success : function(data, status) {
			
 
							var file = $("#articleCoverFile") ;
			
 
							file.after(file.clone().val(""));      
			
 
							file.remove(); 
			
 
							
			
 
							if (data.Code == 10000) {
			
 
								 
			
 
							 	var html = "";
			
 
						 		html += '';
			
 
					 			html += '<img src="'+(data.url.Uri==undefined?'':data.url.Uri)+'" alt="" />';
			
 
						 		html += '<i class="icon icon-close" id = "gg"></i>';
			
 
				 
			
 
				                $('#newUrl').html(html);
			
 
						 		$("#newUrl").show();//
			
 
						 		$("#fileHide").hide();//隐藏
			
 
						 		articleCover = data.url.Uri;
			
 
				 
			
 
						 		$("#gg").click(function () {
			
 
						 			uploadImage2();
			
 
						 		});
			
 
							} else if (data.Code == -10000) {
			
 
								
			
 
				
			
 
							}
			
 
						},error: function (data, status, e){
			
 
				      	     artLoading.close();
			
 
				       	     tip("请重新登录，可能网络异常");
			
 
				       }
			
 
					});	
			
 
				}
			
 
				function uploadImage2(){
			
 
						$("#newUrl").hide();
			
 
						$("#fileHide").show();
			
 
						$("#articleCoverFile").change(function () {
			
 
							uploadImage();
			
 
					    });
			
 
				}
			
 
				
			
 
				
			
 
				
			
 
				//保存文章
			
 
				function saveArticle(){
			
 
				
			
 
					var param = {};
			
 
					var remark = remark1.getContent();
			
 
					param.remark = remark;
			
 
					
			
 
					param.ArticleTitle = $('#ArticleTitle').val();
			
 
					param.ArticleType =  $('#ArticleType').formSelect('getDataKey');
			
 
					param.Articlelevel =  $('#Articlelevel').formSelect('getDataKey');
			
 
					param.newUrl = articleCover;
			
 
					param.SecondLevelCategoryId =  $('#SecondLevelCategoryId').formSelect('getDataKey');
			
 
					param.SecondLevelCategoryName =  $('#SecondLevelCategoryId').formSelect('getDataVal');
			
 
					 
			
 
					param.FirstLevelCategoryId =  $('#FirstLevelCategoryId').formSelect('getDataKey');
			
 
					param.FirstLevelCategoryName =  $('#FirstLevelCategoryId').formSelect('getDataVal');
			
 
					if("" == param.ArticleTitle){
			
 
						ask("标题不能为空");
			
 
						return;
			
 
					}
			
 
					
			
 
					$.post("/JkEdu/articlePc/saveArticle",param, function(data){
			
 
							if(data.Code==10000){
			
 
								var artBox=art.dialog({
			
 
									lock: true,
			
 
									artIcon:'error',
			
 
									opacity:0.4,
			
 
									width: 250,
			
 
									title:'提示',
			
 
									content: "保存成功",
			
 
									ok: function () {
			
 
					 					location.href ="JkArticleLibrary.html";
			
 
										//window.opener.query();
			
 
									},
			
 
									close:function(){
			
 
						   		 	}
			
 
								});
			
 
							}else{
			
 
								ask(data.Message);
			
 
							}
			
 
						});
			
 
					 
			
 
				}
			
 
				
			
 
				function ask(message){
			
 
				 	art.dialog({
			
 
						lock : true,
			
 
						artIcon : 'ask',
			
 
						opacity : 0.4,
			
 
						width : 250,
			
 
						title : '提示',
			
 
						content : message,
			
 
						ok : function() {
			
 
							
			
 
						}
			
 
					});
			
 
				 	
			
 
				 }
			
 
				 
			
 
				//一级分类下拉框
			
 
				function getrounte1(){
			
 
					
			
 
					var tempArr =new Array();
			
 
					$.ajax({
			
 
						dataType: "json",
			
 
						type: "POST",
			
 
						cache:false,
			
 
						data : {
			
 
						},
			
 
						url: "/JkEdu/configDict/getCateOne",
			
 
						success : function(result) {
			
 
							
			
 
							
			
 
							if (result.Code == 10000) {
			
 
								var list = result.result;
			
 
								
			
 
								if (list != null) {
			
 
									list.unshift({
			
 
										"categoryId" : "",
			
 
										"categoryName" : "--请选择一级分类--"
			
 
									});
			
 
									$('#FirstLevelCategoryId').formSelect({
			
 
										jsonData : list,
			
 
										jsonDataId : "categoryId",
			
 
										jsonDataText : "categoryName"
			
 
									}, null, function(dom, text, value) {// 点击某个选项回调
			
 
										$('#SecondLevelCategoryId').formSelect('resetValue');
			
 
										getrounte2();
			
 
									});
			
 
								}
			
 
							}
			
 
						}
			
 
					});
			
 
				}
			
 
				
			
 
				//二级分类下拉框
			
 
				function getrounte2(){
			
 
					var pFirstId = $("#p_FirstLevelCategoryId").val();
			
 
					var tempArr =new Array();
			
 
					$.ajax({
			
 
						dataType: "json",
			
 
						type: "POST",
			
 
						cache:false,
			
 
						data : {
			
 
							pFirstId:pFirstId,
			
 
						},
			
 
						url: "/JkEdu/configDict/getCateTwo",
			
 
						success : function(result) {
			
 
							
			
 
							
			
 
							if (result.Code == 10000) {
			
 
								var list = result.result;
			
 
								
			
 
								if (list != null) {
			
 
									list.unshift({
			
 
										"categoryId" : "",
			
 
										"categoryName" : "--请选择一级分类--"
			
 
									});
			
 
									$('#SecondLevelCategoryId').formSelect({
			
 
										jsonData : list,
			
 
										jsonDataId : "categoryId",
			
 
										jsonDataText : "categoryName"
			
 
									}, null, function(dom, text, value) {// 点击某个选项回调
			
 
										 
			
 
									});
			
 
								}
			
 
							}
			
 
						}
			
 
					});
			
 
				}
			
 
				
			
 
				//优先级下拉框
			
 
				function getArticlelevel(){
			
 
					
			
 
					var tempArr =new Array();
			
 
					$.ajax({
			
 
						dataType: "json",
			
 
						type: "POST",
			
 
						cache:false,
			
 
						data : {
			
 
							typeName : "prio"
			
 
				
			
 
						},
			
 
						url: "/JkEdu/configDict/getDict",
			
 
						success : function(result) {
			
 
							if (result.Code == 10000) {
			
 
								var list = result.result;
			
 
								if (list != null) {
			
 
									list.unshift({
			
 
										"code" : "",
			
 
										"codeName" : "--请选择重要等级--"
			
 
									});
			
 
									$('#Articlelevel').formSelect({
			
 
										jsonData : list,
			
 
										jsonDataId : "code",
			
 
										jsonDataText : "codeName"
			
 
									}, null, function(dom, text, value) {// 点击某个选项回调
			
 
										 
			
 
									});
			
 
								}
			
 
							}
			
 
						}
			
 
					});
			
 
				}
			
 
				//类型下拉框
			
 
				function getArticleType() {
			
 
						$.ajax({
			
 
							url: "/JkEdu/configDict/getDict",
			
 
							
			
 
				 			async : false,
			
 
							dataType: "json",
			
 
							type: "POST",
			
 
							
			
 
				 			data : {
			
 
								typeName : "aType"
			
 
							},
			
 
							success : function(result) {
			
 
								if (result.Code == 10000) {
			
 
									var list = result.result;
			
 
									if (list != null) {
			
 
										list.unshift({
			
 
											"code" : "",
			
 
											"codeName" : "--请选择类型--"
			
 
										});
			
 
										$('#ArticleType').formSelect({
			
 
											jsonData : list,
			
 
											jsonDataId : "code",
			
 
											jsonDataText : "codeName"
			
 
										}, null, function(dom, text, value) {// 点击某个选项回调
			
 
											 
			
 
										});
			
 
									}
			
 
								}
			
 
							}
			
 
						});
			
 
				}
			
 
				
			
 
				//预览
			
 
				function preview()
			
 
				{
			
 
					var remark = remark1.getContent();
			
 
				    var fatherDiv = remark;
			
 
				    var sonDiv = document.getElementById("articlecp");
			
 
				    //将fatherDiv中的所有内容 包括HTML标签 给son
			
 
				    sonDiv.innerHTML = remark;
			
 
				}
			
 
				</script>
			
 
				</body>
			
 
				</html>
			
--- a/edu-article/JkEdu/WebRoot/JkArticle/AlreadyPushJkArticle.html
+++ b/edu-article/JkEdu/WebRoot/JkArticle/AlreadyPushJkArticle.html
@ -0,0 +1,212 @@
 
				<!DOCTYPE html>
			
 
				<html lang="en">
			
 
				<head>
			
 
				    <meta charset="utf-8" />
			
 
				    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
			
 
				    <meta name="renderer" content="webkit" />
			
 
				    <title>以推送文章</title>
			
 
				    <link rel="stylesheet" href="../cross/css/cross.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../cross/css/cross.ui.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../iconfont/iconfont.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../widget/datetimepicker/2.1.9/css/jquery.datetimepicker.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../widget/artDialog/4.1.7/css/artDialog.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../widget/datatables/1.10.10/css/jquery.dataTables.css" type="text/css"/>
			
 
				    <link rel="stylesheet" href="../css/health-edu.css" type="text/css" />
			
 
				 
			
 
				    <style>
			
 
				    .round-no{
			
 
				    	width:16px;height:16px;
			
 
						display: inline-block;font-size:15px;
			
 
						line-heigth:16px;text-align:center;color:#f00;
			
 
				    	padding-left: 2px;
			
 
						text-decoration:none
			
 
					}
			
 
					.round-ok{
			
 
						width:16px;height:16px;
			
 
						display: inline-block;font-size:15px;
			
 
						line-heigth:16px;text-align:center;color:#0288FF;
			
 
				    	padding-left: 2px;
			
 
						text-decoration:none
			
 
					}
			
 
				    </style>
			
 
				</head>
			
 
				<body>
			
 
				<div class="">
			
 
				    <div class="plr5">
			
 
				        <div class="form-layout form-inline  ">
			
 
				
			
 
				
			
 
							<div class="control-group">
			
 
								<label class="control-label"></label>
			
 
								<div class="control-form">
			
 
									<div class=" cus-sel cus-sel-w170 cus-sel-h33"
			
 
										id="FirstLevelCategoryId" data-toggle="formSelect">
			
 
				
			
 
										<div class="cus-sel-chosed">
			
 
											<input type="text" class="c-hide"> <span
			
 
												class="cus-sel-chosed-txt" data-value="">--请选择一级分类--</span> <span
			
 
												class="jselect-icon"></span>
			
 
										</div>
			
 
										<div class="cus-sel-list c-hide">
			
 
											<ul>
			
 
											</ul>
			
 
										</div>
			
 
									</div>
			
 
									
			
 
									
			
 
									
			
 
									<div class=" cus-sel cus-sel-w170 cus-sel-h33"
			
 
										data-toggle="formSelect" id="SecondLevelCategoryId">
			
 
										<div class="cus-sel-chosed">
			
 
											<input type="text" class="c-hide"> <span
			
 
												class="cus-sel-chosed-txt" data-value="">--请选择二级分类--</span> <span
			
 
												class="jselect-icon"></span>
			
 
										</div>
			
 
										<div class="cus-sel-list c-hide">
			
 
											<ul>
			
 
											</ul>
			
 
										</div>
			
 
									</div>
			
 
				
			
 
								</div>
			
 
							</div>
			
 
							
			
 
							
			
 
							<div class="control-group">
			
 
								<label class="control-label"></label>
			
 
								<div class="control-form">
			
 
									<div class="cus-sel cus-sel-w150 cus-sel-h33"  
			
 
										id="ArticleType">
			
 
										<div class="cus-sel-chosed">
			
 
											<input   type="text" style="display:none;"> <span
			
 
												class="cus-sel-chosed-txt" data-value="">--请选择类型--</span> <span
			
 
												class="jselect-icon"></span>
			
 
										</div>
			
 
										<div class="cus-sel-list c-hide">
			
 
												<ul>
			
 
												</ul>
			
 
										</div>
			
 
									</div>
			
 
				
			
 
								</div>
			
 
							</div>
			
 
							<div class="control-group">
			
 
								<label class="control-label"></label>
			
 
								<div class="control-form">
			
 
									<div class="cus-sel cus-sel-w150 cus-sel-h33" data-toggle="formSelect"
			
 
										id="ArticleSource">
			
 
										<div class="cus-sel-chosed">
			
 
											<input type="text" style="display:none;"> <span
			
 
												class="cus-sel-chosed-txt" data-value="">--请选择来源--</span> <span
			
 
												class="jselect-icon"></span>
			
 
										</div>
			
 
										<div class="cus-sel-list c-hide">
			
 
												<ul>
			
 
												</ul>
			
 
										</div>
			
 
									</div>
			
 
				
			
 
								</div>
			
 
							</div>
			
 
							<div class="control-group">
			
 
								<label class="control-label"></label>
			
 
								<div class="control-form">
			
 
									<div class="cus-sel  cus-sel-w150  cus-sel-h33" data-toggle="formSelect"
			
 
										id="Articlelevel">
			
 
										<div class="cus-sel-chosed">
			
 
											<input type="text" style="display:none;"> <span
			
 
												class="cus-sel-chosed-txt" data-value="">--请选择等级--</span> <span
			
 
												class="jselect-icon"></span>
			
 
										</div>
			
 
										<div class="cus-sel-list c-hide">
			
 
												<ul>
			
 
												</ul>
			
 
										</div>
			
 
									</div>
			
 
								</div>
			
 
							</div>
			
 
							<div class="control-group">
			
 
								<label class="control-label"></label>
			
 
								<div class="control-form">
			
 
									<input type="text" placeholder="文章标题"
			
 
										class="input-text input-text-w200" id="ArticleTitle">
			
 
								</div>
			
 
							</div>
			
 
							
			
 
							<div class="control-group">
			
 
								<label class="control-label"></label>
			
 
				
			
 
								<div class="date-wrap">
			
 
									<input type="text"  placeholder="发送时间"  value="" id="StartTime"
			
 
										class="date-txt datetimepicker" />
			
 
				
			
 
								</div>
			
 
							</div>
			
 
							<div class="control-group">
			
 
								<label class="control-label">~</label>
			
 
							
			
 
								<div class="date-wrap">
			
 
									<input type="text" placeholder="发送时间"  value="" id="EndTime"
			
 
										class="date-txt datetimepicker" />
			
 
								</div>
			
 
							</div>
			
 
				
			
 
							
			
 
							<div class="control-group">
			
 
								<div class="control-form">
			
 
				 					<a href="javascript:doSearch();" id="findBtn" class="c-btn c-btn-blue btn-w60">搜索</a>
			
 
								</div>
			
 
							</div>
			
 
						 
			
 
						</div>
			
 
				        
			
 
				        <div class="" id="groupDataTableDiv">
			
 
				            <table id="groupDataTable" class="cell-border hover c-t-left c-t-center" cellspacing="0" width="100%">
			
 
				                <thead>
			
 
				                <tr>
			
 
				                 		<th   style="width:8%" align="center">文章标题</th>
			
 
										<th   style="width:4%" align="center">分类/类型</th> 
			
 
										<th   style="width:3%" align="center">来源</th>
			
 
										<th   style="width:3%" align="center">数据</th>
			
 
										<th   style="width:5%" align="center">发送时间</th>
			
 
										<th   style="width:3%" align="center">操作</th>
			
 
				                </tr>
			
 
				                </thead>
			
 
				                <tbody></tbody>
			
 
				            </table>
			
 
				        </div>
			
 
				    </div>
			
 
				</div>
			
 
				 
			
 
					<script src="../cross/js/jquery/1.8.3/jquery.js"></script>
			
 
					<script type="text/javascript" src="../cross/js/cross.ui.js"></script>
			
 
				<script type="text/javascript"
			
 
						src="../widget/placeholder/2.0.7/js/jquery.placeholder.js"></script>
			
 
					<script type="text/javascript" src="../widget/artDialog/4.1.7/js/artDialog.js?v=20160629"></script>
			
 
				<script type="text/javascript" src="../widget/datatables/1.10.10/js/jquery.dataTables.js"></script>
			
 
				 
			
 
				<script type="text/javascript" src="../widget/inputSelect/1.0/js/inputSelect.js"></script>
			
 
				  	<script type="text/javascript" src="js/AlreadyPushJkArticle.js"></script>
			
 
				 	
			
 
				<script type="text/javascript"
			
 
						src="../widget/datetimepicker/2.1.9/js/jquery.datetimepicker.js"></script>
			
 
				<script type="text/javascript" >
			
 
				 
			
 
				
			
 
				function ask(message){
			
 
				 	art.dialog({
			
 
						lock : true,
			
 
						artIcon : 'ask',
			
 
						opacity : 0.4,
			
 
						width : 250,
			
 
						title : '提示',
			
 
						content : message,
			
 
						ok : function() {
			
 
							
			
 
						}
			
 
					});
			
 
				 	
			
 
				 }
			
 
				</script>
			
 
				</body>
			
 
				</html>
			
--- a/edu-article/JkEdu/WebRoot/JkArticle/ArticleDoctorList.html
+++ b/edu-article/JkEdu/WebRoot/JkArticle/ArticleDoctorList.html
@ -0,0 +1,257 @@
 
				<!DOCTYPE html>
			
 
				<html lang="en">
			
 
				<head>
			
 
					<meta charset="utf-8" />
			
 
				    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
			
 
				    <meta name="renderer" content="webkit" />
			
 
				    <title>文章管理</title>
			
 
				    <link rel="stylesheet" href="../cross/css/cross.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../cross/css/cross.ui.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../css/health-edu.css" type="text/css" />
			
 
				</head>
			
 
				<body>
			
 
				<div class="p20">
			
 
					<h2 class="c-f16 c-666 c-normal pb20 c-border-b">文章名称： 卫计委健康宣教1</h2>
			
 
					<ul class="tags-list pt50">
			
 
						<li>
			
 
							<div class="tit">
			
 
								<h3>下属单位</h3>
			
 
								<span class="tag tag-hollow tag-all">全部</span>
			
 
							</div>
			
 
							 <div id="sCompany"></div>
			
 
							
			
 
						</li>
			
 
						<li>
			
 
							<div class="tit">
			
 
								<h3>性别</h3>
			
 
								<span class="tag tag-hollow tag-all">全部</span>
			
 
							</div>
			
 
							<div class="con">
			
 
								<span class="tag tag-hollow">男</span>
			
 
								<span class="tag tag-hollow">女</span>
			
 
							</div>
			
 
						</li>
			
 
						<li>
			
 
							<div class="tit">
			
 
								<h3>服务类型</h3>
			
 
								<span class="tag tag-hollow tag-all">全部</span>
			
 
							</div>
			
 
							  <div id="secondLevel"></div>
			
 
							
			
 
							<!-- <div class="con">
			
 
								<span class="tag tag-hollow">高血压</span>
			
 
								<span class="tag tag-hollow">心脏病</span>
			
 
								<span class="tag tag-hollow">感冒</span>
			
 
								<span class="tag tag-hollow">骨折</span>
			
 
								<span class="tag tag-hollow">帕金森综合症</span>
			
 
								<span class="tag tag-hollow">狂犬病</span>
			
 
								<span class="tag tag-hollow">高血压</span>
			
 
								<span class="tag tag-hollow">心脏病</span>
			
 
								<span class="tag tag-hollow">感冒</span>
			
 
								<span class="tag tag-hollow">骨折</span>
			
 
								<span class="tag tag-hollow">帕金森综合症</span>
			
 
								<span class="tag tag-hollow c-hide">狂犬病</span>
			
 
								<span class="tag tag-hollow c-hide">高血压</span>
			
 
								<span class="tag tag-hollow c-hide">心脏病</span>
			
 
								<span class="tag tag-hollow c-hide">感冒</span>
			
 
								<span class="tag tag-hollow c-hide">骨折</span>
			
 
								<div class="get-more"><a href="javascript:;">展开查看全部</a></div>
			
 
							</div> -->
			
 
						</li>
			
 
						<li>
			
 
							<div class="tit">
			
 
								<h3>疾病类型</h3>
			
 
								<span class="tag tag-hollow tag-all">全部</span>
			
 
							</div>
			
 
							<div class="con">
			
 
								<span class="tag tag-hollow">高血压</span>
			
 
								<span class="tag tag-hollow">心脏病</span>
			
 
								<span class="tag tag-hollow">感冒</span>
			
 
								<span class="tag tag-hollow">骨折</span>
			
 
								<span class="tag tag-hollow">帕金森综合症</span>
			
 
							</div>
			
 
						</li>
			
 
						<li>
			
 
							<div class="tit">
			
 
								<h3>健康情况</h3>
			
 
								<span class="tag tag-hollow tag-all">全部</span>
			
 
							</div>
			
 
							<div class="con">
			
 
								<span class="tag tag-hollow">高血压</span>
			
 
								<span class="tag tag-hollow">心脏病</span>
			
 
								<span class="tag tag-hollow">感冒</span>
			
 
								<span class="tag tag-hollow">骨折</span>
			
 
								<span class="tag tag-hollow">帕金森综合症</span>
			
 
							</div>
			
 
						</li>
			
 
					</ul>
			
 
					<div class="c-border-t c-t-center ptb50">
			
 
						<a id="sendBtn" href="javascript:;" class="c-btn c-btn-blue btn-w90">发送</a>
			
 
						<a href="#" class="c-btn c-btn-white btn-w90 ml10">取消并返回</a>
			
 
					</div>
			
 
				</div>
			
 
				<script type="text/javascript" src="../cross/js/jquery/1.8.3/jquery.js"></script>
			
 
				<script type="text/javascript" src="../cross/js/cross.ui.js"></script>
			
 
				<script type="text/javascript" src="../widget/placeholder/2.0.7/js/jquery.placeholder.js"></script>
			
 
				<link rel="stylesheet" href="../widget/artDialog/4.1.7/css/artDialog.min.css" type="text/css" />
			
 
				<script type="text/javascript" src="../widget/artDialog/4.1.7/js/artDialog.min.js"></script>
			
 
				<script type="text/javascript">
			
 
				 	$(function(){
			
 
				 		
			
 
				 		showSecondLevel();
			
 
				 		showSCompany();
			
 
				 		//标签选中
			
 
				 		$('.tags-list .tag').click(function(){
			
 
				 			var tag = $(this).parents('li').find('.tag').not('.tag-all');
			
 
				 			var tagAll = $(this).parents('li').find('.tag-all');
			
 
				 			if($(this).hasClass('tag-all')){
			
 
				 				$(this).toggleClass('curr');
			
 
				 				if($(this).hasClass('curr')){
			
 
				 					tag.addClass('curr');
			
 
				 				}else{
			
 
				 					tag.removeClass('curr');
			
 
				 				}
			
 
				 			}else{
			
 
				 				if(tagAll.hasClass('curr')){
			
 
				 					tagAll.removeClass('curr');
			
 
				 					$(this).toggleClass('curr');
			
 
				 				}else{
			
 
				 					$(this).toggleClass('curr');
			
 
				 					var tagCurr = $(this).parents('li').find('.con').find('.curr');
			
 
				 					if(tagCurr.length == tag.length){
			
 
				 						tagAll.addClass('curr');
			
 
				 					}
			
 
				 				}
			
 
				 			}
			
 
				 		});
			
 
				 		//展开查看全部
			
 
				 		$('.get-more a').click(function(){
			
 
				 			$(this).parent().siblings('.c-hide').removeClass('c-hide');
			
 
				 			$('.get-more').hide();
			
 
				 		});
			
 
				 		
			
 
				 		//发送
			
 
				 		$('#sendBtn').click(function(){
			
 
				 			art.dialog({
			
 
								lock: true,
			
 
								artIcon:'ask',
			
 
								opacity:0.4,
			
 
								width: 400,
			
 
								overflow:true,
			
 
								title:'推送文章',
			
 
								content: '<p class="c-f14">将文章发送给 <em class="c-0090ff">1324543</em> 个用户？</p>',
			
 
								cancelVal:'拒绝',
			
 
								ok: function () {
			
 
								
			
 
								},
			
 
								cancel: function () {
			
 
								
			
 
								}
			
 
							});
			
 
				 		});
			
 
				 	});
			
 
				 	
			
 
				 	//服务类型
			
 
				 	function showSecondLevel(){
			
 
				 		
			
 
				 		var tempArr =new Array();
			
 
				 		$.ajax({
			
 
				 			dataType: "json",
			
 
				 			type: "POST",
			
 
				 			cache:false,
			
 
				 			data : {
			
 
				 				"CategoryLevel":"1"
			
 
				 			},
			
 
				 			url: "/JkEdu/articlePc/queryCategory",
			
 
				 			success : function(result) {
			
 
				 				console.info(result);
			
 
				 				if (result.Code == 10000) {
			
 
				 					if (result.Code==10000){
			
 
				 						
			
 
				 		 				
			
 
				 		 				$('#secondLevel').html("");
			
 
				 		 				var data = result.result;
			
 
				 		 				
			
 
				 		 				var html = "";
			
 
				 		 				serviceId_temp = "";
			
 
				 		 				html += '<div class="con">';
			
 
				 		 				$.each(data,function(i,row){
			
 
				 	 		 				
			
 
				 		  					var sId = row.firstlevelid;
			
 
				 		 					var sName = row.categoryname;
			
 
				 		 	 				html += '<span class="tag tag-hollow">'+(sName==undefined?'':sName)+'</span>';
			
 
				 		 	 				
			
 
				 		   				});
			
 
				 		 				html += '</div><div class="get-more"><a href="javascript:;">展开查看全部</a></div>';
			
 
				
			
 
				 		 				$('#secondLevel').html(html);
			
 
				 		 				
			
 
				 		 			} else {
			
 
				 		 				$('#secondLevel').html("");
			
 
				 		 				ask(result.Message);
			
 
				 		 			}
			
 
				 				}
			
 
				 			}
			
 
				 		});
			
 
				 	}
			
 
				 	
			
 
				 	//下属单位
			
 
				 	function showSCompany(){
			
 
				 		
			
 
				 		var tempArr =new Array();
			
 
				 		$.ajax({
			
 
				 			dataType: "json",
			
 
				 			type: "POST",
			
 
				 			cache:false,
			
 
				 			data : {
			
 
				 				typeName : "sCompany"
			
 
				 			},
			
 
				 			url: "/JkEdu/configDict/getDict",
			
 
				 			success : function(result) {
			
 
				 				if (result.Code == 10000) {
			
 
				 					if (result.Code==10000){
			
 
				 						
			
 
				 		 				$('#sCompany').html("");
			
 
				 		 				var data = result.result;
			
 
				 		 				
			
 
				 		 				var html = "";
			
 
				 		 				serviceId_temp = "";
			
 
				 		 				html += '<div class="con">';
			
 
				 		 				$.each(data,function(i,row){
			
 
				 	 		 				
			
 
				 		  					var sId = row.code;
			
 
				 		 					var sName = row.codeName;
			
 
				 		 	 				html += '<span class="tag tag-hollow">'+(sName==undefined?'':sName)+'</span>';
			
 
				 		 	 				
			
 
				 		   				});
			
 
				 		 				html += '</div><div class="get-more"><a href="javascript:;">展开查看全部</a></div>';
			
 
				
			
 
				 		 				$('#sCompany').html(html);
			
 
				 		 				
			
 
				 		 			} else {
			
 
				 		 				$('#sCompany').html("");
			
 
				 		 				ask(result.Message);
			
 
				 		 			}
			
 
				 				}
			
 
				 			}
			
 
				 		});
			
 
				 	}
			
 
				 	
			
 
				 	
			
 
				 	function ask(message){
			
 
				 	 	art.dialog({
			
 
				 			lock : true,
			
 
				 			artIcon : 'ask',
			
 
				 			opacity : 0.4,
			
 
				 			width : 250,
			
 
				 			title : '提示',
			
 
				 			content : message,
			
 
				 			ok : function() {
			
 
				 				
			
 
				 			}
			
 
				 		});
			
 
				 	 	
			
 
				 	 }
			
 
				</script>
			
 
				</body>
			
 
				</html>
			
--- a/edu-article/JkEdu/WebRoot/JkArticle/EditPcJkArticle.html
+++ b/edu-article/JkEdu/WebRoot/JkArticle/EditPcJkArticle.html
@ -0,0 +1,539 @@
 
				<!DOCTYPE html>
			
 
				<html lang="en">
			
 
				<head>
			
 
				<meta charset="utf-8" />
			
 
				<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
			
 
				<meta name="renderer" content="webkit" />
			
 
				<title>编辑文章-卫计委</title>
			
 
				<link rel="stylesheet" href="../iconfont/iconfont.css" type="text/css" />
			
 
				<link rel="stylesheet" href="../cross/css/cross.css" type="text/css" />
			
 
				<link rel="stylesheet" href="../cross/css/cross.ui.css" type="text/css" />
			
 
				<link rel="stylesheet" href="../css/health-edu.css" type="text/css" />
			
 
				</head>
			
 
				<body>
			
 
				
			
 
				
			
 
					<div class="c-hidden">
			
 
						<div class="phone-part fr">
			
 
							<div class="c-t-center mb30">
			
 
								<a id="preview" href="javascript:;" onclick="preview()"
			
 
									class="c-btn bgc-ec6941 btn-w60">预览</a>
			
 
							</div>
			
 
							<div class="phone">
			
 
								<div class="phone-wrap">
			
 
									<div class="phone-header">
			
 
										<img src="../images/health-edu/top.png" class="width-100" />
			
 
										<div class="phone-tit">
			
 
											<a href="javascript:;" class="btn-return"><i
			
 
												class="iconfont icon-xiangzuo c-f12"></i> 返回</a>
			
 
											<h1 id ="h1w"> </h1>
			
 
											<a href="#" class="btn-more"><i class="iconfont icon-more"></i></a>
			
 
										</div>
			
 
									</div>
			
 
									<div class="phone-main">
			
 
										<div class="article" id="articlecp"></div>
			
 
									</div>
			
 
								</div>
			
 
							</div>
			
 
						</div>
			
 
						<div class="main-part p20">
			
 
							<div
			
 
								class="form-layout form-horizontal form-horizontal-narrow c-f14 c-666 mtb20">
			
 
								<div class="control-group">
			
 
									<label class="control-label c-t-right">分类：</label>
			
 
									<div class="control-form">
			
 
										<div class=" cus-sel cus-sel-w200 cus-sel-h33"
			
 
											id="FirstLevelCategoryId"  >
			
 
				
			
 
											<div class="cus-sel-chosed">
			
 
												<input id="p_FirstLevelCategoryId" type="text" class="c-hide"> <span
			
 
													class="cus-sel-chosed-txt" data-value="">--请选择一级分类--</span> <span
			
 
													class="jselect-icon"></span>
			
 
											</div>
			
 
											<div class="cus-sel-list c-hide">
			
 
												<ul>
			
 
												</ul>
			
 
											</div>
			
 
										</div>
			
 
										<div class="cus-sel cus-sel-h33 ml10" 
			
 
											id="SecondLevelCategoryId">
			
 
											<div class="cus-sel-chosed">
			
 
												<input  id="p_SecondLevelCategoryId"  type="text" class="c-hide"> <span
			
 
													class="cus-sel-chosed-txt" data-value="">--请选择二级分类--</span> <span
			
 
													class="jselect-icon"></span>
			
 
											</div>
			
 
											<div class="cus-sel-list c-hide">
			
 
												<ul>
			
 
												</ul>
			
 
											</div>
			
 
										</div>
			
 
									</div>
			
 
								</div>
			
 
								<div class="control-group">
			
 
									<label class="control-label c-t-right">优先级：</label>
			
 
									<div class="control-form">
			
 
										<div class="cus-sel cus-sel-h33" data-toggle="formSelect"
			
 
											id="Articlelevel">
			
 
											<div class="cus-sel-chosed">
			
 
												<input type="text" style="display:none;"> <span
			
 
													class="cus-sel-chosed-txt" data-value="">--请选择重要等级--</span> <span
			
 
													class="jselect-icon"></span>
			
 
											</div>
			
 
											<div class="cus-sel-list c-hide">
			
 
												<ul>
			
 
												</ul>
			
 
											</div>
			
 
										</div>
			
 
									</div>
			
 
								</div>
			
 
								 
			
 
								<div class="control-group">
			
 
									<label class="control-label c-t-right">类型：</label>
			
 
									<div class="control-form">
			
 
										<div class="cus-sel cus-sel-h33"  
			
 
											id="ArticleType">
			
 
											<div class="cus-sel-chosed">
			
 
												<input type="text" style="display:none;"> <span
			
 
													class="cus-sel-chosed-txt" data-value="">--请选择类型--</span> <span
			
 
													class="jselect-icon"></span>
			
 
											</div>
			
 
											<div class="cus-sel-list c-hide">
			
 
												<ul>
			
 
												</ul>
			
 
											</div>
			
 
										</div>
			
 
									</div>
			
 
								</div>
			
 
								<div class="control-group">
			
 
									<label class="control-label c-t-right">标题：</label>
			
 
									<div class="control-form">
			
 
										<input type="text" placeholder="请输入标题" maxlength="50"
			
 
											class="input-text input-text-w520" id="ArticleTitle">
			
 
										<div class="c-inline-block c-ec514f c-f12 ml10">最多输入50个字</div>
			
 
									</div>
			
 
								</div>
			
 
								
			
 
								<div class="control-group">
			
 
									<label class="control-label mt25 c-t-right">封面：</label>
			
 
									<div class="control-form">
			
 
				 		                <div class="upload-img mr20" id = "newUrl"   style="display:none;" >
			
 
						                </div>
			
 
										<span class="btn-file btn-file-3 fileinput-button" id = "fileHide"> <i
			
 
											class="c-f40 c-bold">+</i> <input  id="articleCoverFile"  class="fileupload-btn"
			
 
											type="file" name="file" multiple="">
			
 
										</span> <span class="control-tip">注：为了前端的优质显示效果，建议图片大小控制在100kb以内，像素200x200以内（支持jpg/png/gif）</span>
			
 
									</div>
			
 
								</div>
			
 
								
			
 
								<div class="control-group">
			
 
									<label class="control-label c-t-right">内容：</label>
			
 
									<div class="control-form">
			
 
										<script id="content" name="content" type="text/plain"></script>
			
 
									</div>
			
 
								</div>
			
 
								<div class="control-group">
			
 
									<div class="control-form">
			
 
										<a href="#" class="c-btn c-btn-blue btn-w60"
			
 
											onClick="editArticle()">保存</a> <a href="#"
			
 
											class="c-btn c-btn-white btn-w60 ml10">取消</a>
			
 
									</div>
			
 
								</div>
			
 
				
			
 
							</div>
			
 
						</div>
			
 
					</div>
			
 
					<script type="text/javascript" src="../widget/artDialog/4.1.7/js/artDialog.min.js"></script>
			
 
				
			
 
					<script type="text/javascript" src="../cross/js/jquery/1.8.3/jquery.js"></script>
			
 
				 	
			
 
					<script type="text/javascript" src="../cross/js/cross.ui.js"></script>
			
 
					<link rel="stylesheet"
			
 
						href="../widget/artDialog/4.1.7/css/artDialog.css" type="text/css" />
			
 
					<script type="text/javascript"
			
 
						src="../widget/artDialog/4.1.7/js/artDialog.js"></script>
			
 
					<script type="text/javascript"
			
 
						src="../widget/placeholder/2.0.7/js/jquery.placeholder.js"></script>
			
 
					<script type="text/javascript"
			
 
						src="../widget/nicescroll/3.6.0/js/jquery.nicescroll.min.js"></script>
			
 
					<script type="text/javascript"
			
 
						src="../widget/ueditor/1.4.3/ueditor.config2.js"></script>
			
 
					<script type="text/javascript"
			
 
						src="../widget/ueditor/1.4.3/ueditor.api.js"></script>
			
 
					<script type="text/javascript"
			
 
						src="../widget/inputSelect/1.0/js/inputSelect.js"></script>
			
 
					<script type="text/javascript"
			
 
						src="../widget/fileUpload/9.11.2/js/jquery.fileupload.js"></script>
			
 
					<script src="../cross/js/jquery/1.8.3/ajaxfileupload.js"></script>
			
 
					
			
 
					<script type="text/javascript">
			
 
				var remark1 = null;
			
 
				var articleid = null;
			
 
				var articleCover = ""; //封面图
			
 
				
			
 
				$(function() {
			
 
					
			
 
					
			
 
				 	articleid = getUrlParam("articleid");
			
 
				 	getrounte1();
			
 
					getrounte2();
			
 
					getArticlelevel();
			
 
					getArticleType();
			
 
					queryCardInfo();
			
 
					
			
 
					$('.phone-main').height($('.phone-wrap').height() - $('.phone-header').height());
			
 
					//ueditor
			
 
					remark1 = UE.getEditor('content');
			
 
					$("#articleCoverFile").change(function () {
			
 
						uploadImage();
			
 
				    });
			
 
				
			
 
					//预览区自定义滚动条
			
 
				    $(".phone-main").niceScroll({cursorcolor:"#a8a8a8",zindex:999});
			
 
				    var nice = $(".phone-main").getNiceScroll();
			
 
				    $(window).resize(function(){
			
 
				        nice.resize();
			
 
				    });
			
 
				   
			
 
				
			
 
				});
			
 
				
			
 
				function queryCardInfo(){
			
 
					 
			
 
					 
			
 
					$.ajax({
			
 
						dataType: "json",
			
 
						type: "POST",
			
 
						cache:false,
			
 
				 
			
 
						url: '/JkEdu/articlePc/queryArticlePcId',
			
 
						data: {
			
 
							articleid : articleid
			
 
						},
			
 
						beforeSend: function(){
			
 
							artLoading=art.dialog({
			
 
								lock: true,
			
 
								content: '<img src="../widget/artDialog/4.1.7/images/loading.gif" class="mr10" />数据加载中，请稍候...', 
			
 
								tips:true
			
 
							});
			
 
						},
			
 
						success: function(data){
			
 
							artLoading.close();
			
 
							if(data.Code==10000){
			
 
								if(typeof(data.result) != "undefined"){
			
 
									setTimeout(function(){
			
 
								 		$('#ArticleTitle').val(data.result.articletitle);
			
 
								 		$('#h1w').val(data.result.articletitle);
			
 
									 	$('#h1w').html(data.result.articletitle);
			
 
								 		if (data.result.articlecover!=undefined){
			
 
								 			var html = "";
			
 
									 		html += '';
			
 
								 			html += '<img src="'+(data.result.articlecover==undefined?'':data.result.articlecover)+'" alt="" />';
			
 
									 		html += '<i class="icon icon-close" id = "gg"></i>';
			
 
							                $('#newUrl').html(html);
			
 
									 		$("#newUrl").show();//
			
 
									 		$("#fileHide").hide();//隐藏
			
 
									 		$('#newUrl').val(data.result.articlecover);
			
 
									 		$("#gg").click(function () {
			
 
									 			uploadImage2();
			
 
									 		});
			
 
								 		}
			
 
								 		$('#ArticleType').formSelect('setDataKey', data.result.articletype);
			
 
								 		$('#SecondLevelCategoryId').formSelect('setDataKey', data.result.secondlevelcategoryid);
			
 
								 		$('#FirstLevelCategoryId').formSelect('setDataKey', data.result.firstlevelcategoryid);
			
 
								 		$('#Articlelevel').formSelect('setDataKey', data.result.articlelevel);
			
 
				
			
 
									 	if (typeof(data.result.articlecontent) != "undefined") {
			
 
											remark1.ready(function() {
			
 
											    //设置编辑器的内容
			
 
												remark1.setContent(data.result.articlecontent);
			
 
												
			
 
											});
			
 
										}
			
 
									 	$('#articlecp').html(data.result.articlecontent);
			
 
									 	
			
 
									}, 300);
			
 
								}
			
 
								 
			
 
							}else{
			
 
								ask(data.Message);
			
 
							}
			
 
						}, 
			
 
						error: function () {
			
 
							artLoading.close();
			
 
							var artBox=art.dialog({
			
 
								lock: true,
			
 
								artIcon:'error',
			
 
								opacity:0.4,
			
 
								width: 250,
			
 
								title:'提示',
			
 
								content: '数据加载失败！请联系管理员',
			
 
								ok: function () {
			
 
								}
			
 
							});
			
 
						}
			
 
					});
			
 
				}
			
 
				
			
 
				function getUrlParam(name) {
			
 
					var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
			
 
					var r = window.location.search.substr(1).match(reg);
			
 
					if (r!=null) return decodeURI(r[2]); return "";
			
 
				}
			
 
				
			
 
				
			
 
				function uploadImage(){
			
 
					var val=$("#articleCoverFile").val();
			
 
					if(val==null||val==""){
			
 
						return;
			
 
					}
			
 
					$.ajaxFileUpload({
			
 
						url : '/JkEdu/file/upload', //需要链接到服务器地址  
			
 
						secureuri : false,
			
 
						fileElementId : 'articleCoverFile', //文件选择框的id属性  
			
 
						dataType : 'json',
			
 
						success : function(data, status) {
			
 
							var file = $("#articleCoverFile") ;
			
 
							file.after(file.clone().val(""));      
			
 
							file.remove(); 
			
 
							
			
 
							if (data.Code == 10000) {
			
 
								 
			
 
							 	var html = "";
			
 
						 		html += '';
			
 
					 			html += '<img src="'+(data.url.Uri==undefined?'':data.url.Uri)+'" alt="" />';
			
 
						 		html += '<i class="icon icon-close" id = "gg"></i>';
			
 
				 
			
 
				                $('#newUrl').html(html);
			
 
						 		$("#newUrl").show();//
			
 
						 		$("#fileHide").hide();//隐藏
			
 
						 		articleCover = data.url.Uri;
			
 
						 		$("#gg").click(function () {
			
 
						 			uploadImage2();
			
 
						 		});
			
 
							} else if (data.Code == -10000) {
			
 
								
			
 
				
			
 
							}
			
 
						},error: function (data, status, e){
			
 
				      	     artLoading.close();
			
 
				       	     tip("请重新登录，可能网络异常");
			
 
				       }
			
 
					});	
			
 
				}
			
 
				function uploadImage2(){
			
 
						$("#newUrl").hide();
			
 
						$("#fileHide").show();
			
 
						$("#articleCoverFile").change(function () {
			
 
							uploadImage();
			
 
					    });
			
 
				}
			
 
				 
			
 
				//修改文章
			
 
				function editArticle(){
			
 
				
			
 
					var param = {};
			
 
					var remark = remark1.getContent();
			
 
					param.remark = remark;
			
 
					param.articleid = articleid;
			
 
					param.ArticleTitle = $('#ArticleTitle').val();
			
 
					param.ArticleType =  $('#ArticleType').formSelect('getDataKey');
			
 
					param.Articlelevel =  $('#Articlelevel').formSelect('getDataKey');
			
 
					param.newUrl = articleCover;
			
 
					param.SecondLevelCategoryId =  $('#SecondLevelCategoryId').formSelect('getDataKey');
			
 
					param.SecondLevelCategoryName =  $('#SecondLevelCategoryId').formSelect('getDataVal');
			
 
					 
			
 
					param.FirstLevelCategoryId =  $('#FirstLevelCategoryId').formSelect('getDataKey');
			
 
					param.FirstLevelCategoryName =  $('#FirstLevelCategoryId').formSelect('getDataVal');
			
 
					if("" == param.ArticleTitle){
			
 
						ask("标题不能为空");
			
 
						return;
			
 
					}
			
 
					
			
 
					$.post("/JkEdu/articlePc/editArticle",param, function(data){
			
 
							if(data.Code==10000){
			
 
								var artBox=art.dialog({
			
 
									lock: true,
			
 
									artIcon:'error',
			
 
									opacity:0.4,
			
 
									width: 250,
			
 
									title:'提示',
			
 
									content: "修改成功",
			
 
									ok: function () {
			
 
					 					location.href ="JkArticleLibrary.html";
			
 
										//window.opener.query();
			
 
									},
			
 
									close:function(){
			
 
						   		 	}
			
 
								});
			
 
							}else{
			
 
								ask(data.Message);
			
 
							}
			
 
						});
			
 
					 
			
 
				}
			
 
				
			
 
				function ask(message){
			
 
				 	art.dialog({
			
 
						lock : true,
			
 
						artIcon : 'ask',
			
 
						opacity : 0.4,
			
 
						width : 250,
			
 
						title : '提示',
			
 
						content : message,
			
 
						ok : function() {
			
 
							
			
 
						}
			
 
					});
			
 
				 	
			
 
				 }
			
 
				 
			
 
				//一级分类下拉框
			
 
				function getrounte1(){
			
 
					
			
 
					var tempArr =new Array();
			
 
					$.ajax({
			
 
						dataType: "json",
			
 
						type: "POST",
			
 
						cache:false,
			
 
						data : {
			
 
						},
			
 
						url: "/JkEdu/configDict/getCateOne",
			
 
						success : function(result) {
			
 
							
			
 
							
			
 
							if (result.Code == 10000) {
			
 
								var list = result.result;
			
 
								
			
 
								if (list != null) {
			
 
									list.unshift({
			
 
										"categoryId" : "",
			
 
										"categoryName" : "--请选择一级分类--"
			
 
									});
			
 
									$('#FirstLevelCategoryId').formSelect({
			
 
										jsonData : list,
			
 
										jsonDataId : "categoryId",
			
 
										jsonDataText : "categoryName"
			
 
									}, null, function(dom, text, value) {// 点击某个选项回调
			
 
										$('#SecondLevelCategoryId').formSelect('resetValue');
			
 
										getrounte2();
			
 
									});
			
 
								}
			
 
							}
			
 
						}
			
 
					});
			
 
				}
			
 
				
			
 
				//二级分类下拉框
			
 
				function getrounte2(){
			
 
					var pFirstId = $("#p_FirstLevelCategoryId").val();
			
 
					var tempArr =new Array();
			
 
					$.ajax({
			
 
						dataType: "json",
			
 
						type: "POST",
			
 
						cache:false,
			
 
						data : {
			
 
							pFirstId:pFirstId,
			
 
						},
			
 
						url: "/JkEdu/configDict/getCateTwo",
			
 
						success : function(result) {
			
 
							
			
 
							
			
 
							if (result.Code == 10000) {
			
 
								var list = result.result;
			
 
								
			
 
								if (list != null) {
			
 
									list.unshift({
			
 
										"categoryId" : "",
			
 
										"categoryName" : "--请选择一级分类--"
			
 
									});
			
 
									$('#SecondLevelCategoryId').formSelect({
			
 
										jsonData : list,
			
 
										jsonDataId : "categoryId",
			
 
										jsonDataText : "categoryName"
			
 
									}, null, function(dom, text, value) {// 点击某个选项回调
			
 
										 
			
 
									});
			
 
								}
			
 
							}
			
 
						}
			
 
					});
			
 
				}
			
 
				
			
 
				
			
 
				//优先级下拉框
			
 
				function getArticlelevel(){
			
 
					
			
 
					var tempArr =new Array();
			
 
					$.ajax({
			
 
						dataType: "json",
			
 
						type: "POST",
			
 
						cache:false,
			
 
						data : {
			
 
							typeName : "prio"
			
 
				
			
 
						},
			
 
						url: "/JkEdu/configDict/getDict",
			
 
						success : function(result) {
			
 
							if (result.Code == 10000) {
			
 
								var list = result.result;
			
 
								if (list != null) {
			
 
									list.unshift({
			
 
										"code" : "",
			
 
										"codeName" : "--请选择重要等级--"
			
 
									});
			
 
									$('#Articlelevel').formSelect({
			
 
										jsonData : list,
			
 
										jsonDataId : "code",
			
 
										jsonDataText : "codeName"
			
 
									}, null, function(dom, text, value) {// 点击某个选项回调
			
 
										 
			
 
									});
			
 
								}
			
 
							}
			
 
						}
			
 
					});
			
 
				}
			
 
				//类型下拉框
			
 
				function getArticleType() {
			
 
						$.ajax({
			
 
							url: "/JkEdu/configDict/getDict",
			
 
							
			
 
				 			async : false,
			
 
							dataType: "json",
			
 
							type: "POST",
			
 
							
			
 
				 			data : {
			
 
								typeName : "aType"
			
 
							},
			
 
							success : function(result) {
			
 
								if (result.Code == 10000) {
			
 
									var list = result.result;
			
 
									if (list != null) {
			
 
										list.unshift({
			
 
											"code" : "",
			
 
											"codeName" : "--请选择类型--"
			
 
										});
			
 
										$('#ArticleType').formSelect({
			
 
											jsonData : list,
			
 
											jsonDataId : "code",
			
 
											jsonDataText : "codeName"
			
 
										}, null, function(dom, text, value) {// 点击某个选项回调
			
 
											 
			
 
										});
			
 
									}
			
 
								}
			
 
							}
			
 
						});
			
 
				}
			
 
				//预览
			
 
				function preview()
			
 
				{
			
 
					var remark = remark1.getContent();
			
 
				    var fatherDiv = remark;
			
 
				    var sonDiv = document.getElementById("articlecp");
			
 
				    //将fatherDiv中的所有内容 包括HTML标签 给son
			
 
				    sonDiv.innerHTML = remark;
			
 
				}
			
 
				</script>
			
 
				</body>
			
 
				</html>
			
--- a/edu-article/JkEdu/WebRoot/JkArticle/JkArticle.html
+++ b/edu-article/JkEdu/WebRoot/JkArticle/JkArticle.html
@ -0,0 +1,71 @@
 
				<!DOCTYPE html>
			
 
				<html lang="en">
			
 
				<head>
			
 
				<meta charset="utf-8" />
			
 
				<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
			
 
				<meta name="renderer" content="webkit" />
			
 
				<title>文章管理-卫计委</title>
			
 
				<link rel="stylesheet" href="../cross/css/cross.min.css" type="text/css" />
			
 
				
			
 
				<link rel="stylesheet" href="../cross/css/cross.css"
			
 
					type="text/css" />
			
 
				
			
 
				<link rel="stylesheet" href="../cross/css/cross.ui.css"
			
 
					type="text/css"></link>
			
 
				<link rel="stylesheet" href="../iconfont/iconfont.css"
			
 
					type="text/css"></link>
			
 
				<link rel="stylesheet" href="css/article.css" type="text/css"></link>
			
 
				<link rel="stylesheet"
			
 
					href="../widget/datatables/1.10.10/css/jquery.dataTables.css">
			
 
				</head>
			
 
				<body>
			
 
					
			
 
				   <div class="pt20 pl20 pb10">
			
 
						<div class="tabs tabs-two c-position-r" data-toggle="tabs" data-toggle-tabs="oneIframe">
			
 
					        <div class="tabs-hd clearfix">
			
 
					            <a href="javascript:;" data-src="JkArticleLibrary.html" class="curr"><span>文章库</span></a>
			
 
							            <a href="javascript:;" data-src="PushEdJkArticle.html"><span>已推送文章</span></a>
			
 
							                      
			
 
					        </div>
			
 
					        <div class="tabs-bd mt20">
			
 
					            <div class="tabs-bd-box c-hide curr arthold">
			
 
					               			 <iframe src="JkArticleLibrary.html" width="100%" height="100%" data-iframe="0" data-left="0"></iframe>
			
 
					            </div>
			
 
					        </div>
			
 
					    </div>
			
 
					</div>
			
 
				 	<script src="../cross/js/jquery/1.8.3/jquery.js"></script>
			
 
					
			
 
					<link rel="stylesheet"
			
 
						href="../widget/artDialog/4.1.7/css/artDialog.css"
			
 
						type="text/css" />
			
 
					<script type="text/javascript"
			
 
						src="../widget/artDialog/4.1.7/js/artDialog.js"></script>
			
 
					<link rel="stylesheet"
			
 
						href="../widget/datatables/1.10.10/css/jquery.dataTables.css"
			
 
						type="text/css" />
			
 
					<script type="text/javascript"
			
 
						src="../widget/datatables/1.10.10/js/jquery.dataTables.js"></script>
			
 
				
			
 
					<script type="text/javascript" src="../cross/js/cross.ui.js"></script>
			
 
				 	<script type="text/javascript"
			
 
						src="../widget/placeholder/2.0.7/js/jquery.placeholder.js"></script>
			
 
					<link rel="stylesheet"
			
 
						href="../widget/datetimepicker/2.1.9/css/jquery.datetimepicker.css"
			
 
						type="text/css" />
			
 
					<script type="text/javascript"
			
 
						src="../widget/datetimepicker/2.1.9/js/jquery.datetimepicker.js"></script>
			
 
					<script type="text/javascript" src="../widget/inputSelect/1.0/js/inputSelect.js"></script>
			
 
						
			
 
					<script type="text/javascript">
			
 
				$(function() {
			
 
				    
			
 
				    
			
 
				    $('.arthold').height($(window).height() - 90).css('overflow','auto');
			
 
				    $(window).resize(function(){
			
 
				    	$('.arthold').height($(window).height() - 90);
			
 
				    });
			
 
				});
			
 
				</script>
			
 
				</body>
			
 
				</html>
			
--- a/edu-article/JkEdu/WebRoot/JkArticle/JkArticleDoctor.html
+++ b/edu-article/JkEdu/WebRoot/JkArticle/JkArticleDoctor.html
@ -0,0 +1,69 @@
 
				<!DOCTYPE html>
			
 
				<html lang="en">
			
 
				<head>
			
 
				<meta charset="utf-8" />
			
 
				<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
			
 
				<meta name="renderer" content="webkit" />
			
 
				<title>文章管理-医生</title>
			
 
				<link rel="stylesheet" href="../cross/css/cross.min.css" type="text/css" />
			
 
				<link rel="stylesheet" href="../cross/css/cross.css"
			
 
					type="text/css" />
			
 
				
			
 
				<link rel="stylesheet" href="../cross/css/cross.ui.css"
			
 
					type="text/css"></link>
			
 
				<link rel="stylesheet" href="../iconfont/iconfont.css"
			
 
					type="text/css"></link>
			
 
				<link rel="stylesheet" href="css/article.css" type="text/css"></link>
			
 
				<link rel="stylesheet"
			
 
					href="../widget/datatables/1.10.10/css/jquery.dataTables.css">
			
 
				</head>
			
 
				<body>
			
 
					 <div class="pt20 pl20 pb10">
			
 
						<div class="tabs tabs-two c-position-r" data-toggle="tabs" data-toggle-tabs="oneIframe">
			
 
					        <div class="tabs-hd clearfix">
			
 
					           <a href="javascript:;" data-src="JkArticleLibraryDoctor.html" class="curr"><span>文章库</span></a>
			
 
							   <a href="javascript:;" data-src="PushEdJkArticle.html"><span>已推送文章</span></a>
			
 
								             
			
 
					        </div>
			
 
					        <div class="tabs-bd mt20">
			
 
					            <div class="tabs-bd-box c-hide curr arthold">
			
 
					               			 <iframe src="JkArticleLibraryDoctor.html" width="100%" height="100%" data-iframe="0" data-left="0"></iframe>
			
 
					            </div>
			
 
					        </div>
			
 
					    </div>
			
 
					</div>
			
 
				 	<script src="../cross/js/jquery/1.8.3/jquery.js"></script>
			
 
					
			
 
					<link rel="stylesheet"
			
 
						href="../widget/artDialog/4.1.7/css/artDialog.css"
			
 
						type="text/css" />
			
 
					<script type="text/javascript"
			
 
						src="../widget/artDialog/4.1.7/js/artDialog.js"></script>
			
 
					<link rel="stylesheet"
			
 
						href="../widget/datatables/1.10.10/css/jquery.dataTables.css"
			
 
						type="text/css" />
			
 
					<script type="text/javascript"
			
 
						src="../widget/datatables/1.10.10/js/jquery.dataTables.js"></script>
			
 
				
			
 
					<script type="text/javascript" src="../cross/js/cross.ui.js"></script>
			
 
				 	<script type="text/javascript"
			
 
						src="../widget/placeholder/2.0.7/js/jquery.placeholder.js"></script>
			
 
					<link rel="stylesheet"
			
 
						href="../widget/datetimepicker/2.1.9/css/jquery.datetimepicker.css"
			
 
						type="text/css" />
			
 
					<script type="text/javascript"
			
 
						src="../widget/datetimepicker/2.1.9/js/jquery.datetimepicker.js"></script>
			
 
					<script type="text/javascript" src="../widget/inputSelect/1.0/js/inputSelect.js"></script>
			
 
						
			
 
					<script type="text/javascript">
			
 
				$(function() {
			
 
				     
			
 
				    
			
 
				    $('.arthold').height($(window).height() - 90).css('overflow','auto');
			
 
				    $(window).resize(function(){
			
 
				    	$('.arthold').height($(window).height() - 90);
			
 
				    });
			
 
				});
			
 
				</script>
			
 
				</body>
			
 
				</html>
			
--- a/edu-article/JkEdu/WebRoot/JkArticle/JkArticleLibrary.html
+++ b/edu-article/JkEdu/WebRoot/JkArticle/JkArticleLibrary.html
@ -0,0 +1,227 @@
 
				<!DOCTYPE html>
			
 
				<html lang="en">
			
 
				<head>
			
 
				    <meta charset="utf-8" />
			
 
				    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
			
 
				    <meta name="renderer" content="webkit" />
			
 
				    <title>文章库--卫计委</title>
			
 
				    <link rel="stylesheet" href="../cross/css/cross.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../cross/css/cross.ui.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../iconfont/iconfont.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../widget/datetimepicker/2.1.9/css/jquery.datetimepicker.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../widget/artDialog/4.1.7/css/artDialog.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../widget/datatables/1.10.10/css/jquery.dataTables.css" type="text/css"/>
			
 
				    <link rel="stylesheet" href="../css/health-edu.css" type="text/css" />
			
 
				 
			
 
				    <style>
			
 
				    .round-no{
			
 
				    	width:16px;height:16px;
			
 
						display: inline-block;font-size:15px;
			
 
						line-heigth:16px;text-align:center;color:#f00;
			
 
				    	padding-left: 2px;
			
 
						text-decoration:none
			
 
					}
			
 
					.round-ok{
			
 
						width:16px;height:16px;
			
 
						display: inline-block;font-size:15px;
			
 
						line-heigth:16px;text-align:center;color:#0288FF;
			
 
				    	padding-left: 2px;
			
 
						text-decoration:none
			
 
					}
			
 
				    </style>
			
 
				</head>
			
 
				<body>
			
 
				<div class="">
			
 
				    <div class="plr5">
			
 
				        <div class="form-layout form-inline  ">
			
 
				
			
 
				
			
 
							<div class="control-group">
			
 
								<label class="control-label">分类：</label>
			
 
								<div class="control-form">
			
 
									<div class=" cus-sel cus-sel-w200 cus-sel-h33" id="FirstLevelCategoryId">
			
 
										<div class="cus-sel-chosed">
			
 
											<input id="p_FirstLevelCategoryId" type="text" class="c-hide"> 
			
 
											<span class="cus-sel-chosed-txt" data-value="">--请选择一级分类--</span> 
			
 
											<span class="jselect-icon"></span>
			
 
										</div>
			
 
										<div class="cus-sel-list c-hide">
			
 
											<ul>
			
 
											</ul>
			
 
										</div>
			
 
									</div>
			
 
									
			
 
									<div class=" cus-sel cus-sel-w240 cus-sel-h33" id="SecondLevelCategoryId">
			
 
										<div class="cus-sel-chosed">
			
 
											<input id="p_SecondLevelCategoryId" type="text" class="c-hide"> 
			
 
											<span class="cus-sel-chosed-txt" data-value="">--请选择二级分类--</span> 
			
 
											<span class="jselect-icon"></span>
			
 
										</div>
			
 
										<div class="cus-sel-list c-hide">
			
 
											<ul>
			
 
											</ul>
			
 
										</div>
			
 
									</div>
			
 
				
			
 
								</div>
			
 
							</div>
			
 
							<div class="control-group" style=" width:60px;"></div>
			
 
							<div class="control-group">
			
 
								<label class="control-label">添加时间：</label>
			
 
				
			
 
								<div class="date-wrap">
			
 
									<input type="text" placeholder="请选择开始时间" value="" id="StartTime"  
			
 
									onfocus="WdatePicker({doubleCalendar:false,dateFmt:'yyyy-MM-dd HH:mm:ss'})"
			
 
										class="date-txt datetimepicker" />
			
 
				
			
 
								</div>
			
 
							</div>
			
 
							<div class="control-group">
			
 
								<div class="date-wrap">
			
 
									<input type="text" placeholder="请选择结束时间" value="" id="EndTime"
			
 
									 onfocus="WdatePicker({doubleCalendar:false,dateFmt:'yyyy-MM-dd HH:mm:ss'})"
			
 
										class="date-txt datetimepicker" />
			
 
								</div>
			
 
							</div>
			
 
				
			
 
							<div class="control-group">
			
 
								<label class="control-label">类型：</label>
			
 
								<div class="control-form">
			
 
									<div class="cus-sel cus-sel-h33"  
			
 
										id="ArticleType">
			
 
										<div class="cus-sel-chosed">
			
 
											<input   type="text" style="display:none;"> <span
			
 
												class="cus-sel-chosed-txt" data-value="">--请选择类型--</span> <span
			
 
												class="jselect-icon"></span>
			
 
										</div>
			
 
										<div class="cus-sel-list c-hide">
			
 
												<ul>
			
 
												</ul>
			
 
										</div>
			
 
									</div>
			
 
				
			
 
								</div>
			
 
							</div>
			
 
					 		<div class="control-group" style=" width:10px;"></div>
			
 
							<div class="control-group">
			
 
								<label class="control-label">来源：</label>
			
 
								<div class="control-form">
			
 
									<div class="cus-sel cus-sel-h33" data-toggle="formSelect"
			
 
										id="ArticleSource">
			
 
										<div class="cus-sel-chosed">
			
 
											<input type="text" style="display:none;"> <span
			
 
												class="cus-sel-chosed-txt" data-value="">--请选择来源--</span> <span
			
 
												class="jselect-icon"></span>
			
 
										</div>
			
 
										<div class="cus-sel-list c-hide">
			
 
												<ul>
			
 
												</ul>
			
 
										</div>
			
 
									</div>
			
 
				
			
 
								</div>
			
 
							</div>
			
 
							<div class="control-group" style=" width:40px;"></div>
			
 
							<div class="control-group">
			
 
								<label class="control-label">优先级：</label>
			
 
								<div class="control-form">
			
 
									<div class="cus-sel cus-sel-h33" data-toggle="formSelect"
			
 
										id="Articlelevel">
			
 
										<div class="cus-sel-chosed">
			
 
											<input type="text" style="display:none;"> <span
			
 
												class="cus-sel-chosed-txt" data-value="">--请选择等级--</span> <span
			
 
												class="jselect-icon"></span>
			
 
										</div>
			
 
										<div class="cus-sel-list c-hide">
			
 
												<ul>
			
 
												</ul>
			
 
										</div>
			
 
									</div>
			
 
								</div>
			
 
							</div>
			
 
							<div class="control-group">
			
 
								<label class="control-label">关键字：</label>
			
 
								<div class="control-form">
			
 
									<input type="text" placeholder="搜索文章标题或机构名称"
			
 
										class="input-text input-text-w200" id="ArticleTitle">
			
 
								</div>
			
 
							</div>
			
 
							<div class="control-group" style=" width:730px;"></div>
			
 
				
			
 
							<div class="control-group">
			
 
								<div class="control-form">
			
 
				 					<a href="javascript:doSearch();" id="findBtn" class="c-btn c-btn-blue btn-w60">查询</a>
			
 
								</div>
			
 
							</div>
			
 
							<div class="control-group">
			
 
								<div class="control-form">
			
 
				
			
 
									<a href="AddPcJkArticle.html" class="c-btn bgc-ec6941 btn-w60 ml10"
			
 
										data-options="iconCls:'icon-add',plain:true">添加文章</a>
			
 
				
			
 
								</div>
			
 
							</div>
			
 
							<div class="control-group">
			
 
								<div class="control-form">
			
 
				 				
			
 
									<a href="javascript:chk();" class="c-btn c-btn-green btn-w60 ml10"
			
 
										style="background-color: #1f8c7f; ">批量删除</a>
			
 
								</div>
			
 
							</div>
			
 
						</div>
			
 
				        
			
 
				        <div class="" id="groupDataTableDiv">
			
 
				            <table id="groupDataTable" class="cell-border hover c-t-left c-t-center" cellspacing="0" width="100%">
			
 
				                <thead>
			
 
				                <tr>
			
 
				                	<th style="width:2%" ><label class="checkbox all-checkbox" > 
			
 
					                	<input type="checkbox" name="tags" class="c-hide"  > <i class="icon-chkbox"></i>
			
 
									</label></th>
			
 
				                 		<th   style="width:8%" align="center">文章标题</th>
			
 
										<th   style="width:4%" align="center">分类/类型</th> 
			
 
										<th   style="width:3%" align="center">来源</th>
			
 
										<th   style="width:3%" align="center">优先级</th>
			
 
										<th   style="width:5%" align="center">添加/编辑时间</th>
			
 
										<th   style="width:3%" align="center">操作</th>
			
 
										<th   style="width:2%" align="center">居民推送</th>
			
 
				                </tr>
			
 
				                </thead>
			
 
				                <tbody></tbody>
			
 
				            </table>
			
 
				        </div>
			
 
				    </div>
			
 
				</div>
			
 
				 
			
 
					<script src="../cross/js/jquery/1.8.3/jquery.js"></script>
			
 
					<script type="text/javascript" src="../cross/js/cross.ui.js"></script>
			
 
				<script type="text/javascript"
			
 
						src="../widget/placeholder/2.0.7/js/jquery.placeholder.js"></script>
			
 
					<script type="text/javascript" src="../widget/artDialog/4.1.7/js/artDialog.js?v=20160629"></script>
			
 
				<script type="text/javascript" src="../widget/datatables/1.10.10/js/jquery.dataTables.js"></script>
			
 
				 
			
 
				<script type="text/javascript" src="../widget/inputSelect/1.0/js/inputSelect.js"></script>
			
 
				  	<script type="text/javascript" src="js/JkArticleLibrary.js"></script>
			
 
				 	
			
 
				<script type="text/javascript"
			
 
						src="../widget/datetimepicker/2.1.9/js/jquery.datetimepicker.js"></script>
			
 
				<script type="text/javascript" src="../widget/My97DatePicker/WdatePicker.js"></script>
			
 
				<script type="text/javascript" >
			
 
				 
			
 
				
			
 
				function ask(message){
			
 
				 	art.dialog({
			
 
						lock : true,
			
 
						artIcon : 'ask',
			
 
						opacity : 0.4,
			
 
						width : 250,
			
 
						title : '提示',
			
 
						content : message,
			
 
						ok : function() {
			
 
							
			
 
						}
			
 
					});
			
 
				 	
			
 
				 }
			
 
				</script>
			
 
				</body>
			
 
				</html>
			
--- a/edu-article/JkEdu/WebRoot/JkArticle/JkArticleLibraryDoctor.html
+++ b/edu-article/JkEdu/WebRoot/JkArticle/JkArticleLibraryDoctor.html
@ -0,0 +1,230 @@
 
				<!DOCTYPE html>
			
 
				<html lang="en">
			
 
				<head>
			
 
				    <meta charset="utf-8" />
			
 
				    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
			
 
				    <meta name="renderer" content="webkit" />
			
 
				    <title>文章库-医生</title>
			
 
				    <link rel="stylesheet" href="../cross/css/cross.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../cross/css/cross.ui.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../iconfont/iconfont.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../widget/datetimepicker/2.1.9/css/jquery.datetimepicker.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../widget/artDialog/4.1.7/css/artDialog.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../widget/datatables/1.10.10/css/jquery.dataTables.css" type="text/css"/>
			
 
				    <link rel="stylesheet" href="../css/health-edu.css" type="text/css" />
			
 
				 
			
 
				    <style>
			
 
				    .round-no{
			
 
				    	width:16px;height:16px;
			
 
						display: inline-block;font-size:15px;
			
 
						line-heigth:16px;text-align:center;color:#f00;
			
 
				    	padding-left: 2px;
			
 
						text-decoration:none
			
 
					}
			
 
					.round-ok{
			
 
						width:16px;height:16px;
			
 
						display: inline-block;font-size:15px;
			
 
						line-heigth:16px;text-align:center;color:#0288FF;
			
 
				    	padding-left: 2px;
			
 
						text-decoration:none
			
 
					}
			
 
				    </style>
			
 
				</head>
			
 
				<body>
			
 
				<div class="">
			
 
				    <div class="plr5">
			
 
				        <div class="form-layout form-inline  ">
			
 
				
			
 
				
			
 
							<div class="control-group">
			
 
								<label class="control-label">分类：</label>
			
 
								<div class="control-form">
			
 
									<div class=" cus-sel cus-sel-w200 cus-sel-h33" id="FirstLevelCategoryId">
			
 
										<div class="cus-sel-chosed">
			
 
											<input id="p_FirstLevelCategoryId" type="text" class="c-hide"> 
			
 
											<span class="cus-sel-chosed-txt" data-value="">--请选择一级分类--</span> 
			
 
											<span class="jselect-icon"></span>
			
 
										</div>
			
 
										<div class="cus-sel-list c-hide">
			
 
											<ul>
			
 
											</ul>
			
 
										</div>
			
 
									</div>
			
 
									
			
 
									<div class=" cus-sel cus-sel-w240 cus-sel-h33" id="SecondLevelCategoryId">
			
 
										<div class="cus-sel-chosed">
			
 
											<input id="p_SecondLevelCategoryId" type="text" class="c-hide"> 
			
 
											<span class="cus-sel-chosed-txt" data-value="">--请选择二级分类--</span> 
			
 
											<span class="jselect-icon"></span>
			
 
										</div>
			
 
										<div class="cus-sel-list c-hide">
			
 
											<ul>
			
 
											</ul>
			
 
										</div>
			
 
									</div>
			
 
				
			
 
								</div>
			
 
							</div>
			
 
							<div class="control-group" style=" width:60px;"></div>
			
 
							<div class="control-group">
			
 
								<label class="control-label">添加时间：</label>
			
 
				
			
 
								<div class="date-wrap">
			
 
									<input type="text" placeholder="请选择开始时间" value="" id="StartTime"
			
 
										onfocus="WdatePicker({doubleCalendar:false,dateFmt:'yyyy-MM-dd HH:mm:ss'})"
			
 
										class="date-txt datetimepicker" />
			
 
				
			
 
								</div>
			
 
							</div>
			
 
							<div class="control-group">
			
 
								<div class="date-wrap">
			
 
									<input type="text" placeholder="请选择结束时间" value="" id="EndTime"
			
 
										onfocus="WdatePicker({doubleCalendar:false,dateFmt:'yyyy-MM-dd HH:mm:ss'})"
			
 
										class="date-txt datetimepicker" />
			
 
								</div>
			
 
							</div>
			
 
				
			
 
							<div class="control-group">
			
 
								<label class="control-label">类型：</label>
			
 
								<div class="control-form">
			
 
									<div class="cus-sel cus-sel-h33"  
			
 
										id="ArticleType">
			
 
										<div class="cus-sel-chosed">
			
 
											<input   type="text" style="display:none;"> <span
			
 
												class="cus-sel-chosed-txt" data-value="">--请选择类型--</span> <span
			
 
												class="jselect-icon"></span>
			
 
										</div>
			
 
										<div class="cus-sel-list c-hide">
			
 
												<ul>
			
 
												</ul>
			
 
										</div>
			
 
									</div>
			
 
				
			
 
								</div>
			
 
							</div>
			
 
					 		<div class="control-group" style=" width:10px;"></div>
			
 
							<div class="control-group">
			
 
								<label class="control-label">来源：</label>
			
 
								<div class="control-form">
			
 
									<div class="cus-sel cus-sel-h33" data-toggle="formSelect"
			
 
										id="ArticleSource">
			
 
										<div class="cus-sel-chosed">
			
 
											<input type="text" style="display:none;"> <span
			
 
												class="cus-sel-chosed-txt" data-value="">--请选择来源--</span> <span
			
 
												class="jselect-icon"></span>
			
 
										</div>
			
 
										<div class="cus-sel-list c-hide">
			
 
												<ul>
			
 
												</ul>
			
 
										</div>
			
 
									</div>
			
 
				
			
 
								</div>
			
 
							</div>
			
 
							<div class="control-group" style=" width:40px;"></div>
			
 
							<div class="control-group">
			
 
								<label class="control-label">优先级：</label>
			
 
								<div class="control-form">
			
 
									<div class="cus-sel cus-sel-h33" data-toggle="formSelect"
			
 
										id="Articlelevel">
			
 
										<div class="cus-sel-chosed">
			
 
											<input type="text" style="display:none;"> <span
			
 
												class="cus-sel-chosed-txt" data-value="">--请选择等级--</span> <span
			
 
												class="jselect-icon"></span>
			
 
										</div>
			
 
										<div class="cus-sel-list c-hide">
			
 
												<ul>
			
 
												</ul>
			
 
										</div>
			
 
									</div>
			
 
								</div>
			
 
							</div>
			
 
							<div class="control-group">
			
 
								<label class="control-label">关键字：</label>
			
 
								<div class="control-form">
			
 
									<input type="text" placeholder="搜索文章标题或机构名称"
			
 
										class="input-text input-text-w200" id="ArticleTitle">
			
 
								</div>
			
 
							</div>
			
 
							<div class="control-group" style=" width:730px;"></div>
			
 
				
			
 
							<div class="control-group">
			
 
								<div class="control-form">
			
 
				 					<a href="javascript:doSearch();" id="findBtn" class="c-btn c-btn-blue btn-w60">查询</a>
			
 
								</div>
			
 
							</div>
			
 
							<div class="control-group">
			
 
								<div class="control-form">
			
 
				
			
 
									<a href="AddPcJkArticleDoctor.html" class="c-btn bgc-ec6941 btn-w60 ml10"
			
 
										data-options="iconCls:'icon-add',plain:true">添加文章</a>
			
 
				
			
 
								</div>
			
 
							</div>
			
 
							<div class="control-group">
			
 
								<div class="control-form">
			
 
				 				
			
 
									<a href="javascript:chk();" class="c-btn c-btn-green btn-w60 ml10"
			
 
										style="background-color: #1f8c7f; ">批量删除</a>
			
 
								</div>
			
 
							</div>
			
 
						</div>
			
 
				        
			
 
				        <div class="" id="groupDataTableDiv">
			
 
				            <table id="groupDataTable" class="cell-border hover c-t-left c-t-center" cellspacing="0" width="100%">
			
 
				                <thead>
			
 
				                <tr>
			
 
				                	<th style="width:2%" ><label class="checkbox all-checkbox" > 
			
 
					                	<input type="checkbox" name="tags" class="c-hide"  > <i class="icon-chkbox"></i>
			
 
									</label></th>
			
 
				                 		<th   style="width:5%" align="center">文章标题</th>
			
 
										<th   style="width:4%" align="center">分类/类型</th> 
			
 
										<th   style="width:3%" align="center">来源/发布人</th>
			
 
										<th   style="width:3%" align="center">优先级</th>
			
 
										<th   style="width:5%" align="center">添加/编辑时间</th>
			
 
										<th   style="width:3%" align="center">认证状态</th>
			
 
										<th   style="width:3%" align="center">认证机构</th>
			
 
										<th   style="width:6%" align="center">操作</th>
			
 
				                </tr>
			
 
				                </thead>
			
 
				                <tbody></tbody>
			
 
				            </table>
			
 
				        </div>
			
 
				    </div>
			
 
				</div>
			
 
				 
			
 
					<script src="../cross/js/jquery/1.8.3/jquery.js"></script>
			
 
					<script type="text/javascript" src="../cross/js/cross.ui.js"></script>
			
 
				<script type="text/javascript"
			
 
						src="../widget/placeholder/2.0.7/js/jquery.placeholder.js"></script>
			
 
					<script type="text/javascript" src="../widget/artDialog/4.1.7/js/artDialog.js?v=20160629"></script>
			
 
				<script type="text/javascript" src="../widget/datatables/1.10.10/js/jquery.dataTables.js"></script>
			
 
				 
			
 
				<script type="text/javascript" src="../widget/inputSelect/1.0/js/inputSelect.js"></script>
			
 
				  	<script type="text/javascript" src="js/JkArticleLibraryDoctor.js"></script>
			
 
				 	
			
 
				<script type="text/javascript"
			
 
						src="../widget/datetimepicker/2.1.9/js/jquery.datetimepicker.js"></script>
			
 
				<script type="text/javascript" src="../js/localStorageUtils.js"></script>
			
 
				<script type="text/javascript" src="../widget/My97DatePicker/WdatePicker.js"></script>
			
 
				
			
 
				<script type="text/javascript" >
			
 
				 
			
 
				
			
 
				function ask(message){
			
 
				 	art.dialog({
			
 
						lock : true,
			
 
						artIcon : 'ask',
			
 
						opacity : 0.4,
			
 
						width : 250,
			
 
						title : '提示',
			
 
						content : message,
			
 
						ok : function() {
			
 
							
			
 
						}
			
 
					});
			
 
				 	
			
 
				 }
			
 
				</script>
			
 
				</body>
			
 
				</html>
			
--- a/edu-article/JkEdu/WebRoot/JkArticle/PushArticle.html
+++ b/edu-article/JkEdu/WebRoot/JkArticle/PushArticle.html
@ -0,0 +1,573 @@
 
				<!DOCTYPE html>
			
 
				<html lang="en">
			
 
				<head>
			
 
					<meta charset="utf-8" />
			
 
				    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
			
 
				    <meta name="renderer" content="webkit" />
			
 
				    <title>卫计委推送</title>
			
 
				    <link rel="stylesheet" href="../cross/css/cross.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../cross/css/cross.ui.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../css/health-edu.css" type="text/css" />
			
 
				</head>
			
 
				<body>
			
 
				<div class="p20">
			
 
				 	<h2 class="c-f16 c-666 c-normal pb20 c-border-b" id = "articleTitle">  </h2>
			
 
					
			
 
					<ul class="tags-list pt50">
			
 
						<li  class="xsdwCss">
			
 
							<div class="tit">
			
 
								<h3>下属单位</h3>
			
 
								<span class="tag tag-hollow tag-all">全部</span>
			
 
							</div>
			
 
							 <div id="sCompany"></div>
			
 
							
			
 
						</li>
			
 
						<li class="xbCss">
			
 
							<div class="tit">
			
 
								<h3>性别</h3>
			
 
								<span class="tag tag-hollow tag-all">全部</span>
			
 
							</div>
			
 
							<div class="con">
			
 
								<span class="tag tag-hollow" id = "nan" >男</span>
			
 
								<span class="tag tag-hollow" id = "nv" >女</span>
			
 
							</div>
			
 
						</li>
			
 
						<li class="fwlxCss" >
			
 
							<div class="tit">
			
 
								<h3>服务类型</h3>
			
 
								<span class="tag tag-hollow tag-all">全部</span>
			
 
							</div>
			
 
							  <div id="secondLevel"></div>
			
 
							
			
 
						
			
 
						</li>
			
 
						<li class="jblxCss"  >
			
 
							<div class="tit">
			
 
								<h3>疾病类型</h3>
			
 
								<span class="tag tag-hollow tag-all">全部</span>
			
 
							</div>
			
 
							<div class="con">
			
 
								<span class="tag tag-hollow">高血压</span>
			
 
								<span class="tag tag-hollow">心脏病</span>
			
 
								<span class="tag tag-hollow">感冒</span>
			
 
								<span class="tag tag-hollow">骨折</span>
			
 
								<span class="tag tag-hollow curr">帕金森综合症</span>
			
 
							</div>
			
 
						</li>
			
 
						<li>
			
 
							<div class="tit">
			
 
								<h3>健康情况</h3>
			
 
								<span class="tag tag-hollow tag-all">全部</span>
			
 
							</div>
			
 
							<div class="con">
			
 
								<span class="tag tag-hollow">高血压</span>
			
 
								<span class="tag tag-hollow">心脏病</span>
			
 
								<span class="tag tag-hollow">感冒</span>
			
 
								<span class="tag tag-hollow">骨折</span>
			
 
								<span class="tag tag-hollow">帕金森综合症</span>
			
 
							</div>
			
 
						</li>
			
 
					</ul>
			
 
					<div class="c-border-t c-t-center ptb50">
			
 
				 	
			
 
						<a href="javascript:Push();" class="c-btn c-btn-blue btn-w90">确定</a>
			
 
						<a href="#" class="c-btn c-btn-white btn-w90 ml10">取消并返回</a>
			
 
					</div>
			
 
				</div>
			
 
				
			
 
				<!-- 发送文章 start -->
			
 
				<div id="Pushdiv" style="display:none;">
			
 
					<input type="hidden" id="p_testcaseid">
			
 
					<input type="hidden" id="f_methodid">
			
 
					<form id="form_add">
			
 
						
			
 
				     	<div class="control-group">
			
 
							<tr>
			
 
								<th colspan="14" class="c-t-center" style="font-size:14px;"
			
 
									rowspan="1"><span>文章名称:</span> <span style="font-size:14px;"
			
 
									id="pushArticletitle"></span> </th>
			
 
							</tr>
			
 
						</div>
			
 
						<div class="control-group">
			
 
							<tr>
			
 
								<th colspan="14" class="c-t-center" style="font-size:14px;"
			
 
									rowspan="1"><span>发送居民范围:</span> </th>
			
 
							</tr>
			
 
						</div>
			
 
						<div class="control-group">
			
 
							<tr>
			
 
								<th colspan="14" class="c-t-center" style="font-size:14px;"
			
 
									rowspan="1"><span>下属单位:</span> <span style="font-size:14px;"
			
 
									id="xsdwId"></span> </th>
			
 
							</tr>
			
 
						</div>
			
 
						<div class="control-group">
			
 
							<tr>
			
 
								<th colspan="14" class="c-t-center" style="font-size:14px;"
			
 
									rowspan="1"><span>性别:</span> <span style="font-size:14px;"
			
 
									id="xbId"></span> </th>
			
 
							</tr>
			
 
						</div>
			
 
						<div class="control-group">
			
 
							<tr>
			
 
								<th colspan="14" class="c-t-center" style="font-size:14px;"
			
 
									rowspan="1"><span>服务类型:</span> <span style="font-size:14px;"
			
 
									id="fwlxId"></span> </th>
			
 
							</tr>
			
 
						</div>
			
 
						<div class="control-group">
			
 
							<tr>
			
 
								<th colspan="14" class="c-t-center" style="font-size:14px;"
			
 
									rowspan="1"><span>疾病类型:</span> <span style="font-size:14px;"
			
 
									id="jblxId"></span> </th>
			
 
							</tr>
			
 
						</div>
			
 
						<div class="control-group">
			
 
							<tr>
			
 
								<th colspan="14" class="c-t-center" style="font-size:14px;"
			
 
									rowspan="1"><span>健康情况:</span> <span style="font-size:14px;"
			
 
									id="p_yearE"></span> </th>
			
 
							</tr>
			
 
						</div>
			
 
						<div class="control-group">
			
 
							<tr>
			
 
								<th colspan="14" class="c-t-center" style="font-size:14px;"
			
 
									rowspan="1"><span>发送用户数:</span> <span style="font-size:14px;"
			
 
									id="p_yearE"></span> </th>
			
 
							</tr>
			
 
						</div>
			
 
						<div class="form-layout form-inline">
			
 
					    	<div id="innerfm"></div>
			
 
						</div>
			
 
						<div class="c-t-center mt10">
			
 
				        	<a href="javascript:sendOut();" id="addBtn" class="c-btn c-btn-blue">发送</a>
			
 
				         </div>
			
 
					</form>
			
 
				</div>
			
 
				<!-- 发送文章  -->
			
 
				
			
 
				<script type="text/javascript" src="../cross/js/jquery/1.8.3/jquery.js"></script>
			
 
				<script type="text/javascript" src="../cross/js/cross.ui.js"></script>
			
 
				<script type="text/javascript" src="../widget/placeholder/2.0.7/js/jquery.placeholder.js"></script>
			
 
				<link rel="stylesheet" href="../widget/artDialog/4.1.7/css/artDialog.min.css" type="text/css" />
			
 
				<script type="text/javascript" src="../widget/artDialog/4.1.7/js/artDialog.min.js"></script>
			
 
				<script type="text/javascript">
			
 
					var articleid = null;
			
 
					articleid = getUrlParam("articleid");
			
 
					var articletitle = "";
			
 
					var jblx = new Array();
			
 
					var fwlx = new Array();
			
 
					var xb = new Array();
			
 
					var xsdw = new Array();
			
 
				 	$(function(){
			
 
				 		queryCardInfo();
			
 
				 		showSecondLevel();
			
 
				 		showSCompany();
			
 
				 		 
			
 
				 	 	$('.tags-list').on('click','.tag-hollow',function(){
			
 
				    			var all = $(this).hasClass('tag-all');
			
 
				    			var curr = $(this).hasClass('curr');
			
 
				 			$('.tag-all').siblings('.c-hide').removeClass('c-hide');
			
 
				
			
 
				    			if(all){
			
 
				    				if(curr){
			
 
				    					
			
 
				    					$(this).removeClass('curr');
			
 
				    					$(this).parent().siblings().find('.tag-hollow').removeClass('curr');
			
 
				     			}else{
			
 
				     				$(this).addClass('curr');
			
 
				    					$(this).parent().siblings().find('.tag-hollow').addClass('curr');
			
 
				    				}
			
 
				    			}else{
			
 
				    				if(curr){
			
 
				    					$(this).removeClass('curr');
			
 
				    					$(this).parent().siblings().find('.tag-all').removeClass('curr');
			
 
				    				}else{
			
 
				    					$(this).addClass('curr');
			
 
				    				}
			
 
				    			}
			
 
				    	});
			
 
				 		
			
 
				 		//展开查看全部
			
 
				 		$('.get-more a').click(function(){
			
 
				 			 
			
 
				 			$(this).parent().siblings('.c-hide').removeClass('c-hide');
			
 
				 		 
			
 
				 			$('.get-more').hide();
			
 
				 		});
			
 
				 		
			
 
				 		//发送
			
 
				 		$('#sendBtn').click(function(){
			
 
				 			art.dialog({
			
 
								lock: true,
			
 
								artIcon:'ask',
			
 
								opacity:0.4,
			
 
								width: 400,
			
 
								overflow:true,
			
 
								title:'推送文章',
			
 
								content: '<p class="c-f14">将文章发送给 <em class="c-0090ff">1324543</em> 个用户？</p>',
			
 
								cancelVal:'拒绝',
			
 
								ok: function () {
			
 
								
			
 
								},
			
 
								cancel: function () {
			
 
								
			
 
								}
			
 
							});
			
 
				 		});
			
 
				  		 
			
 
				 	});
			
 
				 	function class2(){
			
 
				 	 	$('.tags-list').on('click','.tag-hollow',function(){
			
 
				    			var all = $(this).hasClass('tag-all');
			
 
				    			var curr = $(this).hasClass('curr');
			
 
				 			$('.tag-all').siblings('.c-hide').removeClass('c-hide');
			
 
				
			
 
				    			if(all){
			
 
				    				if(curr){
			
 
				    					
			
 
				    					$(this).removeClass('curr');
			
 
				    					$(this).parent().siblings().find('.tag-hollow').removeClass('curr');
			
 
				     			}else{
			
 
				     				$(this).addClass('curr');
			
 
				    					$(this).parent().siblings().find('.tag-hollow').addClass('curr');
			
 
				    				}
			
 
				    			}else{
			
 
				    				if(curr){
			
 
				    					$(this).removeClass('curr');
			
 
				    					$(this).parent().siblings().find('.tag-all').removeClass('curr');
			
 
				    				}else{
			
 
				    					$(this).addClass('curr');
			
 
				    				}
			
 
				    			}
			
 
				    	});
			
 
						//展开查看全部
			
 
						$('.get-more a').click(function(){
			
 
							$(this).parent().siblings('.c-hide').removeClass('c-hide');
			
 
				
			
 
							$('.get-more').hide();
			
 
						});
			
 
					}
			
 
				 	
			
 
				 	//下属单位
			
 
				 	function showSCompany(){
			
 
				 		
			
 
				 		$.ajax({
			
 
				 			dataType: "json",
			
 
				 			type: "POST",
			
 
				 			cache:false,
			
 
				 			data : {
			
 
				 				typeName : "sCompany"
			
 
				 			},
			
 
				 			url: "/JkEdu/configDict/getDict",
			
 
				 			success : function(result) {
			
 
				 				if (result.Code == 10000) {
			
 
				 					if (result.Code==10000){
			
 
				 		 				$('#sCompany').html("");
			
 
				 		 				var data = result.result;
			
 
				 		 				var html = "";
			
 
				 		 				serviceId_temp = "";
			
 
				 		 				html += '<div class="con">';
			
 
				 		 				var s = "";
			
 
				 		 				$.each(data,function(i,row){
			
 
				 		  					var sId = row.code;
			
 
				 		 					var sName = row.codeName;
			
 
				 		 					s=i;
			
 
											if(i<7){
			
 
				 	 		 	 				html += '<span class="tag tag-hollow">'+(sName==undefined?'':sName)+'</span>';
			
 
				  		 					}else{
			
 
					 		 	 				html += '<span class="tag tag-hollow c-hide ">'+(sName==undefined?'':sName)+'</span>';
			
 
				 		 					}
			
 
				 		   				});
			
 
				 		 				if (s>7){
			
 
				 	 		 				html += '</div><div class="get-more xsdw"><a href="javascript:;">展开查看全部1</a></div>';
			
 
										}
			
 
				 		 				$('#sCompany').html(html);
			
 
				 		 				//展开查看全部
			
 
				 		 				$('.xsdw  a').click(function(){
			
 
				 		 					$(this).parent().siblings().find('.c-hide').removeClass('c-hide');
			
 
				 		 					$('.xsdw').hide();
			
 
				 		 				});
			
 
				  		 			} else {
			
 
				 		 				$('#sCompany').html("");
			
 
				 		 				ask(result.Message);
			
 
				 		 			}
			
 
				 					
			
 
				 				}
			
 
				 				 
			
 
				 			}
			
 
				 		});
			
 
				 	}
			
 
				 	
			
 
				 	
			
 
				 	//服务类型（新）
			
 
				 	function showSecondLevel(labelType){
			
 
				 		
			
 
				 		$.ajax({
			
 
				 			dataType: "json",
			
 
				 			type: "POST",
			
 
				 			cache:false,
			
 
				 			data : {
			
 
				 				"CategoryLevel":"1"
			
 
				 			},
			
 
				 			url: "/JkEdu/articlePc/queryCategory",
			
 
				 			success : function(result) {
			
 
				 				if (result.Code == 10000) {
			
 
				 					if (result.Code==10000){
			
 
				 		 				$('#secondLevel').html("");
			
 
				 		 				var data = result.result;
			
 
				 		 				var html = "";
			
 
				 		 				serviceId_temp = "";
			
 
				 		 				html += '<div class="con">';
			
 
				 		 				
			
 
				 		 				
			
 
				 		 				$.each(data,function(i,row){
			
 
				 		 					
			
 
				 	 		 				
			
 
				 		  					var sId = row.firstlevelid;
			
 
				 		 					var sName = row.categoryname;
			
 
				 		 	 				
			
 
				 		 					if(i<7){
			
 
				 		 						html += '<span class="tag tag-hollow oo">'+(sName==undefined?'':sName)+'</span>';
			
 
				
			
 
				 		 					}else{
			
 
				 	 		 	 				html += '<span class="tag tag-hollow c-hide oo">'+(sName==undefined?'':sName)+'</span>';
			
 
				
			
 
				 		 					}
			
 
				
			
 
				 		   				});
			
 
										if (s>7){
			
 
				
			
 
				 	 		 				html += '</div><div class="get-more fwclass"><a href="javascript:;">展开查看全部</a></div>';
			
 
				
			
 
										}
			
 
				 		 				$('#secondLevel').html(html);
			
 
				 		 				//展开查看全部
			
 
				 		 				$('.fwclass  a').click(function(){
			
 
				 		 					$(this).parent().siblings().find('.c-hide').removeClass('c-hide');
			
 
				
			
 
				 		 					$('.fwclass').hide();
			
 
				 		 				});
			
 
				 		 				
			
 
				  		 			} else {
			
 
				 		 				$('#secondLevel').html("");
			
 
				 		 				ask(result.Message);
			
 
				 		 			}
			
 
				 					
			
 
				 				}
			
 
				 			}
			
 
				 		});
			
 
				 	}
			
 
				 	
			
 
				 	
			
 
				 	
			
 
				 	//发送弹框
			
 
				 	function Push() {
			
 
				 		
			
 
				  		$("#addBtn").show();
			
 
				
			
 
						
			
 
						var $this = $(".xbCss").find('.tag').parents('li').find('.con').find('.curr');
			
 
						for (var i = 0; i < $this.length; i++) {
			
 
							xb[i] = $this[i].innerHTML;
			
 
							//console.info($this[i].id);
			
 
				 		}
			
 
						//console.info($this);
			
 
						if ($.inArray("男", xb)==0&&$.inArray("女", xb)==1){
			
 
							
			
 
							$("#xbId").text("不限");//性别
			
 
						}else {
			
 
							$("#xbId").text(xb);//性别
			
 
						}
			
 
						
			
 
						var $this = $(".fwlxCss").find('.tag').parents('li').find('.con').find('.curr');
			
 
						for (var i = 0; i < $this.length; i++) {
			
 
							fwlx[i] = $this[i].innerHTML;
			
 
				 		}
			
 
						$("#fwlxId").text(fwlx);//服务类型
			
 
						
			
 
						var $this = $(".jblxCss").find('.tag').parents('li').find('.con').find('.curr');
			
 
						for (var i = 0; i < $this.length; i++) {
			
 
							jblx[i] = $this[i].innerHTML;
			
 
				 		}
			
 
						$("#jblxId").text(jblx);//疾病类型
			
 
						
			
 
						
			
 
						var $this = $(".xsdwCss").find('.tag').parents('li').find('.con').find('.curr');
			
 
						
			
 
						for (var i = 0; i < $this.length; i++) {
			
 
							xsdw[i] = $this[i].innerHTML;
			
 
				 		}
			
 
						$("#xsdwId").text(xsdw);//下属单位
			
 
						
			
 
				 		$("#pushArticletitle").text(articletitle);
			
 
				
			
 
				 		
			
 
				 		var contents=$('#Pushdiv').get(0);
			
 
				 		popAdd = art.dialog({
			
 
				 	        lock: true,
			
 
				  	        opacity:0.4,
			
 
				 	        width: 500,
			
 
				 	        height : 250,
			
 
				 			overflow:true,
			
 
				 	        title:'',
			
 
				 	        content: contents,
			
 
				 	        fixed : false,
			
 
				 	        ok : null,
			
 
				 			cancel : null, 
			
 
				 			quickClose : true
			
 
				 	    });
			
 
				 	}
			
 
				 	
			
 
				 	function getUrlParam(name) {
			
 
				 		var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
			
 
				 		var r = window.location.search.substr(1).match(reg);
			
 
				 		if (r!=null) return decodeURI(r[2]); return "";
			
 
				 	}	 		
			
 
				 	
			
 
				 	function queryCardInfo(){
			
 
						 
			
 
				  		$.ajax({
			
 
				 			dataType: "json",
			
 
				 			type: "POST",
			
 
				 			cache:false,
			
 
				 	 
			
 
				 			url: '/JkEdu/articlePc/queryArticlePcId',
			
 
				 			data: {
			
 
				 				articleid : articleid
			
 
				 			},
			
 
				 			beforeSend: function(){
			
 
				 				artLoading=art.dialog({
			
 
				 					lock: true,
			
 
				 					content: '<img src="../widget/artDialog/4.1.7/images/loading.gif" class="mr10" />数据加载中，请稍候...', 
			
 
				 					tips:true
			
 
				 				});
			
 
				 			},
			
 
				 			success: function(data){
			
 
				
			
 
				 				artLoading.close();
			
 
				 				if(data.Code==10000){
			
 
				 					if(typeof(data.result) != "undefined"){
			
 
				 						
			
 
				 						setTimeout(function(){
			
 
											articletitle = data.result.articletitle;
			
 
											var html = "";
			
 
										 		html += '文章名称：';
			
 
									 			html += articletitle;
			
 
								                $('#articleTitle').html(html);
			
 
				  				            
			
 
				 						}, 300);
			
 
				 					}
			
 
				 					 
			
 
				 				}else{
			
 
				 					ask(data.Message);
			
 
				 				}
			
 
				 			}, 
			
 
				 			error: function () {
			
 
				 				artLoading.close();
			
 
				 				var artBox=art.dialog({
			
 
				 					lock: true,
			
 
				 					artIcon:'error',
			
 
				 					opacity:0.4,
			
 
				 					width: 250,
			
 
				 					title:'提示',
			
 
				 					content: '数据加载失败！请联系管理员',
			
 
				 					ok: function () {
			
 
				 					}
			
 
				 				});
			
 
				 			}
			
 
				 		});
			
 
				 	}
			
 
				 	
			
 
				 	
			
 
				 	//根据标签类型和子标签code获取医生签约的患者列表
			
 
				 	function querySignPatientsByLabel(labelType,labelCode){
			
 
				 		 
			
 
				 		var teamCode =	$('#tdlbId').formSelect('getDataKey');
			
 
				  		var labelCodes=labelCode.substring(0,labelCode.length-1);
			
 
				  		$.ajax({
			
 
				 			dataType: "json",
			
 
				 			type: "POST",
			
 
				 			cache:false,
			
 
				 			url: '/JkEdu/articleDoctorPc/querySignPatientsByLabel',
			
 
				 			data: {
			
 
				 				labelType : labelType,
			
 
				 				teamCode : teamCode,
			
 
				 				labelCode :labelCodes
			
 
				 			},
			
 
				 			 
			
 
				 			success: function(data){
			
 
				 				artLoading.close();
			
 
				 				if(data.Code==10000){
			
 
				 					if(typeof(data.result) != "undefined"){
			
 
				 						setTimeout(function(){
			
 
				 							
			
 
				 							var html = "";
			
 
				 							for(var i=0;i<data.result.result.length;i++){
			
 
				 								
			
 
				 								var code = data.result.result[i].code;
			
 
				 								var name = data.result.result[i].name;
			
 
				 						 		if(i<7){
			
 
				 						 			html += '<span class="tag tag-hollow oo">'+(name==undefined?'':name)+'</span>';
			
 
				 	 	 		 	 				 
			
 
				 	  		 					}else{
			
 
				 	  		 					html += '<span class="tag tag-hollow c-hide oo">'+(sName==undefined?'':name)+'</span>';
			
 
				 	 		 					}
			
 
				 							}
			
 
				 						 	html += ' ';
			
 
				 						 	
			
 
				 						 	if (s>7){
			
 
				
			
 
				 	 	 		 				html += '</div><div class="get-more fwclass"><a href="javascript:;">展开查看全部</a></div>';
			
 
				
			
 
				 							}
			
 
				 	 		 				$('#secondLevel').html(html);
			
 
				 	 		 				//展开查看全部
			
 
				 	 		 				$('.fwclass  a').click(function(){
			
 
				 	 		 					$(this).parent().siblings().find('.c-hide').removeClass('c-hide');
			
 
				
			
 
				 	 		 					$('.fwclass').hide();
			
 
				 	 		 				});
			
 
				 						 	
			
 
				 						 
			
 
				 						 
			
 
				 						}, 300);
			
 
				 					}
			
 
				 					 
			
 
				 				}else{
			
 
				 					ask(data.Message);
			
 
				 				}
			
 
				 			}, 
			
 
				 			error: function () {
			
 
				 				artLoading.close();
			
 
				 				var artBox=art.dialog({
			
 
				 					lock: true,
			
 
				 					artIcon:'error',
			
 
				 					opacity:0.4,
			
 
				 					width: 250,
			
 
				 					title:'提示',
			
 
				 					content: '数据加载失败！请联系管理员',
			
 
				 					ok: function () {
			
 
				 					}
			
 
				 				});
			
 
				 			}
			
 
				 		});
			
 
				 	}
			
 
				 		 		
			
 
				 	function ask(message){
			
 
				 	 	art.dialog({
			
 
				 			lock : true,
			
 
				 			artIcon : 'ask',
			
 
				 			opacity : 0.4,
			
 
				 			width : 250,
			
 
				 			title : '提示',
			
 
				 			content : message,
			
 
				 			ok : function() {
			
 
				 				
			
 
				 			}
			
 
				 		});
			
 
				 	 	
			
 
				 	 }
			
 
				</script>
			
 
				</body>
			
 
				</html>
			
--- a/edu-article/JkEdu/WebRoot/JkArticle/PushArticleDoctor.html
+++ b/edu-article/JkEdu/WebRoot/JkArticle/PushArticleDoctor.html
@ -0,0 +1,719 @@
 
				<!DOCTYPE html>
			
 
				<html lang="en">
			
 
				<head>
			
 
					<meta charset="utf-8" />
			
 
				    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
			
 
				    <meta name="renderer" content="webkit" />
			
 
				    <title>医生推送</title>
			
 
				    <link rel="stylesheet" href="../cross/css/cross.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../cross/css/cross.ui.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../css/health-edu.css" type="text/css" />
			
 
				</head>
			
 
				<body>
			
 
				<div class="p20"  >
			
 
					<h2 class="c-f16 c-666 c-normal pb20 c-border-b" id = "articleTitle">  </h2>
			
 
					<div class="mt20">
			
 
						<div class="form-layout form-inline c-666">
			
 
							 
			
 
				            
			
 
				            
			
 
				            <div class="control-group">
			
 
								<div class="control-form">
			
 
									<div class=" cus-sel cus-sel-w200 cus-sel-h33" id="tdlbId">
			
 
										<div class="cus-sel-chosed">
			
 
											<input id="p_tdlbId" type="text" class="c-hide"> 
			
 
											<span class="cus-sel-chosed-txt" data-value="">--请选择--</span> 
			
 
											<span class="jselect-icon"></span>
			
 
										</div>
			
 
										<div class="cus-sel-list c-hide">
			
 
											<ul>
			
 
											</ul>
			
 
										</div>
			
 
									</div>
			
 
								</div>
			
 
							</div>
			
 
				            
			
 
				            <div class="control-group">
			
 
				                <div class="control-form">
			
 
				                    <ul class="tab-hd">
			
 
				                    	<li  class="curr fwlxli">服务类型</li>
			
 
				                    	<li class="jblxli">疾病类型</li>
			
 
				                    	<li>健康情况</li>
			
 
				                    	<li>团队标签</li>
			
 
				                    </ul>
			
 
				                </div>
			
 
				            </div>
			
 
				            <div class="control-group">
			
 
				                <label class="control-label c-t-right">居民姓名：</label>
			
 
				                <div class="control-form">
			
 
				                    <input type="text" class="input-text input-text-w150"  id="patientName" placeholder="请填写姓名" />
			
 
				                </div>
			
 
				            </div>
			
 
				            <div class="control-group">
			
 
				            	<div class="control-form">
			
 
				            		<a href="javascript:querySignPatientsByName();" class="c-btn c-btn-blue btn-w60">查询</a>
			
 
				            	</div>
			
 
				            </div>
			
 
						</div>
			
 
					</div>
			
 
					
			
 
				    <ul class="tab-bd pt30">
			
 
				    	<li class="tab-item curr" id = "fwlxliId">
			
 
						    	 
			
 
				    	</li>
			
 
				    	
			
 
				    	<li class="tab-item curr" id = "jblxId">
			
 
						    	 
			
 
				    	</li>
			
 
				    	<li class="tab-item curr">
			
 
				    			<label id="jblxchooseAll" class="checkbox mb10" data-toggle="checkbox">
			
 
							        <input type="checkbox" name="tags">
			
 
							        <i class="icon-chkbox"></i>选中以下所有签约居民
			
 
						    	</label>
			
 
				    		<ul class="tags-list tag-small">
			
 
								<li>
			
 
									<div class="tit">
			
 
										<h3>糖尿病</h3>
			
 
										<span class="tag tag-hollow tag-all">全部</span>
			
 
									</div>
			
 
									<div class="con" >
			
 
										<span class="tag tag-hollow">张发杰</span>
			
 
										<span class="tag tag-hollow">刘靓丽</span>
			
 
									</div>
			
 
								</li>
			
 
								 <li>
			
 
									<div class="tit">
			
 
										<h3>感冒</h3>
			
 
										<span class="tag tag-hollow tag-all">全部</span>
			
 
									</div>
			
 
									<div class="con"  >
			
 
										<span class="tag tag-hollow">感冒1</span>
			
 
										<span class="tag tag-hollow">感冒2</span>
			
 
									</div>
			
 
								</li>
			
 
								 <li>
			
 
									<div class="tit">
			
 
										<h3>感冒2</h3>
			
 
										<span class="tag tag-hollow tag-all">全部</span>
			
 
									</div>
			
 
									<div class="con" id = "ss2">
			
 
										<span class="tag tag-hollow">感冒1</span>
			
 
										<span class="tag tag-hollow">感冒2</span>
			
 
									</div>
			
 
								</li>
			
 
							</ul>
			
 
				    	</li>
			
 
				    	 
			
 
				    	<li class="tab-item curr">
			
 
				    			<label id="jkqkchooseAll" class="checkbox mb10" data-toggle="checkbox">
			
 
							        <input type="checkbox" name="tags">
			
 
							        <i class="icon-chkbox"></i>选中以下所有签约居民
			
 
						    	</label>
			
 
				    		<ul class="tags-list tag-small">
			
 
								<li>
			
 
									<div class="tit">
			
 
										<h3>骨折</h3>
			
 
										<span class="tag tag-hollow tag-all c-hide qbss"   >全部</span>
			
 
									</div>
			
 
									<div class="con">
			
 
										<span class="tag tag-hollow">张发杰</span>
			
 
										<span class="tag tag-hollow">刘靓丽</span>
			
 
										<span class="tag tag-hollow">张发杰</span>
			
 
										<span class="tag tag-hollow">刘靓丽</span>
			
 
										<span class="tag tag-hollow">张发杰</span>
			
 
										<span class="tag tag-hollow">刘靓丽</span>
			
 
										<span class="tag tag-hollow">张发杰</span>
			
 
										<span class="tag tag-hollow">刘靓丽</span>
			
 
										<span class="tag tag-hollow">张发杰</span>
			
 
										<span class="tag tag-hollow c-hide">刘靓丽</span>
			
 
										<span class="tag tag-hollow c-hide">张发杰</span>
			
 
										<span class="tag tag-hollow c-hide">刘靓丽</span>
			
 
										<span class="tag tag-hollow c-hide">张发杰</span>
			
 
										<span class="tag tag-hollow c-hide">刘靓丽</span>
			
 
										<span class="tag tag-hollow c-hide">张发杰</span>
			
 
										<span class="tag tag-hollow c-hide">刘靓丽</span>
			
 
										<div class="get-more"><a href="javascript:;">展开查看全部</a></div>
			
 
									</div>
			
 
								</li>
			
 
								 
			
 
							</ul>
			
 
				    	</li>
			
 
				    	
			
 
				    	
			
 
				    	<li class="tab-item curr">
			
 
				    			<label id="tdbqchooseAll" class="checkbox mb10" data-toggle="checkbox">
			
 
							        <input type="checkbox" name="tags">
			
 
							        <i class="icon-chkbox"></i>选中以下所有签约居民
			
 
						    	</label>
			
 
				    		<ul class="tags-list tag-small">
			
 
								<li>
			
 
									<div class="tit">
			
 
										<h3>骨质疏松</h3>
			
 
										<span class="tag tag-hollow tag-all c-hide qbss "  >全部</span>
			
 
									</div>
			
 
									<div class="con">
			
 
										<span class="tag tag-hollow">张发杰</span>
			
 
										<span class="tag tag-hollow">刘靓丽</span>
			
 
										<span class="tag tag-hollow">张发杰</span>
			
 
										<span class="tag tag-hollow">刘靓丽</span>
			
 
										<span class="tag tag-hollow">张发杰</span>
			
 
									</div>
			
 
								</li>
			
 
								 
			
 
							</ul>
			
 
				    	</li>
			
 
				    	
			
 
				    	 
			
 
				    </ul>
			
 
					<div class="c-border-t c-t-center ptb50">
			
 
						<a   href="javascript:Push();"  class="c-btn c-btn-blue btn-w90">确定</a>
			
 
						<a href="#" class="c-btn c-btn-white btn-w90 ml10">取消并返回</a>
			
 
					</div>
			
 
				</div>
			
 
				
			
 
				<!-- 发送文章 start -->
			
 
				<div id="Pushdiv" style="display:none;">
			
 
					<input type="hidden" id="p_testcaseid">
			
 
					<input type="hidden" id="f_methodid">
			
 
					<form id="form_add">
			
 
						
			
 
				     	<div class="control-group">
			
 
							<tr>
			
 
								<th colspan="14" class="c-t-center" style="font-size:14px;"
			
 
									rowspan="1"><span>文章名称:</span> <span style="font-size:14px;"
			
 
									id="pushArticletitle"></span> </th>
			
 
							</tr>
			
 
						</div>
			
 
						 
			
 
						<div class="control-group">
			
 
							<tr>
			
 
								<th colspan="14" class="c-t-center" style="font-size:14px;"
			
 
									rowspan="1"><span>发送给</span> <span style="font-size:14px;"
			
 
									id="xsdwId"></span> </th>
			
 
							</tr>
			
 
						</div>
			
 
						 
			
 
						<div class="control-group">
			
 
							<tr>
			
 
								<th colspan="14" class="c-t-center" style="font-size:14px;"
			
 
									rowspan="1"><span>发送用户数:</span> <span style="font-size:14px;"
			
 
									id="p_yearE"></span> </th>
			
 
							</tr>
			
 
						</div>
			
 
						<div class="form-layout form-inline">
			
 
					    	<div id="innerfm"></div>
			
 
						</div>
			
 
						<div class="c-t-center mt10">
			
 
				        	<a href="javascript:sendOut();" id="addBtn" class="c-btn c-btn-blue">发送</a>
			
 
				         </div>
			
 
					</form>
			
 
				</div>
			
 
				<!-- 发送文章  -->
			
 
				<script type="text/javascript" src="../cross/js/jquery/1.8.3/jquery.js"></script>
			
 
				<script type="text/javascript" src="../cross/js/cross.ui.js"></script>
			
 
				<script type="text/javascript" src="../widget/placeholder/2.0.7/js/jquery.placeholder.js"></script>
			
 
				<link rel="stylesheet" href="../widget/artDialog/4.1.7/css/artDialog.min.css" type="text/css" />
			
 
				<script type="text/javascript" src="../widget/artDialog/4.1.7/js/artDialog.min.js"></script>
			
 
				<script type="text/javascript">
			
 
					var articleid = null;
			
 
					articleid = getUrlParam("articleid");
			
 
					var articletitle = "";
			
 
					var fwlxlikai=1;
			
 
					var jblxlikai=1;
			
 
					var jkqklikai=1;
			
 
					var tdbqlikai=1;
			
 
					
			
 
					var isauthentication = "";
			
 
					var labelCodeArr = new Array();
			
 
				 	$(function(){
			
 
				 		getdoctorTeams();
			
 
				 		queryCardInfo();
			
 
					    $('.qbss').parent().find('.c-hide').removeClass('c-hide'); //设置“全部”按钮显示
			
 
					    $(this).addClass('curr').siblings().removeClass('curr')
			
 
				 		//$('.tab-bd .tab-item').eq(0).addClass('curr').siblings().removeClass('curr'); //设置默认展示 服务类型 下的数据
			
 
				
			
 
						//选中服务类型下的居民
			
 
				 		$('#fwlxchooseAll').click(function(){
			
 
				 			if(!$(this).hasClass('checked')){
			
 
				 				$(this).siblings('.tags-list').find('.tag').addClass('curr');
			
 
				 			}else{
			
 
				 				$(this).siblings('.tags-list').find('.tag').removeClass('curr');
			
 
				 			}
			
 
				 		});
			
 
				 		//选中疾病类型下的居民
			
 
				 		$('#jblxchooseAll').click(function(){
			
 
				 			if(!$(this).hasClass('checked')){
			
 
				 				$(this).siblings('.tags-list').find('.tag').addClass('curr');
			
 
				 			}else{
			
 
				 				$(this).siblings('.tags-list').find('.tag').removeClass('curr');
			
 
				 			}
			
 
				 		});
			
 
				 		
			
 
				 		//选中健康情况下的居民
			
 
				 		$('#jkqkchooseAll').click(function(){
			
 
				 			if(!$(this).hasClass('checked')){
			
 
				 				$(this).siblings('.tags-list').find('.tag').addClass('curr');
			
 
				 			}else{
			
 
				 				$(this).siblings('.tags-list').find('.tag').removeClass('curr');
			
 
				 			}
			
 
				 		});
			
 
				 		
			
 
				 		//选中团队标签下的居民
			
 
				 		$('#tdbqchooseAll').click(function(){
			
 
				 			if(!$(this).hasClass('checked')){
			
 
				 				$(this).siblings('.tags-list').find('.tag').addClass('curr');
			
 
				 			}else{
			
 
				 				$(this).siblings('.tags-list').find('.tag').removeClass('curr');
			
 
				 			}
			
 
				 		});
			
 
				 		
			
 
				 		//展开查看全部
			
 
				 		$('.get-more a').click(function(){
			
 
				 			$(this).parent().siblings('.c-hide').removeClass('c-hide');
			
 
				
			
 
				 			$('.get-more').hide();
			
 
				 		});
			
 
				 		
			
 
				 		//选项卡
			
 
				 		$('.tab-hd li').click(function(){
			
 
				 			var index = $(this).index();
			
 
				 			$(this).addClass('curr').siblings().removeClass('curr');
			
 
				 			$('.tab-bd .tab-item').eq(index).addClass('curr').siblings().removeClass('curr');
			
 
				 			
			
 
				 			 
			
 
				 		});
			
 
				 	});
			
 
				 	
			
 
				 	function getUrlParam(name) {
			
 
				 		var reg = new RegExp("(^|&)"+ name +"=([^&]*)(&|$)");
			
 
				 		var r = window.location.search.substr(1).match(reg);
			
 
				 		if (r!=null) return decodeURI(r[2]); return "";
			
 
				 	}
			
 
				 	//文章验证通过的样式
			
 
				 	function IsAuthentiCss1() {
			
 
				 		$('.tags-list').on('click','.tag-hollow',function(){
			
 
				    			var all = $(this).hasClass('tag-all');
			
 
				    			var curr = $(this).hasClass('curr');
			
 
				 			$('.tag-all').siblings('.c-hide').removeClass('c-hide');
			
 
				
			
 
				    			if(all){
			
 
				    				if(curr){
			
 
				    					
			
 
				    					$(this).removeClass('curr');
			
 
				    					$(this).parent().siblings().find('.tag-hollow').removeClass('curr');
			
 
				     			}else{
			
 
				     				$(this).addClass('curr');
			
 
				    					$(this).parent().siblings().find('.tag-hollow').addClass('curr');
			
 
				    				}
			
 
				    			}else{
			
 
				    				if(curr){
			
 
				    					$(this).removeClass('curr');
			
 
				    					$(this).parent().siblings().find('.tag-all').removeClass('curr');
			
 
				    				}else{
			
 
				    					$(this).addClass('curr');
			
 
				    				}
			
 
				    			}
			
 
				    			});
			
 
				 	}
			
 
				 	
			
 
				 	//文章验证不通过的样式
			
 
				 	function IsAuthentiCss2() {
			
 
				 	 	$('.tags-list').on('click','.tag-hollow',function(){
			
 
				       		$(this).addClass('curr').siblings().removeClass('curr')
			
 
				
			
 
							});
			
 
				 	}
			
 
				
			
 
				 	function queryCardInfo(){
			
 
				 		 
			
 
				  		$.ajax({
			
 
				 			dataType: "json",
			
 
				 			type: "POST",
			
 
				 			cache:false,
			
 
				 	 
			
 
				 			url: '/JkEdu/articlePc/queryArticlePcId',
			
 
				 			data: {
			
 
				 				articleid : articleid
			
 
				 			},
			
 
				 			beforeSend: function(){
			
 
				 				artLoading=art.dialog({
			
 
				 					lock: true,
			
 
				 					content: '<img src="../widget/artDialog/4.1.7/images/loading.gif" class="mr10" />数据加载中，请稍候...', 
			
 
				 					tips:true
			
 
				 				});
			
 
				 			},
			
 
				 			success: function(data){
			
 
				 				artLoading.close();
			
 
				 				if(data.Code==10000){
			
 
				 					if(typeof(data.result) != "undefined"){
			
 
				 						setTimeout(function(){
			
 
											 articletitle = data.result.articletitle;
			
 
											 isauthentication =  data.result.isauthentication;
			
 
											
			
 
				 							if (isauthentication==1) {
			
 
				 								
			
 
				 								var html = "";
			
 
				 						 		html += '文章名称：';
			
 
				 					 			html += articletitle;
			
 
				 				                $('#articleTitle').html(html);
			
 
				 				                IsAuthentiCss1();
			
 
				 							} else {
			
 
				 								var html = "";
			
 
				 						 		html += '文章名称：';
			
 
				 					 			html += articletitle;
			
 
				 						 		html += '<span class="c-f14 c-f08867 ml10"> '+"（该文章还未认证，无法批量发送）"+'</span>';
			
 
				 				                $('#articleTitle').html(html);
			
 
				 				        
			
 
				 				                IsAuthentiCss2();
			
 
				 							}
			
 
				  				            
			
 
				 						}, 300);
			
 
				 					}
			
 
				 					 
			
 
				 				}else{
			
 
				 					ask(data.Message);
			
 
				 				}
			
 
				 			}, 
			
 
				 			error: function () {
			
 
				 				artLoading.close();
			
 
				 				var artBox=art.dialog({
			
 
				 					lock: true,
			
 
				 					artIcon:'error',
			
 
				 					opacity:0.4,
			
 
				 					width: 250,
			
 
				 					title:'提示',
			
 
				 					content: '数据加载失败！请联系管理员',
			
 
				 					ok: function () {
			
 
				 					}
			
 
				 				});
			
 
				 			}
			
 
				 		});
			
 
				 	}
			
 
				 	
			
 
				 	//发送弹框
			
 
				 	function Push() {
			
 
				 		
			
 
				  		$("#addBtn").show();
			
 
				
			
 
						
			
 
				 		$("#pushArticletitle").text(articletitle);
			
 
				
			
 
				 		
			
 
				 		var contents=$('#Pushdiv').get(0);
			
 
				 		popAdd = art.dialog({
			
 
				 	        lock: true,
			
 
				  	        opacity:0.4,
			
 
				 	        width: 500,
			
 
				 	        height : 250,
			
 
				 			overflow:true,
			
 
				 	        title:'推送文章',
			
 
				 	        content: contents,
			
 
				 	        fixed : false,
			
 
				 	        ok : null,
			
 
				 			cancel : null, 
			
 
				 			quickClose : true
			
 
				 	    });
			
 
				 	}
			
 
				 	
			
 
				 	//团队列表下拉框
			
 
				 	function getdoctorTeams(){
			
 
				 		var pFirstId = $("#tdlbId").val();
			
 
				 		$.ajax({
			
 
				 			dataType: "json",
			
 
				 			type: "POST",
			
 
				 			cache:false,
			
 
				 			initialValue:1,
			
 
				
			
 
				 			data : {},
			
 
				 			url: "/JkEdu/doctor/doctorTeams",
			
 
				 			success : function(result) {
			
 
				 				if (result.status == 10000) {
			
 
				 					var list = result.result;
			
 
				 					if (list != null) {
			
 
				 						list.unshift({
			
 
				 							"id" : "",
			
 
				 							"name" : "--请选择--"
			
 
				 						});
			
 
				 						
			
 
				 						$('#tdlbId').formSelect({
			
 
				 							jsonData : list,
			
 
				  							initialValue:{key:list[1].id,val:list[1].name},
			
 
				 							jsonDataId : "id",
			
 
				 							jsonDataText : "name"
			
 
				 						}, null, function(dom, text, value) {// 点击某个选项回调
			
 
				 							
			
 
				 						});
			
 
				 					}
			
 
				 				}
			
 
				 			}
			
 
				 		});
			
 
				 	}
			
 
				 	//服务类型标签
			
 
				 	$('.fwlxli').bind('click',function(){
			
 
				 		//设置为只执行一次查询
			
 
				 		if(fwlxlikai){
			
 
				 			queryLabelsWithNum(1);
			
 
				 			fwlxlikai = 0;
			
 
				 		}
			
 
				 		
			
 
				 	});
			
 
				 	//疾病类型标签
			
 
				 	$('.jblxli').bind('click',function(){
			
 
				 		//设置为只执行一次查询
			
 
				 		if(jblxlikai){
			
 
				 			queryLabelsWithNum(3);
			
 
				 			jblxlikai = 0;
			
 
				 		}
			
 
				 		
			
 
				 	});
			
 
				 	
			
 
				 	function queryLabelsWithNum(labelType){
			
 
				 		var teamCode =	$('#tdlbId').formSelect('getDataKey');
			
 
				  		$.ajax({
			
 
				 			dataType: "json",
			
 
				 			type: "POST",
			
 
				 			cache:false,
			
 
				 			url: '/JkEdu/articleDoctorPc/querylabelsWithNum',
			
 
				 			data: {
			
 
				 				labelType : labelType,
			
 
				 				teamCode : teamCode 
			
 
				 				 
			
 
				 			},
			
 
				 			beforeSend: function(){
			
 
				 				artLoading=art.dialog({
			
 
				 					lock: true,
			
 
				 					content: '<img src="../widget/artDialog/4.1.7/images/loading.gif" class="mr10" />数据加载中，请稍候...', 
			
 
				 					tips:true
			
 
				 				});
			
 
				 			},
			
 
				 			success: function(data){
			
 
				 				artLoading.close();
			
 
				 				if(data.Code==10000){
			
 
				 					if(typeof(data.result) != "undefined"){
			
 
				 						setTimeout(function(){
			
 
				 							 
			
 
				 							var html = "";
			
 
				 							html += ' <label id="fwlxchooseAll" class="checkbox mb10 " data-toggle="checkbox">';
			
 
										 	html += ' <input type="checkbox" name="tags"><i class="icon-chkbox"></i>选中以下所有签约居民 </label><ul class="tags-list tag-small"> ';
			
 
				 							for(var i=0;i<data.result.result.length;i++){
			
 
				 								
			
 
				 								var labelName = data.result.result[i].labelName;
			
 
				 								var labelCode = data.result.result[i].labelCode;
			
 
				 								labelCodeArr[i] = data.result.result[i].labelCode+labelType;
			
 
				 							 		
			
 
					 							var id = "labelCode"+data.result.result[i].labelCode+labelType;
			
 
				 								
			
 
				 						 		html += ' <li> <div class="tit"> <h3>'+labelName+'</h3> <span class="tag tag-hollow tag-all">全部</span> </div> ';
			
 
				 						 		html += ' <div class="con" id= '+id+' >  </div></li>';
			
 
				 						 	 	
			
 
				 							}
			
 
				 							 
			
 
				 							//console.info(data.result.result[1]);
			
 
										 	html += '</ul>';
			
 
										 	if (labelType==1){
			
 
										 		$('#fwlxliId').html(html);
			
 
										 	}else{
			
 
										 		$('#jblxId').html(html);
			
 
										 	}
			
 
										 	
			
 
				  							if (isauthentication==1){
			
 
				 	 							IsAuthentiCss1();//刷新样式
			
 
				 							}
			
 
				 							IsAuthentiCss2();//刷新样式
			
 
				  							 
			
 
				 	 						setHtml(labelType);
			
 
				 						}, 300);
			
 
				 						
			
 
				 					}
			
 
				 					 
			
 
				 				}else{
			
 
				 					ask(data.Message);
			
 
				 				}
			
 
				 			}, 
			
 
				 			error: function () {
			
 
				 				artLoading.close();
			
 
				 				var artBox=art.dialog({
			
 
				 					lock: true,
			
 
				 					artIcon:'error',
			
 
				 					opacity:0.4,
			
 
				 					width: 250,
			
 
				 					title:'提示',
			
 
				 					content: '数据加载失败！请联系管理员',
			
 
				 					ok: function () {
			
 
				 					}
			
 
				 				});
			
 
				 			}
			
 
				 		});
			
 
				 	}
			
 
				 	
			
 
				 	function setHtml(labelType ){
			
 
				 		
			
 
				 		for(var i=0;i<labelCodeArr.length;i++){
			
 
				 			
			
 
				 			querySignPatientsByLabel(labelType,labelCodeArr[i]);
			
 
				 	 	}
			
 
				 	}
			
 
				 	
			
 
				 	
			
 
				 	//根据标签类型和子标签code获取医生签约的患者列表
			
 
				 	function querySignPatientsByLabel(labelType,labelCode){
			
 
				 		 
			
 
				 		var teamCode =	$('#tdlbId').formSelect('getDataKey');
			
 
				  		var labelCodes=labelCode.substring(0,labelCode.length-1);
			
 
				  		$.ajax({
			
 
				 			dataType: "json",
			
 
				 			type: "POST",
			
 
				 			cache:false,
			
 
				 			url: '/JkEdu/articleDoctorPc/querySignPatientsByLabel',
			
 
				 			data: {
			
 
				 				labelType : labelType,
			
 
				 				teamCode : teamCode,
			
 
				 				labelCode :labelCodes
			
 
				 			},
			
 
				 			 
			
 
				 			success: function(data){
			
 
				 				artLoading.close();
			
 
				 				if(data.Code==10000){
			
 
				 					if(typeof(data.result) != "undefined"){
			
 
				 						setTimeout(function(){
			
 
				 							 
			
 
				 							var html = "";
			
 
				 							labelCodeArr
			
 
				 							for(var i=0;i<data.result.result.length;i++){
			
 
				 								
			
 
				 								var code = data.result.result[i].code;
			
 
				 								var name = data.result.result[i].name;
			
 
				 						 		//html += '    <li> <div class="tit"> <h3>'+labelName+'</h3> <span class="tag tag-hollow tag-all">全部</span> </div> ';
			
 
				 						 		
			
 
				 						 		if(i<7){
			
 
				 	 	 		 	 				html += '<span class="tag tag-hollow">'+name+'</span>';
			
 
				 	  		 					}else{
			
 
				 		 		 	 				html += '<span class="tag tag-hollow c-hide">'+name+'</span>';
			
 
				 	 		 					}
			
 
				 							}
			
 
				 						 	html += ' ';
			
 
				 							//html += '<span class="tag tag-hollow">是是是2</span>';
			
 
										 	var ids = "#labelCode"+labelCode;
			
 
										 	
			
 
				 							$(ids).html(html);
			
 
				 						 
			
 
				 						}, 300);
			
 
				 					}
			
 
				 					 
			
 
				 				}else{
			
 
				 					ask(data.Message);
			
 
				 				}
			
 
				 			}, 
			
 
				 			error: function () {
			
 
				 				artLoading.close();
			
 
				 				var artBox=art.dialog({
			
 
				 					lock: true,
			
 
				 					artIcon:'error',
			
 
				 					opacity:0.4,
			
 
				 					width: 250,
			
 
				 					title:'提示',
			
 
				 					content: '数据加载失败！请联系管理员',
			
 
				 					ok: function () {
			
 
				 					}
			
 
				 				});
			
 
				 			}
			
 
				 		});
			
 
				 	}
			
 
				 	
			
 
				 	function querySignPatientsByName(){
			
 
				 		var teamCode =	$('#tdlbId').formSelect('getDataKey');
			
 
				 		var	patientName = $("#patientName").val();
			
 
				  		$.ajax({
			
 
				 			dataType: "json",
			
 
				 			type: "POST",
			
 
				 			cache:false,
			
 
				 			url: '/JkEdu/articleDoctorPc/querySignPatientsByLabel',
			
 
				 			data: {
			
 
				 				patientName : patientName,
			
 
				 				teamCode : teamCode 
			
 
				 				 
			
 
				 			},
			
 
				 			beforeSend: function(){
			
 
				 				artLoading=art.dialog({
			
 
				 					lock: true,
			
 
				 					content: '<img src="../widget/artDialog/4.1.7/images/loading.gif" class="mr10" />数据加载中，请稍候...', 
			
 
				 					tips:true
			
 
				 				});
			
 
				 			},
			
 
				 			success: function(data){
			
 
				 				artLoading.close();
			
 
				 				if(data.Code==10000){
			
 
				 					if(typeof(data.result) != "undefined"){
			
 
				 						setTimeout(function(){
			
 
				 							 
			
 
				 							var html = "";
			
 
				 							html += ' <label id="fwlxchooseAll" class="checkbox mb10 " data-toggle="checkbox">';
			
 
										 	html += ' <input type="checkbox" name="tags"><i class="icon-chkbox"></i>选中以下所有签约居民 </label><ul class="tags-list tag-small"> ';
			
 
				 							for(var i=0;i<data.result.result.length;i++){
			
 
				 								
			
 
				 								var labelName = data.result.result[i].labelName;
			
 
				 								var labelCode = data.result.result[i].labelCode;
			
 
				 								labelCodeArr[i] = data.result.result[i].labelCode+labelType;
			
 
				 							 		
			
 
					 							var id = "labelCode"+data.result.result[i].labelCode+labelType;
			
 
				 								
			
 
				 						 		html += ' <li> <div class="tit"> <h3>'+labelName+'</h3> <span class="tag tag-hollow tag-all">全部</span> </div> ';
			
 
				 						 		html += ' <div class="con" id= '+id+' >  </div></li>';
			
 
				 						 	 	
			
 
				 							}
			
 
				 							 
			
 
				 							//console.info(data.result.result[1]);
			
 
										 	html += '</ul>';
			
 
										 	if (labelType==1){
			
 
										 		$('#fwlxliId').html(html);
			
 
										 	}else{
			
 
										 		$('#jblxId').html(html);
			
 
										 	}
			
 
										 	
			
 
				  							if (isauthentication==1){
			
 
				 	 							IsAuthentiCss1();//刷新样式
			
 
				 							}
			
 
				 							IsAuthentiCss2();//刷新样式
			
 
				 							 
			
 
				 	 						setHtml(labelType);
			
 
				 						}, 300);
			
 
				 						
			
 
				 					}
			
 
				 					 
			
 
				 				}else{
			
 
				 					ask(data.Message);
			
 
				 				}
			
 
				 			}, 
			
 
				 			error: function () {
			
 
				 				artLoading.close();
			
 
				 				var artBox=art.dialog({
			
 
				 					lock: true,
			
 
				 					artIcon:'error',
			
 
				 					opacity:0.4,
			
 
				 					width: 250,
			
 
				 					title:'提示',
			
 
				 					content: '数据加载失败！请联系管理员',
			
 
				 					ok: function () {
			
 
				 					}
			
 
				 				});
			
 
				 			}
			
 
				 		});
			
 
				 	}
			
 
				 	
			
 
				 	function ask(message){
			
 
				 	 	art.dialog({
			
 
				 			lock : true,
			
 
				 			artIcon : 'ask',
			
 
				 			opacity : 0.4,
			
 
				 			width : 250,
			
 
				 			title : '提示',
			
 
				 			content : message,
			
 
				 			ok : function() {
			
 
				 				
			
 
				 			}
			
 
				 		});
			
 
				 	 	
			
 
				 	 }
			
 
				</script>
			
 
				</body>
			
 
				</html>
			
--- a/edu-article/JkEdu/WebRoot/JkArticle/PushEdJkArticle.html
+++ b/edu-article/JkEdu/WebRoot/JkArticle/PushEdJkArticle.html
@ -0,0 +1,212 @@
 
				<!DOCTYPE html>
			
 
				<html lang="en">
			
 
				<head>
			
 
				    <meta charset="utf-8" />
			
 
				    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
			
 
				    <meta name="renderer" content="webkit" />
			
 
				    <title>以推送文章</title>
			
 
				    <link rel="stylesheet" href="../cross/css/cross.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../cross/css/cross.ui.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../iconfont/iconfont.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../widget/datetimepicker/2.1.9/css/jquery.datetimepicker.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../widget/artDialog/4.1.7/css/artDialog.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../widget/datatables/1.10.10/css/jquery.dataTables.css" type="text/css"/>
			
 
				    <link rel="stylesheet" href="../css/health-edu.css" type="text/css" />
			
 
				 
			
 
				    <style>
			
 
				    .round-no{
			
 
				    	width:16px;height:16px;
			
 
						display: inline-block;font-size:15px;
			
 
						line-heigth:16px;text-align:center;color:#f00;
			
 
				    	padding-left: 2px;
			
 
						text-decoration:none
			
 
					}
			
 
					.round-ok{
			
 
						width:16px;height:16px;
			
 
						display: inline-block;font-size:15px;
			
 
						line-heigth:16px;text-align:center;color:#0288FF;
			
 
				    	padding-left: 2px;
			
 
						text-decoration:none
			
 
					}
			
 
				    </style>
			
 
				</head>
			
 
				<body>
			
 
				<div class="">
			
 
				    <div class="plr5">
			
 
				        <div class="form-layout form-inline  ">
			
 
				
			
 
				
			
 
							<div class="control-group">
			
 
								<label class="control-label"></label>
			
 
								<div class="control-form">
			
 
									<div class=" cus-sel cus-sel-w170 cus-sel-h33"
			
 
										id="FirstLevelCategoryId"  >
			
 
				
			
 
										<div class="cus-sel-chosed">
			
 
											<input  id="p_FirstLevelCategoryId"  type="text" class="c-hide"> <span
			
 
												class="cus-sel-chosed-txt" data-value="">--请选择一级分类--</span> <span
			
 
												class="jselect-icon"></span>
			
 
										</div>
			
 
										<div class="cus-sel-list c-hide">
			
 
											<ul>
			
 
											</ul>
			
 
										</div>
			
 
									</div>
			
 
									
			
 
									
			
 
									
			
 
									<div class=" cus-sel cus-sel-w170 cus-sel-h33"
			
 
										  id="SecondLevelCategoryId">
			
 
										<div class="cus-sel-chosed">
			
 
											<input  id="p_SecondLevelCategoryId"  type="text" class="c-hide"> <span
			
 
												class="cus-sel-chosed-txt" data-value="">--请选择二级分类--</span> <span
			
 
												class="jselect-icon"></span>
			
 
										</div>
			
 
										<div class="cus-sel-list c-hide">
			
 
											<ul>
			
 
											</ul>
			
 
										</div>
			
 
									</div>
			
 
				
			
 
								</div>
			
 
							</div>
			
 
							
			
 
							
			
 
							<div class="control-group">
			
 
								<label class="control-label"></label>
			
 
								<div class="control-form">
			
 
									<div class="cus-sel cus-sel-w150 cus-sel-h33"  
			
 
										id="ArticleType">
			
 
										<div class="cus-sel-chosed">
			
 
											<input   type="text" style="display:none;"> <span
			
 
												class="cus-sel-chosed-txt" data-value="">--请选择类型--</span> <span
			
 
												class="jselect-icon"></span>
			
 
										</div>
			
 
										<div class="cus-sel-list c-hide">
			
 
												<ul>
			
 
												</ul>
			
 
										</div>
			
 
									</div>
			
 
				
			
 
								</div>
			
 
							</div>
			
 
							<div class="control-group">
			
 
								<label class="control-label"></label>
			
 
								<div class="control-form">
			
 
									<div class="cus-sel cus-sel-w150 cus-sel-h33" data-toggle="formSelect"
			
 
										id="ArticleSource">
			
 
										<div class="cus-sel-chosed">
			
 
											<input type="text" style="display:none;"> <span
			
 
												class="cus-sel-chosed-txt" data-value="">--请选择来源--</span> <span
			
 
												class="jselect-icon"></span>
			
 
										</div>
			
 
										<div class="cus-sel-list c-hide">
			
 
												<ul>
			
 
												</ul>
			
 
										</div>
			
 
									</div>
			
 
				
			
 
								</div>
			
 
							</div>
			
 
							<div class="control-group">
			
 
								<label class="control-label"></label>
			
 
								<div class="control-form">
			
 
									<div class="cus-sel  cus-sel-w150  cus-sel-h33" data-toggle="formSelect"
			
 
										id="Articlelevel">
			
 
										<div class="cus-sel-chosed">
			
 
											<input type="text" style="display:none;"> <span
			
 
												class="cus-sel-chosed-txt" data-value="">--请选择等级--</span> <span
			
 
												class="jselect-icon"></span>
			
 
										</div>
			
 
										<div class="cus-sel-list c-hide">
			
 
												<ul>
			
 
												</ul>
			
 
										</div>
			
 
									</div>
			
 
								</div>
			
 
							</div>
			
 
							<div class="control-group">
			
 
								<label class="control-label"></label>
			
 
								<div class="control-form">
			
 
									<input type="text" placeholder="文章标题"
			
 
										class="input-text input-text-w200" id="ArticleTitle">
			
 
								</div>
			
 
							</div>
			
 
							
			
 
							<div class="control-group">
			
 
								<label class="control-label"></label>
			
 
				
			
 
								<div class="date-wrap">
			
 
									<input type="text"  placeholder="发送时间"  value="" id="StartTime"
			
 
										class="date-txt datetimepicker" />
			
 
				
			
 
								</div>
			
 
							</div>
			
 
							<div class="control-group">
			
 
								<label class="control-label">~</label>
			
 
							
			
 
								<div class="date-wrap">
			
 
									<input type="text" placeholder="发送时间"  value="" id="EndTime"
			
 
										class="date-txt datetimepicker" />
			
 
								</div>
			
 
							</div>
			
 
				
			
 
							
			
 
							<div class="control-group">
			
 
								<div class="control-form">
			
 
				 					<a href="javascript:doSearch();" id="findBtn" class="c-btn c-btn-blue btn-w60">搜索</a>
			
 
								</div>
			
 
							</div>
			
 
						 
			
 
						</div>
			
 
				        
			
 
				        <div class="" id="groupDataTableDiv">
			
 
				            <table id="groupDataTable" class="cell-border hover c-t-left c-t-center" cellspacing="0" width="100%">
			
 
				                <thead>
			
 
				                <tr>
			
 
				                 		<th   style="width:8%" align="center">文章标题</th>
			
 
										<th   style="width:4%" align="center">分类/类型</th> 
			
 
										<th   style="width:3%" align="center">来源</th>
			
 
										<th   style="width:3%" align="center">数据</th>
			
 
										<th   style="width:5%" align="center">发送时间</th>
			
 
										<th   style="width:3%" align="center">操作</th>
			
 
				                </tr>
			
 
				                </thead>
			
 
				                <tbody></tbody>
			
 
				            </table>
			
 
				        </div>
			
 
				    </div>
			
 
				</div>
			
 
				 
			
 
					<script src="../cross/js/jquery/1.8.3/jquery.js"></script>
			
 
					<script type="text/javascript" src="../cross/js/cross.ui.js"></script>
			
 
				<script type="text/javascript"
			
 
						src="../widget/placeholder/2.0.7/js/jquery.placeholder.js"></script>
			
 
					<script type="text/javascript" src="../widget/artDialog/4.1.7/js/artDialog.js?v=20160629"></script>
			
 
				<script type="text/javascript" src="../widget/datatables/1.10.10/js/jquery.dataTables.js"></script>
			
 
				 
			
 
				<script type="text/javascript" src="../widget/inputSelect/1.0/js/inputSelect.js"></script>
			
 
				  	<script type="text/javascript" src="js/AlreadyPushJkArticle.js"></script>
			
 
				 	
			
 
				<script type="text/javascript"
			
 
						src="../widget/datetimepicker/2.1.9/js/jquery.datetimepicker.js"></script>
			
 
				<script type="text/javascript" >
			
 
				 
			
 
				
			
 
				function ask(message){
			
 
				 	art.dialog({
			
 
						lock : true,
			
 
						artIcon : 'ask',
			
 
						opacity : 0.4,
			
 
						width : 250,
			
 
						title : '提示',
			
 
						content : message,
			
 
						ok : function() {
			
 
							
			
 
						}
			
 
					});
			
 
				 	
			
 
				 }
			
 
				</script>
			
 
				</body>
			
 
				</html>
			
--- a/edu-article/JkEdu/WebRoot/JkArticle/css/article.css
+++ b/edu-article/JkEdu/WebRoot/JkArticle/css/article.css
@ -0,0 +1,39 @@
 
				body { *background:url(about:blank) fixed; _height: 100%; _overflow:hidden;}
			
 
				
			
 
				.referral-menu-wrap {width: 189px; height: 100%;border-right: #e0e3ec 1px solid; background: #f6f9fa;}
			
 
				.referral-main-wrap {margin-left: 190px;}
			
 
				
			
 
				.club-route {width: 150px; height: 65px}
			
 
				
			
 
				.c-83c44e{ color:#83c44e;}
			
 
				.c-ec6941{ color:#ec6941;}
			
 
				.c-ed5050{ color:#ed5050;}
			
 
				.c-ddd{ color:#ddd;}
			
 
				.sched-list{}
			
 
				.sched-list ul{ max-height:240px; overflow:auto;}
			
 
				.sched-list li{ width:118px; height:38px; line-height:38px; text-align:center; border:1px solid #ddd; font-size:14px; cursor:pointer; margin:10px 15px; _display:inline; float:left;}
			
 
				.sched-list li.curr{ border:1px solid #4db2ee; background:url(../images/schedtb.png) left top no-repeat; box-shadow:0px 0px 3px #b5b4b4;}
			
 
				.sched-tip{ position:relative; height:28px;}
			
 
				.sched-tip label{ display:block; width:492px; padding-left:28px; height:48px; line-height:48px; background:#f8fff3; color:#83c44e; border-top:1px solid #dbf0ca; border-bottom:1px solid #dbf0ca; position:absolute; left:-25px; top:-20px;}
			
 
				.sched-result img{ vertical-align:middle; margin:0 10px 4px 0;}
			
 
				.yd-state{ display:inline-block; width:48px; height:28px; line-height:28px; background:#fff; text-align:center; vertical-align:middle; margin:0 10px 3px 0; border-radius:3px;}
			
 
				.state-normal{ border:1px solid #83c44e; color:#83c44e;}
			
 
				.state-abnormal{ border:1px solid #ed5050; color:#ed5050;}
			
 
				.sched-doc{ position:relative; height:429px; font-size:14px; padding:0 58px 0 178px;}
			
 
				.sd-left{ position:absolute; left:0; top:0; width:120px; height:427px; border:1px solid #ddd; background:#f4f4f4; text-align:center;}
			
 
				.sd-name-tit{ height:61px; line-height:61px; border-bottom:1px solid #ddd;}
			
 
				.sd-name{ line-height:365px;}
			
 
				.sd-opera1{ width:60px; height:428px; border:1px solid #ddd; border-left:none; border-top:none; position:absolute; left:122px; top:0; background:#fff; z-index:500;}
			
 
				.opera-ul li{ height:121px; line-height:121px; border-top:1px solid #ddd; text-align:center;}
			
 
				.opera-ul li.topli{ height:61px; line-height:61px; background:#f4f4f4;}
			
 
				.sd-opera2{ width:60px; height:428px; border:1px solid #ddd; border-top:none; position:absolute; right:0; top:0; background:#fff; z-index:500;}
			
 
				.sd-mid{ width:100%; height:428px; border-bottom:1px solid #ddd;}
			
 
				.sd-mid-ul>li{ width:14.2%; float:left; border-left:1px solid #ddd;}
			
 
				.sd-mid .lx-wrapper .lx-prev,.sd-mid .lx-wrapper .lx-next{ top:15px; margin-top:0;}
			
 
				.sd-mid .lx-wrapper .lx-prev{ left:-40px; margin-left:0;}
			
 
				.sd-mid .lx-wrapper .lx-next{ right:-45px; margin-right:0;}
			
 
				.sd-mid-ul>li>ul>li{ line-height:20px;}
			
 
				.sd-mid-ul>li>ul>li.topli{ line-height:20px; font-weight:bold;}
			
 
				.operabox{ height:116px; background:#f9fff4; padding:5px 20px 0 20px; font-size:12px; line-height:22px;}
			
 
				.operabox.full{ background:#fff9f9;}
			
 
				.spacep{ border-bottom:1px solid #ddd; margin-bottom:10px; padding-bottom:10px;}
			
--- a/edu-article/JkEdu/WebRoot/JkArticle/js/AlreadyPushJkArticle.js
+++ b/edu-article/JkEdu/WebRoot/JkArticle/js/AlreadyPushJkArticle.js
@ -0,0 +1,384 @@
 
				var roleDataTables = "";
			
 
				var select  = 0;
			
 
				var articleTypeJSON = [];
			
 
				var articlelevelJSON = [];
			
 
				$(function() {
			
 
					$('.datetimepicker').datetimepicker({
			
 
						timepicker : false,
			
 
						format : 'Y-m-d'
			
 
					});
			
 
				 	getrounte1();
			
 
					getrounte2();
			
 
					getArticlelevel();
			
 
					getArticleType();
			
 
					getArticleSource();
			
 
					initTable();
			
 
				
			
 
				});
			
 
				
			
 
				
			
 
				function initTable(){
			
 
					table=$('#groupDataTable').DataTable({
			
 
						"bServerSide": true,// 是否启用服务器处理数据源，必须sAjaxSource指明数据源位置
			
 
						"bprocessing": true,// 是否启用进度显示，进度条等等，对处理大量数据很有用处。
			
 
						"iDisplayLength":9,// 默认每页9条数据
			
 
						"aLengthMenu":[9,50,100],
			
 
						"sAjaxSource" : "/JkEdu/articlePc/queryArticlePcList",
			
 
				
			
 
				        "aoColumns": [
			
 
									  
			
 
									  {
			
 
										"mDataProp" : "articletitle"
			
 
									  },
			
 
						              {"mDataProp": function(obj){
			
 
						            	  var str = "";
			
 
						            	  if (obj.firstlevelcategoryname && obj.firstlevelcategoryname != null) {
			
 
						            		  
			
 
						            		  str +=  obj.firstlevelcategoryname;
			
 
				
			
 
						            	  }
			
 
						            	  if (obj.articletype && obj.articletype != null) {
			
 
						            		  var articletypeS = "";
			
 
				 		            		  $.each(articleTypeJSON, function (n, value) {
			
 
						            			  if(value.code==obj.articletype){
			
 
						            				  articletypeS=value.codeName;
			
 
						            				  //break;
			
 
						            			  }
			
 
						                      });
			
 
						            		  str +=  "<br/>" +articletypeS;
			
 
				
			
 
						            	  }
			
 
						            	  return str;
			
 
						              }
			
 
									},
			
 
									{
			
 
										"mDataProp" : "articlesource"
			
 
									},
			
 
									{
			
 
										"mDataProp" : function(obj) {
			
 
											var str = "";
			
 
											if (obj.articlelevel && obj.articlelevel != null) {
			
 
							            		  var articleleveS = "";
			
 
					 		            		  $.each(articlelevelJSON, function (n, value) {
			
 
							            			  if(value.code==obj.articlelevel){
			
 
							            				  articleleveS=value.codeName;
			
 
				  			            				  //break;
			
 
							            			  }
			
 
							                      });
			
 
					 		            		 str += articleleveS;
			
 
													
			
 
				
			
 
							            	  }
			
 
											 return str;
			
 
										}
			
 
									},
			
 
									
			
 
									{"mDataProp": function(obj){
			
 
						            	  var str = "";
			
 
						            	  if (obj.inserttime && obj.inserttime != null) {
			
 
						            		  
			
 
						            		  str +=  obj.inserttime.substring(0, 19);
			
 
				
			
 
						            	  }
			
 
						        
			
 
						            	  
			
 
						            	  return str;
			
 
						              }},
			
 
									
			
 
									 
			
 
									{
			
 
						            		"mDataProp" : function(obj) {
			
 
												return '<a href="PushArticle.html?type=1&id='
			
 
														+ obj.articleid
			
 
														+ '" class="c-btn c-btn-blue btn-w60" align="center" ">再次推送</a>';
			
 
											}
			
 
									}],
			
 
				 		 
			
 
				   		"fnServerData": function (sSource, aoData, fnCallback) {
			
 
				   			$.ajax({
			
 
				   			    "dataType": 'json',
			
 
							    "type": 'POST',
			
 
							    "url": sSource,
			
 
								"data" : aoData, 
			
 
								"success" : fnCallback,
			
 
								"complete": function (XMLHttpRequest, textStatus){
			
 
									var json = eval("(" + XMLHttpRequest.responseText + ")");
			
 
									if(json.Code != 10000){
			
 
										if (json.Code == 999) {
			
 
											ask("每次查询限制每天前10000条，可调整查询条件查询被限制内容。");
			
 
										} else {
			
 
											ask(json.Message);
			
 
										}
			
 
									}
			
 
								}
			
 
				   			 });
			
 
				   			
			
 
				   			artLoading=art.dialog({lock: true,	content: '<img src="../widget/artDialog/4.1.7/images/loading.gif" class="mr10" />数据加载中，请稍候...', tips:true});
			
 
				   		},
			
 
						"fnServerParams": function(aoData) {// 多条件查询
			
 
							
			
 
							aoData.push({ "name": "ArticleTitle", "value":$("#ArticleTitle").val()});
			
 
							aoData.push({ "name": "StartTime", "value":$("#StartTime").val()});
			
 
							aoData.push({ "name": "EndTime", "value":$("#EndTime").val()});
			
 
				   			aoData.push({"name": "ArticleSource","value": $('#ArticleSource').formSelect('getDataVal')});
			
 
				  			aoData.push({"name": "Articlelevel","value": $('#Articlelevel').formSelect('getDataKey')});
			
 
				 			aoData.push({"name": "SecondLevelCategoryId","value": $('#SecondLevelCategoryId').formSelect('getDataKey')});
			
 
				 			aoData.push({"name": "FirstLevelCategoryId","value": $('#FirstLevelCategoryId').formSelect('getDataKey')});
			
 
				
			
 
				 			aoData.push({"name": "ArticleType","value": $('#ArticleType').formSelect('getDataKey')});
			
 
						},    			      
			
 
						"fnDrawCallback" : function(nRow, aData, iDisplayIndex, iDisplayIndexFull){
			
 
							artLoading.close();
			
 
						},
			
 
						"fnCreatedRow" : function(nRow, aData, iDataIndex ){	// 创建行得时候的回调函数
			
 
							$(nRow).attr('class','tr-list');
			
 
						},
			
 
						 
			
 
					});
			
 
					
			
 
					// 复选框
			
 
					$('#groupDataTableDiv').checkboxGroup({operate:true,oneElemClass:'.outfit-checkbox',allElemClass:'.all-checkbox'});
			
 
					
			
 
					// 点击查询详情
			
 
					$('#groupDataTable').on( 'click', 'a', function () {
			
 
						// 得到table对象
			
 
						table=$('#groupDataTable').DataTable();
			
 
						// 获取选中行数据
			
 
				       	var data = table.row( $(this).parents('tr') ).data();
			
 
						
			
 
					});
			
 
				}
			
 
				
			
 
				// 条件查询
			
 
				function doSearch(){
			
 
					table = $('#groupDataTable').dataTable();// 得到table对象
			
 
					table.fnDraw();// 重绘制
			
 
					table = $('#groupDataTable').DataTable();
			
 
				}
			
 
				
			
 
				function _ajax(url, param, flag) {
			
 
				
			
 
					var obj = null;
			
 
					try {
			
 
						$.ajax({
			
 
							type : 'POST',
			
 
							url : url,
			
 
							data : param,
			
 
							async : flag,
			
 
							timeout : 8000,
			
 
							dataType : 'json',
			
 
							success : function(data) {
			
 
								obj = data;
			
 
							}
			
 
						});
			
 
					} catch (err) {
			
 
						ComWbj.alertIconNo('提示：', err, 'error');
			
 
					}
			
 
					if (!flag)
			
 
						return obj;
			
 
				}
			
 
				
			
 
				
			
 
				//一级分类下拉框
			
 
				function getrounte1(){
			
 
					
			
 
					var tempArr =new Array();
			
 
					$.ajax({
			
 
						dataType: "json",
			
 
						type: "POST",
			
 
						cache:false,
			
 
						data : {
			
 
						},
			
 
						url: "/JkEdu/configDict/getCateOne",
			
 
						success : function(result) {
			
 
							
			
 
							
			
 
							if (result.Code == 10000) {
			
 
								var list = result.result;
			
 
								
			
 
								if (list != null) {
			
 
									list.unshift({
			
 
										"categoryId" : "",
			
 
										"categoryName" : "--请选择一级分类--"
			
 
									});
			
 
									$('#FirstLevelCategoryId').formSelect({
			
 
										jsonData : list,
			
 
										jsonDataId : "categoryId",
			
 
										jsonDataText : "categoryName"
			
 
									}, null, function(dom, text, value) {// 点击某个选项回调
			
 
										$('#SecondLevelCategoryId').formSelect('resetValue');
			
 
										getrounte2();
			
 
									});
			
 
								}
			
 
							}
			
 
						}
			
 
					});
			
 
				}
			
 
				
			
 
				//二级分类下拉框
			
 
				function getrounte2(){
			
 
					var pFirstId = $("#p_FirstLevelCategoryId").val();
			
 
					var tempArr =new Array();
			
 
					$.ajax({
			
 
						dataType: "json",
			
 
						type: "POST",
			
 
						cache:false,
			
 
						data : {
			
 
							pFirstId:pFirstId,
			
 
						},
			
 
						url: "/JkEdu/configDict/getCateTwo",
			
 
						success : function(result) {
			
 
							
			
 
							
			
 
							if (result.Code == 10000) {
			
 
								var list = result.result;
			
 
								
			
 
								if (list != null) {
			
 
									list.unshift({
			
 
										"categoryId" : "",
			
 
										"categoryName" : "--请选择一级分类--"
			
 
									});
			
 
									$('#SecondLevelCategoryId').formSelect({
			
 
										jsonData : list,
			
 
										jsonDataId : "categoryId",
			
 
										jsonDataText : "categoryName"
			
 
									}, null, function(dom, text, value) {// 点击某个选项回调
			
 
										 
			
 
									});
			
 
								}
			
 
							}
			
 
						}
			
 
					});
			
 
				}
			
 
				
			
 
				
			
 
				
			
 
				//优先级下拉框
			
 
				function getArticlelevel(){
			
 
					
			
 
					var tempArr =new Array();
			
 
					$.ajax({
			
 
						dataType: "json",
			
 
						type: "POST",
			
 
						cache:false,
			
 
						data : {
			
 
							typeName : "prio"
			
 
				
			
 
						},
			
 
						url: "/JkEdu/configDict/getDict",
			
 
						success : function(result) {
			
 
							if (result.Code == 10000) {
			
 
								var list = result.result;
			
 
								articlelevelJSON = list;
			
 
								if (list != null) {
			
 
									list.unshift({
			
 
										"code" : "",
			
 
										"codeName" : "--请选择等级--"
			
 
									});
			
 
									$('#Articlelevel').formSelect({
			
 
										jsonData : list,
			
 
										jsonDataId : "code",
			
 
										jsonDataText : "codeName"
			
 
									}, null, function(dom, text, value) {// 点击某个选项回调
			
 
										 
			
 
									});
			
 
								}
			
 
							}
			
 
						}
			
 
					});
			
 
				}
			
 
				
			
 
				// 类型下拉框
			
 
				function getArticleType() {
			
 
					$.ajax({
			
 
						url: "/JkEdu/configDict/getDict",
			
 
						async : false,
			
 
						dataType: "json",
			
 
						type: "POST",
			
 
							data : {
			
 
							typeName : "aType"
			
 
						},
			
 
						success : function(result) {
			
 
							if (result.Code == 10000) {
			
 
								var list = result.result;
			
 
								articleTypeJSON = list;
			
 
								if (list != null) {
			
 
									list.unshift({
			
 
										"code" : "",
			
 
										"codeName" : "--请选择类型--"
			
 
									});
			
 
									$('#ArticleType').formSelect({
			
 
										jsonData : list,
			
 
										jsonDataId : "code",
			
 
										jsonDataText : "codeName"
			
 
									}, null, function(dom, text, value) {// 点击某个选项回调
			
 
										 
			
 
									});
			
 
								}
			
 
							}
			
 
						}
			
 
					});
			
 
				}
			
 
				
			
 
				// 来源下拉框
			
 
				function getArticleSource(){
			
 
					
			
 
					var tempArr =new Array();
			
 
					$.ajax({
			
 
						dataType: "json",
			
 
						type: "POST",
			
 
						cache:false,
			
 
						data : {
			
 
							typeName : "source"
			
 
				
			
 
						},
			
 
						url: "/JkEdu/configDict/getDict",
			
 
						success : function(result) {
			
 
							if (result.Code == 10000) {
			
 
								var list = result.result;
			
 
								if (list != null) {
			
 
									list.unshift({
			
 
										"code" : "",
			
 
										"codeName" : "--请选择来源--"
			
 
									});
			
 
									$('#ArticleSource').formSelect({
			
 
										jsonData : list,
			
 
										jsonDataId : "code",
			
 
										jsonDataText : "codeName"
			
 
									}, null, function(dom, text, value) {// 点击某个选项回调
			
 
										 
			
 
									});
			
 
								}
			
 
							}
			
 
						}
			
 
					});
			
 
				}
			
 
				
			
 
				// 全选和反选
			
 
				$(".all-checkbox").on('click',function(){
			
 
					if (select == 0) {
			
 
						$("tbody tr").find('.input-group-pack').addClass('checked').find('input').attr('checked','true');
			
 
							select = 1;
			
 
				 		return;
			
 
					}
			
 
					if (select == 1) {
			
 
						$("tbody tr ").find('.input-group-pack').removeClass('checked').find('input').removeAttr('checked');
			
 
						select = 0;
			
 
				 		return;
			
 
					}
			
 
				});
			
 
				
			
 
				function ask(message){
			
 
				 	art.dialog({
			
 
						lock : true,
			
 
						artIcon : 'ask',
			
 
						opacity : 0.4,
			
 
						width : 250,
			
 
						title : '提示',
			
 
						content : message,
			
 
						ok : function() {
			
 
							
			
 
						}
			
 
					});
			
 
				 	
			
 
				 }
			
--- a/edu-article/JkEdu/WebRoot/JkArticle/js/JkArticleLibrary.js
+++ b/edu-article/JkEdu/WebRoot/JkArticle/js/JkArticleLibrary.js
@ -0,0 +1,488 @@
 
				var roleDataTables = "";
			
 
				var select  = 0;
			
 
				var articleTypeJSON = [];
			
 
				var articlelevelJSON = [];
			
 
				$(function() {
			
 
					
			
 
					
			
 
				 	getrounte1();
			
 
					getrounte2();
			
 
					//getArticlelevel1();
			
 
					getArticlelevel();
			
 
					getArticleType();
			
 
					getArticleSource();
			
 
					initTable();
			
 
				
			
 
				});
			
 
				
			
 
				
			
 
				function initTable(){
			
 
					table=$('#groupDataTable').DataTable({
			
 
						"bServerSide": true,// 是否启用服务器处理数据源，必须sAjaxSource指明数据源位置
			
 
						"bprocessing": true,// 是否启用进度显示，进度条等等，对处理大量数据很有用处。
			
 
						"iDisplayLength":9,// 默认每页9条数据
			
 
						"aLengthMenu":[9,50,100],
			
 
						"sAjaxSource" : "/JkEdu/articlePc/queryArticlePcList",
			
 
				
			
 
				        "aoColumns": [
			
 
									  {"mDataProp": null},
			
 
									  {
			
 
										"mDataProp" : "articletitle"
			
 
									  },
			
 
						              {"mDataProp": function(obj){
			
 
						            	  var str = "";
			
 
						            	  if (obj.firstlevelcategoryname && obj.firstlevelcategoryname != null) {
			
 
						            		  
			
 
						            		  str +=  obj.firstlevelcategoryname;
			
 
				
			
 
						            	  }
			
 
						            	  if (obj.articletype && obj.articletype != null) {
			
 
						            		  var articletypeS = "";
			
 
				 		            		  $.each(articleTypeJSON, function (n, value) {
			
 
						            			  if(value.code==obj.articletype){
			
 
						            				  articletypeS=value.codeName;
			
 
						            				  //break;
			
 
						            			  }
			
 
						                      });
			
 
						            		  str +=  "<br/>" +articletypeS;
			
 
				
			
 
						            	  }
			
 
						            	  return str;
			
 
						              }
			
 
									},
			
 
									{
			
 
										"mDataProp" : "articlesource"
			
 
									},
			
 
									{
			
 
										"mDataProp" : function(obj) {
			
 
											var str = "";
			
 
											if (obj.articlelevel && obj.articlelevel != null) {
			
 
							            		  var articleleveS = "";
			
 
					 		            		  $.each(articlelevelJSON, function (n, value) {
			
 
							            			  if(value.code==obj.articlelevel){
			
 
							            				  articleleveS=value.codeName;
			
 
				  			            				  //break;
			
 
							            			  }
			
 
							                      });
			
 
					 		            		 str += articleleveS;
			
 
													
			
 
				
			
 
							            	  }
			
 
											 return str;
			
 
										}
			
 
									},
			
 
									
			
 
									{"mDataProp": function(obj){
			
 
						            	  var str = "";
			
 
						            	  if (obj.inserttime && obj.inserttime != null) {
			
 
						            		  
			
 
						            		  str +=  obj.inserttime.substring(0, 19);
			
 
				
			
 
						            	  }
			
 
						            	  if (obj.updatetime && obj.updatetime != null) {
			
 
						            		  
			
 
						            		  str +=   "<br/>" +obj.updatetime.substring(0, 19);
			
 
				
			
 
						            	  }
			
 
						            	  
			
 
						            	  return str;
			
 
						              }},
			
 
									
			
 
									 
			
 
									{
			
 
										"mDataProp" : function(obj) {
			
 
												return '<a href="EditPcJkArticle.html?articleid='
			
 
													+ obj.articleid
			
 
													+ '" class="alinks alinks-blue sms-manager">编辑</a> '
			
 
													
			
 
														+ ' <a onclick=updateTop(\''
			
 
													+ obj.articleid+"','"+obj.articleorder+""
			
 
													+ '\') class="alinks alinks-blue sms-manager" style="margin-left: 20px;">置顶</a>';
			
 
										}
			
 
									},
			
 
									{
			
 
										"mDataProp" : function(obj) {
			
 
											return '<a href="PushArticle.html?articleid='
			
 
													+ obj.articleid
			
 
													+ '" class="c-btn c-btn-blue btn-w60" align="center" ">推送</a>';
			
 
										}
			
 
									}],
			
 
				 		"columnDefs": [{
			
 
				 			targets: 0,
			
 
				       		render: function (data, type, row) {
			
 
				       			var html = "";
			
 
				       			var checkboxName=row.articleid;
			
 
				
			
 
				       			html='<td><label class="checkbox outfit-checkbox"><input type="checkbox" name="tags" value="'+checkboxName+'" class="c-hide"><i class="icon-chkbox"></i></label></td>';
			
 
				      	   		return html;
			
 
				      	   	}
			
 
				 		},{
			
 
							sDefaultContent: '',
			
 
							aTargets: [ '_all' ]
			
 
						}],
			
 
				   		"fnServerData": function (sSource, aoData, fnCallback) {
			
 
				   			 
			
 
				   			$.ajax({
			
 
				   			    "dataType": 'json',
			
 
							    "type": 'POST',
			
 
							    "url": sSource,
			
 
								"data" : aoData, 
			
 
								"success" : fnCallback,
			
 
								"complete": function (XMLHttpRequest, textStatus){
			
 
									var json = eval("(" + XMLHttpRequest.responseText + ")");
			
 
									
			
 
									if(json.Code != 10000){
			
 
											ask(json.Message);
			
 
				
			
 
									}
			
 
								}
			
 
				   			 });
			
 
				   			
			
 
				   			artLoading=art.dialog({lock: true,	content: '<img src="../widget/artDialog/4.1.7/images/loading.gif" class="mr10" />数据加载中，请稍候...', tips:true});
			
 
				   		},
			
 
						"fnServerParams": function(aoData) {// 多条件查询
			
 
							
			
 
							aoData.push({ "name": "ArticleTitle", "value":$("#ArticleTitle").val()});
			
 
							aoData.push({ "name": "StartTime", "value":$("#StartTime").val()});
			
 
							aoData.push({ "name": "EndTime", "value":$("#EndTime").val()});
			
 
				   			aoData.push({"name": "ArticleSource","value": $('#ArticleSource').formSelect('getDataVal')});
			
 
				  			aoData.push({"name": "Articlelevel","value": $('#Articlelevel').formSelect('getDataKey')});
			
 
				 			aoData.push({"name": "SecondLevelCategoryId","value": $('#SecondLevelCategoryId').formSelect('getDataKey')});
			
 
				 			aoData.push({"name": "FirstLevelCategoryId","value": $('#FirstLevelCategoryId').formSelect('getDataKey')});
			
 
				
			
 
				 			aoData.push({"name": "ArticleType","value": $('#ArticleType').formSelect('getDataKey')});
			
 
						},    			      
			
 
						"fnDrawCallback" : function(nRow, aData, iDisplayIndex, iDisplayIndexFull){
			
 
							 
			
 
							artLoading.close();
			
 
						},
			
 
						"fnCreatedRow" : function(nRow, aData, iDataIndex ){	// 创建行得时候的回调函数
			
 
						 
			
 
							$(nRow).attr('class','tr-list');
			
 
						},
			
 
						 
			
 
					});
			
 
					
			
 
					// 复选框
			
 
					$('#groupDataTableDiv').checkboxGroup({operate:true,oneElemClass:'.outfit-checkbox',allElemClass:'.all-checkbox'});
			
 
					
			
 
					// 点击查询详情
			
 
					$('#groupDataTable').on( 'click', 'a', function () {
			
 
						// 得到table对象
			
 
						table=$('#groupDataTable').DataTable();
			
 
						// 获取选中行数据
			
 
				       	var data = table.row( $(this).parents('tr') ).data();
			
 
						
			
 
					});
			
 
				}
			
 
				
			
 
				// 条件查询
			
 
				function doSearch(){
			
 
					table = $('#groupDataTable').dataTable();// 得到table对象
			
 
					table.fnDraw();// 重绘制
			
 
					table = $('#groupDataTable').DataTable();
			
 
				}
			
 
				
			
 
				function _ajax(url, param, flag) {
			
 
				
			
 
					var obj = null;
			
 
					try {
			
 
						$.ajax({
			
 
							type : 'POST',
			
 
							url : url,
			
 
							data : param,
			
 
							async : flag,
			
 
							timeout : 8000,
			
 
							dataType : 'json',
			
 
							success : function(data) {
			
 
								obj = data;
			
 
							}
			
 
						});
			
 
					} catch (err) {
			
 
						ComWbj.alertIconNo('提示：', err, 'error');
			
 
					}
			
 
					if (!flag)
			
 
						return obj;
			
 
				}
			
 
				
			
 
				
			
 
				function chk() {
			
 
					var articleIds = "";
			
 
					var checkboxValues=$('#groupDataTableDiv').checkboxGroup({operate:'getKey'});
			
 
					
			
 
					var checkboxVal=checkboxValues.split(",");
			
 
					var k=0;
			
 
					for(var i=0;i<checkboxVal.length;i++){
			
 
						if(checkboxVal[i]!=""&&checkboxVal[i]!="on"){
			
 
							if(k==0){
			
 
								articleIds=checkboxVal[i];
			
 
							}else{
			
 
								articleIds=articleIds+","+checkboxVal[i];
			
 
							}
			
 
							k++;
			
 
						}
			
 
					}
			
 
					if(k!=0){
			
 
						art.dialog({
			
 
							lock: true,
			
 
							icon: 'question',
			
 
							opacity:0.4,
			
 
							width: 250,
			
 
							title:'提示',
			
 
							content: '确认删除这些文章?',
			
 
					        ok : function() {
			
 
					        	subRemoveArticle(articleIds);
			
 
					        },
			
 
							cancel : null, 
			
 
							quickClose : true
			
 
					    });
			
 
					}else {
			
 
						
			
 
						ask("请选择要删除的文章");
			
 
						return;
			
 
					}
			
 
				}
			
 
				
			
 
				
			
 
				
			
 
				function subRemoveArticle(articleIds) {
			
 
					var param = {};
			
 
					param.ids = articleIds;
			
 
				
			
 
					artLoading=art.dialog({lock: true,	content: '<img src="../widget/artDialog/4.1.7/images/loading.gif" class="mr10" />数据处理中，请稍候...', tips:true});
			
 
					$.post("/JkEdu/articlePc/removeArticle", param, function(result) {
			
 
						
			
 
						artLoading.close();
			
 
						if (result.Code==10000){
			
 
							ask(result.Message);
			
 
							table = $('#groupDataTable').dataTable();// 得到table对象
			
 
							table.fnDraw();// 重绘制
			
 
							table = $('#groupDataTable').DataTable();
			
 
						} else {
			
 
							ask(result.Message)
			
 
						}
			
 
					});
			
 
				}
			
 
				// 置顶
			
 
				function updateTop(articleid,articleorder){
			
 
				 	var param = {};
			
 
				 
			
 
					param.ArticleOrder = articleorder;
			
 
				
			
 
					param.ArticleId = articleid;
			
 
				
			
 
					artLoading=art.dialog({lock: true,	content: '<img src="..//widget/artDialog/4.1.7/images/loading.gif" class="mr10" />数据加载中，请稍候...', tips:true});
			
 
					$.post("/JkEdu/articlePc/updateTop", param, function(result){
			
 
						artLoading.close();
			
 
						if(result.Code==10000){
			
 
							doSearch();
			
 
							// queryList(labelname);
			
 
						} else {
			
 
							ask(result.Message);
			
 
						}
			
 
				   });
			
 
				}
			
 
				
			
 
				
			
 
				// 一级分类下拉框
			
 
				function getrounte1(){
			
 
					
			
 
					var tempArr =new Array();
			
 
					$.ajax({
			
 
						dataType: "json",
			
 
						type: "POST",
			
 
						cache:false,
			
 
						data : {
			
 
						},
			
 
						url: "/JkEdu/configDict/getCateOne",
			
 
						success : function(result) {
			
 
							
			
 
							
			
 
							if (result.Code == 10000) {
			
 
								var list = result.result;
			
 
								
			
 
								if (list != null) {
			
 
									list.unshift({
			
 
										"categoryId" : "",
			
 
										"categoryName" : "--请选择一级分类--"
			
 
									});
			
 
									$('#FirstLevelCategoryId').formSelect({
			
 
										jsonData : list,
			
 
										jsonDataId : "categoryId",
			
 
										jsonDataText : "categoryName"
			
 
									}, null, function(dom, text, value) {// 点击某个选项回调
			
 
										$('#SecondLevelCategoryId').formSelect('resetValue');
			
 
										getrounte2();
			
 
									});
			
 
								}
			
 
							}
			
 
						}
			
 
					});
			
 
				}
			
 
				
			
 
				//二级分类下拉框
			
 
				function getrounte2(){
			
 
					var pFirstId = $("#p_FirstLevelCategoryId").val();
			
 
					var tempArr =new Array();
			
 
					$.ajax({
			
 
						dataType: "json",
			
 
						type: "POST",
			
 
						cache:false,
			
 
						data : {
			
 
							pFirstId:pFirstId,
			
 
						},
			
 
						url: "/JkEdu/configDict/getCateTwo",
			
 
						success : function(result) {
			
 
							
			
 
							
			
 
							if (result.Code == 10000) {
			
 
								var list = result.result;
			
 
								
			
 
								if (list != null) {
			
 
									list.unshift({
			
 
										"categoryId" : "",
			
 
										"categoryName" : "--请选择一级分类--"
			
 
									});
			
 
									$('#SecondLevelCategoryId').formSelect({
			
 
										jsonData : list,
			
 
										jsonDataId : "categoryId",
			
 
										jsonDataText : "categoryName"
			
 
									}, null, function(dom, text, value) {// 点击某个选项回调
			
 
										 
			
 
									});
			
 
								}
			
 
							}
			
 
						}
			
 
					});
			
 
				}
			
 
				
			
 
				//优先级下拉框
			
 
				function getArticlelevel(){
			
 
					
			
 
					var tempArr =new Array();
			
 
					$.ajax({
			
 
						dataType: "json",
			
 
						type: "POST",
			
 
						cache:false,
			
 
						data : {
			
 
							typeName : "prio"
			
 
				
			
 
						},
			
 
						url: "/JkEdu/configDict/getDict",
			
 
						success : function(result) {
			
 
							if (result.Code == 10000) {
			
 
								var list = result.result;
			
 
								articlelevelJSON = list;
			
 
								if (list != null) {
			
 
									list.unshift({
			
 
										"code" : "",
			
 
										"codeName" : "--请选择等级--"
			
 
									});
			
 
									$('#Articlelevel').formSelect({
			
 
										jsonData : list,
			
 
										jsonDataId : "code",
			
 
										jsonDataText : "codeName"
			
 
									}, null, function(dom, text, value) {// 点击某个选项回调
			
 
										 
			
 
									});
			
 
								}
			
 
							}
			
 
						}
			
 
					});
			
 
				}
			
 
				
			
 
				// 类型下拉框
			
 
				function getArticleType() {
			
 
					$.ajax({
			
 
						url: "/JkEdu/configDict/getDict",
			
 
						async : false,
			
 
						dataType: "json",
			
 
						type: "POST",
			
 
							data : {
			
 
							typeName : "aType"
			
 
						},
			
 
						success : function(result) {
			
 
							if (result.Code == 10000) {
			
 
								var list = result.result;
			
 
								articleTypeJSON = list;
			
 
								if (list != null) {
			
 
									list.unshift({
			
 
										"code" : "",
			
 
										"codeName" : "--请选择类型--"
			
 
									});
			
 
									$('#ArticleType').formSelect({
			
 
										jsonData : list,
			
 
										jsonDataId : "code",
			
 
										jsonDataText : "codeName"
			
 
									}, null, function(dom, text, value) {// 点击某个选项回调
			
 
										 
			
 
									});
			
 
								}
			
 
							}
			
 
						}
			
 
					});
			
 
				}
			
 
				
			
 
				// 来源下拉框
			
 
				function getArticleSource(){
			
 
					
			
 
					var tempArr =new Array();
			
 
					$.ajax({
			
 
						dataType: "json",
			
 
						type: "POST",
			
 
						cache:false,
			
 
						data : {
			
 
							typeName : "source"
			
 
				
			
 
						},
			
 
						url: "/JkEdu/configDict/getDict",
			
 
						success : function(result) {
			
 
							if (result.Code == 10000) {
			
 
								var list = result.result;
			
 
								if (list != null) {
			
 
									list.unshift({
			
 
										"code" : "",
			
 
										"codeName" : "--请选择来源--"
			
 
									});
			
 
									$('#ArticleSource').formSelect({
			
 
										jsonData : list,
			
 
										jsonDataId : "code",
			
 
										jsonDataText : "codeName"
			
 
									}, null, function(dom, text, value) {// 点击某个选项回调
			
 
										 
			
 
									});
			
 
								}
			
 
							}
			
 
						}
			
 
					});
			
 
				}
			
 
				
			
 
				// 全选和反选
			
 
				$(".all-checkbox").on('click',function(){
			
 
					
			
 
					if (select == 0) {
			
 
						$("tbody tr").find('.input-group-pack').addClass('checked').find('input').attr('checked','true');
			
 
							select = 1;
			
 
				 		return;
			
 
					}
			
 
					if (select == 1) {
			
 
						$("tbody tr ").find('.input-group-pack').removeClass('checked').find('input').removeAttr('checked');
			
 
						select = 0;
			
 
				 		return;
			
 
					}
			
 
				});
			
 
				
			
 
				function ask(message){
			
 
				 	art.dialog({
			
 
						lock : true,
			
 
						artIcon : 'ask',
			
 
						opacity : 0.4,
			
 
						width : 250,
			
 
						title : '提示',
			
 
						content : message,
			
 
						ok : function() {
			
 
							
			
 
						}
			
 
					});
			
 
				 	
			
 
				 }
			
--- a/edu-article/JkEdu/WebRoot/JkArticle/js/JkArticleLibraryDoctor.js
+++ b/edu-article/JkEdu/WebRoot/JkArticle/js/JkArticleLibraryDoctor.js
@ -0,0 +1,513 @@
 
				var roleDataTables = "";
			
 
				var select  = 0;
			
 
				var articleTypeJSON = [];
			
 
				var articlelevelJSON = [];
			
 
				var uid = "";
			
 
				$(function() {
			
 
				 
			
 
				 	getrounte1();
			
 
					getrounte2();
			
 
					getArticlelevel();
			
 
					getArticleType();
			
 
					getArticleSource();
			
 
					initTable();
			
 
					uid = getUserInfo().uid;
			
 
				 });
			
 
				
			
 
				
			
 
				function initTable(){
			
 
					table=$('#groupDataTable').DataTable({
			
 
						"bServerSide": true,// 是否启用服务器处理数据源，必须sAjaxSource指明数据源位置
			
 
						"bprocessing": true,// 是否启用进度显示，进度条等等，对处理大量数据很有用处。
			
 
						"iDisplayLength":9,// 默认每页9条数据
			
 
						"aLengthMenu":[9,50,100],
			
 
						"sAjaxSource" : "/JkEdu/articleDoctorPc/queryArticlePcDoctorList",
			
 
				
			
 
				        "aoColumns": [
			
 
									  {"mDataProp": null},
			
 
									  {
			
 
										"mDataProp" : "articletitle"
			
 
									  },
			
 
						              {"mDataProp": function(obj){
			
 
						            	  var str = "";
			
 
						            	  if (obj.firstlevelcategoryname && obj.firstlevelcategoryname != null) {
			
 
						            		  
			
 
						            		  str +=  obj.firstlevelcategoryname;
			
 
				
			
 
						            	  }
			
 
						            	  if (obj.articletype && obj.articletype != null) {
			
 
						            		  var articletypeS = "";
			
 
				 		            		  $.each(articleTypeJSON, function (n, value) {
			
 
						            			  if(value.code==obj.articletype){
			
 
						            				  articletypeS=value.codeName;
			
 
						            				  // break;
			
 
						            			  }
			
 
						                      });
			
 
						            		  str +=  "<br/>" +articletypeS;
			
 
				
			
 
						            	  }
			
 
						            	  return str;
			
 
						              }
			
 
									},
			
 
									 {"mDataProp": function(obj){
			
 
										 var str = "";
			
 
						            	  if (obj.articlesource && obj.articlesource != null) {
			
 
						            		  
			
 
						            		  str +=  obj.articlesource;
			
 
				
			
 
						            	  }
			
 
						            	  if (obj.operatorname && obj.operatorname != null) {
			
 
						            		  
			
 
						            		  str +=   "<br/>" +obj.operatorname;
			
 
				
			
 
						            	  }
			
 
						            	  return str;
			
 
						              }
			
 
									},
			
 
								
			
 
									{
			
 
										"mDataProp" : function(obj) {
			
 
											var str = "";
			
 
											if (obj.articlelevel && obj.articlelevel != null) {
			
 
							            		  var articleleveS = "";
			
 
					 		            		  $.each(articlelevelJSON, function (n, value) {
			
 
							            			  if(value.code==obj.articlelevel){
			
 
							            				  articleleveS=value.codeName;
			
 
				  			            				  // break;
			
 
							            			  }
			
 
							                      });
			
 
					 		            		 str += articleleveS;
			
 
													
			
 
				
			
 
							            	  }
			
 
											 return str;
			
 
										}
			
 
									},
			
 
									
			
 
									{"mDataProp": function(obj){
			
 
						            	  var str = "";
			
 
						            	  if (obj.inserttime && obj.inserttime != null) {
			
 
						            		  
			
 
						            		  str +=  obj.inserttime.substring(0, 19);
			
 
				
			
 
						            	  }
			
 
						            	  if (obj.updatetime && obj.updatetime != null) {
			
 
						            		  
			
 
						            		  str +=   "<br/>" +obj.updatetime.substring(0, 19);
			
 
				
			
 
						            	  }
			
 
						            	  
			
 
						            	  return str;
			
 
						              }},
			
 
									
			
 
						          	{
			
 
											"mDataProp" : function(obj) {
			
 
												if (obj.isauthentication == 1) {
			
 
													return "以认证";
			
 
												} else if (obj.isauthentication == 2) {
			
 
													return "未认证";
			
 
												}
			
 
											}
			
 
										},
			
 
										
			
 
										{
			
 
											"mDataProp" : "authentication"
			
 
										},
			
 
									{
			
 
										"mDataProp" : function(obj) {
			
 
											if(uid==obj.operatorid){
			
 
												return '<a href="PushArticleDoctor.html?articleid='
			
 
												+ obj.articleid
			
 
												+ '" class="c-btn c-btn-blue btn-w60" align="center" ">推送</a>  '
			
 
												+  '<a href="EditPcJkArticle.html?articleid='
			
 
												+ obj.articleid
			
 
												+ '" class="c-btn bgc-ec6941 btn-w60" align="center"">编辑</a>';
			
 
							       			}else{
			
 
							       				return '<a href="PushArticleDoctor.html?articleid='
			
 
												+ obj.articleid
			
 
												+ '" class="c-btn c-btn-blue btn-w60" align="center" ">推送</a>  '
			
 
							       				+ ' ';
			
 
							       			}	
			
 
										}
			
 
									}],
			
 
				 		"columnDefs": [{
			
 
				 			targets: 0,
			
 
				       		render: function (data, type, row) {
			
 
				       			var html = "";
			
 
				       			var checkboxName=row.articleid;
			
 
				       			
			
 
				       			if(uid==row.operatorid){
			
 
				            			html='<td><label class="checkbox outfit-checkbox ssyy  "><input type="checkbox" name="tags" value="'+checkboxName+'" class="c-hide "><i class="icon-chkbox"></i></label></td>';
			
 
				
			
 
				       			}else{
			
 
				            			html='<td><label class="checkbox outfit-checkbox disabled "><input type="checkbox" name="tags"   disabled="disabled" value="'+checkboxName+'" class="c-hide "><i class="icon-chkbox"></i></label></td>';
			
 
				       			}
			
 
				 
			
 
				      	   		return html;
			
 
				      	   	}
			
 
				 		},{
			
 
							sDefaultContent: '',
			
 
							aTargets: [ '_all' ]
			
 
						}],
			
 
				   		"fnServerData": function (sSource, aoData, fnCallback) {
			
 
				   			$.ajax({
			
 
				   			    "dataType": 'json',
			
 
							    "type": 'POST',
			
 
							    "url": sSource,
			
 
								"data" : aoData, 
			
 
								"success" : fnCallback,
			
 
								"complete": function (XMLHttpRequest, textStatus){
			
 
									var json = eval("(" + XMLHttpRequest.responseText + ")");
			
 
									if(json.Code != 10000){
			
 
										ask(json.Message);
			
 
									}
			
 
								}
			
 
				   			 });
			
 
				   			
			
 
				   			artLoading=art.dialog({lock: true,	content: '<img src="../widget/artDialog/4.1.7/images/loading.gif" class="mr10" />数据加载中，请稍候...', tips:true});
			
 
				   		},
			
 
						"fnServerParams": function(aoData) {// 多条件查询
			
 
							
			
 
							aoData.push({ "name": "ArticleTitle", "value":$("#ArticleTitle").val()});
			
 
							aoData.push({ "name": "StartTime", "value":$("#StartTime").val()});
			
 
							aoData.push({ "name": "EndTime", "value":$("#EndTime").val()});
			
 
				   			aoData.push({"name": "ArticleSource","value": $('#ArticleSource').formSelect('getDataVal')});
			
 
				  			aoData.push({"name": "Articlelevel","value": $('#Articlelevel').formSelect('getDataKey')});
			
 
				 			aoData.push({"name": "SecondLevelCategoryId","value": $('#SecondLevelCategoryId').formSelect('getDataKey')});
			
 
				 			aoData.push({"name": "FirstLevelCategoryId","value": $('#FirstLevelCategoryId').formSelect('getDataKey')});
			
 
				
			
 
				 			aoData.push({"name": "ArticleType","value": $('#ArticleType').formSelect('getDataKey')});
			
 
						},    			      
			
 
						"fnDrawCallback" : function(nRow, aData, iDisplayIndex, iDisplayIndexFull){
			
 
							artLoading.close();
			
 
						},
			
 
						"fnCreatedRow" : function(nRow, aData, iDataIndex ){	// 创建行得时候的回调函数
			
 
							$(nRow).attr('class','tr-list');
			
 
						},
			
 
						 
			
 
					});
			
 
					
			
 
					// 复选框
			
 
					$('#groupDataTableDiv').checkboxGroup({operate:true,oneElemClass:'.ssyy',allElemClass:'.all-checkbox'});
			
 
					
			
 
					// 点击查询详情
			
 
					$('#groupDataTable').on( 'click', 'a', function () {
			
 
						// 得到table对象
			
 
						table=$('#groupDataTable').DataTable();
			
 
						// 获取选中行数据
			
 
				       	var data = table.row( $(this).parents('tr') ).data();
			
 
						
			
 
					});
			
 
				}
			
 
				
			
 
				// 条件查询
			
 
				function doSearch(){
			
 
					table = $('#groupDataTable').dataTable();// 得到table对象
			
 
					table.fnDraw();// 重绘制
			
 
					table = $('#groupDataTable').DataTable();
			
 
				}
			
 
				
			
 
				function _ajax(url, param, flag) {
			
 
				
			
 
					var obj = null;
			
 
					try {
			
 
						$.ajax({
			
 
							type : 'POST',
			
 
							url : url,
			
 
							data : param,
			
 
							async : flag,
			
 
							timeout : 8000,
			
 
							dataType : 'json',
			
 
							success : function(data) {
			
 
								obj = data;
			
 
							}
			
 
						});
			
 
					} catch (err) {
			
 
						ComWbj.alertIconNo('提示：', err, 'error');
			
 
					}
			
 
					if (!flag)
			
 
						return obj;
			
 
				}
			
 
				
			
 
				
			
 
				function chk() {
			
 
					var articleIds = "";
			
 
					var checkboxValues=$('#groupDataTableDiv').checkboxGroup({operate:'getKey'});
			
 
					
			
 
					var checkboxVal=checkboxValues.split(",");
			
 
					var k=0;
			
 
					for(var i=0;i<checkboxVal.length;i++){
			
 
						if(checkboxVal[i]!=""&&checkboxVal[i]!="on"){
			
 
							if(k==0){
			
 
								articleIds=checkboxVal[i];
			
 
							}else{
			
 
								articleIds=articleIds+","+checkboxVal[i];
			
 
							}
			
 
							k++;
			
 
						}
			
 
					}
			
 
					if(k!=0){
			
 
						art.dialog({
			
 
							lock: true,
			
 
							icon: 'question',
			
 
							opacity:0.4,
			
 
							width: 250,
			
 
							title:'提示',
			
 
							content: '确认删除这些文章?',
			
 
					        ok : function() {
			
 
					        	subRemoveArticle(articleIds);
			
 
					        },
			
 
							cancel : null, 
			
 
							quickClose : true
			
 
					    });
			
 
					}else {
			
 
						
			
 
						ask("请选择要删除的文章");
			
 
						return;
			
 
					}
			
 
				}
			
 
				
			
 
				
			
 
				
			
 
				function subRemoveArticle(articleIds) {
			
 
					var param = {};
			
 
					param.ids = articleIds;
			
 
				
			
 
					artLoading=art.dialog({lock: true,	content: '<img src="../widget/artDialog/4.1.7/images/loading.gif" class="mr10" />数据处理中，请稍候...', tips:true});
			
 
					$.post("/JkEdu/articleDoctorPc/removeArticle", param, function(result) {
			
 
						
			
 
						artLoading.close();
			
 
						if (result.Code==10000){
			
 
							ask(result.Message);
			
 
							table = $('#groupDataTable').dataTable();// 得到table对象
			
 
							table.fnDraw();// 重绘制
			
 
							table = $('#groupDataTable').DataTable();
			
 
						} else {
			
 
							ask(result.Message)
			
 
						}
			
 
					});
			
 
				}
			
 
				// 置顶
			
 
				function updateTop(articleid,articleorder){
			
 
				 	var param = {};
			
 
				 
			
 
					param.ArticleOrder = articleorder;
			
 
				
			
 
					param.ArticleId = articleid;
			
 
				
			
 
					artLoading=art.dialog({lock: true,	content: '<img src="..//widget/artDialog/4.1.7/images/loading.gif" class="mr10" />数据加载中，请稍候...', tips:true});
			
 
					$.post("/JkEdu/articleDoctorPc/updateTop", param, function(result){
			
 
						artLoading.close();
			
 
						if(result.Code==10000){
			
 
							doSearch();
			
 
							// queryList(labelname);
			
 
						} else {
			
 
							ask(result.Message);
			
 
						}
			
 
				   });
			
 
				}
			
 
				
			
 
				//一级分类下拉框
			
 
				function getrounte1(){
			
 
					
			
 
					var tempArr =new Array();
			
 
					$.ajax({
			
 
						dataType: "json",
			
 
						type: "POST",
			
 
						cache:false,
			
 
						data : {
			
 
						},
			
 
						url: "/JkEdu/configDict/getCateOne",
			
 
						success : function(result) {
			
 
							
			
 
							
			
 
							if (result.Code == 10000) {
			
 
								var list = result.result;
			
 
								
			
 
								if (list != null) {
			
 
									list.unshift({
			
 
										"categoryId" : "",
			
 
										"categoryName" : "--请选择一级分类--"
			
 
									});
			
 
									$('#FirstLevelCategoryId').formSelect({
			
 
										jsonData : list,
			
 
										jsonDataId : "categoryId",
			
 
										jsonDataText : "categoryName"
			
 
									}, null, function(dom, text, value) {// 点击某个选项回调
			
 
										$('#SecondLevelCategoryId').formSelect('resetValue');
			
 
										getrounte2();
			
 
									});
			
 
								}
			
 
							}
			
 
						}
			
 
					});
			
 
				}
			
 
				
			
 
				//二级分类下拉框
			
 
				function getrounte2(){
			
 
					var pFirstId = $("#p_FirstLevelCategoryId").val();
			
 
					var tempArr =new Array();
			
 
					$.ajax({
			
 
						dataType: "json",
			
 
						type: "POST",
			
 
						cache:false,
			
 
						data : {
			
 
							pFirstId:pFirstId,
			
 
						},
			
 
						url: "/JkEdu/configDict/getCateTwo",
			
 
						success : function(result) {
			
 
							
			
 
							
			
 
							if (result.Code == 10000) {
			
 
								var list = result.result;
			
 
								
			
 
								if (list != null) {
			
 
									list.unshift({
			
 
										"categoryId" : "",
			
 
										"categoryName" : "--请选择一级分类--"
			
 
									});
			
 
									$('#SecondLevelCategoryId').formSelect({
			
 
										jsonData : list,
			
 
										jsonDataId : "categoryId",
			
 
										jsonDataText : "categoryName"
			
 
									}, null, function(dom, text, value) {// 点击某个选项回调
			
 
										 
			
 
									});
			
 
								}
			
 
							}
			
 
						}
			
 
					});
			
 
				}
			
 
				
			
 
				
			
 
				// 优先级下拉框
			
 
				function getArticlelevel(){
			
 
					
			
 
					var tempArr =new Array();
			
 
					$.ajax({
			
 
						dataType: "json",
			
 
						type: "POST",
			
 
						cache:false,
			
 
						data : {
			
 
							typeName : "prio"
			
 
				
			
 
						},
			
 
						url: "/JkEdu/configDict/getDict",
			
 
						success : function(result) {
			
 
							if (result.Code == 10000) {
			
 
								var list = result.result;
			
 
								articlelevelJSON = list;
			
 
								if (list != null) {
			
 
									list.unshift({
			
 
										"code" : "",
			
 
										"codeName" : "--请选择等级--"
			
 
									});
			
 
									$('#Articlelevel').formSelect({
			
 
										jsonData : list,
			
 
										jsonDataId : "code",
			
 
										jsonDataText : "codeName"
			
 
									}, null, function(dom, text, value) {// 点击某个选项回调
			
 
										 
			
 
									});
			
 
								}
			
 
							}
			
 
						}
			
 
					});
			
 
				}
			
 
				
			
 
				// 类型下拉框
			
 
				function getArticleType() {
			
 
					$.ajax({
			
 
						url: "/JkEdu/configDict/getDict",
			
 
						async : false,
			
 
						dataType: "json",
			
 
						type: "POST",
			
 
							data : {
			
 
							typeName : "aType"
			
 
						},
			
 
						success : function(result) {
			
 
							if (result.Code == 10000) {
			
 
								var list = result.result;
			
 
								articleTypeJSON = list;
			
 
								if (list != null) {
			
 
									list.unshift({
			
 
										"code" : "",
			
 
										"codeName" : "--请选择类型--"
			
 
									});
			
 
									$('#ArticleType').formSelect({
			
 
										jsonData : list,
			
 
										jsonDataId : "code",
			
 
										jsonDataText : "codeName"
			
 
									}, null, function(dom, text, value) {// 点击某个选项回调
			
 
										 
			
 
									});
			
 
								}
			
 
							}
			
 
						}
			
 
					});
			
 
				}
			
 
				
			
 
				// 来源下拉框
			
 
				function getArticleSource(){
			
 
					
			
 
					var tempArr =new Array();
			
 
					$.ajax({
			
 
						dataType: "json",
			
 
						type: "POST",
			
 
						cache:false,
			
 
						data : {
			
 
							typeName : "source"
			
 
				
			
 
						},
			
 
						url: "/JkEdu/configDict/getDict",
			
 
						success : function(result) {
			
 
							if (result.Code == 10000) {
			
 
								var list = result.result;
			
 
								if (list != null) {
			
 
									list.unshift({
			
 
										"code" : "",
			
 
										"codeName" : "--请选择来源--"
			
 
									});
			
 
									$('#ArticleSource').formSelect({
			
 
										jsonData : list,
			
 
										jsonDataId : "code",
			
 
										jsonDataText : "codeName"
			
 
									}, null, function(dom, text, value) {// 点击某个选项回调
			
 
										 
			
 
									});
			
 
								}
			
 
							}
			
 
						}
			
 
					});
			
 
				}
			
 
				
			
 
				//全选和反选
			
 
				$(".all-checkbox").on('click',function(){
			
 
					
			
 
					if (select == 0) {
			
 
						$("tbody tr").find('.input-group-pack').addClass('checked').find('input').attr('checked','true');
			
 
							select = 1;
			
 
				 		return;
			
 
					}
			
 
					if (select == 1) {
			
 
						$("tbody tr ").find('.input-group-pack').removeClass('checked').find('input').removeAttr('checked');
			
 
						select = 0;
			
 
				 		return;
			
 
					}
			
 
				});
			
 
				 
			
 
				
			
 
				function ask(message){
			
 
				 	art.dialog({
			
 
						lock : true,
			
 
						artIcon : 'ask',
			
 
						opacity : 0.4,
			
 
						width : 250,
			
 
						title : '提示',
			
 
						content : message,
			
 
						ok : function() {
			
 
							
			
 
						}
			
 
					});
			
 
				 	
			
 
				 }
			
--- a/edu-article/JkEdu/WebRoot/JkCategory/JkCategory.html
+++ b/edu-article/JkEdu/WebRoot/JkCategory/JkCategory.html
@ -0,0 +1,174 @@
 
				<!DOCTYPE html>
			
 
				<html lang="en">
			
 
				<head>
			
 
					<meta charset="utf-8" />
			
 
				    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
			
 
				    <meta name="renderer" content="webkit" />
			
 
				    <title>分类管理</title>
			
 
				    <link rel="stylesheet" href="../cross/css/cross.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../cross/css/cross.ui.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../css/health-edu.css" type="text/css" />
			
 
				</head>
			
 
				<body>
			
 
				<div class="p20 w680">
			
 
					<div class="mb20">
			
 
						<a id="classifyAdd" href="javascript:;" class="c-btn c-btn-blue">新增分类</a>
			
 
						<a id="classifyEdit" href="javascript:;" class="c-btn c-btn-green ml10">编辑分类</a>
			
 
						<a id="classifySave" href="javascript:;" class="c-btn c-btn-blue ml10 fr">保存分类</a>
			
 
					</div>
			
 
					<ul class="custom-table" id="category">
			
 
				<!-- 		<li class="table-th">
			
 
							<div class="table-key">一级分类</div>
			
 
							<div class="table-info">二级分类</div>
			
 
						</li>
			
 
						<li>
			
 
							<div class="table-key">
			
 
								<div class="item">
			
 
									<span class="tag">养生</span>
			
 
									<span class="tag-edit"><input type="text" value="养生"/><i class="icon icon-tagclose"></i></span>
			
 
								</div>
			
 
							</div>
			
 
							<div class="table-info">
			
 
								<div class="item">
			
 
									<span class="tag">节气养生</span>
			
 
									<span class="tag-edit"><input type="text" value="节气养生"/><i class="icon icon-tagclose"></i></span>
			
 
								</div>
			
 
								<div class="item">
			
 
									<span class="tag">延年益寿</span>
			
 
									<span class="tag-edit"><input type="text" value="延年益寿"/><i class="icon icon-tagclose"></i></span>
			
 
								</div>
			
 
							</div>
			
 
						</li>
			
 
						<li>
			
 
							<div class="table-key">
			
 
								<div class="item">
			
 
									<span class="tag">育儿</span>
			
 
									<span class="tag-edit"><input type="text" value="育儿"/><i class="icon icon-tagclose"></i></span>
			
 
								</div>
			
 
							</div>
			
 
							<div class="table-info">
			
 
								<div class="item">
			
 
									<span class="tag">婴儿养生</span>
			
 
									<span class="tag-edit"><input type="text" value="婴儿养生"/><i class="icon icon-tagclose"></i></span>
			
 
								</div>
			
 
								<div class="item">
			
 
									<span class="tag">幼儿早教</span>
			
 
									<span class="tag-edit"><input type="text" value="幼儿早教"/><i class="icon icon-tagclose"></i></span>
			
 
								</div>
			
 
							</div>
			
 
						</li> -->
			
 
					</ul>
			
 
				</div>
			
 
				
			
 
				<script type="text/javascript" src="../cross/js/jquery/1.8.3/jquery.js"></script>
			
 
				<script type="text/javascript" src="../cross/js/cross.ui.js"></script>
			
 
				<script type="text/javascript" src="../widget/placeholder/2.0.7/js/jquery.placeholder.js"></script>
			
 
				<script type="text/javascript" src="../JkCategory/js/JkCategory.js"></script>
			
 
				<script type="text/javascript">
			
 
					/* $(function(){
			
 
						//新增分类
			
 
				 		var addHtm = '<div class="item has-input">'+
			
 
								'<input type="text" class="cus-input" placeholder="请输入分类"/><a href="javascript:;" class="c-btn c-btn-blue btn-save ml10">保存</a>'+
			
 
								'</div>';
			
 
						var cusTable = $('.custom-table');
			
 
						var cusLi = '<li class="addli">'+
			
 
										'<div class="table-key">'+
			
 
											'<div class="item has-input">'+
			
 
												'<input type="text" class="cus-input" placeholder="请输入分类"/><a href="javascript:;" class="c-btn c-btn-blue btn-save ml10">保存</a><p class="error c-hide">请先填写一级分类</p>'+
			
 
											'</div>'+
			
 
										'</div>'+
			
 
										'<div class="table-info">'+
			
 
											'<div class="item has-input">'+
			
 
												'<input type="text" class="cus-input" placeholder="请输入分类"/><a href="javascript:;" class="c-btn c-btn-blue btn-save ml10">保存</a>'+
			
 
											'</div>'+
			
 
										'</div>'+
			
 
									'</li>';
			
 
						$('#classifyAdd').click(function(){
			
 
							if(cusTable.hasClass('openadd')){return;}
			
 
							if(cusTable.hasClass('openedit')){
			
 
								cusTable.removeClass('openedit');
			
 
							}
			
 
							cusTable.addClass('openadd');
			
 
							cusTable.find('li').not('.table-th').find('.table-info').append(addHtm);
			
 
							cusTable.append(cusLi);
			
 
						});
			
 
						//input聚焦
			
 
						$(document).on('focus','.cus-input',function(){
			
 
							$(this).siblings('.btn-save').show();
			
 
							var infoObj = $(this).parents('.table-info');
			
 
							infoObj.siblings('.table-key').find('.error').hide();
			
 
							if(infoObj.siblings('.table-key').find('.has-input').length != 0){
			
 
								infoObj.find('input').attr('disabled','disabled');
			
 
								infoObj.siblings('.table-key').find('.error').show();
			
 
							}
			
 
						}).on('blur','.cus-input',function(){
			
 
							$(this).siblings('.btn-save').hide();
			
 
						});
			
 
						//保存新增分类
			
 
						$(document).on('mousedown','.btn-save',function(){
			
 
							var val = $(this).siblings('input').val();
			
 
							if(val == ''){return;}
			
 
							var item = '<div class="item"><span class="tag">'+ val +'</span>'+
			
 
										'<span class="tag-edit"><input type="text" value="'+val+'"/><i class="icon icon-tagclose"></i></span>'+'</div>';
			
 
							$(this).parents('li').removeClass('addli');
			
 
							if($(this).parent().parent().hasClass('table-key')){
			
 
								$(this).parent('.item').before(item);
			
 
								if($(this).parent('.item').hasClass('has-input')){
			
 
									$(this).parents('.table-key').siblings('.table-info').find('input').removeAttr('disabled');
			
 
								}
			
 
								$(this).parent('.item').remove();
			
 
								cusTable.append(cusLi);
			
 
								
			
 
							}else{
			
 
								$(this).parent('.item').before(item);
			
 
							}
			
 
							$(this).siblings('input').val('');
			
 
						});
			
 
				 		//保存分类
			
 
						$('#classifySave').click(function(){
			
 
							if(cusTable.hasClass('openadd')){
			
 
								cusTable.find('.item.has-input').remove();
			
 
								cusTable.removeClass('openadd');
			
 
							}
			
 
							if(cusTable.find('.addli')){
			
 
								cusTable.find('.addli').remove();
			
 
							}
			
 
							if(cusTable.hasClass('openedit')){
			
 
								cusTable.find('.tag-edit').each(function(index,ele){
			
 
									var val = $(ele).find('input').val();
			
 
									$(ele).siblings('.tag').text(val);
			
 
								});
			
 
								cusTable.removeClass('openedit');
			
 
							}
			
 
						}); 
			
 
						//编辑分类
			
 
						$('#classifyEdit').click(function(){
			
 
							if(cusTable.hasClass('openadd')){
			
 
								cusTable.removeClass('openadd');
			
 
							}
			
 
							if(cusTable.find('.addli')){
			
 
								cusTable.find('.addli').remove();
			
 
							}
			
 
							if(cusTable.find('.has-input')){
			
 
								cusTable.find('.has-input').remove();
			
 
							}
			
 
							cusTable.addClass('openedit');
			
 
						});
			
 
						//删除标签
			
 
						$(document).on('click','.tag-edit .icon-tagclose',function(){
			
 
							var editItem = $(this).parent().parent();
			
 
							var info = editItem.parent();
			
 
							if(editItem.parent().hasClass('table-key')){
			
 
								editItem.parent().parent('li').remove();
			
 
							}else{
			
 
								editItem.remove();
			
 
								if(info.children().length == 0){
			
 
									info.parent('li').remove();
			
 
								}
			
 
							}
			
 
						});
			
 
					}); */
			
 
				 	
			
 
				</script>
			
 
				</body>
			
 
				</html>
			
--- a/edu-article/JkEdu/WebRoot/JkCategory/js/JkCategory.js
+++ b/edu-article/JkEdu/WebRoot/JkCategory/js/JkCategory.js
@ -0,0 +1,249 @@
 
				
			
 
				var data = "";
			
 
				$(function(){
			
 
						getdata();
			
 
				//		test();
			
 
						
			
 
						
			
 
						
			
 
						
			
 
						
			
 
						//新增分类
			
 
				 		var addHtm = '<div class="item has-input">'+
			
 
								'<input type="text" class="cus-input" placeholder="请输入分类"/><a href="javascript:;" class="c-btn c-btn-blue btn-save ml10">保存</a>'+
			
 
								'</div>';
			
 
						var cusTable = $('.custom-table');
			
 
						var cusLi = '<li class="addli">'+
			
 
										'<div class="table-key">'+
			
 
											'<div class="item has-input">'+
			
 
												'<input type="text" class="cus-input" placeholder="请输入分类"/><a href="javascript:;" class="c-btn c-btn-blue btn-save ml10">保存</a><p class="error c-hide">请先填写一级分类</p>'+
			
 
											'</div>'+
			
 
										'</div>'+
			
 
										'<div class="table-info">'+
			
 
											'<div class="item has-input">'+
			
 
												'<input type="text" class="cus-input" placeholder="请输入分类"/><a href="javascript:;" class="c-btn c-btn-blue btn-save ml10">保存</a>'+
			
 
											'</div>'+
			
 
										'</div>'+
			
 
									'</li>';
			
 
						$('#classifyAdd').click(function(){
			
 
							if(cusTable.hasClass('openadd')){return;}
			
 
							if(cusTable.hasClass('openedit')){
			
 
								cusTable.removeClass('openedit');
			
 
							}
			
 
							cusTable.addClass('openadd');
			
 
							cusTable.find('li').not('.table-th').find('.table-info').append(addHtm);
			
 
							cusTable.append(cusLi);
			
 
						});
			
 
						//input聚焦
			
 
						$(document).on('focus','.cus-input',function(){
			
 
							$(this).siblings('.btn-save').show();
			
 
							var infoObj = $(this).parents('.table-info');
			
 
							infoObj.siblings('.table-key').find('.error').hide();
			
 
							if(infoObj.siblings('.table-key').find('.has-input').length != 0){
			
 
								infoObj.find('input').attr('disabled','disabled');
			
 
								infoObj.siblings('.table-key').find('.error').show();
			
 
							}
			
 
						}).on('blur','.cus-input',function(){
			
 
							$(this).siblings('.btn-save').hide();
			
 
						});
			
 
						//保存新增分类
			
 
						$(document).on('mousedown','.btn-save',function(){
			
 
							var val = $(this).siblings('input').val();
			
 
							var uuid=guid();
			
 
							if(val == ''){return;}
			
 
							var item = '<div class="item"><span class="tag">'+ val +'</span>'+
			
 
										'<span class="tag-edit"><input type="text" value="'+val+'" data-value="'+uuid+'"/><i class="icon icon-tagclose"></i></span>'+'</div>';
			
 
							$(this).parents('li').removeClass('addli');
			
 
							if($(this).parent().parent().hasClass('table-key')){
			
 
								addcategory(uuid,val,1);//添加一级分类
			
 
									$(this).parent('.item').before(item);
			
 
									if($(this).parent('.item').hasClass('has-input')){
			
 
										$(this).parents('.table-key').siblings('.table-info').find('input').removeAttr('disabled');
			
 
									}
			
 
									$(this).parent('.item').remove();
			
 
									cusTable.append(cusLi);
			
 
							}else{
			
 
								var name = $(this).parents('.table-info').siblings('.table-key').find('input').val();
			
 
								var firstLevelId = $(this).parents('.table-info').siblings('.table-key').find('input').data('value');
			
 
								addcategory(uuid,val,2,firstLevelId);//添加二级分类
			
 
								$(this).parent('.item').before(item);
			
 
							}
			
 
							$(this).siblings('input').val('');
			
 
							
			
 
							
			
 
							
			
 
							
			
 
						});
			
 
				 		//保存分类
			
 
						$('#classifySave').click(function(){
			
 
							if(cusTable.hasClass('openadd')){
			
 
								cusTable.find('.item.has-input').remove();
			
 
								cusTable.removeClass('openadd');
			
 
							}
			
 
							if(cusTable.find('.addli')){
			
 
								cusTable.find('.addli').remove();
			
 
							}
			
 
							if(cusTable.hasClass('openedit')){
			
 
								cusTable.find('.tag-edit').each(function(index,ele){
			
 
									var val = $(ele).find('input').val();
			
 
									if($(ele).siblings('.tag').text()!=val){
			
 
										save($(ele).find('input').data('value'),val);//保存修改后的值
			
 
									}
			
 
									$(ele).siblings('.tag').text(val);
			
 
								});
			
 
								cusTable.removeClass('openedit');
			
 
							}
			
 
						}); 
			
 
						//编辑分类
			
 
						$('#classifyEdit').click(function(){
			
 
							if(cusTable.hasClass('openadd')){
			
 
								cusTable.removeClass('openadd');
			
 
							}
			
 
							if(cusTable.find('.addli')){
			
 
								cusTable.find('.addli').remove();
			
 
							}
			
 
							if(cusTable.find('.has-input')){
			
 
								cusTable.find('.has-input').remove();
			
 
							}
			
 
							cusTable.addClass('openedit');
			
 
						});
			
 
						//删除标签
			
 
						$(document).on('click','.tag-edit .icon-tagclose',function(){
			
 
							var editItem = $(this).parent().parent();
			
 
							var info = editItem.parent();
			
 
							if(editItem.parent().hasClass('table-key')){
			
 
								var categoryId = editItem.find('input').data('value');
			
 
								update(categoryId);
			
 
								editItem.parent().parent('li').remove();
			
 
								
			
 
							}else{
			
 
								var categoryId = editItem.find('input').data('value');
			
 
									update(categoryId);
			
 
									editItem.remove();
			
 
									if(info.children().length == 0){
			
 
										info.parent('li').remove();
			
 
									}
			
 
								
			
 
							}
			
 
						});
			
 
				});
			
 
				function test(){
			
 
					var param = {};
			
 
					var uid=guid();
			
 
					param.categoryId=uid;
			
 
					param.categoryName="test";
			
 
					param.categoryLevel=1;
			
 
					param.secondLevelId=
			
 
					param.firstLevelId=uid;
			
 
					param.orgName="健康教育";
			
 
					param.orgId = "123";
			
 
					param.operatorName = "t";
			
 
					param.operatorId ="20";
			
 
					$.post("/JkEdu/Category/addCategory", param, function(result) {
			
 
						
			
 
					});
			
 
				}
			
 
				function getdata(){
			
 
					var param = {};
			
 
					$.post("/JkEdu/Category/getCategoryList", param, function(result) {
			
 
						
			
 
						if (result.Code==10000){
			
 
							data = result.result;
			
 
							init();
			
 
						} else {
			
 
							ask(result.Message);
			
 
						}
			
 
					});
			
 
					
			
 
				}
			
 
				function init(){
			
 
					
			
 
					var html='';
			
 
					html+='<li class="table-th">'
			
 
						+'<div class="table-key">一级分类</div>'
			
 
						+'<div class="table-info">二级分类</div>'
			
 
						+'</li>';
			
 
					$.each(data, function (i, val) {
			
 
						if(val.categorylevel==1){
			
 
							html+='<li><div class="table-key">'
			
 
								+'<div class="item">'
			
 
								+'<span class="tag">'+val.categoryname+'</span>'
			
 
								+'<span class="tag-edit"><input type="text" value="'+val.categoryname+'" data-value="'+val.categoryid+'"/><i class="icon icon-tagclose"></i></span>'
			
 
								+'</div>'
			
 
								+'</div>';
			
 
							html+='<div class="table-info">';
			
 
							$.each(data, function (j, val2) {
			
 
								if(val2.categorylevel==2&&val2.firstlevelid==val.categoryid){
			
 
									html+='<div class="item">'
			
 
										+'<span class="tag">'+val2.categoryname+'</span>'
			
 
										+'<span class="tag-edit"><input type="text" value="'+val2.categoryname+'" data-value="'+val2.categoryid+'"/><i class="icon icon-tagclose"></i></span>'
			
 
										+'</div>';
			
 
								}
			
 
							});
			
 
							html+='</div></li>';
			
 
						}
			
 
					});
			
 
					$("#category").append(html);
			
 
				}
			
 
				
			
 
				function guid() {
			
 
				    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
			
 
				        var r = Math.random()*16|0, v = c == 'x' ? r : (r&0x3|0x8);
			
 
				        return v.toString(16);
			
 
				    });
			
 
				}
			
 
				
			
 
				function addcategory(categoryId,categoryName,level,firstLevelId){
			
 
					var param = {};
			
 
					var uid=guid();
			
 
					param.categoryId=categoryId;
			
 
					param.categoryName=categoryName;
			
 
					param.categoryLevel=level;
			
 
					param.secondLevelId="";
			
 
						if(level==1){
			
 
							param.firstLevelId=categoryId;
			
 
						}else{
			
 
							param.firstLevelId=firstLevelId;
			
 
						}
			
 
					param.orgName="健康教育";
			
 
					param.orgId = "123";
			
 
					param.operatorName = "t";
			
 
					param.operatorId ="20";
			
 
					$.post("/JkEdu/Category/addCategory", param, function(result) {
			
 
						if(result.Code==10000){
			
 
							return true;
			
 
						}else{
			
 
							return false;
			
 
						}
			
 
					});
			
 
					
			
 
				}
			
 
				
			
 
				function update(categoryId){
			
 
					var param = {};
			
 
					param.categoryId=categoryId;
			
 
					param.categoryState=2;
			
 
					$.post("/JkEdu/Category/updateCategory", param, function(result) {
			
 
						console.log(result.Code);
			
 
						if(result.Code==10000){
			
 
							return true;
			
 
						}else{
			
 
							return false;
			
 
						}
			
 
					});
			
 
				}
			
 
				
			
 
				function save(categoryId,categoryName){
			
 
					var param = {};
			
 
					param.categoryId=categoryId;
			
 
					param.categoryName=categoryName;
			
 
					param.categoryState="";
			
 
					$.post("/JkEdu/Category/updateCategory", param, function(result) {
			
 
						console.log(result.Code);
			
 
						if(result.Code==10000){
			
 
							return true;
			
 
						}else{
			
 
							return false;
			
 
						}
			
 
					});
			
 
				}
			
--- a/edu-article/JkEdu/WebRoot/JkQRCode/JkQRCode.html
+++ b/edu-article/JkEdu/WebRoot/JkQRCode/JkQRCode.html
@ -0,0 +1,240 @@
 
				<!DOCTYPE html>
			
 
				<html lang="en">
			
 
				<head>
			
 
					<meta charset="utf-8" />
			
 
				    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
			
 
				    <meta name="renderer" content="webkit" />
			
 
				    <title>二维码管理</title>
			
 
				    <link rel="stylesheet" href="../iconfont/iconfont.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../cross/css/cross.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../cross/css/cross.ui.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../css/health-edu.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../widget/artDialog/4.1.7/css/artDialog.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../widget/fileUpload/9.11.2/css/jquery.fileupload.css" type="text/css" />
			
 
					
			
 
				</head>
			
 
				<body>
			
 
				<div class="c-hidden">
			
 
				    <div class="phone-part fr">
			
 
				       <div class="c-t-center mb30">
			
 
				       		<a id="preview" href="javascript:;" class="c-btn bgc-ec6941 btn-w60">预览</a>
			
 
				       </div>
			
 
				    	<div class="phone">
			
 
				    		<div class="phone-wrap">
			
 
					    		<div class="phone-header">
			
 
					    			<img src="../images/health-edu/top.png" class="width-100" />
			
 
					    			<div class="phone-tit">
			
 
					    				<a href="javascript:;" class="btn-return"><i class="iconfont icon-xiangzuo c-f12"></i> 返回</a>
			
 
					    				<h1>二维码管理</h1>
			
 
					    				<a href="#" class="btn-more"><i class="iconfont icon-more"></i></a>	
			
 
					    			</div>
			
 
					    		</div>
			
 
					        	<div class="phone-main">
			
 
					        		
			
 
					        		<div class="c-position-r c-t-center height-100">
			
 
					        			<div class="position-t width-100 mtb20">
			
 
						           			<img id="phoneTopImgUrl" src="" alt="" />
			
 
						           			<p class="mt10 c-f14 c-666">文章顶部位置</p>
			
 
						           		</div>
			
 
						           		<div class="position-b width-100 mtb20 c-hide">
			
 
						           			<img id="phoneBottomImgUrl" src="" alt="" />
			
 
						           			<p class="mt10 c-f14 c-666">文章尾部位置</p>
			
 
						           		</div>
			
 
					        		</div>
			
 
					            </div>
			
 
				            </div>
			
 
				       </div>
			
 
				    </div>
			
 
				    <div class="main-part p20">
			
 
				        <div class="form-layout form-horizontal form-horizontal-wider c-f14 c-666 mtb20">
			
 
				        	<input type="hidden" id="id"/>
			
 
				        	<div class="control-group">
			
 
					            <label class="control-label mt25 c-t-right">上传二维码图片：</label>
			
 
					            <div class="control-form">
			
 
				            		<span id="showImgUrlDiv">
			
 
					                </span>
			
 
					                <span class="btn-file btn-file-3 fileinput-button" id="uploadFileFlag">
			
 
										<i class="c-f40 c-bold">+</i>
			
 
										<input id="uploadImg" class="fileupload-btn" type="file" name="file" multiple="">
			
 
									</span>
			
 
									<span class="control-tip">注：为了前端的优质显示效果，建议图片大小控制在100kb以内，像素200x200以内（支持jpg/png/gif）</span>
			
 
					            </div>
			
 
					        </div>
			
 
					        <div class="control-group">
			
 
					            <label class="control-label c-t-right">添加位置：</label>
			
 
					            <div class="control-form" id="position">
			
 
					                <label class="radio checked" data-toggle="radio">
			
 
					                    <input type="radio" class="c-hide" name="position" value="1">
			
 
					                    <i class="icon-radio"></i>文章顶部
			
 
					                </label>
			
 
					                <label class="radio ml40" data-toggle="radio">
			
 
					                    <input type="radio" class="c-hide" name="position" value="2">
			
 
					                    <i class="icon-radio"></i>文章尾部
			
 
					                </label>
			
 
					            </div>
			
 
					        </div>
			
 
					        <div class="control-group">
			
 
					            <div class="control-form">
			
 
					            	<a href="javascript:save()" class="c-btn c-btn-blue btn-w60"><i class="iconfont">&#xe652;</i>保存</a>
			
 
					            </div>
			
 
					        </div>
			
 
				        </div>
			
 
				    </div>
			
 
				</div>
			
 
				
			
 
				<script type="text/javascript" src="../cross/js/jquery/1.8.3/jquery.js"></script>
			
 
				<script type="text/javascript" src="../cross/js/cross.ui.js"></script>
			
 
				<script type="text/javascript" src="../widget/placeholder/2.0.7/js/jquery.placeholder.js"></script>
			
 
				<script type="text/javascript" src="../widget/artDialog/4.1.7/js/artDialog.js"></script>
			
 
				<script type="text/javascript" src="../widget/fileUpload/9.11.2/js/jquery.fileupload.js"></script>
			
 
				<script src="../cross/js/jquery/1.8.3/ajaxfileupload.js"></script>
			
 
					
			
 
				<script type="text/javascript">
			
 
				$(function() {
			
 
					$('.phone-main').height($('.phone-wrap').height() - $('.phone-header').height());
			
 
					//预览
			
 
					$('#preview').click(function(){
			
 
						if($.trim($('#position .checked').text()) == '文章顶部'){
			
 
							$('.position-t').show().siblings().hide();
			
 
						}else{
			
 
							$('.position-b').show().siblings().hide();
			
 
						}
			
 
					});
			
 
					
			
 
					//点击上传图片
			
 
					$('#uploadImg').change(function() {
			
 
						uploadImage();
			
 
				    });
			
 
					
			
 
					//初始化查询
			
 
					query();
			
 
				});
			
 
				
			
 
				function query(newImgUrl) {
			
 
					artLoading = art.dialog({lock: true,content: '<img src="../widget/artDialog/4.1.7/images/loading.gif" class="mr10" />数据加载中，请稍候...', tips:true});
			
 
					$.post("/JkEdu/articleQRCode/getArticleQRCode", {}, function(result) {
			
 
						artLoading.close();
			
 
						var data = eval("(" + result + ")");
			
 
						if (data.Code = 1) {
			
 
							var ret = data.Result;
			
 
							var html = "";
			
 
							var phoneTopHtml = "";
			
 
							var phoneBottomHtml = "";
			
 
							if (ret.length > 0) {
			
 
								$("#id").val(ret[0].id);
			
 
								$('#position').radioGroup({operate:'setKey',opreateDataKey:ret[0].position});
			
 
								if (ret[0].imgurl) {
			
 
									$("#phoneTopImgUrl").attr('src',ret[0].imgurl); 
			
 
									$("#phoneBottomImgUrl").attr('src',ret[0].imgurl);
			
 
									html += '<div class="upload-img mr20">';
			
 
									html += '<img id="codeImgUrl" src="'+ret[0].imgurl+'" alt="" />';
			
 
									html += '<i class="icon icon-close" id="remove"></i></div>';
			
 
									$("#showImgUrlDiv").html(html);
			
 
									$("#uploadFileFlag").hide();
			
 
								} else {
			
 
									$("#uploadFileFlag").show();
			
 
								}
			
 
							} else {
			
 
								$('#position').radioGroup({operate:'setKey',opreateDataKey:"1"});
			
 
							}
			
 
							
			
 
							//删除图片
			
 
							$('#remove').click(function(){
			
 
								removeImageUrl();
			
 
							})
			
 
						} else {
			
 
							ask(data.Message);
			
 
						}
			
 
					});
			
 
				}
			
 
				
			
 
				//保存
			
 
				function save() {
			
 
					var id = $("#id").val();
			
 
					var position = $('#position').radioGroup({operate:'getKey'});
			
 
					//获取上传图片src地址
			
 
					var imgUrl = $("#codeImgUrl").attr('src');
			
 
					var display =$('#showImgUrlDiv').css('display');
			
 
					if (display == 'none' || imgUrl == null || imgUrl == "") {
			
 
						ask("二维码图片不能为空");
			
 
						return;
			
 
					}
			
 
					
			
 
					var param = {};
			
 
					if (id) {
			
 
						param.id = id;
			
 
					}
			
 
					param.position = position;
			
 
					param.imgUrl = imgUrl;
			
 
					
			
 
					artLoading = art.dialog({lock: true,content: '<img src="../widget/artDialog/4.1.7/images/loading.gif" class="mr10" />数据加载中，请稍候...', tips:true});
			
 
					$.post("/JkEdu/articleQRCode/saveArticleQRCode", param, function(result) {
			
 
						artLoading.close();
			
 
						var data = eval("(" + result + ")");
			
 
						ask(data.Message);
			
 
						query();
			
 
					});
			
 
					
			
 
				}
			
 
				
			
 
				//上传图片
			
 
				function uploadImage() {
			
 
					var val = $("#uploadImg").val();
			
 
					if (val == null||val == "") {
			
 
						ask("文件上传有问题，请从新上传！");
			
 
						return;
			
 
					}
			
 
					
			
 
					$.ajaxFileUpload({
			
 
						url : '/JkEdu/file/upload', //需要链接到服务器地址  
			
 
						secureuri : false,
			
 
						fileElementId : 'uploadImg', //文件选择框的id属性  
			
 
						dataType : 'json',
			
 
						success : function(data, status) {
			
 
							var html = '';
			
 
							if (data.Code = 10000) {
			
 
								$("#phoneTopImgUrl").attr('src',data.url.Uri); 
			
 
								$("#phoneBottomImgUrl").attr('src',data.url.Uri);
			
 
								html += '<div class="upload-img mr20">';
			
 
								html += '<img id="codeImgUrl" src="'+data.url.Uri+'" alt="" />';
			
 
								html += '<i class="icon icon-close" id="remove"></i></div>';
			
 
								$("#showImgUrlDiv").html(html);
			
 
								$("#showImgUrlDiv").show();
			
 
								$("#uploadFileFlag").hide();
			
 
								
			
 
								//删除图片
			
 
								$('#remove').click(function(){
			
 
									removeImageUrl();
			
 
								})
			
 
							} else {
			
 
								ask(data.Message);
			
 
							}
			
 
						} 
			
 
					});
			
 
				}
			
 
				
			
 
				function removeImageUrl() {
			
 
					$("#showImgUrlDiv").hide();
			
 
					$("#uploadFileFlag").show();
			
 
					$('#uploadImg').change(function() {
			
 
						uploadImage();
			
 
				    });
			
 
				}
			
 
				
			
 
				//消息提示
			
 
				function ask(message){
			
 
				 	art.dialog({
			
 
						lock : true,
			
 
						artIcon : 'ask',
			
 
						opacity : 0.4,
			
 
						width : 250,
			
 
						title : '提示',
			
 
						content : message,
			
 
						ok : function() {
			
 
							
			
 
						}
			
 
					});
			
 
				}
			
 
				</script>
			
 
				</body>
			
 
				</html>
			
--- a/edu-article/JkEdu/WebRoot/JkSignature/JkSignature.html
+++ b/edu-article/JkEdu/WebRoot/JkSignature/JkSignature.html
@ -0,0 +1,144 @@
 
				<!DOCTYPE html>
			
 
				<html lang="en">
			
 
				<head>
			
 
					<meta charset="utf-8" />
			
 
				    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
			
 
				    <meta name="renderer" content="webkit" />
			
 
				    <title>署名管理</title>
			
 
				    <link rel="stylesheet" href="../iconfont/iconfont.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../cross/css/cross.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../cross/css/cross.ui.css" type="text/css" />
			
 
				    <link rel="stylesheet" href="../css/health-edu.css" type="text/css" />
			
 
				</head>
			
 
				<body>
			
 
				<div class="c-hidden">
			
 
				    <div class="phone-part fr">
			
 
				       <div class="c-t-center mb30">
			
 
				       		<a id="preview" href="javascript:;" class="c-btn bgc-ec6941 btn-w60">预览</a>
			
 
				       </div>
			
 
				    	<div class="phone">
			
 
				    		<div class="phone-wrap">
			
 
					    		<div class="phone-header">
			
 
					    			<img src="../images/health-edu/top.png" class="width-100" />
			
 
					    			<div class="phone-tit">
			
 
					    				<a href="javascript:;" class="btn-return"><i class="iconfont icon-xiangzuo c-f12"></i> 返回</a>
			
 
					    				<h1>署名管理</h1>
			
 
					    				<a href="#" class="btn-more"><i class="iconfont icon-more"></i></a>	
			
 
					    			</div>
			
 
					    		</div>
			
 
					        	<div class="phone-main">
			
 
					        		<div class="c-position-r height-100">
			
 
					        			<div class="position-t width-100 ptb20 plr15 border-box">
			
 
						           			<div class="c-list c-border">
			
 
							                    <div class="c-list-div ptb12">
			
 
							                        <div class="c-list-key pr15">
			
 
							                            <div class="c-avatar-m"> <img src="http://ued.yihu.cn/framework/images/face.png" alt="" class="border-radius-circle"></div>
			
 
							                        </div>
			
 
							                        <div class="c-list-info">
			
 
							                            <h4 class="c-nowrap">XX医生</h4>
			
 
							                            <p class="c-nowrap">全科诊室</p>
			
 
							                            <p class="c-nowrap">鼓东社区卫生服务中心</p>
			
 
							                        </div>
			
 
							                        <div class="c-list-key">+ 关注</div>
			
 
							                    </div>
			
 
							                </div>
			
 
						           			<p class="mt10 c-f14 c-666 c-t-center">文章顶部位置</p>
			
 
						           		</div>
			
 
						           		<div class="position-b width-100 mtb20 plr15 border-box c-hide">
			
 
						           			<div class="c-list c-border">
			
 
							                    <div class="c-list-div ptb12">
			
 
							                        <div class="c-list-key pr15">
			
 
							                            <div class="c-avatar-m"> <img src="http://ued.yihu.cn/framework/images/face.png" alt="" class="border-radius-circle"></div>
			
 
							                        </div>
			
 
							                        <div class="c-list-info">
			
 
							                            <h4 class="c-nowrap">XX医生</h4>
			
 
							                            <p class="c-nowrap">全科诊室</p>
			
 
							                            <p class="c-nowrap">鼓东社区卫生服务中心</p>
			
 
							                        </div>
			
 
							                        <div class="c-list-key">+ 关注</div>
			
 
							                    </div>
			
 
							                </div>
			
 
						           			<p class="mt10 c-f14 c-666 c-t-center">文章尾部位置</p>
			
 
						           		</div>
			
 
					        		</div>
			
 
					            </div>
			
 
				            </div>
			
 
				       </div>
			
 
				    </div>
			
 
				    <div class="main-part p20">
			
 
				        <div class="form-layout form-horizontal form-horizontal-wider c-f14 c-666 mtb20">
			
 
				        	<div class="control-group">
			
 
					            <label class="control-label c-t-right">署名功能：</label>
			
 
					            <div class="control-form" id="state">
			
 
					                <label class="radio" data-toggle="radio" name="state">
			
 
					                    <input type="radio"  value="1" class="c-hide" >
			
 
					                    <i class="icon-radio"></i>开启
			
 
					                </label>
			
 
					                <label class="radio ml40" data-toggle="radio" name="state">
			
 
					                    <input type="radio" class="c-hide" value="2" >
			
 
					                    <i class="icon-radio"></i>关闭
			
 
					                </label>
			
 
					            </div>
			
 
					        </div>
			
 
					        <div class="control-group">
			
 
					            <label class="control-label c-t-right">添加位置：</label>
			
 
					            <div class="control-form" id="position">
			
 
					                <label class="radio" data-toggle="radio">
			
 
					                    <input type="radio" checked="checked" class="c-hide" value="1" name="position">
			
 
					                    <i class="icon-radio"></i>文章顶部
			
 
					                </label>
			
 
					                <label class="radio ml40" data-toggle="radio">
			
 
					                    <input type="radio" class="c-hide" value="2" name="position">
			
 
					                    <i class="icon-radio"></i>文章尾部
			
 
					                </label>
			
 
					                <label class="radio ml40" data-toggle="radio">
			
 
					                    <input type="radio" class="c-hide" value="3" name="position">
			
 
					                    <i class="icon-radio"></i>顶部与尾部均添加
			
 
					                </label>
			
 
					            </div>
			
 
					        </div>
			
 
					        <div class="control-group">
			
 
					            <div class="control-form">
			
 
					                <a id="save" href="javascript:;" class="c-btn c-btn-blue btn-w60">保存</a>
			
 
					            </div>
			
 
					        </div>
			
 
				        </div>
			
 
				    </div>
			
 
				</div>
			
 
				
			
 
				<script type="text/javascript" src="../cross/js/jquery/1.8.3/jquery.js"></script>
			
 
				<script type="text/javascript" src="../cross/js/cross.ui.js"></script>
			
 
				<script type="text/javascript" src="../widget/placeholder/2.0.7/js/jquery.placeholder.js"></script>
			
 
				<script type="text/javascript" src="../JkSignature/js/jkSignature.js"></script>
			
 
				<script type="text/javascript">
			
 
				/* $(function() {
			
 
					$('.phone-main').height($('.phone-wrap').height() - $('.phone-header').height());
			
 
					//预览
			
 
					$('#preview').click(function(){
			
 
						
			
 
						if($.trim($('#off .checked').text())=="开启"){
			
 
							if($.trim($('#position .checked').text()) == '顶部与尾部均添加'){
			
 
								$('.position-t').show();
			
 
								$('.position-b').show();
			
 
							}else{
			
 
								if($.trim($('#position .checked').text()) == '文章顶部'){
			
 
									$('.position-t').show().siblings().hide();
			
 
								}else{
			
 
									$('.position-b').show().siblings().hide();
			
 
								}
			
 
							}
			
 
							
			
 
						}else{
			
 
							$('.position-t').hide();
			
 
							$('.position-b').hide();
			
 
						}
			
 
						
			
 
					});
			
 
					//删除当前图片
			
 
					$('.icon-close').click(function(){
			
 
						$(this).parent('.upload-img').remove();
			
 
					});
			
 
				}); */
			
 
				</script>
			
 
				</body>
			
 
				</html>
			
--- a/edu-article/JkEdu/WebRoot/JkSignature/js/jkSignature.js
+++ b/edu-article/JkEdu/WebRoot/JkSignature/js/jkSignature.js
@ -0,0 +1,100 @@
 
				$(function() {
			
 
					
			
 
					$('.phone-main').height($('.phone-wrap').height() - $('.phone-header').height());
			
 
					//预览
			
 
					$('#preview').click(function(){
			
 
						
			
 
						if($.trim($('#state .checked').text())=="开启"){
			
 
							if($.trim($('#position .checked').text()) == '顶部与尾部均添加'){
			
 
								$('.position-t').show();
			
 
								$('.position-b').show();
			
 
							}else{
			
 
								if($.trim($('#position .checked').text()) == '文章顶部'){
			
 
									$('.position-t').show().siblings().hide();
			
 
								}else{
			
 
									$('.position-b').show().siblings().hide();
			
 
								}
			
 
							}
			
 
							
			
 
						}else{
			
 
							$('.position-t').hide();
			
 
							$('.position-b').hide();
			
 
						}
			
 
						
			
 
					});
			
 
						//保存
			
 
						$('#save').click(function(){
			
 
							var position=1;
			
 
							var state=1;
			
 
						if($.trim($('#state .checked').text())=="开启"){
			
 
							state=1;
			
 
							if($.trim($('#position .checked').text()) == '顶部与尾部均添加'){
			
 
								position=3;
			
 
							}else{
			
 
								if($.trim($('#position .checked').text()) == '文章顶部'){
			
 
									position=1;
			
 
								}else{
			
 
									position=2;
			
 
								}
			
 
							}
			
 
							
			
 
						}else{
			
 
							state=2;
			
 
						}
			
 
						update(position,state);
			
 
					});
			
 
					
			
 
						init();
			
 
					
			
 
					//删除当前图片
			
 
					$('.icon-close').click(function(){
			
 
						$(this).parent('.upload-img').remove();
			
 
					});
			
 
				});
			
 
				
			
 
				function init(){
			
 
					var param = {};
			
 
					$.post("/JkEdu/Signature/getSignature", param, function(result) {
			
 
						console.log(result.Code);
			
 
						if(result.Code==10000){
			
 
							if(result.result[0].state==1){
			
 
								if(result.result[0].position==1){
			
 
									$('.position-t').show().siblings().hide();
			
 
								}else if(result.result[0].position==2){
			
 
									$('.position-b').show().siblings().hide();
			
 
								}else{
			
 
									$('.position-t').show();
			
 
									$('.position-b').show();
			
 
								}
			
 
							}else{
			
 
								$('.position-t').hide();
			
 
								$('.position-b').hide();
			
 
							}
			
 
							
			
 
							 $('#state').radioGroup({operate:'setKey',opreateDataKey:result.result[0].state});
			
 
							 $('#position').radioGroup({operate:'setKey',opreateDataKey:result.result[0].position});
			
 
							
			
 
							
			
 
				//			if(result.result[0].state=2){
			
 
				//				$("label[name='state']:contains('开启')").addClass('checked');
			
 
				//				$("label[name='state']:contains('开启')").find(':radio').prop("checked", "checked");
			
 
				//			}else{
			
 
				//				$("label[name='state']:contains('关闭')").addClass('checked');
			
 
				//				$("label[name='state']:contains('关闭')").find(':radio').prop("checked", "checked");
			
 
				//			}
			
 
						}
			
 
					});
			
 
				}
			
 
				function update(position,state){
			
 
					var param = {};
			
 
					param.position=position;
			
 
					param.state=state;
			
 
					$.post("/JkEdu/Signature/updateSignature", param, function(result) {
			
 
						console.log(result.Code);
			
 
						if(result.Code==10000){
			
 
							return true;
			
 
						}else{
			
 
							return false;
			
 
						}
			
 
					});
			
 
				}
			
--- a/edu-article/JkEdu/WebRoot/META-INF/MANIFEST.MF
+++ b/edu-article/JkEdu/WebRoot/META-INF/MANIFEST.MF
@ -0,0 +1,3 @@
 
				Manifest-Version: 1.0
			
 
				Class-Path: 
			
 
				
			
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/Article.sql.xml
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/Article.sql.xml
@ -0,0 +1,143 @@
 
				<?xml version="1.0" encoding="UTF-8"?>
			
 
				<das-client>
			
 
					<Sqls> 
			
 
						 <Sql name='getArticleList'>
			
 
						 <![CDATA[
			
 
						select m.*,n.BrowseNumber,n.PointNumber,n.CollectionNumber,n.CommentNumber from Org_Article m 
			
 
				LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where 1=1 @Condition
			
 
						
			
 
							]]>
			
 
						</Sql>
			
 
							 <Sql name='getArticleListCount'>
			
 
						 <![CDATA[
			
 
					select count(*) from Org_Article m 
			
 
				LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where 1=1 @Condition
			
 
				
			
 
							]]>
			
 
						</Sql>
			
 
								 <Sql name='getCollectionArticleList'>
			
 
						 <![CDATA[
			
 
				select aa.* ,n.BrowseNumber,n.PointNumber,n.CollectionNumber,n.CommentNumber from (
			
 
				select m.* from Org_Article m  INNER JOIN User_ArticleCollection n on  m.articleid=n.ArticleId and  1=1 @UserParam) as aa LEFT JOIN 
			
 
				User_ArticleStatistics n on aa.ArticleId=n.ArticleId where 1=1 @Condition
			
 
							]]>
			
 
						</Sql>
			
 
									 <Sql name='getCollectionArticleListCount'>
			
 
						 <![CDATA[
			
 
				select count(*) from (
			
 
				select m.* from Org_Article m  INNER JOIN User_ArticleCollection n on  m.articleid=n.ArticleId and 1=1 @UserParam) as aa LEFT JOIN 
			
 
				User_ArticleStatistics n on aa.ArticleId=n.ArticleId where 1=1 @Condition
			
 
							]]>
			
 
						</Sql>
			
 
							 <Sql name='pointNumberCount'>
			
 
						 <![CDATA[
			
 
				
			
 
				select *  from User_Behavior where  BehaviorAction=1 and 1=1 @Condition
			
 
							]]>
			
 
						</Sql>
			
 
							 <Sql name='collectionNumberCount'>
			
 
						 <![CDATA[
			
 
				select * from User_ArticleCollection where 1=1 @Condition
			
 
				
			
 
							]]>
			
 
						</Sql>
			
 
						 <Sql name='updateArticleStatistic'>
			
 
						 <![CDATA[
			
 
						 update User_ArticleStatistics set @behaviorParam where @ArticleId
			
 
							]]>
			
 
						</Sql>
			
 
						
			
 
						 <Sql name='updateCollectionStatistic'>
			
 
						 <![CDATA[
			
 
						 update User_ArticleStatistics set @behaviorParam= (
			
 
				select count(*) from User_ArticleCollection where 1=1 @Condition) where @ArticleId
			
 
							]]>
			
 
						</Sql>
			
 
							 <Sql name='updateCommentStatistic'>
			
 
						 <![CDATA[
			
 
						 update User_ArticleStatistics  set @behaviorParam= (
			
 
				select count(*) from User_ArticleComment where 1=1 @Condition) where @ArticleId
			
 
							]]>
			
 
						</Sql>
			
 
							 <Sql name='insertArticleStatistic'>
			
 
						 <![CDATA[
			
 
									
			
 
								INSERT INTO User_ArticleStatistics (		
			
 
							ArticleId
			
 
						)
			
 
						SELECT  ?
			
 
				FROM dual   where not exists( select ArticleId from User_ArticleStatistics where 1=1 and  ArticleId=? ); 
			
 
					
			
 
							]]>
			
 
						</Sql>
			
 
						 <Sql name='deleteArticleStatistic'>
			
 
						 <![CDATA[
			
 
									
			
 
								delete  from User_ArticleStatistics
			
 
							]]>
			
 
						</Sql>
			
 
						 <Sql name='queryArticleStatistic'>
			
 
						 <![CDATA[
			
 
								select * from (
			
 
							select count(case behavioraction when '1' then 'PointNumber' end) as PointNumber,
			
 
							 count(case behavioraction when '3' then 'ShareNumber' end) as ShareNumber, 
			
 
							count(case behavioraction when '4' then 'BrowseNumber' end) as BrowseNumber,ArticleId
			
 
							from User_Behavior where 1=1 @Condition) as aa LEFT JOIN
			
 
							(select count(*) as CommentNumber,ArticleId from User_ArticleComment where 1=1 @Condition) as bb ON aa.articleid=bb.articleid
			
 
							LEFT JOIN 
			
 
							(select count(*)  as CollectionNumber,ArticleId from User_ArticleCollection where 1=1 @Condition and usertype=2)as cc
			
 
							ON  aa.articleid=bb.articleid
			
 
				
			
 
							]]>
			
 
							
			
 
						</Sql>
			
 
						 <Sql name='insertArticleInitStatistic'>
			
 
						 <![CDATA[
			
 
				
			
 
							INSERT INTO User_ArticleStatistics (ArticleId, BrowseNumber, PointNumber, CommentNumber, ShareNumber, CollectionNumber) VALUES (?,?,?,?,?,?);
			
 
				
			
 
							]]>
			
 
							
			
 
						</Sql>
			
 
						
			
 
							 <Sql name='getDoctorArticleList'>
			
 
						 <![CDATA[
			
 
				
			
 
								select * from (
			
 
						select m.*,n.BrowseNumber,n.PointNumber,n.CollectionNumber,n.CommentNumber from Org_Article m 
			
 
				LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where   m.isauthentication=1 and 1=1 @Condition
			
 
						union
			
 
						select m.* ,n.BrowseNumber,n.PointNumber,n.CollectionNumber,n.CommentNumber from Org_Article m 
			
 
				LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where   m.isauthentication=2 and  1=1 @Condition @Operatorid  
			
 
					) as aa  @PageParam
			
 
						
			
 
							]]>
			
 
						</Sql>
			
 
							 <Sql name='getDoctorArticleListCount'>
			
 
						 <![CDATA[
			
 
						select articleid from (
			
 
						select articleid from Org_Article where isauthentication=1  and 1=1  @Condition
			
 
						union
			
 
						select articleid from Org_Article where  isauthentication=2 and  1=1 @Condition @Operatorid  
			
 
						) as aa 
			
 
				
			
 
							]]>
			
 
						</Sql>
			
 
						
			
 
							 <Sql name='getDoctorArticalByUserId'>
			
 
						 <![CDATA[
			
 
				
			
 
						select m.*,n.BrowseNumber,n.PointNumber,n.CollectionNumber,n.CommentNumber from Org_Article m 
			
 
				LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where   1=1 @Condition
			
 
							]]>
			
 
						</Sql>
			
 
							 <Sql name='getDoctorArticalByUserIdCount'>
			
 
						 <![CDATA[
			
 
				
			
 
						select m.*,n.BrowseNumber,n.PointNumber,n.CollectionNumber,n.CommentNumber from Org_Article m 
			
 
				LEFT JOIN User_ArticleStatistics n on m.ArticleId=n.ArticleId where   1=1 @Condition 		 
			
 
						
			
 
							]]>
			
 
						</Sql>
			
 
					</Sqls>
			
 
				</das-client>
			
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/Behavior.sql.xml
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/Behavior.sql.xml
@ -0,0 +1,71 @@
 
				<?xml version="1.0" encoding="UTF-8"?>
			
 
				<das-client>
			
 
					<Sqls> 	
			
 
							 <Sql name='saveBehavior'>
			
 
						 <![CDATA[
			
 
						INSERT INTO User_Behavior (
			
 
											ArticleId,
			
 
											BehaviorAction,
			
 
											UserId,
			
 
											CName
			
 
											)
			
 
											VALUES(?,?,?,?);
			
 
							]]>
			
 
						</Sql>
			
 
				
			
 
							 <Sql name='saveArticleCollection'>
			
 
						 <![CDATA[
			
 
									
			
 
								INSERT INTO User_ArticleCollection (		
			
 
							ArticleId,
			
 
							UserType,			
			
 
							UserId,
			
 
							CName,
			
 
							OrgName,
			
 
							OrgId,
			
 
							ArticleCategoryId,
			
 
							ArticleCategoryName
			
 
						)
			
 
						SELECT  ?,?,?,?,?,?,?,?
			
 
				FROM dual   where not exists( select ArticleId from User_ArticleCollection where 1=1  @Condition ); 
			
 
					
			
 
							]]>
			
 
						</Sql>
			
 
					 <Sql name='deleteArticleCollection'>
			
 
						 <![CDATA[
			
 
						delete from  User_ArticleCollection	 where 1=1 @Condition
			
 
						
			
 
							]]>
			
 
							</Sql>
			
 
						<Sql name='getArticleCommentList'>
			
 
						 <![CDATA[
			
 
						select * from User_ArticleComment where 1=1  @Condition
			
 
							]]>
			
 
						
			
 
						</Sql>
			
 
						
			
 
							 <Sql name='deleteBehavior'>
			
 
						 <![CDATA[
			
 
						delete from  User_Behavior	 where 1=1 @Condition
			
 
						
			
 
							]]>
			
 
							</Sql>
			
 
							 <Sql name='saveArticleComment'>
			
 
						 <![CDATA[
			
 
								
			
 
								INSERT INTO User_ArticleComment (		
			
 
							CommentId,
			
 
							CommentContent,			
			
 
							ArticleId,
			
 
							UserId,
			
 
							CName,
			
 
							UserImg
			
 
						)VALUES(?,?,?,?,?,?)
			
 
						
			
 
						
			
 
						
			
 
							]]>
			
 
							</Sql>
			
 
						
			
 
					</Sqls>
			
 
				</das-client>
			
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/Category.sql.xml
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/Category.sql.xml
@ -0,0 +1,40 @@
 
				<?xml version="1.0" encoding="UTF-8"?>
			
 
				<das-client>
			
 
					<Sqls> 
			
 
						 <Sql name='getCategoryList'>
			
 
						 <![CDATA[
			
 
						select m.*, ISNULL (n.CategoryId)  as isSubscrive from Org_Category m left JOIN
			
 
				 User_Subscrive n on m.CategoryId=n.CategoryId and  1=1 @UserId where 1=1 and CategoryState!=2 @Condition
			
 
							]]>
			
 
							</Sql>
			
 
							
			
 
							 <Sql name='addCategory'>
			
 
						 <![CDATA[
			
 
								INSERT INTO Org_Category  
			
 
									(
			
 
									CategoryId,
			
 
									CategoryName,
			
 
									CategoryLevel,
			
 
									SecondLevelId,
			
 
									FirstLevelId,
			
 
									OrgName,
			
 
									OrgId,
			
 
									CategoryState,
			
 
									InsertTime,
			
 
									UpdateTime,
			
 
									OperatorName,
			
 
									OperatorId
			
 
									)
			
 
									VALUES(?,?,?,?,?,?,?,?,?,?,?,?)
			
 
							]]>
			
 
							</Sql>
			
 
							
			
 
							
			
 
							<Sql name='updateCategory'>
			
 
						 	<![CDATA[
			
 
								update  Org_Category  set @behaviorParam where 1=1 @Condition
			
 
							]]>
			
 
							</Sql>
			
 
							
			
 
					</Sqls>
			
 
				</das-client>
			
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/ConfigSys.sql.xml
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/ConfigSys.sql.xml
@ -0,0 +1,49 @@
 
				<?xml version="1.0" encoding="UTF-8"?>
			
 
				<das-client>
			
 
					<Sqls> 
			
 
						 <Sql name='getSignatur'>
			
 
						 <![CDATA[
			
 
					select * from Config_Signatur
			
 
								]]>
			
 
							</Sql>
			
 
								 <Sql name='getArticleORCode'>
			
 
						 <![CDATA[
			
 
					select * from Config_ArticleQRCode
			
 
								]]>
			
 
							</Sql>
			
 
								 <Sql name='getConfigSys'>
			
 
						 <![CDATA[
			
 
					select * from Config_Sys
			
 
								]]>
			
 
							</Sql>
			
 
							
			
 
							<!-- 获取菜单 -->
			
 
							<Sql name = 'getConfigMenu'>
			
 
								<![CDATA[
			
 
								select * from Config_Menu order by MenuId
			
 
								]]>
			
 
							</Sql>
			
 
							
			
 
							<!-- 获取角色菜单 -->
			
 
							<Sql name = 'getConfigMenuRole'>
			
 
								<![CDATA[
			
 
								select * from Config_MenuRole where 1=1 @condition order by Id
			
 
								]]>
			
 
							</Sql>
			
 
							
			
 
							<!-- 删除角色菜单 -->
			
 
							<Sql name = 'deleteConfigMenuRoleByRoleId'>
			
 
								<![CDATA[
			
 
								DELETE FROM Config_MenuRole where RoleId = ?
			
 
								]]>
			
 
							</Sql>
			
 
							
			
 
							<!-- 查询登陆人员角色菜单 -->
			
 
							<Sql name = 'getUserConfigMenuRole'>
			
 
								<![CDATA[
			
 
								SELECT m.*,r.RoleId,r.RoleName FROM Config_Menu m, Config_MenuRole r 
			
 
								where m.MenuId=r.MenuId @condition ORDER BY m.MenuId
			
 
								]]>
			
 
							</Sql>
			
 
					</Sqls>
			
 
				</das-client>
			
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/ConfigSystem.sql.xml
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/ConfigSystem.sql.xml
@ -0,0 +1,15 @@
 
				<?xml version="1.0" encoding="UTF-8"?>
			
 
				<das-client>
			
 
					<Sqls> 
			
 
						<Sql name='getConfigSys'>
			
 
						 <![CDATA[
			
 
								select * from  Config_Sys where 1=1
			
 
							]]>
			
 
							</Sql>
			
 
						<Sql name='updateConfigSys'>
			
 
						 <![CDATA[
			
 
								update  Config_Sys  set @behaviorParam where 1=1 @Condition
			
 
							]]>
			
 
							</Sql>
			
 
					</Sqls>
			
 
				</das-client>
			
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/Dictionary.sql.xml
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/Dictionary.sql.xml
@ -0,0 +1,36 @@
 
				<?xml version="1.0" encoding="UTF-8"?>
			
 
				<das-client>
			
 
					<Sqls>
			
 
				
			
 
						<Sql name='getDictionaryList'>
			
 
						 	<![CDATA[
			
 
								SELECT * from Config_Dictionary
			
 
							]]>
			
 
						</Sql>
			
 
				
			
 
						<Sql name='getDictionaryTypeName'>
			
 
						 	<![CDATA[
			
 
								SELECT TypeName FROM Config_Dictionary group by TypeName
			
 
							]]>
			
 
						</Sql>
			
 
				
			
 
						<Sql name='delDictionary'>
			
 
						 	<![CDATA[
			
 
								delete FROM Config_Dictionary where 1=1 @Condition
			
 
							]]>
			
 
						</Sql>
			
 
				
			
 
						<Sql name='updateDictionary'>
			
 
						 	<![CDATA[
			
 
								update  Config_Dictionary set @behaviorParam where 1=1  @Condition
			
 
							]]>
			
 
						</Sql>
			
 
						<Sql name='addDictionary'>
			
 
						 	<![CDATA[
			
 
								INSERT INTO Config_Dictionary (@behaviorParam) VALUES (@Condition)
			
 
							]]>
			
 
						</Sql>
			
 
				
			
 
				
			
 
					</Sqls>
			
 
				</das-client>
			
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/Signature.sql.xml
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/Signature.sql.xml
@ -0,0 +1,15 @@
 
				<?xml version="1.0" encoding="UTF-8"?>
			
 
				<das-client>
			
 
					<Sqls> 
			
 
						<Sql name='getSignature'>
			
 
						 <![CDATA[
			
 
								select * from  Config_Signatur where 1=1
			
 
							]]>
			
 
							</Sql>
			
 
						<Sql name='updateSignature'>
			
 
						 <![CDATA[
			
 
								update  Config_Signatur  set @behaviorParam where 1=1
			
 
							]]>
			
 
							</Sql>
			
 
					</Sqls>
			
 
				</das-client>
			
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/Subscrive.sql.xml
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/Subscrive.sql.xml
@ -0,0 +1,29 @@
 
				<?xml version="1.0" encoding="UTF-8"?>
			
 
				<das-client>
			
 
					<Sqls> 
			
 
						 <Sql name='getSubscriveList'>
			
 
						 <![CDATA[
			
 
						select * from User_Subscrive where 1=1 @Condition
			
 
						
			
 
							]]>
			
 
						</Sql>
			
 
							 <Sql name='saveSubscrive'>
			
 
						 <![CDATA[
			
 
						INSERT INTO User_Subscrive (
			
 
											CategoryId,
			
 
											CategoryName,
			
 
											UserId,
			
 
											CName
			
 
											)
			
 
											VALUES(?,?,?,?);
			
 
							]]>
			
 
						</Sql>
			
 
							 <Sql name='deleteSubscrive'>
			
 
						 <![CDATA[
			
 
						delete from  User_Subscrive	 where 1=1 @Condition
			
 
						
			
 
							]]>
			
 
						</Sql>
			
 
						
			
 
					</Sqls>
			
 
				</das-client>
			
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/User.sql.xml
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/User.sql.xml
@ -0,0 +1,11 @@
 
				<?xml version="1.0" encoding="UTF-8"?>
			
 
				<das-client>
			
 
					<Sqls> 
			
 
						 <Sql name='getUserList'>
			
 
						 <![CDATA[
			
 
						select * from user
			
 
							]]>
			
 
						</Sql>
			
 
						
			
 
					</Sqls>
			
 
				</das-client>
			
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/articlePc.sql.xml
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/articlePc.sql.xml
@ -0,0 +1,33 @@
 
				<?xml version="1.0" encoding="UTF-8"?>
			
 
				<das-client>
			
 
					<Sqls> 
			
 
						 <Sql name='getArticlePcList'>
			
 
						 <![CDATA[
			
 
								select * from Org_Article where 1=1  and  ArticleState =1  @Condition    order by ArticleOrder desc  ,UpdateTime desc   
			
 
							]]>
			
 
						</Sql>
			
 
						
			
 
						<Sql name='queryCategory'>
			
 
						 <![CDATA[
			
 
								select categoryId,categoryName,categoryLevel,FirstLevelId,SecondLevelId from Org_Category where 1=1  and  CategoryState =1  @Condition      
			
 
							]]>
			
 
						</Sql>
			
 
						
			
 
						 <Sql name='getArticlePc'>
			
 
						 <![CDATA[
			
 
								select * from Org_Article where 1=1  and  ArticleState =1  and ArticleOrder = 99
			
 
							]]>
			
 
						</Sql>
			
 
						
			
 
						<Sql name='querySwitchState'>
			
 
						 <![CDATA[
			
 
				 				select SwitchState from Config_Sys where SwitchType=1
			
 
							]]>
			
 
						</Sql>
			
 
						<Sql name='getArticlePcId'>
			
 
						 <![CDATA[
			
 
								select * from Org_Article where 1=1  and  ArticleState =1  @Condition     
			
 
							]]>
			
 
						</Sql>
			
 
					</Sqls>
			
 
				</das-client>
			
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/ActionEnter.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/ActionEnter.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/ConfigManager.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/ConfigManager.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/Encoder.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/Encoder.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/PathFormat.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/PathFormat.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/UeditorFilter.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/UeditorFilter.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/define/ActionMap$1.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/define/ActionMap$1.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/define/ActionMap.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/define/ActionMap.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/define/ActionState.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/define/ActionState.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/define/AppInfo$1.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/define/AppInfo$1.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/define/AppInfo.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/define/AppInfo.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/define/BaseState.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/define/BaseState.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/define/FileType$1.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/define/FileType$1.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/define/FileType.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/define/FileType.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/define/MIMEType$1.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/define/MIMEType$1.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/define/MIMEType.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/define/MIMEType.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/define/MultiState.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/define/MultiState.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/define/State.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/define/State.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/hunter/FileManager.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/hunter/FileManager.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/hunter/ImageHunter.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/hunter/ImageHunter.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/upload/Base64Uploader.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/upload/Base64Uploader.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/upload/BinaryUploader.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/upload/BinaryUploader.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/upload/StorageManager.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/upload/StorageManager.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/upload/Uploader.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/baidu/ueditor/upload/Uploader.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/ArticleAction.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/ArticleAction.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/ArticlePcAction.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/ArticlePcAction.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/ArticlePcDoctorAction.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/ArticlePcDoctorAction.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/ArticleQRCodeAction.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/ArticleQRCodeAction.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/CategoryAction.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/CategoryAction.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/ConfigDictionaryAction.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/ConfigDictionaryAction.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/ConfigSystemAction.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/ConfigSystemAction.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/DictionaryAction.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/DictionaryAction.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/DoctorAction.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/DoctorAction.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/FileAction.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/FileAction.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/MenuAction.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/MenuAction.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/SignatureAction.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/SignatureAction.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/UploadAction.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/UploadAction.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/UserAction.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/action/UserAction.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/api/ArticleApi.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/api/ArticleApi.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/api/ArticleApiTest.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/api/ArticleApiTest.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/api/BehaviorApi.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/api/BehaviorApi.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/api/CategoryApi.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/api/CategoryApi.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/api/ConfigSysApi.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/api/ConfigSysApi.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/api/ConfigSysApiTest.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/api/ConfigSysApiTest.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/api/SubscriveApi.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/api/SubscriveApi.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/api/SubscriveApiTest.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/api/SubscriveApiTest.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/dao/ArticleDao.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/dao/ArticleDao.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/dao/ArticlePcDao.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/dao/ArticlePcDao.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/dao/ArticlePcDoctorDao.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/dao/ArticlePcDoctorDao.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/dao/ArticleQRCodeDao.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/dao/ArticleQRCodeDao.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/dao/BehaviorDao.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/dao/BehaviorDao.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/dao/CategoryDao.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/dao/CategoryDao.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/dao/ConfigSysDao.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/dao/ConfigSysDao.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/dao/ConfigSystemDao.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/dao/ConfigSystemDao.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/dao/DictionaryDao.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/dao/DictionaryDao.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/dao/MenuDao.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/dao/MenuDao.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/dao/OperatorLogDao.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/dao/OperatorLogDao.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/dao/SignatureDao.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/dao/SignatureDao.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/dao/SubscriveDao.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/dao/SubscriveDao.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/enums/ArticleSqlNameEnum.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/enums/ArticleSqlNameEnum.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/enums/BehaviorSqlNameEnum.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/enums/BehaviorSqlNameEnum.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/enums/CategorySqlNameEnum.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/enums/CategorySqlNameEnum.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/enums/ConfigSysSqlNameEnum.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/enums/ConfigSysSqlNameEnum.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/enums/ConfigSystemSqlNameEnum.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/enums/ConfigSystemSqlNameEnum.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/enums/DictionarySqlNameEnum.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/enums/DictionarySqlNameEnum.class
--- a/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/enums/MyDatabaseEnum.class
+++ b/edu-article/JkEdu/WebRoot/WEB-INF/classes/com/yihu/jk/enums/MyDatabaseEnum.class