Merge branch 'master-v32-xwx' into 'master'

宁夏-自动化巡检-sheet页详情优化



See merge request !385

@@ -386,7 +386,7 @@ layui.define(['table', 'form', 'laydate', 'laytpl','common','sessions','xmSelect
             var lastRowCell = JSON.parse(data.lastRowCell);
             layer.open({
                 type: '1'
-                , title: '新增sheet页'
+                , title: 'sheet页详情'
                 , btn: ["保存", "取消"]
                 , area: ['80%', '90%']
                 , shade: 0.3

@@ -167,7 +167,7 @@
                     <label class="col-md-4 control-label"><button type="button" class="layui-btn layui-btn-normal" id="contentResult">获取列信息</button></label>
                 </div>
             </div>
-            <div class="layui-form-item col-show-area">
+            <div class="layui-form-item col-show-area" style="height: 260px">
                 <form onsubmit="return false" id="colNameForm">
                     <table class="layui-table">
                         <thead>