diff --git a/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/dao/EngineItemDao.java b/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/dao/EngineItemDao.java
index 862655038dfab5d7be638a4d92d7b86a8125480d..c5ace80a2191f1b1ceb883dbd4b4cafd004bf29b 100644
--- a/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/dao/EngineItemDao.java
+++ b/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/dao/EngineItemDao.java
@@ -33,4 +33,6 @@ public interface EngineItemDao extends BaseMapper<EngineItemEntity> {
 
     Map getExcelTitleById(@Param("id")String id);
     EngineItemEntity getTableNameById(@Param("id")String id);
+
+    List<EngineItemEntity> queryListByPage(Map param);
 }
diff --git a/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/entity/EngineItemEntity.java b/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/entity/EngineItemEntity.java
index c1cbba71e04448ad59c4f2079fba5244e15da8cc..2d9a39732429b42dde552249c98ec6bc034207fd 100644
--- a/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/entity/EngineItemEntity.java
+++ b/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/entity/EngineItemEntity.java
@@ -69,4 +69,7 @@ public class EngineItemEntity implements Serializable {
 	@TableField(exist = false)
 	private List<Long> paramIdList;
 
+	@TableField(exist = false)
+	private String paramNames;
+
 }
diff --git a/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/service/impl/EngineManageServiceImpl.java b/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/service/impl/EngineManageServiceImpl.java
index 00df6af579af52b026df233bfc0a5948b5070da4..c79e8a4ba610a4d615c0299ec38584f8049bc1fc 100644
--- a/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/service/impl/EngineManageServiceImpl.java
+++ b/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/service/impl/EngineManageServiceImpl.java
@@ -40,16 +40,14 @@ public class EngineManageServiceImpl extends ServiceImpl<EngineItemDao, EngineIt
     @Override
     @DataFilter(subDept = true, user = false)
     public PageUtils queryPage(Map<String, Object> params) {
-        String name = (String)params.get("name");
-        IPage<EngineItemEntity> page = this.page(
-                new Query<EngineItemEntity>().getPage(params),
-                new QueryWrapper<EngineItemEntity>()
-                        .like(StringUtils.isNotBlank(name),"name", name)
-                        .eq("dept_id",ShiroUtils.getUserEntity().getDeptId())
-        );
-
-        return new PageUtils(page);
-    }
+		params.put("flag",1);
+        params.put("pageNum",(Integer.parseInt(params.get("page").toString())-1)*Integer.parseInt(params.get("limit").toString()));
+        params.put("pageSize",Integer.parseInt(params.get("limit").toString()));
+        List<EngineItemEntity> list = engineItemDao.queryListByPage(params);
+        params.put("flag",null);
+        int count = engineItemDao.queryListByPage(params).size();
+        PageUtils pageUtils = new PageUtils(list,count,Integer.parseInt(params.get("limit").toString()),Integer.parseInt(params.get("page").toString()));
+        return pageUtils;    }
 
     @Override
     public PageUtils queryEngine(EngineItemEntity engineItemEntity) {
diff --git a/neuray-admin/src/main/resources/mapper/param/EngineItemDao.xml b/neuray-admin/src/main/resources/mapper/param/EngineItemDao.xml
index ca7ac1208d757afd2471176340ff220ea02fff8e..a2406f044ff4e5f8feb25d36fd30bd262942ee49 100644
--- a/neuray-admin/src/main/resources/mapper/param/EngineItemDao.xml
+++ b/neuray-admin/src/main/resources/mapper/param/EngineItemDao.xml
@@ -79,4 +79,19 @@
             id = #{id}
     </select>
 
+    <select id="queryListByPage" resultType="com.gitee.neuray.security.modules.param.entity.EngineItemEntity">
+        select
+                *
+        from engine_item ei
+        left join (select GROUP_CONCAT(B.param_name) paramNames,A.engine_id from engine_param A,param_item B where A.param_id = B.id group by A.engine_id ) lj
+        on ei.id = lj.engine_id
+        where
+            1=1
+        <if test="name != null and name != ''">
+            and name like concat('%',#{name},'%')
+        </if>
+        <if test="flag != null">
+            limit #{pageNum},#{pageSize}
+        </if>
+    </select>
 </mapper>
\ No newline at end of file
diff --git a/neuray-admin/src/main/resources/statics/js/index1.js b/neuray-admin/src/main/resources/statics/js/index1.js
index 4d49e2db0fe5e4a621df455def5d1e51e90a7928..d43f933f3837442240ab09add6cb02dea170c64d 100644
--- a/neuray-admin/src/main/resources/statics/js/index1.js
+++ b/neuray-admin/src/main/resources/statics/js/index1.js
@@ -102,7 +102,7 @@ var vm = new Vue({
         if($("#larry-side .layui-nav-item>a").length==0 || !isquery){
             return;
         }
-        console.log("执行")
+        // console.log("执行")
         isquery=false;
         layui.config({
             base: 'statics/js/',
diff --git a/neuray-admin/src/main/resources/statics/js/modules/param/engineManager.js b/neuray-admin/src/main/resources/statics/js/modules/param/engineManager.js
index 213e5a6efd93503aa2dbfc213fc2044b59db6cfa..d8afcd67de7ebf7b0028b861b4b7030625522032 100644
--- a/neuray-admin/src/main/resources/statics/js/modules/param/engineManager.js
+++ b/neuray-admin/src/main/resources/statics/js/modules/param/engineManager.js
@@ -5,7 +5,7 @@ $(function () {
         colModel: [			
 			//{ label: 'id', name: 'id', index: 'id', width: 50, key: true },
 			{ label: '发动机名称', name: 'name', index: 'name', width: 80 }, 			
-			{ label: '发动机参数生成表名', name: 'tableName', index: 'table_name', width: 80 }, 			
+			{ label: '参数设置', name: 'paramNames', index: 'table_name', width: 80 },
 			{ label: '创建时间', name: 'createTime', index: 'create_time', width: 80 }, 			
 			//{ label: '创建人id', name: 'createUser', index: 'create_user', width: 80 },
 			{ label: '创建人名称', name: 'createName', index: 'create_name', width: 80 }, 			
@@ -147,7 +147,6 @@ var vm = new Vue({
             });
         },
 		reload: function (event) {
-		    debugger
 			vm.showList = true;
 			var page = $("#jqGrid").jqGrid('getGridParam','page');
 			$("#jqGrid").jqGrid('setGridParam',{
diff --git a/neuray-admin/src/main/resources/statics/js/modules/param/engineParam.js b/neuray-admin/src/main/resources/statics/js/modules/param/engineParam.js
index 36c91cda6f142f86bdbd4cbbeb89263f28fd0077..fa2b248486bdceb49c1bdb8e0b6c99fbfb6c3dd7 100644
--- a/neuray-admin/src/main/resources/statics/js/modules/param/engineParam.js
+++ b/neuray-admin/src/main/resources/statics/js/modules/param/engineParam.js
@@ -72,10 +72,11 @@ var vm = new Vue({
             });
         },
         chooseNode :function (e,tId,tNode){
-
-            vm.engineObj = tNode
-            $.jgrid.gridUnload('#jqGrid')
-            this.initGrid()
+            if(tNode.tId != 'tree_1'){
+                vm.engineObj = tNode
+                $.jgrid.gridUnload('#jqGrid')
+                this.initGrid()
+            }
         },
         initGrid: function  (){
             $.get(baseURL + "engine/param/listColumn",{tableName:vm.engineObj.tableName}, function(r){
@@ -142,7 +143,6 @@ var vm = new Vue({
         },
         saveOrUpdate: function (event) {
             $('#btnSaveOrUpdate').button('loading').delay(1000).queue(function() {
-                console.log(vm.paramList);
                 var paramRet = {};
                 paramRet.list = vm.paramList;
                 paramRet.tableName = vm.engineObj.tableName;
diff --git a/neuray-admin/src/main/resources/statics/plugins/MtrSearchZTree/index.html b/neuray-admin/src/main/resources/statics/plugins/MtrSearchZTree/index.html
index 1cf6b17b348acb1e5fd9f8f8176fc3c584800829..6e0d4e3585bda4b8585429be5a50b1e797a250af 100644
--- a/neuray-admin/src/main/resources/statics/plugins/MtrSearchZTree/index.html
+++ b/neuray-admin/src/main/resources/statics/plugins/MtrSearchZTree/index.html
@@ -61,7 +61,7 @@
 			$.fn.zTree.init($("#tree"), setting, zNodes);
 			new MtrSearchZTree();
 			$("#loadBig").on("click", function(e) {
-				console.log(bigdata);
+				// console.log(bigdata);
 				$.fn.zTree.init($("#stree"), setting, bigdata);
 				new MtrSearchZTree("#stree");
 			});
diff --git a/neuray-admin/src/main/resources/templates/modules/param/engineParam.html b/neuray-admin/src/main/resources/templates/modules/param/engineParam.html
index 86d1cb4d0ee50bdc26badaf5ddeee66d808f4f54..025c5bd4b675a386f6cefda163611b2e5bfe00d6 100644
--- a/neuray-admin/src/main/resources/templates/modules/param/engineParam.html
+++ b/neuray-admin/src/main/resources/templates/modules/param/engineParam.html
@@ -57,15 +57,15 @@
 	<!--上传文件弹出层开始 -->
 	<div v-show="!showList && showImport" class="panel panel-default">
 		<form action="" method="post" class="layui-form layui-form-pane" id="exportFrm" lay-filter="exportFrm">
-			<div class="layui-upload" >
+			<div class="layui-upload" style="margin:20px ">
 				<a class="btn btn-primary" @click="download"><i class="fa fa-download"></i>&nbsp;下载模板</a><br><br>
-				<a class="btn btn-primary" id="test8"><i class="fa fa-file-excel-o"></i>&nbsp;选择文件</a>
-				<input disabled="true" type="text" id="fileName" class="form-control"  placeholder="请选择文件名称" />
+				<a class="btn btn-primary" style="float:left;margin-right:20px"  id="test8"><i class="fa fa-file-excel-o"></i>&nbsp;选择文件</a>
+				<input style="float:left;width:200px;margin-right:20px" disabled="true" type="text" id="fileName" class="form-control"  placeholder="请选择文件名称" />
 				<a class="btn btn-primary" id="test9" ><i class="fa fa-upload"></i>&nbsp;开始上传</a>
 			</div>
 			<div class="form-group">
-				<div class="col-sm-2 control-label"></div>
-				&nbsp;&nbsp;<input type="button" class="btn btn-warning" @click="importReload" value="返回"/>
+				<div class=" control-label"></div>
+				&nbsp;&nbsp;<input style="margin: 13px;" type="button" class="btn btn-warning" @click="importReload" value="返回"/>
 			</div>
 		</form>
 	</div>