monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit 37b6062b18c78a1835795d2679484ce8974404d1 2 parents 5d460db2 bad78545

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

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



See merge request !39
Inline Side-by-side
Showing 2 changed files with 3 additions and 2 deletions
@@ -71,6 +71,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions',' @@ -71,6 +71,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common','reslist','sessions','
71 resize: false, 71 resize: false,
72 content: laytpl(res.body).render(JSON.stringify(params)), 72 content: laytpl(res.body).render(JSON.stringify(params)),
73 btn: ["选择","取消"], 73 btn: ["选择","取消"],
  74 + id:'layui-layer11',//设定一个id，防止重复弹出
74 success: function (index, layero) { 75 success: function (index, layero) {
75 76
76 }, 77 },
@@ -35,8 +35,8 @@ @@ -35,8 +35,8 @@
35 :style="{'height':height+'px','max-height':height + 'px','overflow':'hidden'}"> 35 :style="{'height':height+'px','max-height':height + 'px','overflow':'hidden'}">
36 <div style="display: flex;flex-direction: row;padding: 3px;background-color: white;padding-bottom: 5px;height:45px;border-bottom: solid 1px #EBEEF5"> 36 <div style="display: flex;flex-direction: row;padding: 3px;background-color: white;padding-bottom: 5px;height:45px;border-bottom: solid 1px #EBEEF5">
37 <div style="width: calc(100% - 150px);padding-left: 6px;text-align: left;"> 37 <div style="width: calc(100% - 150px);padding-left: 6px;text-align: left;">
38 - <el-input v-model="keyWord" placeholder="请输入关键字" :size="$global.elementSize"  
39 - style="width: 220px;margin-right:10px" clearable/> 38 + <el-input v-model="keyWord" placeholder="请输入关键字" :size="$global.elementSize" @keydown.enter.native="searchFile"
  39 + style="width: 220px;margin-right:10px" clearable />
40 <el-button :size="$global.elementSize" @click="searchFile"> 40 <el-button :size="$global.elementSize" @click="searchFile">
41 <i class="iconfont icon-sousuo"></i>搜索</el-button> 41 <i class="iconfont icon-sousuo"></i>搜索</el-button>
42 <el-button :size="$global.elementSize" @click="showUserDialog(true)" v-if="!isView && !isRecycle"> 42 <el-button :size="$global.elementSize" @click="showUserDialog(true)" v-if="!isView && !isRecycle">