From 583a7a1631577c878b9c69bae2011086b3d5cac1 Mon Sep 17 00:00:00 2001 From: T-95707 Date: Mon, 21 Sep 2020 14:08:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?20200921=20zjt=20=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statics/js/modules/param/engineParam.js | 145 ++++++++++++++++++ .../templates/modules/param/engineParam.html | 68 ++++++++ 2 files changed, 213 insertions(+) create mode 100644 neuray-admin/src/main/resources/statics/js/modules/param/engineParam.js create mode 100644 neuray-admin/src/main/resources/templates/modules/param/engineParam.html 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 new file mode 100644 index 0000000..07b2386 --- /dev/null +++ b/neuray-admin/src/main/resources/statics/js/modules/param/engineParam.js @@ -0,0 +1,145 @@ +$(function () { + debugger + $("#jqGrid").jqGrid({ + url: baseURL + 'engine/param/list', + datatype: "json", + colModel: [ + { label: 'id', name: 'id', index: 'id', width: 50, key: true }, + { label: '参数名称', name: 'paramName', index: 'param_name', width: 80 }, + { label: '参数描述', name: 'paramContent', index: 'param_content', width: 80 }, + { label: '部门ID', name: 'deptId', index: 'dept_id', 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 }, + { label: '修改时间', name: 'updateTime', index: 'update_time', width: 80 }, + { label: '修改人ID', name: 'updateUser', index: 'update_user', width: 80 }, + { label: '修改人名字', name: 'updateName', index: 'update_name', width: 80 } + ], + viewrecords: true, + height: 385, + rowNum: 10, + rowList : [10,30,50], + rownumbers: true, + rownumWidth: 25, + autowidth:true, + multiselect: true, + pager: "#jqGridPager", + jsonReader : { + root: "page.list", + page: "page.currPage", + total: "page.totalPage", + records: "page.totalCount" + }, + prmNames : { + page:"page", + rows:"limit", + order: "order" + }, + gridComplete:function(){ + //隐藏grid底部滚动条 + $("#jqGrid").closest(".ui-jqgrid-bdiv").css({ "overflow-x" : "hidden" }); + } + }); +}); + +var vm = new Vue({ + el:'#rrapp', + data:{ + showList: true, + title: null, + paramItem: {} + }, + methods: { + query: function () { + vm.reload(); + }, + add: function(){ + vm.showList = false; + vm.title = "新增"; + vm.paramItem = {}; + }, + update: function (event) { + var id = getSelectedRow(); + if(id == null){ + return ; + } + vm.showList = false; + vm.title = "修改"; + + vm.getInfo(id) + }, + saveOrUpdate: function (event) { + if($("#form1").validate().form()){ + $('#btnSaveOrUpdate').button('loading').delay(1000).queue(function() { + var url = vm.paramItem.id == null ? "param/item/save" : "param/item/update"; + $.ajax({ + type: "POST", + url: baseURL + url, + contentType: "application/json", + data: JSON.stringify(vm.paramItem), + success: function(r){ + if(r.code === 0){ + layer.msg("操作成功", {icon: 1}); + vm.reload(); + $('#btnSaveOrUpdate').button('reset'); + $('#btnSaveOrUpdate').dequeue(); + }else{ + layer.alert(r.msg); + $('#btnSaveOrUpdate').button('reset'); + $('#btnSaveOrUpdate').dequeue(); + } + } + }); + }); + } + }, + del: function (event) { + var ids = getSelectedRows(); + if(ids == null){ + return ; + } + var lock = false; + layer.confirm('确定要删除选中的记录?', { + btn: ['确定','取消'] //按钮 + }, function(){ + if(!lock) { + lock = true; + $.ajax({ + type: "POST", + url: baseURL + "param/item/delete", + contentType: "application/json", + data: JSON.stringify(ids), + success: function(r){ + if(r.code == 0){ + layer.msg("操作成功", {icon: 1}); + $("#jqGrid").trigger("reloadGrid"); + }else{ + layer.alert(r.msg); + } + } + }); + } + }, function(){ + }); + }, + getInfo: function(id){ + $.get(baseURL + "param/item/info/"+id, function(r){ + vm.paramItem = r.paramItem; + }); + }, + reload: function (event) { + vm.showList = true; + var page = $("#jqGrid").jqGrid('getGridParam','page'); + $("#jqGrid").jqGrid('setGridParam',{ + page:page + }).trigger("reloadGrid"); + }, + import: function (event) { + vm.showList = true; + var page = $("#jqGrid").jqGrid('getGridParam','page'); + $("#jqGrid").jqGrid('setGridParam',{ + page:page + }).trigger("reloadGrid"); + } + } +}); \ No newline at end of file diff --git a/neuray-admin/src/main/resources/templates/modules/param/engineParam.html b/neuray-admin/src/main/resources/templates/modules/param/engineParam.html new file mode 100644 index 0000000..b2565f1 --- /dev/null +++ b/neuray-admin/src/main/resources/templates/modules/param/engineParam.html @@ -0,0 +1,68 @@ + + + + 发动机参数管理 + <#include "/header.html"> + + +
+
+
+ <#if shiro.hasPermission("param:item:save")> +  新增 + + <#if shiro.hasPermission("param:item:update")> +  修改 + + <#if shiro.hasPermission("param:item:delete")> +  删除 + + + + +
+
+
+
+ +
+
{{title}}
+
+
+
参数名称
+
+ +
+
+ +
+
参数描述
+
+ +
+
+
+
+ +    +
+
+
+
+ + + + \ No newline at end of file -- Gitee From 9e79845669a92acce8d51749ef73896a592c8518 Mon Sep 17 00:00:00 2001 From: T-95707 Date: Tue, 22 Sep 2020 08:50:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?20200922=20zjt=20=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../statics/js/modules/param/engineParam.js | 83 ++++++++++--------- 1 file changed, 44 insertions(+), 39 deletions(-) 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 07b2386..25976ca 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 @@ -1,43 +1,48 @@ $(function () { - debugger - $("#jqGrid").jqGrid({ - url: baseURL + 'engine/param/list', - datatype: "json", - colModel: [ - { label: 'id', name: 'id', index: 'id', width: 50, key: true }, - { label: '参数名称', name: 'paramName', index: 'param_name', width: 80 }, - { label: '参数描述', name: 'paramContent', index: 'param_content', width: 80 }, - { label: '部门ID', name: 'deptId', index: 'dept_id', 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 }, - { label: '修改时间', name: 'updateTime', index: 'update_time', width: 80 }, - { label: '修改人ID', name: 'updateUser', index: 'update_user', width: 80 }, - { label: '修改人名字', name: 'updateName', index: 'update_name', width: 80 } - ], - viewrecords: true, - height: 385, - rowNum: 10, - rowList : [10,30,50], - rownumbers: true, - rownumWidth: 25, - autowidth:true, - multiselect: true, - pager: "#jqGridPager", - jsonReader : { - root: "page.list", - page: "page.currPage", - total: "page.totalPage", - records: "page.totalCount" - }, - prmNames : { - page:"page", - rows:"limit", - order: "order" - }, - gridComplete:function(){ - //隐藏grid底部滚动条 - $("#jqGrid").closest(".ui-jqgrid-bdiv").css({ "overflow-x" : "hidden" }); + $.get(baseURL + "engine/param/list", function(r){ + $("#jqGrid").jqGrid({ + //url: baseURL + 'engine/manage/list', + datatype: "local", + /*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: 'createTime', index: 'create_time', width: 80 }, + { label: '创建人id', name: 'createUser', index: 'create_user', width: 80 }, + { label: '创建人名称', name: 'createName', index: 'create_name', width: 80 }, + { label: '修改时间', name: 'updateTime', index: 'update_time', width: 80 }, + { label: '修改人id', name: 'updateUser', index: 'update_user', width: 80 }, + { label: '修改人名称', name: 'updateName', index: 'update_name', width: 80 }, + { label: '部门id', name: 'deptId', index: 'dept_id', width: 80 } + ],*/ + colModel: r.ret.column, + //viewrecords: true, + height: 385, + /*rowNum: 10, + rowList : [10,30,50], + rownumbers: true, + rownumWidth: 25, + autowidth:true, + multiselect: true, + pager: "#jqGridPager", + jsonReader : { + root: "page.list", + page: "page.currPage", + total: "page.totalPage", + records: "page.totalCount" + }, + prmNames : { + page:"page", + rows:"limit", + order: "order" + }, + gridComplete:function(){ + //隐藏grid底部滚动条 + $("#jqGrid").closest(".ui-jqgrid-bdiv").css({ "overflow-x" : "hidden" }); + }*/ + }); + for ( var i = 0; i <= r.ret.ret.length; i++){ + jQuery("#jqGrid").jqGrid('addRowData', i + 1, r.ret.ret[i]); } }); }); -- Gitee