From 729f1cff3b3d2b855c346de481e62cca3e9ad243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com> Date: Tue, 27 Dec 2022 08:33:18 +0800 Subject: [PATCH] 'commit' --- WebRoot/html/formDesign/fill.html | 48 +++++++++---------- WebRoot/html/formDesign/listTaskPageInfo.html | 2 +- .../dsideal/FengHuang/Zjb/Model/ZjbModel.java | 1 + 3 files changed, 24 insertions(+), 27 deletions(-) diff --git a/WebRoot/html/formDesign/fill.html b/WebRoot/html/formDesign/fill.html index 67219e8..f18f2e3 100644 --- a/WebRoot/html/formDesign/fill.html +++ b/WebRoot/html/formDesign/fill.html @@ -53,22 +53,20 @@ } //利用Ajax读取出已经录入数据 + let module_id = $.getUrlParam('module_id'); let task_id = $.getUrlParam('task_id'); let page = $.getUrlParam('page'); - //调用Ajax,将已经存储好的JSON数据导入进来 + //调用Ajax,将已经存储好的JSON数据模板导入进来 $.ajax({ type: "GET", dataType: "json", - url: "/FengHuang/zjb/getTaskPage", + url: "/FengHuang/zjb/getModulePage", data: { - "task_id": task_id, + "module_id": module_id, "page": page }, async: false, success: function (result) { - console.log(result); - //TODO - //这里有问题,只有填报结果,不是完整内容,是不行的,看来是在保存时就出了问题。 data = result; render = formDesigner.render({ elem: '#workspace', @@ -182,26 +180,24 @@ form.on('submit(demo1)', function (data) { let jsonStr = render.getFormData(); let json = JSON.stringify(jsonStr); - //这里不应该是只获取填报的数据,而是应该获取完整的数据,这里有问题。 - - // $.ajax({ - // type: "POST", - // dataType: "json", - // url: "/FengHuang/zjb/saveFillPage", - // data: { - // "task_id": task_id, - // "page": page, - // "json": json - // }, - // async: false, - // success: function (result) { - // layer.msg('保存成功!', {icon: 1, time: 1500}, - // function (index) { - // window.location.href = "listTaskPageInfo.html?task_id=" + task_id; - // } - // ); - // } - // }); + $.ajax({ + type: "POST", + dataType: "json", + url: "/FengHuang/zjb/saveFillPage", + data: { + "task_id": task_id, + "page": page, + "json": json + }, + async: false, + success: function (result) { + layer.msg('保存成功!', {icon: 1, time: 1500}, + function (index) { + window.location.href = "listTaskPageInfo.html?task_id=" + task_id; + } + ); + } + }); return false; }); }); diff --git a/WebRoot/html/formDesign/listTaskPageInfo.html b/WebRoot/html/formDesign/listTaskPageInfo.html index 0b20b72..579bc84 100644 --- a/WebRoot/html/formDesign/listTaskPageInfo.html +++ b/WebRoot/html/formDesign/listTaskPageInfo.html @@ -59,7 +59,7 @@ table.on('tool(idTest)', function (obj) { var data = obj.data; if (obj.event === "modify") { - window.location.href = "fill.html?task_id=" + task_id + "&page=" + data.page; + window.location.href = "fill.html?task_id=" + task_id + "&page=" + data.page+"&module_id="+data.module_id; } }); }); diff --git a/src/main/java/com/dsideal/FengHuang/Zjb/Model/ZjbModel.java b/src/main/java/com/dsideal/FengHuang/Zjb/Model/ZjbModel.java index 94d1de4..6561e21 100644 --- a/src/main/java/com/dsideal/FengHuang/Zjb/Model/ZjbModel.java +++ b/src/main/java/com/dsideal/FengHuang/Zjb/Model/ZjbModel.java @@ -135,6 +135,7 @@ public class ZjbModel { for (int i = 1; i <= page_count; i++) { Record r = new Record(); r.set("page", i); + r.set("module_id",module_id); if (_map.containsKey(i)) { r.set("json", _map.get(i)); r.set("page_finish", true);