From 7c686b7b8251cf7ab6decd07363150abce53cbce Mon Sep 17 00:00:00 2001 From: T-95707 Date: Thu, 24 Sep 2020 14:47:25 +0800 Subject: [PATCH 1/2] 20200924 zjt --- .../resources/templates/modules/param/engineParam.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) 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 86d1cb4..025c5bd 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 @@
-
+
 下载模板

-  选择文件 - +  选择文件 +  开始上传
-
-    +
+   
-- Gitee From ce4be80182640741986e5853140c1031b4717f2d Mon Sep 17 00:00:00 2001 From: T-95707 Date: Thu, 24 Sep 2020 16:39:56 +0800 Subject: [PATCH 2/2] 20200924 zjt --- .../modules/param/dao/EngineItemDao.java | 2 ++ .../modules/param/entity/EngineItemEntity.java | 3 +++ .../service/impl/EngineManageServiceImpl.java | 18 ++++++++++++------ .../resources/mapper/param/EngineItemDao.xml | 10 ++++++++++ .../statics/js/modules/param/engineManager.js | 2 +- .../statics/js/modules/param/engineParam.js | 9 +++++---- 6 files changed, 33 insertions(+), 11 deletions(-) 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 988804a..e86b4a4 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 { Map getExcelTitleById(@Param("id")String id); EngineItemEntity getTableNameById(@Param("id")String id); + + List 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 c1cbba7..2d9a397 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 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 8ffcbe5..2ccab62 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 @@ -38,12 +38,18 @@ public class EngineManageServiceImpl extends ServiceImpl params) { - IPage page = this.page( - new Query().getPage(params), - new QueryWrapper() - ); - - return new PageUtils(page); +// IPage page = this.page( +// new Query().getPage(params), +// new QueryWrapper() +// ); + 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 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 diff --git a/neuray-admin/src/main/resources/mapper/param/EngineItemDao.xml b/neuray-admin/src/main/resources/mapper/param/EngineItemDao.xml index 980cfe7..b365bff 100644 --- a/neuray-admin/src/main/resources/mapper/param/EngineItemDao.xml +++ b/neuray-admin/src/main/resources/mapper/param/EngineItemDao.xml @@ -79,4 +79,14 @@ id = #{id} + \ No newline at end of file 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 152e331..10750cf 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 }, 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 36c91cd..06686fa 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){ -- Gitee