Merge branch 'master-mj' of http://113.200.75.45:82/monitor_v3/hg-monitor-web into master-mj

@@ -369,9 +369,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
                 btn: ['确定', '取消'] //按钮
                 btn: ['确定', '取消'] //按钮
             }, function () {
             }, function () {
                 admin.req({
                 admin.req({
-                    url: common.domainName + '/api-web/alarmPolicy/delete'
+                    url: common.domainName + '/api-web/alarmPolicy/delete?ids='+id
                     ,type:"delete"
                     ,type:"delete"
-                    ,data:{ids:id}
                 }).done(function (res) {
                 }).done(function (res) {
                     if(res.success){
                     if(res.success){
                         layer.msg('删除成功', {
                         layer.msg('删除成功', {
@@ -431,7 +430,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
                     name: 'name',
                     name: 'name',
                     value: 'name'
                     value: 'name'
                 },
                 },
-                height: 'auto',
+                height: '500px',
                 data: resTypeTree,
                 data: resTypeTree,
                 on: function (data) {
                 on: function (data) {
                     if(data.isAdd){
                     if(data.isAdd){

@@ -256,7 +256,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             common.openWin('machineroom/bizupgradeAdd', title, {id: id}, ['保存', '取消'], function f() {
             common.openWin('machineroom/bizupgradeAdd', title, {id: id}, ['保存', '取消'], function f() {
                 $("#bizupgrade-form-save-id").trigger("click");
                 $("#bizupgrade-form-save-id").trigger("click");
                 reloadAllChange();
                 reloadAllChange();
-            })
+            },null,null,null,{end: reloadAllChange()})
         }
         }
 
 
         //查看附件/调整信息列表
         //查看附件/调整信息列表

@@ -182,7 +182,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             common.openWin('machineroom/devicehitchAdd', title, {id: id}, ['保存', '取消'], function f(){
             common.openWin('machineroom/devicehitchAdd', title, {id: id}, ['保存', '取消'], function f(){
                 $("#devicehitch-form-save-id").trigger("click");
                 $("#devicehitch-form-save-id").trigger("click");
                 reloadAllChange();
                 reloadAllChange();
-            })
+            },null,null,null,{end: reloadAllChange()})
         }
         }
 
 
         //查看附件/调整信息列表
         //查看附件/调整信息列表

@@ -293,7 +293,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             common.openWin('emergency/add', title, {id: id}, ['保存', '取消'], function f() {
             common.openWin('emergency/add', title, {id: id}, ['保存', '取消'], function f() {
                 $("#emergency-form-save-id").trigger("click");
                 $("#emergency-form-save-id").trigger("click");
                 reloadAllChange();
                 reloadAllChange();
-            })
+            },null,null,null,{end: reloadAllChange()})
         }
         }
 
 
         //查看附件/调整信息列表
         //查看附件/调整信息列表

@@ -291,7 +291,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             common.openWin('machineroom/deviceAdd', title, {id: id}, ['保存', '取消'], function f() {
             common.openWin('machineroom/deviceAdd', title, {id: id}, ['保存', '取消'], function f() {
                 $("#device-form-save-id").trigger("click");
                 $("#device-form-save-id").trigger("click");
                 reloadAllChange();
                 reloadAllChange();
-            })
+            },null,null,null,{end: reloadAllChange()})
         }
         }
 
 
         //查看更换配件列表
         //查看更换配件列表

@@ -183,7 +183,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             common.openWin('machineroom/staffAdd', title, {id: id}, ['保存', '取消'], function f() {
             common.openWin('machineroom/staffAdd', title, {id: id}, ['保存', '取消'], function f() {
                 $("#staff-form-save-id").trigger("click");
                 $("#staff-form-save-id").trigger("click");
                 reloadAllChange();
                 reloadAllChange();
-            })
+            },null,null,null,{end: reloadAllChange()})
         }
         }
 
 
         //查看附件/接收人列表
         //查看附件/接收人列表

@@ -173,7 +173,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             common.openWin('machineroom/extraAdd', title, {id: id}, ['保存', '取消'], function f(){
             common.openWin('machineroom/extraAdd', title, {id: id}, ['保存', '取消'], function f(){
                 $("#extra-form-save-id").trigger("click");
                 $("#extra-form-save-id").trigger("click");
                 reloadAllChange();
                 reloadAllChange();
-            })
+            },null,null,null,{end: reloadAllChange()})
         }
         }
 
 
         //查看附件/调整信息列表
         //查看附件/调整信息列表

@@ -158,8 +158,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             var title = id ? '编辑' : '新增'
             var title = id ? '编辑' : '新增'
             common.openWin('machineroom/meetingApplyAdd', title, {id: id}, ['保存', '取消'], function f(){
             common.openWin('machineroom/meetingApplyAdd', title, {id: id}, ['保存', '取消'], function f(){
                 $("#meetingApply-form-save-id").trigger("click");
                 $("#meetingApply-form-save-id").trigger("click");
+                form.render();
                 reloadAllChange();
                 reloadAllChange();
-            })
+            },null,null,null,{end: reloadAllChange()})
         }
         }
 
 
         //查看附件/调整信息列表
         //查看附件/调整信息列表

