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

…master-v32-lushangqing

@@ -2,26 +2,26 @@
     <el-row>
         <el-col :span="24">
             <div class="set-add-div">
-                <el-row>
+                <el-row style="margin-bottom: 5px;margin-top: 5px">
                     <el-col :span="24">
                         <div class="flex-div-start margin-top-bottom-10">
-                            <el-input style="width:160px;margin-left: 10px;" class="margin-right-10" v-model="keyWords"
+                            <el-input style="width:160px;margin-left: 10px;float: left;" class="margin-right-10" v-model="keyWords"
                                       placeholder="输入关键字"/>
-                            <el-dropdown style="margin-top: -15px;">
+                            <el-dropdown style="margin-top: -15px;margin-left: 10px;float: left;">
                                 <el-icon class="el-icon--right">
                                     <arrow-down/>
                                 </el-icon>
                                 <cm-biz-type-tree-input multiple clearable collapseTags @callback="getBizType"/>
                             </el-dropdown>
 
-                            <el-dropdown style="margin-top: -15px;margin-left: 10px;">
+                            <el-dropdown style="margin-top: -15px;margin-left: 10px;float: left;">
                                 <el-icon class="el-icon--right">
                                     <arrow-down/>
                                 </el-icon>
                                 <cm-res-type-tree-input multiple clearable collapseTags @callback="getResType"/>
                             </el-dropdown>
 
-                            <div class="flex-div-start">
+                            <div class="flex-div-start" style="float: left;">
 <!--                                <el-button type="primary" @click="onReset()">重置</el-button>-->
                                 <el-button type="primary" @click="onBtnSearch()" style="margin-left: 10px">查询</el-button>
                             </div>

@@ -106,7 +106,6 @@ body{
     align-items: center;
     width: 20px;
     height: 20px;
-    background:rgb(30,159,255);
     border-radius: 2px;
     cursor: pointer;
 }
@@ -176,4 +175,5 @@ body{
 .list-handle{
     display: flex;
     justify-content: space-around;
+    color:rgb(30,159,255);
 }
\ No newline at end of file

@@ -46,7 +46,7 @@
                         <template #default="scope">
                             <div class="list-handle">
                                 <span class="icon-bg">
-                                     <i class="icon-list icon-list-delete" title="删除" @click="handleDelete(scope.row)"></i>
+                                     <i class="el-icon-delete" title="删除" @click="handleDelete(scope.row)"></i>
                                 </span>
                                 <span class="icon-bg">
                                      <i class="el-icon-edit-outline" title="修改" @click="handleUpdate(scope.row)"></i>