Merge branch 'master-v32-xwx' into 'master'

告警模板配置资源弹框重复弹出



See merge request !771

@@ -157,8 +157,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'reslist', 'sessions'
             view('commonViewModel').render("template/res/reslist").then(function (res) {
                 layer.open({
                     type: 1,
-                    id:(new Date()).getTime(),
-                    area: ['80%', '90%'],
+                    id:'alarmtemplateRes',
+                    area: ['80%', '81%'],
                     resize: false,
                     shadeClose: true,
                    content: laytpl(res.body).render(JSON.stringify({oldData: oldResIdList})),