@@ -65,6 +65,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                             time: 1000,
                             time: 1000,
                         }, function () {
                         }, function () {
                             $("#attachment").removeAttr("disabled");
                             $("#attachment").removeAttr("disabled");
+                            //var index = parent.layer.getFrameIndex(window.name);
+                            //parent.location.reload();//刷新父页面，注意一定要在关闭当前iframe层之前执行刷新
                             layer.closeAll();
                             layer.closeAll();
                             table.reload('table-MeetingApply-view', {
                             table.reload('table-MeetingApply-view', {
                                 where: {
                                 where: {

@@ -137,8 +137,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
         function openmeetingsummaryForm(id) {
         function openmeetingsummaryForm(id) {
             var title = id ? '编辑' : '新增'
             var title = id ? '编辑' : '新增'
             common.openWin('machineroom/meetingsummaryAdd', title, {id: id}, ['确定', '取消'], function f(index,layero){
             common.openWin('machineroom/meetingsummaryAdd', title, {id: id}, ['确定', '取消'], function f(index,layero){
-                layer.closeAll();
-            })
+            },null,null,null,{end: reloadAllChange()})
         }
         }
 
 
 
 

@@ -198,7 +198,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             common.openWin('recoveryverify/add', title, {id: id}, ['保存', '取消'], function f() {
             common.openWin('recoveryverify/add', title, {id: id}, ['保存', '取消'], function f() {
                 $("#recoveryverify-form-save-id").trigger("click");
                 $("#recoveryverify-form-save-id").trigger("click");
                 reloadAllChange();
                 reloadAllChange();
-            })
+            },null,null,null,{end: reloadAllChange()})
         }
         }
 
 
         //查看附件/调整信息列表
         //查看附件/调整信息列表

@@ -116,7 +116,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
             $.ajax({
             $.ajax({
                 url: url,
                 url: url,
                 success: function (res) {
                 success: function (res) {
-                    var selects = res.data.options;
+                    var selects = res.data;
                     var $sel = $("form[name='add-config-form']").find("select[name='manufacturerId']");
                     var $sel = $("form[name='add-config-form']").find("select[name='manufacturerId']");
                     $sel.append('<option value="">请选择</option>')
                     $sel.append('<option value="">请选择</option>')
                     $.each(selects, function (i, e) {
                     $.each(selects, function (i, e) {

@@ -474,6 +474,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
                     }
                     }
                     var $dom = $($("#resManageAddProtocol").html());
                     var $dom = $($("#resManageAddProtocol").html());
                     $dom.find(".protocol-title span").text(e.protocolCode);
                     $dom.find(".protocol-title span").text(e.protocolCode);
+                    $dom.find(".protocol-title a.protocol-pwd").attr('data-protocol',e.protocolCode);
                     showPwdBtn(e.protocolCode, $dom, e.protocolParamList);
                     showPwdBtn(e.protocolCode, $dom, e.protocolParamList);
                     $.each(e.protocolParamList, function (index, param) {
                     $.each(e.protocolParamList, function (index, param) {
 
 

@@ -164,7 +164,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             common.openWin('machineroom/routeAdjustAdd', title, {id: id}, ['保存', '取消'], function f() {
             common.openWin('machineroom/routeAdjustAdd', title, {id: id}, ['保存', '取消'], function f() {
                 $("#routeAdjust-form-save-id").trigger("click");
                 $("#routeAdjust-form-save-id").trigger("click");
                 reloadAllChange();
                 reloadAllChange();
-            })
+            },null,null,null,{end: reloadAllChange()})
         }
         }
 
 
         //查看附件/调整信息列表
         //查看附件/调整信息列表