Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/views/core/task/index.vue

@@ -7,7 +7,7 @@
                     @click="clickTreeNode"></org-tree>
       </el-col>
       <el-col :span="20" :xs="24">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
 <!--
       <el-form-item label="调阅周期" prop="cycle">
         <el-select v-model="queryParams.cycle" placeholder="请选择周期" clearable>
@@ -58,13 +58,23 @@
 
 
 
-      <el-form-item>
+      <!-- <el-form-item>
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
-      </el-form-item>
+      </el-form-item> -->
     </el-form>
 
     <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+                <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery"
+                         >搜索
+                </el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
+                         >重置
+                </el-button>
+              </el-col>
 
      <el-col :span="1.5">
         <el-button

src/views/system/device/index.vue

@@ -19,7 +19,7 @@
                   <el-input v-model="queryParams.deviceName" placeholder="请输入关键字" maxlength="50"
                             @keyup.enter.native="handleQuery" />
                 </el-form-item>
-                <el-form-item label="设备类别" prop="assetType">
+                <el-form-item label="设备类别" prop="assetType" label-width="80">
 
                   <el-select style="width: 100%;"  v-model="queryParams.assetType" placeholder="请选择设备类别"
                              @change="searchChangeSelectDevice">
@@ -28,7 +28,7 @@
                   </el-select>
                 </el-form-item>
 
-                <el-form-item label="设备分类" prop="deviceType">
+                <el-form-item label="设备分类" prop="deviceType" label-width="80">
 
                   <el-select style="width: 100%;"  v-model="queryParams.deviceType" placeholder="请选择设备种类">
                     <el-option v-for="item in searchDevices" :key="item.dictValue" :label="item.dictLabel"
@@ -47,13 +47,34 @@
                   >
                 </el-col>
                 <el-col :span="1.5">
-                  <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
+                  <el-button    type="primary" icon="el-icon-refresh" size="mini" @click="resetQuery"
                   >重置</el-button
                   >
                 </el-col>
                 <el-col :span="1.5">
                   <el-button
                     type="primary"
+                    icon="el-icon-search"
+                    size="mini"
+                    @click="handleQuery"
+                  >搜索</el-button
+                  >
+                </el-col>
+                <el-col :span="1.5">
+                  <el-button
+                    type="primary"
+                    icon="el-icon-refresh"
+                    size="mini"
+                    @click="resetQuery"
+               
+                  >重置</el-button
+                  >
+                </el-col>
+
+
+                <el-col :span="1.5">
+                  <el-button
+                    type="primary"
                     icon="el-icon-plus"
                     size="mini"
                     @click="handleAdd"