fix: 告警策略；告警订阅优化

@@ -72,7 +72,7 @@ layui.define(['form', 'admin', 'laydate', 'common', 'sessions', 'reskpilist'], f
 
 
         function getNoticeMergeFlag() {
         function getNoticeMergeFlag() {
             admin.req({
             admin.req({
-                url: common.domainName + '/mj/sys/conf/getByCode?code=noticeMerge'
+                url: common.domainName + '/mj/sys/conf/getByCode?code=noticeMergeTab'
                 , method: 'get'
                 , method: 'get'
                 , async: false
                 , async: false
                 , success: function (res) {
                 , success: function (res) {

@@ -355,7 +355,7 @@ layui.define(['form', 'admin', 'laydate', 'table', 'common', 'sessions', 'cron',
                 }
                 }
                 str = 1;
                 str = 1;
                 admin.req({
                 admin.req({
-                    url: domainName + '/api-web/alarmsubscribe/save?access_token=' + accessToken
+                    url: domainName + '/api-web/alarmsubscribe/save?accessToken=' + accessToken
                     , data: JSON.stringify(data)
                     , data: JSON.stringify(data)
                     , type: 'post'
                     , type: 'post'
                     , contentType: "application/json; charset=utf-8"
                     , contentType: "application/json; charset=utf-8"

@@ -102,7 +102,15 @@ layui.define(['element', 'common', 'sessions', 'form', 'admin'], function (expor
                 url: domainName + '/mj/userGroup/page?keywords=&perPage=999999&page=1'
                 url: domainName + '/mj/userGroup/page?keywords=&perPage=999999&page=1'
             }).done(function (res) {
             }).done(function (res) {
                 if(res && res.data){
                 if(res && res.data){
+                    let newData = [];
                     let arr = res.data.rows;
                     let arr = res.data.rows;
+                    arr.forEach((item, index) => {
+                        newData.push({
+                            name: item.nickname,
+                            value: item.username
+                        })
+                    })
+
                     groupSel = xmSelect.render({
                     groupSel = xmSelect.render({
                         el: '.selectGroup',
                         el: '.selectGroup',
                         filterable: true,
                         filterable: true,
@@ -276,7 +284,7 @@ layui.define(['element', 'common', 'sessions', 'form', 'admin'], function (expor
                             strict: true,
                             strict: true,
                         },
                         },
                         data() {
                         data() {
-                            return arr
+                            return newData
                         }
                         }
                     })
                     })
                     if (userSelIds) {  //回填
                     if (userSelIds) {  //回填