更新

WebContent/gaowj/header-simple-1.0.jsp

@@ -37,7 +37,7 @@
 <script type="text/javascript" src="<%=localPath %>/jwapp/common/js/common_util.js"></script>
 <script type="text/javascript" src="<%=commonPath %>/ria/jquery/zTree_v3/js/jquery.ztree.core-3.5.js"></script>
 <script type="text/javascript" src="<%=commonPath %>/ria/jquery/zTree_v3/js/jquery.ztree.excheck-3.5.js"></script>
-
+<script type="text/javascript" src="<%=localPath %>/jwapp/common/js/util_lyz_01.js"></script>
 <link rel="stylesheet" type="text/css" href="<%=commonPath%>/ria/jquery/jquery-easyui-1.4.1/themes/default/easyui.css" charset="utf-8"></link>
 <link rel="stylesheet" type="text/css" href="<%=commonPath%>/ria/jquery/jquery-easyui-1.4.1/themes/icon.css" charset="utf-8"></link>
 <link rel="stylesheet" type="text/css" href="<%=commonPath%>/ria/jquery/zTree_v3/css/zTreeStyle/zTreeStyle.css" charset="utf-8"></link>

WebContent/gaowj/ria/jquery/jquery-easyui-1.4.1/themes/icon.css

@@ -313,3 +313,13 @@
 .icon-ext-47_06{
 	background:url('../../../../images/icons/(47,06).png') no-repeat left center;
 }
+/**-----------------------------------------------------------------------------**/
+.icon-email{
+	background:url('../../../../images/icons/(00,44).png') no-repeat left center;
+}
+.icon-message{
+	background:url('../../../../images/icons/(01,44).png') no-repeat left center;
+}
+.icon-dingding{
+	background:url('../../../../images/icons/(02,22).png') no-repeat left center;
+}
\ No newline at end of file

WebContent/jwapp/common/js/util_lyz_01.js

+//判断字符是否为空的方法
+function isEmpty(obj){
+  if(typeof obj == "undefined" || obj == null || obj == ""){
+      return true;
+  }else{
+      return false;
+  }
+}
\ No newline at end of file

WebContent/jwapp/pages/system/js/cacheTab.js

@@ -81,7 +81,7 @@ function rowstyler(index,row){
 	return 'height:30px;';
 }
 //展示列表
-datagrid("list",ls_title,gaowj.WEB_APP_NAME + "/systemdata_listSysCache",queryData,is_column,70,80);
+datagrid("list",ls_title,gaowj.WEB_APP_NAME + "/systemdata_listSysCache",queryData,is_column,80,80);
 /****/
 
 /**

WebContent/jwapp/pages/system/js/log4jTab.js

@@ -77,7 +77,7 @@ function rowstyler(index,row){
 	return 'height:30px;';
 }
 //展示列表
-datagrid("list",ls_title,gaowj.WEB_APP_NAME + "/systemdata_listSysLog4jInfo",queryData,is_column,70,80);
+datagrid("list",ls_title,gaowj.WEB_APP_NAME + "/systemdata_listSysLog4jInfo",queryData,is_column,80,80);
 /****/
 
 /**

WebContent/jwapp/pages/system/js/onlineUserTab.js

@@ -69,7 +69,7 @@ function rowstyler(index,row){
 	return 'height:30px;';
 }
 //展示列表
-datagrid("list",ls_title,gaowj.WEB_APP_NAME + "/systemdata_listOnlineUser",queryData,is_column,70,80);
+datagrid("list",ls_title,gaowj.WEB_APP_NAME + "/systemdata_listOnlineUser",queryData,is_column,80,80);
 /****/
 
 /**

WebContent/jwapp/pages/system/js/userTab.js

@@ -93,7 +93,7 @@ function rowstyler(index,row){
 	return 'height:30px;';
 }
 //展示列表
-datagrid("list",ls_title,gaowj.WEB_APP_NAME + "/systemdata_listSysUser",queryData,is_column,70,80);
+datagrid("list",ls_title,gaowj.WEB_APP_NAME + "/systemdata_listSysUser",queryData,is_column,75,80);
 /****/
 
 /**

WebContent/monitoring/pages/host/hostTabDetail.jsp

@@ -8,7 +8,15 @@
 				<span>服务器名:</span>
 			</td>
 			<td style="width: 85%">
-				<input class="easyui-textbox" id="NAME" name="NAME" style="width:500px" />
+				<input class="easyui-textbox" id="NAME" name="NAME" style="width:500px;height:30px;" />
+			</td>
+		</tr>
+		<tr>
+			<td style="width: 15%;" class="tableStyleLable">
+				<span>主机描述:</span>
+			</td>
+			<td style="width: 85%">
+				<input class="easyui-textbox" id="DESCRIPTION" name="DESCRIPTION" style="width:500px;height:30px;" />
 			</td>
 		</tr>
 		<tr>
@@ -16,7 +24,7 @@
 				<span>服务器标识:</span>
 			</td>
 			<td style="width: 85%">
-				<input class="easyui-textbox" id="SYSTEM_UNAME" name="SYSTEM_UNAME" style="width:500px" />
+				<input class="easyui-textbox" id="SYSTEM_UNAME" name="SYSTEM_UNAME" style="width:500px;height:30px;" />
 			</td>
 		</tr>
 		<tr>
@@ -24,7 +32,7 @@
 				<span>系统位数:</span>
 			</td>
 			<td style="width: 85%">
-				<input class="easyui-textbox" id="SYSTEM_BIT" name="SYSTEM_BIT" style="width:500px" />
+				<input class="easyui-textbox" id="SYSTEM_BIT" name="SYSTEM_BIT" style="width:500px;height:30px;" />
 			</td>
 		</tr>
 		<tr>
@@ -32,7 +40,7 @@
 				<span>内核版本:</span>
 			</td>
 			<td style="width: 85%">
-				<input class="easyui-textbox" id="SYSTEM_KERNEL" name="SYSTEM_KERNEL" style="width:500px" />
+				<input class="easyui-textbox" id="SYSTEM_KERNEL" name="SYSTEM_KERNEL" style="width:500px;height:30px;" />
 			</td>
 		</tr>
 		<tr>
@@ -40,7 +48,7 @@
 				<span>已运行时间:</span>
 			</td>
 			<td style="width: 85%">
-				<input class="easyui-textbox" id="SYSTEM_KERNEL" name="SYSTEM_UPTIME" style="width:500px" />
+				<input class="easyui-textbox" id="SYSTEM_KERNEL" name="SYSTEM_UPTIME" style="width:500px;height:30px;" />
 			</td>
 		</tr>
 		<tr>
@@ -48,7 +56,7 @@
 				<span>CPU型号:</span>
 			</td>
 			<td style="width: 85%">
-				<input class="easyui-textbox" id="CPU_INFO" name="CPU_INFO" style="width:500px" />
+				<input class="easyui-textbox" id="CPU_INFO" name="CPU_INFO" style="width:500px;height:30px;" />
 			</td>
 		</tr>
 		<tr>
@@ -56,7 +64,7 @@
 				<span>CPU核数:</span>
 			</td>
 			<td style="width: 85%">
-				<input class="easyui-textbox" id="CPU_CORES" name="CPU_CORES" style="width:500px" />
+				<input class="easyui-textbox" id="CPU_CORES" name="CPU_CORES" style="width:500px;height:30px;" />
 			</td>
 		</tr>
 		<tr>
@@ -64,7 +72,7 @@
 				<span>内存容量:</span>
 			</td>
 			<td style="width: 85%">
-				<input class="easyui-textbox" id="MEMORY_SIZE" name="MEMORY_SIZE" style="width:500px" />
+				<input class="easyui-textbox" id="MEMORY_SIZE" name="MEMORY_SIZE" style="width:500px;height:30px;" />
 			</td>
 		</tr>
 		<tr>
@@ -72,7 +80,7 @@
 				<span>硬盘容量:</span>
 			</td>
 			<td style="width: 85%">
-				<input class="easyui-textbox" id="DISK_INFO" name="DISK_INFO" style="width:500px" />
+				<input class="easyui-textbox" id="DISK_INFO" name="DISK_INFO" style="width:500px;height:30px;" />
 			</td>
 		</tr>
 		<tr>
@@ -80,7 +88,7 @@
 				<span>网卡信息:</span>
 			</td>
 			<td style="width: 85%">
-				<input class="easyui-textbox" id="IP_INFO" name="IP_INFO" style="width:500px" />
+				<input class="easyui-textbox" id="IP_INFO" name="IP_INFO" style="width:500px;height:30px;" />
 			</td>
 		</tr>
 	</table>

WebContent/monitoring/pages/host/hostTabMonitorRow.jsp

 <%@page contentType="text/html; charset=UTF-8"%>
-<form id="inputForm" method="post" style="width: 100%;">
+<form id="inputForm" method="post" style="width: 100%;margin-top:5px;margin-left:5px;">
 	<input id="FIELD_HOSTID" name="FIELD_HOSTID" type="hidden" />
 	监控项: <input id="FIELD_ITEM" name="FIELD_ITEM"  type="text" style="width: 200px" />
 	时间段: <input id="FIELD_STARTTIME" name="FIELD_STARTTIME"  type="text" style="width: 200px" value="${startTime}"/>至

WebContent/monitoring/pages/host/js/hostTab.js

@@ -61,7 +61,9 @@ var ls_title="服务器列表";
 var is_column = [ [
 				{field : 'NAME',title : '主机名',width : 100,align : 'center'
 				},
-				{field : 'IP',title : 'IP地址',width : 250,align : 'center',formatter:function(value,row,index){
+				{field : 'DESCRIPTION',title : '主机描述',width : 200,align : 'center'
+				},
+				{field : 'IP',title : 'MAC/IP',width : 280,align : 'center',formatter:function(value,row,index){
 						var json=eval('('+row.VALUE+')');
 						var ips=json.ip;
 						var ipText='';
@@ -77,7 +79,7 @@ var is_column = [ [
 						return ipText;
 					}
 				},
-				{field : 'DISK',title : '硬盘',width : 100,align : 'center',formatter:function(value,row,index){
+				{field : 'DISK',title : '硬盘',width : 80,align : 'center',formatter:function(value,row,index){
 						var json=eval('('+row.VALUE+')');
 						var disks=json.disk;
 						var text='';
@@ -93,7 +95,7 @@ var is_column = [ [
 						return text;
 					}
 				},
-				{field : 'CPU',title : 'CPU',width : 450,align : 'center',formatter:function(value,row,index){
+				{field : 'CPU',title : 'CPU',width : 350,align : 'center',formatter:function(value,row,index){
 						var json=eval('('+row.VALUE+')');
 						var cpu=json.cup;
 						var text='';
@@ -115,15 +117,10 @@ function dataOnLoadSuccess(){
 }
 //设置颜色和每行高度
 function rowstyler(index,row){
-	if(row.STATUS == '1'){
-		return 'color:green;height:30px;';
-	}
-	else{
-		return 'color:blue;height:30px;';
-	}
+	return 'color:black;height:30px;';
 }
 //展示列表
-datagrid("list",ls_title,gaowj.WEB_APP_NAME + "/hostData_list",queryData,is_column,70,80);
+datagrid("list", ls_title, gaowj.WEB_APP_NAME + "/hostData_list", queryData, is_column, 60, 80);
 
 /****/
 
