monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 鲁尚清
Commit df47455a8ce3d822723255434edec9d5b799b691 2 parents 08adeedc ceb7e76b

Merge branch 'master' of http://192.168.1.136:82/monitor_v3/hg-monitor-web into … 

…master-v32-lushangqing
Inline Side-by-side
Showing 3 changed files with 7 additions and 7 deletions
@@ -2,26 +2,26 @@ @@ -2,26 +2,26 @@
2 <el-row> 2 <el-row>
3 <el-col :span="24"> 3 <el-col :span="24">
4 <div class="set-add-div"> 4 <div class="set-add-div">
5 - <el-row> 5 + <el-row style="margin-bottom: 5px;margin-top: 5px">
6 <el-col :span="24"> 6 <el-col :span="24">
7 <div class="flex-div-start margin-top-bottom-10"> 7 <div class="flex-div-start margin-top-bottom-10">
8 - <el-input style="width:160px;margin-left: 10px;" class="margin-right-10" v-model="keyWords" 8 + <el-input style="width:160px;margin-left: 10px;float: left;" class="margin-right-10" v-model="keyWords"
9 placeholder="输入关键字"/> 9 placeholder="输入关键字"/>
10 - <el-dropdown style="margin-top: -15px;"> 10 + <el-dropdown style="margin-top: -15px;margin-left: 10px;float: left;">
11 <el-icon class="el-icon--right"> 11 <el-icon class="el-icon--right">
12 <arrow-down/> 12 <arrow-down/>
13 </el-icon> 13 </el-icon>
14 <cm-biz-type-tree-input multiple clearable collapseTags @callback="getBizType"/> 14 <cm-biz-type-tree-input multiple clearable collapseTags @callback="getBizType"/>
15 </el-dropdown> 15 </el-dropdown>
16 16
17 - <el-dropdown style="margin-top: -15px;margin-left: 10px;"> 17 + <el-dropdown style="margin-top: -15px;margin-left: 10px;float: left;">
18 <el-icon class="el-icon--right"> 18 <el-icon class="el-icon--right">
19 <arrow-down/> 19 <arrow-down/>
20 </el-icon> 20 </el-icon>
21 <cm-res-type-tree-input multiple clearable collapseTags @callback="getResType"/> 21 <cm-res-type-tree-input multiple clearable collapseTags @callback="getResType"/>
22 </el-dropdown> 22 </el-dropdown>
23 23
24 - <div class="flex-div-start"> 24 + <div class="flex-div-start" style="float: left;">
25 <!-- <el-button type="primary" @click="onReset()">重置</el-button>--> 25 <!-- <el-button type="primary" @click="onReset()">重置</el-button>-->
26 <el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button> 26 <el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
27 </div> 27 </div>
@@ -106,7 +106,6 @@ body{ @@ -106,7 +106,6 @@ body{
106 align-items: center; 106 align-items: center;
107 width: 20px; 107 width: 20px;
108 height: 20px; 108 height: 20px;
109 - background:rgb(30,159,255);  
110 border-radius: 2px; 109 border-radius: 2px;
111 cursor: pointer; 110 cursor: pointer;
112 } 111 }
@@ -176,4 +175,5 @@ body{ @@ -176,4 +175,5 @@ body{
176 .list-handle{ 175 .list-handle{
177 display: flex; 176 display: flex;
178 justify-content: space-around; 177 justify-content: space-around;
  178 + color:rgb(30,159,255);
179 } 179 }
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 <template #default="scope"> 46 <template #default="scope">
47 <div class="list-handle"> 47 <div class="list-handle">
48 <span class="icon-bg"> 48 <span class="icon-bg">
49 - <i class="icon-list icon-list-delete" title="删除" @click="handleDelete(scope.row)"></i> 49 + <i class="el-icon-delete" title="删除" @click="handleDelete(scope.row)"></i>
50 </span> 50 </span>
51 <span class="icon-bg"> 51 <span class="icon-bg">
52 <i class="el-icon-edit-outline" title="修改" @click="handleUpdate(scope.row)"></i> 52 <i class="el-icon-edit-outline" title="修改" @click="handleUpdate(scope.row)"></i>