Index: ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportView.js
===================================================================
diff -u -r32194 -r32206
--- ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportView.js	(.../reportView.js)	(revision 32194)
+++ ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportView.js	(.../reportView.js)	(revision 32206)
@@ -22,11 +22,12 @@
 			region: 'center',
 			margins: '0 0 0 0',
 			layout: 'fit',
-			items: reportContainer
+			items: reportContainer,
+			listeners: {
+				render: function () {
+					ret.hide();
+				}
+			}
 		}]
 	});
-
-	setTimeout(function () {
-		ret.hide();
-	}, 3000);
 });
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportUpdate.jsp
===================================================================
diff -u -r32194 -r32206
--- ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportUpdate.jsp	(.../reportUpdate.jsp)	(revision 32194)
+++ ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportUpdate.jsp	(.../reportUpdate.jsp)	(revision 32206)
@@ -19,8 +19,6 @@
 		<script type="text/javascript" src="/js/common.js?version=${svnRevision}"></script>
 		<script type="text/javascript" src="reportUpdate.js?version=${svnRevision}"></script>
 
-		<div id="gridDiv" style="height: 100%;"></div>
-
 	</body>
 
 </html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/customizedreports/js/api.js
===================================================================
diff -u -r32194 -r32206
--- ssts-web/src/main/webapp/disinfectsystem/customizedreports/js/api.js	(.../api.js)	(revision 32194)
+++ ssts-web/src/main/webapp/disinfectsystem/customizedreports/js/api.js	(.../api.js)	(revision 32206)
@@ -92,28 +92,6 @@
 			}
 		});
 	},
-	//删除报表
-	deleteReportFunction: function (postData) {
-		$.ajax({
-			type: "post",
-			url: WWWROOT + '/disinfectSystem/customizedReports/reportController/deleteReportDefinition.mhtml',
-			async: true,
-			data: postData,
-			success: function (result) {
-				var res = JSON.parse(result);
-
-				if (res.success) {
-					layer.msg('删除成功');
-
-					setTimeout(function () {
-						window.location.reload()
-					}, 500);
-				} else {
-					layer.msg(res.message);
-				}
-			}
-		});
-	},
 	//读取自定义报表
 	getReportDefinition: function (postData, callback) {
 		$.ajax({
@@ -168,24 +146,6 @@
 			}
 		});
 	},
-	//保存报表
-	saveReportDefinition: function (postData, callback) {
-		$.ajax({
-			type: "post",
-			url: WWWROOT + '/disinfectSystem/customizedReports/reportController/saveReportDefinition.mhtml',
-			async: true,
-			data: postData,
-			success: function (result) {
-				var res = JSON.parse(result);
-
-				if (res.success) {
-					callback(res);
-				} else {
-					layer.msg(res.message);
-				}
-			}
-		});
-	},
 	//获取所有文件夹
 	getAllFolders: function (callback) {
 		$.ajax({
@@ -203,60 +163,6 @@
 			}
 		});
 	},
-	//文件夹重命名
-	renameFolder: function (postData, callback) {
-		$.ajax({
-			type: "post",
-			url: WWWROOT + '/disinfectSystem/customizedReports/folderController/renameFolder.mhtml',
-			async: true,
-			data: postData,
-			success: function (result) {
-				var res = JSON.parse(result);
-
-				if (res.success) {
-					callback(res);
-				} else {
-					layer.msg(res.message);
-				}
-			}
-		});
-	},
-	//删除文件夹
-	deleteFolder: function (postData, callback) {
-		$.ajax({
-			type: "post",
-			url: WWWROOT + '/disinfectSystem/customizedReports/folderController/deleteFolder.mhtml',
-			async: true,
-			data: postData,
-			success: function (result) {
-				var res = JSON.parse(result);
-
-				if (res.success) {
-					callback(res);
-				} else {
-					layer.msg(res.message);
-				}
-			}
-		});
-	},
-	//保存文件夹
-	saveFolder: function (postData, callback) {
-		$.ajax({
-			type: "post",
-			url: WWWROOT + '/disinfectSystem/customizedReports/folderController/saveFolder.mhtml',
-			async: true,
-			data: postData,
-			success: function (result) {
-				var res = JSON.parse(result);
-
-				if (res.success) {
-					callback(res);
-				} else {
-					layer.msg(res.message);
-				}
-			}
-		});
-	},
 	//获取数据类型
 	getAllTypesOfDataSet: function (callback) {
 		$.ajax({
@@ -292,77 +198,6 @@
 			}
 		});
 	},
-	//获取报表查询条件的参数
-	getAllParameters: function (postData, callback) {
-		$.ajax({
-			type: "post",
-			url: WWWROOT + '/disinfectSystem/customizedReports/parameterController/getAllParameters.mhtml',
-			async: true,
-			data: postData,
-			success: function (result) {
-				var res = JSON.parse(result);
-
-				if (res.success) {
-					callback(res);
-				} else {
-					layer.msg(res.message);
-				}
-			}
-		});
-	},
-	//保存报表参数
-	saveParameter: function (postData, callback) {
-		$.ajax({
-			type: "post",
-			url: WWWROOT + '/disinfectSystem/customizedReports/parameterController/saveParameter.mhtml',
-			async: true,
-			data: postData,
-			success: function (result) {
-				var res = JSON.parse(result);
-
-				callback(res);
-			}
-		});
-	},
-	//删除报表参数
-	deleteParameter: function (postData, callback) {
-		$.ajax({
-			type: "post",
-			url: WWWROOT + '/disinfectSystem/customizedReports/parameterController/deleteParameter.mhtml',
-			async: true,
-			data: postData,
-			success: function (result) {
-				var res = JSON.parse(result);
-
-				if (res.success) {
-					callback(res);
-				} else {
-					layer.msg(res.message);
-				}
-			}
-		});
-	},
-	//删除表格
-	closeTable: function (docIndex, callback) {
-		var optionsList = JSON.parse(sessionStorage.getItem('optionsList'));
-
-		var tableOptionList = optionsList.tableOptionList;
-		var chartOptionList = optionsList.chartOptionList;
-
-		tableOptionList.splice(docIndex, 1);
-
-		var zIndex = parseInt(optionsList.zIndex) - 1;
-
-		var newOptionsList = {
-			tableOptionList: tableOptionList,
-			chartOptionList: chartOptionList,
-			zIndex: zIndex
-		}
-
-		sessionStorage.setItem('optionsList', JSON.stringify(newOptionsList));
-
-		callback();
-	},
 	querySingleColumn: function (postData, callback) {
 		$.ajax({
 			type: "post",
Index: ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportList.jsp
===================================================================
diff -u -r32194 -r32206
--- ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportList.jsp	(.../reportList.jsp)	(revision 32194)
+++ ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportList.jsp	(.../reportList.jsp)	(revision 32206)
@@ -11,16 +11,18 @@
 		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
 		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 		<title>报表定义</title>
+		<link rel="stylesheet" href="./layui/css/layui.css?version=${svnRevision}"></link>
 	</head>
 
 	<body>
 		<%@ include file="/common/include_Ext425JsAndCss.jsp"%>
-
-		<script type="text/javascript" src="/js/common.js?version=${svnRevision}"></script>
+		<script>
+			var WWWROOT = '${ctx}';
+		</script>
+		<script type="text/javascript" src="${ctx}/js/common.js?version=${svnRevision}"></script>
 		<script type="text/javascript" src="reportList.js?version=${svnRevision}"></script>
 
 		<div id="gridDiv" style="height: 100%;"></div>
-
 	</body>
 
 </html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportList/reportView.jsp
===================================================================
diff -u -r32194 -r32206
--- ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportList/reportView.jsp	(.../reportView.jsp)	(revision 32194)
+++ ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportList/reportView.jsp	(.../reportView.jsp)	(revision 32206)
@@ -13,150 +13,18 @@
 		<title>自定义报表</title>
 		<meta name="description" content="demo" />
 		<link rel="stylesheet" href="../layui/css/layui.css?version=${svnRevision}"></link>
+		<link rel="stylesheet" href="../js/common.css?version=${svnRevision}"></link>
 		<style>
-			#myGrid {
-				height: auto !important;
-			}
-			
 			#myGrid .ag-root-wrapper {
-				position: absolute;
-				background: #fff;
+				top: -25px !important;
 			}
-			
-			.chart-wrapper {
-				position: relative !important;
-			}
-			
-			.chart-wrapper-centent {
-				position: absolute;
-				left: 0;
-				top: 0;
-				width: 800px;
-				height: 434px;
-			}
-			
-			.chart-wrapper-centent .chart-wrapper {
-				width: 800px;
-				height: 434px;
-			}
-			
-			.buttons {
-				display: flex;
-				align-items: center;
-				justify-content: space-between;
-				margin-right: 220px;
-			}
-			
-			.btns .layui-btn-group {
-				display: flex;
-			}
-			
-			.layui-tree-txt,
-			.layui-tree-icon,
-			.layui-tree-icon .layui-icon {
-				color: #fff !important;
-			}
-			
-			.pageNumber {
-				text-align: right;
-				padding-right: 20px;
-			}
-			
-			.layui-laypage a,
-			.layui-laypage span {
-				margin-bottom: 0 !important;
-				line-height: 25px !important;
-			}
-			
-			.layui-laypage .layui-laypage-curr .layui-laypage-em {
-				top: 0 !important;
-			}
-			
-			#charts {
-				position: relative;
-			}
-			
-			.noneText {
-				font-size: 20px;
-				color: #555;
-			}
-			
 			.chartItem,
 			.ag-root-wrapper {
 				border: 1px solid rgb(221, 219, 218);
 				border-radius: .25rem;
 				background-clip: padding-box;
 				box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.10);
 			}
-
-			.searchDiv {
-				padding: 10px;
-			}
-			
-			.searchDiv .layui-form-item {
-				margin-bottom: 0;
-			}
-			
-			.searchDiv .layui-form-item .layui-inline {
-				height: 30px !important;
-			}
-			
-			.layui-form-pane .layui-form-label {
-				padding: 0 15px !important;
-				height: 30px;
-				line-height: 27px;
-			}
-			
-			.layui-input {
-				height: 30px;
-				line-height: 30px;
-			}
-			
-			#time {
-				width: 250px;
-			}
-			
-			.layui-laypage select {
-				height: 28px;
-			}
-			
-			.tableName {
-				font-size: 24px;
-				margin-bottom: 5px;
-				text-align: center;
-			}
-
-			xm-select {
-				width: 180px !important;
-				height: 30px !important;
-				line-height: 30px !important;
-			}
-			
-			xm-select>.xm-label .scroll {
-				overflow-y: inherit !important;
-			}
-			
-			xm-select>.xm-label .scroll .label-content {
-				height: 30px !important;
-			}
-			
-			xm-select>.xm-label .xm-label-block {
-				height: 22px !important;
-				line-height: 22px !important;
-			}
-			
-			xm-select>.xm-label .xm-label-block>span {
-				font-size: 12px !important;
-			}
-
-			xm-select > .xm-body{
-				width: 220px !important;
-				top: 30px !important; 
-			}
-
-			.layui-form-select dl {
-				top: 30px !important; 
-			}
 		</style>
 		<script src="../js/ag-grid-enterprise.min.js?version=${svnRevision}"></script>
 	</head>
@@ -165,6 +33,7 @@
 		var api;
 		var defaultDepartCoding = '${departCoding}';
 		var defaultDepartName = '${departName}';
+		var reportId = '${param.id}';
 	</script>
 
 	<body>