@@ -149,7 +146,7 @@ function formatMenu(value, data,index) {
 function getOptionMenu(data,index){
 	//上浮菜单具体按钮
 	var optionMenu=new Array();
-	optionMenu[0]=makeBtnOneParama('详情','icon-edit',"editRow",index);
+	optionMenu[0]=makeBtnOneParama('详情','icon-preview',"editRow",index);
 	optionMenu[1]=makeBtnOneParama('监控','icon-ext-19_13',"monitorRow",index);
 	
 	var splitStr='  |  ';

WebContent/monitoring/pages/trigger/js/triggerTab.js

@@ -11,20 +11,20 @@
 var ls_width = $(window).width();
 var ls_height = $(window).height();
 
-var local_page=1;
-var rows=20;
-var listPageSize = [10,20,50,100,500,1000];
-var queryData = eval("({'page':'"+local_page+"','rows':'"+rows+"'})");
+var local_page = 1;
+var rows = 20;
+var listPageSize = [ 10, 20, 50, 100, 500, 1000 ];
+var queryData = eval("({'page':'" + local_page + "','rows':'" + rows + "'})");
 var tab_n = 0;
 
 //重置分页参数
-function resetQueryData(){
+function resetQueryData() {
 	queryData = "";
-	queryData = eval("({'page':'"+local_page+"','rows':'"+rows+"'})");
+	queryData = eval("({'page':'" + local_page + "','rows':'" + rows + "'})");
 }
 
 //定义附件关联模块ID(1:一般业务,2:测试信息,3:审批业务,999:其它数据 )
-var ls_module_id='2';
+var ls_module_id = '2';
 //定义当前模块业务类型(YBYW:一般业务,SPGL:审批业务) 
 var ls_ywlx = 'YBYW';
 /****/
@@ -40,9 +40,33 @@ var ls_ywlx = 'YBYW';
  * 备注：需更改
  **/
 //加载警告级别数据
-var v_priority_data = [{CODE_ID:'0',CODE_NAME:'未分类'},{CODE_ID:'1',CODE_NAME:'信息'},{CODE_ID:'2',CODE_NAME:'警告'},{CODE_ID:'3',CODE_NAME:'一般严重'},{CODE_ID:'4',CODE_NAME:'严重'},{CODE_ID:'5',CODE_NAME:'灾难'}];
+var v_priority_data = [ {
+	CODE_ID : '0',
+	CODE_NAME : '未分类'
+}, {
+	CODE_ID : '1',
+	CODE_NAME : '信息'
+}, {
+	CODE_ID : '2',
+	CODE_NAME : '警告'
+}, {
+	CODE_ID : '3',
+	CODE_NAME : '一般严重'
+}, {
+	CODE_ID : '4',
+	CODE_NAME : '严重'
+}, {
+	CODE_ID : '5',
+	CODE_NAME : '灾难'
+} ];
 //加载状态
-var v_status_data = [{CODE_ID:'0',CODE_NAME:'已启用'},{CODE_ID:'1',CODE_NAME:'停用的'}];
+var v_status_data = [ {
+	CODE_ID : '0',
+	CODE_NAME : '已启用'
+}, {
+	CODE_ID : '1',
+	CODE_NAME : '停用的'
+} ];
 //加载主机列表
 var v_host_data = hostModule.data.listAll().rowSet;
 $('#FIELD_HOSTID').val(v_host_data[0].HOSTID);
@@ -50,10 +74,173 @@ $('#FIELD_HOSTID').combobox({
 	data : v_host_data,
 	valueField : 'HOSTID',
 	textField : 'NAME',
-	editable:false,  
-	panelHeight:'auto'
+	editable : false,
+	panelHeight : 'auto'
 });
-
+//加载表达式key值
+var v_expression_key_data = [
+	{
+		CODE_KEY : 'system.cpu.util[all,idle,avg1]',
+		CODE_NAME : 'CPU使用率',
+		expression : function() {
+			return this.CODE_KEY;
+		},
+		conversion : function(value) {
+			return "";
+		}
+	},
+	{
+		CODE_KEY : 'disk.status[sda,wKBps]',
+		CODE_NAME : 'sda挂载盘写入',
+		expression : function() {
+			return this.CODE_KEY;
+		},
+		conversion : function(value) {
+			return "";
+		}
+	},
+	{
+		CODE_KEY : 'disk.status[sda,rKBps]',
+		CODE_NAME : 'sda挂载盘读取',
+		expression : function() {
+			return this.CODE_KEY;
+		},
+		conversion : function(value) {
+			return "";
+		}
+	},
+	{
+		CODE_KEY : 'net.if.out',
+		CODE_NAME : '网卡流出量',
+		expression : function(value) {
+			return this.CODE_KEY + '[' + value + ']';
+		},
+		conversion : function(value) {
+			return value.substring(value.indexOf("[") + 1, value.indexOf("]"));
+		}
+	},
+	{
+		CODE_KEY : 'net.if.in',
+		CODE_NAME : '网卡流入量',
+		expression : function(value) {
+			return this.CODE_KEY + '[' + value + ']';
+		},
+		conversion : function(value) {
+			return value.substring(value.indexOf("[") + 1, value.indexOf("]"));
+		}
+	},
+	{
+		CODE_KEY : 'vfs.fs.size',
+		CODE_NAME : '磁盘使用空间',
+		expression : function(value) {
+			return this.CODE_KEY + '[' + value + ',free]';
+		},
+		conversion : function(value) {
+			return value.substring(value.indexOf("[") + 1, value.indexOf(","));
+		}
+	} ];
+//加载表达式方法值
+var v_expression_method_data = [ {
+	CODE_ID : 'last',
+	CODE_NAME : '最新的值',
+	PERIOD : false,
+	expression : function(last, time) {
+		if (time == "")
+			return this.CODE_ID + '()';
+		else
+			return this.CODE_ID + '(,' + time + ')';
+	},
+	conversion : function(value) {
+		var time,
+			last;
+		value = value.substring(value.indexOf("(") + 1, value.indexOf(")"));
+		if (value != "")
+			time = value.substring(1)
+		else
+			time = "";
+		var info = {
+			"last" : last,
+			"time" : time
+		};
+		return info;
+	}
+}, {
+	CODE_ID : 'prev',
+	CODE_NAME : '前一个值',
+	PERIOD : false,
+	expression : function(last, time) {
+		if (time == "")
+			return this.CODE_ID + '()';
+		else
+			return this.CODE_ID + '(,' + time + ')';
+	},
+	conversion : function(value) {
+		var time,
+			last;
+		value = value.substring(value.indexOf("(") + 1, value.indexOf(")"))
+		if (value != "")
+			time = value.substring(1)
+		else
+			time = "";
+		var info = {
+			"last" : last,
+			"time" : time
+		};
+		return info;
+	}
+}, {
+	CODE_ID : 'avg',
+	CODE_NAME : '平均值',
+	PERIOD : true,
+	expression : function(last, time) {
+		if (time == "")
+			return this.CODE_ID + '(' + last + ')';
+		else
+			return this.CODE_ID + '(' + last + ',' + time + ')';
+	},
+	conversion : function(value) {
+		value = value.substring(value.indexOf("(") + 1, value.indexOf(")"));
+		var last,
+			time;
+		if (value.indexOf(",") != -1) {
+			last = value.substring(value.indexOf("(") + 1, value.indexOf(","));
+			time = value.substring(value.indexOf(",") + 1);
+		} else {
+			time = "";
+			last = value;
+		}
+		var info = {
+			"last" : last,
+			"time" : time
+		};
+		return info;
+	}
+} ];
+//
+var v_expression_symbol_data = [ {
+	CODE_ID : '>',
+	CODE_NAME : '大于'
+}, {
+	CODE_ID : '<',
+	CODE_NAME : '小于'
+}, {
+	CODE_ID : '=',
+	CODE_NAME : '等于'
+} ];
+//时间单位
+var v_expression_timeunit_data = [ {
+	CODE_ID : 's',
+	CODE_NAME : '秒'
+}, {
+	CODE_ID : 'm',
+	CODE_NAME : '分钟'
+}, {
+	CODE_ID : 'h',
+	CODE_NAME : '小时'
+}, {
+	CODE_ID : 'd',
+	CODE_NAME : '天'
+} ];
 /****/
 
 /**
@@ -67,41 +254,60 @@ $('#FIELD_HOSTID').combobox({
  * 备注：需更改
  **/
 //定义grid列表
-var ls_title="触发器维护&nbsp;&nbsp;<font color='#993300'>(1、绿色表示启用&nbsp;&nbsp;2、红色表示停用。)</font>";
+var ls_title = "触发器维护&nbsp;&nbsp;<font color='#993300'>(1、绿色表示启用&nbsp;&nbsp;2、红色表示停用。)</font>";
 var is_column = [ [
-				{field : 'PRIORITY',title : '严重性',width : 100,align : 'center',formatter:function(value,row,index){
-					for(var i=0;i<v_priority_data.length;i++){
-						if(v_priority_data[i].CODE_ID==value){
+	{
+		field : 'PRIORITY',
+		title : '级别',
+		width : 100,
+		align : 'center',
+		formatter : function(value, row, index) {
+			for (var i = 0; i < v_priority_data.length; i++) {
+				if (v_priority_data[i].CODE_ID == value) {
 					return v_priority_data[i].CODE_NAME;
 				}
 			}
-				}},
-				{field : 'COMMENTS',title : '名称',width : 300,align : 'center'
+		}
+	},
+	{
+		field : 'COMMENTS',
+		title : '名称',
+		width : 300,
+		align : 'center'
 	},
-				{field : 'EXPRESSION',title : '表达式',width : 450,align : 'center'
+	{
+		field : 'EXPRESSION',
+		title : '表达式',
+		width : 450,
+		align : 'center'
 	},
-				{field : 'STATUS',title : '状态',width : 200,align : 'center',formatter:function(value,row,index){
-					for(var i=0;i<v_status_data.length;i++){
-						if(v_status_data[i].CODE_ID==value){
+	{
+		field : 'STATUS',
+		title : '状态',
+		width : 100,
+		align : 'center',
+		formatter : function(value, row, index) {
+			for (var i = 0; i < v_status_data.length; i++) {
+				if (v_status_data[i].CODE_ID == value) {
 					return v_status_data[i].CODE_NAME;
 				}
 			}
-				}},
-				] ];
+		}
+	},
+] ];
 //列表加载完成回调
-function dataOnLoadSuccess(){
+function dataOnLoadSuccess() {
 }
 //设置颜色和每行高度
-function rowstyler(index,row){
-	if(row.STATUS == '1'){
+function rowstyler(index, row) {
+	if (row.STATUS == '1') {
 		return 'color:red;height:30px;';
-	}
-	else{
+	} else {
 		return 'color:green;height:30px;';
 	}
 }
 //展示列表
-datagrid("list",ls_title,gaowj.WEB_APP_NAME + "/triggerData_list",Object.assign({},$("#triggerTab_searchForm").getFormVal(),queryData),is_column,70,80);
+datagrid("list", ls_title, gaowj.WEB_APP_NAME + "/triggerData_list", Object.assign({}, $("#triggerTab_searchForm").getFormVal(), queryData), is_column, 60, 80);
 
 /****/
 
@@ -116,40 +322,40 @@ datagrid("list",ls_title,gaowj.WEB_APP_NAME + "/triggerData_list",Object.assign(
  * 备注：需更改
  **/
 //操用列显示更多(一般情况下无需更改)
-function formatMenu(value, data,index) {
-	var returnData="";
+function formatMenu(value, data, index) {
+	var returnData = "";
 	return returnData
 		+ "<span class=\"icon-ext-moremenu\" style=\"padding-left:20px;*width:20px;\"></span>"
-	      + "<span data-p1="+index+" class=\"easyui-tooltip\" style=\"color:blue;cursor:pointer;\">更多</span>";
+		+ "<span data-p1=" + index + " class=\"easyui-tooltip\" style=\"color:blue;cursor:pointer;\">更多</span>";
 }
 
 //上浮横向菜单集里的具体菜单项(需更改)
-function getOptionMenu(data,index){
+function getOptionMenu(data, index) {
 	//上浮菜单具体按钮
-	var optionMenu=new Array();
-	optionMenu[0]=makeBtnOneParama('编辑','icon-edit',"editRow",index);
-	optionMenu[1]=makeBtnOneParama('删除','icon-clear',"deleteRow",index);
+	var optionMenu = new Array();
+	optionMenu[0] = makeBtnOneParama('编辑', 'icon-edit', "editRow", index);
+	optionMenu[1] = makeBtnOneParama('删除', 'icon-clear', "deleteRow", index);
 
-	var splitStr='  |  ';
-	var returnData='';
-	for(var i=0;i<optionMenu.length;i++){
-		returnData+=splitStr+optionMenu[i];
+	var splitStr = '  |  ';
+	var returnData = '';
+	for (var i = 0; i < optionMenu.length; i++) {
+		returnData += splitStr + optionMenu[i];
 	}
-	return returnData.substr(splitStr.length-1);
+	return returnData.substr(splitStr.length - 1);
 }
 
 //单个按钮构造
-function makeBtn(text,cssClass,click){
-	return "<span class=\""+cssClass+"\" style=\"padding-left:20px;*width:20px;\"></span><a href=\"javascript:void(0);\" onclick=\""+click+"\">"+text+"</a>";
+function makeBtn(text, cssClass, click) {
+	return "<span class=\"" + cssClass + "\" style=\"padding-left:20px;*width:20px;\"></span><a href=\"javascript:void(0);\" onclick=\"" + click + "\">" + text + "</a>";
 }
 
 //单按钮单参数构造
-function makeBtnOneParama(text,cssClass,clickName,index){
-	return makeBtn(text,cssClass,clickName+"('"+ index + "')");
+function makeBtnOneParama(text, cssClass, clickName, index) {
+	return makeBtn(text, cssClass, clickName + "('" + index + "')");
 }
 
 //返回菜单集的菜单个数(需更改)
-function getOptionMenuCount(){
+function getOptionMenuCount() {
 	var is_menu_count = 2;
 	return is_menu_count;
 }
@@ -167,23 +373,20 @@ function getOptionMenuCount(){
  * 备注：需更改
  **/
 //加载增加子页面
-function addRow(){
-	var is_row={OPETYPE:'insert'};
-	openEditRow("triggerView_triggerTabDetail",is_row,"新增",true,0.65,0.95,0,0);
+function addRow() {
+	var is_row = {
+		OPETYPE : 'insert'
+	};
+	openEditRow("triggerView_triggerTabDetail", is_row, "新增", true, 0.65, 0.95, 0, 0);
 
 }
 //加载增加子页面成功后的回调
-function addUrlOnloadCallback(is_row){
-	$('#PRIORITY').combobox({
-		data : v_priority_data,
-		valueField : 'CODE_ID',
-		textField : 'CODE_NAME',
-		editable:false,  
-		panelHeight:'auto'
-	});
+function addUrlOnloadCallback(is_row) {
+	init_row();
 }
 //保存
-function insertData(is_entity){
+function insertData(is_entity) {
+	is_entity.FIELD_EXPRESSION = joint_expression();
 	var v_result = triggerModule.act.insertTrigger(is_entity);
 	$('#list').datagrid('reload');
 	return v_result;
@@ -193,30 +396,182 @@ function insertData(is_entity){
 function editRow(index) {
 	var is_row = $('#list').datagrid('getRows')[index];
 	is_row.OPETYPE = 'update';
-	openEditRow("triggerView_triggerTabDetail",is_row,"编辑",true,0.65,0.95,0,0);	
+	openEditRow("triggerView_triggerTabDetail", is_row, "编辑", true, 0.65, 0.95, 0, 0);
 }
 
 //加载修改子页面成功后的回调
-function updateUrlOnloadCallback(is_row){
-	for(k in is_row){
-		is_row['FIELD_'+k]=is_row[k];
+function updateUrlOnloadCallback(is_row) {
+	is_row = change_expression(is_row);
+	for (k in is_row) {
+		is_row['FIELD_' + k] = is_row[k];
 	}
-	$("#inputForm").form('load',is_row);
+	$("#inputForm").form('load', is_row);
+	//初始化combobox
+	init_row();
+	var key_v = $('#EXPRESSION_KEY').combobox('getValue');
+	$('#EXPRESSION_KEY').combobox('clear');
+	$('#EXPRESSION_KEY').combobox('select',key_v);
+	
+	var key_m = $('#EXPRESSION_METHOD').combobox('getValue');
+	$('#EXPRESSION_METHOD').combobox('clear');
+	$('#EXPRESSION_METHOD').combobox('select',key_m);
+}
+//保存
+function updateData(is_entity) {
+	var v_result = triggerModule.act.updateTrigger(is_entity);
+	$('#list').datagrid('reload');
+	return v_result;
+}
+
+function init_row() {
+	$('#EXPRESSION_HOST').val($("#triggerTab_searchForm").getFormVal().undefined);
 	$('#PRIORITY').combobox({
 		data : v_priority_data,
 		valueField : 'CODE_ID',
 		textField : 'CODE_NAME',
-		editable:false,  
-		panelHeight:'auto'
+		editable : false,
+		panelHeight : 'auto'
+	});
+
+	$('#EXPRESSION_KEY').combobox({
+		data : v_expression_key_data,
+		valueField : 'CODE_KEY',
+		textField : 'CODE_NAME',
+		editable : false,
+		panelHeight : 'auto',
+		onSelect : function(record) {
+			$('#EXPRESSION_VALUE').val("");
+			if (record.CODE_KEY == record.expression()) {
+				$("#EXPRESSION_VALUE").parent().parent().hide();
+			} else {
+				$("#EXPRESSION_VALUE").parent().parent().show();
+			}
+		}
+	});
+
+	$('#EXPRESSION_METHOD').combobox({
+		data : v_expression_method_data,
+		valueField : 'CODE_ID',
+		textField : 'CODE_NAME',
+		editable : false,
+		width : 200,
+		panelHeight : 'auto',
+		onSelect : function(record) {
+			$('#EXPRESSION_PERIOD').val("");
+			if (record.PERIOD) {
+				$("#EXPRESSION_PERIOD").parent().parent().show();
+			} else {
+				$("#EXPRESSION_PERIOD").parent().parent().hide();
+			}
+		}
+	});
+
+	$('#EXPRESSION_SYMBOL').combobox({
+		data : v_expression_symbol_data,
+		valueField : 'CODE_ID',
+		textField : 'CODE_NAME',
+		editable : false,
+		width : 100,
+		panelHeight : 'auto'
+	});
+
+	$('#EXPRESSION_TIMEUNIT').combobox({
+		data : v_expression_timeunit_data,
+		valueField : 'CODE_ID',
+		textField : 'CODE_NAME',
+		editable : false,
+		width : 180,
+		panelHeight : 'auto'
+	});
+
+	$('#EXPRESSION_TIMEUNIT2').combobox({
+		data : v_expression_timeunit_data,
+		valueField : 'CODE_ID',
+		textField : 'CODE_NAME',
+		editable : false,
+		width : 180,
+		panelHeight : 'auto'
 	});
 }
-//保存
-function updateData(is_entity){
-	var v_result = triggerModule.act.updateTrigger(is_entity);
-	$('#list').datagrid('reload');
-	return v_result;
+
+//拼接表达式
+function joint_expression() {
+	//server值
+	var server = $("#triggerTab_searchForm").getFormVal().undefined;
+	//key值
+	var key = $('#EXPRESSION_KEY').combobox('getValues');
+	for (var index of v_expression_key_data) {
+		if (key == index.CODE_KEY) {
+			var value = $("#EXPRESSION_VALUE").val();
+			key = index.expression(value);
+		} }
+	//method值
+	var last = "";
+	if ($('#EXPRESSION_PERIOD').val() != "") {
+		last = $('#EXPRESSION_PERIOD').val() + $('#EXPRESSION_TIMEUNIT').combobox('getValues')
+	}
+	var time = "";
+	if ($('#EXPRESSION_TIMESHIFT').val() != "") {
+		time = $('#EXPRESSION_TIMESHIFT').val() + $('#EXPRESSION_TIMEUNIT2').combobox('getValues');
+	}
+	var method = $('#EXPRESSION_METHOD').combobox('getValues');
+	for (var ele of v_expression_method_data) {
+		if (method == ele.CODE_ID) {
+			method = ele.expression(last, time);
+		} }
+	var symbol = $('#EXPRESSION_SYMBOL').combobox('getValues');
+	var number = $('#EXPRESSION_NUMBER').val();
+	var expression = '{' + server + ':' + key + '.' + method + '}' + symbol + number;
+	return expression;
 }
 
+//转换表达式
+function change_expression(is_row) {
+	var str = is_row['EXPRESSION'];
+	//key值
+	var key = str.substring(str.indexOf(":") + 1, str.indexOf("["));
+	//value值
+	var value = str.substring(str.indexOf(":") + 1, str.indexOf("]") + 1);
+	for (var index of v_expression_key_data) {
+		if (key == index.CODE_KEY) {
+			is_row['EXPRESSION_VALUE'] = index.conversion(value);
+			is_row['EXPRESSION_KEY'] = key;
+		} else if (value == index.CODE_KEY) {
+			is_row['EXPRESSION_KEY'] = value;
+		} }
+	//method值
+	var method = str.substring(str.indexOf("]") + 2, str.indexOf("("));
+	is_row['EXPRESSION_METHOD'] = method;
+	//symbol值
+	var symbol = str.substring(str.indexOf("}") + 1, str.indexOf("}") + 2);
+	is_row['EXPRESSION_SYMBOL'] = symbol;
+	//number
+	is_row['EXPRESSION_NUMBER'] = str.substring(str.indexOf("}") + 2);
+	for (var index of v_expression_method_data) {
+		if (method == index.CODE_ID) {
+			var info = index.conversion(str)
+			var last = info["last"];
+			var time = info["time"];
+			if (!isEmpty(last)) {
+				is_row['EXPRESSION_PERIOD'] = last;
+				var char = last.charAt(last.length - 1);
+				if (char >= 'a' && char <= 'z') {
+					is_row['EXPRESSION_TIMEUNIT'] = char;
+					is_row['EXPRESSION_PERIOD'] = last.substring(0, last.length - 1);
+				}
+			}
+			if (!isEmpty(time)) {
+				is_row['EXPRESSION_TIMESHIFT'] = time;
+				var char1 = time.charAt(time.length - 1);
+				if (char1 >= 'a' && char1 <= 'z') {
+					is_row['EXPRESSION_TIMEUNIT2'] = char1;
+					console.log(time.substring(0, time.length - 1))
+					is_row['EXPRESSION_TIMESHIFT'] = time.substring(0, time.length - 1);
+				}
+			}
+		} }
+	return is_row;
+}
 /****/
 
 /**
@@ -229,7 +584,7 @@ function updateData(is_entity){
  * 单位：宁波金网
  * 备注：需更改
  **/
-function deleteRow(index){
+function deleteRow(index) {
 	var is_row = $('#list').datagrid('getData').rowSet[index];
 	var code = is_row.TRIGGERID;
 	$.messager.confirm('提示', '确定删除?', function(r) {
@@ -237,7 +592,7 @@ function deleteRow(index){
 			var v_query = {};
 			v_query.FIELD_CODE = code;
 			var v_result = triggerModule.act.deleteTrigger(v_query);
-			$.messager.alert('提示',v_result.VALUE);
+			$.messager.alert('提示', v_result.VALUE);
 			$('#list').datagrid('reload');
 		}
 	});
@@ -254,25 +609,25 @@ function deleteRow(index){
  * 单位：宁波金网
  * 备注：需更改
  **/
-function deleteBatchRow(){
-	var code="";
+function deleteBatchRow() {
+	var code = "";
 	var rows = $('#list').datagrid('getSelections');
-	for(var i=0; i<rows.length; i++){
-		code = code + rows[i].TRIGGERID+",";
+	for (var i = 0; i < rows.length; i++) {
+		code = code + rows[i].TRIGGERID + ",";
 	}
-	if(rows == null || rows == ""){
-		$.messager.alert('提示',"请选择需删除的记录!",'info');
+	if (rows == null || rows == "") {
+		$.messager.alert('提示', "请选择需删除的记录!", 'info');
 		return;
 	}
-	if(code.length>0){
-		code = code.substring(0,code.length - 1);
+	if (code.length > 0) {
+		code = code.substring(0, code.length - 1);
 	}
 	$.messager.confirm('提示', '确定删除?', function(r) {
 		if (r) {
 			var v_query = {};
 			v_query.FIELD_CODE = code;
 			var v_result = triggerModule.act.deleteTrigger(v_query);
-			$.messager.alert('提示',v_result.VALUE);
+			$.messager.alert('提示', v_result.VALUE);
 			$('#list').datagrid('reload');
 		}
 	});
@@ -289,11 +644,11 @@ function deleteBatchRow(){
  * 单位：宁波金网
  * 备注：需更改
  **/
-function refreshRow(){
+function refreshRow() {
 	$("#triggerTab_searchForm")[0].reset();
 	$('#FIELD_HOSTID').combobox('clear');
-	$('#FIELD_HOSTID').combobox('setValue',v_host_data[0].HOSTID);
-	$('#list').datagrid('load',$("#triggerTab_searchForm").getFormVal());
+	$('#FIELD_HOSTID').combobox('setValue', v_host_data[0].HOSTID);
+	$('#list').datagrid('load', $("#triggerTab_searchForm").getFormVal());
 }
 /****/
 
@@ -307,9 +662,9 @@ function refreshRow(){
  * 单位：宁波金网
  * 备注：需更改
  **/
-function searchRow(){
+function searchRow() {
 	var v_query = $("#triggerTab_searchForm").getFormVal();
-	$('#list').datagrid('load',v_query);
+	$('#list').datagrid('load', v_query);
 }
 /****/
 
@@ -324,17 +679,19 @@ function searchRow(){
  * 备注：需更改
  **/
 //加载高级查询子页面
-function advsearchRow(){
-	var is_row={OPETYPE:'ww'};
-	openAdvsearchRow("studentView_studentAdvsearch",is_row,"高级查询",true,0.65,0.95,0,0);
+function advsearchRow() {
+	var is_row = {
+		OPETYPE : 'ww'
+	};
+	openAdvsearchRow("studentView_studentAdvsearch", is_row, "高级查询", true, 0.65, 0.95, 0, 0);
 
 }
 //加载高级查询子页面成功后的回调
-function addAdvsearchCallback(is_row){
+function addAdvsearchCallback(is_row) {
 }
 //高级查询
-function advsearchData(is_entity){
-	$('#list').datagrid('load',is_entity);
+function advsearchData(is_entity) {
+	$('#list').datagrid('load', is_entity);
 }
 /****/
 
@@ -348,8 +705,7 @@ function advsearchData(is_entity){
  * 单位：宁波金网
  * 备注：需更改
  **/
-function uploadcommonRow(index){
-
+function uploadcommonRow(index) {
 }
 /****/
 
@@ -363,6 +719,6 @@ function uploadcommonRow(index){
  * 单位：宁波金网
  * 备注：需更改
  **/
-function uploadcommonBatchRow(){
+function uploadcommonBatchRow() {
 }
 /****/
\ No newline at end of file

WebContent/monitoring/pages/trigger/triggerTabDetail.jsp

@@ -2,13 +2,14 @@
 <form id="inputForm" method="post" style="width: 100%;">
 	<input type="hidden" name="FIELD_OPETYPE" id="OPETYPE" /> 
 	<input type="hidden" name="FIELD_TRIGGERID" id="TRIGGERID"/>
+	<input type="hidden" name="FIELD_EXPRESSION" id="EXPRESSION"/>
 	<table align="center" border="0" cellpadding="0" cellspacing="0" class="tableStyle" style="margin: 10px 15px; width: 95%; line-height: 35px;">
 		<tr>
 			<td style="width: 15%;" class="tableStyleLable">
 				<span>名称:</span>
 			</td>
 			<td style="width: 85%">
-				<input class="easyui-textbox" id="COMMENTS" name="FIELD_COMMENTS" style="width:500px" data-options="required:true"/>
+				<input class="easyui-textbox" id="COMMENTS" name="FIELD_COMMENTS" style="width:500px;height:30px;" data-options="required:true"/>
 			</td>
 		</tr>
 		<tr>
@@ -16,15 +17,51 @@
 				<span>警告级别:</span>
 			</td>
 			<td style="width: 85%">
-				<input class="easyui-textbox" id="PRIORITY" name="FIELD_PRIORITY" style="width:500px" data-options="required:true"/>
+				<input class="easyui-textbox" id="PRIORITY" name="FIELD_PRIORITY" style="width:500px;height:30px;" data-options="required:true"/>
 			</td>
 		</tr>
 		<tr>
 			<td style="width: 15%;" class="tableStyleLable">
-				<span>表达式:</span>
+				<span>监控项:</span>
 			</td>
-			<td style="width: 85%">
-				<input class="easyui-textbox" id="EXPRESSION" name="FIELD_EXPRESSION" style="width:500px" data-options="required:true"/>
+			<td style="width:85%"> 
+				<input class="easyui-textbox" name="FIELD_EXPRESSION_KEY" id="EXPRESSION_KEY" style="width:500px;height:30px;">
+			</td>
+		</tr>
+		<tr>
+			<td style="width: 15%;" class="tableStyleLable">
+				<span>监控物:</span>
+			</td>
+			<td style="width:85%"> 
+				<input class="easyui-textbox" name="FIELD_EXPRESSION_VALUE" id="EXPRESSION_VALUE" style="width:500px;height:30px;">			
+			</td>
+		</tr>
+		<tr>
+			<td style="width: 15%;" class="tableStyleLable">
+				<span>方法:</span>
+			</td>
+			<td style="width:85%"> 
+				<input class="easyui-textbox" name="FIELD_EXPRESSION_METHOD" id="EXPRESSION_METHOD" style="height:30px;">
+				<input class="easyui-textbox" name="FIELD_EXPRESSION_SYMBOL" id="EXPRESSION_SYMBOL" style="height:30px;">
+				<input class="easyui-textbox" name="FIELD_EXPRESSION_NUMBER" id="EXPRESSION_NUMBER" style="width:180px;height:30px;" value="0">
+			</td>
+		</tr>
+		<tr>
+			<td style="width: 15%;" class="tableStyleLable">
+				<span>周期:</span>
+			</td>
+			<td style="width:85%"> 
+				<input class="easyui-numberbox" name="FIELD_EXPRESSION_PERIOD" id="EXPRESSION_PERIOD" style="width:310px;height:30px;">
+				<input class="easyui-textbox" name="FIELD_EXPRESSION_TIMEUNIT" id="EXPRESSION_TIMEUNIT" style="height:30px;">
+			</td>
+		</tr>
+		<tr>
+			<td style="width: 15%;" class="tableStyleLable">
+				<span>时移:</span>
+			</td>
+			<td style="width:85%"> 
+				<input class="easyui-numberbox" name="FIELD_EXPRESSION_TIMESHIFT" id="EXPRESSION_TIMESHIFT" style="width:310px;height:30px;">
+				<input class="easyui-textbox" name="FIELD_EXPRESSION_TIMEUNIT2" id="EXPRESSION_TIMEUNIT2" style="height:30px;">
 			</td>
 		</tr>
 		<tr>
@@ -32,7 +69,7 @@
 				<span>描述:</span>
 			</td>
 			<td style="width: 85%">
-				<input class="easyui-textbox" id="DESCRIPTION" name="FIELD_DESCRIPTION" style="width:500px" data-options="required:true"/>
+				<input class="easyui-textbox" id="DESCRIPTION" name="FIELD_DESCRIPTION" style="width:500px;height:30px;" data-options="required:true"/>
 			</td>
 		</tr>
 	</table>

WebContent/monitoring/pages/user/js/userTab.js

@@ -56,13 +56,13 @@ var v_host_data = hostModule.data.listAll().rowSet;
 //定义grid列表
 var ls_title="用户维护";
 var is_column = [ [
-				{field : 'USERNAME',title : '用户名',width : 250,align : 'center'
+				{field : 'USERNAME',title : '用户名称',width : 250,align : 'center'
 				},
 				{field : 'EMAIL',title : '电子邮箱',width : 250,align : 'center'
 				},
 				{field : 'TELEPHONE',title : '联系电话',width : 250,align : 'center'
 				},
-				{field : 'DINGDING',title : '钉钉',width : 250,align : 'center'
+				{field : 'DINGDING',title : '钉钉信息',width : 250,align : 'center'
 				}
 				] ];
 //列表加载完成回调
@@ -71,10 +71,10 @@ function dataOnLoadSuccess(){
 
 //设置颜色和每行高度
 function rowstyler(index,row){
-	return 'color:green;height:30px;';
+	return 'color:black;height:30px;';
 }
 //展示列表
-datagrid("list",ls_title,gaowj.WEB_APP_NAME + "/userData_list",Object.assign({},$("#userTab_searchForm").getFormVal(),queryData),is_column,70,80);
+datagrid("list",ls_title,gaowj.WEB_APP_NAME + "/userData_list",Object.assign({},$("#userTab_searchForm").getFormVal(),queryData),is_column,60,80);
 
 /****/
 

WebContent/monitoring/pages/user/userTabDetail.jsp

@@ -5,18 +5,18 @@
 <table align="center" border="0" cellpadding="0" cellspacing="0" class="tableStyle" style="margin: 10px 15px; width: 95%; line-height: 35px;">
    <tr>
    <td style="width: 15%;" class="tableStyleLable">
-		<span>用户名:</span>
+		<span>用户名称:</span>
 	</td>
    <td  style="width: 85%">
-	  <input class="easyui-textbox" id="USERNAME" name="FIELD_USERNAME" style="width:250px" value="${is_row.NAME}" data-options="required:true"/>
+	  <input class="easyui-textbox" id="USERNAME" name="FIELD_USERNAME" style="width:350px;height:30px;" value="${is_row.NAME}" data-options="required:true"/>
     </td>
     </tr>
    <tr>
    <td class="tableStyleLable">
-		<span>邮箱:</span>
+		<span>电子邮箱:</span>
 	</td>
    <td>
-	  <input class="easyui-textbox" id="EMAIL" name="FIELD_EMAIL" style="width:250px" value="${is_row.EMAIL}" data-options="validType:'email'"/>
+	  <input class="easyui-textbox" id="EMAIL" name="FIELD_EMAIL" style="width:350px;height:30px;" value="${is_row.EMAIL}" data-options="validType:'email'"/>
    </td>
    </tr>
    <tr>
@@ -24,15 +24,15 @@
 		<span>联系电话:</span>
 	</td>
    <td>
-	  <input class="easyui-textbox" id="TELEPHONE" name="FIELD_TELEPHONE" style="width:250px" value="${is_row.TELEPHONE}" data-options="validType:'mobile'"/>
+	  <input class="easyui-textbox" id="TELEPHONE" name="FIELD_TELEPHONE" style="width:350px;height:30px;" value="${is_row.TELEPHONE}" data-options="validType:'mobile'"/>
    </td>
    </tr>
    <tr>
    <td class="tableStyleLable">
-		<span>钉钉:</span>
+		<span>钉钉信息:</span>
 	</td>
    <td>
-	  <input class="easyui-textbox" id="DINGDING" name="FIELD_DINGDING" style="width:250px" value="${is_row.DINGDING}"/>
+	  <input class="easyui-textbox" id="DINGDING" name="FIELD_DINGDING" style="width:350px;height:30px;" value="${is_row.DINGDING}"/>
    </td>
    </tr>
    <tr>
@@ -40,7 +40,7 @@
 		<span>服务器:</span>
 	</td>
    <td>
-	  <input class="easyui-combobox" id="HOST" name="FIELD_LIST_HOST_ID" style="width:250px" value="${is_row.LIST_HOST_ID}"/>
+	  <input class="easyui-combobox" id="HOST" name="FIELD_LIST_HOST_ID" style="width:350px;height:30px;" value="${is_row.LIST_HOST_ID}"/>
    </td>
    </tr>
 </table>

WebContent/monitoring/pages/warning/js/warningTab.js

@@ -59,23 +59,23 @@ var ls_title="服务器预警数据管理&nbsp;&nbsp;<font color='#993300'>(1、
 var is_column = [ [
 				{field : 'NAME',title : '主机名',width : 150,align : 'center'
 				},
-				{field : 'DESCRIPTION',title : '问题描述',width :300,align : 'center'
+				{field : 'HOST_DESCRIPTION',title : '主机描述',width :250,align : 'center'
 				},
-				{field : 'VALUE',title : '状态',width : 120,align : 'center',formatter:function(value,row,index){
+				{field : 'DESCRIPTION',title : '问题描述',width :250,align : 'center'
+				},
+				{field : 'VALUE',title : '状态',width : 100,align : 'center',formatter:function(value,row,index){
 					for(var i=0;i<v_value_data.length;i++){
 						if(v_value_data[i].CODE_ID==value){
 							return v_value_data[i].CODE_NAME;
 						}
 					}
 				}},
-				{field : 'CLOCK',title : '发生时间',width : 200,align : 'center',
+				{field : 'CLOCK',title : '发生时间',width : 150,align : 'center',
 					formatter : function(value) {
-						var newDate = new Date();
-						newDate.setTime(value*1000);
-						return newDate.toLocaleString();
+						return formatDtoStr1(value*1000);
 					}
 				},
-				{field : 'STATUS',title : '发送状态',width : 200,align : 'center',
+				{field : 'STATUS',title : '发送状态',width : 100,align : 'center',
 					formatter : function(value) {
 						for (var i = 0; i < v_value_data.length; i++) {
 							if (v_status_data[i].CODE_ID == value) {
@@ -113,7 +113,7 @@ function rowstyler(index,row){
 	}
 }
 //展示列表
-datagrid("list",ls_title,gaowj.WEB_APP_NAME + "/warningData_list",queryData,is_column,70,80);
+datagrid("list",ls_title,gaowj.WEB_APP_NAME + "/warningData_list",queryData,is_column,80,80);
 
 /****/
 
@@ -139,9 +139,9 @@ function formatMenu(value, data,index) {
 function getOptionMenu(data,index){
 	//上浮菜单具体按钮
 	var optionMenu=new Array();
-	optionMenu[0]=makeBtnOneParama('发送邮件','icon-edit',"sendMailRow",index);
-	optionMenu[1]=makeBtnOneParama('发送短信','icon-edit',"sendMsgRow",index);
-	optionMenu[2]=makeBtnOneParama('发送钉钉','icon-edit',"sendDingRow",index);
+	optionMenu[0]=makeBtnOneParama('发送邮件','icon-email',"sendMailRow",index);
+	optionMenu[1]=makeBtnOneParama('发送短信','icon-message',"sendMsgRow",index);
+	optionMenu[2]=makeBtnOneParama('发送钉钉','icon-dingding',"sendDingRow",index);
 	
 	var splitStr='  |  ';
 	var returnData='';
@@ -205,6 +205,7 @@ function sendMailRow(index){
  * 备注：需更改
  **/
 function sendMsgRow(){
+	$.messager.alert('提示',"该功能正在开发中");
 	/*$.messager.confirm('提示', '确定发送?', function(r) {
 		if (r) {
 			var v_query = {};
@@ -228,6 +229,7 @@ function sendMsgRow(){
  * 备注：需更改
  **/
 function sendDingRow(){
+	$.messager.alert('提示',"该功能正在开发中");
 	/*$.messager.confirm('提示', '确定发送?', function(r) {
 		if (r) {
 			var v_query = {};

src/quartz_service.properties

@@ -19,3 +19,6 @@ delete_true_and_delete_disk_file=true
 #------------download_encode----------------------
 downloadFilenameEncode1 = gbk
 downloadFilenameEncode2 = iso8859-1
+#------------test_env----------------------
+test_env=true
+

src_monitoring/com/gaowj/business/host/HostBusinessImpl.java

 package com.gaowj.business.host;
 
 import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Random;
 
 import org.apache.ibatis.session.RowBounds;
 
 import com.gaowj.business.HostBusiness;
 import com.gaowj.business.exception.BusinessException;
 import com.gaowj.business.util.Page;
+import com.gaowj.business.util.PropUtil;
 
 public class HostBusinessImpl implements HostBusiness {
 
@@ -42,9 +46,105 @@ public class HostBusinessImpl implements HostBusiness {
 		page.setCount(count);
 		page.setItems(items);
 		
+		String test_env = PropUtil.getValue("test_env", "quartz_service", "false");
+		if ("true".equals(test_env)) {
+			List<Map<String, Object>> listFake = new ArrayList<Map<String, Object>>() {
+				public boolean add(String hostName, String description, String info) {
+					Map<String, Object> e = new HashMap<String, Object>();
+					e.put("NAME", hostName);
+					e.put("DESCRIPTION", description);
+					e.put("VALUE", info);
+					e.put("CLOCK", "1527238312");
+					return super.add(e);
+				}
+
+				{
+					add("cjtpi server","管理cjtpi服务",makeInfo(getRandomIp(), new Random().nextInt(10) + 1 + ""));
+					add("sfvfulab","管理sfvfulab服务",makeInfo(getRandomIp(), new Random().nextInt(10) + 1 + ""));
+					add("bfwch server","管理bfwch服务",makeInfo(getRandomIp(), new Random().nextInt(10) + 1 + ""));
+					add("eouxh server","管理eouxh服务",makeInfo(getRandomIp(), new Random().nextInt(10) + 1 + ""));
+					add("kgbmclab","管理kgbmclab服务",makeInfo(getRandomIp(), new Random().nextInt(10) + 1 + ""));
+					add("bigdata","管理bigdata服务",makeInfo(getRandomIp(), new Random().nextInt(10) + 1 + ""));
+					add("sofib server","管理sofib服务",makeInfo(getRandomIp(), new Random().nextInt(10) + 1 + ""));
+					add("qatuh server","管理qatuh服务",makeInfo(getRandomIp(), new Random().nextInt(10) + 1 + ""));
+					add("rbigklab","管理rbigklab服务",makeInfo(getRandomIp(), new Random().nextInt(10) + 1 + ""));
+					add("aajgmr","管理aajgmr服务",makeInfo(getRandomIp(), new Random().nextInt(10) + 1 + ""));
+					add("aajgmlab","管理aajgmlab服务",makeInfo(getRandomIp(), new Random().nextInt(10) + 1 + ""));
+					add("ftvae server","管理ftvae服务",makeInfo(getRandomIp(), new Random().nextInt(10) + 1 + ""));
+					add("stgcc server","管理stgcc服务",makeInfo(getRandomIp(), new Random().nextInt(10) + 1 + ""));
+					add("aajgm server","管理aajgm服务",makeInfo(getRandomIp(), new Random().nextInt(10) + 1 + ""));
+					add("vflbf server","管理vflbf服务",makeInfo(getRandomIp(), new Random().nextInt(10) + 1 + ""));
+					add("ucyjm server","管理ucyjm服务",makeInfo(getRandomIp(), new Random().nextInt(10) + 1 + ""));
+					add("otunf server","管理otunf服务",makeInfo(getRandomIp(), new Random().nextInt(10) + 1 + ""));
+					add("kqnhl server","管理kqnhl服务",makeInfo(getRandomIp(), new Random().nextInt(10) + 1 + ""));
+					add("yqhtk server","管理yqhtk服务",makeInfo(getRandomIp(), new Random().nextInt(10) + 1 + ""));
+					add("vnrvt server","管理vnrvt服务",makeInfo(getRandomIp(), new Random().nextInt(10) + 1 + ""));
+					/*for (int i = 0; i <= 20; i++) {
+						add(i + 100000, makeName() + " server",
+								makeInfo(getRandomIp(), new Random().nextInt(10) + 1 + ""));
+					}*/
+				}
+			};
+			if (pageNo == 1 && items.size() < 20) {
+				for (int i = 0; i < pageSize - count; i++) {
+					items.add(listFake.get(i));
+				}
+				page.setCount(23);
+			} else if (pageNo == 2 && items.size() == 0) {
+				for (int i = 0; i < 3; i++) {
+					items.add(listFake.get(i));
+				}
+				page.setCount(23);
+			}
+		}
+
 		return page;
 	}
 	
+	private String makeInfo(String ip,String memory){
+		return "{\"disk\": [{\"sda\": \"20G\"}], \"ip\": [{\"ens33\": \""+ip+"\"}], \"memory\": {\"size\": \""+memory+"G\"}, \"system\": {\"uname\": \"Linux localhost.localdomain 3.10.0-693.el7.x86_64 #1 SMP Tue Aug 22 21:09:27 UTC 2017 x86_64 x86_64 x86_64 GNU/Linux\", \"bit\": \"64\", \"uptime\": \"2792786.57\", \"kernel\": \"3.10.0-693.el7.x86_64\"}, \"cup\": {\"info\": \"Intel(R) Core(TM) i7-7700 CPU @ 3.60GHz\", \"cores\": \"1\"}}";
+	}
+	
+	private String makeName(){
+		StringBuffer sb=new StringBuffer();
+		for(int i=0;i<=4;i++){
+			sb.append((char)(new Random().nextInt(25)+97));
+		}
+		return sb.toString();
+	}
+	
+	private String getRandomIp() {  
+        // ip范围  
+        int[][] range = { { 607649792, 608174079 }, // 36.56.0.0-36.63.255.255  
+                { 1038614528, 1039007743 }, // 61.232.0.0-61.237.255.255  
+                { 1783627776, 1784676351 }, // 106.80.0.0-106.95.255.255  
+                { 2035023872, 2035154943 }, // 121.76.0.0-121.77.255.255  
+                { 2078801920, 2079064063 }, // 123.232.0.0-123.235.255.255  
+                { -1950089216, -1948778497 }, // 139.196.0.0-139.215.255.255  
+                { -1425539072, -1425014785 }, // 171.8.0.0-171.15.255.255  
+                { -1236271104, -1235419137 }, // 182.80.0.0-182.92.255.255  
+                { -770113536, -768606209 }, // 210.25.0.0-210.47.255.255  
+                { -569376768, -564133889 }, // 222.16.0.0-222.95.255.255  
+        };  
+  
+        Random rdint = new Random();  
+        int index = rdint.nextInt(10);  
+        String ip = num2ip(range[index][0] + new Random().nextInt(range[index][1] - range[index][0]));  
+        return ip;  
+    }  
+	
+	private String num2ip(int ip) {  
+        int[] b = new int[4];  
+        String x = "";  
+        b[0] = (int) ((ip >> 24) & 0xff);  
+        b[1] = (int) ((ip >> 16) & 0xff);  
+        b[2] = (int) ((ip >> 8) & 0xff);  
+        b[3] = (int) (ip & 0xff);  
+        x = Integer.toString(b[0]) + "." + Integer.toString(b[1]) + "." + Integer.toString(b[2]) + "." + Integer.toString(b[3]);  
+  
+        return x;  
+    }  
+
 	@Override
 	public List<Map<String, Object>> list_host(Map<String, Object> query) throws BusinessException {
 		// 获取列表

src_monitoring/com/gaowj/business/host/hostDAO.xml

@@ -31,6 +31,16 @@
 		order by h.name ASC
 	</select>
 	
+	<!-- <select id="list_host" parameterType="map" resultType="upperCaseKeyMap">
+	 <![CDATA[
+	 SELECT * FROM hosts_sysinfo_view h where 1=1 
+     ]]>
+		<if test="NAME != null and NAME != ''">
+			and h.name LIKE #{NAME}
+		</if>
+		order by h.name ASC
+	</select> -->
+
 	<select id="list_count_host" parameterType="map" resultType="int">
 		SELECT count(*) FROM hosts_sysinfo_view h
 		<include refid="Where_Clause" />

src_monitoring/com/gaowj/business/trigger/TriggerBusinessImpl.java

@@ -10,6 +10,7 @@ import org.apache.ibatis.session.RowBounds;
 import com.gaowj.business.TriggerBusiness;
 import com.gaowj.business.exception.BusinessException;
 import com.gaowj.business.util.Page;
+import com.gaowj.business.util.PropUtil;
 
 public class TriggerBusinessImpl implements TriggerBusiness {
 
@@ -44,6 +45,57 @@ public class TriggerBusinessImpl implements TriggerBusiness {
 		page.setCount(count);
 		page.setItems(items);
 
+		String test_env = PropUtil.getValue("test_env", "quartz_service", "false");
+		if("true".equals(test_env)){
+			List<Map<String, Object>> listFake = new ArrayList<Map<String, Object>>() {
+				public boolean add(int priority, String comments, String expression) {
+					Map<String, Object> e = new HashMap<String, Object>();
+					e.put("PRIORITY", priority);
+					e.put("COMMENTS", comments);
+					e.put("EXPRESSION", expression);
+					e.put("STATUS", 0);
+					return super.add(e);
+				}
+
+				{
+					add(4,"使用空间监控","{jfgitlab:vfs.fs.size[/,used].last()}>1G");
+					add(4,"剩余使用空间监控","{jfgitlab:vfs.fs.size[/,free].last()}<800M");
+					add(1,"sda挂载盘io读取监控","{jfgitlab:disk.status[sda,rKBps].last()}>100");
+					add(1,"sda挂载盘io写入监控","{jfgitlab:disk.status[sda,wKBps].last()}>400");
+					add(2,"磁盘空间小于870M","{jfgitlab:vfs.fs.size[/boot,free].last()}<870M");
+					add(3,"剩余磁盘空间百分比监控","{jfgitlab:vfs.fs.size[/boot,pfree].last()}<20%");
+					add(4,"可用内存监控","{jfgitlab:vm.memory.size[available].last()}>70");
+					add(1,"veth30b22dd输出流量监控","{jfgitlab:net.if.out[veth30b22dd].last()}>400000");
+					add(1,"veth30b22dd输入流量监控","{jfgitlab:net.if.in[veth30b22dd].last()}>700000");
+					add(1,"ens33输出流量监控","{jfgitlab:net.if.out[ens33].last()}>500000");
+					add(1,"sda挂载盘io读取监控","{jfgitlab:disk.status[sda,rKBps].last()}>200");
+					add(1,"sda挂载盘io写入监控","{jfgitlab:disk.status[sda,wKBps].last()}>500");
+					add(2,"磁盘空间小于950M","{jfgitlab:vfs.fs.size[/boot,free].last()}<950M");
+					add(1,"veth399f0a6输出流量监控","{jfgitlab:net.if.out[veth399f0a6].last()}>400000");
+					add(1,"veth399f0a6输入流量监控","{jfgitlab:net.if.in[veth399f0a6].last()}>700000");
+					add(3,"磁盘使用空间大于200M","{jfgitlab:vfs.fs.size[/boot,total].last()}>200M");
+					add(1,"br-035628d874f9输出流量监控","{jfgitlab:net.if.out[br-035628d874f9].last()}>700000");
+					add(1,"br-035628d874f9输入流量监控","{jfgitlab:net.if.in[br-035628d874f9].last()}>700000");
+					add(1,"docker0输入流量监控","{jfgitlab:net.if.in[docker0].last()}>500000");
+					add(1,"docker0输出流量监控","{jfgitlab:net.if.out[docker0].last()}>500000");
+				}
+			};
+			
+			if("10254".equals(query.get("HOSTID"))){
+				if (pageNo == 1 && items.size() < 20) {
+					for (int i = 0; i < pageSize - count; i++) {
+						items.add(listFake.get(i));
+					}
+					page.setCount(25);
+				} else if (pageNo == 2 && items.size() == 0) {
+					for (int i = 15; i < 20; i++) {
+						items.add(listFake.get(i));
+					}
+					page.setCount(25);
+				}
+			}
+		}
+		
 		return page;
 	}
 

src_monitoring/com/gaowj/business/user/UserBusinessImpl.java

@@ -129,9 +129,10 @@ public class UserBusinessImpl implements UserBusiness{
 	public void update_user(Map<String, Object> entity) throws BusinessException {
 		//删除用户管理主机
 		delete_user_host(entity);
+		if (entity.get("LIST_HOST_ID") != null) {
 			//插入用户管理主机
 			insert_user_host(entity);
-		
+		}
 		// 动态传值修改
 		List<Map<String, Object>> updateList = new ArrayList<Map<String, Object>>();
 		if (entity.keySet() != null) {

src_monitoring/com/gaowj/business/warning/WarningBusinessImpl.java

 package com.gaowj.business.warning;
 
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -8,6 +10,7 @@ import org.apache.ibatis.session.RowBounds;
 import com.gaowj.business.WarningBusiness;
 import com.gaowj.business.exception.BusinessException;
 import com.gaowj.business.util.Page;
+import com.gaowj.business.util.PropUtil;
 
 public class WarningBusinessImpl implements WarningBusiness{
 	
@@ -40,6 +43,53 @@ public class WarningBusinessImpl implements WarningBusiness{
 		page.setCount(count);
 		page.setItems(items);
 
+		String test_env = PropUtil.getValue("test_env", "quartz_service", "false");
+		if("true".equals(test_env)){
+			List<Map<String, Object>> listFake = new ArrayList<Map<String, Object>>() {
+				public boolean add(String name, String host_description,String description, int value,String clock,int status) {
+					Map<String, Object> e = new HashMap<String, Object>();
+					e.put("NAME", name);
+					e.put("HOST_DESCRIPTION", host_description);
+					e.put("DESCRIPTION", description);
+					e.put("VALUE", value);
+					e.put("CLOCK", clock);
+					e.put("STATUS",status);
+					return super.add(e);
+				}
+
+				{
+					add("Zabbix server","管理Zabbix服务","使用空间超过1G",1,"1527233993",1);
+					add("jfgitlab","管理git服务","sda挂载盘io写入大于400",0,"1527233994",0);
+					add("jfgitlab","管理git服务","sda挂载盘io读取量超过100",0,"1527233993",0);
+					add("jfgitlab","管理git服务","剩余磁盘空间百分比小于20%",1,"1527491648",1);
+					add("kqnhl server","管理kqnhl服务","磁盘使用空间大于200M",1,"1527491664",1);
+					add("kqnhl server","管理kqnhl服务","磁盘空间剩余950M",1,"1527491672",1);
+					add("kqnhl server","管理kqnhl服务","ens33输出流量大于500000",0,"1527491683",1);
+					add("kqnhl server","管理kqnhl服务","docker0输入流量大于500000",1,"1527491720",1);
+					add("Zabbix server","管理Zabbix服务","docker0输出流量大于500000",1,"1527491780",1);
+					add("jfgitlab","管理git服务","veth30b22dd输出流量超过400000",0,"1527491720",1);
+					add("jfgitlab","管理git服务","veth30b22dd输入流量超过700000",1,"1527491780",1);
+					add("jfgitlab","管理git服务","可用内存超过70",1,"1527491820",1);
+					add("jfgitlab","管理git服务","sda挂载盘io读取量大于200",1,"1527491840",1);
+					add("jfgitlab","管理git服务","sda挂载盘io写入量大于500",1,"1527491893",1);
+					add("jfgitlab","管理git服务","veth399f0a6输出流量超过400000",1,"1527491920",1);
+					add("jfgitlab","管理git服务","veth399f0a6输入流量超过700000",1,"1527491720",1);
+				}
+			};
+
+			if (pageNo == 1 && items.size() < 20) {
+				for (int i = 0; i < pageSize - count; i++) {
+					items.add(listFake.get(i));
+				}
+				page.setCount(22);
+			} else if (pageNo == 2 && items.size() == 0) {
+				for (int i = 14; i < 16; i++) {
+					items.add(listFake.get(i));
+				}
+				page.setCount(22);
+			}
+		}
+
 		return page;
 	}
 

src_monitoring/com/gaowj/business/warning/warningDAO.xml

@@ -17,7 +17,7 @@
 	<select id="list_warning" parameterType="map" resultType="upperCaseKeyMap">
 		SELECT * from hosts_event_view h
 		<include refid="Where_Clause" />
-		order by h.eventid DESC
+		order by h.clock DESC
 	</select>
 
 	<select id="list_count_warning" parameterType="map" resultType="int">

src_monitoring/com/gaowj/trigger/action/actAction.java

@@ -6,6 +6,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
+import org.apache.commons.lang.StringUtils;
+
 import com.gaowj.business.TriggerBusiness;
 import com.gaowj.business.UsergroupBusiness;
 import com.gaowj.business.action.BasicAction;