diff --git a/WebRoot/view/tb/form/designer.html b/WebRoot/view/tb/form/designer.html
index f9e38315..324d669a 100644
--- a/WebRoot/view/tb/form/designer.html
+++ b/WebRoot/view/tb/form/designer.html
@@ -4,82 +4,68 @@
 <head>
     <meta charset="utf-8">
     <meta name="viewport"
-        content="width=device-width,initial-scale=0,maximum-scale=0,user-scalable=yes,shrink-to-fit=no">
+          content="width=device-width,initial-scale=0,maximum-scale=0,user-scalable=yes,shrink-to-fit=no">
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <title>表单设计器</title>
-    <link rel="stylesheet" href="./layui/css/layui.css" />
-    <link rel="stylesheet" href="./ayq/modules/cron.css" />
-    <link rel="stylesheet" href="./ayq/modules/labelGeneration.css" />
-    <link rel="stylesheet" href="./ayq/modules/formDesigner.css" />
+    <link rel="stylesheet" href="./layui/css/layui.css"/>
+    <link rel="stylesheet" href="./ayq/modules/cron.css"/>
+    <link rel="stylesheet" href="./ayq/modules/labelGeneration.css"/>
+    <link rel="stylesheet" href="./ayq/modules/formDesigner.css"/>
 </head>
 
 <body class="layui-layout-body">
-    <input type="hidden" th:value="${formId}" id="fromId">
-    <div style="height: 100%; width: 100%;" id="formdesigner">
+<input type="hidden" th:value="${formId}" id="fromId">
+<div style="height: 100%; width: 100%;" id="formdesigner">
 
-    </div>
-    <script type="text/javascript" src="./layui/layui.js"></script>
-    <script type="text/javascript" src="./ayq/js/config.js"></script>
-    <script type="text/javascript" src="./ayq/modules/Sortable/Sortable.js"></script>
-    <!--htmlformat 为js-beautify代码-->
-    <script type="text/javascript" src="./ayq/js/htmlformat.js"></script>
-    <script type="text/javascript" src="./ayq/js/jsformat.js"></script>
-    <script type="text/javascript" src="./ayq/modules/iceEditor/iceEditor.js"></script>
-    <script>
-        layui.config(
-            { base: './ayq/modules/' }).use(['layer', 'formDesigner'], function () {
-                var $ = layui.jquery;
-                var formDesigner = layui.formDesigner;
-                var data = [];
-                var jobId = GetQueryString("job_id");
-                if (jobId != null && jobId != "") {
-                    window.localStorage.setItem('job_id', jobId);
-                    $.ajax({
-                        url: "/QingLong/collect/getJobBasic?job_id=" + jobId,
-                        async: false,
-                        type: 'GET',
-                        dataType: "json",
-                        success: function (res) {
-                            data = JSON.parse(res.form_json);
-                        }
-                    });
-                } else {
-                    localStorage.removeItem('job_id');
-                    localStorage.removeItem('form_json');
+</div>
+<script type="text/javascript" src="./layui/layui.js"></script>
+<script type="text/javascript" src="./ayq/js/config.js"></script>
+<script type="text/javascript" src="./ayq/modules/Sortable/Sortable.js"></script>
+<!--htmlformat 为js-beautify代码-->
+<script type="text/javascript" src="./ayq/js/htmlformat.js"></script>
+<script type="text/javascript" src="./ayq/js/jsformat.js"></script>
+<script type="text/javascript" src="./ayq/modules/iceEditor/iceEditor.js"></script>
+<script>
+    layui.config(
+        {base: './ayq/modules/'}).use(['layer', 'formDesigner'], function () {
+        var $ = layui.jquery;
+        var formDesigner = layui.formDesigner;
+        var data = [];
+        var jobId = GetQueryString("job_id");
+        if (jobId != null && jobId != "") {
+            window.localStorage.setItem('job_id', jobId);
+            $.ajax({
+                url: "/QingLong/collect/getJobBasic?job_id=" + jobId,
+                async: false,
+                type: 'GET',
+                dataType: "json",
+                success: function (res) {
+                    data = JSON.parse(res.form_json);
                 }
-                formDesigner.render({
-                    data: data,
-                    elem: '#formdesigner'
-                });
-
-                //阻止body的drag冒泡问题        
-                document.body.ondrop = function (event) {
-                    event.preventDefault();
-                    event.stopPropagation();
-                };
             });
-
-        function GetQueryString(name, istop) {
-            var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
-            var r = window.location.search.substr(1).match(reg);
-            if (typeof (istop) != "undefined") r = top.location.search.substr(1).match(reg);
-
-            if (r != null) return unescape(r[2]);
-            return null;
+        } else {
+            localStorage.removeItem('job_id');
+            localStorage.removeItem('form_json');
         }
+        formDesigner.render({
+            data: data,
+            elem: '#formdesigner'
+        });
 
+        //阻止body的drag冒泡问题
+        document.body.ondrop = function (event) {
+            event.preventDefault();
+            event.stopPropagation();
+        };
+    });
 
-<<<<<<< HEAD
+    function GetQueryString(name, istop) {
+        var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)", "i");
+        var r = window.location.search.substr(1).match(reg);
+        if (typeof (istop) != "undefined") r = top.location.search.substr(1).match(reg);
         if (r != null) return unescape(r[2]);
         return null;
     }
 </script>
-=======
-
-
-
-    </script>
-
->>>>>>> e9b2d3e86dfe83dea1477c229c7aaad77fb1636a
 </body>
 </html>
\ No newline at end of file