Index: ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportList/reportUpdate.js
===================================================================
diff -u -r32194 -r32206
--- ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportList/reportUpdate.js	(.../reportUpdate.js)	(revision 32194)
+++ ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportList/reportUpdate.js	(.../reportUpdate.js)	(revision 32206)
@@ -1,23 +1,16 @@
-layui.use(['layer', 'table', 'form', 'tree', 'laypage', 'laydate'], function () {
+layui.use(['layer', 'table', 'form', 'laypage', 'laydate'], function () {
 	var layer = layui.layer;
 	var laypage = layui.laypage;
 	var form = layui.form;
 	var laydate = layui.laydate;
-	var tree = layui.tree;
 	var $ = layui.jquery;
 	var table = layui.table;
-	var root = WWWROOT;
 
 	var tableOptions = [];
 	var tableDataSetSource = [];
 	var tableIndex = 0;
 	var tableSearchOptions = [];
 
-	var chartOptions = [];
-	var chartDataSetSource = [];
-	var chartIndex = 0;
-	var chartSearchOptions = [];
-
 	var zIndex = 0;
 
 	var attrTitleName = '';
@@ -78,22 +71,13 @@
 
 	//获取报表详情
 	function getReportInfo(data, type) {
-		var tableJson = data;
 		var chartArray = data.chartArray || [];
 		var tableArray = data.tableArray || [];
 
 		zIndex = data.zIndex || 0;
 
-		if (type == 'table') {
-			getReportInfoForTable(tableArray);
-		} else if (type == 'chart') {
-			getReportInfoForChart(chartArray);
-		} else {
-			getReportInfoForTable(tableArray);
+		getReportInfoForTable(tableArray);
 
-			getReportInfoForChart(chartArray);
-		}
-
 		saveDraft(function () { });
 	};
 
@@ -159,7 +143,7 @@
 	};
 
 	//获取表格详情
-	function getReportInfoForTable(tableArray, queryJson) {
+	function getReportInfoForTable(tableArray) {
 		setElementById('myGrid', 'html', '');
 
 		tableOptions = [];
@@ -328,128 +312,12 @@
 
 				gridOptionsDefault.api.setServerSideDatasource(datasource);
 
-				var dataArr = [];
-				api.getOrgunitInfoForCusReport(function (res) {
-					for (var z = 0; z < res.length; z++) {
-						dataArr[z] = {
-							name: res[z].selectName,
-							value: res[z].selectValue
-						}
-						if (res[z].selectValue == defaultDepartCoding) {
-							dataArr[z].selected = true;
-						}
-					}
-				})
-
-				for (var j = 0; j < searchOptions.length; j++) {
-					var startDate;
-					var endDate;
-					var searchParameterValue;
-					var newDataArr = [];
-					if (typeof searchOptions[j].parameterValue == 'string') {
-						searchParameterValue = JSON.parse(searchOptions[j].parameterValue);
-					} else {
-						searchParameterValue = searchOptions[j].parameterValue;
-					}
-
-					var elementName = searchOptions[j].elementName;
-
-					if (elementName == '供应室') {
-						newDataArr = dataArr;
-					}
-
-					var defaultStartDate = searchParameterValue.defaultStartDate;
-					var defaultEndDate = searchParameterValue.defaultEndDate;
-					var defaultChange = searchParameterValue.defaultChange;
-
-					if (searchOptions[j].elementType == 'date') {
-						if (defaultChange == 5) {
-							startDate = defaultStartDate;
-							endDate = defaultEndDate;
-						} else {
-							startDate = getDate(defaultChange);
-							endDate = getDate();
-						}
-
-						laydate.render({
-							elem: '#tableDate-' + j,
-							range: true,
-							value: startDate + ' - ' + endDate
-						});
-					}
-
-					if (searchOptions[j].elementType == 'time') {
-						if (defaultChange == 5) {
-							startDate = defaultStartDate;
-							endDate = defaultEndDate;
-						} else {
-							startDate = getDate(defaultChange) + ' ' + defaultStartDate;
-							endDate = getDate() + ' ' + defaultEndDate;
-						}
-
-						laydate.render({
-							elem: '#tableTime-' + j,
-							type: 'datetime',
-							range: true,
-							value: startDate + ' - ' + endDate
-						});
-					}
-
-					if (searchOptions[j].elementType == 'system') {
-						if (elementName == '供应室') {
-							xmSelectRender(j, searchOptions, newDataArr);
-						}
-					}
-				}
-
-				form.render('select');
+				//渲染查询条件
+				renderSearchBox(searchOptions, form, laydate);
 			});
 		}
 	};
 
-	//获取图形详情
-	function getReportInfoForChart(chartArray) {
-		chartIndex = chartArray.length;
-		chartOptions = [];
-		chartDataSetSource = [];
-		chartSearchOptions = [];
-
-		for (var i = 0; i < chartArray.length; i++) {
-			var postData = {
-				id: chartArray[i].datasetId,
-				limit: defaultTableLimit,
-				offset: 0
-			}
-
-			api.getRecordsOfDataSet(postData, function (res) {
-				var rows = res.rows || [];
-
-				var columnDefsDefault = chartArray[i].chartDataSetSource;
-				var searchOptions = chartArray[i].children.searchOptions;
-				var obj = {
-					width: chartArray[i].tableWidth,
-					height: chartArray[i].tableHeight,
-					top: chartArray[i].tableTop,
-					left: chartArray[i].tableLeft,
-					id: chartArray[i].datasetId,
-					componentId: chartArray[i].componentId,
-					chartOptions: chartArray[i].chartOptions,
-					index: i,
-					zIndex: chartArray[i].tableZindex,
-					searchOptions: searchOptions,
-					tableName: chartArray[i].tableName
-				};
-
-				chartOptions[i] = obj;
-				chartDataSetSource[i] = columnDefsDefault;
-
-				chartSearchOptions.push(searchOptions);
-
-				chartInit(columnDefsDefault, obj, rows, -1);
-			});
-		}
-	}
-
 	//自定义表格配置
 	function gridOptionFunction(columnDefsDefault) {
 		var arr = [];
@@ -697,302 +565,11 @@
 
 		gridOptionsDefault.api.setServerSideDatasource(datasource);
 
-		var dataArr = [];
-		api.getOrgunitInfoForCusReport(function (res) {
-			for (var z = 0; z < res.length; z++) {
-				dataArr[z] = {
-					name: res[z].selectName,
-					value: res[z].selectValue
-				}
-				if (res[z].selectValue == defaultDepartCoding) {
-					dataArr[z].selected = true;
-				}
-			}
-		})
+		renderSearchBox(searchOptions, form, laydate)
 
-		for (var i = 0; i < searchOptions.length; i++) {
-			var startDate;
-			var endDate;
-			var searchParameterValue;
-			var newDataArr = [];
-
-			if (typeof searchOptions[i].parameterValue == 'string') {
-				searchParameterValue = JSON.parse(searchOptions[i].parameterValue);
-			} else {
-				searchParameterValue = searchOptions[i].parameterValue;
-			}
-
-			var elementName = searchOptions[i].elementName;
-
-			if (elementName == '供应室') {
-				newDataArr = dataArr;
-			}
-
-			var defaultStartDate = searchParameterValue.defaultStartDate;
-			var defaultEndDate = searchParameterValue.defaultEndDate;
-			var defaultChange = searchParameterValue.defaultChange;
-
-			if (searchOptions[i].elementType == 'date') {
-				if (defaultChange == 5) {
-					startDate = defaultStartDate;
-					endDate = defaultEndDate;
-				} else {
-					startDate = getDate(defaultChange);
-					endDate = getDate();
-				}
-
-				laydate.render({
-					elem: '#tableDate-' + i,
-					range: true,
-					value: startDate + ' - ' + endDate
-				});
-			}
-
-			if (searchOptions[i].elementType == 'time') {
-				if (defaultChange == 5) {
-					startDate = defaultStartDate;
-					endDate = defaultEndDate;
-				} else {
-					startDate = getDate(defaultChange) + ' ' + defaultStartDate;
-					endDate = getDate() + ' ' + defaultEndDate;
-				}
-
-				laydate.render({
-					elem: '#tableTime-' + i,
-					type: 'datetime',
-					range: true,
-					value: startDate + ' - ' + endDate
-				});
-			}
-
-			if (searchOptions[i].elementType == 'system') {
-				if (elementName == '供应室') {
-					xmSelectRender(i, searchOptions, newDataArr);
-				}
-			}
-		}
-
-		form.render();
-
 		saveDraft(function () { });
 	};
 
-	//图形初始化
-	function chartInit(columnDefsDefault, obj, rows, index) {
-		var chartContainer = document.getElementById('charts');
-		var searchOptions = obj.searchOptions || [];
-		var chartOrderIndex = index;
-		var tableName = obj.tableName || '';
-		var datasetId = obj.id;
-
-		var parameterValue = '';
-
-		var html = '<div class="chart-wrapper-centent ag-theme-balham ag-popup" style="width:' + obj.width + 'px;height:' + obj.height + 'px;top:' + obj.top + 'px;left:' + obj.left + 'px;z-index:' + obj.zIndex + '">' +
-			'<div class="chart-wrapper ag-panel ag-dialog ag-ltr" style="width:' + obj.width + 'px;height:' + obj.height + 'px;">' +
-			'<div class="ag-title-bar ag-unselectable">' +
-			'<span class="ag-title-bar-title">图表</span>' +
-			'<div class="ag-title-bar-buttons">' +
-			'<div class="ag-button chart-wrapper-add"><input type="hidden" class="addIndex" value="' + obj.index + '" /><img src="/images/web/action_add.png"/></div>' +
-			'<div class="ag-button chart-wrapper-search"><input type="hidden" class="searchIndex" value="' + obj.index + '" /><img src="/images/web/search.png"/></div>' +
-			'<div class="ag-button chart-wrapper-close"><input type="hidden" class="closeIndex" value="' + obj.index + '" /><span class="ag-icon ag-icon-cross"></span></div>' +
-			'</div>' +
-			'</div>';
-		if (searchOptions.length > 0) {
-			html += getSearchBox(obj.index, datasetId, obj.componentId, searchOptions);
-		}
-
-		html += '<div class="tableName">' + tableName + '</div>';
-		html += '<div class="ag-panel-content-wrapper chart-wrapper-body chartItem"></div>' +
-			'</div>' +
-			'<div class="ag-resizer-wrapper drag">' +
-			'<div class="ag-resizer ag-resizer-bottomRight" style="pointer-events: all;"><img src="../img/resize.png"/></div>' +
-			'</div>' +
-			'<input type="hidden" class="id" value="' + datasetId + '" />' +
-			'<input type="hidden" class="componentId" value="' + obj.componentId + '" />';
-		'</div>';
-
-		var chartDiv;
-
-		if (chartOrderIndex == -1) {
-			chartDiv = document.createElement('div');
-			chartDiv.className = 'chartItem';
-			chartDiv.innerHTML = html;
-			chartContainer.appendChild(chartDiv);
-		} else {
-			chartDiv = chartContainer.children[chartOrderIndex];
-			chartDiv.innerHTML = html;
-		}
-
-		closeTable(chartDiv.querySelector('.chart-wrapper-close'), 'chart');
-
-		searchTable(chartDiv.querySelector('.chart-wrapper-search'), 'chart');
-
-		addTitle(chartDiv.querySelector('.chart-wrapper-add'), 'chart');
-
-		dragBox(chartDiv.querySelector(".ag-title-bar"), chartDiv.querySelector(".chart-wrapper-centent"));
-
-		mouseDown(chartDiv.querySelector(".chart-wrapper"));
-
-		var dataArr = [];
-		api.getOrgunitInfoForCusReport(function (res) {
-			for (var z = 0; z < res.length; z++) {
-				dataArr[z] = {
-					name: res[z].selectName,
-					value: res[z].selectValue
-				}
-				if (res[z].selectValue == defaultDepartCoding) {
-					dataArr[z].selected = true;
-				}
-			}
-		})
-
-		for (var i = 0; i < searchOptions.length; i++) {
-			var startDate;
-			var endDate;
-			var searchParameterValue;
-			var newDataArr = [];
-
-			if (typeof searchOptions[i].parameterValue == 'string') {
-				searchParameterValue = JSON.parse(searchOptions[i].parameterValue);
-			} else {
-				searchParameterValue = searchOptions[i].parameterValue;
-			}
-
-			var defaultStartDate = searchParameterValue.defaultStartDate;
-			var defaultEndDate = searchParameterValue.defaultEndDate;
-			var defaultChange = searchParameterValue.defaultChange;
-
-			var elementName = searchOptions[i].elementName;
-
-			if (elementName == '供应室') {
-				newDataArr = dataArr;
-			}
-
-			if (searchOptions[i].elementType == 'date') {
-				if (defaultChange == 5) {
-					startDate = defaultStartDate;
-					endDate = defaultEndDate;
-				} else {
-					startDate = getDate(defaultChange);
-					endDate = getDate();
-				}
-
-				laydate.render({
-					elem: '#chartDate-' + i,
-					range: true,
-					value: startDate + ' - ' + endDate
-				});
-			}
-
-			if (searchOptions[i].elementType == 'time') {
-				if (defaultChange == 5) {
-					startDate = defaultStartDate;
-					endDate = defaultEndDate;
-				} else {
-					startDate = getDate(defaultChange) + ' ' + defaultStartDate;
-					endDate = getDate() + ' ' + defaultEndDate;
-				}
-
-				laydate.render({
-					elem: '#chartTime-' + i,
-					type: 'datetime',
-					range: true,
-					value: startDate + ' - ' + endDate
-				});
-			}
-
-			if (searchOptions[i].elementType == 'system') {
-				if (elementName == '供应室') {
-					xmSelectRender(i, searchOptions, newDataArr);
-				}
-			}
-		}
-
-		form.render();
-
-		chartStart(chartDiv.querySelector('.chartItem'), obj, columnDefsDefault, rows);
-	};
-
-	//获取图形
-	function chartStart(chartContent, obj, columnDefsDefault, rows) {
-		var myChart = echarts.init(chartContent);
-
-		var columns = obj.chartOptions.cellRange.columns;
-		var chartType = obj.chartOptions.chartType;
-
-		var xAxisData = [];
-		var seriesData = [];
-		var pieSeriesData = [];
-
-		for (var i = 0; i < columns.length; i++) {
-			var data = 0;
-
-			for (var j = 0; j < rows.length; j++) {
-				var value = rows[j][columns[i]] || 0;
-				value = (isNaN(parseInt(value))) ? 0 : parseInt(value);
-
-				data += value;
-			}
-
-			for (var k = 0; k < columnDefsDefault.length; k++) {
-				if (columnDefsDefault[k].field == columns[i]) {
-					xAxisData[i] = columnDefsDefault[k].headerName;
-					pieSeriesData[i] = {
-						value: data,
-						name: columnDefsDefault[k].headerName
-					}
-				}
-			}
-
-			seriesData[i] = data;
-		}
-
-		if (chartType == 'pie') {
-			var option = {
-				title: {
-					text: '',
-					x: 'center'
-				},
-				legend: {
-					type: 'scroll',
-					orient: 'vertical',
-					right: 10,
-					top: 20,
-					bottom: 20,
-					data: xAxisData
-				},
-				series: [{
-					type: chartType,
-					radius: '55%',
-					center: ['50%', '60%'],
-					data: pieSeriesData
-				}]
-			};
-
-			myChart.setOption(option);
-		} else {
-			var option = {
-				title: {
-					text: '',
-					x: 'center'
-				},
-				xAxis: {
-					type: 'category',
-					data: xAxisData
-				},
-				yAxis: {
-					type: 'value'
-				},
-				series: [{
-					data: seriesData,
-					type: chartType
-				}]
-			};
-
-			myChart.setOption(option);
-		}
-	};
-
 	//删除表格
 	function closeTable(pThat, type) {
 		pThat.onclick = function () {
@@ -1014,32 +591,13 @@
 						getReportDefinition(saveReportOptions.reportId, 'table');
 					}, 200);
 				});
