diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index f280c51..6312059 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -1,14 +1,14 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="fetchData" >
+    <!--<div class="search-div">-->
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
         <!--一般查询条件-->
         <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" clearable/>
+          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
         </search-item>
         <search-item v-if="isOperation()" >
-          <el-select v-model="listQuery.alarmType" placeholder="告警类型" clearable>
+          <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
             <el-option
               v-for="item in alarmTypeList"
               :key="item.value"
@@ -17,7 +17,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" clearable>
+          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
             <el-option
               v-for="item in alarmContentTypeList"
               :key="item.value"
@@ -32,13 +32,13 @@
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="报警开始时间"
-            end-placeholder="报警结束时间"/>
+            end-placeholder="报警结束时间" size="small"/>
         </search-item>
-        <search-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </search-item>
+        <!--<search-item>-->
+          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>-->
+        <!--</search-item>-->
       </search-area>
-    </div>
+    <!--</div>-->
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index f280c51..6312059 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -1,14 +1,14 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="fetchData" >
+    <!--<div class="search-div">-->
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
         <!--一般查询条件-->
         <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" clearable/>
+          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
         </search-item>
         <search-item v-if="isOperation()" >
-          <el-select v-model="listQuery.alarmType" placeholder="告警类型" clearable>
+          <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
             <el-option
               v-for="item in alarmTypeList"
               :key="item.value"
@@ -17,7 +17,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" clearable>
+          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
             <el-option
               v-for="item in alarmContentTypeList"
               :key="item.value"
@@ -32,13 +32,13 @@
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="报警开始时间"
-            end-placeholder="报警结束时间"/>
+            end-placeholder="报警结束时间" size="small"/>
         </search-item>
-        <search-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </search-item>
+        <!--<search-item>-->
+          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>-->
+        <!--</search-item>-->
       </search-area>
-    </div>
+    <!--</div>-->
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8408f23..3f9c72a 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -1,44 +1,42 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
-        <!--一般查询条件-->
-        <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
-        </search-item>
-        <search-item v-if="isOperation()" >
-          <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
-            <el-option
-              v-for="item in alarmTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
-            <el-option
-              v-for="item in alarmContentTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="报警开始时间"
-            end-placeholder="报警结束时间" size="small"/>
-        </search-item>
-        <!--<search-item>-->
-          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
-        <!--</search-item>-->
-      </search-area>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+      </search-item>
+      <search-item v-if="isOperation()" >
+        <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
+          <el-option
+            v-for="item in alarmTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
+          <el-option
+            v-for="item in alarmContentTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="报警开始时间"
+          end-placeholder="报警结束时间" size="small"/>
+      </search-item>
+      <!--<search-item>-->
+        <!--<el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
+      <!--</search-item>-->
+    </search-area>
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index f280c51..6312059 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -1,14 +1,14 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="fetchData" >
+    <!--<div class="search-div">-->
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
         <!--一般查询条件-->
         <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" clearable/>
+          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
         </search-item>
         <search-item v-if="isOperation()" >
-          <el-select v-model="listQuery.alarmType" placeholder="告警类型" clearable>
+          <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
             <el-option
               v-for="item in alarmTypeList"
               :key="item.value"
@@ -17,7 +17,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" clearable>
+          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
             <el-option
               v-for="item in alarmContentTypeList"
               :key="item.value"
@@ -32,13 +32,13 @@
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="报警开始时间"
-            end-placeholder="报警结束时间"/>
+            end-placeholder="报警结束时间" size="small"/>
         </search-item>
-        <search-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </search-item>
+        <!--<search-item>-->
+          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>-->
+        <!--</search-item>-->
       </search-area>
-    </div>
+    <!--</div>-->
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8408f23..3f9c72a 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -1,44 +1,42 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
-        <!--一般查询条件-->
-        <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
-        </search-item>
-        <search-item v-if="isOperation()" >
-          <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
-            <el-option
-              v-for="item in alarmTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
-            <el-option
-              v-for="item in alarmContentTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="报警开始时间"
-            end-placeholder="报警结束时间" size="small"/>
-        </search-item>
-        <!--<search-item>-->
-          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
-        <!--</search-item>-->
-      </search-area>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+      </search-item>
+      <search-item v-if="isOperation()" >
+        <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
+          <el-option
+            v-for="item in alarmTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
+          <el-option
+            v-for="item in alarmContentTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="报警开始时间"
+          end-placeholder="报警结束时间" size="small"/>
+      </search-item>
+      <!--<search-item>-->
+        <!--<el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
+      <!--</search-item>-->
+    </search-area>
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmRule/alarmRule.vue b/src/views/alarmRule/alarmRule.vue
index 0201880..360a8ae 100644
--- a/src/views/alarmRule/alarmRule.vue
+++ b/src/views/alarmRule/alarmRule.vue
@@ -30,6 +30,6 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .container{
-    padding: 5px;
+    /*padding: 5px;*/
   }
 </style>

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index f280c51..6312059 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -1,14 +1,14 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="fetchData" >
+    <!--<div class="search-div">-->
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
         <!--一般查询条件-->
         <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" clearable/>
+          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
         </search-item>
         <search-item v-if="isOperation()" >
-          <el-select v-model="listQuery.alarmType" placeholder="告警类型" clearable>
+          <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
             <el-option
               v-for="item in alarmTypeList"
               :key="item.value"
@@ -17,7 +17,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" clearable>
+          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
             <el-option
               v-for="item in alarmContentTypeList"
               :key="item.value"
@@ -32,13 +32,13 @@
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="报警开始时间"
-            end-placeholder="报警结束时间"/>
+            end-placeholder="报警结束时间" size="small"/>
         </search-item>
-        <search-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </search-item>
+        <!--<search-item>-->
+          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>-->
+        <!--</search-item>-->
       </search-area>
-    </div>
+    <!--</div>-->
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8408f23..3f9c72a 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -1,44 +1,42 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
-        <!--一般查询条件-->
-        <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
-        </search-item>
-        <search-item v-if="isOperation()" >
-          <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
-            <el-option
-              v-for="item in alarmTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
-            <el-option
-              v-for="item in alarmContentTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="报警开始时间"
-            end-placeholder="报警结束时间" size="small"/>
-        </search-item>
-        <!--<search-item>-->
-          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
-        <!--</search-item>-->
-      </search-area>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+      </search-item>
+      <search-item v-if="isOperation()" >
+        <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
+          <el-option
+            v-for="item in alarmTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
+          <el-option
+            v-for="item in alarmContentTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="报警开始时间"
+          end-placeholder="报警结束时间" size="small"/>
+      </search-item>
+      <!--<search-item>-->
+        <!--<el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
+      <!--</search-item>-->
+    </search-area>
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmRule/alarmRule.vue b/src/views/alarmRule/alarmRule.vue
index 0201880..360a8ae 100644
--- a/src/views/alarmRule/alarmRule.vue
+++ b/src/views/alarmRule/alarmRule.vue
@@ -30,6 +30,6 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .container{
-    padding: 5px;
+    /*padding: 5px;*/
   }
 </style>
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 1337bf9..1a175f1 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -1,23 +1,21 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
-        <!--一般查询条件-->
-        <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-        </search-item>
-        <search-item v-if="showDeviceType" >
-          <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
-            <el-option
-              v-for="item in deviceTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-      </search-area>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
+      </search-item>
+      <search-item v-if="showDeviceType" >
+        <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index f280c51..6312059 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -1,14 +1,14 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="fetchData" >
+    <!--<div class="search-div">-->
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
         <!--一般查询条件-->
         <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" clearable/>
+          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
         </search-item>
         <search-item v-if="isOperation()" >
-          <el-select v-model="listQuery.alarmType" placeholder="告警类型" clearable>
+          <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
             <el-option
               v-for="item in alarmTypeList"
               :key="item.value"
@@ -17,7 +17,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" clearable>
+          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
             <el-option
               v-for="item in alarmContentTypeList"
               :key="item.value"
@@ -32,13 +32,13 @@
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="报警开始时间"
-            end-placeholder="报警结束时间"/>
+            end-placeholder="报警结束时间" size="small"/>
         </search-item>
-        <search-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </search-item>
+        <!--<search-item>-->
+          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>-->
+        <!--</search-item>-->
       </search-area>
-    </div>
+    <!--</div>-->
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8408f23..3f9c72a 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -1,44 +1,42 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
-        <!--一般查询条件-->
-        <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
-        </search-item>
-        <search-item v-if="isOperation()" >
-          <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
-            <el-option
-              v-for="item in alarmTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
-            <el-option
-              v-for="item in alarmContentTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="报警开始时间"
-            end-placeholder="报警结束时间" size="small"/>
-        </search-item>
-        <!--<search-item>-->
-          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
-        <!--</search-item>-->
-      </search-area>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+      </search-item>
+      <search-item v-if="isOperation()" >
+        <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
+          <el-option
+            v-for="item in alarmTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
+          <el-option
+            v-for="item in alarmContentTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="报警开始时间"
+          end-placeholder="报警结束时间" size="small"/>
+      </search-item>
+      <!--<search-item>-->
+        <!--<el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
+      <!--</search-item>-->
+    </search-area>
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmRule/alarmRule.vue b/src/views/alarmRule/alarmRule.vue
index 0201880..360a8ae 100644
--- a/src/views/alarmRule/alarmRule.vue
+++ b/src/views/alarmRule/alarmRule.vue
@@ -30,6 +30,6 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .container{
-    padding: 5px;
+    /*padding: 5px;*/
   }
 </style>
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 1337bf9..1a175f1 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -1,23 +1,21 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
-        <!--一般查询条件-->
-        <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-        </search-item>
-        <search-item v-if="showDeviceType" >
-          <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
-            <el-option
-              v-for="item in deviceTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-      </search-area>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
+      </search-item>
+      <search-item v-if="showDeviceType" >
+        <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
deleted file mode 100644
index 60d5324..0000000
--- a/src/views/alarmRule/listRule.vue
+++ /dev/null
@@ -1,260 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-          </el-form-item>
-          <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
-            <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
-    <!--查询结果Table显示-->
-    <div>
-      <el-row class="table-title">
-        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/alarmRule/add')" class="edit_btn" size="small" @click="add">新增</el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <!--<el-table-column align="center" type="selection" width="55"/>-->
-        <el-table-column :index="indexMethod" align="center" type="index"/>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row.wellCode }}</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
-          <template slot-scope="scope">
-            <el-button v-if="hasPerm('/alarmRule/update')" type="text" @click="edit(scope.row)">编辑</el-button>
-            <el-button v-if="hasPerm('/alarmRule/delete')" type="text" @click="del(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-
-    <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData"/>
-    <info-well v-show="wellShow" ref="wellInfo"/>
-
-  </div>
-</template>
-
-<script>
-import infoWell from '@/views/wellManage/infoWell'
-import editRule from '@/views/alarmRule/editRule'
-import { getDeviceType } from '@/api/device'
-import { getAlarmRuleList, delRule } from '@/api/alarmRule'
-
-export default {
-  name: 'ListRule',
-  components: { editRule, infoWell },
-  data() {
-    return {
-      listQuery: {
-        keywords: '',
-        status: '',
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: ''
-      }, // 筛选条件
-      columns: [
-        {
-          text: '井编号',
-          value: 'wellCode',
-          align: 'center',
-          type: 'Button'
-        },
-        {
-          text: '井名称',
-          value: 'wellName',
-          align: 'center'
-        },
-        {
-          text: '井深',
-          value: 'deep',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '设备编号',
-          value: 'devcode',
-          align: 'center'
-        },
-        {
-          text: '告警上限（m）',
-          value: 'highValue',
-          align: 'center'
-        },
-        {
-          text: '操作人',
-          value: 'user',
-          width: 100,
-          align: 'center'
-        }
-      ], // 显示列
-      multipleSelection: [], // 多选选中项
-      list: [], // 列表数据
-      total: 0, // 数据总数
-      deviceTypeList: [], // 设备类型列表
-      showDeviceType: true,
-      listLoading: true, // 加载动画
-      editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示井详情
-    }
-  },
-  created() {
-    this.fetchDeviceType()// 获取部门树
-    this.fetchData()// 获取数据
-  },
-  methods: {
-    // 显示井详情
-    showWellDetail(row) {
-      this.wellShow = true
-      this.$refs.wellInfo.initDialog(row.wellId)
-    },
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
-    // 编辑告警规则信息
-    edit(row) {
-      this.editShow = true
-      this.$refs.editrule.initDialog('update', true, row)
-    },
-    add() {
-      this.editShow = true
-      this.$refs.editrule.initDialog('create', true)
-    },
-    // 编辑告警规则信息
-    del(row) {
-      this.$confirm(
-        '确定要删除该报警规则吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delRule(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      })
-    },
-    // 查询数据
-    search() {
-      this.fetchData(false)
-    },
-    // 获取数据
-    fetchData(isNowPage = true) {
-      this.listLoading = true
-      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
-        this.listQuery.offset = 1
-      }
-      getAlarmRuleList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = parseInt(response.data.total)
-        this.listLoading = false
-      })
-    },
-    // 获取设备类型
-    fetchDeviceType() {
-      getDeviceType(this.listQuery).then(response => {
-        this.deviceTypeList = []
-        const supportDeviceTypes = this.$store.getters.deviceTypes
-        for (const item of response.data) {
-          if (supportDeviceTypes.indexOf(item.value) !== -1) {
-            this.deviceTypeList.push(item)
-          }
-        }
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
-        }
-      })
-    },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index f280c51..6312059 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -1,14 +1,14 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="fetchData" >
+    <!--<div class="search-div">-->
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
         <!--一般查询条件-->
         <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" clearable/>
