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

宁夏-自动化巡检-报表填报管理格式展示优化以及编辑格式点击按钮添加key、value格式



See merge request !382

@@ -16,6 +16,7 @@ layui.define(['table', 'form', 'laydate', 'laytpl','common','sessions','xmSelect
             reportId = '';
             reportId = '';
         }
         }
         var sheetCollection = []; // 选择的资源ID
         var sheetCollection = []; // 选择的资源ID
+        var protocolsSelect = {};
         var sheetNameCollection=[];
         var sheetNameCollection=[];
         var sheetTable;
         var sheetTable;
         var sessions = layui.sessions;
         var sessions = layui.sessions;
@@ -150,7 +151,17 @@ layui.define(['table', 'form', 'laydate', 'laytpl','common','sessions','xmSelect
                                 {type: 'checkbox', width: '3%'}
                                 {type: 'checkbox', width: '3%'}
                                 , {field: 'sheetName', title: 'sheet页名称', width: '20%'}
                                 , {field: 'sheetName', title: 'sheet页名称', width: '20%'}
                                 , {field: 'pollName', title: '数据源标识', width: '20%'}
                                 , {field: 'pollName', title: '数据源标识', width: '20%'}
-                                , {field: 'headInfo', title: '列信息', width: '50%'}
+                                , {field: 'line', title: '列信息', width: '50%',
+                                    templet: function (d) {
+                                        if(d.line) {
+                                            var array = [];
+                                            $.each(d.line.split(','), function (i, v) {
+                                                array.push(`<span class="layui-badge layui-bg-blue" style="margin:2px">${v}</span>`);
+                                            });
+                                            return array.join("")
+                                        }
+                                    }
+                                }
                                 , {title: '操作', width: '7%', align: 'center',
                                 , {title: '操作', width: '7%', align: 'center',
                                     toolbar:'<div><span class="link" lay-event="sheetEdit">编辑</span></div>'}
                                     toolbar:'<div><span class="link" lay-event="sheetEdit">编辑</span></div>'}
                             ]]
                             ]]

@@ -24,6 +24,46 @@ layui.define(['table', 'form', 'laydate', 'common','sessions','xmSelect','laydat
                 }
                 }
             })
             })
         }
         }
+        $("#addSubDom").unbind().on("click",function () {
+            layer.open({
+                title: '添加子节点集',
+                id: 'layer-subscribe-select',
+                content:'<form class="layui-form form-edit layui-form-pane" lay-filter="form-add-subDom" onsubmit="return false;">\n' +
+                    '    <div class="layui-form-item">\n' +
+                    '        <label class="layui-form-label">子节点key</label>\n' +
+                    '        <div class="layui-input-block">\n' +
+                    '            <input id="txt-collector-add-key" placeholder="请输入key" lay-verify="required" class="layui-input" name="key" autocomplete="off"/>\n' +
+                    '        </div>\n' +
+                    '    </div>\n' +
+                    '    <div class="layui-form-item">\n' +
+                    '        <label class="layui-form-label">子节点value</label>\n' +
+                    '        <div class="layui-input-block">\n' +
+                    '            <input id="txt-collector-add-key" placeholder="请输入value" lay-verify="required" class="layui-input" name="value" autocomplete="off"/>\n' +
+                    '        </div>\n' +
+                    '    </div>\n' +
+                    '</form>',
+                type: 1,
+                area: ['20%', '28%'],
+                btn: ['添加', '取消'],
+                yes: function (index, layero) {
+                    layer.close(index);
+                    //获取增加的key和value
+                    var kay = $('input[name="key"]').val();
+                    var value = $('input[name="value"]').val();
+                    //获取子节点
+                    var subDom = $('.layui-textarea').val();
+                    //判断是否为修改
+                    if (subDom.length<=0){
+                        var subAdd='[{"key":"'+kay+'","value":"'+value+'"}]';
+                    }else {
+                        var subAdd=subDom.substr(0, subDom.length - 1)+',{"key":"'+kay+'","value":"'+value+'"}]';
+                    }
+                    //回填子节点集
+                    $("#reportSelectAddForm").find("textarea[name='subDom']").val(subAdd)
+                }
+            });
+
+        })
         form.on('submit(reportSelect-add-submit)', function (data) {
         form.on('submit(reportSelect-add-submit)', function (data) {
             var bean = data.field;
             var bean = data.field;
             var loading = layer.load(2);
             var loading = layer.load(2);

@@ -71,7 +71,17 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                     field: 'name', title: '组名称', align: 'center', width: '20%', sort: true,
                     field: 'name', title: '组名称', align: 'center', width: '20%', sort: true,
                     templet: '<div><span reportselect-data-edit="{{d.id}}"  class="layui-table-link">{{d.name}}</span></div>'
                     templet: '<div><span reportselect-data-edit="{{d.id}}"  class="layui-table-link">{{d.name}}</span></div>'
                 }
                 }
-                , {field: 'subDom', title: '组节点集', width: '40%'}
+                , {field: 'subDom', title: '组节点集', width: '40%',
+                    templet: function (d) {
+                        if(d.child) {
+                            var array = [];
+                            $.each(d.child.split(','), function (i, v) {
+                                array.push(`<span class="layui-badge layui-bg-blue" style="margin:2px">${v}</span>`);
+                            });
+                            return array.join("")
+                        }
+                    }
+                    }
                 , {field: 'createTime', title: '创建日期', width: '15%',templet:'<div>{{ layui.util.toDateString(d.createTime, "yyyy-MM-dd HH:mm:ss") }}</div>'}
                 , {field: 'createTime', title: '创建日期', width: '15%',templet:'<div>{{ layui.util.toDateString(d.createTime, "yyyy-MM-dd HH:mm:ss") }}</div>'}
                 , {title: '操作',fixed:'right', align: 'center',templet: '<div><button reportSelect-data-delete="{{d.id}}" class="layui-btn layui-btn-xs layui-btn-normal" lay-tips="删除"><i class="layui-icon layui-icon-delete"></i></button>'}
                 , {title: '操作',fixed:'right', align: 'center',templet: '<div><button reportSelect-data-delete="{{d.id}}" class="layui-btn layui-btn-xs layui-btn-normal" lay-tips="删除"><i class="layui-icon layui-icon-delete"></i></button>'}
             ]],
             ]],

@@ -20,7 +20,8 @@
            <div class="layui-form-item">
            <div class="layui-form-item">
                <label class="layui-form-label textarea-label">子节点<span style="color: red">*</span>：</label>
                <label class="layui-form-label textarea-label">子节点<span style="color: red">*</span>：</label>
                <div class="layui-input-block">
                <div class="layui-input-block">
-                   <textarea name="subDom" class="layui-textarea"></textarea>
+                   <textarea name="subDom" class="layui-textarea" readonly></textarea>
+                   <button id="addSubDom" type="button" class="layui-btn layui-btn-sm layui-btn-normal"><i class="layui-icon">&#xe654;</i>添加</button>
                </div>
                </div>
            </div>
            </div>
            <button type="submit" lay-submit class="reportSelect-add-submit" lay-filter="reportSelect-add-submit" style="display: none">提交</button>
            <button type="submit" lay-submit class="reportSelect-add-submit" lay-filter="reportSelect-add-submit" style="display: none">提交</button>