-			} else {
-				var item = pThat.parentNode.parentNode.parentNode.parentNode;
-
-				item.parentNode.removeChild(item);
-
-				chartOptions[docIndex] = null;
-				chartDataSetSource[docIndex] = null;
-				chartIndex--
-				chartSearchOptions[docIndex] = null;
-
-				saveDraft(function () {
-					setTimeout(function () {
-						getReportDefinition(saveReportOptions.reportId, 'chart');
-					}, 200);
-				});
 			}
 		};
 		pThat.onmouseenter = function () {
 			if (type == 'table') {
 				layerWin = layer.tips('删除表格', pThat, {
 					tips: 3
 				});
-			} else {
-				layerWin = layer.tips('删除图形', pThat, {
-					tips: 3
-				});
 			}
 
 			return;
@@ -1091,11 +649,6 @@
 						componentId = pThat.parentElement.getElementsByClassName('componentId')[0].getElementsByClassName('id')[0].value;
 						divOption = pThat.parentElement.parentElement.getElementsByClassName('ag-root-wrapper')[0];
 						tableName = pThat.parentElement.getElementsByTagName('div')[0].getElementsByClassName('title')[0].getElementsByClassName('tableName')[0].innerText;
-					} else {
-						datasetId = pThat.parentElement.parentElement.parentElement.parentElement.getElementsByClassName('id')[0].value;
-						componentId = pThat.parentElement.parentElement.parentElement.parentElement.getElementsByClassName('componentId')[0].value;
-						divOption = pThat.parentElement.parentElement.parentElement.parentElement.parentElement.getElementsByClassName('chart-wrapper-centent')[0];
-						tableName = pThat.parentElement.parentElement.parentElement.getElementsByClassName('tableName')[0].innerText;
 					}
 
 					var tableWidth = divOption.style.width.split('px')[0];
@@ -1160,28 +713,13 @@
 
 					layer.close(index);
 				});
-			} else {
-				layer.prompt({
-					formType: 0,
-					value: '',
-					title: '请输入图形标题',
-					area: ['800px', '350px'] //自定义文本域宽高
-				}, function (value, index, elem) {
-					pThat.parentNode.parentNode.parentNode.getElementsByClassName('tableName')[0].innerHTML = value;
-					chartOptions[docIndex].tableName = value;
-					layer.close(index);
-				});
 			}
 		};
 		pThat.onmouseenter = function (e) {
 			if (type == 'table') {
 				layerWin = layer.tips('设置表格标题', pThat, {
 					tips: 3
 				});
-			} else {
-				layerWin = layer.tips('设置图形标题', pThat, {
-					tips: 3
-				});
 			}
 		};
 		pThat.onmouseleave = function () {
@@ -1235,57 +773,6 @@
 		})
 	};
 
-	//获取数据类型（图形）
-	function getChartDataType() {
-		layer.open({
-			type: 1,
-			content: $('#chartDataWindow'),
-			title: '选择数据集',
-			area: ['800px', '400px'],
-			success: function () {
-				setElementById('chartDataSetTypeBody', 'html', '');
-				setElementById('chartDataSetBody', 'html', '');
-
-				setElementById('columnDefString', 'value', '');
-				setElementById('objString', 'value', '');
-				setElementById('rowString', 'value', '');
-				setElementById('rowEndIndex', 'value', 0);
-				setElementById('showField', 'html', '');
-
-				document.getElementById('chartForm').style.display = 'none';
-
-				api.getAllTypesOfDataSet(function (res) {
-					var rows = res.rows || [];
-
-					var html = '';
-
-					for (var i = 0; i < rows.length; i++) {
-						html += '<tr class="chartChangeDataType"><td>' + rows[i] + '</td></tr>';
-					}
-
-					setElementById('chartDataSetTypeBody', 'html', html);
-
-					var nodeList = document.querySelectorAll('.chartChangeDataType');
-
-					for (var i = 0; i < nodeList.length; i++) {
-						nodeList[i].onclick = function () {
-							var name = this.getElementsByTagName('td')[0].innerText;
-							var index = rows.indexOf(name);
-
-							for (var j = 0; j < rows.length; j++) {
-								document.getElementsByClassName('chartChangeDataType')[j].getElementsByTagName('td')[0].style.color = '#666';
-							}
-
-							document.getElementsByClassName('chartChangeDataType')[index].getElementsByTagName('td')[0].style.color = '#009688';
-
-							getChartDataSet(name)
-						}
-					}
-				})
-			}
-		})
-	};
-
 	//获取数据集（表格）
 	function getDataSet(name) {
 		var postData = {
@@ -1314,35 +801,6 @@
 		});
 	};
 
-	//获取数据集（图表）
-	function getChartDataSet(name) {
-		var postData = {
-			type: name
-		};
-
-		api.getDataSet(postData, function (res) {
-			var rows = res.rows || [];
-
-			var html = '';
-
-			for (var i = 0; i < rows.length; i++) {
-				html += '<tr class="chartChangeDataSet"><input type="hidden" value="' + rows[i].datasetId + '" /><td>' + rows[i].datasetName + '</td></tr>';
-			}
-
-			setElementById('chartDataSetBody', 'html', html);
-
-			var nodeList = document.querySelectorAll('.chartChangeDataSet');
-
-			for (var i = 0; i < nodeList.length; i++) {
-				nodeList[i].onclick = function () {
-					var datasetId = this.getElementsByTagName('input')[0].value;
-
-					getChartFieldsOfDataSet(datasetId)
-				}
-			}
-		});
-	};
-
 	//获取数据集所有的字段列表（表格）
 	function getFieldsOfDataSet(datasetId) {
 		var postData = {
@@ -1396,68 +854,6 @@
 		});
 	};
 
-	//获取数据集所有的字段列表（图形）
-	function getChartFieldsOfDataSet(datasetId) {
-		var postData = {
-			id: datasetId
-		};
-
-		api.getFieldsOfDataSet(postData, function (res) {
-			var rows = res.rows || [];
-			var componentId = res.data || '';
-			var columnDefsDefault = [];
-
-			for (var i = 0; i < rows.length; i++) {
-				columnDefsDefault[i] = {
-					field: rows[i].fieldName,
-					headerName: rows[i].fieldDisplayName,
-					enableRowGroup: true,
-					enablePivot: false,
-					type: rows[i].fieldType,
-					filter: (rows[i].queryParameterType == 'none') ? false : true
-				}
-			}
-
-			var postData = {
-				id: datasetId,
-				limit: defaultTableLimit,
-				offset: 0
-			};
-
-			api.getRecordsOfDataSet(postData, function (res) {
-				var rows = res.rows || [];
-
-				var obj = {
-					width: 800,
-					height: 400,
-					top: 0,
-					left: 0,
-					id: datasetId,
-					componentId: componentId,
-					chartOptions: {}
-				};
-
-				var html = '';
-
-				for (var i = 0; i < columnDefsDefault.length; i++) {
-					html += '<input type="checkbox" class="fieldName fieldName_' + i + '" value="' + columnDefsDefault[i].field + '" lay-skin="primary" title="' + columnDefsDefault[i].headerName + '" checked>';
-				}
-
-				var rowString = (rows.length > 0) ? JSON.stringify(rows) : '';
-
-				setElementById('columnDefString', 'value', JSON.stringify(columnDefsDefault));
-				setElementById('objString', 'value', JSON.stringify(obj));
-				setElementById('rowString', 'value', rowString);
-				setElementById('rowEndIndex', 'value', columnDefsDefault.length);
-				setElementById('showField', 'html', html);
-
-				document.getElementById('chartForm').style.display = 'block';
-
-				form.render();
-			})
-		});
-	};
-
 	//获取所有报表数据
 	function getReportData() {
 		var tableNewOptions = [];
@@ -1490,7 +886,6 @@
 		}
 
 		var tableArray = [];
-		var chartArray = [];
 
 		var nodeList = document.getElementById('myGrid').querySelectorAll('.ag-root-wrapper');
 
@@ -1546,137 +941,14 @@
 			};
 		}
 
-		var chartNewOptions = [];
-		var chartNewDataSetSource = [];
-		var chartNewSearchOptions = [];
-
-		for (var i = 0, z = 0; i < chartOptions.length; i++) {
-			var chartOptionsItem = chartOptions[i] || 'null';
-
-			if (chartOptionsItem !== 'null') {
-				chartNewOptions[z] = chartOptions[i];
-				z++;
-			}
-		}
-
-		for (var i = 0, z = 0; i < chartDataSetSource.length; i++) {
-			var chartDataSetSourceItem = chartDataSetSource[i] || 'null';
-
-			if (chartDataSetSourceItem !== 'null') {
-				chartNewDataSetSource[z] = chartDataSetSource[i];
-				z++;
-			}
-		}
-
-		for (var i = 0, z = 0; i < chartSearchOptions.length; i++) {
-			var chartSearchOptionsItem = chartSearchOptions[i] || 'null';
-
-			if (chartSearchOptionsItem !== 'null') {
-				chartNewSearchOptions[z] = chartSearchOptions[i];
-				z++;
-			}
-		}
-
-		var nodeList2 = document.getElementById('charts').querySelectorAll('.chart-wrapper-centent');
-
-		for (var i = 0; i < nodeList2.length; i++) {
-			var item = nodeList2[i];
-			var index = i;
-
-			var tableWidth = item.style.width.split('px')[0];
-			var tableHeight = item.style.height.split('px')[0];
-			var tableTop = item.style.top.split('px')[0];
-			var tableLeft = item.style.left.split('px')[0];
-			var tableZindex = item.style.zIndex;
-			var chartOptionsObject = chartNewOptions[index].chartOptions;
-			var chartDataSetSourceObject = chartNewDataSetSource[index];
-			var datasetId = item.getElementsByClassName('id')[0].value;
-			var componentId = item.getElementsByClassName('componentId')[0].value;
-
-			chartArray[index] = {
-				tableWidth: tableWidth,
-				tableHeight: tableHeight,
-				tableTop: tableTop,
-				tableLeft: tableLeft,
-				tableZindex: tableZindex,
-				chartOptions: chartOptionsObject,
-				chartDataSetSource: chartDataSetSourceObject,
-				datasetId: datasetId,
-				componentId: componentId,
-				tableName: chartNewOptions[index].tableName || '',
-				tableLimit: defaultTableLimit,
-				children: {
-					searchOptions: chartNewSearchOptions[index] || []
-				}
-			}
-		}
-
 		var tableJson = {
 			tableArray: tableArray,
-			chartArray: chartArray,
 			zIndex: zIndex
 		}
 
 		return tableJson;
 	}
 
-	//添加图形到报表
-	form.on('submit(chartForm)', function (data) {
-		var rows = [];
-		var obj = [];
-
-		if (data.field.rowString == '') {
-			rows = [];
-		} else {
-			rows = JSON.parse(data.field.rowString);
-		}
-
-		if (data.field.objString == '') {
-			obj = [];
-		} else {
-			obj = JSON.parse(data.field.objString);
-		}
-
-		var columnDefsDefault = JSON.parse(data.field.columnDefString);
-		var rowStartIndex = data.field.rowStartIndex || 0;
-		var rowEndIndex = data.field.rowEndIndex || columnDefsDefault.length;
-
-		var columnArray = [];
-
-		for (var i = 0, z = 0; i < columnDefsDefault.length; i++) {
-			var checked = $('.fieldName_' + i).prop('checked');
-
-			if (checked) {
-				var value = document.querySelector('.fieldName_' + i).value;
-
-				columnArray[z] = value;
-				z++;
-			}
-		}
-
-		obj.chartOptions = {
-			cellRange: {
-				rowStartIndex: parseInt(rowStartIndex),
-				rowEndIndex: parseInt(rowEndIndex),
-				columns: columnArray
-			},
-			chartType: data.field.chartType
-		}
-
-		obj.index = chartIndex;
-		obj.zIndex = zIndex;
-
-		chartOptions[chartIndex] = obj;
-		chartDataSetSource[chartIndex] = columnDefsDefault;
-
-		chartIndex++;
-		layer.closeAll();
-
-		zIndex++;
-
-		chartInit(columnDefsDefault, obj, rows, -1);
-	});
-
 	//新增表格
 	document.getElementById('addTable').addEventListener('click', function () {
 		getDataType();
@@ -1694,7 +966,7 @@
 			return;
 		} else {
 			if (tableOptions.length == 0 && chartOptions.length == 0) {
-				layer.msg('请添加一个表格或图表');
+				layer.msg('请添加一个表格');
 				return;
 			}
 
@@ -1782,7 +1054,7 @@
 
 		if (saveType == 2 || isAddReport == false) {
 			if (tableOptions.length == 0 && chartOptions.length == 0) {
-				layer.msg('请添加一个表格或图表');
+				layer.msg('请添加一个表格');
 				return;
 			}
 
@@ -1824,11 +1096,6 @@
 		}
 	});
 