+          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
         </search-item>
         <search-item v-if="isOperation()" >
-          <el-select v-model="listQuery.alarmType" placeholder="告警类型" clearable>
+          <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
             <el-option
               v-for="item in alarmTypeList"
               :key="item.value"
@@ -17,7 +17,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" clearable>
+          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
             <el-option
               v-for="item in alarmContentTypeList"
               :key="item.value"
@@ -32,13 +32,13 @@
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="报警开始时间"
-            end-placeholder="报警结束时间"/>
+            end-placeholder="报警结束时间" size="small"/>
         </search-item>
-        <search-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </search-item>
+        <!--<search-item>-->
+          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>-->
+        <!--</search-item>-->
       </search-area>
-    </div>
+    <!--</div>-->
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8408f23..3f9c72a 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -1,44 +1,42 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
-        <!--一般查询条件-->
-        <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
-        </search-item>
-        <search-item v-if="isOperation()" >
-          <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
-            <el-option
-              v-for="item in alarmTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
-            <el-option
-              v-for="item in alarmContentTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="报警开始时间"
-            end-placeholder="报警结束时间" size="small"/>
-        </search-item>
-        <!--<search-item>-->
-          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
-        <!--</search-item>-->
-      </search-area>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+      </search-item>
+      <search-item v-if="isOperation()" >
+        <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
+          <el-option
+            v-for="item in alarmTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
+          <el-option
+            v-for="item in alarmContentTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="报警开始时间"
+          end-placeholder="报警结束时间" size="small"/>
+      </search-item>
+      <!--<search-item>-->
+        <!--<el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
+      <!--</search-item>-->
+    </search-area>
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmRule/alarmRule.vue b/src/views/alarmRule/alarmRule.vue
index 0201880..360a8ae 100644
--- a/src/views/alarmRule/alarmRule.vue
+++ b/src/views/alarmRule/alarmRule.vue
@@ -30,6 +30,6 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .container{
-    padding: 5px;
+    /*padding: 5px;*/
   }
 </style>
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 1337bf9..1a175f1 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -1,23 +1,21 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
-        <!--一般查询条件-->
-        <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-        </search-item>
-        <search-item v-if="showDeviceType" >
-          <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
-            <el-option
-              v-for="item in deviceTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-      </search-area>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
+      </search-item>
+      <search-item v-if="showDeviceType" >
+        <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
deleted file mode 100644
index 60d5324..0000000
--- a/src/views/alarmRule/listRule.vue
+++ /dev/null
@@ -1,260 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-          </el-form-item>
-          <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
-            <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
-    <!--查询结果Table显示-->
-    <div>
-      <el-row class="table-title">
-        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/alarmRule/add')" class="edit_btn" size="small" @click="add">新增</el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <!--<el-table-column align="center" type="selection" width="55"/>-->
-        <el-table-column :index="indexMethod" align="center" type="index"/>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row.wellCode }}</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
-          <template slot-scope="scope">
-            <el-button v-if="hasPerm('/alarmRule/update')" type="text" @click="edit(scope.row)">编辑</el-button>
-            <el-button v-if="hasPerm('/alarmRule/delete')" type="text" @click="del(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-
-    <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData"/>
-    <info-well v-show="wellShow" ref="wellInfo"/>
-
-  </div>
-</template>
-
-<script>
-import infoWell from '@/views/wellManage/infoWell'
-import editRule from '@/views/alarmRule/editRule'
-import { getDeviceType } from '@/api/device'
-import { getAlarmRuleList, delRule } from '@/api/alarmRule'
-
-export default {
-  name: 'ListRule',
-  components: { editRule, infoWell },
-  data() {
-    return {
-      listQuery: {
-        keywords: '',
-        status: '',
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: ''
-      }, // 筛选条件
-      columns: [
-        {
-          text: '井编号',
-          value: 'wellCode',
-          align: 'center',
-          type: 'Button'
-        },
-        {
-          text: '井名称',
-          value: 'wellName',
-          align: 'center'
-        },
-        {
-          text: '井深',
-          value: 'deep',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '设备编号',
-          value: 'devcode',
-          align: 'center'
-        },
-        {
-          text: '告警上限（m）',
-          value: 'highValue',
-          align: 'center'
-        },
-        {
-          text: '操作人',
-          value: 'user',
-          width: 100,
-          align: 'center'
-        }
-      ], // 显示列
-      multipleSelection: [], // 多选选中项
-      list: [], // 列表数据
-      total: 0, // 数据总数
-      deviceTypeList: [], // 设备类型列表
-      showDeviceType: true,
-      listLoading: true, // 加载动画
-      editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示井详情
-    }
-  },
-  created() {
-    this.fetchDeviceType()// 获取部门树
-    this.fetchData()// 获取数据
-  },
-  methods: {
-    // 显示井详情
-    showWellDetail(row) {
-      this.wellShow = true
-      this.$refs.wellInfo.initDialog(row.wellId)
-    },
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
-    // 编辑告警规则信息
-    edit(row) {
-      this.editShow = true
-      this.$refs.editrule.initDialog('update', true, row)
-    },
-    add() {
-      this.editShow = true
-      this.$refs.editrule.initDialog('create', true)
-    },
-    // 编辑告警规则信息
-    del(row) {
-      this.$confirm(
-        '确定要删除该报警规则吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delRule(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      })
-    },
-    // 查询数据
-    search() {
-      this.fetchData(false)
-    },
-    // 获取数据
-    fetchData(isNowPage = true) {
-      this.listLoading = true
-      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
-        this.listQuery.offset = 1
-      }
-      getAlarmRuleList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = parseInt(response.data.total)
-        this.listLoading = false
-      })
-    },
-    // 获取设备类型
-    fetchDeviceType() {
-      getDeviceType(this.listQuery).then(response => {
-        this.deviceTypeList = []
-        const supportDeviceTypes = this.$store.getters.deviceTypes
-        for (const item of response.data) {
-          if (supportDeviceTypes.indexOf(item.value) !== -1) {
-            this.deviceTypeList.push(item)
-          }
-        }
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
-        }
-      })
-    },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index a46b904..502d027 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -133,6 +133,7 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .container{
-    padding: 5px;
+    /*padding: 5px;*/
+    background-color: white
   }
 </style>

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index f280c51..6312059 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -1,14 +1,14 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="fetchData" >
+    <!--<div class="search-div">-->
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
         <!--一般查询条件-->
         <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" clearable/>
+          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
         </search-item>
         <search-item v-if="isOperation()" >
-          <el-select v-model="listQuery.alarmType" placeholder="告警类型" clearable>
+          <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
             <el-option
               v-for="item in alarmTypeList"
               :key="item.value"
@@ -17,7 +17,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" clearable>
+          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
             <el-option
               v-for="item in alarmContentTypeList"
               :key="item.value"
@@ -32,13 +32,13 @@
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="报警开始时间"
-            end-placeholder="报警结束时间"/>
+            end-placeholder="报警结束时间" size="small"/>
         </search-item>
-        <search-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </search-item>
+        <!--<search-item>-->
+          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>-->
+        <!--</search-item>-->
       </search-area>
