git-svn-id: https://192.168.57.71/svn/jsgkj@723 931142cf-59ea-a443-aa0e-51397b428577

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/layouts/header.jsp

@@ -14,17 +14,22 @@
 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0" />
 
 <link rel="shortcut icon" href="<%=request.getContextPath()%>/static/images/system.ico" />
-<link rel="stylesheet" type="text/css" href="<%=request.getContextPath()%>/static/colResizable/css/main.css" />  
 
 
 <link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/css/bootstrap.css" />
 <link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/css/ace-fonts.css" />
+<link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/css/datepicker.css" />
+<link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/css/bootstrap-timepicker.css">
+<link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/css/daterangepicker.css">
+<link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/css/bootstrap-datetimepicker.css">
+<link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/css/bootstrap-datetimepicker.min.css">
 <link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/css/font-awesome.css" />
 <link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/css/ace.onpage-help.css" />
 <link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/css/jquery-ui.css" />
 <link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/css/ui.jqgrid.css" />
+<link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/css/bootstrap-multiselect.css" />
 <link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/css/ace.css" class="ace-main-stylesheet" id="main-ace-style" />
-
+<link rel="stylesheet" href="<%=request.getContextPath()%>/ace/assets/js/themes/sunburst.css" />
 
 <link rel="stylesheet" href="<%=request.getContextPath()%>/static/css/common/main.css" />
 

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/layouts/scripts.jsp

@@ -9,14 +9,60 @@
 </script>
 <script type="text/javascript" src="<%=request.getContextPath()%>/static/js/jquery-1.11.3.js"></script>
 
-<script  src="<%=request.getContextPath()%>/static/colResizable/js/colResizable-1.5.min.js"></script>
-
 <script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/layer/layer.js"></script>
 
 
+<script src="<%=request.getContextPath()%>/ace/assets/js/ace/elements.onpage-help.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/ace/ace.onpage-help.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/ace-extra.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/bootstrap.js"></script>
 
+<script src="<%=request.getContextPath()%>/ace/assets/js/jquery-ui.custom.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/jquery.ui.touch-punch.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/jquery.easypiechart.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/jquery.sparkline.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/flot/jquery.flot.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/flot/jquery.flot.pie.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/flot/jquery.flot.resize.js"></script>
 <script src="<%=request.getContextPath()%>/ace/assets/js/jqGrid/jquery.jqGrid.src.js"></script>
 <script src="<%=request.getContextPath()%>/ace/assets/js/jqGrid/i18n/grid.locale-cn.js"></script>
 
+<script src="<%=request.getContextPath()%>/ace/assets/js/ace/elements.scroller.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/ace/elements.colorpicker.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/ace/elements.fileinput.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/ace/elements.typeahead.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/ace/elements.wysiwyg.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/ace/elements.spinner.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/ace/elements.treeview.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/ace/elements.wizard.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/ace/elements.aside.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/ace/ace.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/ace/ace.ajax-content.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/ace/ace.touch-drag.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/ace/ace.sidebar.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/ace/ace.sidebar-scroll-1.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/ace/ace.submenu-hover.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/ace/ace.widget-box.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/ace/ace.settings.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/ace/ace.settings-rtl.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/ace/ace.settings-skin.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/ace/ace.widget-on-reload.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/bootstrap-multiselect.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/ace/ace.searchbox-autocomplete.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/date-time/bootstrap-datepicker.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/date-time/bootstrap-timepicker.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/date-time/moment.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/date-time/daterangepicker.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/date-time/bootstrap-datetimepicker.js" charset="UTF-8"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/date-time/bootstrap-datetimepicker.zh-CN.js" charset="UTF-8"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/jqBootstrapValidation.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/jquery.bootstrap.teninedialog.v3.js"></script>
+
+<script src="<%=request.getContextPath()%>/ace/assets/js/rainbow.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/language/generic.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/language/html.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/language/css.js"></script>
+<script src="<%=request.getContextPath()%>/ace/assets/js/language/javascript.js"></script>
+
 
 <script type="text/javascript" src="<%=request.getContextPath()%>/static/js/common/common.js"></script>

