diff --git a/src/views/deviceConfig/components/editWatchConfig.vue b/src/views/deviceConfig/components/editWatchConfig.vue
index 757cbc7..4747c60 100644
--- a/src/views/deviceConfig/components/editWatchConfig.vue
+++ b/src/views/deviceConfig/components/editWatchConfig.vue
@@ -52,7 +52,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="重传次数" prop="retryTimes">
             <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
@@ -63,11 +63,11 @@
             <el-input v-model.trim="configForm.collectInterval" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+      </el-row> -->
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="采集时间" prop="collectTime">
-            <!--<el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>-->
+            <el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>
             <el-time-picker
               v-model="configForm.collectTime"
               value-format="HH:mm"
@@ -80,15 +80,20 @@
             <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+      </el-row> -->
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="采集次数" prop="collectCount">
             <el-input-number :min="1" :max="24" v-model="configForm.collectCount" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="安装高度" prop="collectCount">
+            <el-input-number :min="1" :max="24" v-model="configForm.collectCount" type="text" placeholder="非必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row> -->
+      <!-- <el-row v-if="showIp" :gutter="20">
         <el-col :span="12">
           <el-form-item label="ip地址" prop="ip">
             <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填"/>
@@ -99,7 +104,7 @@
             <el-input v-model.trim="configForm.port" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>

diff --git a/src/views/deviceConfig/components/editWatchConfig.vue b/src/views/deviceConfig/components/editWatchConfig.vue
index 757cbc7..4747c60 100644
--- a/src/views/deviceConfig/components/editWatchConfig.vue
+++ b/src/views/deviceConfig/components/editWatchConfig.vue
@@ -52,7 +52,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="重传次数" prop="retryTimes">
             <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
@@ -63,11 +63,11 @@
             <el-input v-model.trim="configForm.collectInterval" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+      </el-row> -->
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="采集时间" prop="collectTime">
-            <!--<el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>-->
+            <el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>
             <el-time-picker
               v-model="configForm.collectTime"
               value-format="HH:mm"
@@ -80,15 +80,20 @@
             <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+      </el-row> -->
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="采集次数" prop="collectCount">
             <el-input-number :min="1" :max="24" v-model="configForm.collectCount" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="安装高度" prop="collectCount">
+            <el-input-number :min="1" :max="24" v-model="configForm.collectCount" type="text" placeholder="非必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row> -->
+      <!-- <el-row v-if="showIp" :gutter="20">
         <el-col :span="12">
           <el-form-item label="ip地址" prop="ip">
             <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填"/>
@@ -99,7 +104,7 @@
             <el-input v-model.trim="configForm.port" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index c349cda..a3425c4 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -7,8 +7,11 @@
           <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">
+          <!-- <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="areaId">
+            <area-select-tree v-model="listQuery.areaId" :need-top="false" :dept-show="true" placeholder="区域"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -70,6 +73,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import selectTree from '@/components/SelectTree/singleSelect'
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 import { getNoiseConfigList, batchImportNoiseConfig, batchExportNoiseConfig } from '@/api/noiseconfig'
 import { getDeptTreeList } from '@/api/system/dept'
 import EditGasConfig from './editGasConfig'
