Authored by wangtao

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

... ... @@ -16,7 +16,7 @@
<div style="margin-right:6px;">
<cm-biz-type-tree-input @callback="getBizType" clearable collapseTags multiple/>
</div>
<div>
<div style="margin-right:6px;">
<cm-res-type-tree-input @callback="getResType" clearable collapseTags multiple/>
</div>
<div class="flex-div-start" style="float: left;">
... ... @@ -30,8 +30,12 @@
</el-row>
<el-row>
<div class="flex-div-start" style="margin: 4px;">
<el-button @click="save()" style="margin-left: 10px" type="primary">新增</el-button>
<el-button @click="deleteOther()" style="margin-left: 10px" type="primary">删除</el-button>
<div style="margin-left: 10px">
<el-button @click="save()" type="primary">新增</el-button>
</div>
<div style="margin-left: 10px">
<el-button @click="deleteOther()" style="margin-left: 10px" type="primary">删除</el-button>
</div>
</div>
</el-row>
<el-row class="margin-bottom-50" style="padding:0 10px;">
... ...