gkaqv2/trunk/modules/web/src/main/webapp/WEB-INF/view/user/index.jsp

@@ -8,7 +8,6 @@
 <script src="<%=base%>/static/js/user/index.js"></script>
 </head>
 <body class="p_body">
-<form action="" method="post" id="form">
 	<div class="p_all">
 	<div class="p_block">
 		<div class="p_headdiv">
@@ -50,7 +49,7 @@
 						<input type="text" id="username2" name="username2" 
 							class="p_txt" value=""></td>
 					<td class="tdname">
-						<img src="<%=base%>/static/images/list/btn_query.png" title="查询"/>
+						<img class="p_searchbtn" src="<%=base%>/static/images/list/btn_query.png" title="查询"/>
 					</td>
 				</tr>
 			</table>
@@ -62,6 +61,91 @@
 		</div>
 	</div>
 	</div>
-</form>
+	
+	<!--弹出新增界面-->
+	<div id="modal-table" class="modal fade" tabindex="-1">
+			<div class="modal-dialog" style="width: 700px; height: 500px;">
+				<div class="modal-content">
+					<div class="modal-header no-padding">
+						<div class="table-header">
+							<button type="button" class="close" data-dismiss="modal"
+								aria-hidden="true">
+								<span class="white">&times;</span>
+							</button>
+							<label class="modal-title" id="myModalLabel"></label>
+						</div>
+					</div>
+					<div class="modal-body no-padding">
+						<form class="form-horizontal" id="form" method="post"
+							onsubmit="return false;">
+							<input type="hidden" id="id" name="id">
+							<div class="form-group">
+								<label for="name" class="col-sm-2 control-label">任务名称</label>
+								<div class="col-sm-3">
+									<div id="nameError"></div>
+									<input type="text" class="form-control limited {required:true}"
+										id="name" name="name" maxlength="100">
+								</div>
+								<div class="col-sm-1">
+									<span id="nameImageTip" class="sp_yes"
+										style="display: none"></span>
+								</div>
+								<label for="code" class="col-sm-2 control-label">任务编码</label>
+								<div class="col-sm-3">
+									<div id="codeError"></div>
+									<input type="text" class="form-control limited {required:true}"
+										id="code" name="code" maxlength="100"
+										placeholder="">
+								</div>
+								<div class="col-sm-1">
+									<span id="codeImageTip" class="sp_yes"
+										style="display: none"></span>
+								</div>
+							</div>
+							<div class="form-group">
+								<label for="jobCode" class="col-sm-2 control-label">所在工作</label>
+								<div class="col-sm-3">
+                                    <select class="form-control" id="jobCode" name="jobCode">
+                                    </select>
+								</div>
+								<div class="col-sm-1"></div>
+								<label for="type" class="col-sm-2 control-label">任务类型</label>
+								<div class="col-sm-3">
+                                    <select class="form-control" id="type" name="type">
+	                                    <option selected value='1'>sql同步任务</option>
+                                    </select>
+								</div>
+							</div>
+							<div class="form-group">
+								<label for="cacheUse" class="col-sm-2 control-label">是否存在缓存</label>
+								<div class="col-sm-3">
+                                    <select class="form-control" id="cacheUse" name="cacheUse">
+	                                    <option selected value='1'>是</option>
+	                                    <option selected value='0'>否</option>
+                                    </select>
+								</div>
+							</div>
+							<div class="form-group">
+								<label for="cacheFolder" class="col-sm-2 control-label">缓存目录</label>
+								<div class="col-sm-9">
+									<input type="text" class="form-control limited" id="cacheFolder"
+										name="cacheFolder" maxlength="200" placeholder="">
+								</div>
+							</div>
+					
+					<div class="modal-footer no-margin-top center modal-foot-border">
+						<button id="btnSave" class="btn btn-success btn-round btn-sm">
+							<i class="ace-icon fa fa-save"></i> 保存
+						</button>
+						<button type="button" class="btn btn-grey btn-round btn-sm"
+							onclick="closeWin()">
+							<i class="ace-icon fa fa-remove"></i> 关闭
+						</button>
+					</div>
+					</form>
+				</div>
+			</div>
+		</div>
+	</div>
 </body>
 </html>

