diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/alarmpolicyIndex.js b/hg-monitor-web-base/src/main/resources/static/src/controller/alarmpolicyIndex.js
index 2058668..10507c9 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/alarmpolicyIndex.js
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/alarmpolicyIndex.js
@@ -369,9 +369,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
btn: ['确定', '取消'] //按钮
}, function () {
admin.req({
- url: common.domainName + '/api-web/alarmPolicy/delete'
+ url: common.domainName + '/api-web/alarmPolicy/delete?ids='+id
,type:"delete"
- ,data:{ids:id}
}).done(function (res) {
if(res.success){
layer.msg('删除成功', {
@@ -431,7 +430,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','sessions','xmSelect',
name: 'name',
value: 'name'
},
- height: 'auto',
+ height: '500px',
data: resTypeTree,
on: function (data) {
if(data.isAdd){
diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/bizupgrade.js b/hg-monitor-web-base/src/main/resources/static/src/controller/bizupgrade.js
index 15613ca..d7c0e81 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/bizupgrade.js
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/bizupgrade.js
@@ -256,7 +256,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
common.openWin('machineroom/bizupgradeAdd', title, {id: id}, ['保存', '取消'], function f() {
$("#bizupgrade-form-save-id").trigger("click");
reloadAllChange();
- })
+ },null,null,null,{end: reloadAllChange()})
}
//查看附件/调整信息列表
diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/devicehitch.js b/hg-monitor-web-base/src/main/resources/static/src/controller/devicehitch.js
index 2d3c224..f1af314 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/devicehitch.js
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/devicehitch.js
@@ -182,7 +182,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
common.openWin('machineroom/devicehitchAdd', title, {id: id}, ['保存', '取消'], function f(){
$("#devicehitch-form-save-id").trigger("click");
reloadAllChange();
- })
+ },null,null,null,{end: reloadAllChange()})
}
//查看附件/调整信息列表
diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/emergency.js b/hg-monitor-web-base/src/main/resources/static/src/controller/emergency.js
index 8bfa6c6..6592f8d 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/emergency.js
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/emergency.js
@@ -293,7 +293,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
common.openWin('emergency/add', title, {id: id}, ['保存', '取消'], function f() {
$("#emergency-form-save-id").trigger("click");
reloadAllChange();
- })
+ },null,null,null,{end: reloadAllChange()})
}
//查看附件/调整信息列表
diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/enterDevice.js b/hg-monitor-web-base/src/main/resources/static/src/controller/enterDevice.js
index 98aafdf..5158bc6 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/enterDevice.js
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/enterDevice.js
@@ -291,7 +291,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
common.openWin('machineroom/deviceAdd', title, {id: id}, ['保存', '取消'], function f() {
$("#device-form-save-id").trigger("click");
reloadAllChange();
- })
+ },null,null,null,{end: reloadAllChange()})
}
//查看更换配件列表
diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/enterStaff.js b/hg-monitor-web-base/src/main/resources/static/src/controller/enterStaff.js
index 461131b..3eb333a 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/enterStaff.js
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/enterStaff.js
@@ -183,7 +183,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
common.openWin('machineroom/staffAdd', title, {id: id}, ['保存', '取消'], function f() {
$("#staff-form-save-id").trigger("click");
reloadAllChange();
- })
+ },null,null,null,{end: reloadAllChange()})
}
//查看附件/接收人列表
diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/extra.js b/hg-monitor-web-base/src/main/resources/static/src/controller/extra.js
index dd1d105..f0f82d3 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/extra.js
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/extra.js
@@ -173,7 +173,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
common.openWin('machineroom/extraAdd', title, {id: id}, ['保存', '取消'], function f(){
$("#extra-form-save-id").trigger("click");
reloadAllChange();
- })
+ },null,null,null,{end: reloadAllChange()})
}
//查看附件/调整信息列表
diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/meetingApply.js b/hg-monitor-web-base/src/main/resources/static/src/controller/meetingApply.js
index 95748e3..966d3a5 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/meetingApply.js
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/meetingApply.js
@@ -158,8 +158,9 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
var title = id ? '编辑' : '新增'
common.openWin('machineroom/meetingApplyAdd', title, {id: id}, ['保存', '取消'], function f(){
$("#meetingApply-form-save-id").trigger("click");
+ form.render();
reloadAllChange();
- })
+ },null,null,null,{end: reloadAllChange()})
}
//查看附件/调整信息列表
diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/meetingApplyAdd.js b/hg-monitor-web-base/src/main/resources/static/src/controller/meetingApplyAdd.js
index 1efdd84..b46e9a3 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/meetingApplyAdd.js
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/meetingApplyAdd.js
@@ -65,6 +65,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
time: 1000,
}, function () {
$("#attachment").removeAttr("disabled");
+ //var index = parent.layer.getFrameIndex(window.name);
+ //parent.location.reload();//刷新父页面，注意一定要在关闭当前iframe层之前执行刷新
layer.closeAll();
table.reload('table-MeetingApply-view', {
where: {
diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/meetingsummary.js b/hg-monitor-web-base/src/main/resources/static/src/controller/meetingsummary.js
index 2cb7346..cf86670 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/meetingsummary.js
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/meetingsummary.js
@@ -137,8 +137,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
function openmeetingsummaryForm(id) {
var title = id ? '编辑' : '新增'
common.openWin('machineroom/meetingsummaryAdd', title, {id: id}, ['确定', '取消'], function f(index,layero){
- layer.closeAll();
- })
+ },null,null,null,{end: reloadAllChange()})
}
diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/recoveryverify.js b/hg-monitor-web-base/src/main/resources/static/src/controller/recoveryverify.js
index 771d53b..74ce776 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/recoveryverify.js
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/recoveryverify.js
@@ -198,7 +198,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
common.openWin('recoveryverify/add', title, {id: id}, ['保存', '取消'], function f() {
$("#recoveryverify-form-save-id").trigger("click");
reloadAllChange();
- })
+ },null,null,null,{end: reloadAllChange()})
}
//查看附件/调整信息列表
diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/reportConfigAdd.js b/hg-monitor-web-base/src/main/resources/static/src/controller/reportConfigAdd.js
index 150a956..2b3ccb9 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/reportConfigAdd.js
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/reportConfigAdd.js
@@ -116,7 +116,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
$.ajax({
url: url,
success: function (res) {
- var selects = res.data.options;
+ var selects = res.data;
var $sel = $("form[name='add-config-form']").find("select[name='manufacturerId']");
$sel.append('<option value="">请选择</option>')
$.each(selects, function (i, e) {
diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/resManageAdd.js b/hg-monitor-web-base/src/main/resources/static/src/controller/resManageAdd.js
index 7de3087..98c1c44 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/resManageAdd.js
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/resManageAdd.js
@@ -474,6 +474,7 @@ layui.define(['table', 'form', 'laydate', 'common', 'sessions', 'laydate', 'admi
}
var $dom = $($("#resManageAddProtocol").html());
$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);
$.each(e.protocolParamList, function (index, param) {
diff --git a/hg-monitor-web-base/src/main/resources/static/src/controller/routeAdjust.js b/hg-monitor-web-base/src/main/resources/static/src/controller/routeAdjust.js
index c47f16f..4134c00 100644
--- a/hg-monitor-web-base/src/main/resources/static/src/controller/routeAdjust.js
+++ b/hg-monitor-web-base/src/main/resources/static/src/controller/routeAdjust.js
@@ -164,7 +164,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
common.openWin('machineroom/routeAdjustAdd', title, {id: id}, ['保存', '取消'], function f() {
$("#routeAdjust-form-save-id").trigger("click");
reloadAllChange();
- })
+ },null,null,null,{end: reloadAllChange()})
}
//查看附件/调整信息列表