-    </div>
+    <!--</div>-->
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8408f23..3f9c72a 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -1,44 +1,42 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
-        <!--一般查询条件-->
-        <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
-        </search-item>
-        <search-item v-if="isOperation()" >
-          <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
-            <el-option
-              v-for="item in alarmTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
-            <el-option
-              v-for="item in alarmContentTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="报警开始时间"
-            end-placeholder="报警结束时间" size="small"/>
-        </search-item>
-        <!--<search-item>-->
-          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
-        <!--</search-item>-->
-      </search-area>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+      </search-item>
+      <search-item v-if="isOperation()" >
+        <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
+          <el-option
+            v-for="item in alarmTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
+          <el-option
+            v-for="item in alarmContentTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="报警开始时间"
+          end-placeholder="报警结束时间" size="small"/>
+      </search-item>
+      <!--<search-item>-->
+        <!--<el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
+      <!--</search-item>-->
+    </search-area>
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmRule/alarmRule.vue b/src/views/alarmRule/alarmRule.vue
index 0201880..360a8ae 100644
--- a/src/views/alarmRule/alarmRule.vue
+++ b/src/views/alarmRule/alarmRule.vue
@@ -30,6 +30,6 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .container{
-    padding: 5px;
+    /*padding: 5px;*/
   }
 </style>
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 1337bf9..1a175f1 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -1,23 +1,21 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
-        <!--一般查询条件-->
-        <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-        </search-item>
-        <search-item v-if="showDeviceType" >
-          <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
-            <el-option
-              v-for="item in deviceTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-      </search-area>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
+      </search-item>
+      <search-item v-if="showDeviceType" >
+        <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
deleted file mode 100644
index 60d5324..0000000
--- a/src/views/alarmRule/listRule.vue
+++ /dev/null
@@ -1,260 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-          </el-form-item>
-          <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
-            <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
-    <!--查询结果Table显示-->
-    <div>
-      <el-row class="table-title">
-        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/alarmRule/add')" class="edit_btn" size="small" @click="add">新增</el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <!--<el-table-column align="center" type="selection" width="55"/>-->
-        <el-table-column :index="indexMethod" align="center" type="index"/>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row.wellCode }}</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
-          <template slot-scope="scope">
-            <el-button v-if="hasPerm('/alarmRule/update')" type="text" @click="edit(scope.row)">编辑</el-button>
-            <el-button v-if="hasPerm('/alarmRule/delete')" type="text" @click="del(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-
-    <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData"/>
-    <info-well v-show="wellShow" ref="wellInfo"/>
-
-  </div>
-</template>
-
-<script>
-import infoWell from '@/views/wellManage/infoWell'
-import editRule from '@/views/alarmRule/editRule'
-import { getDeviceType } from '@/api/device'
-import { getAlarmRuleList, delRule } from '@/api/alarmRule'
-
-export default {
-  name: 'ListRule',
-  components: { editRule, infoWell },
-  data() {
-    return {
-      listQuery: {
-        keywords: '',
-        status: '',
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: ''
-      }, // 筛选条件
-      columns: [
-        {
-          text: '井编号',
-          value: 'wellCode',
-          align: 'center',
-          type: 'Button'
-        },
-        {
-          text: '井名称',
-          value: 'wellName',
-          align: 'center'
-        },
-        {
-          text: '井深',
-          value: 'deep',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '设备编号',
-          value: 'devcode',
-          align: 'center'
-        },
-        {
-          text: '告警上限（m）',
-          value: 'highValue',
-          align: 'center'
-        },
-        {
-          text: '操作人',
-          value: 'user',
-          width: 100,
-          align: 'center'
-        }
-      ], // 显示列
-      multipleSelection: [], // 多选选中项
-      list: [], // 列表数据
-      total: 0, // 数据总数
-      deviceTypeList: [], // 设备类型列表
-      showDeviceType: true,
-      listLoading: true, // 加载动画
-      editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示井详情
-    }
-  },
-  created() {
-    this.fetchDeviceType()// 获取部门树
-    this.fetchData()// 获取数据
-  },
-  methods: {
-    // 显示井详情
-    showWellDetail(row) {
-      this.wellShow = true
-      this.$refs.wellInfo.initDialog(row.wellId)
-    },
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
-    // 编辑告警规则信息
-    edit(row) {
-      this.editShow = true
-      this.$refs.editrule.initDialog('update', true, row)
-    },
-    add() {
-      this.editShow = true
-      this.$refs.editrule.initDialog('create', true)
-    },
-    // 编辑告警规则信息
-    del(row) {
-      this.$confirm(
-        '确定要删除该报警规则吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delRule(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      })
-    },
-    // 查询数据
-    search() {
-      this.fetchData(false)
-    },
-    // 获取数据
-    fetchData(isNowPage = true) {
-      this.listLoading = true
-      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
-        this.listQuery.offset = 1
-      }
-      getAlarmRuleList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = parseInt(response.data.total)
-        this.listLoading = false
-      })
-    },
-    // 获取设备类型
-    fetchDeviceType() {
-      getDeviceType(this.listQuery).then(response => {
-        this.deviceTypeList = []
-        const supportDeviceTypes = this.$store.getters.deviceTypes
-        for (const item of response.data) {
-          if (supportDeviceTypes.indexOf(item.value) !== -1) {
-            this.deviceTypeList.push(item)
-          }
-        }
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
-        }
-      })
-    },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index a46b904..502d027 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -133,6 +133,7 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .container{
-    padding: 5px;
+    /*padding: 5px;*/
+    background-color: white
   }
 </style>
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 709e3a8..5386d52 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -1,30 +1,26 @@
 <template>
   <div class="app-container">
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="beginTime">
-            <el-date-picker
-              v-model="timeRange"
-              type="datetimerange"
-              range-separator="至"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable/>
+      </search-item>
+      <search-item v-if="showDeviceType" >
+        <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" size="small" placeholder="选择权属单位"/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间" size="small"/>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <div>
+    <div style="padding:0px 10px">
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
@@ -242,7 +238,7 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .app-container{
-    padding: 10px;
+    padding: 0px 0px;
   }
   $tableTitleHeight:46px;
   .table{

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index f280c51..6312059 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -1,14 +1,14 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="fetchData" >
+    <!--<div class="search-div">-->
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
         <!--一般查询条件-->
         <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" clearable/>
+          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
         </search-item>
         <search-item v-if="isOperation()" >
-          <el-select v-model="listQuery.alarmType" placeholder="告警类型" clearable>
+          <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
             <el-option
               v-for="item in alarmTypeList"
               :key="item.value"
@@ -17,7 +17,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" clearable>
+          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
             <el-option
               v-for="item in alarmContentTypeList"
               :key="item.value"
@@ -32,13 +32,13 @@
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="报警开始时间"
-            end-placeholder="报警结束时间"/>
+            end-placeholder="报警结束时间" size="small"/>
         </search-item>
-        <search-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </search-item>
+        <!--<search-item>-->
+          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>-->
+        <!--</search-item>-->
       </search-area>
-    </div>
+    <!--</div>-->
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8408f23..3f9c72a 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -1,44 +1,42 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
-        <!--一般查询条件-->
-        <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
-        </search-item>
-        <search-item v-if="isOperation()" >
-          <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
-            <el-option
-              v-for="item in alarmTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
-            <el-option
-              v-for="item in alarmContentTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="报警开始时间"
-            end-placeholder="报警结束时间" size="small"/>
-        </search-item>
-        <!--<search-item>-->
-          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
-        <!--</search-item>-->
-      </search-area>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+      </search-item>
+      <search-item v-if="isOperation()" >
+        <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
+          <el-option
+            v-for="item in alarmTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
+          <el-option
+            v-for="item in alarmContentTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="报警开始时间"
+          end-placeholder="报警结束时间" size="small"/>
+      </search-item>
+      <!--<search-item>-->
+        <!--<el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
+      <!--</search-item>-->
+    </search-area>
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmRule/alarmRule.vue b/src/views/alarmRule/alarmRule.vue
index 0201880..360a8ae 100644
--- a/src/views/alarmRule/alarmRule.vue
+++ b/src/views/alarmRule/alarmRule.vue
@@ -30,6 +30,6 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .container{
-    padding: 5px;
+    /*padding: 5px;*/
   }
 </style>
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 1337bf9..1a175f1 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -1,23 +1,21 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
-        <!--一般查询条件-->
-        <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-        </search-item>
-        <search-item v-if="showDeviceType" >
-          <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
-            <el-option
-              v-for="item in deviceTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-      </search-area>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
+      </search-item>
+      <search-item v-if="showDeviceType" >
+        <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
deleted file mode 100644
index 60d5324..0000000
--- a/src/views/alarmRule/listRule.vue
+++ /dev/null
@@ -1,260 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-          </el-form-item>
-          <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
-            <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
-    <!--查询结果Table显示-->
-    <div>
-      <el-row class="table-title">
-        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/alarmRule/add')" class="edit_btn" size="small" @click="add">新增</el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <!--<el-table-column align="center" type="selection" width="55"/>-->
-        <el-table-column :index="indexMethod" align="center" type="index"/>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row.wellCode }}</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
-          <template slot-scope="scope">
-            <el-button v-if="hasPerm('/alarmRule/update')" type="text" @click="edit(scope.row)">编辑</el-button>
-            <el-button v-if="hasPerm('/alarmRule/delete')" type="text" @click="del(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-
-    <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData"/>
-    <info-well v-show="wellShow" ref="wellInfo"/>
-
-  </div>
-</template>
-
-<script>
-import infoWell from '@/views/wellManage/infoWell'
-import editRule from '@/views/alarmRule/editRule'
-import { getDeviceType } from '@/api/device'
-import { getAlarmRuleList, delRule } from '@/api/alarmRule'
-
-export default {
-  name: 'ListRule',
-  components: { editRule, infoWell },
-  data() {
-    return {
-      listQuery: {
-        keywords: '',
-        status: '',
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: ''
-      }, // 筛选条件
-      columns: [
-        {
-          text: '井编号',
-          value: 'wellCode',
-          align: 'center',
-          type: 'Button'
-        },
-        {
-          text: '井名称',
-          value: 'wellName',
-          align: 'center'
-        },
-        {
-          text: '井深',
-          value: 'deep',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '设备编号',
-          value: 'devcode',
-          align: 'center'
-        },
-        {
-          text: '告警上限（m）',
-          value: 'highValue',
-          align: 'center'
-        },
-        {
-          text: '操作人',
-          value: 'user',
-          width: 100,
-          align: 'center'
-        }
-      ], // 显示列
-      multipleSelection: [], // 多选选中项
-      list: [], // 列表数据
-      total: 0, // 数据总数
-      deviceTypeList: [], // 设备类型列表
-      showDeviceType: true,
-      listLoading: true, // 加载动画
-      editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示井详情
-    }
-  },
-  created() {
-    this.fetchDeviceType()// 获取部门树
-    this.fetchData()// 获取数据
-  },
-  methods: {
-    // 显示井详情
-    showWellDetail(row) {
-      this.wellShow = true
-      this.$refs.wellInfo.initDialog(row.wellId)
-    },
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
-    // 编辑告警规则信息
-    edit(row) {
-      this.editShow = true
-      this.$refs.editrule.initDialog('update', true, row)
-    },
-    add() {
-      this.editShow = true
-      this.$refs.editrule.initDialog('create', true)
-    },
-    // 编辑告警规则信息
-    del(row) {
-      this.$confirm(
-        '确定要删除该报警规则吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delRule(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      })
-    },
-    // 查询数据
-    search() {
-      this.fetchData(false)
-    },
-    // 获取数据
-    fetchData(isNowPage = true) {
-      this.listLoading = true
-      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
-        this.listQuery.offset = 1
-      }
-      getAlarmRuleList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = parseInt(response.data.total)
-        this.listLoading = false
-      })
-    },
-    // 获取设备类型
-    fetchDeviceType() {
-      getDeviceType(this.listQuery).then(response => {
-        this.deviceTypeList = []
-        const supportDeviceTypes = this.$store.getters.deviceTypes
-        for (const item of response.data) {
-          if (supportDeviceTypes.indexOf(item.value) !== -1) {
-            this.deviceTypeList.push(item)
-          }
-        }
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
-        }
-      })
-    },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index a46b904..502d027 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -133,6 +133,7 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .container{
-    padding: 5px;
+    /*padding: 5px;*/
+    background-color: white
   }
 </style>
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 709e3a8..5386d52 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -1,30 +1,26 @@
 <template>
   <div class="app-container">
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="beginTime">
-            <el-date-picker
-              v-model="timeRange"
-              type="datetimerange"
-              range-separator="至"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable/>
+      </search-item>
+      <search-item v-if="showDeviceType" >
+        <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" size="small" placeholder="选择权属单位"/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间" size="small"/>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <div>
+    <div style="padding:0px 10px">
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
@@ -242,7 +238,7 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .app-container{
-    padding: 10px;
+    padding: 0px 0px;
   }
   $tableTitleHeight:46px;
   .table{
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4ef378c..63b4a1c 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -1,30 +1,48 @@
 <template>
   <div class="app-container">
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="beginTime">
-            <el-date-picker
-              v-model="timeRange"
-              type="datetimerange"
-              range-separator="至"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable/>
+      </search-item>
+      <search-item v-if="showDeviceType" >
+        <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" size="small" placeholder="选择权属单位"/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间" size="small"/>
+      </search-item>
+    </search-area>
+    <!--<div class="search-div">-->
+      <!--<el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">-->
+        <!--<el-row>-->
+          <!--<el-form-item class="selectForm-container-item" prop="keywords">-->
+            <!--<el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>-->
+          <!--</el-form-item>-->
+          <!--<el-form-item class="selectForm-container-item">-->
+            <!--<dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>-->
+          <!--</el-form-item>-->
+          <!--<el-form-item class="selectForm-container-item" prop="beginTime">-->
+            <!--<el-date-picker-->
+              <!--v-model="timeRange"-->
+              <!--type="datetimerange"-->
+              <!--range-separator="至"-->
+              <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+              <!--start-placeholder="开始时间"-->
+              <!--end-placeholder="结束时间"/>-->
+          <!--</el-form-item>-->
+          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>-->
+        <!--</el-row>-->
+      <!--</el-form>-->
+    <!--</div>-->
     <!--查询结果Table显示-->
-    <div>
+    <div style="padding:0px 10px">
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
@@ -236,7 +254,7 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .app-container{
-    padding: 10px;
+    padding: 0px 0px;
   }
   $tableTitleHeight:46px;
   .table{

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index f280c51..6312059 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -1,14 +1,14 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="fetchData" >
+    <!--<div class="search-div">-->
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
         <!--一般查询条件-->
         <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" clearable/>
+          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
         </search-item>
         <search-item v-if="isOperation()" >
-          <el-select v-model="listQuery.alarmType" placeholder="告警类型" clearable>
+          <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
             <el-option
               v-for="item in alarmTypeList"
               :key="item.value"
@@ -17,7 +17,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" clearable>
+          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
             <el-option
               v-for="item in alarmContentTypeList"
               :key="item.value"
@@ -32,13 +32,13 @@
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="报警开始时间"
-            end-placeholder="报警结束时间"/>
+            end-placeholder="报警结束时间" size="small"/>
         </search-item>
-        <search-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </search-item>
+        <!--<search-item>-->
+          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>-->
+        <!--</search-item>-->
       </search-area>
-    </div>
+    <!--</div>-->
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8408f23..3f9c72a 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -1,44 +1,42 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
-        <!--一般查询条件-->
-        <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
-        </search-item>
-        <search-item v-if="isOperation()" >
-          <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
-            <el-option
-              v-for="item in alarmTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
-            <el-option
-              v-for="item in alarmContentTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="报警开始时间"
-            end-placeholder="报警结束时间" size="small"/>
-        </search-item>
-        <!--<search-item>-->
-          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
-        <!--</search-item>-->
-      </search-area>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+      </search-item>
+      <search-item v-if="isOperation()" >
+        <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
+          <el-option
+            v-for="item in alarmTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
+          <el-option
+            v-for="item in alarmContentTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="报警开始时间"
+          end-placeholder="报警结束时间" size="small"/>
+      </search-item>
+      <!--<search-item>-->
+        <!--<el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
+      <!--</search-item>-->
+    </search-area>
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmRule/alarmRule.vue b/src/views/alarmRule/alarmRule.vue
index 0201880..360a8ae 100644
--- a/src/views/alarmRule/alarmRule.vue
+++ b/src/views/alarmRule/alarmRule.vue
@@ -30,6 +30,6 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .container{
-    padding: 5px;
+    /*padding: 5px;*/
   }
 </style>
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 1337bf9..1a175f1 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -1,23 +1,21 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
-        <!--一般查询条件-->
-        <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-        </search-item>
-        <search-item v-if="showDeviceType" >
-          <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
-            <el-option
-              v-for="item in deviceTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-      </search-area>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
+      </search-item>
+      <search-item v-if="showDeviceType" >
+        <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
deleted file mode 100644
index 60d5324..0000000
--- a/src/views/alarmRule/listRule.vue
+++ /dev/null
@@ -1,260 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-          </el-form-item>
-          <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
-            <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
-    <!--查询结果Table显示-->
-    <div>
-      <el-row class="table-title">
-        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/alarmRule/add')" class="edit_btn" size="small" @click="add">新增</el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <!--<el-table-column align="center" type="selection" width="55"/>-->
-        <el-table-column :index="indexMethod" align="center" type="index"/>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row.wellCode }}</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
-          <template slot-scope="scope">
-            <el-button v-if="hasPerm('/alarmRule/update')" type="text" @click="edit(scope.row)">编辑</el-button>
-            <el-button v-if="hasPerm('/alarmRule/delete')" type="text" @click="del(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-
-    <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData"/>
-    <info-well v-show="wellShow" ref="wellInfo"/>
-
-  </div>
-</template>
-
-<script>
-import infoWell from '@/views/wellManage/infoWell'
-import editRule from '@/views/alarmRule/editRule'
-import { getDeviceType } from '@/api/device'
-import { getAlarmRuleList, delRule } from '@/api/alarmRule'
-
-export default {
-  name: 'ListRule',
-  components: { editRule, infoWell },
-  data() {
-    return {
-      listQuery: {
-        keywords: '',
-        status: '',
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: ''
-      }, // 筛选条件
-      columns: [
-        {
-          text: '井编号',
-          value: 'wellCode',
-          align: 'center',
-          type: 'Button'
-        },
-        {
-          text: '井名称',
-          value: 'wellName',
-          align: 'center'
-        },
-        {
-          text: '井深',
-          value: 'deep',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '设备编号',
-          value: 'devcode',
-          align: 'center'
-        },
-        {
-          text: '告警上限（m）',
-          value: 'highValue',
-          align: 'center'
-        },
-        {
-          text: '操作人',
-          value: 'user',
-          width: 100,
-          align: 'center'
-        }
-      ], // 显示列
-      multipleSelection: [], // 多选选中项
-      list: [], // 列表数据
-      total: 0, // 数据总数
-      deviceTypeList: [], // 设备类型列表
-      showDeviceType: true,
-      listLoading: true, // 加载动画
-      editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示井详情
-    }
-  },
-  created() {
-    this.fetchDeviceType()// 获取部门树
-    this.fetchData()// 获取数据
-  },
-  methods: {
-    // 显示井详情
-    showWellDetail(row) {
-      this.wellShow = true
-      this.$refs.wellInfo.initDialog(row.wellId)
-    },
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
-    // 编辑告警规则信息
-    edit(row) {
-      this.editShow = true
-      this.$refs.editrule.initDialog('update', true, row)
-    },
-    add() {
-      this.editShow = true
-      this.$refs.editrule.initDialog('create', true)
-    },
-    // 编辑告警规则信息
-    del(row) {
-      this.$confirm(
-        '确定要删除该报警规则吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delRule(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      })
-    },
-    // 查询数据
-    search() {
-      this.fetchData(false)
-    },
-    // 获取数据
-    fetchData(isNowPage = true) {
-      this.listLoading = true
-      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
-        this.listQuery.offset = 1
-      }
-      getAlarmRuleList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = parseInt(response.data.total)
-        this.listLoading = false
-      })
-    },
-    // 获取设备类型
-    fetchDeviceType() {
-      getDeviceType(this.listQuery).then(response => {
-        this.deviceTypeList = []
-        const supportDeviceTypes = this.$store.getters.deviceTypes
-        for (const item of response.data) {
-          if (supportDeviceTypes.indexOf(item.value) !== -1) {
-            this.deviceTypeList.push(item)
-          }
-        }
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
-        }
-      })
-    },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index a46b904..502d027 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -133,6 +133,7 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .container{
-    padding: 5px;
+    /*padding: 5px;*/
+    background-color: white
   }
 </style>
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 709e3a8..5386d52 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -1,30 +1,26 @@
 <template>
   <div class="app-container">
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="beginTime">
-            <el-date-picker
-              v-model="timeRange"
-              type="datetimerange"
-              range-separator="至"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable/>
+      </search-item>
+      <search-item v-if="showDeviceType" >
+        <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" size="small" placeholder="选择权属单位"/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间" size="small"/>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <div>
+    <div style="padding:0px 10px">
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
@@ -242,7 +238,7 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .app-container{
-    padding: 10px;
+    padding: 0px 0px;
   }
   $tableTitleHeight:46px;
   .table{
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4ef378c..63b4a1c 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -1,30 +1,48 @@
 <template>
   <div class="app-container">
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="beginTime">
-            <el-date-picker
-              v-model="timeRange"
-              type="datetimerange"
-              range-separator="至"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable/>
+      </search-item>
+      <search-item v-if="showDeviceType" >
+        <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" size="small" placeholder="选择权属单位"/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间" size="small"/>
+      </search-item>
+    </search-area>
+    <!--<div class="search-div">-->
+      <!--<el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">-->
+        <!--<el-row>-->
+          <!--<el-form-item class="selectForm-container-item" prop="keywords">-->
+            <!--<el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>-->
+          <!--</el-form-item>-->
+          <!--<el-form-item class="selectForm-container-item">-->
+            <!--<dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>-->
+          <!--</el-form-item>-->
+          <!--<el-form-item class="selectForm-container-item" prop="beginTime">-->
+            <!--<el-date-picker-->
+              <!--v-model="timeRange"-->
+              <!--type="datetimerange"-->
+              <!--range-separator="至"-->
+              <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+              <!--start-placeholder="开始时间"-->
+              <!--end-placeholder="结束时间"/>-->
+          <!--</el-form-item>-->
+          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>-->
+        <!--</el-row>-->
+      <!--</el-form>-->
+    <!--</div>-->
     <!--查询结果Table显示-->
-    <div>
+    <div style="padding:0px 10px">
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
@@ -236,7 +254,7 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .app-container{
-    padding: 10px;
+    padding: 0px 0px;
   }
   $tableTitleHeight:46px;
   .table{
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 39f4156..b8a9ebd 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -1,25 +1,32 @@
 <template>
   <div class="app-container" style="background-color: white">
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
-          </el-form-item>
-          <el-form-item>
-            <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deviceType" placeholder="监测指标" size="small" clearable>
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+    </search-area>
+    <!--<div class="search-div">-->
+      <!--<el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">-->
+        <!--<el-row>-->
+          <!--<el-form-item class="selectForm-container-item" prop="keywords">-->
+          <!--</el-form-item>-->
+          <!--<el-form-item>-->
+
+          <!--</el-form-item>-->
+          <!--<el-button type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
+        <!--</el-row>-->
+      <!--</el-form>-->
+    <!--</div>-->
     <!--结果展示-->
     <div v-show="chartShow" class="chart-container">
       <el-row class="chart-tools">
@@ -57,7 +64,7 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位)曲线图,分析数据变化趋势。</p>
         <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index f280c51..6312059 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -1,14 +1,14 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="fetchData" >
+    <!--<div class="search-div">-->
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
         <!--一般查询条件-->
         <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" clearable/>
+          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
         </search-item>
         <search-item v-if="isOperation()" >
-          <el-select v-model="listQuery.alarmType" placeholder="告警类型" clearable>
+          <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
             <el-option
               v-for="item in alarmTypeList"
               :key="item.value"
@@ -17,7 +17,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" clearable>
+          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
             <el-option
               v-for="item in alarmContentTypeList"
               :key="item.value"
@@ -32,13 +32,13 @@
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="报警开始时间"
-            end-placeholder="报警结束时间"/>
+            end-placeholder="报警结束时间" size="small"/>
         </search-item>
-        <search-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </search-item>
+        <!--<search-item>-->
+          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>-->
+        <!--</search-item>-->
       </search-area>
-    </div>
+    <!--</div>-->
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8408f23..3f9c72a 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -1,44 +1,42 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
-        <!--一般查询条件-->
-        <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
-        </search-item>
-        <search-item v-if="isOperation()" >
-          <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
-            <el-option
-              v-for="item in alarmTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
-            <el-option
-              v-for="item in alarmContentTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="报警开始时间"
-            end-placeholder="报警结束时间" size="small"/>
-        </search-item>
-        <!--<search-item>-->
-          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
-        <!--</search-item>-->
-      </search-area>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+      </search-item>
+      <search-item v-if="isOperation()" >
+        <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
+          <el-option
+            v-for="item in alarmTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
+          <el-option
+            v-for="item in alarmContentTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="报警开始时间"
+          end-placeholder="报警结束时间" size="small"/>
+      </search-item>
+      <!--<search-item>-->
+        <!--<el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
+      <!--</search-item>-->
+    </search-area>
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmRule/alarmRule.vue b/src/views/alarmRule/alarmRule.vue
index 0201880..360a8ae 100644
--- a/src/views/alarmRule/alarmRule.vue
+++ b/src/views/alarmRule/alarmRule.vue
@@ -30,6 +30,6 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .container{
-    padding: 5px;
+    /*padding: 5px;*/
   }
 </style>
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 1337bf9..1a175f1 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -1,23 +1,21 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
-        <!--一般查询条件-->
-        <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-        </search-item>
-        <search-item v-if="showDeviceType" >
-          <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
-            <el-option
-              v-for="item in deviceTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-      </search-area>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
+      </search-item>
+      <search-item v-if="showDeviceType" >
+        <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
deleted file mode 100644
index 60d5324..0000000
--- a/src/views/alarmRule/listRule.vue
+++ /dev/null
@@ -1,260 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-          </el-form-item>
-          <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
-            <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
-    <!--查询结果Table显示-->
-    <div>
-      <el-row class="table-title">
-        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/alarmRule/add')" class="edit_btn" size="small" @click="add">新增</el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <!--<el-table-column align="center" type="selection" width="55"/>-->
-        <el-table-column :index="indexMethod" align="center" type="index"/>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row.wellCode }}</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
-          <template slot-scope="scope">
-            <el-button v-if="hasPerm('/alarmRule/update')" type="text" @click="edit(scope.row)">编辑</el-button>
-            <el-button v-if="hasPerm('/alarmRule/delete')" type="text" @click="del(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-
-    <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData"/>
-    <info-well v-show="wellShow" ref="wellInfo"/>
-
-  </div>
-</template>
-
-<script>
-import infoWell from '@/views/wellManage/infoWell'
-import editRule from '@/views/alarmRule/editRule'
-import { getDeviceType } from '@/api/device'
-import { getAlarmRuleList, delRule } from '@/api/alarmRule'
-
-export default {
-  name: 'ListRule',
-  components: { editRule, infoWell },
-  data() {
-    return {
-      listQuery: {
-        keywords: '',
-        status: '',
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: ''
-      }, // 筛选条件
-      columns: [
-        {
-          text: '井编号',
-          value: 'wellCode',
-          align: 'center',
-          type: 'Button'
-        },
-        {
-          text: '井名称',
-          value: 'wellName',
-          align: 'center'
-        },
-        {
-          text: '井深',
-          value: 'deep',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '设备编号',
-          value: 'devcode',
-          align: 'center'
-        },
-        {
-          text: '告警上限（m）',
-          value: 'highValue',
-          align: 'center'
-        },
-        {
-          text: '操作人',
-          value: 'user',
-          width: 100,
-          align: 'center'
-        }
-      ], // 显示列
-      multipleSelection: [], // 多选选中项
-      list: [], // 列表数据
-      total: 0, // 数据总数
-      deviceTypeList: [], // 设备类型列表
-      showDeviceType: true,
-      listLoading: true, // 加载动画
-      editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示井详情
-    }
-  },
-  created() {
-    this.fetchDeviceType()// 获取部门树
-    this.fetchData()// 获取数据
-  },
-  methods: {
-    // 显示井详情
-    showWellDetail(row) {
-      this.wellShow = true
-      this.$refs.wellInfo.initDialog(row.wellId)
-    },
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
-    // 编辑告警规则信息
-    edit(row) {
-      this.editShow = true
-      this.$refs.editrule.initDialog('update', true, row)
-    },
-    add() {
-      this.editShow = true
-      this.$refs.editrule.initDialog('create', true)
-    },
-    // 编辑告警规则信息
-    del(row) {
-      this.$confirm(
-        '确定要删除该报警规则吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delRule(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      })
-    },
-    // 查询数据
-    search() {
-      this.fetchData(false)
-    },
-    // 获取数据
-    fetchData(isNowPage = true) {
-      this.listLoading = true
-      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
-        this.listQuery.offset = 1
-      }
-      getAlarmRuleList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = parseInt(response.data.total)
-        this.listLoading = false
-      })
-    },
-    // 获取设备类型
-    fetchDeviceType() {
-      getDeviceType(this.listQuery).then(response => {
-        this.deviceTypeList = []
-        const supportDeviceTypes = this.$store.getters.deviceTypes
-        for (const item of response.data) {
-          if (supportDeviceTypes.indexOf(item.value) !== -1) {
-            this.deviceTypeList.push(item)
-          }
-        }
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
-        }
-      })
-    },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index a46b904..502d027 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -133,6 +133,7 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .container{
-    padding: 5px;
+    /*padding: 5px;*/
+    background-color: white
   }
 </style>
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 709e3a8..5386d52 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -1,30 +1,26 @@
 <template>
   <div class="app-container">
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="beginTime">
-            <el-date-picker
-              v-model="timeRange"
-              type="datetimerange"
-              range-separator="至"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable/>
+      </search-item>
+      <search-item v-if="showDeviceType" >
+        <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" size="small" placeholder="选择权属单位"/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间" size="small"/>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <div>
+    <div style="padding:0px 10px">
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
@@ -242,7 +238,7 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .app-container{
-    padding: 10px;
+    padding: 0px 0px;
   }
   $tableTitleHeight:46px;
   .table{
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4ef378c..63b4a1c 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -1,30 +1,48 @@
 <template>
   <div class="app-container">
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="beginTime">
-            <el-date-picker
-              v-model="timeRange"
-              type="datetimerange"
-              range-separator="至"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable/>
+      </search-item>
+      <search-item v-if="showDeviceType" >
+        <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" size="small" placeholder="选择权属单位"/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间" size="small"/>
+      </search-item>
+    </search-area>
+    <!--<div class="search-div">-->
+      <!--<el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">-->
+        <!--<el-row>-->
+          <!--<el-form-item class="selectForm-container-item" prop="keywords">-->
+            <!--<el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>-->
+          <!--</el-form-item>-->
+          <!--<el-form-item class="selectForm-container-item">-->
+            <!--<dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>-->
+          <!--</el-form-item>-->
+          <!--<el-form-item class="selectForm-container-item" prop="beginTime">-->
+            <!--<el-date-picker-->
+              <!--v-model="timeRange"-->
+              <!--type="datetimerange"-->
+              <!--range-separator="至"-->
+              <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+              <!--start-placeholder="开始时间"-->
+              <!--end-placeholder="结束时间"/>-->
+          <!--</el-form-item>-->
+          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>-->
+        <!--</el-row>-->
+      <!--</el-form>-->
+    <!--</div>-->
     <!--查询结果Table显示-->
-    <div>
+    <div style="padding:0px 10px">
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
@@ -236,7 +254,7 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .app-container{
-    padding: 10px;
+    padding: 0px 0px;
   }
   $tableTitleHeight:46px;
   .table{
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 39f4156..b8a9ebd 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -1,25 +1,32 @@
 <template>
   <div class="app-container" style="background-color: white">
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
-          </el-form-item>
-          <el-form-item>
-            <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deviceType" placeholder="监测指标" size="small" clearable>
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+    </search-area>
+    <!--<div class="search-div">-->
+      <!--<el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">-->
+        <!--<el-row>-->
+          <!--<el-form-item class="selectForm-container-item" prop="keywords">-->
+          <!--</el-form-item>-->
+          <!--<el-form-item>-->
+
+          <!--</el-form-item>-->
+          <!--<el-button type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
+        <!--</el-row>-->
+      <!--</el-form>-->
+    <!--</div>-->
     <!--结果展示-->
     <div v-show="chartShow" class="chart-container">
       <el-row class="chart-tools">
@@ -57,7 +64,7 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位)曲线图,分析数据变化趋势。</p>
         <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index cb97cb0..f590b1c 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -1,19 +1,19 @@
 <template>
   <div class="app-container">
     <!--筛选条件-->
-    <div class="search-div">
+    <!--<div class="search-div">-->
       <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
         <!--一般查询条件-->
         <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable/>
+          <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" size="small" clearable/>
         </search-item>
         <search-item>
-          <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" size="small" dept-type="03" placeholder="选择权属单位"/>
         </search-item>
       </search-area>
-    </div>
+    <!--</div>-->
     <!--查询结果Table显示-->
-    <div>
+    <div style="padding:0px 10px">
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
@@ -311,9 +311,9 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .app-container{
-    padding: 10px;
-  }
+  /*.app-container{*/
+    /*padding: 10px;*/
+  /*}*/
   $tableTitleHeight:46px;
   .table{
     margin-bottom: 20px;
@@ -322,8 +322,8 @@
     margin-bottom: 50px;
   }
   .table-title{
-    margin: 0px 6px;
-    background-color: white;
+    /*margin: 0px 6px;*/
+    background-color:rgba(243, 243, 243, 1);
     height: $tableTitleHeight;
     .title-header{
       line-height:$tableTitleHeight;

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index f280c51..6312059 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -1,14 +1,14 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="fetchData" >
+    <!--<div class="search-div">-->
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
         <!--一般查询条件-->
         <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" clearable/>
+          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
         </search-item>
         <search-item v-if="isOperation()" >
-          <el-select v-model="listQuery.alarmType" placeholder="告警类型" clearable>
+          <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
             <el-option
               v-for="item in alarmTypeList"
               :key="item.value"
@@ -17,7 +17,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" clearable>
+          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
             <el-option
               v-for="item in alarmContentTypeList"
               :key="item.value"
@@ -32,13 +32,13 @@
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="报警开始时间"
-            end-placeholder="报警结束时间"/>
+            end-placeholder="报警结束时间" size="small"/>
         </search-item>
-        <search-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </search-item>
+        <!--<search-item>-->
+          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>-->
+        <!--</search-item>-->
       </search-area>
-    </div>
+    <!--</div>-->
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8408f23..3f9c72a 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -1,44 +1,42 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
-        <!--一般查询条件-->
-        <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
-        </search-item>
-        <search-item v-if="isOperation()" >
-          <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
-            <el-option
-              v-for="item in alarmTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
-            <el-option
-              v-for="item in alarmContentTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="报警开始时间"
-            end-placeholder="报警结束时间" size="small"/>
-        </search-item>
-        <!--<search-item>-->
-          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
-        <!--</search-item>-->
-      </search-area>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+      </search-item>
+      <search-item v-if="isOperation()" >
+        <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
+          <el-option
+            v-for="item in alarmTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
+          <el-option
+            v-for="item in alarmContentTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="报警开始时间"
+          end-placeholder="报警结束时间" size="small"/>
+      </search-item>
+      <!--<search-item>-->
+        <!--<el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
+      <!--</search-item>-->
+    </search-area>
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmRule/alarmRule.vue b/src/views/alarmRule/alarmRule.vue
index 0201880..360a8ae 100644
--- a/src/views/alarmRule/alarmRule.vue
+++ b/src/views/alarmRule/alarmRule.vue
@@ -30,6 +30,6 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .container{
-    padding: 5px;
+    /*padding: 5px;*/
   }
 </style>
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 1337bf9..1a175f1 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -1,23 +1,21 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
-        <!--一般查询条件-->
-        <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-        </search-item>
-        <search-item v-if="showDeviceType" >
-          <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
-            <el-option
-              v-for="item in deviceTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-      </search-area>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
+      </search-item>
+      <search-item v-if="showDeviceType" >
+        <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
deleted file mode 100644
index 60d5324..0000000
--- a/src/views/alarmRule/listRule.vue
+++ /dev/null
@@ -1,260 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-          </el-form-item>
-          <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
-            <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
-    <!--查询结果Table显示-->
-    <div>
-      <el-row class="table-title">
-        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/alarmRule/add')" class="edit_btn" size="small" @click="add">新增</el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <!--<el-table-column align="center" type="selection" width="55"/>-->
-        <el-table-column :index="indexMethod" align="center" type="index"/>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row.wellCode }}</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
-          <template slot-scope="scope">
-            <el-button v-if="hasPerm('/alarmRule/update')" type="text" @click="edit(scope.row)">编辑</el-button>
-            <el-button v-if="hasPerm('/alarmRule/delete')" type="text" @click="del(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-
-    <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData"/>
-    <info-well v-show="wellShow" ref="wellInfo"/>
-
-  </div>
-</template>
-
-<script>
-import infoWell from '@/views/wellManage/infoWell'
-import editRule from '@/views/alarmRule/editRule'
-import { getDeviceType } from '@/api/device'
-import { getAlarmRuleList, delRule } from '@/api/alarmRule'
-
-export default {
-  name: 'ListRule',
-  components: { editRule, infoWell },
-  data() {
-    return {
-      listQuery: {
-        keywords: '',
-        status: '',
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: ''
-      }, // 筛选条件
-      columns: [
-        {
-          text: '井编号',
-          value: 'wellCode',
-          align: 'center',
-          type: 'Button'
-        },
-        {
-          text: '井名称',
-          value: 'wellName',
-          align: 'center'
-        },
-        {
-          text: '井深',
-          value: 'deep',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '设备编号',
-          value: 'devcode',
-          align: 'center'
-        },
-        {
-          text: '告警上限（m）',
-          value: 'highValue',
-          align: 'center'
-        },
-        {
-          text: '操作人',
-          value: 'user',
-          width: 100,
-          align: 'center'
-        }
-      ], // 显示列
-      multipleSelection: [], // 多选选中项
-      list: [], // 列表数据
-      total: 0, // 数据总数
-      deviceTypeList: [], // 设备类型列表
-      showDeviceType: true,
-      listLoading: true, // 加载动画
-      editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示井详情
-    }
-  },
-  created() {
-    this.fetchDeviceType()// 获取部门树
-    this.fetchData()// 获取数据
-  },
-  methods: {
-    // 显示井详情
-    showWellDetail(row) {
-      this.wellShow = true
-      this.$refs.wellInfo.initDialog(row.wellId)
-    },
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
-    // 编辑告警规则信息
-    edit(row) {
-      this.editShow = true
-      this.$refs.editrule.initDialog('update', true, row)
-    },
-    add() {
-      this.editShow = true
-      this.$refs.editrule.initDialog('create', true)
-    },
-    // 编辑告警规则信息
-    del(row) {
-      this.$confirm(
-        '确定要删除该报警规则吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delRule(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      })
-    },
-    // 查询数据
-    search() {
-      this.fetchData(false)
-    },
-    // 获取数据
-    fetchData(isNowPage = true) {
-      this.listLoading = true
-      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
-        this.listQuery.offset = 1
-      }
-      getAlarmRuleList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = parseInt(response.data.total)
-        this.listLoading = false
-      })
-    },
-    // 获取设备类型
-    fetchDeviceType() {
-      getDeviceType(this.listQuery).then(response => {
-        this.deviceTypeList = []
-        const supportDeviceTypes = this.$store.getters.deviceTypes
-        for (const item of response.data) {
-          if (supportDeviceTypes.indexOf(item.value) !== -1) {
-            this.deviceTypeList.push(item)
-          }
-        }
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
-        }
-      })
-    },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index a46b904..502d027 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -133,6 +133,7 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .container{
-    padding: 5px;
+    /*padding: 5px;*/
+    background-color: white
   }
 </style>
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 709e3a8..5386d52 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -1,30 +1,26 @@
 <template>
   <div class="app-container">
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="beginTime">
-            <el-date-picker
-              v-model="timeRange"
-              type="datetimerange"
-              range-separator="至"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable/>
+      </search-item>
+      <search-item v-if="showDeviceType" >
+        <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" size="small" placeholder="选择权属单位"/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间" size="small"/>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <div>
+    <div style="padding:0px 10px">
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
@@ -242,7 +238,7 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .app-container{
-    padding: 10px;
+    padding: 0px 0px;
   }
   $tableTitleHeight:46px;
   .table{
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4ef378c..63b4a1c 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -1,30 +1,48 @@
 <template>
   <div class="app-container">
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="beginTime">
-            <el-date-picker
-              v-model="timeRange"
-              type="datetimerange"
-              range-separator="至"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable/>
+      </search-item>
+      <search-item v-if="showDeviceType" >
+        <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" size="small" placeholder="选择权属单位"/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间" size="small"/>
+      </search-item>
+    </search-area>
+    <!--<div class="search-div">-->
+      <!--<el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">-->
+        <!--<el-row>-->
+          <!--<el-form-item class="selectForm-container-item" prop="keywords">-->
+            <!--<el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>-->
+          <!--</el-form-item>-->
+          <!--<el-form-item class="selectForm-container-item">-->
+            <!--<dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>-->
+          <!--</el-form-item>-->
+          <!--<el-form-item class="selectForm-container-item" prop="beginTime">-->
+            <!--<el-date-picker-->
+              <!--v-model="timeRange"-->
+              <!--type="datetimerange"-->
+              <!--range-separator="至"-->
+              <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+              <!--start-placeholder="开始时间"-->
+              <!--end-placeholder="结束时间"/>-->
+          <!--</el-form-item>-->
+          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>-->
+        <!--</el-row>-->
+      <!--</el-form>-->
+    <!--</div>-->
     <!--查询结果Table显示-->
-    <div>
+    <div style="padding:0px 10px">
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
@@ -236,7 +254,7 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .app-container{
-    padding: 10px;
+    padding: 0px 0px;
   }
   $tableTitleHeight:46px;
   .table{
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 39f4156..b8a9ebd 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -1,25 +1,32 @@
 <template>
   <div class="app-container" style="background-color: white">
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
-          </el-form-item>
-          <el-form-item>
-            <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deviceType" placeholder="监测指标" size="small" clearable>
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+    </search-area>
+    <!--<div class="search-div">-->
+      <!--<el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">-->
+        <!--<el-row>-->
+          <!--<el-form-item class="selectForm-container-item" prop="keywords">-->
+          <!--</el-form-item>-->
+          <!--<el-form-item>-->
+
+          <!--</el-form-item>-->
+          <!--<el-button type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
+        <!--</el-row>-->
+      <!--</el-form>-->
+    <!--</div>-->
     <!--结果展示-->
     <div v-show="chartShow" class="chart-container">
       <el-row class="chart-tools">
@@ -57,7 +64,7 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位)曲线图,分析数据变化趋势。</p>
         <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index cb97cb0..f590b1c 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -1,19 +1,19 @@
 <template>
   <div class="app-container">
     <!--筛选条件-->
-    <div class="search-div">
+    <!--<div class="search-div">-->
       <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
         <!--一般查询条件-->
         <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable/>
+          <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" size="small" clearable/>
         </search-item>
         <search-item>
-          <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" size="small" dept-type="03" placeholder="选择权属单位"/>
         </search-item>
       </search-area>
-    </div>
+    <!--</div>-->
     <!--查询结果Table显示-->
-    <div>
+    <div style="padding:0px 10px">
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
@@ -311,9 +311,9 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .app-container{
-    padding: 10px;
-  }
+  /*.app-container{*/
+    /*padding: 10px;*/
+  /*}*/
   $tableTitleHeight:46px;
   .table{
     margin-bottom: 20px;
@@ -322,8 +322,8 @@
     margin-bottom: 50px;
   }
   .table-title{
-    margin: 0px 6px;
-    background-color: white;
+    /*margin: 0px 6px;*/
+    background-color:rgba(243, 243, 243, 1);
     height: $tableTitleHeight;
     .title-header{
       line-height:$tableTitleHeight;
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index bca3aa7..c5ae5ba 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -4,21 +4,21 @@
       <el-tab-pane v-if="hasPerm('/busConfig/liquidConfig/list')" label="液位监测仪" name="liquid">
         <list-liquid-config ref="liquidConfig"/>
       </el-tab-pane>
-      <!--<el-tab-pane v-if="hasPerm('/busConfig/gasConfig/list')" label="燃气智能监测终端" name="gas">-->
-      <!--<list-gas-config ref="gasConfig"/>-->
-      <!--</el-tab-pane>-->
-      <!--<el-tab-pane v-if="hasPerm('/busConfig/harmfulConfig/list')" label="有害气体监测仪" name="harmful">-->
-      <!--<list-harmful-config ref="harmfulConfig"/>-->
-      <!--</el-tab-pane>-->
-      <!--<el-tab-pane v-if="hasPerm('/busConfig/tempConfig/list')" label="温湿度监测仪" name="temphumidity">-->
-      <!--<list-temp-config ref="tempConfig"/>-->
-      <!--</el-tab-pane>-->
-      <!--<el-tab-pane v-if="hasPerm('/busConfig/digConfig/list')" label="开挖监测仪" name="dig">-->
-      <!--<list-dig-config ref="digConfig"/>-->
-      <!--</el-tab-pane>-->
-      <!--<el-tab-pane v-if="hasPerm('/busConfig/noiseConfig/list')" label="噪声监测仪" name="dig">-->
-      <!--<list-noise-config ref="noiseConfig"/>-->
-      <!--</el-tab-pane>-->
+      <el-tab-pane v-if="hasPerm('/busConfig/gasConfig/list')" label="燃气智能监测终端" name="gas">
+        <list-gas-config ref="gasConfig"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/harmfulConfig/list')" label="有害气体监测仪" name="harmful">
+        <list-harmful-config ref="harmfulConfig"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/tempConfig/list')" label="温湿度监测仪" name="temphumidity">
+        <list-temp-config ref="tempConfig"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/digConfig/list')" label="开挖监测仪" name="dig">
+        <list-dig-config ref="digConfig"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/noiseConfig/list')" label="噪声监测仪" name="dig">
+        <list-noise-config ref="noiseConfig"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -80,6 +80,6 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .container{
-    padding: 5px;
+    /*padding: 5px;*/
   }
 </style>

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index f280c51..6312059 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -1,14 +1,14 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="fetchData" >
+    <!--<div class="search-div">-->
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
         <!--一般查询条件-->
         <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" clearable/>
+          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
         </search-item>
         <search-item v-if="isOperation()" >
-          <el-select v-model="listQuery.alarmType" placeholder="告警类型" clearable>
+          <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
             <el-option
               v-for="item in alarmTypeList"
               :key="item.value"
@@ -17,7 +17,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" clearable>
+          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
             <el-option
               v-for="item in alarmContentTypeList"
               :key="item.value"
@@ -32,13 +32,13 @@
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="报警开始时间"
-            end-placeholder="报警结束时间"/>
+            end-placeholder="报警结束时间" size="small"/>
         </search-item>
-        <search-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </search-item>
+        <!--<search-item>-->
+          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>-->
+        <!--</search-item>-->
       </search-area>
-    </div>
+    <!--</div>-->
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8408f23..3f9c72a 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -1,44 +1,42 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
-        <!--一般查询条件-->
-        <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
-        </search-item>
-        <search-item v-if="isOperation()" >
-          <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
-            <el-option
-              v-for="item in alarmTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
-            <el-option
-              v-for="item in alarmContentTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="报警开始时间"
-            end-placeholder="报警结束时间" size="small"/>
-        </search-item>
-        <!--<search-item>-->
-          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
-        <!--</search-item>-->
-      </search-area>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+      </search-item>
+      <search-item v-if="isOperation()" >
+        <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
+          <el-option
+            v-for="item in alarmTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
+          <el-option
+            v-for="item in alarmContentTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="报警开始时间"
+          end-placeholder="报警结束时间" size="small"/>
+      </search-item>
+      <!--<search-item>-->
+        <!--<el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
+      <!--</search-item>-->
+    </search-area>
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmRule/alarmRule.vue b/src/views/alarmRule/alarmRule.vue
index 0201880..360a8ae 100644
--- a/src/views/alarmRule/alarmRule.vue
+++ b/src/views/alarmRule/alarmRule.vue
@@ -30,6 +30,6 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .container{
-    padding: 5px;
+    /*padding: 5px;*/
   }
 </style>
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 1337bf9..1a175f1 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -1,23 +1,21 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
-        <!--一般查询条件-->
-        <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-        </search-item>
-        <search-item v-if="showDeviceType" >
-          <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
-            <el-option
-              v-for="item in deviceTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-      </search-area>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
+      </search-item>
+      <search-item v-if="showDeviceType" >
+        <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
deleted file mode 100644
index 60d5324..0000000
--- a/src/views/alarmRule/listRule.vue
+++ /dev/null
@@ -1,260 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-          </el-form-item>
-          <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
-            <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
-    <!--查询结果Table显示-->
-    <div>
-      <el-row class="table-title">
-        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/alarmRule/add')" class="edit_btn" size="small" @click="add">新增</el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <!--<el-table-column align="center" type="selection" width="55"/>-->
-        <el-table-column :index="indexMethod" align="center" type="index"/>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row.wellCode }}</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
-          <template slot-scope="scope">
-            <el-button v-if="hasPerm('/alarmRule/update')" type="text" @click="edit(scope.row)">编辑</el-button>
-            <el-button v-if="hasPerm('/alarmRule/delete')" type="text" @click="del(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-
-    <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData"/>
-    <info-well v-show="wellShow" ref="wellInfo"/>
-
-  </div>
-</template>
-
-<script>
-import infoWell from '@/views/wellManage/infoWell'
-import editRule from '@/views/alarmRule/editRule'
-import { getDeviceType } from '@/api/device'
-import { getAlarmRuleList, delRule } from '@/api/alarmRule'
-
-export default {
-  name: 'ListRule',
-  components: { editRule, infoWell },
-  data() {
-    return {
-      listQuery: {
-        keywords: '',
-        status: '',
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: ''
-      }, // 筛选条件
-      columns: [
-        {
-          text: '井编号',
-          value: 'wellCode',
-          align: 'center',
-          type: 'Button'
-        },
-        {
-          text: '井名称',
-          value: 'wellName',
-          align: 'center'
-        },
-        {
-          text: '井深',
-          value: 'deep',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '设备编号',
-          value: 'devcode',
-          align: 'center'
-        },
-        {
-          text: '告警上限（m）',
-          value: 'highValue',
-          align: 'center'
-        },
-        {
-          text: '操作人',
-          value: 'user',
-          width: 100,
-          align: 'center'
-        }
-      ], // 显示列
-      multipleSelection: [], // 多选选中项
-      list: [], // 列表数据
-      total: 0, // 数据总数
-      deviceTypeList: [], // 设备类型列表
-      showDeviceType: true,
-      listLoading: true, // 加载动画
-      editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示井详情
-    }
-  },
-  created() {
-    this.fetchDeviceType()// 获取部门树
-    this.fetchData()// 获取数据
-  },
-  methods: {
-    // 显示井详情
-    showWellDetail(row) {
-      this.wellShow = true
-      this.$refs.wellInfo.initDialog(row.wellId)
-    },
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
-    // 编辑告警规则信息
-    edit(row) {
-      this.editShow = true
-      this.$refs.editrule.initDialog('update', true, row)
-    },
-    add() {
-      this.editShow = true
-      this.$refs.editrule.initDialog('create', true)
-    },
-    // 编辑告警规则信息
-    del(row) {
-      this.$confirm(
-        '确定要删除该报警规则吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delRule(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      })
-    },
-    // 查询数据
-    search() {
-      this.fetchData(false)
-    },
-    // 获取数据
-    fetchData(isNowPage = true) {
-      this.listLoading = true
-      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
-        this.listQuery.offset = 1
-      }
-      getAlarmRuleList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = parseInt(response.data.total)
-        this.listLoading = false
-      })
-    },
-    // 获取设备类型
-    fetchDeviceType() {
-      getDeviceType(this.listQuery).then(response => {
-        this.deviceTypeList = []
-        const supportDeviceTypes = this.$store.getters.deviceTypes
-        for (const item of response.data) {
-          if (supportDeviceTypes.indexOf(item.value) !== -1) {
-            this.deviceTypeList.push(item)
-          }
-        }
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
-        }
-      })
-    },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index a46b904..502d027 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -133,6 +133,7 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .container{
-    padding: 5px;
+    /*padding: 5px;*/
+    background-color: white
   }
 </style>
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 709e3a8..5386d52 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -1,30 +1,26 @@
 <template>
   <div class="app-container">
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="beginTime">
-            <el-date-picker
-              v-model="timeRange"
-              type="datetimerange"
-              range-separator="至"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable/>
+      </search-item>
+      <search-item v-if="showDeviceType" >
+        <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" size="small" placeholder="选择权属单位"/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间" size="small"/>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <div>
+    <div style="padding:0px 10px">
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
@@ -242,7 +238,7 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .app-container{
-    padding: 10px;
+    padding: 0px 0px;
   }
   $tableTitleHeight:46px;
   .table{
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4ef378c..63b4a1c 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -1,30 +1,48 @@
 <template>
   <div class="app-container">
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="beginTime">
-            <el-date-picker
-              v-model="timeRange"
-              type="datetimerange"
-              range-separator="至"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable/>
+      </search-item>
+      <search-item v-if="showDeviceType" >
+        <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" size="small" placeholder="选择权属单位"/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间" size="small"/>
+      </search-item>
+    </search-area>
+    <!--<div class="search-div">-->
+      <!--<el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">-->
+        <!--<el-row>-->
+          <!--<el-form-item class="selectForm-container-item" prop="keywords">-->
+            <!--<el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>-->
+          <!--</el-form-item>-->
+          <!--<el-form-item class="selectForm-container-item">-->
+            <!--<dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>-->
+          <!--</el-form-item>-->
+          <!--<el-form-item class="selectForm-container-item" prop="beginTime">-->
+            <!--<el-date-picker-->
+              <!--v-model="timeRange"-->
+              <!--type="datetimerange"-->
+              <!--range-separator="至"-->
+              <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+              <!--start-placeholder="开始时间"-->
+              <!--end-placeholder="结束时间"/>-->
+          <!--</el-form-item>-->
+          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>-->
+        <!--</el-row>-->
+      <!--</el-form>-->
+    <!--</div>-->
     <!--查询结果Table显示-->
-    <div>
+    <div style="padding:0px 10px">
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
@@ -236,7 +254,7 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .app-container{
-    padding: 10px;
+    padding: 0px 0px;
   }
   $tableTitleHeight:46px;
   .table{
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 39f4156..b8a9ebd 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -1,25 +1,32 @@
 <template>
   <div class="app-container" style="background-color: white">
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
-          </el-form-item>
-          <el-form-item>
-            <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deviceType" placeholder="监测指标" size="small" clearable>
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+    </search-area>
+    <!--<div class="search-div">-->
+      <!--<el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">-->
+        <!--<el-row>-->
+          <!--<el-form-item class="selectForm-container-item" prop="keywords">-->
+          <!--</el-form-item>-->
+          <!--<el-form-item>-->
+
+          <!--</el-form-item>-->
+          <!--<el-button type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
+        <!--</el-row>-->
+      <!--</el-form>-->
+    <!--</div>-->
     <!--结果展示-->
     <div v-show="chartShow" class="chart-container">
       <el-row class="chart-tools">
@@ -57,7 +64,7 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位)曲线图,分析数据变化趋势。</p>
         <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index cb97cb0..f590b1c 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -1,19 +1,19 @@
 <template>
   <div class="app-container">
     <!--筛选条件-->
-    <div class="search-div">
+    <!--<div class="search-div">-->
       <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
         <!--一般查询条件-->
         <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable/>
+          <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" size="small" clearable/>
         </search-item>
         <search-item>
-          <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" size="small" dept-type="03" placeholder="选择权属单位"/>
         </search-item>
       </search-area>
-    </div>
+    <!--</div>-->
     <!--查询结果Table显示-->
-    <div>
+    <div style="padding:0px 10px">
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
@@ -311,9 +311,9 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .app-container{
-    padding: 10px;
-  }
+  /*.app-container{*/
+    /*padding: 10px;*/
+  /*}*/
   $tableTitleHeight:46px;
   .table{
     margin-bottom: 20px;
@@ -322,8 +322,8 @@
     margin-bottom: 50px;
   }
   .table-title{
-    margin: 0px 6px;
-    background-color: white;
+    /*margin: 0px 6px;*/
+    background-color:rgba(243, 243, 243, 1);
     height: $tableTitleHeight;
     .title-header{
       line-height:$tableTitleHeight;
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index bca3aa7..c5ae5ba 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -4,21 +4,21 @@
       <el-tab-pane v-if="hasPerm('/busConfig/liquidConfig/list')" label="液位监测仪" name="liquid">
         <list-liquid-config ref="liquidConfig"/>
       </el-tab-pane>
-      <!--<el-tab-pane v-if="hasPerm('/busConfig/gasConfig/list')" label="燃气智能监测终端" name="gas">-->
-      <!--<list-gas-config ref="gasConfig"/>-->
-      <!--</el-tab-pane>-->
-      <!--<el-tab-pane v-if="hasPerm('/busConfig/harmfulConfig/list')" label="有害气体监测仪" name="harmful">-->
-      <!--<list-harmful-config ref="harmfulConfig"/>-->
-      <!--</el-tab-pane>-->
-      <!--<el-tab-pane v-if="hasPerm('/busConfig/tempConfig/list')" label="温湿度监测仪" name="temphumidity">-->
-      <!--<list-temp-config ref="tempConfig"/>-->
-      <!--</el-tab-pane>-->
-      <!--<el-tab-pane v-if="hasPerm('/busConfig/digConfig/list')" label="开挖监测仪" name="dig">-->
-      <!--<list-dig-config ref="digConfig"/>-->
-      <!--</el-tab-pane>-->
-      <!--<el-tab-pane v-if="hasPerm('/busConfig/noiseConfig/list')" label="噪声监测仪" name="dig">-->
-      <!--<list-noise-config ref="noiseConfig"/>-->
-      <!--</el-tab-pane>-->
+      <el-tab-pane v-if="hasPerm('/busConfig/gasConfig/list')" label="燃气智能监测终端" name="gas">
+        <list-gas-config ref="gasConfig"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/harmfulConfig/list')" label="有害气体监测仪" name="harmful">
+        <list-harmful-config ref="harmfulConfig"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/tempConfig/list')" label="温湿度监测仪" name="temphumidity">
+        <list-temp-config ref="tempConfig"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/digConfig/list')" label="开挖监测仪" name="dig">
+        <list-dig-config ref="digConfig"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/noiseConfig/list')" label="噪声监测仪" name="dig">
+        <list-noise-config ref="noiseConfig"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -80,6 +80,6 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .container{
-    padding: 5px;
+    /*padding: 5px;*/
   }
 </style>
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index b656dc6..aaabfc2 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -4,10 +4,10 @@
     <div class="search-div">
       <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
         <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="设备编号/井编号" clearable/>
+          <el-input v-model.trim="listQuery.keywords" placeholder="设备编号/井编号" size="small" clearable/>
         </search-item>
         <search-item v-if="showDeviceType" >
-          <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
+          <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
             <el-option
               v-for="item in deviceTypeList"
               :key="item.value"
@@ -16,10 +16,10 @@
           </el-select>
         </search-item>
         <search-item>
-          <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" size="small" dept-type="03" placeholder="选择权属单位"/>
         </search-item>
         <search-item v-if="isAdministrator()" >
-          <el-select v-model="listQuery.isOnline" placeholder="在线情况" clearable>
+          <el-select v-model="listQuery.isOnline" placeholder="在线情况" size="small" clearable>
             <el-option
               v-for="item in onlineStates"
               :key="item.value"

diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index f280c51..6312059 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -1,14 +1,14 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="fetchData" >
+    <!--<div class="search-div">-->
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
         <!--一般查询条件-->
         <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" clearable/>
+          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
         </search-item>
         <search-item v-if="isOperation()" >
-          <el-select v-model="listQuery.alarmType" placeholder="告警类型" clearable>
+          <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
             <el-option
               v-for="item in alarmTypeList"
               :key="item.value"
@@ -17,7 +17,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" clearable>
+          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
             <el-option
               v-for="item in alarmContentTypeList"
               :key="item.value"
@@ -32,13 +32,13 @@
             range-separator="至"
             value-format="yyyy-MM-dd HH:mm:ss"
             start-placeholder="报警开始时间"
-            end-placeholder="报警结束时间"/>
+            end-placeholder="报警结束时间" size="small"/>
         </search-item>
-        <search-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </search-item>
+        <!--<search-item>-->
+          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>-->
+        <!--</search-item>-->
       </search-area>
-    </div>
+    <!--</div>-->
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index 8408f23..3f9c72a 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -1,44 +1,42 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
-        <!--一般查询条件-->
-        <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
-        </search-item>
-        <search-item v-if="isOperation()" >
-          <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
-            <el-option
-              v-for="item in alarmTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
-            <el-option
-              v-for="item in alarmContentTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-        <search-item>
-          <el-date-picker
-            v-model="timeRange"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="报警开始时间"
-            end-placeholder="报警结束时间" size="small"/>
-        </search-item>
-        <!--<search-item>-->
-          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
-        <!--</search-item>-->
-      </search-area>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
+      </search-item>
+      <search-item v-if="isOperation()" >
+        <el-select v-model="listQuery.alarmType" placeholder="告警类型" size="small" clearable>
+          <el-option
+            v-for="item in alarmTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-select :disabled="alarmContentTypeList.length>0?false:true" v-model="listQuery.alarmContentType" placeholder="告警内容" size="small" clearable>
+          <el-option
+            v-for="item in alarmContentTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="报警开始时间"
+          end-placeholder="报警结束时间" size="small"/>
+      </search-item>
+      <!--<search-item>-->
+        <!--<el-button class="filter-item" type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
+      <!--</search-item>-->
+    </search-area>
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmRule/alarmRule.vue b/src/views/alarmRule/alarmRule.vue
index 0201880..360a8ae 100644
--- a/src/views/alarmRule/alarmRule.vue
+++ b/src/views/alarmRule/alarmRule.vue
@@ -30,6 +30,6 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .container{
-    padding: 5px;
+    /*padding: 5px;*/
   }
 </style>
diff --git a/src/views/alarmRule/components/listRule.vue b/src/views/alarmRule/components/listRule.vue
index 1337bf9..1a175f1 100644
--- a/src/views/alarmRule/components/listRule.vue
+++ b/src/views/alarmRule/components/listRule.vue
@@ -1,23 +1,21 @@
 <template>
   <app-container>
     <!--筛选条件-->
-    <div class="search-div">
-      <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
-        <!--一般查询条件-->
-        <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-        </search-item>
-        <search-item v-if="showDeviceType" >
-          <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
-            <el-option
-              v-for="item in deviceTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </search-item>
-      </search-area>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" size="small" clearable/>
+      </search-item>
+      <search-item v-if="showDeviceType" >
+        <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
     <div>
       <el-row style="height: 12px;background-color: #ebebeb"/>
diff --git a/src/views/alarmRule/listRule.vue b/src/views/alarmRule/listRule.vue
deleted file mode 100644
index 60d5324..0000000
--- a/src/views/alarmRule/listRule.vue
+++ /dev/null
@@ -1,260 +0,0 @@
-<template>
-  <div class="app-container">
-    <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-          </el-form-item>
-          <el-form-item v-if="showDeviceType" class="selectForm-container-item" prop="wellType">
-            <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
-    <!--查询结果Table显示-->
-    <div>
-      <el-row class="table-title">
-        <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
-        <el-col :span="12" :offset="6" class="edit_btns">
-          <el-button v-if="hasPerm('/alarmRule/add')" class="edit_btn" size="small" @click="add">新增</el-button>
-        </el-col>
-      </el-row>
-      <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
-        <!--<el-table-column align="center" type="selection" width="55"/>-->
-        <el-table-column :index="indexMethod" align="center" type="index"/>
-        <el-table-column v-for="column in columns" :key="column.value" :label="column.text" :width="column.width" :align="column.align" show-overflow-tooltip>
-          <template slot-scope="scope">
-            <span v-if="column.type!='Button'" :class="column.class">{{ scope.row[column.value] }}</span>
-            <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row.wellCode }}</el-button>
-          </template>
-        </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
-          <template slot-scope="scope">
-            <el-button v-if="hasPerm('/alarmRule/update')" type="text" @click="edit(scope.row)">编辑</el-button>
-            <el-button v-if="hasPerm('/alarmRule/delete')" type="text" @click="del(scope.row)">删除</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <!--分页-->
-    <div class="pagination-container">
-      <el-pagination
-        v-show="total>listQuery.limit"
-        :current-page="listQuery.offset"
-        :page-sizes="[20,30,50]"
-        :page-size="listQuery.limit"
-        :total="total"
-        align="center"
-        layout="total, sizes, prev, pager, next"
-        @size-change="handleSizeChange"
-        @current-change="handleCurrentChange"/>
-    </div>
-
-    <edit-rule v-show="editShow" ref="editrule" @watchChild="fetchData"/>
-    <info-well v-show="wellShow" ref="wellInfo"/>
-
-  </div>
-</template>
-
-<script>
-import infoWell from '@/views/wellManage/infoWell'
-import editRule from '@/views/alarmRule/editRule'
-import { getDeviceType } from '@/api/device'
-import { getAlarmRuleList, delRule } from '@/api/alarmRule'
-
-export default {
-  name: 'ListRule',
-  components: { editRule, infoWell },
-  data() {
-    return {
-      listQuery: {
-        keywords: '',
-        status: '',
-        offset: 1,
-        limit: 20,
-        sort: '',
-        order: ''
-      }, // 筛选条件
-      columns: [
-        {
-          text: '井编号',
-          value: 'wellCode',
-          align: 'center',
-          type: 'Button'
-        },
-        {
-          text: '井名称',
-          value: 'wellName',
-          align: 'center'
-        },
-        {
-          text: '井深',
-          value: 'deep',
-          align: 'center'
-        },
-        {
-          text: '设备类型',
-          value: 'deviceTypeName',
-          align: 'center'
-        },
-        {
-          text: '设备编号',
-          value: 'devcode',
-          align: 'center'
-        },
-        {
-          text: '告警上限（m）',
-          value: 'highValue',
-          align: 'center'
-        },
-        {
-          text: '操作人',
-          value: 'user',
-          width: 100,
-          align: 'center'
-        }
-      ], // 显示列
-      multipleSelection: [], // 多选选中项
-      list: [], // 列表数据
-      total: 0, // 数据总数
-      deviceTypeList: [], // 设备类型列表
-      showDeviceType: true,
-      listLoading: true, // 加载动画
-      editShow: false, // 是否显示编辑框
-      wellShow: false // 是否显示井详情
-    }
-  },
-  created() {
-    this.fetchDeviceType()// 获取部门树
-    this.fetchData()// 获取数据
-  },
-  methods: {
-    // 显示井详情
-    showWellDetail(row) {
-      this.wellShow = true
-      this.$refs.wellInfo.initDialog(row.wellId)
-    },
-    checkSelection() {
-      if (this.multipleSelection.length === 0) {
-        return false
-      } else {
-        return true
-      }
-    },
-    // 编辑告警规则信息
-    edit(row) {
-      this.editShow = true
-      this.$refs.editrule.initDialog('update', true, row)
-    },
-    add() {
-      this.editShow = true
-      this.$refs.editrule.initDialog('create', true)
-    },
-    // 编辑告警规则信息
-    del(row) {
-      this.$confirm(
-        '确定要删除该报警规则吗？',
-        '确认操作',
-        {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }
-      ).then(() => {
-        delRule(row.id).then(response => {
-          if (response.code === 200) {
-            this.$message.success('删除成功')
-            this.fetchData()
-          }
-        })
-      })
-    },
-    // 查询数据
-    search() {
-      this.fetchData(false)
-    },
-    // 获取数据
-    fetchData(isNowPage = true) {
-      this.listLoading = true
-      if (!isNowPage) { // 是否显示当前页，否则跳转第一页
-        this.listQuery.offset = 1
-      }
-      getAlarmRuleList(this.listQuery).then(response => {
-        this.list = response.data.rows
-        this.total = parseInt(response.data.total)
-        this.listLoading = false
-      })
-    },
-    // 获取设备类型
-    fetchDeviceType() {
-      getDeviceType(this.listQuery).then(response => {
-        this.deviceTypeList = []
-        const supportDeviceTypes = this.$store.getters.deviceTypes
-        for (const item of response.data) {
-          if (supportDeviceTypes.indexOf(item.value) !== -1) {
-            this.deviceTypeList.push(item)
-          }
-        }
-        if (this.deviceTypeList.length <= 1) {
-          this.showDeviceType = false
-        }
-      })
-    },
-    indexMethod(index) {
-      return this.listQuery.limit * (this.listQuery.offset - 1) + index + 1
-    },
-    // 改变页容量
-    handleSizeChange(val) {
-      this.listQuery.limit = val
-      this.fetchData()
-    },
-    // 改变当前页
-    handleCurrentChange(val) {
-      this.listQuery.offset = val
-      this.fetchData()
-    },
-    // 多选触发方法
-    handleSelectionChange(val) {
-      this.multipleSelection = val
-    }
-  }
-}
-</script>
-
-<style rel="stylesheet/scss" lang="scss" scoped>
-  $tableTitleHeight:46px;
-  .table{
-    margin-bottom: 20px;
-  }
-  .pagination-container{
-    margin-bottom: 50px;
-  }
-  .table-title{
-    background-color:rgba(243, 243, 243, 1);
-    height: $tableTitleHeight;
-    .title-header{
-      line-height:$tableTitleHeight;
-      color: #606266;
-      font-size: 15px;
-      i{
-        margin-left: 5px;
-        margin-right: 5px;
-      }
-    }
-  }
-  .edit_btns{
-    .edit_btn{
-      float:right;
-      margin:7px 3px;//为了需要居中显示margin-top和bottom要用$tableTitleHeight减去按钮原高度除以2
-    }
-  }
-</style>
diff --git a/src/views/dataManage/dataManage.vue b/src/views/dataManage/dataManage.vue
index a46b904..502d027 100644
--- a/src/views/dataManage/dataManage.vue
+++ b/src/views/dataManage/dataManage.vue
@@ -133,6 +133,7 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .container{
-    padding: 5px;
+    /*padding: 5px;*/
+    background-color: white
   }
 </style>
diff --git a/src/views/dataManage/deviceData/listLiquidData.vue b/src/views/dataManage/deviceData/listLiquidData.vue
index 709e3a8..5386d52 100644
--- a/src/views/dataManage/deviceData/listLiquidData.vue
+++ b/src/views/dataManage/deviceData/listLiquidData.vue
@@ -1,30 +1,26 @@
 <template>
   <div class="app-container">
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="beginTime">
-            <el-date-picker
-              v-model="timeRange"
-              type="datetimerange"
-              range-separator="至"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable/>
+      </search-item>
+      <search-item v-if="showDeviceType" >
+        <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" size="small" placeholder="选择权属单位"/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间" size="small"/>
+      </search-item>
+    </search-area>
     <!--查询结果Table显示-->
-    <div>
+    <div style="padding:0px 10px">
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
@@ -242,7 +238,7 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .app-container{
-    padding: 10px;
+    padding: 0px 0px;
   }
   $tableTitleHeight:46px;
   .table{
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4ef378c..63b4a1c 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -1,30 +1,48 @@
 <template>
   <div class="app-container">
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
-          </el-form-item>
-          <el-form-item class="selectForm-container-item" prop="beginTime">
-            <el-date-picker
-              v-model="timeRange"
-              type="datetimerange"
-              range-separator="至"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始时间"
-              end-placeholder="结束时间"/>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
+      <!--一般查询条件-->
+      <search-item>
+        <el-input v-model.trim="listQuery.keywords" size="small" placeholder="井编号/设备编号" clearable/>
+      </search-item>
+      <search-item v-if="showDeviceType" >
+        <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" size="small" placeholder="选择权属单位"/>
+      </search-item>
+      <search-item>
+        <el-date-picker
+          v-model="timeRange"
+          type="datetimerange"
+          range-separator="至"
+          value-format="yyyy-MM-dd HH:mm:ss"
+          start-placeholder="开始时间"
+          end-placeholder="结束时间" size="small"/>
+      </search-item>
+    </search-area>
+    <!--<div class="search-div">-->
+      <!--<el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">-->
+        <!--<el-row>-->
+          <!--<el-form-item class="selectForm-container-item" prop="keywords">-->
+            <!--<el-input v-model.trim="listQuery.keywords" placeholder="井编号/设备编号" clearable/>-->
+          <!--</el-form-item>-->
+          <!--<el-form-item class="selectForm-container-item">-->
+            <!--<dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>-->
+          <!--</el-form-item>-->
+          <!--<el-form-item class="selectForm-container-item" prop="beginTime">-->
+            <!--<el-date-picker-->
+              <!--v-model="timeRange"-->
+              <!--type="datetimerange"-->
+              <!--range-separator="至"-->
+              <!--value-format="yyyy-MM-dd HH:mm:ss"-->
+              <!--start-placeholder="开始时间"-->
+              <!--end-placeholder="结束时间"/>-->
+          <!--</el-form-item>-->
+          <!--<el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>-->
+        <!--</el-row>-->
+      <!--</el-form>-->
+    <!--</div>-->
     <!--查询结果Table显示-->
-    <div>
+    <div style="padding:0px 10px">
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
@@ -236,7 +254,7 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .app-container{
-    padding: 10px;
+    padding: 0px 0px;
   }
   $tableTitleHeight:46px;
   .table{
diff --git a/src/views/dataStatics/dataStatics.vue b/src/views/dataStatics/dataStatics.vue
index 39f4156..b8a9ebd 100644
--- a/src/views/dataStatics/dataStatics.vue
+++ b/src/views/dataStatics/dataStatics.vue
@@ -1,25 +1,32 @@
 <template>
   <div class="app-container" style="background-color: white">
     <!--筛选条件-->
-    <div class="search-div">
-      <el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">
-        <el-row>
-          <el-form-item class="selectForm-container-item" prop="keywords">
-            <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" clearable/>
-          </el-form-item>
-          <el-form-item>
-            <el-select v-model="listQuery.deviceType" placeholder="监测指标" clearable>
-              <el-option
-                v-for="item in deviceTypeList"
-                :key="item.value"
-                :label="item.name"
-                :value="item.value"/>
-            </el-select>
-          </el-form-item>
-          <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
-        </el-row>
-      </el-form>
-    </div>
+    <search-area :need-clear="false" :need-search-more="false" size="small" @search="search">
+      <search-item>
+        <el-input v-model.trim="listQuery.wellCode" placeholder="井编号" size="small" clearable/>
+      </search-item>
+      <search-item>
+        <el-select v-model="listQuery.deviceType" placeholder="监测指标" size="small" clearable>
+          <el-option
+            v-for="item in deviceTypeList"
+            :key="item.value"
+            :label="item.name"
+            :value="item.value"/>
+        </el-select>
+      </search-item>
+    </search-area>
+    <!--<div class="search-div">-->
+      <!--<el-form ref="selectForm" :inline="true" :model="listQuery" class="form-container">-->
+        <!--<el-row>-->
+          <!--<el-form-item class="selectForm-container-item" prop="keywords">-->
+          <!--</el-form-item>-->
+          <!--<el-form-item>-->
+
+          <!--</el-form-item>-->
+          <!--<el-button type="primary" icon="el-icon-search" size="small" @click="search">搜索</el-button>-->
+        <!--</el-row>-->
+      <!--</el-form>-->
+    <!--</div>-->
     <!--结果展示-->
     <div v-show="chartShow" class="chart-container">
       <el-row class="chart-tools">
@@ -57,7 +64,7 @@
     <div v-show="!chartShow" class="introduce">
       <el-row>
         <h3>说明</h3>
-        <p>该模块可以查看指定井一段时间范围内的数据(液位、燃气、有害气体、温湿度)曲线图,分析数据变化趋势。</p>
+        <p>该模块可以查看指定井一段时间范围内的数据(液位)曲线图,分析数据变化趋势。</p>
         <p>使用方法：请在上方输入框中输入要查询的完整的井编号，选择监测指标后点击搜索按钮。默认查询7天数据。</p>
       </el-row>
       <el-row>
diff --git a/src/views/deviceConfig/components/listLiquidConfig.vue b/src/views/deviceConfig/components/listLiquidConfig.vue
index cb97cb0..f590b1c 100644
--- a/src/views/deviceConfig/components/listLiquidConfig.vue
+++ b/src/views/deviceConfig/components/listLiquidConfig.vue
@@ -1,19 +1,19 @@
 <template>
   <div class="app-container">
     <!--筛选条件-->
-    <div class="search-div">
+    <!--<div class="search-div">-->
       <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
         <!--一般查询条件-->
         <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" clearable/>
+          <el-input v-model.trim="listQuery.keywords" placeholder="设备编号" size="small" clearable/>
         </search-item>
         <search-item>
-          <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" size="small" dept-type="03" placeholder="选择权属单位"/>
         </search-item>
       </search-area>
-    </div>
+    <!--</div>-->
     <!--查询结果Table显示-->
-    <div>
+    <div style="padding:0px 10px">
       <el-row class="table-title">
         <el-col :span="6"><div class="title-header"><i class="el-icon-menu"/>数据列表</div></el-col>
         <el-col :span="12" :offset="6" class="edit_btns">
@@ -311,9 +311,9 @@
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  .app-container{
-    padding: 10px;
-  }
+  /*.app-container{*/
+    /*padding: 10px;*/
+  /*}*/
   $tableTitleHeight:46px;
   .table{
     margin-bottom: 20px;
@@ -322,8 +322,8 @@
     margin-bottom: 50px;
   }
   .table-title{
-    margin: 0px 6px;
-    background-color: white;
+    /*margin: 0px 6px;*/
+    background-color:rgba(243, 243, 243, 1);
     height: $tableTitleHeight;
     .title-header{
       line-height:$tableTitleHeight;
diff --git a/src/views/deviceConfig/deviceConfig.vue b/src/views/deviceConfig/deviceConfig.vue
index bca3aa7..c5ae5ba 100644
--- a/src/views/deviceConfig/deviceConfig.vue
+++ b/src/views/deviceConfig/deviceConfig.vue
@@ -4,21 +4,21 @@
       <el-tab-pane v-if="hasPerm('/busConfig/liquidConfig/list')" label="液位监测仪" name="liquid">
         <list-liquid-config ref="liquidConfig"/>
       </el-tab-pane>
-      <!--<el-tab-pane v-if="hasPerm('/busConfig/gasConfig/list')" label="燃气智能监测终端" name="gas">-->
-      <!--<list-gas-config ref="gasConfig"/>-->
-      <!--</el-tab-pane>-->
-      <!--<el-tab-pane v-if="hasPerm('/busConfig/harmfulConfig/list')" label="有害气体监测仪" name="harmful">-->
-      <!--<list-harmful-config ref="harmfulConfig"/>-->
-      <!--</el-tab-pane>-->
-      <!--<el-tab-pane v-if="hasPerm('/busConfig/tempConfig/list')" label="温湿度监测仪" name="temphumidity">-->
-      <!--<list-temp-config ref="tempConfig"/>-->
-      <!--</el-tab-pane>-->
-      <!--<el-tab-pane v-if="hasPerm('/busConfig/digConfig/list')" label="开挖监测仪" name="dig">-->
-      <!--<list-dig-config ref="digConfig"/>-->
-      <!--</el-tab-pane>-->
-      <!--<el-tab-pane v-if="hasPerm('/busConfig/noiseConfig/list')" label="噪声监测仪" name="dig">-->
-      <!--<list-noise-config ref="noiseConfig"/>-->
-      <!--</el-tab-pane>-->
+      <el-tab-pane v-if="hasPerm('/busConfig/gasConfig/list')" label="燃气智能监测终端" name="gas">
+        <list-gas-config ref="gasConfig"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/harmfulConfig/list')" label="有害气体监测仪" name="harmful">
+        <list-harmful-config ref="harmfulConfig"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/tempConfig/list')" label="温湿度监测仪" name="temphumidity">
+        <list-temp-config ref="tempConfig"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/digConfig/list')" label="开挖监测仪" name="dig">
+        <list-dig-config ref="digConfig"/>
+      </el-tab-pane>
+      <el-tab-pane v-if="hasPerm('/busConfig/noiseConfig/list')" label="噪声监测仪" name="dig">
+        <list-noise-config ref="noiseConfig"/>
+      </el-tab-pane>
     </el-tabs>
   </div>
 </template>
@@ -80,6 +80,6 @@
 
 <style rel="stylesheet/scss" lang="scss" scoped>
   .container{
-    padding: 5px;
+    /*padding: 5px;*/
   }
 </style>
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index b656dc6..aaabfc2 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -4,10 +4,10 @@
     <div class="search-div">
       <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
         <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="设备编号/井编号" clearable/>
+          <el-input v-model.trim="listQuery.keywords" placeholder="设备编号/井编号" size="small" clearable/>
         </search-item>
         <search-item v-if="showDeviceType" >
-          <el-select v-model="listQuery.deviceType" placeholder="设备类型" clearable>
+          <el-select v-model="listQuery.deviceType" placeholder="设备类型" size="small" clearable>
             <el-option
               v-for="item in deviceTypeList"
               :key="item.value"
@@ -16,10 +16,10 @@
           </el-select>
         </search-item>
         <search-item>
-          <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" size="small" dept-type="03" placeholder="选择权属单位"/>
         </search-item>
         <search-item v-if="isAdministrator()" >
-          <el-select v-model="listQuery.isOnline" placeholder="在线情况" clearable>
+          <el-select v-model="listQuery.isOnline" placeholder="在线情况" size="small" clearable>
             <el-option
               v-for="item in onlineStates"
               :key="item.value"
diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue
index 48dd03a..743bb64 100644
--- a/src/views/wellManage/listWell.vue
+++ b/src/views/wellManage/listWell.vue
@@ -5,10 +5,10 @@
       <search-area :need-clear="false" :need-search-more="false" type="seperate" size="small" search-more-type="default" @search="search" >
         <!--一般查询条件-->
         <search-item>
-          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" clearable/>
+          <el-input v-model.trim="listQuery.keywords" placeholder="井编号" size="small" clearable/>
         </search-item>
         <search-item v-if="showWellType" >
-          <el-select v-model="listQuery.wellType" placeholder="选择井类型" clearable>
+          <el-select v-model="listQuery.wellType" placeholder="选择井类型" size="small" clearable>
             <el-option
               v-for="item in wellTypeList"
               :key="item.value"
@@ -17,7 +17,7 @@
           </el-select>
         </search-item>
         <search-item>
-          <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+          <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" size="small" placeholder="选择权属单位"/>
         </search-item>
       </search-area>
     </div>
@@ -434,6 +434,7 @@
     // 获取井类型
     fetchWellType() {
       getWellType().then(response => {
+        debugger
         this.wellTypeList = []
         const wellTypes = this.$store.getters.wellTypes
         for (const wellType of response.data) {