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

杭州-综合监控-告警模板配置策略bug修改



See merge request !39

@@ -71,6 +71,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions','
                         resize: false,
                         content: laytpl(res.body).render(JSON.stringify(params)),
                         btn: ["选择","取消"],
+                        id:'layui-layer11',//设定一个id，防止重复弹出
                         success: function (index, layero) {
 
                         },

@@ -35,8 +35,8 @@
                  :style="{'height':height+'px','max-height':height + 'px','overflow':'hidden'}">
                 <div style="display: flex;flex-direction: row;padding: 3px;background-color: white;padding-bottom: 5px;height:45px;border-bottom: solid 1px #EBEEF5">
                     <div style="width: calc(100% - 150px);padding-left: 6px;text-align: left;">
-                        <el-input v-model="keyWord" placeholder="请输入关键字" :size="$global.elementSize"
-                                  style="width: 220px;margin-right:10px" clearable/>
+                        <el-input v-model="keyWord" placeholder="请输入关键字" :size="$global.elementSize" @keydown.enter.native="searchFile"
+                                  style="width: 220px;margin-right:10px" clearable />
                         <el-button :size="$global.elementSize" @click="searchFile">
                             <i class="iconfont icon-sousuo"></i>搜索</el-button>
                         <el-button :size="$global.elementSize" @click="showUserDialog(true)" v-if="!isView && !isRecycle">