-	//添加图形
-	document.getElementById('addChart').addEventListener('click', function () {
-		getChartDataType();
-	});
-
 	//关闭报表
 	document.getElementById('closeReport').addEventListener('click', function () {
 		layer.confirm('是否关闭该页面?', function () {
@@ -1959,8 +1226,6 @@
 
 		if (type == 'table') {
 			rows = tableSearchOptions[index] || [];
-		} else {
-			rows = chartSearchOptions[index] || [];
 		}
 
 		rows.sort(sortNumber);
@@ -2101,25 +1366,6 @@
 
 				getSettingTable(settingId, settingType);
 			})
-		} else {
-			var searchOption = chartSearchOptions[settingId];
-
-			api.getRecordsOfDataSet(postData, function (res) {
-				var rows = res.rows || [];
-				var componentOption = JSON.parse(getElementById('componentOption', 'value'));
-
-				chartOptions[settingId].searchOptions = chartSearchOptions[settingId];
-				chartOptions[settingId].width = componentOption.width;
-				chartOptions[settingId].height = componentOption.height;
-				chartOptions[settingId].left = componentOption.left;
-				chartOptions[settingId].top = componentOption.top;
-				chartOptions[settingId].zIndex = componentOption.zIndex;
-				chartOptions[settingId].index = settingId;
-
-				chartInit(chartDataSetSource[settingId], chartOptions[settingId], rows, settingId);
-
-				getSettingTable(settingId, settingType);
-			})
 		}
 	};
 
@@ -2149,20 +1395,6 @@
 					tableSearchOptions[componentIndex][hiddenSort].parameterValue = JSON.stringify(parameterValue);
 
 					setElementById('hiddenField', 'value', JSON.stringify(parameterValue));
-				} else {
-					var parameterValue = chartSearchOptions[componentIndex][hiddenSort].parameterValue;
-
-					if (typeof parameterValue == 'object') {
-						parameterValue = parameterValue;
-					} else {
-						parameterValue = JSON.parse(parameterValue);
-					}
-
-					parameterValue.children.splice(itemSetId, 1);
-
-					chartSearchOptions[componentIndex][hiddenSort].parameterValue = JSON.stringify(parameterValue);
-
-					setElementById('hiddenField', 'value', JSON.stringify(parameterValue));
 				}
 
 				saveDraft(function () {
@@ -2207,21 +1439,6 @@
 								value: tableData[i].field + ',' + tableData[i].headerName + ',' + settingId + ',' + settingType + ',' + sort + ',' + layerIndex
 							})
 						}
-					} else {
-						var chartData = chartDataSetSource[settingId];
-						var columns = chartOptions[settingId].chartOptions.cellRange.columns;
-
-						for (var i = 0, k = 0; i < chartData.length; i++) {
-							for (var j = 0; j < columns.length; j++) {
-								if (chartData[i].field == columns[j]) {
-									selectData.push({
-										name: chartData[i].headerName,
-										field: chartData[i].field,
-										value: chartData[i].field + ',' + chartData[i].headerName + ',' + settingId + ',' + settingType + ',' + sort + ',' + layerIndex
-									})
-								}
-							}
-						}
 					}
 
 					var html = '';
@@ -2249,9 +1466,6 @@
 					if (settingType == 'table') {
 						datasetId = componentOption.datasetId;
 						componentId = componentOption.componentId;
-					} else {
-						datasetId = chartOptions[settingId].id;
-						componentId = chartOptions[settingId].componentId;
 					}
 
 					reloadPanel(settingId, datasetId, componentId, settingType);
@@ -2290,9 +1504,6 @@
 					if (settingType == 'table') {
 						datasetId = componentOption.datasetId;
 						componentId = componentOption.componentId;
-					} else {
-						datasetId = chartOptions[settingId].id;
-						componentId = chartOptions[settingId].componentId;
 					}
 
 					tableSearchOptions[settingId][data.sort].selectValueType = formRadio.selectValueType;
@@ -2346,9 +1557,6 @@
 					if (settingType == 'table') {
 						datasetId = componentOption.datasetId;
 						componentId = componentOption.componentId;
-					} else {
-						datasetId = chartOptions[settingId].id;
-						componentId = chartOptions[settingId].componentId;
 					}
 
 					reloadPanel(settingId, datasetId, componentId, settingType);
@@ -2430,9 +1638,6 @@
 					if (settingType == 'table') {
 						datasetId = componentOption.datasetId;
 						componentId = componentOption.componentId;
-					} else {
-						datasetId = chartOptions[settingId].id;
-						componentId = chartOptions[settingId].componentId;
 					}
 
 					reloadPanel(settingId, datasetId, componentId, settingType);
@@ -2447,10 +1652,6 @@
 					datasetId = componentOption.datasetId;
 					componentId = componentOption.componentId;
 					tableSearchOptions[settingId].splice(sort, 1);
-				} else {
-					datasetId = chartOptions[settingId].id;
-					componentId = chartOptions[settingId].componentId;
-					chartSearchOptions[settingId].splice(sort, 1);
 				}
 
 				saveDraft(function () {
@@ -2469,9 +1670,6 @@
 			if (settingType == 'table') {
 				datasetId = componentOption.datasetId;
 				componentId = componentOption.componentId;
-			} else {
-				datasetId = chartOptions[settingId].id;
-				componentId = chartOptions[settingId].componentId;
 			}
 			tableSearchOptions[settingId][sort].notAllowBlank = !notAllowBlank;
 			reloadPanel(settingId, datasetId, componentId, settingType);
@@ -2506,9 +1704,6 @@
 			if (settingType == 'table') {
 				tableSearchOptions[settingId][sort].parameterValue = JSON.stringify(fieldArray);
 				tableSearchOptions[settingId][sort].titleName = titleArray.join(',');
-			} else {
-				chartSearchOptions[settingId][sort].parameterValue = JSON.stringify(fieldArray);
-				chartSearchOptions[settingId][sort].titleName = titleArray.join(',');
 			}
 
 			saveDraft(function () {
@@ -2540,13 +1735,6 @@
 				defaultStartDate: startDate,
 				defaultEndDate: endDate
 			};
-		} else {
-			chartSearchOptions[settingId][sort].parameterValue = {
-				field: dateField,
-				defaultChange: selectData,
-				defaultStartDate: startDate,
-				defaultEndDate: endDate
-			};
 		}
 
 		saveDraft(function () {
@@ -2575,13 +1763,6 @@
 					defaultStartDate: CustomizeStartTime,
 					defaultEndDate: CustomizeEndTime
 				};
-			} else {
-				chartSearchOptions[settingId][sort].parameterValue = {
-					field: timeField,
-					defaultChange: selectTime,
-					defaultStartDate: CustomizeStartTime,
-					defaultEndDate: CustomizeEndTime
-				};
 			}
 		} else {
 			var FixStartTime_time = getElementById('FixStartTime-time', 'value');
@@ -2594,13 +1775,6 @@
 					defaultStartDate: FixStartTime_time,
 					defaultEndDate: FixEndTime_time
 				};
-			} else {
-				chartSearchOptions[settingId][sort].parameterValue = {
-					field: timeField,
-					defaultChange: selectTime,
-					defaultStartDate: FixStartTime_time,
-					defaultEndDate: FixEndTime_time
-				};
 			}
 		}
 
@@ -2626,7 +1800,6 @@
 		var elementType = getElementById('elementType', 'value');
 		var elementonlyAsQueryParameter = getElementById('elementonlyAsQueryParameter', 'value');
 		var elementTypeName = $('#elementType').find('option[value=' + elementType + ']').text();
-
 		var componentOption = JSON.parse(getElementById('componentOption', 'value'))
 		var docIndex = componentOption.index;
 		var type = componentOption.type;
@@ -2638,10 +1811,6 @@
 			searchOption = tableSearchOptions[docIndex] || [];
 			datasetId = componentOption.datasetId;
 			componentId = componentOption.componentId;
-		} else {
-			searchOption = chartSearchOptions[docIndex] || [];
-			datasetId = chartOptions[docIndex].id;
-			componentId = chartOptions[docIndex].componentId;
 		}
 		var length = searchOption.length;
 
@@ -2674,7 +1843,6 @@
 				return;
 			}
 
-			parameterValue = JSON.stringify(parameterValue);
 		} else if (elementType == 'date') {
 			parameterValue = {
 				field: fieldArray[0],
@@ -2688,7 +1856,6 @@
 				return;
 			}
 
-			parameterValue = JSON.stringify(parameterValue);
 		} else if (elementType == 'time') {
 			parameterValue = {
 				field: fieldArray[0],
@@ -2702,7 +1869,6 @@
 				return;
 			}
 
-			parameterValue = JSON.stringify(parameterValue);
 		} else if (elementType == 'number') {
 			var condition = getElementById('condition', 'value');
 
@@ -2718,7 +1884,6 @@
 				return;
 			}
 
-			parameterValue = JSON.stringify(parameterValue);
 		} else {
 			parameterValue = fieldArray;
 			if (parameterValue.length == 0) {
@@ -2786,29 +1951,6 @@
 
 				form.render('select');
 			})
-		} else {
-			chartSearchOptions[docIndex] = searchOption;
-
-			api.getRecordsOfDataSet(data, function (res) {
-				var rows = res.rows || [];
-
-				chartOptions[docIndex].searchOptions = chartSearchOptions[docIndex];
-				chartOptions[docIndex].width = componentOption.width;
-				chartOptions[docIndex].height = componentOption.height;
-				chartOptions[docIndex].top = componentOption.top;
-				chartOptions[docIndex].left = componentOption.left;
-				chartOptions[docIndex].zIndex = componentOption.zIndex;
-
-				chartInit(chartDataSetSource[docIndex], chartOptions[docIndex], rows, docIndex);
-
-				getSettingTable(docIndex, type);
-				getQuerySetting('text');
-
-				setElementById('elementName', 'value', '');
-				setElementById('elementType', 'value', 'text');
-
-				form.render('select');
-			})
 		}
 	});
 
@@ -2845,8 +1987,6 @@
 
 		if (componentType == 'table') {
 			tableSearchOptions[componentIndex][hiddenSort].parameterValue = JSON.stringify(rows);
-		} else {
-			chartSearchOptions[componentIndex][hiddenSort].parameterValue = JSON.stringify(rows);
 		}
 
 		setElementById('hiddenField', 'value', JSON.stringify(rows));
@@ -2883,9 +2023,6 @@
 		if (componentType == 'table') {
 			tableSearchOptions[componentIndex][hiddenSort].selectValueType = '2';
 			tableSearchOptions[componentIndex][hiddenSort].parameterValue2 = JSON.stringify(rows);
-		} else {
-			chartSearchOptions[componentIndex][hiddenSort].selectValueType = '2';
-			chartSearchOptions[componentIndex][hiddenSort].parameterValue2 = JSON.stringify(rows);
 		}
 
 		setElementById('hiddenField2', 'value', JSON.stringify(rows));
@@ -2997,20 +2134,12 @@
 				tableSearchOptions[settingId][sort].elementName = value;
 				datasetId = componentOption.datasetId;
 				componentId = componentOption.componentId;
-			} else {
-				chartSearchOptions[settingId][sort].elementName = value;
-				datasetId = chartOptions[settingId].id;
-				componentId = chartOptions[settingId].componentId;
 			}
 		} else {
 			if (settingType == 'table') {
 				tableSearchOptions[settingId][sort].orderIndex = value;
 				datasetId = componentOption.datasetId;
 				componentId = componentOption.componentId;
-			} else {
-				chartSearchOptions[settingId][sort].orderIndex = value;
-				datasetId = chartOptions[settingId].id;
-				componentId = chartOptions[settingId].componentId;
 			}
 		}
 
@@ -3041,14 +2170,6 @@
 			} else {
 				rows = parameterValue;
 			}
