'commit'

3 years ago · 3cc3b6a12c
parent 6da6323df9
commit 3cc3b6a12c
4 changed files with 185 additions and 223 deletions
--- a/WebRoot/html/formDesign/fill.html
+++ b/WebRoot/html/formDesign/fill.html
@ -15,26 +15,16 @@

 <body>
 <div>
-  <div>
-    <button type="button" class="layui-btn" id="importJsonData">导入数据</button>
-  </div>
    <div id="workspace" style="margin: 20px 20px;padding: 20px 20px;border: 1px solid #009688;">
    </div>
 </div>
-<div class="importjsoncodedataview" style="display: none;">
-  <textarea class="site-demo-text" id="import-json-code-view"></textarea>
-  <a href="javascript:;" class="layui-btn layui-btn-normal" style="margin-right:20px;" id="import-json-code-data">导入数据</a>
-</div>
-<div class="getFormData" style="display: none;">
-  <textarea class="site-demo-text" id="get-form-data"></textarea>
-</div>
+
 <script type="text/javascript" src="./layui/layui.js"></script>
 <script type="text/javascript" src="./ayq/modules/Sortable/Sortable.js"></script>
 <script type="text/javascript" src="./ayq/modules/iceEditor/iceEditor.js"></script>

 <script>
-  var demojs = [];
-  //JavaScript代码区域
+    var data = [];
    layui.config({base: './ayq/modules/'}).use(['formDesigner', 'element', 'form', 'layer', 'upload'], function () {
        var layer = layui.layer;
        var $ = layui.jquery;
@ -58,18 +48,28 @@
            }
            return res;
        }
-
-    if (window.localStorage.getItem('layui_form_json') !== undefined) {
-      demojs = JSON.parse(window.localStorage.getItem('layui_form_json'));
+        //利用Ajax读取出已经录入数据
+        let task_id = $.getUrlParam('task_id');
+        let page = $.getUrlParam('page');
+        //调用Ajax，将已经存储好的JSON数据导入进来
+        $.ajax({
+            type: "GET",
+            dataType: "json",
+            url: "/FengHuang/zjb/getTaskPage",
+            data: {
+                "task_id": task_id,
+                "page": page
+            },
+            async: false,
+            success: function (result) {
+                data=result;
                render = formDesigner.render({
                    elem: '#workspace',
-        data: demojs,
+                    data: data,
                    viewOrDesign: true
                });
                var images = render.getImages();//这个方法有问题，本来是3个的，执行完变6个！
-      
                images = unique(images);
-      
                for (let i = 0; i < images.length; i++) {
                    let item = images[i].select
                    var id = item.substr(5);//去掉image前缀
@ -100,12 +100,10 @@
                            layer.msg('上传成功！', {icon: 1});
                        }
                    });
-      };
-      
+                }
                //文件上传代码
                var filesData = render.getFiles();
                filesData = unique(filesData);
-     
                for (var i = 0; i < filesData.length; i++) {
                    var id = '#' + filesData[i].select;

@ -172,6 +170,7 @@
                    });
                }
            }
+        });
        //监听提交
        form.on('submit(demo1)', function (data) {
            var json = render.getFormData();
@ -179,57 +178,6 @@
            layer.msg(JSON.stringify(json), {icon: 6});
            return false;
        });
-
-    //导入数据
-    $('#importJsonData').on('click', function () {
-      layer.open({
-        type: 1
-        , title: 'JSON模板数据导入'
-        , id: 'Lay_layer_importjsoncodeview'
-        , content: $('.importjsoncodedataview')
-        , area: ['800px', '640px']
-        , shade: false
-        , resize: false
-        , success: function (layero, index) {
-        }
-        , end: function () {
-          $('.importjsoncodeview').css("display","none")
-        }
-      });
-    });
-
-    //导入数据
-    $('#getFormData').on('click', function () {
-      var _value = render.getFormData();
-      $('#get-form-data').val(JSON.stringify(_value,null,4));
-      layer.open({
-        type: 1
-        , title: 'JSON模板数据导入'
-        , id: 'Lay_layer_importjsoncodeview'
-        , content: $('.getFormData')
-        , area: ['800px', '640px']
-        , shade: false
-        , resize: false
-        , success: function (layero, index) {
-        }
-        , end: function () {
-          $('.getFormData').css("display","none")
-        }
-      });
-    });
-
-    $('#import-json-code-data').on('click', function () {
-      var _value = document.getElementById("import-json-code-view").value;
-      try {
-        var json = JSON.parse(_value);
-        render.setFormData(json);
-        layer.closeAll();
-        layer.msg('导入成功');
-      }catch (e) {
-        layer.closeAll();
-        layer.msg('导入数据格式异常');
-      }
-    });
    });

    function getSubmitData() {
--- a/WebRoot/html/formDesign/listTaskPageInfo.html
+++ b/WebRoot/html/formDesign/listTaskPageInfo.html
@ -55,7 +55,7 @@
        table.on('tool(idTest)', function (obj) {
            var data = obj.data;
            if (obj.event === "modify") {
-                //window.location.href = "designModulePage.html?module_id=" + module_id + "&page=" +  data.page;
+                window.location.href = "fill.html?task_id=" + task_id + "&page=" + data.page;
            }
        });
    });
--- a/src/main/java/com/dsideal/FengHuang/Zjb/Controller/ZjbController.java
+++ b/src/main/java/com/dsideal/FengHuang/Zjb/Controller/ZjbController.java
@ -28,6 +28,13 @@ public class ZjbController extends Controller {
        renderJson(json);
    }

+    @Before({GET.class})
+    @IsNumericInterface({"task_id", "page"})
+    public void getTaskPage(int task_id, int page) {
+        String json = zm.getTaskPage(task_id, page);
+        renderJson(json);
+    }
+
    @Before({GET.class})
    @IsNumericInterface({"module_id"})
    public void getModulePageFillInfo(int module_id) {
--- a/src/main/java/com/dsideal/FengHuang/Zjb/Model/ZjbModel.java
+++ b/src/main/java/com/dsideal/FengHuang/Zjb/Model/ZjbModel.java
@ -47,6 +47,13 @@ public class ZjbModel {
        return "[]";
    }

+    public String getTaskPage(int task_id, int page) {
+        String sql = "select json from t_zjb_task_fill where task_id=? and page=?";
+        List<Record> list = Db.find(sql, task_id, page);
+        if (list.size() > 0) return list.get(0).getStr("json");
+        return "[]";
+    }
+
    public Record getMoudleInfo(int module_id) {
        String sql = "select * from t_zjb_module where module_id=?";
        return Db.findFirst(sql, module_id);