Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web

@@ -16,6 +16,7 @@ layui.define(['table', 'form', 'laydate', 'laytpl','common','sessions','xmSelect
             reportId = '';
         }
         var sheetCollection = []; // 选择的资源ID
+        var protocolsSelect = {};
         var sheetNameCollection=[];
         var sheetTable;
         var sessions = layui.sessions;
@@ -150,7 +151,17 @@ layui.define(['table', 'form', 'laydate', 'laytpl','common','sessions','xmSelect
                                 {type: 'checkbox', width: '3%'}
                                 , {field: 'sheetName', title: 'sheet页名称', 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',
                                     toolbar:'<div><span class="link" lay-event="sheetEdit">编辑</span></div>'}
                             ]]

@@ -152,7 +152,7 @@ layui.define(['table', 'form', 'laydate', 'admin', 'layer', 'laytpl', 'common',
                                 ,type: 1 //Page层类型
                                 , area: ['80%', '90%']
                                 , btn: ['选择', '关闭']
-                                , title: '选择巡检结果通知人'
+                                , title: '报表授权'
                                 , shade: 0.6 //遮罩透明度
                                 , maxmin: false //允许全屏最小化
                                 , anim: 1 //0-6的动画形式，-1不开启

@@ -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) {
             var bean = data.field;
             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,
                     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>'}
                 , {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">
                <label class="layui-form-label textarea-label">子节点<span style="color: red">*</span>：</label>
                <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>
            <button type="submit" lay-submit class="reportSelect-add-submit" lay-filter="reportSelect-add-submit" style="display: none">提交</button>

@@ -132,22 +132,23 @@
     <cm-dialog title="保存场景" width="500px" :showDialogVisible="dialogFormVisible" @hidedialog="showDialogForm"
                @okfunc="saveAnalysis">
         <template v-slot>
-            <div style="display:inline-block;margin-bottom: 10px">
+            <div style="display:inline-block;margin-bottom: 10px" >
                 <el-radio-group v-model="isAdd" @change="analysisChange">
-                    <el-radio :label="false" border>
+                    <el-radio  :label="false" border :disabled="isEdit">
                         新增场景分类
                     </el-radio>
-                    <el-radio :label="true" border>
+                    <el-radio  :label="true" border >
                         追加场景分类
                     </el-radio>
                 </el-radio-group>
             </div>
-            <div v-if="!isAdd" style="padding: 3px 10px;">
+            <div v-if="!isAdd " style="padding: 3px 10px;">
                 <el-input v-model="form.parentName" placeholder="请输入场景分类"/>
             </div>
-            <div v-if="!isAdd" style="padding: 3px 10px;">
+            <div v-if="!isAdd  " style="padding: 3px 10px;">
                 <el-input v-model="form.desc" placeholder="请输入场景分类描述"/>
             </div>
+
             <div v-else style="padding: 3px 10px;">
                 <el-select v-model="form.parentId" placeholder="请选择场景分类" style="width: 100%">
                     <el-option

@@ -147,7 +147,14 @@ export default {
         const tabSecondList = Vue.ref([]);
         let dialogFormVisible = Vue.ref(false);
         let parentList = Vue.ref([]);
-        let isAdd = Vue.ref(false);
+
+        var isEdit=Vue.ref(false);
+        var isAdd = Vue.ref(false);
+            if(false==id){
+                isEdit=false;
+            }else{
+                isEdit=true;
+            }
         let count=Vue.ref(0);
         let countFirst=Vue.ref(0);
 
@@ -167,10 +174,12 @@ export default {
 
 
         let getResType = (arr) => {
+
             var types = arr.map(function (v) {
                 return v.id;
             });
             resTypeArr.value = types;
+            getParams.value.resType=resTypeArr.value.join(',');
             loeadTable();
         }
         let getKpiType = (arr) => {
@@ -179,6 +188,7 @@ export default {
                 return v.kpiId;
             });
             kpiTypeArr.value = types;
+            getParams.value.kpiId=  kpiTypeArr.value.join(',');
             loeadTable();
         }
         let getBizType = (arr) => {
@@ -186,10 +196,11 @@ export default {
                 return v.busId;
             });
             busTypeArr.value = types;
+            getParams.value.busId = busTypeArr.value.join(',');
             loeadTable();
         }
         // 查询参数
-        let getParams = Vue.ref({
+        var getParams = Vue.ref({
             keyWords: keyWords.value,
             resType: resTypeArr.value.join(','),
             kpiId: kpiTypeArr.value.join(','),
@@ -235,7 +246,6 @@ export default {
         let getPageInfoSecond = ({page, limit}) => {
             getParams.value.page = page;
             getParams.value.limit = limit;
-
             // 下一页搜索
             loadSecondList();
         }
@@ -380,6 +390,11 @@ export default {
 
         // 点击按钮搜索
         let onBtnSearch = () => {
+            getParams.value.busId = busTypeArr.value.join(',');
+            getParams.value.resType=resTypeArr.value.join(',');
+            getParams.value.kpiId=  kpiTypeArr.value.join(',');
+            getParams.value .keyWords = keyWords.value;
+
             loeadTable(true);
         }
 
@@ -443,6 +458,10 @@ export default {
             }
 
             let url = '';
+            if(id && parentId == ''){
+                proxy.$global.showMsg("请切换场景并选择场景分类","warning");
+                return;
+            }
             if (isAdd.value == false) {
                 if(parentName == ''){
                     proxy.$global.showMsg("请输入场景分类！","warning");
@@ -463,7 +482,7 @@ export default {
             proxy.$http.post(url, addParam, function (res) {
                 if (res && res.success) {
                     proxy.$global.showMsg("添加成功！");
-
+                    showDialogForm(false);
                     onReset();
                     // 清空数据
                     form.value = {
@@ -482,7 +501,7 @@ export default {
                     // 已选择列表
                     tabFirstList.value = [];
                     // 关闭谈画框
-                    showDialogForm(false);
+
 
                     // window.top.location.href = window.top.location.origin + "/#/analysis/view/id=105"
                     window.top.location.href =  window.top.location.origin + '/#/' + res.str;
@@ -579,6 +598,7 @@ export default {
             timeRangeChange,
 
             isAdd,
+            isEdit,
             analysisChange,
             dialogFormVisible,
             showDialogForm,