@@ -79,10 +83,11 @@
 
 export default {
   name: 'ListNoiseConfig',
-  components: { EditNoiseConfig, DeptSelect, DownloadTemplate, EditGasConfig, selectTree },
+  components: { EditNoiseConfig, DeptSelect, DownloadTemplate, EditGasConfig, selectTree, AreaSelectTree },
   data() {
     return {
       listQuery: {
+        areaId: '',
         keywords: '',
         offset: 1,
         limit: 20,
@@ -96,6 +101,12 @@
           align: 'center'
         },
         {
+          text: '报警阈值',
+          value: 'threshold',
+          align: 'center',
+          width: 80
+        },
+        {
           text: '重传次数',
           value: 'retryTimes',
           align: 'center'

diff --git a/src/views/deviceConfig/components/editWatchConfig.vue b/src/views/deviceConfig/components/editWatchConfig.vue
index 757cbc7..4747c60 100644
--- a/src/views/deviceConfig/components/editWatchConfig.vue
+++ b/src/views/deviceConfig/components/editWatchConfig.vue
@@ -52,7 +52,7 @@
           </el-form-item>
         </el-col>
       </el-row>
-      <el-row :gutter="20">
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="重传次数" prop="retryTimes">
             <el-input-number :min="1" :max="10" v-model="configForm.retryTimes" type="text" placeholder="必填"/>
@@ -63,11 +63,11 @@
             <el-input v-model.trim="configForm.collectInterval" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+      </el-row> -->
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="采集时间" prop="collectTime">
-            <!--<el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>-->
+            <el-input v-model.trim="configForm.collectTime" type="text" placeholder="必填"/>
             <el-time-picker
               v-model="configForm.collectTime"
               value-format="HH:mm"
@@ -80,15 +80,20 @@
             <el-input-number :min="1" :max="10" v-model="configForm.attemptsMax" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row :gutter="20">
+      </el-row> -->
+      <!-- <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="采集次数" prop="collectCount">
             <el-input-number :min="1" :max="24" v-model="configForm.collectCount" type="text" placeholder="必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
-      <el-row v-if="showIp" :gutter="20">
+        <el-col :span="12">
+          <el-form-item label="安装高度" prop="collectCount">
+            <el-input-number :min="1" :max="24" v-model="configForm.collectCount" type="text" placeholder="非必填"/>
+          </el-form-item>
+        </el-col>
+      </el-row> -->
+      <!-- <el-row v-if="showIp" :gutter="20">
         <el-col :span="12">
           <el-form-item label="ip地址" prop="ip">
             <el-input v-model.trim="configForm.ip" type="text" placeholder="非必填"/>
@@ -99,7 +104,7 @@
             <el-input v-model.trim="configForm.port" type="text" placeholder="非必填"/>
           </el-form-item>
         </el-col>
-      </el-row>
+      </el-row> -->
     </el-form>
     <div slot="footer" class="dialog-footer">
       <el-button :disabled="!canEdit" type="primary" @click="saveData">保存</el-button>
diff --git a/src/views/deviceConfig/components/listNoiseConfig.vue b/src/views/deviceConfig/components/listNoiseConfig.vue
index c349cda..a3425c4 100644
--- a/src/views/deviceConfig/components/listNoiseConfig.vue
+++ b/src/views/deviceConfig/components/listNoiseConfig.vue
@@ -7,8 +7,11 @@
           <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">
+          <!-- <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="areaId">
+            <area-select-tree v-model="listQuery.areaId" :need-top="false" :dept-show="true" placeholder="区域"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -70,6 +73,7 @@
 <script>
 import { judgeTree, toTreeList } from '@/utils/structure'
 import selectTree from '@/components/SelectTree/singleSelect'
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 import { getNoiseConfigList, batchImportNoiseConfig, batchExportNoiseConfig } from '@/api/noiseconfig'
 import { getDeptTreeList } from '@/api/system/dept'
 import EditGasConfig from './editGasConfig'
@@ -79,10 +83,11 @@
 
 export default {
   name: 'ListNoiseConfig',
-  components: { EditNoiseConfig, DeptSelect, DownloadTemplate, EditGasConfig, selectTree },
+  components: { EditNoiseConfig, DeptSelect, DownloadTemplate, EditGasConfig, selectTree, AreaSelectTree },
   data() {
     return {
       listQuery: {
+        areaId: '',
         keywords: '',
         offset: 1,
         limit: 20,
@@ -96,6 +101,12 @@
           align: 'center'
         },
         {
+          text: '报警阈值',
+          value: 'threshold',
+          align: 'center',
+          width: 80
+        },
+        {
           text: '重传次数',
           value: 'retryTimes',
           align: 'center'
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index e8ce6a8..872a4dd 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.vue
@@ -16,6 +16,15 @@
           </el-select>
         </search-item>
         <search-item>
+          <area-select-tree
+            v-model.trim="listQuery.area"
+            :need-top="false"
+            :dept-show="true"
+            placeholder="区域"
+            size="small"
+          />
+        </search-item>
+        <!-- <search-item>
           <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" size="small" dept-type="03" placeholder="选择权属单位"/>
         </search-item>
         <search-item v-if="isAdministrator()" >
@@ -26,7 +35,7 @@
               :label="item.name"
               :value="item.value"/>
           </el-select>
-        </search-item>
+        </search-item> -->
       </search-area>
     </div>
     <!--查询结果Table显示-->
@@ -98,6 +107,7 @@
 import editDevice from '@/views/deviceManage/editDevice'
 import detailDevice from '@/views/deviceManage/detailDevice'
 import selectTree from '@/components/SelectTree/singleSelect'
+import AreaSelectTree from '@/components/AreaSelect/areaSelectTree'
 import { getDeviceList, getDeviceType, delDevice, batchImportDevice, batchExportDevice } from '@/api/device'
 import DownloadTemplate from '@/components/DownloadTemplate'
 import DeptSelect from '@/components/DeptSelect/index'
@@ -106,10 +116,11 @@
 
 export default {
   name: 'ListDevice',
-  components: { DeptSelect, DownloadTemplate, editDevice, detailDevice, selectTree, InfoWell },
+  components: { DeptSelect, DownloadTemplate, editDevice, detailDevice, selectTree, InfoWell, AreaSelectTree },
   data() {
     return {
       listQuery: {
+        area: '',
         keywords: '',
         deviceType: '',
         isOnline: '',