Merge remote-tracking branch 'origin/master'

src/main/resources/templates/template.html

@@ -85,7 +85,7 @@
     </div>
 <div class="all layui-row">
     <div class=" t1 layui-col-md2 " >
-        <div class="c" style="width:90%">
+        <div class="c" style="width:90%;height: 85vh;overflow: auto;">
             <div class="grid-demo grid-demo-bg1">
                 <button type="button" class="layui-btn layui-btn-sm" onclick="addTemplate()">添加指标模板</button>
                 <button type="button" class="layui-btn layui-btn-sm layui-btn-danger" onclick="deleteTemplate()">删除指标模板</button>
@@ -382,7 +382,7 @@
                 type: 1,
                 title:"添加指标模板",
                 content: $("#add-template"),
-                area: ['600px', '1000px'],
+                area: ['600px', '600px'],
                 btn: ['确定'],
                 shadeClose: true,
                 yes: function(index, layero){