gkaqv2/trunk/modules/web/src/main/webapp/static/css/common/main.css

@@ -124,7 +124,7 @@
 
 .p_txt {
 	width:200px;
-	height:20px;
+	height:26px;
 }
 
 

gkaqv2/trunk/modules/web/src/main/webapp/static/js/common/common.js

@@ -129,20 +129,20 @@ function enableTooltips(table) {
 
 /**
  * jqGrid默认属性
- *//*
+ */
 jQuery.extend(jQuery.jgrid.defaults,{
 	sortable:true, // 列是否可拖拽
 	viewrecords : true, //是否在导航分页栏显示记录总数
 	emptyrecords: "无数据显示" // 无数据提示信息
 });
 
-*//**
+/**
  * 替换jqGrid的操作图标
- *//*
+ */
 $.jgrid.defaults.gridComplete = function () {
     updatePagerIcons(this);
     //$(this).closest(".ui-jqgrid-bdiv").css("overflow-x", "hidden");
-};*/
+};
 
 /**
  * 灰化DIV层控件

gkaqv2/trunk/modules/web/src/main/webapp/static/js/user/index.js

@@ -37,28 +37,29 @@ function initGrid() {
 			name : 'realName',
 			index : 'realName',
 			editable : false,
-			sortable : true
+			sortable : false
 		},{
 			name : 'loginName',
 			index : 'loginName',
 			editable : false,
-			sortable : true
+			sortable : false
 		},{
 			name : 'realName',
 			index : 'realName',
 			editable : false,
-			sortable : true
+			sortable : false
 		},{
 			name : 'loginName',
 			index : 'loginName',
 			editable : false,
-			sortable : true
+			sortable : false
 		} ],
 		rowNum : _rowNum, //每页显示记录数
 		rowList : _rowList, //用于改变显示行数的下拉列表框的元素数组。
 		pager : pager_selector, //定义翻页用的导航栏
 		page : 1, //设置初始的页码,初始为1
-		pagerpos : 'left', //指定分页栏的位置
+		rownumbers : true,
+		pagerpos : 'center', //指定分页栏的位置
 		altRows : true, //设置为交替行表格,默认为false
 		multiselect : false, //可以多选
 		multiboxonly : false, //只有选择checkbox才会起作用 
@@ -96,4 +97,49 @@ function initGrid() {
 	});
 	// 调整jqgrid
 	ajustJqGrid(grid_selector, pager_selector);
+};
+
+/**
+ * 增加信息
+ */
+function addInfo() {
+	comClearFormData("form");
+	// 隐藏校验图标
+	hideValidateTip();
+	$("#id").val("");
+	$("#btnSave").show();
+	// 启用元素
+	comEnableElements("modal-table");
+	$("#cacheUse").val("0");
+	$("#modal-table #myModalLabel").text("新增任务");
+	$('#modal-table').modal('show');
+};
+/**
+ * 删除信息
+ */
+function delInfo() {
+	var idsStr = getMultiData();
+	if(idsStr.length >=1 ){
+		showMsgConfimDialog("确定删除吗?",function(){
+			$.ajax({
+				async : false,
+				type : 'POST',
+				dataType : "json",
+				data : {"ids":idsStr, opt:'QY'},
+				url : basePath + '/task/delTask',//请求的路径				
+				success : function(data) {
+					// 成功后刷新页面
+					if (data == "SUCCESS") {
+						showMsgDialog("数据已删除！");
+					}
+					jQuery(grid_selector).trigger("reloadGrid");
+				},
+				error: function (XMLHttpRequest, textStatus, errorThrown) {
+		            showMsgDialog("error:" + errorThrown);
+		        }
+			});
+		});
+	} else {
+		showMsgDialog("请至少选择一条记录");
+	}
 };