-		} else {
-			var parameterValue = chartSearchOptions[componentIndex][hiddenSort].parameterValue;
-
-			if (typeof parameterValue == 'string') {
-				rows = JSON.parse(parameterValue);
-			} else {
-				rows = parameterValue;
-			}
 		}
 
 		if (obj.field == 'selectName') {
@@ -3061,8 +2182,6 @@
 
 		if (componentType == 'table') {
 			tableSearchOptions[componentIndex][hiddenSort].parameterValue = JSON.stringify(rows);
-		} else {
-			chartSearchOptions[componentIndex][hiddenSort].parameterValue = JSON.stringify(rows);
 		}
 
 		setElementById('hiddenField', 'value', JSON.stringify(rows));
@@ -3078,102 +2197,21 @@
 		var field = data.field;
 		var queryJson = [];
 		var startOrEnd = document.getElementsByClassName('startOrEnd');
-		var arr = [];
-		var k = 0;
-		var z = 0;
-		var m = 0;
-		var msg = '';
-		// var layerShowLoad = layer.load(1, {
-		// 	shade: [0.3, '#000'] //0.1透明度的白色背景
-		// });
-		for (var i = 0; i < startOrEnd.length; i++) {
-			var dataType = startOrEnd[i].getAttribute('data-type');
-			var numberType = dataType.split('|')[1];
-			var numberCondition = dataType.split('|')[2];
-			var value = dataType.split('|')[3];
-			var notAllowBlank = dataType.split('|')[4];
-			var name = dataType.split('|')[5];
-			var startOrEndValue = '';
+		var layerShowLoad = layer.load(1, {
+			shade: [0.3, '#000'] //0.1透明度的白色背景
+		});
 
-			if (i % 2 == 0) {
-				startOrEndValue = startOrEnd[i].value;
-				arr[k] = {
-					name: dataType.split('|')[0].split(','),
-					type: numberType,
-					condition: numberCondition,
-					onlyAsQueryParameter: true,
-					value1: startOrEndValue,
-					value2: ''
-				};
-				k++;
-			} else {
-				startOrEndValue = startOrEnd[i].value;
-				arr[k - 1].value2 = startOrEndValue;
-			}
-
-			if ((notAllowBlank == true || notAllowBlank == 'true') && (startOrEndValue == '')) {
-				msg = name + '不能为空！';
-			}
-
-		}
-		for (var key in field) {
-			if (key !== 'datasetId' && key !== 'componentId' && key !== 'componentIndex' && key !== 'componentType') {
-				var type = key.split('|')[1] || '';
-				var condition = key.split('|')[2] || '';
-				var notAllowBlank = key.split('|')[3] || '';
-				var name = key.split('|')[4] || '';
-				var value1 = field[key].split(' - ')[0] || '';
-				var value2 = field[key].split(' - ')[1] || '';
-
-				if ((notAllowBlank == true || notAllowBlank == 'true') && (value1 == '')) {
-					msg = name + '不能为空！';
-				}
-
-				if (type !== '' && type !== 'text') {
-					queryJson[m] = {
-						name: key.split('|')[0].split(','),
-						type: type,
-						condition: condition,
-						onlyAsQueryParameter: true,
-						value1: value1,
-						value2: value2,
-					}
-					m++;
-				}
-			}
-		}
-		if (msg !== '') {
-			layer.msg(msg);
-			return
-		}
-
-		queryJson = queryJson.concat(arr);
 		var datasetId = field.datasetId;
 		var componentIndex = parseInt(field.componentIndex);
 		var componentType = field.componentType;
 
 		if (componentType == 'table') {
-			var tableText = document.getElementsByClassName('xm-table-text');
-			var tableArr = [];
-			for (var j = 0, z = 0; j < tableText.length; j++) {
-				var value = document.getElementsByClassName('xm-table-text')[j].value;
-				var name = document.getElementsByClassName('xm-table-text')[j].getAttribute('name');
-
-				if (value !== '' && name.split('|')[1] == 'text') {
-					tableArr[z] = {
-						name: name.split('|')[0].split(','),
-						type: name.split('|')[1],
-						condition: '',
-						onlyAsQueryParameter: true,
-						value1: value,
-						value2: '',
-					}
-					z++;
-				}
+			if (getSearchResult(field, startOrEnd) == false) {
+				layer.close(layerShowLoad);
+				return;
 			}
+			queryJson = getSearchResult(field, startOrEnd);
 
-			queryJson = queryJson.concat(tableArr);
-
 			var gridOptionsDefault = tableOptions[componentIndex];
 			var that = document.getElementById('myGrid').children[componentIndex].querySelector(".ag-root-wrapper");
 
@@ -3197,46 +2235,6 @@
 
 				layer.close(layerShowLoad);
 			});
-		} else {
-			var chartText = document.getElementsByClassName('xm-chart-text');
-			var chartArr = [];
-
-			for (var j = 0, z = 0; j < chartText.length; j++) {
-				var value = document.getElementsByClassName('xm-chart-text')[j].getElementsByClassName('label-content')[0].innerText || '';
-				var name = document.getElementsByClassName('xm-chart-text')[j].getAttribute('name');
-
-				if (value !== '') {
-					chartArr[z] = {
-						name: name.split('|')[0].split(','),
-						type: name.split('|')[1],
-						condition: '',
-						onlyAsQueryParameter: true,
-						value1: value,
-						value2: '',
-					}
-					z++;
-				}
-			}
-
-			queryJson = queryJson.concat(chartArr);
-
-			var columnDefsDefault = chartDataSetSource[componentIndex];
-			var obj = chartOptions[componentIndex];
-			var postData = {
-				id: datasetId,
-				limit: defaultTableLimit,
-				offset: 0,
-				queryJson: JSON.stringify(queryJson)
-			}
-
-			api.getRecordsOfDataSet(postData, function (res) {
-				var rows = res.rows || [];
-				var chartContent = document.getElementById('charts').children[componentIndex].getElementsByClassName("chartItem")[0];
-
-				chartStart(chartContent, obj, columnDefsDefault, rows);
-
-				layer.close(layerShowLoad);
-			});
 		}
 	});
 });
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportUpdate.js
===================================================================
diff -u -r32194 -r32206
--- ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportUpdate.js	(.../reportUpdate.js)	(revision 32194)
+++ ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportUpdate.js	(.../reportUpdate.js)	(revision 32206)
@@ -21,11 +21,12 @@
 			region: 'center',
 			margins: '0 0 0 0',
 			layout: 'fit',
-			items: reportContainer
+			items: reportContainer,
+			listeners: {
+				render: function () {
+					ret.hide();
+				}
+			}
 		}],
 	});
-
-	setTimeout(function () {
-		ret.hide();
-	}, 3000);
 });
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/customizedreports/js/common.js
===================================================================
diff -u -r32194 -r32206
--- ssts-web/src/main/webapp/disinfectsystem/customizedreports/js/common.js	(.../common.js)	(revision 32194)
+++ ssts-web/src/main/webapp/disinfectsystem/customizedreports/js/common.js	(.../common.js)	(revision 32206)
@@ -659,27 +659,7 @@
 	FakeServer.prototype.filterOutOtherGroups = function (originalData, groupKeys, rowGroupCols) {
 		var filteredData = originalData;
 		var that = this;
-		var orderJson = [];
-		/*
-				for(var i = 0; i < rowGroupCols.length; i++) {
-					orderJson[i] = {
-						colId: rowGroupCols[i].id,
-						sort: 'asc'
-					}
-				}
 
-				var postData = {
-					id: datasetId,
-					limit: 20,
-					offset: offset,
-					queryJson: JSON.stringify(queryJson),
-					orderJson: JSON.stringify(orderJson)
-				}
-
-				api.getRecordsOfDataSet(postData, function(res) {
-					filteredData = res.rows || [];
-				});*/
-
 		groupKeys.forEach(function (groupKey, index) {
 			var rowGroupCol = rowGroupCols[index];
 			var field = rowGroupCol.id;
@@ -748,7 +728,7 @@
 	})(index);
 }
 
