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

…master-v32-lushangqing

@@ -14,6 +14,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
         var noticeWaySelect = {};  //通知方式下拉框
         var noticeWaySelect = {};  //通知方式下拉框
         var subTypeSelect = {};  //订阅类型下拉框
         var subTypeSelect = {};  //订阅类型下拉框
         var busId = '';
         var busId = '';
+        var userName = '';
         if(data && data.policyId){
         if(data && data.policyId){
             policyId = data.policyId;
             policyId = data.policyId;
         }else{
         }else{
@@ -203,7 +204,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                 subType: subTypeSelect.getValue("valueStr"),
                 subType: subTypeSelect.getValue("valueStr"),
                 subWay: noticeWaySelect.getValue("valueStr"),
                 subWay: noticeWaySelect.getValue("valueStr"),
                 resIdList: resIdList,
                 resIdList: resIdList,
-                busId: busId
+                busId: busId,
+                userName: userName
             }
             }
             , height: 'full-200'
             , height: 'full-200'
             , page: {
             , page: {
@@ -1047,7 +1049,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                     subType: subTypeSelect.getValue('valueStr'),
                     subType: subTypeSelect.getValue('valueStr'),
                     subWay: noticeWaySelect.getValue("valueStr"),
                     subWay: noticeWaySelect.getValue("valueStr"),
                     resIdList: resIdList,
                     resIdList: resIdList,
-                    busId: busId
+                    busId: busId,
+                    userName: userName
                 }
                 }
             });
             });
         }
         }
@@ -1149,6 +1152,50 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions'], function
                 }
                 }
             }
             }
         });
         });
+        //用户
+        $.ajax({
+            url: domainName + '/api-user/users/getAll',
+            data: {
+                access_token: accessToken
+            },
+            success: function (response) {
+                if (response) {
+                    var busTypeList = response;
+                    var bizList = response.map(item => {
+                        return {
+                            name: item.nickname,
+                            value: item.username,
+                            parentId: item.parentId
+                        }
+                    });
+                    var bizTree=common.pidToChildren(bizList, 'value', 'parentId');
+
+                    // 影响业务下拉框
+                    xmSelect.render({
+                        el: '#alarmsubscribe_user',
+                        name: 'bizId',
+                        tips: '=订阅用户=',
+                        toolbar: {
+                            show: true,
+                            list: ['ALL', 'CLEAR']
+                        },
+                        filterable: true,
+                        layVerType: 'msg',
+                        data: bizTree,
+                        on: function (data) {
+                            if (data.arr.length > 0) {
+                                userName = data.arr.map(t=>t.value).join(',');
+                            } else {
+                                userName = '';
+                            }
+                            reloadalarmsubscribeTable();
+                        }
+                    });
+                } else {
+                    layer.msg('获取用户失败', {icon: 2});
+                }
+            }
+        });
         //获取选中的数据
         //获取选中的数据
         function getCheckSubscribeData() {
         function getCheckSubscribeData() {
             return table.checkStatus('alarmsubscTable').data;
             return table.checkStatus('alarmsubscTable').data;

@@ -49,6 +49,11 @@
                                     </div>
                                     </div>
                                 </div>
                                 </div>
                                 <div class="layui-inline">
                                 <div class="layui-inline">
+                                    <div class="layui-input-inline layui-input-inline--long">
+                                        <div id="alarmsubscribe_user"></div>
+                                    </div>
+                                </div>
+                                <div class="layui-inline">
                                     <button id="alarmsubscribeQueryBtn" type="button" class="layui-btn layui-btn-normal" ><i
                                     <button id="alarmsubscribeQueryBtn" type="button" class="layui-btn layui-btn-normal" ><i
                                             class="layui-icon layui-icon-search"></i>查询
                                             class="layui-icon layui-icon-search"></i>查询
                                     </button>
                                     </button>