From 75ef39c63d885fe78a77dca76a0ce44c45325232 Mon Sep 17 00:00:00 2001 From: leewand Date: Thu, 24 Sep 2020 09:14:54 +0800 Subject: [PATCH 1/2] bug --- .../modules/param/controller/EngineParamController.java | 4 ++-- .../main/resources/statics/js/modules/param/engineParam.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/controller/EngineParamController.java b/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/controller/EngineParamController.java index e0685d7..70d6343 100644 --- a/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/controller/EngineParamController.java +++ b/neuray-admin/src/main/java/com/gitee/neuray/security/modules/param/controller/EngineParamController.java @@ -61,8 +61,8 @@ public class EngineParamController { @RequestMapping("/getParam") @RequiresPermissions("engine:param:getParam") public R getParam(@RequestParam Map map){ - //String engineId = map.get("id").toString(); - String engineId = "9PAPsQM0"; + String engineId = map.get("id").toString(); + //String engineId = "9PAPsQM0"; Long deptId = ShiroUtils.getUserEntity().getDeptId(); List ret = paramItemService.getParamByEngine(engineId,deptId); return R.ok().put("paramList", ret); 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 88f584c..ae0aa4a 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 @@ -257,7 +257,7 @@ var vm = new Vue({ }, getParam: function(){ - $.get(baseURL + "engine/param/getParam/", function(r){ + $.get(baseURL + "engine/param/getParam/",vm.engineObj, function(r){ for (var i=0 ; i Date: Thu, 24 Sep 2020 09:15:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8E=BB=E6=8E=89debugger?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/statics/js/modules/param/engineParam.js | 11 ++++------- .../resources/statics/js/modules/param/paramItem.js | 1 - 2 files changed, 4 insertions(+), 8 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 ae0aa4a..7a2280c 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 @@ -104,7 +104,7 @@ var vm = new Vue({ }); }, chooseNode :function (e,tId,tNode){ - debugger + vm.engineObj = tNode $.jgrid.gridUnload('#jqGrid') this.initGrid() @@ -157,7 +157,7 @@ var vm = new Vue({ vm.title = "新增"; vm.paramList = {}; this.getParam() - debugger + }, update: function (event) { var id = getSelectedRow(); @@ -169,7 +169,7 @@ var vm = new Vue({ vm.title = "修改"; vm.paramList = {}; //this.getParam() - debugger + vm.getInfo(id) }, saveOrUpdate: function (event) { @@ -179,7 +179,7 @@ var vm = new Vue({ paramRet.list = vm.paramList; paramRet.tableName = vm.engineObj.tableName; paramRet.id = vm.id; - debugger + var url = vm.title == "新增" ? "engine/param/save" : "engine/param/update"; $.ajax({ type: "POST", @@ -206,7 +206,6 @@ var vm = new Vue({ var ids = [] for(var id in idss){ ids.push(getSelectedData(idss[id]).id) - debugger } var mapParam = {} mapParam.ids = ids @@ -252,7 +251,6 @@ var vm = new Vue({ } vm.paramList = r.paramList; vm.id = obj.id - debugger }); }, @@ -265,7 +263,6 @@ var vm = new Vue({ }); }, reload: function (event) { - debugger /*vm.showList = true; vm.style = {width: '20%',float: 'left'} var page = $("#jqGrid").jqGrid('getGridParam','page'); diff --git a/neuray-admin/src/main/resources/statics/js/modules/param/paramItem.js b/neuray-admin/src/main/resources/statics/js/modules/param/paramItem.js index a60badf..0dc3365 100644 --- a/neuray-admin/src/main/resources/statics/js/modules/param/paramItem.js +++ b/neuray-admin/src/main/resources/statics/js/modules/param/paramItem.js @@ -1,5 +1,4 @@ $(function () { - debugger $("#jqGrid").jqGrid({ url: baseURL + 'param/item/list', datatype: "json", -- Gitee