-//获取查询条件
+//获取查询条件组件
 function getSearchBox(index, datasetId, componentId, searchOptions, exportTable) {
 	var html = '';
 	html += '<div class="searchDiv">';
@@ -769,6 +749,7 @@
 
 		var elementName = searchOptions[j].elementName;
 		var notAllowBlank = searchOptions[j].notAllowBlank || false;
+		var onlyAsQueryParameter = searchOptions[j].onlyAsQueryParameter;
 
 		if (searchOptions[j].elementType == 'select') {
 			html += '<div class="layui-inline">';
@@ -781,7 +762,7 @@
 			children.sort(sortNumber);
 
 			html += '<div class="layui-inline">';
-			html += '<select name="' + field + '|select||' + notAllowBlank + '|' + elementName + '">';
+			html += '<select name="' + field + '|select||' + notAllowBlank + '|' + elementName + '|' + onlyAsQueryParameter + '">';
 
 			for (var k = 0; k < children.length; k++) {
 				html += '<option value="' + children[k].selectValue + '">' + children[k].selectName + '</option>';
@@ -799,7 +780,7 @@
 			var field = searchOptions[j].parameterValue.field;
 
 			html += '<div class="layui-inline">';
-			html += '<input type="text" name="' + field + '|date||' + notAllowBlank + '|' + elementName + '" id="tableDate-' + j + '" class="layui-input">';
+			html += '<input type="text" name="' + field + '|date||' + notAllowBlank + '|' + elementName + '|' + onlyAsQueryParameter + '" id="tableDate-' + j + '" class="layui-input">';
 			html += '</div>';
 
 			html += '</div></div>';
@@ -811,7 +792,7 @@
 			var field = searchOptions[j].parameterValue.field;
 
 			html += '<div class="layui-inline">';
-			html += '<input type="text" style="width:250px" name="' + field + '|time||' + notAllowBlank + '|' + elementName + '" id="tableTime-' + j + '" class="layui-input">';
+			html += '<input type="text" style="width:250px" name="' + field + '|time||' + notAllowBlank + '|' + elementName + '|' + onlyAsQueryParameter + '" id="tableTime-' + j + '" class="layui-input">';
 			html += '</div>';
 
 			html += '</div></div>';
@@ -848,12 +829,12 @@
 
 			if (defaultChange == 5) {
 				html += '<div class="layui-inline" style="width:330px;display:flex;">';
-				html += '<input type="number" placeholder="起始值" data-type="' + field + '|number|' + searchOptions[j].parameterValue.defaultChange + '|start|' + notAllowBlank + '|' + elementName + '" class="layui-input startOrEnd">';
-				html += '<input type="number" placeholder="结束值" data-type="' + field + '|number|' + searchOptions[j].parameterValue.defaultChange + '|end|' + notAllowBlank + '|' + elementName + '" class="layui-input startOrEnd">';
+				html += '<input type="number" placeholder="起始值" data-type="' + field + '|number|' + searchOptions[j].parameterValue.defaultChange + '|start|' + notAllowBlank + '|' + elementName + '|' + onlyAsQueryParameter + '" class="layui-input startOrEnd">';
+				html += '<input type="number" placeholder="结束值" data-type="' + field + '|number|' + searchOptions[j].parameterValue.defaultChange + '|end|' + notAllowBlank + '|' + elementName + '|' + onlyAsQueryParameter + '" class="layui-input startOrEnd">';
 				html += '</div>';
 			} else {
 				html += '<div class="layui-inline">';
-				html += '<input type="number" name="' + field + '|number|' + searchOptions[j].parameterValue.defaultChange + '|' + notAllowBlank + '|' + elementName + '" class="layui-input">';
+				html += '<input type="number" name="' + field + '|number|' + searchOptions[j].parameterValue.defaultChange + '|' + notAllowBlank + '|' + elementName + '|' + onlyAsQueryParameter + '" class="layui-input">';
 				html += '</div>';
 			}
 
@@ -880,7 +861,7 @@
 			var field = searchOptions[j].parameterValue;
 
 			html += '<div class="layui-inline">';
-			html += '<input type="text" name="' + field + '|text||' + notAllowBlank + '|' + elementName + '" class="layui-input xm-table-text">';
+			html += '<input type="text" name="' + field + '|text||' + notAllowBlank + '|' + elementName + '|' + onlyAsQueryParameter + '" class="layui-input xm-table-text">';
 			html += '</div>';
 
 			html += '</div></div>';
@@ -891,9 +872,186 @@
 	if (exportTable) {
 		html += '<button type="button" class="layui-btn layui-btn-sm" lay-submit lay-filter="exportReport"><i class="layui-icon">&#xe601;</i>导出</button>';
 	}
+	html += '<button type="reset" class="layui-btn layui-btn-sm layui-btn-primary">重置</button>';
 	html += '</div>';
 	html += '</div>';
 	html += '</form>';
 	html += '</div>';
 	return html;
-}
\ No newline at end of file
+}
+
+//渲染查询条件
+function renderSearchBox(searchOptions, form, laydate) {
+	//获取系统变量供应室的数据
+	var dataArr = [];
+	api.getOrgunitInfoForCusReport(function (res) {
+		for (var z = 0; z < res.length; z++) {
+			dataArr[z] = {
+				name: res[z].selectName,
+				value: res[z].selectValue
+			}
+			if (res[z].selectValue == defaultDepartCoding) {
+				dataArr[z].selected = true;
+			}
+		}
+	})
+
+	for (var k = 0; k < searchOptions.length; k++) {
+		var startDate;
+		var endDate;
+		var defaultStartDate = searchOptions[k].parameterValue.defaultStartDate;
+		var defaultEndDate = searchOptions[k].parameterValue.defaultEndDate;
+		var defaultChange = searchOptions[k].parameterValue.defaultChange;
+		var newDataArr = [];
+
+		var elementName = searchOptions[k].elementName;
+
+		if (elementName == '供应室') {
+			newDataArr = dataArr;
+		}
+
+		if (searchOptions[k].elementType == 'date') {
+			if (defaultChange == 5) {
+				startDate = defaultStartDate;
+				endDate = defaultEndDate;
+			} else {
+				startDate = getDate(defaultChange);
+				endDate = getDate();
+			}
+
+			laydate.render({
+				elem: '#tableDate-' + k,
+				range: true,
+				value: startDate + ' - ' + endDate
+			});
+		}
+
+		if (searchOptions[k].elementType == 'time') {
+			if (defaultChange == 5) {
+				startDate = defaultStartDate;
+				endDate = defaultEndDate;
+			} else {
+				startDate = getDate(defaultChange) + ' ' + defaultStartDate;
+				endDate = getDate() + ' ' + defaultEndDate;
+			}
+
+			laydate.render({
+				elem: '#tableTime-' + k,
+				type: 'datetime',
+				range: true,
+				value: startDate + ' - ' + endDate
+			});
+		}
+
+		if (searchOptions[k].elementType == 'system') {
+			if (elementName == '供应室') {
+				xmSelectRender(k, searchOptions, newDataArr);
+			}
+		}
+	}
+
+	form.render();
+}
+
+//获取查询条件内容
+function getSearchResult(field, startOrEnd) {
+	var queryJson = [];
+	var arr = [];
+	var k = 0;
+	var m = 0;
+	var z = 0;
+	var msg = '';
+
+	for (var i = 0; i < startOrEnd.length; i++) {
+		var dataType = startOrEnd[i].getAttribute('data-type');
+		var numberType = dataType.split('|')[1];
+		var numberCondition = dataType.split('|')[2];
+		var notAllowBlank = dataType.split('|')[4];
+		var name = dataType.split('|')[5];
+		var onlyAsQueryParameter = dataType.split('|')[6];
+		var startOrEndValue = '';
+
+		if (i % 2 == 0) {
+			startOrEndValue = startOrEnd[i].value;
+			arr[k] = {
+				name: dataType.split('|')[0].split(','),
+				type: numberType,
+				condition: numberCondition,
+				onlyAsQueryParameter: onlyAsQueryParameter,
+				value1: startOrEndValue,
+				value2: ''
+			};
+			k++;
+		} else {
+			startOrEndValue = startOrEnd[i].value;
+			arr[k - 1].value2 = startOrEndValue;
+		}
+
+		if ((notAllowBlank == true || notAllowBlank == 'true') && (startOrEndValue == '')) {
+			msg = name + '不能为空！';
+		}
+	}
+
+	for (var key in field) {
+		if (key !== 'datasetId' && key !== 'componentId' && key !== 'componentIndex' && key !== 'componentType') {
+			var type = key.split('|')[1] || '';
+			var condition = key.split('|')[2] || '';
+			var notAllowBlank = key.split('|')[3] || '';
+			var name = key.split('|')[4] || '';
+			var onlyAsQueryParameter = key.split('|')[5] || '';
+			var value1 = field[key].split(' - ')[0] || '';
+			var value2 = field[key].split(' - ')[1] || '';
+
+			if ((notAllowBlank == true || notAllowBlank == 'true') && (value1 == '')) {
+				msg = name + '不能为空！';
+			}
+
+			if (type !== '' && type !== 'text') {
+				queryJson[m] = {
+					name: key.split('|')[0].split(','),
+					type: type,
+					condition: condition,
+					onlyAsQueryParameter: onlyAsQueryParameter,
+					value1: value1,
+					value2: value2,
+				}
+				m++;
+			}
+		}
+	}
+
+	if (msg !== '') {
+		layer.msg(msg);
+		return false;
+	}
+
+	queryJson = queryJson.concat(arr);
+
+	var componentType = field.componentType;
+
+	if (componentType == 'table') {
+		var tableText = document.getElementsByClassName('xm-table-text');
+		var tableArr = [];
+		for (var j = 0, z = 0; j < tableText.length; j++) {
+			var value = tableText[j].value;
+			var name = tableText[j].getAttribute('name');
+
+			if (value !== '' && name.split('|')[1] == 'text') {
+				var onlyAsQueryParameter = name.split('|')[5] || '';
+				tableArr[z] = {
+					name: name.split('|')[0].split(','),
+					type: name.split('|')[1],
+					condition: '',
+					onlyAsQueryParameter: onlyAsQueryParameter,
+					value1: value,
+					value2: '',
+				}
+				z++;
+			}
+		}
+
+		queryJson = queryJson.concat(tableArr);
+
+		return queryJson;
+	}
+}
Index: ssts-web/src/main/webapp/disinfectsystem/customizedreports/js/common.css
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/customizedreports/js/common.css	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/customizedreports/js/common.css	(revision 32206)
@@ -0,0 +1,328 @@
+.container .right {
+    position: absolute;
+    width: 100%;
+    top: 30px;
+    left: 0px;
+}
+
+#myGrid .ag-root-wrapper {
+    position: absolute;
+    background: #fff;
+}
+
+.chart-wrapper {
+    position: relative !important;
+}
+
+.chart-wrapper-centent {
+    position: absolute;
+    left: 0;
+    top: 0;
+    width: 800px;
+    height: 434px;
+}
+
+.chart-wrapper-centent .chart-wrapper {
+    width: 800px;
+    height: 434px;
+}
+
+.ag-column-drop,
+.ag-title-bar {
+    cursor: move !important;
+}
+
+.drag {
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    height: 10px;
+    width: 10px;
+    cursor: nwse-resize;
+    z-index: 0;
+    text-align: center;
+    line-height: 10px;
+}
+
+.drag img {
+    width: 10px;
+    height: 10px;
+}
+
+.ag-resizer-bottomRight {
+    position: absolute;
+    bottom: 0;
+    right: 0;
+    height: 10px;
+    width: 10px;
+    cursor: nwse-resize;
+}
+
+.reportName {
+    color: #555;
+    height: 20px;
+    line-height: 20px;
+    padding: 10px 20px;
+    font-size: 16px;
+}
+
+.btns .layui-btn-group {
+    display: flex;
+}
+
+#dataSetWindow .layui-table {
+    margin: 0 !important;
+}
+
+#dataSetWindow .layui-table tr,
+#chartDataWindow .layui-table tr {
+    cursor: pointer;
+}
+
+.layui-tree-txt,
+.layui-tree-icon,
+.layui-tree-icon .layui-icon {
+    color: #fff !important;
+}
+
+.closeTable,
+.searchIcon,
+.addIcon {
+    position: absolute;
+    top: 5px;
+    right: 10px;
+    height: 16px;
+    width: 16px;
+    cursor: pointer;
+    z-index: 0;
+    text-align: center;
+    line-height: 16px;
+}
+
+.closeTable img,
+.searchIcon img,
+.addIcon img {
+    width: 16px;
+    height: 16px;
+}
+
+.searchIcon {
+    right: 35px;
+}
+
+.addIcon {
+    right: 65px;
+}
+
+.pageNumber {
+    text-align: right;
+    padding-right: 20px;
+}
+
+.layui-laypage a,
+.layui-laypage span {
+    margin-bottom: 0 !important;
+    line-height: 25px !important;
+}
+
+.layui-laypage .layui-laypage-curr .layui-laypage-em {
+    top: 0 !important;
+}
+
+#charts .ag-root-wrapper {
+    display: none;
+}
+
+.layui-btn-group {
+    display: flex !important;
+    width: 100%;
+}
+
+.layui-input {
+    height: 30px;
+    line-height: 30px;
+}
+
+.layui-form-label {
+    padding: 5px 15px;
+}
+
+.layui-table-view .layui-table td,
+.layui-table-view .layui-table th {
+    padding: 1px 0;
+}
+
+#textCheckbox .layui-form-checkbox {
+    margin-bottom: 10px;
+}
+
+xm-select {
+    width: 180px !important;
+    height: 30px !important;
+    line-height: 30px !important;
+}
+
+xm-select>.xm-label .scroll {
+    overflow-y: inherit !important;
+}
+
+xm-select>.xm-label .scroll .label-content {
+    height: 30px !important;
+}
+
+xm-select>.xm-label .xm-label-block {
+    height: 22px !important;
+    line-height: 22px !important;
+}
+
+xm-select>.xm-label .xm-label-block>span {
+    font-size: 12px !important;
+}
+
+xm-select > .xm-body{
+    width: 220px !important;
+    top: 30px !important; 
+}
+
+.searchDiv {
+    padding: 10px;
+}
+
+.searchDiv .layui-form-item {
+    margin-bottom: 0;
+}
+
+.searchDiv .layui-form-item .layui-inline {
+    height: 30px !important;
+}
+
+.layui-form-pane .layui-form-label {
+    padding: 0 15px !important;
+    height: 30px;
+    line-height: 27px;
+}
+
+#time {
+    width: 250px;
+}
+
+#textCheckbox .layui-form-checkbox {
+    height: 30px !important;
+}
+
+.x-toolbar {
+    border-color: #a8d2ad;
+    border-style: solid;
+    border-width: 0 0 1px 0;
+    display: block;
+    padding: 2px;
+    background: transparent url(../img/white-top-bottom.gif) repeat-x 0 -1px;
+    position: relative;
+    z-index: 999999;
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+}
+
+.x-panel-tbar .x-toolbar {
+    border: 1px solid #afd7af;
+    border-top: 0 none;
+    overflow: hidden;
+    padding: 2px;
+    height: 20px;
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+}
+
+.x-toolbar .ytb-sep {
+    background-image: url("../img/grid-blue-split.gif");
+    background-position: center;
+    background-repeat: no-repeat;
+    display: block;
+    font-size: 1px;
+    height: 16px;
+    width: 4px;
+    overflow: hidden;
+    cursor: default;
+    margin: 0 2px 0;
+    border: 0;
+}
+
+.x-btn {
+    border: 0 none;
+    background: transparent;
+    font: normal 11px tahoma, verdana, helvetica;
+    padding-left: 18px;
+    padding-top: 3px;
+    padding-bottom: 2px;
+    padding-right: 3px;
+    cursor: pointer;
+    margin: 0;
+    overflow: visible;
+    width: auto;
+    -moz-outline: 0 none;
+    outline: 0 none;
+}
+
+.x-btn-text {
+    background-position: 0 2px;
+    background-repeat: no-repeat;
+    font-family: "宋体" !important;
+    font-size: 12px !important;
+}
+
+.layui-form-checkbox span {
+    height: auto !important;
+}
+
+.tableName {
+    font-size: 24px;
+    margin-bottom: 5px;
+    text-align: center;
+}
+
+.chart-wrapper-search,
+.chart-wrapper-add {
+    width: 20px;
+    height: 20px;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+}
+
+.chart-wrapper-search img,
+.chart-wrapper-add img {
+    width: 16px;
+    height: 16px;
+}
+
+.btn_ext_application_add {
+    background-image: url("/images/web/application_add.png") !important;
+}
+
+.btn_ext_options {
+    background-image: url("/images/web/options.png") !important;
+}
+
+.btn_ext_letter {
+    background-image: url("/images/web/letter.png") !important;
+}
+
+.btn_ext_save {
+    background-image: url("/images/web/save.png") !important;
+}
+
+.btn_ext_close {
+    background-image: url("/images/close.gif") !important;
+}
+
+.layui-form-select dl {
+    top: 30px !important; 
+}
+
+.layui-table-view .layui-form-checkbox {
+    margin-top: 1px;
+    top: 0 !important;
+}
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportList/reportUpdate.jsp
===================================================================
diff -u -r32194 -r32206
--- ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportList/reportUpdate.jsp	(.../reportUpdate.jsp)	(revision 32194)
+++ ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportList/reportUpdate.jsp	(.../reportUpdate.jsp)	(revision 32206)
@@ -14,336 +14,7 @@
 		<title>自定义报表</title>
 		<meta name="description" content="demo" />
 		<link rel="stylesheet" href="../layui/css/layui.css?version=${svnRevision}"></link>
-		<style>
-			.container .right {
-				position: absolute;
-				width: 100%;
-				top: 30px;
-				left: 0px;
-			}
-			
-			#myGrid .ag-root-wrapper {
-				position: absolute;
-				background: #fff;
-			}
-			
-			.chart-wrapper {
-				position: relative !important;
-			}
-			
-			.chart-wrapper-centent {
-				position: absolute;
-				left: 0;
-				top: 0;
-				width: 800px;
-				height: 434px;
-			}
-			
-			.chart-wrapper-centent .chart-wrapper {
-				width: 800px;
-				height: 434px;
-			}
-			
-			.ag-column-drop,
-			.ag-title-bar {
-				cursor: move !important;
-			}
-			
-			.drag {
-				position: absolute;
-				bottom: 0;
-				right: 0;
-				height: 10px;
-				width: 10px;
-				cursor: nwse-resize;
-				z-index: 0;
-				text-align: center;
-				line-height: 10px;
-			}
-			
-			.drag img {
-				width: 10px;
-				height: 10px;
-			}
-			
-			.ag-resizer-bottomRight {
-				position: absolute;
-				bottom: 0;
-				right: 0;
-				height: 10px;
-				width: 10px;
-				cursor: nwse-resize;
-			}
-			
-			.reportName {
-				color: #555;
-				height: 20px;
-				line-height: 20px;
-				padding: 10px 20px;
-				font-size: 16px;
-			}
-			
-			.btns .layui-btn-group {
-				display: flex;
-			}
-			
-			#dataSetWindow .layui-table {
-				margin: 0 !important;
-			}
-			
-			#dataSetWindow .layui-table tr,
-			#chartDataWindow .layui-table tr {
-				cursor: pointer;
-			}
-			
-			.layui-tree-txt,
-			.layui-tree-icon,
-			.layui-tree-icon .layui-icon {
-				color: #fff !important;
-			}
-			
-			.closeTable,
-			.searchIcon,
-			.addIcon {
-				position: absolute;
-				top: 5px;
-				right: 10px;
-				height: 16px;
-				width: 16px;
-				cursor: pointer;
-				z-index: 0;
-				text-align: center;
-				line-height: 16px;
-			}
-			
-			.closeTable img,
-			.searchIcon img,
-			.addIcon img {
-				width: 16px;
-				height: 16px;
-			}
-			
-			.searchIcon {
-				right: 35px;
-			}
-			
-			.addIcon {
-				right: 65px;
-			}
-			
-			.pageNumber {
-				text-align: right;
-				padding-right: 20px;
-			}
-			
-			.layui-laypage a,
-			.layui-laypage span {
-				margin-bottom: 0 !important;
-				line-height: 25px !important;
-			}
-			
-			.layui-laypage .layui-laypage-curr .layui-laypage-em {
-				top: 0 !important;
-			}
-			
-			#charts .ag-root-wrapper {
-				display: none;
-			}
-			
-			.layui-btn-group {
-				display: flex !important;
-				width: 100%;
-			}
-			
-			.layui-input {
-				height: 30px;
-				line-height: 30px;
-			}
-			
-			.layui-form-label {
-				padding: 5px 15px;
-			}
-			
-			.layui-table-view .layui-table td,
-			.layui-table-view .layui-table th {
-				padding: 1px 0;
-			}
-			
-			#textCheckbox .layui-form-checkbox {
-				margin-bottom: 10px;
-			}
-			
-			xm-select {
-				width: 180px !important;
-				height: 30px !important;
-				line-height: 30px !important;
-			}
-			
-			xm-select>.xm-label .scroll {
-				overflow-y: inherit !important;
-			}
-			
-			xm-select>.xm-label .scroll .label-content {
-				height: 30px !important;
-			}
-			
-			xm-select>.xm-label .xm-label-block {
-				height: 22px !important;
-				line-height: 22px !important;
-			}
-			
-			xm-select>.xm-label .xm-label-block>span {
-				font-size: 12px !important;
-			}
-
-			xm-select > .xm-body{
-				width: 220px !important;
-				top: 30px !important; 
-			}
-
-			.searchDiv {
-				padding: 10px;
-			}
-			
-			.searchDiv .layui-form-item {
-				margin-bottom: 0;
-			}
-			
-			.searchDiv .layui-form-item .layui-inline {
-				height: 30px !important;
-			}
-			
-			.layui-form-pane .layui-form-label {
-				padding: 0 15px !important;
-				height: 30px;
-				line-height: 27px;
-			}
-			
-			#time {
-				width: 250px;
-			}
-			
-			#textCheckbox .layui-form-checkbox {
-				height: 30px !important;
-			}
-			
-			.x-toolbar {
-				border-color: #a8d2ad;
-				border-style: solid;
-				border-width: 0 0 1px 0;
-				display: block;
-				padding: 2px;
-				background: transparent url(../img/white-top-bottom.gif) repeat-x 0 -1px;
-				position: relative;
-				z-index: 999999;
-				position: fixed;
-				top: 0;
-				left: 0;
-				width: 100%;
-			}
-			
-			.x-panel-tbar .x-toolbar {
-				border: 1px solid #afd7af;
-				border-top: 0 none;
-				overflow: hidden;
-				padding: 2px;
-				height: 20px;
-				display: flex;
-				align-items: center;
-				justify-content: flex-start;
-			}
-			
-			.x-toolbar .ytb-sep {
-				background-image: url("../img/grid-blue-split.gif");
-				background-position: center;
-				background-repeat: no-repeat;
-				display: block;
-				font-size: 1px;
-				height: 16px;
-				width: 4px;
-				overflow: hidden;
-				cursor: default;
-				margin: 0 2px 0;
-				border: 0;
-			}
-			
-			.x-btn {
-				border: 0 none;
-				background: transparent;
-				font: normal 11px tahoma, verdana, helvetica;
-				padding-left: 18px;
-				padding-top: 3px;
-				padding-bottom: 2px;
-				padding-right: 3px;
-				cursor: pointer;
-				margin: 0;
-				overflow: visible;
-				width: auto;
-				-moz-outline: 0 none;
-				outline: 0 none;
-			}
-			
-			.x-btn-text {
-				background-position: 0 2px;
-				background-repeat: no-repeat;
-				font-family: "宋体" !important;
-				font-size: 12px !important;
-			}
-			
-			.layui-form-checkbox span {
-				height: auto !important;
-			}
-			
-			.tableName {
-				font-size: 24px;
-				margin-bottom: 5px;
-				text-align: center;
-			}
-			
-			.chart-wrapper-search,
-			.chart-wrapper-add {
-				width: 20px;
-				height: 20px;
-				display: flex;
-				justify-content: center;
-				align-items: center;
-			}
-			
-			.chart-wrapper-search img,
-			.chart-wrapper-add img {
-				width: 16px;
-				height: 16px;
-			}
-			
-			.btn_ext_application_add {
-				background-image: url("/images/web/application_add.png") !important;
-			}
-			
-			.btn_ext_options {
-				background-image: url("/images/web/options.png") !important;
-			}
-			
-			.btn_ext_letter {
-				background-image: url("/images/web/letter.png") !important;
-			}
-			
-			.btn_ext_save {
-				background-image: url("/images/web/save.png") !important;
-			}
-			
-			.btn_ext_close {
-				background-image: url("/images/close.gif") !important;
-			}
-
-			.layui-form-select dl {
-				top: 30px !important; 
-			}
-
-			.layui-table-view .layui-form-checkbox {
-				margin-top: 1px;
-				top: 0 !important;
-			}
-		</style>
+		<link rel="stylesheet" href="../js/common.css?version=${svnRevision}"></link>
 		<script src="../js/ag-grid-enterprise.min.js?version=${svnRevision}"></script>
 	</head>
 	<script>
