diff --git a/src/api/systemConfig/deptPermission.js b/src/api/systemConfig/deptPermission.js
index 9b58c07..c4c47da 100644
--- a/src/api/systemConfig/deptPermission.js
+++ b/src/api/systemConfig/deptPermission.js
@@ -2,18 +2,9 @@
  * 组织权限配置配置接口
 */
 import request from '@/utils/request'
-import qs from 'qs'
 
-// 设备类别
-export function getDevice(params) {
-  return request({
-    url: 'device/type',
-    method: 'get',
-    params
-  })
-}
 // 组织权限配置配置查询
-export function deptList(params) {
+export function deptPermissionList(params) {
   return request({
     url: 'deptPermission/list',
     method: 'get',
@@ -22,31 +13,25 @@
 }
 
 // 添加组织权限配置
-export function addDept(params) {
+export function addDeptPermission(data) {
   return request({
     url: 'deptPermission/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织权限配置
-export function updateDept(params) {
+export function updateDeptPermission(data) {
   return request({
     url: 'deptPermission/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织权限配置
-export function delDept(ids) {
+export function delDeptPermission(id) {
   return request({
-    url: 'deptPermission/delete',
-    method: 'post',
-    params: {
-      ids: ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
+    url: 'deptPermission/delete/' + id,
+    method: 'post'
   })
 }

diff --git a/src/api/systemConfig/deptPermission.js b/src/api/systemConfig/deptPermission.js
index 9b58c07..c4c47da 100644
--- a/src/api/systemConfig/deptPermission.js
+++ b/src/api/systemConfig/deptPermission.js
@@ -2,18 +2,9 @@
  * 组织权限配置配置接口
 */
 import request from '@/utils/request'
-import qs from 'qs'
 
-// 设备类别
-export function getDevice(params) {
-  return request({
-    url: 'device/type',
-    method: 'get',
-    params
-  })
-}
 // 组织权限配置配置查询
-export function deptList(params) {
+export function deptPermissionList(params) {
   return request({
     url: 'deptPermission/list',
     method: 'get',
@@ -22,31 +13,25 @@
 }
 
 // 添加组织权限配置
-export function addDept(params) {
+export function addDeptPermission(data) {
   return request({
     url: 'deptPermission/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织权限配置
-export function updateDept(params) {
+export function updateDeptPermission(data) {
   return request({
     url: 'deptPermission/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织权限配置
-export function delDept(ids) {
+export function delDeptPermission(id) {
   return request({
-    url: 'deptPermission/delete',
-    method: 'post',
-    params: {
-      ids: ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
+    url: 'deptPermission/delete/' + id,
+    method: 'post'
   })
 }
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
index 8737939..8d9778d 100644
--- a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -1,32 +1,27 @@
 <template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+  <el-dialog append-to-body :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
+    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-width="140px" label-well-code="right">
+      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="组织机构" prop="deptid">
+            <dept-select v-model="deviceForm.deptid" :need-top="true" dept-type="03" placeholder="选择组织机构" :disabled="dialogStatus === 'detail' ? true : false" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="默认城市编码" prop="area">
             <el-input
-              v-model="deviceForm.deptid"
+              v-model="deviceForm.area"
               clearable
-              disabled
-              placeholder="请输入组织id"
+              placeholder="请输入城市编码"
+              :disabled="dialogStatus === 'detail' ? true : false"
             />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="deviceForm.deviceType" placeholder="请选择设备类型" multiple clearable :disabled="dialogStatus === 'detail' ? true : false">
+          <el-form-item label="支持设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" placeholder="请选择设备类型" multiple collapse-tags clearable :disabled="dialogStatus === 'detail' ? true : false">
               <el-option
                 v-for="item in deviceTypeList"
                 :key="item.value"
@@ -37,14 +32,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="点位类型" prop="wellType">
-            <el-select
-              v-model="deviceForm.wellType"
-              multiple
-              clearable
-              placeholder="请选择支持点位类型"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
+          <el-form-item label="支持点位类型" prop="wellType">
+            <el-select v-model="deviceForm.wellType" multiple collapse-tags clearable placeholder="请选择支持点位类型" :disabled="dialogStatus === 'detail' ? true : false">
               <el-option
                 v-for="item in wellTypeList"
                 :key="item.value"
@@ -57,7 +46,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="经度" prop="lng">
+          <el-form-item label="地图默认中心-经度" prop="lng">
             <el-input
               v-model="deviceForm.lng"
               clearable
@@ -67,7 +56,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="纬度" prop="lat">
+          <el-form-item label="地图默认中心-纬度" prop="lat">
             <el-input
               v-model="deviceForm.lat"
               clearable
@@ -78,11 +67,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
+    <div v-show="dialogStatus === 'detail' ? false : true" slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">
         保存
       </el-button>
@@ -94,10 +79,13 @@
 </template>
 
 <script>
-import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
+import { updateDeptPermission, addDeptPermission } from '@/api/systemConfig/deptPermission'
+import { getDeviceType } from '@/api/device/device'
 import { getWellType } from '@/api/well/well'
+import DeptSelect from '@/components/DeptSelect'
 export default {
   name: 'EditDeptPermission',
+  components: { DeptSelect },
   data() {
     return {
       dialogFormVisible: false, // 对话框显示隐藏
@@ -110,23 +98,16 @@
         detail: '详情'
       },
       // 支持点位类型
-      wellTypeList: [
-        {
-          label: '点位类型一',
-          value: '1'
-        },
-        {
-          label: '点位类型二',
-          value: '2'
-        }
-      ],
+      wellTypeList: [],
       // 表单内容
       deviceForm: {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
+        id: '',
+        deptid: '', // 部门id
+        wellType: '', // 支持井类型
+        deviceType: '', // 支持的设备类型
+        area: '', // 默认城市编码
+        lng: '', // 经度
+        lat: '' // 纬度
       },
       // 表单校验规则
       rules: {
@@ -145,7 +126,7 @@
   methods: {
     // 获取设备类型
     fetchDeviceType() {
-      getDevice().then(response => {
+      getDeviceType().then(response => {
         this.deviceTypeList = response.data
       })
     },
@@ -158,9 +139,11 @@
     // 重置表单
     resetForm() {
       this.deviceForm = {
+        id: '',
         deptid: '',
         wellType: '',
         deviceType: '',
+        area: '', // 默认城市编码
         lng: '',
         lat: ''
       }
@@ -176,9 +159,11 @@
         })
       } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
         this.deviceForm = {
+          id: row.id,
           deptid: row.deptid,
           wellType: row.wellType,
           deviceType: row.deviceType,
+          area: row.area,
           lng: row.lng,
           lat: row.lat
         }
@@ -196,7 +181,7 @@
     updateData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          updateDept(this.deviceForm).then(response => {
+          updateDeptPermission(this.deviceForm).then(response => {
             if (response.code === 200) {
               this.$message.success('修改成功')
               this.$emit('watchChild')
@@ -209,9 +194,8 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
         if (valid) {
-          addDept(this.deviceForm).then(response => {
+          addDeptPermission(this.deviceForm).then(response => {
             if (response.code === 200) {
               this.$confirm('新增成功，是否继续新增?', '提示', {
                 confirmButtonText: '是',

diff --git a/src/api/systemConfig/deptPermission.js b/src/api/systemConfig/deptPermission.js
index 9b58c07..c4c47da 100644
--- a/src/api/systemConfig/deptPermission.js
+++ b/src/api/systemConfig/deptPermission.js
@@ -2,18 +2,9 @@
  * 组织权限配置配置接口
 */
 import request from '@/utils/request'
-import qs from 'qs'
 
-// 设备类别
-export function getDevice(params) {
-  return request({
-    url: 'device/type',
-    method: 'get',
-    params
-  })
-}
 // 组织权限配置配置查询
-export function deptList(params) {
+export function deptPermissionList(params) {
   return request({
     url: 'deptPermission/list',
     method: 'get',
@@ -22,31 +13,25 @@
 }
 
 // 添加组织权限配置
-export function addDept(params) {
+export function addDeptPermission(data) {
   return request({
     url: 'deptPermission/add',
     method: 'post',
-    params
+    data
   })
 }
 // 修改组织权限配置
-export function updateDept(params) {
+export function updateDeptPermission(data) {
   return request({
     url: 'deptPermission/update',
     method: 'post',
-    params
+    data
   })
 }
 // 删除组织权限配置
-export function delDept(ids) {
+export function delDeptPermission(id) {
   return request({
-    url: 'deptPermission/delete',
-    method: 'post',
-    params: {
-      ids: ids
-    },
-    paramsSerializer: params => {
-      return qs.stringify(params, { indices: false })
-    }
+    url: 'deptPermission/delete/' + id,
+    method: 'post'
   })
 }
diff --git a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
index 8737939..8d9778d 100644
--- a/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
+++ b/src/views/systemConfig/deptPermission/components/editDeptPermission.vue
@@ -1,32 +1,27 @@
 <template>
-  <el-dialog
-    append-to-body
-    :title="textMap[dialogStatus]"
-    :visible.sync="dialogFormVisible"
-  >
-    <el-form
-      ref="dataForm"
-      :rules="rules"
-      :model="deviceForm"
-      label-width="100px"
-      label-well-code="right"
-    >
-      <el-row v-show="dialogStatus === 'detail' ? true : false" :gutter="20">
+  <el-dialog append-to-body :title="textMap[dialogStatus]" :visible.sync="dialogFormVisible">
+    <el-form ref="dataForm" :rules="rules" :model="deviceForm" label-width="140px" label-well-code="right">
+      <el-row :gutter="20">
         <el-col :span="12">
           <el-form-item label="组织机构" prop="deptid">
+            <dept-select v-model="deviceForm.deptid" :need-top="true" dept-type="03" placeholder="选择组织机构" :disabled="dialogStatus === 'detail' ? true : false" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="默认城市编码" prop="area">
             <el-input
-              v-model="deviceForm.deptid"
+              v-model="deviceForm.area"
               clearable
-              disabled
-              placeholder="请输入组织id"
+              placeholder="请输入城市编码"
+              :disabled="dialogStatus === 'detail' ? true : false"
             />
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="设备类型" prop="deviceType">
-            <el-select v-model="deviceForm.deviceType" placeholder="请选择设备类型" multiple clearable :disabled="dialogStatus === 'detail' ? true : false">
+          <el-form-item label="支持设备类型" prop="deviceType">
+            <el-select v-model="deviceForm.deviceType" placeholder="请选择设备类型" multiple collapse-tags clearable :disabled="dialogStatus === 'detail' ? true : false">
               <el-option
                 v-for="item in deviceTypeList"
                 :key="item.value"
@@ -37,14 +32,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="点位类型" prop="wellType">
-            <el-select
-              v-model="deviceForm.wellType"
-              multiple
-              clearable
-              placeholder="请选择支持点位类型"
-              :disabled="dialogStatus === 'detail' ? true : false"
-            >
+          <el-form-item label="支持点位类型" prop="wellType">
+            <el-select v-model="deviceForm.wellType" multiple collapse-tags clearable placeholder="请选择支持点位类型" :disabled="dialogStatus === 'detail' ? true : false">
               <el-option
                 v-for="item in wellTypeList"
                 :key="item.value"
@@ -57,7 +46,7 @@
       </el-row>
       <el-row :gutter="20">
         <el-col :span="12">
-          <el-form-item label="经度" prop="lng">
+          <el-form-item label="地图默认中心-经度" prop="lng">
             <el-input
               v-model="deviceForm.lng"
               clearable
@@ -67,7 +56,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="12">
-          <el-form-item label="纬度" prop="lat">
+          <el-form-item label="地图默认中心-纬度" prop="lat">
             <el-input
               v-model="deviceForm.lat"
               clearable
@@ -78,11 +67,7 @@
         </el-col>
       </el-row>
     </el-form>
-    <div
-      v-show="dialogStatus === 'detail' ? false : true"
-      slot="footer"
-      class="dialog-footer"
-    >
+    <div v-show="dialogStatus === 'detail' ? false : true" slot="footer" class="dialog-footer">
       <el-button type="primary" @click="saveData">
         保存
       </el-button>
@@ -94,10 +79,13 @@
 </template>
 
 <script>
-import { getDevice, updateDept, addDept } from '@/api/systemConfig/deptPermission'
+import { updateDeptPermission, addDeptPermission } from '@/api/systemConfig/deptPermission'
+import { getDeviceType } from '@/api/device/device'
 import { getWellType } from '@/api/well/well'
+import DeptSelect from '@/components/DeptSelect'
 export default {
   name: 'EditDeptPermission',
+  components: { DeptSelect },
   data() {
     return {
       dialogFormVisible: false, // 对话框显示隐藏
@@ -110,23 +98,16 @@
         detail: '详情'
       },
       // 支持点位类型
-      wellTypeList: [
-        {
-          label: '点位类型一',
-          value: '1'
-        },
-        {
-          label: '点位类型二',
-          value: '2'
-        }
-      ],
+      wellTypeList: [],
       // 表单内容
       deviceForm: {
-        deptid: '',
-        wellType: '',
-        deviceType: '',
-        lng: '',
-        lat: ''
+        id: '',
+        deptid: '', // 部门id
+        wellType: '', // 支持井类型
+        deviceType: '', // 支持的设备类型
+        area: '', // 默认城市编码
+        lng: '', // 经度
+        lat: '' // 纬度
       },
       // 表单校验规则
       rules: {
@@ -145,7 +126,7 @@
   methods: {
     // 获取设备类型
     fetchDeviceType() {
-      getDevice().then(response => {
+      getDeviceType().then(response => {
         this.deviceTypeList = response.data
       })
     },
@@ -158,9 +139,11 @@
     // 重置表单
     resetForm() {
       this.deviceForm = {
+        id: '',
         deptid: '',
         wellType: '',
         deviceType: '',
+        area: '', // 默认城市编码
         lng: '',
         lat: ''
       }
@@ -176,9 +159,11 @@
         })
       } else if (this.dialogStatus === 'update' || this.dialogStatus === 'detail') {
         this.deviceForm = {
+          id: row.id,
           deptid: row.deptid,
           wellType: row.wellType,
           deviceType: row.deviceType,
+          area: row.area,
           lng: row.lng,
           lat: row.lat
         }
@@ -196,7 +181,7 @@
     updateData() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          updateDept(this.deviceForm).then(response => {
+          updateDeptPermission(this.deviceForm).then(response => {
             if (response.code === 200) {
               this.$message.success('修改成功')
               this.$emit('watchChild')
@@ -209,9 +194,8 @@
     // 新增数据
     createData: function() {
       this.$refs['dataForm'].validate((valid) => {
-        console.log(this.deviceForm)
         if (valid) {
-          addDept(this.deviceForm).then(response => {
+          addDeptPermission(this.deviceForm).then(response => {
             if (response.code === 200) {
               this.$confirm('新增成功，是否继续新增?', '提示', {
                 confirmButtonText: '是',
diff --git a/src/views/systemConfig/deptPermission/deptPermission.vue b/src/views/systemConfig/deptPermission/deptPermission.vue
index ad3ff51..4518e08 100644
--- a/src/views/systemConfig/deptPermission/deptPermission.vue
+++ b/src/views/systemConfig/deptPermission/deptPermission.vue
@@ -41,7 +41,7 @@
 <script>
 import DeptSelect from '@/components/DeptSelect'
 import EditDeptPermission from '@/views/systemConfig/deptPermission/components/editDeptPermission'
-import { deptList, delDept } from '@/api/systemConfig/deptPermission'
+import { deptPermissionList, delDeptPermission } from '@/api/systemConfig/deptPermission'
 
 export default {
   name: 'DeptPermission',
@@ -69,6 +69,11 @@
           align: 'center'
         },
         {
+          text: '默认城市编码',
+          value: 'area',
+          align: 'center'
+        },
+        {
           text: '地图默认中心-经度',
           value: 'lng',
           align: 'center'
@@ -97,7 +102,7 @@
     // 获取数据列表
     fetchData() {
       this.listLoading = true
-      deptList(this.listQuery).then(response => {
+      deptPermissionList(this.listQuery).then(response => {
         this.list = response.data
         this.listLoading = false
       })
@@ -112,7 +117,7 @@
           type: 'warning'
         }
       ).then(() => {
-        delDept(row.id).then(response => {
+        delDeptPermission(row.id).then(response => {
           if (response.code === 200) {
             this.$message.success('删除成功')
             this.fetchData()