monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by wangtao
Commit 8130e5e6171631a0040332ebdd6157267db33afd 2 parents 47adb081 2b95b6e3

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

Inline Side-by-side
Showing 1 changed file with 7 additions and 3 deletions
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 <div style="margin-right:6px;"> 16 <div style="margin-right:6px;">
17 <cm-biz-type-tree-input @callback="getBizType" clearable collapseTags multiple/> 17 <cm-biz-type-tree-input @callback="getBizType" clearable collapseTags multiple/>
18 </div> 18 </div>
19 - <div> 19 + <div style="margin-right:6px;">
20 <cm-res-type-tree-input @callback="getResType" clearable collapseTags multiple/> 20 <cm-res-type-tree-input @callback="getResType" clearable collapseTags multiple/>
21 </div> 21 </div>
22 <div class="flex-div-start" style="float: left;"> 22 <div class="flex-div-start" style="float: left;">
@@ -30,8 +30,12 @@ @@ -30,8 +30,12 @@
30 </el-row> 30 </el-row>
31 <el-row> 31 <el-row>
32 <div class="flex-div-start" style="margin: 4px;"> 32 <div class="flex-div-start" style="margin: 4px;">
33 - <el-button @click="save()" style="margin-left: 10px" type="primary">新增</el-button>  
34 - <el-button @click="deleteOther()" style="margin-left: 10px" type="primary">删除</el-button> 33 + <div style="margin-left: 10px">
  34 + <el-button @click="save()" type="primary">新增</el-button>
  35 + </div>
  36 + <div style="margin-left: 10px">
  37 + <el-button @click="deleteOther()" style="margin-left: 10px" type="primary">删除</el-button>
  38 + </div>
35 </div> 39 </div>
36 </el-row> 40 </el-row>
37 <el-row class="margin-bottom-50" style="padding:0 10px;"> 41 <el-row class="margin-bottom-50" style="padding:0 10px;">