@@ -409,16 +80,6 @@
 				</div>
 			</form>
 		</div>
-		<div id="chartFormWindow" style="display: none;padding: 20px;">
-			<form class="layui-form">
-				<div class="layui-form-item">
-					<label class="layui-form-label">图形标题</label>
-					<div class="layui-input-block">
-						<input id="chartTitle" type="text" name="chartTitle" required lay-verify="required" placeholder="请输入图形名称" class="layui-input">
-					</div>
-				</div>
-			</form>
-		</div>
 		<div id="dataSetWindow" style="display: none;">
 			<div style="display: flex;justify-content: space-between;">
 				<table class="layui-table" style="width: 200px;">
@@ -465,34 +126,6 @@
 
 					</tbody>
 				</table>
-				<form class="layui-form" id="chartForm" style="width: 340px;margin: 10px;display: none;">
-					<div class="layui-form-item">
-						<label class="layui-form-label">图形类型</label>
-						<div class="layui-input-block">
-							<select name="chartType" id="chartType">
-								<option value="bar">柱状图</option>
-								<option value="line">折线图</option>
-								<option value="pie">饼图</option>
-							</select>
-						</div>
-					</div>
-					<div class="layui-form-item">
-						<label class="layui-form-label">显示字段</label>
-						<div class="layui-input-block" id="showField">
-
-						</div>
-					</div>
-					<input id="columnDefString" name="columnDefString" type="hidden" />
-					<input id="rowEndIndex" name="rowEndIndex" type="hidden" />
-					<input id="objString" name="objString" type="hidden" />
-					<input id="rowString" name="rowString" type="hidden" />
-					<div class="layui-form-item">
-						<label class="layui-form-label"></label>
-						<div class="layui-input-block">
-							<button type="button" class="layui-btn" lay-submit lay-filter="chartForm">确定</button>
-						</div>
-					</div>
-				</form>
 			</div>
 		</div>
 		<div id="querySettingWindow" style="display: none;padding: 10px;">
Index: ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportList/reportView.js
===================================================================
diff -u -r32194 -r32206
--- ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportList/reportView.js	(.../reportView.js)	(revision 32194)
+++ ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportList/reportView.js	(.../reportView.js)	(revision 32206)
@@ -1,41 +1,28 @@
-layui.use(['layer', 'table', 'form', 'tree', 'laypage', 'laydate'], function () {
+layui.use(['layer', 'form', 'laypage', 'laydate'], function () {
 	var layer = layui.layer;
 	var laypage = layui.laypage;
 	var form = layui.form;
-	var tree = layui.tree;
-	var $ = layui.jquery;
-	var table = layui.table;
 	var laydate = layui.laydate;
 
-	var href = decodeURI(window.location.href);
-	var params = href.split('?')[1] || '';
-
-	var reportId = params.split('=')[1] || '';
-
 	getReportDefinition(reportId);
 
 	var gridOptionsDefaultArray = [];
 
-	var columnDefsDefaultArray = [];
-	var chartOptions = [];
-
 	//读取自定义报表
 	function getReportDefinition(reportId) {
 		var postData = {
 			id: reportId
 		};
 
 		api.getReportDefinition(postData, function (res) {
-			var getReportName = res.data.reportName;
-			var getReportDescription = res.data.reportDescription;
-			var getFolderName = res.data.folderName;
 			var resData = res.data.reportDefinition;
 
 			setElementById('myGrid', 'html', '');
 
 			getReportInfo(resData);
 		});
 	};
+
 	//自定义表格配置
 	function gridOptionFunction(columnDefsDefault) {
 		var gridOptionsDefault = {
@@ -143,7 +130,7 @@
 
 	//自定义分页
 	function onPaginationChanged(el, gridOptionsDefault, total, id, queryJson) {
-		var limit = 20;
+		var limit = defaultTableLimit;
 
 		laypage.render({
 			elem: el.querySelector('.pageNumber'),
@@ -177,201 +164,16 @@
 		});
 	};
 
-	//图形初始化
-	function chartInit(columnDefsDefault, obj, rows) {
-		var gridDiv = document.getElementById('charts');
-		var searchOptions = obj.searchOptions;
-		var tableName = obj.tableName || '';
-		var datasetId = obj.id;
-
-		var html = '<div class="chartItem" style="top:' + obj.top + 'px;width:' + obj.width + 'px;height:' + obj.height + 'px;z-index:' + obj.zIndex + ';left:' + obj.left + 'px;padding:10px;background:#fff;position: absolute">';
-		html += '<div class="chartTitle">';
-
-		if (searchOptions.length > 0) {
-			html += getSearchBox(obj.index, obj.id, obj.componentId, searchOptions, true);
-		}
-
-		html += '<div class="tableName">' + tableName + '</div>';
-		html += '</div>';
-		html += '<div class="chartContent"></div></div>';
-
-		var chartDiv = document.createElement('div');
-		chartDiv.innerHTML = html;
-		gridDiv.appendChild(chartDiv);
-
-		var chartContent = chartDiv.getElementsByClassName('chartItem')[0].querySelector('.chartContent');
-		var chartHeight = chartDiv.querySelector('.chartTitle').offsetHeight;
-		var chartWidth = chartDiv.querySelector('.chartTitle').offsetWidth;
-
-		chartContent.style.width = obj.width;
-		chartContent.style.height = parseInt(obj.height) - chartHeight;
-
-		var dataArr = [];
-		api.getOrgunitInfoForCusReport(function (res) {
-			for (var z = 0; z < res.length; z++) {
-				dataArr[z] = {
-					name: res[z].selectName,
-					value: res[z].selectValue
-				}
-				if (res[z].selectValue == defaultDepartCoding) {
-					dataArr[z].selected = true;
-				}
-			}
-		})
-
-		for (var i = 0; i < searchOptions.length; i++) {
-			var startDate;
-			var endDate;
-			var defaultStartDate = searchOptions[i].parameterValue.defaultStartDate;
-			var defaultEndDate = searchOptions[i].parameterValue.defaultEndDate;
-			var defaultChange = searchOptions[i].parameterValue.defaultChange;
-			var newDataArr = [];
-
-			var elementName = searchOptions[i].elementName;
-
-			if (elementName == '供应室') {
-				newDataArr = dataArr;
-			}
-
-			if (searchOptions[i].elementType == 'date') {
-				if (defaultChange == 5) {
-					startDate = defaultStartDate;
-					endDate = defaultEndDate;
-				} else {
-					startDate = getDate(defaultChange);
-					endDate = getDate();
-				}
-
-				laydate.render({
-					elem: '#chartDate-' + i,
-					range: true,
-					value: startDate + ' - ' + endDate
-				});
-			}
-
-			if (searchOptions[i].elementType == 'time') {
-				if (defaultChange == 5) {
-					startDate = defaultStartDate;
-					endDate = defaultEndDate;
-				} else {
-					startDate = getDate(defaultChange) + ' ' + defaultStartDate;
-					endDate = getDate() + ' ' + defaultEndDate;
-				}
-
-				laydate.render({
-					elem: '#chartTime-' + i,
-					type: 'datetime',
-					range: true,
-					value: startDate + ' - ' + endDate
-				});
-			}
-
-			if (searchOptions[i].elementType == 'system') {
-				if (elementName == '供应室') {
-					xmSelectRender(i, searchOptions, newDataArr);
-				}
-			}
-		}
-
-		form.render();
-
-		chartStart(chartContent, obj, columnDefsDefault, rows);
-	};
-
-	//获取图形
-	function chartStart(chartContent, obj, columnDefsDefault, rows) {
-		var myChart = echarts.init(chartContent);
-
-		var columns = obj.chartOptions.cellRange.columns;
-		var chartType = obj.chartOptions.chartType;
-		var chartTitle = obj.chartOptions.chartTitle || '';
-
-		var xAxisData = [];
-		var seriesData = [];
-		var pieSeriesData = [];
-
-		for (var i = 0; i < columns.length; i++) {
-			var data = 0;
-
-			for (var j = 0; j < rows.length; j++) {
-				var value = rows[j][columns[i]] || 0;
-				value = (isNaN(parseInt(value))) ? 0 : parseInt(value);
-
-				data += value;
-			}
-
-			for (var k = 0; k < columnDefsDefault.length; k++) {
-				if (columnDefsDefault[k].field == columns[i]) {
-					xAxisData[i] = columnDefsDefault[k].headerName;
-					pieSeriesData[i] = {
-						value: data,
-						name: columnDefsDefault[k].headerName
-					}
-				}
-			}
-
-			seriesData[i] = data;
-		}
-
-		if (chartType == 'pie') {
-			var option = {
-				title: {
-					text: chartTitle,
-					x: 'center'
-				},
-				legend: {
-					type: 'scroll',
-					orient: 'vertical',
-					right: 10,
-					top: 20,
-					bottom: 20,
-					data: xAxisData
-				},
-				series: [{
-					type: chartType,
-					radius: '55%',
-					center: ['50%', '60%'],
-					data: pieSeriesData
-				}]
-			};
-
-			myChart.setOption(option);
-		} else {
-			var option = {
-				title: {
-					text: chartTitle,
-					x: 'center'
-				},
-				xAxis: {
-					type: 'category',
-					data: xAxisData
-				},
-				yAxis: {
-					type: 'value'
-				},
-				series: [{
-					data: seriesData,
-					type: chartType
-				}]
-			};
-
-			myChart.setOption(option);
-		}
-	};
-
 	//获取报表详情
 	function getReportInfo(data) {
 		var tableJson = data || [];
 		var tableArray = tableJson.tableArray;
-		var chartArray = tableJson.chartArray;
 
 		getReportInfoForTable(tableArray);
-
-		getReportInfoForChart(chartArray);
 	};
 
 	//获取表格详情
-	function getReportInfoForTable(tableArray, queryJson) {
+	function getReportInfoForTable(tableArray) {
 		setElementById('myGrid', 'html', '');
 
 		var gridDiv = document.querySelector('#myGrid');
@@ -383,7 +185,9 @@
 			var searchOptions = tableArray[i].children.searchOptions || [];
 			var tableName = tableArray[i].tableName || '';
 			var tableIndex = i;
-			var datasetId = tableArray[i].datasetId;
+			if (tableArray[i].tableLimit) {
+				defaultTableLimit = tableArray[i].tableLimit;
+			}
 
 			gridDiv.appendChild(tableDiv);
 
@@ -403,6 +207,7 @@
 
 			var html = '';
 
+			//获取查询条件
 			html += getSearchBox(tableIndex, tableArray[tableIndex].datasetId, tableArray[tableIndex].componentId, searchOptions, true);
 
 			html += '<div class="tableName">' + tableName + '</div>';
@@ -430,6 +235,7 @@
 			tableDiv.querySelector(".ag-root-wrapper").style.left = tableArray[tableIndex].tableLeft + 'px';
 			tableDiv.querySelector(".ag-root-wrapper").style.zIndex = tableArray[tableIndex].tableZindex;
 
+			//自定义分页
 			onPaginationChanged(tableDiv.querySelector(".ag-root-wrapper"), gridOptionsDefault, total, tableArray[tableIndex].datasetId, {});
 
 			gridOptionsDefaultArray[tableIndex] = gridOptionsDefault;
@@ -439,371 +245,74 @@
 
 			gridOptionsDefault.api.setServerSideDatasource(datasource);
 
-			var dataArr = [];
-			api.getOrgunitInfoForCusReport(function (res) {
-				for (var z = 0; z < res.length; z++) {
-					dataArr[z] = {
-						name: res[z].selectName,
-						value: res[z].selectValue
-					}
-					if (res[z].selectValue == defaultDepartCoding) {
-						dataArr[z].selected = true;
-					}
-				}
-			})
-
-			for (var k = 0; k < searchOptions.length; k++) {
-				var startDate;
-				var endDate;
-				var defaultStartDate = searchOptions[k].parameterValue.defaultStartDate;
-				var defaultEndDate = searchOptions[k].parameterValue.defaultEndDate;
-				var defaultChange = searchOptions[k].parameterValue.defaultChange;
-				var newDataArr = [];
-
-				var elementName = searchOptions[k].elementName;
-
-				if (elementName == '供应室') {
-					newDataArr = dataArr;
-				}
-
-				if (searchOptions[k].elementType == 'date') {
-					if (defaultChange == 5) {
-						startDate = defaultStartDate;
-						endDate = defaultEndDate;
-					} else {
-						startDate = getDate(defaultChange);
-						endDate = getDate();
-					}
-
-					laydate.render({
-						elem: '#tableDate-' + k,
-						range: true,
-						value: startDate + ' - ' + endDate
-					});
-				}
-
-				if (searchOptions[k].elementType == 'time') {
-					if (defaultChange == 5) {
-						startDate = defaultStartDate;
-						endDate = defaultEndDate;
-					} else {
-						startDate = getDate(defaultChange) + ' ' + defaultStartDate;
-						endDate = getDate() + ' ' + defaultEndDate;
-					}
-
-					laydate.render({
-						elem: '#tableTime-' + k,
-						type: 'datetime',
-						range: true,
-						value: startDate + ' - ' + endDate
-					});
-				}
-
-				if (searchOptions[k].elementType == 'system') {
-					if (elementName == '供应室') {
-						xmSelectRender(k, searchOptions, newDataArr);
-					}
-				}
-			}
-
-			form.render();
+			//渲染查询条件
+			renderSearchBox(searchOptions, form, laydate);
 		}
 	}
 
-	//渲染文本框
-	function xmSelectTextResult(val, searchName, datasetId, cb) {
-		var postData = {
-			id: datasetId,
-			name: searchName,
-			value: val,
-			limit: 1000,
-			offset: 0
-		};
-
-		api.querySingleColumn(postData, function (res) {
-			var rows = res.rows || [];
-			var newRows = [];
-
-			for (var z = 0; z < rows.length; z++) {
-				newRows[z] = {
-					name: rows[z],
-					value: rows[z]
-				}
-			}
-
-			cb(newRows)
-		}, function () {
-			cb([]);
-		})
-	}
-
-	//获取图形详情
-	function getReportInfoForChart(chartArray) {
-		setElementById('charts', 'html', '');
-
-		chartIndex = chartArray.length;
-
-		for (var i = 0; i < chartArray.length; i++) {
-			var postData = {
-				id: chartArray[i].datasetId,
-				limit: 20,
-				offset: 0
-			}
-
-			api.getRecordsOfDataSet(postData, function (res) {
-				var rows = res.rows || [];
-
-				var columnDefsDefault = chartArray[i].chartDataSetSource;
-				var obj = {
-					width: chartArray[i].tableWidth,
-					height: chartArray[i].tableHeight,
-					top: chartArray[i].tableTop,
-					left: chartArray[i].tableLeft,
-					id: chartArray[i].datasetId,
-					zIndex: chartArray[i].tableZindex,
-					chartOptions: chartArray[i].chartOptions,
-					searchOptions: chartArray[i].children.searchOptions || [],
-					index: i,
-					tableName: chartArray[i].tableName
-				};
-
-				columnDefsDefaultArray[i] = columnDefsDefault;
-				chartOptions[i] = obj;
-
-				chartInit(columnDefsDefault, obj, rows);
-			});
-		}
-	}
-
-	//表格或图形查询
+	//表格查询
 	form.on('submit(searchReport)', function (data) {
 		var field = data.field;
 		var queryJson = [];
 		var startOrEnd = document.getElementsByClassName('startOrEnd');
-		var arr = [];
-		var k = 0;
-		var z = 0;
-		var m = 0;
+		var layerShowLoad = layer.load(1, {
+			shade: [0.3, '#000'] //0.1透明度的白色背景
+		});
 
-		for (var i = 0; i < startOrEnd.length; i++) {
-			var dataType = startOrEnd[i].getAttribute('data-type');
-			var numberName = dataType.split('|')[0];
-			var numberType = dataType.split('|')[1];
-			var numberCondition = dataType.split('|')[2];
-			var value = dataType.split('|')[3];
-
-			if (i % 2 == 0) {
-				arr[k] = {
-					name: dataType.split('|')[0].split(','),
-					type: numberType,
-					condition: numberCondition,
-					onlyAsQueryParameter: true,
-					value1: startOrEnd[i].value,
-					value2: ''
-				};
-				k++;
-			} else {
-				arr[k - 1].value2 = startOrEnd[i].value;
-			}
-		}
-
-		for (var key in field) {
-			if (field[key] !== '' && key !== 'datasetId' && key !== 'componentId' && key !== 'componentIndex' && key !== 'componentType') {
-				var type = key.split('|')[1] || '';
-				var condition = key.split('|')[2] || '';
-				var value1 = field[key].split(' - ')[0] || '';
-				var value2 = field[key].split(' - ')[1] || '';
-
-				if (type !== '' && type !== 'text') {
-					queryJson[m] = {
-						name: key.split('|')[0].split(','),
-						type: type,
-						condition: condition,
-						onlyAsQueryParameter: true,
-						value1: value1,
-						value2: value2,
-					}
-					m++;
-				}
-			}
-		}
-
-		queryJson = queryJson.concat(arr);
-
 		var datasetId = field.datasetId;
 		var componentIndex = parseInt(field.componentIndex);
 		var componentType = field.componentType;
 
 		if (componentType == 'table') {
-			var tableText = document.getElementsByClassName('xm-table-text');
-			var tableArr = [];
-
-			for (var j = 0, z = 0; j < tableText.length; j++) {
-				var value = tableText[j].value;
-				var name = tableText[j].getAttribute('name');
-
-				if (value !== '') {
-					tableArr[z] = {
-						name: name.split('|')[0].split(','),
-						type: name.split('|')[1],
-						condition: '',
-						onlyAsQueryParameter: true,
-						value1: value,
-						value2: '',
-					}
-					z++;
-				}
+			if (getSearchResult(field, startOrEnd) == false) {
+				layer.close(layerShowLoad);
+				return;
 			}
+			queryJson = getSearchResult(field, startOrEnd);
 
-			queryJson = queryJson.concat(tableArr);
-
 			var gridOptionsDefault = gridOptionsDefaultArray[componentIndex];
-			var that = document.getElementById('myGrid').querySelectorAll(".ag-root-wrapper")[componentIndex];
+			var that = document.getElementById('myGrid').children[componentIndex].querySelector(".ag-root-wrapper");
 
 			var postData = {
 				id: datasetId,
-				limit: 20,
+				limit: defaultTableLimit,
 				offset: 0,
 				queryJson: JSON.stringify(queryJson)
 			}
 
 			api.getRecordsOfDataSet(postData, function (res) {
 				var rows = res.rows || [];
+				var total = res.total || 0;
 
 				var fakeServer = createFakeServer(rows, datasetId, 0, queryJson);
 				var datasource = createServerSideDatasource(fakeServer, gridOptionsDefault);
 
 				gridOptionsDefault.api.setServerSideDatasource(datasource);
 
-				onPaginationChanged(that, gridOptionsDefault, res.total, datasetId, queryJson);
-			});
-		} else {
-			var chartText = document.getElementsByClassName('xm-chart-text');
-			var chartArr = [];
+				onPaginationChanged(that, gridOptionsDefault, total, datasetId, queryJson);
 
-			for (var j = 0, z = 0; j < chartText.length; j++) {
-				var value = document.getElementsByClassName('xm-chart-text')[j].getElementsByClassName('label-content')[0].innerText || '';
-				var name = document.getElementsByClassName('xm-chart-text')[j].getAttribute('name');
-
-				if (value !== '') {
-					chartArr[z] = {
-						name: name.split('|')[0].split(','),
-						type: name.split('|')[1],
-						condition: '',
-						onlyAsQueryParameter: true,
-						value1: value,
-						value2: '',
-					}
-					z++;
-				}
-			}
-
-			queryJson = queryJson.concat(chartArr);
-
-			var columnDefsDefault = columnDefsDefaultArray[componentIndex];
-			var obj = chartOptions[componentIndex];
-			var postData = {
-				id: datasetId,
-				limit: 20,
-				offset: 0,
-				queryJson: JSON.stringify(queryJson)
-			}
-
-			api.getRecordsOfDataSet(postData, function (res) {
-				var rows = res.rows || [];
-
-				var chartContent = document.getElementById('charts').children[componentIndex].getElementsByClassName("chartItem")[0].querySelector('.chartContent');
-
-				chartStart(chartContent, obj, columnDefsDefault, rows);
+				layer.close(layerShowLoad);
 			});
 		}
 	});
 
 	//导出
 	form.on('submit(exportReport)', function (data) {
 		var field = data.field;
+		var componentId = field.componentId;
 		var queryJson = [];
 		var startOrEnd = document.getElementsByClassName('startOrEnd');
-		var arr = [];
-		var k = 0;
-		var z = 0;
-		var m = 0;
+		var layerShowLoad = layer.load(1, {
+			shade: [0.3, '#000'] //0.1透明度的白色背景
+		});
 
-		for (var i = 0; i < startOrEnd.length; i++) {
-			var dataType = startOrEnd[i].getAttribute('data-type');
-			var numberName = dataType.split('|')[0];
-			var numberType = dataType.split('|')[1];
-			var numberCondition = dataType.split('|')[2];
-			var value = dataType.split('|')[3];
-
-			if (i % 2 == 0) {
-				arr[k] = {
-					name: dataType.split('|')[0].split(','),
-					type: numberType,
-					condition: numberCondition,
-					onlyAsQueryParameter: true,
-					value1: startOrEnd[i].value,
-					value2: ''
-				};
-				k++;
-			} else {
-				arr[k - 1].value2 = startOrEnd[i].value;
-			}
-		}
-
-		for (var key in field) {
-			if (field[key] !== '' && key !== 'datasetId' && key !== 'componentId' && key !== 'componentIndex' && key !== 'componentType') {
-				var type = key.split('|')[1] || '';
-				var condition = key.split('|')[2] || '';
-				var value1 = field[key].split(' - ')[0] || '';
-				var value2 = field[key].split(' - ')[1] || '';
-
-				if (type !== '' && type !== 'text') {
-					queryJson[m] = {
-						name: key.split('|')[0].split(','),
-						type: type,
-						condition: condition,
-						onlyAsQueryParameter: true,
-						value1: value1,
-						value2: value2,
-					}
-					m++;
-				}
-			}
-		}
-
-		queryJson = queryJson.concat(arr);
-
-		var componentId = field.componentId;
 		var datasetId = field.datasetId;
-		var componentIndex = parseInt(field.componentIndex);
-		var componentType = field.componentType;
 
-		var tableText = document.getElementsByClassName('xm-table-text');
-		var tableArr = [];
+		queryJson = getSearchResult(field, startOrEnd);
 
-		for (var j = 0, z = 0; j < tableText.length; j++) {
-			var value = tableText[j].value;
-			var name = tableText[j].getAttribute('name');
-
-			if (value !== '') {
-				tableArr[z] = {
-					name: name.split('|')[0].split(','),
-					type: name.split('|')[1],
-					condition: '',
-					onlyAsQueryParameter: true,
-					value1: value,
-					value2: '',
-				}
-				z++;
-			}
-		}
-
-		queryJson = queryJson.concat(tableArr);
-
 		var postData = {
 			id: datasetId,
-			limit: 20,
+			limit: defaultTableLimit,
 			offset: 0,
 			queryJson: JSON.stringify(queryJson)
 		}
@@ -820,6 +329,7 @@
 			} else {
 				var url = encodeURI(WWWROOT + '/disinfectSystem/customizedReports/reportController/exportData.mhtml?&reportId=' + reportId + '&componentId=' + componentId + '&queryJson=' + JSON.stringify(queryJson));
 				window.open(url);
+				layer.close(layerShowLoad);
 			}
 		});
 	});