diff --git a/config/dev.env.js b/config/dev.env.js
index b193360..9f671cf 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -7,9 +7,9 @@
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
+  // BASE_API: '"http://106.74.146.218:2031"'
+  // BASE_API: '"http://192.168.0.212:14537"'
   BASE_API: '"http://119.254.103.80:14537"'
-  // BASE_API: '"http://192.168.0.225:14537"'
-  // BASE_API: '"http://119.254.103.80:14536"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
 })

diff --git a/config/dev.env.js b/config/dev.env.js
index b193360..9f671cf 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -7,9 +7,9 @@
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
+  // BASE_API: '"http://106.74.146.218:2031"'
+  // BASE_API: '"http://192.168.0.212:14537"'
   BASE_API: '"http://119.254.103.80:14537"'
-  // BASE_API: '"http://192.168.0.225:14537"'
-  // BASE_API: '"http://119.254.103.80:14536"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index d2d48be..488d501 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://119.254.103.80:14537"',
+  // BASE_API: '"http://119.254.103.80:14537"',
+  BASE_API: '"http://127.0.0.1:8083"'
 }

diff --git a/config/dev.env.js b/config/dev.env.js
index b193360..9f671cf 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -7,9 +7,9 @@
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
+  // BASE_API: '"http://106.74.146.218:2031"'
+  // BASE_API: '"http://192.168.0.212:14537"'
   BASE_API: '"http://119.254.103.80:14537"'
-  // BASE_API: '"http://192.168.0.225:14537"'
-  // BASE_API: '"http://119.254.103.80:14536"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index d2d48be..488d501 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://119.254.103.80:14537"',
+  // BASE_API: '"http://119.254.103.80:14537"',
+  BASE_API: '"http://127.0.0.1:8083"'
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 32b0b59..30ecec9 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -85,7 +85,7 @@
           checkCell: true
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },

diff --git a/config/dev.env.js b/config/dev.env.js
index b193360..9f671cf 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -7,9 +7,9 @@
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
+  // BASE_API: '"http://106.74.146.218:2031"'
+  // BASE_API: '"http://192.168.0.212:14537"'
   BASE_API: '"http://119.254.103.80:14537"'
-  // BASE_API: '"http://192.168.0.225:14537"'
-  // BASE_API: '"http://119.254.103.80:14536"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index d2d48be..488d501 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://119.254.103.80:14537"',
+  // BASE_API: '"http://119.254.103.80:14537"',
+  BASE_API: '"http://127.0.0.1:8083"'
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 32b0b59..30ecec9 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -85,7 +85,7 @@
           checkCell: true
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index bf896d5..4a3be6d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -135,7 +135,7 @@
           class: 'warning'
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },

diff --git a/config/dev.env.js b/config/dev.env.js
index b193360..9f671cf 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -7,9 +7,9 @@
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
+  // BASE_API: '"http://106.74.146.218:2031"'
+  // BASE_API: '"http://192.168.0.212:14537"'
   BASE_API: '"http://119.254.103.80:14537"'
-  // BASE_API: '"http://192.168.0.225:14537"'
-  // BASE_API: '"http://119.254.103.80:14536"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index d2d48be..488d501 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://119.254.103.80:14537"',
+  // BASE_API: '"http://119.254.103.80:14537"',
+  BASE_API: '"http://127.0.0.1:8083"'
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 32b0b59..30ecec9 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -85,7 +85,7 @@
           checkCell: true
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index bf896d5..4a3be6d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -135,7 +135,7 @@
           class: 'warning'
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 545db9d..7a0e35f 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/statics/alarmsByDept')" label="按权属单位" name="byDept">
+      <el-tab-pane v-if="hasPerm('/statics/alarmsByDept')" label="按派出所" name="byDept">
         <alarm-statics-by-dept ref="bydept"/>
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/statics/alarmsByArea')" label="按区域" name="byArea">

diff --git a/config/dev.env.js b/config/dev.env.js
index b193360..9f671cf 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -7,9 +7,9 @@
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
+  // BASE_API: '"http://106.74.146.218:2031"'
+  // BASE_API: '"http://192.168.0.212:14537"'
   BASE_API: '"http://119.254.103.80:14537"'
-  // BASE_API: '"http://192.168.0.225:14537"'
-  // BASE_API: '"http://119.254.103.80:14536"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index d2d48be..488d501 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://119.254.103.80:14537"',
+  // BASE_API: '"http://119.254.103.80:14537"',
+  BASE_API: '"http://127.0.0.1:8083"'
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 32b0b59..30ecec9 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -85,7 +85,7 @@
           checkCell: true
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index bf896d5..4a3be6d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -135,7 +135,7 @@
           class: 'warning'
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 545db9d..7a0e35f 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/statics/alarmsByDept')" label="按权属单位" name="byDept">
+      <el-tab-pane v-if="hasPerm('/statics/alarmsByDept')" label="按派出所" name="byDept">
         <alarm-statics-by-dept ref="bydept"/>
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/statics/alarmsByArea')" label="按区域" name="byArea">
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4f841c8..4b9b221 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -29,7 +29,6 @@
         <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('/welldata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
-
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
@@ -102,7 +101,7 @@
           checkState: true
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },

diff --git a/config/dev.env.js b/config/dev.env.js
index b193360..9f671cf 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -7,9 +7,9 @@
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
+  // BASE_API: '"http://106.74.146.218:2031"'
+  // BASE_API: '"http://192.168.0.212:14537"'
   BASE_API: '"http://119.254.103.80:14537"'
-  // BASE_API: '"http://192.168.0.225:14537"'
-  // BASE_API: '"http://119.254.103.80:14536"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index d2d48be..488d501 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://119.254.103.80:14537"',
+  // BASE_API: '"http://119.254.103.80:14537"',
+  BASE_API: '"http://127.0.0.1:8083"'
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 32b0b59..30ecec9 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -85,7 +85,7 @@
           checkCell: true
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index bf896d5..4a3be6d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -135,7 +135,7 @@
           class: 'warning'
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 545db9d..7a0e35f 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/statics/alarmsByDept')" label="按权属单位" name="byDept">
+      <el-tab-pane v-if="hasPerm('/statics/alarmsByDept')" label="按派出所" name="byDept">
         <alarm-statics-by-dept ref="bydept"/>
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/statics/alarmsByArea')" label="按区域" name="byArea">
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4f841c8..4b9b221 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -29,7 +29,6 @@
         <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('/welldata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
-
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
@@ -102,7 +101,7 @@
           checkState: true
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 0020bf4..1e3eb1c 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -103,7 +103,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="20">
-        <el-col :span="14">
+        <el-col :span="9">
           <el-form-item label="工单动态">
             <el-steps :active="activeStep">
               <el-step
@@ -153,6 +153,7 @@
         firstStatePhotos: '', // 现场情况图片
         handleMessage: '', // 维护情况描述
         handleStatePhotos: '', // 维护图片
+        createTime: '', // 创建工单时间
         getJobPerson: '', // 接单人员名称
         getJobTime: '', // 接单时间
         confirmJobPerson: '', // 确认人员名称
@@ -219,36 +220,45 @@
             this.handleImageList = []
           }
           // 处理工单动态
-          // 若有人接单，状态改为已接单
-          if (job.getJobTime) {
+          // 显示创建工单时间
+          if (job.createTime) {
             const activity = {
-              content: job.getJobPerson + '已接单',
-              timestamp: job.getJobTime
+              content: '生成工单',
+              timestamp: job.createTime
             }
             this.activities.push(activity)
             this.activeStep = 1
-          } else { // 否则添加空的状态
-            const activity = {
-              content: '待处理',
-              timestamp: ''
-            }
-            this.activities.push(activity)
           }
+          // 若有人接单，状态改为已接单
+          // if (job.getJobTime) {
+          //   const activity = {
+          //     content: job.getJobPerson + '已接单',
+          //     timestamp: job.getJobTime
+          //   }
+          //   this.activities.push(activity)
+          //   this.activeStep = 1
+          // } else { // 否则添加空的状态
+          //   const activity = {
+          //     content: '待处理',
+          //     timestamp: ''
+          //   }
+          //   this.activities.push(activity)
+          // }
           // 若有人确认，状态改为已确认
-          if (job.confirmJobTime) {
-            const activity = {
-              content: job.confirmJobPerson + '已确认',
-              timestamp: job.confirmJobTime
-            }
-            this.activities.push(activity)
-            this.activeStep = 2
-          } else if (job.alarmType === '1') { // 若无人确认且为数据异常插入空的待确认
-            const activity = {
-              content: '待确认',
-              timestamp: ''
-            }
-            this.activities.push(activity)
-          }
+          // if (job.confirmJobTime) {
+          //   const activity = {
+          //     content: job.confirmJobPerson + '已确认',
+          //     timestamp: job.confirmJobTime
+          //   }
+          //   this.activities.push(activity)
+          //   this.activeStep = 2
+          // } else if (job.alarmType === '1') { // 若无人确认且为数据异常插入空的待确认
+          //   const activity = {
+          //     content: '待确认',
+          //     timestamp: ''
+          //   }
+          //   this.activities.push(activity)
+          // }
           if (job.handleJobTime) {
             // 若有处理时间，状态置为已完成
             // 若没有处理人则处理人为系统
@@ -256,17 +266,17 @@
             if (!handleJobPerson) {
               handleJobPerson = '系统'
             }
-            const activity1 = {
-              content: handleJobPerson + '处理中',
-              timestamp: job.handleJobTime
-            }
+            // const activity1 = {
+            //   content: handleJobPerson + '处理中',
+            //   timestamp: job.handleJobTime
+            // }
             const activity2 = {
               content: handleJobPerson + '已完成',
               timestamp: job.handleJobTime
             }
-            this.activities.push(activity1)
+            // this.activities.push(activity1)
             this.activities.push(activity2)
-            this.activeStep = 3
+            this.activeStep = 2
           } else if (this.jobForm.jobStatusName === '完成') {
             // 特殊情况处理:已确认之后结束的工单,将完成人和时间用确认人代替
             const activity = {
@@ -275,15 +285,15 @@
             }
             this.activities.push(activity)
           } else {
-            const activity1 = {
-              content: '处理中',
-              timestamp: ''
-            }
+            // const activity1 = {
+            //   content: '处理中',
+            //   timestamp: ''
+            // }
             const activity2 = {
               content: '已完成',
               timestamp: ''
             }
-            this.activities.push(activity1)
+            // this.activities.push(activity1)
             this.activities.push(activity2)
           }
           if (Array.isArray(job.flow) && job.flow.length > 0) {

diff --git a/config/dev.env.js b/config/dev.env.js
index b193360..9f671cf 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -7,9 +7,9 @@
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
+  // BASE_API: '"http://106.74.146.218:2031"'
+  // BASE_API: '"http://192.168.0.212:14537"'
   BASE_API: '"http://119.254.103.80:14537"'
-  // BASE_API: '"http://192.168.0.225:14537"'
-  // BASE_API: '"http://119.254.103.80:14536"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index d2d48be..488d501 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://119.254.103.80:14537"',
+  // BASE_API: '"http://119.254.103.80:14537"',
+  BASE_API: '"http://127.0.0.1:8083"'
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 32b0b59..30ecec9 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -85,7 +85,7 @@
           checkCell: true
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index bf896d5..4a3be6d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -135,7 +135,7 @@
           class: 'warning'
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 545db9d..7a0e35f 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/statics/alarmsByDept')" label="按权属单位" name="byDept">
+      <el-tab-pane v-if="hasPerm('/statics/alarmsByDept')" label="按派出所" name="byDept">
         <alarm-statics-by-dept ref="bydept"/>
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/statics/alarmsByArea')" label="按区域" name="byArea">
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4f841c8..4b9b221 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -29,7 +29,6 @@
         <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('/welldata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
-
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
@@ -102,7 +101,7 @@
           checkState: true
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 0020bf4..1e3eb1c 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -103,7 +103,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="20">
-        <el-col :span="14">
+        <el-col :span="9">
           <el-form-item label="工单动态">
             <el-steps :active="activeStep">
               <el-step
@@ -153,6 +153,7 @@
         firstStatePhotos: '', // 现场情况图片
         handleMessage: '', // 维护情况描述
         handleStatePhotos: '', // 维护图片
+        createTime: '', // 创建工单时间
         getJobPerson: '', // 接单人员名称
         getJobTime: '', // 接单时间
         confirmJobPerson: '', // 确认人员名称
@@ -219,36 +220,45 @@
             this.handleImageList = []
           }
           // 处理工单动态
-          // 若有人接单，状态改为已接单
-          if (job.getJobTime) {
+          // 显示创建工单时间
+          if (job.createTime) {
             const activity = {
-              content: job.getJobPerson + '已接单',
-              timestamp: job.getJobTime
+              content: '生成工单',
+              timestamp: job.createTime
             }
             this.activities.push(activity)
             this.activeStep = 1
-          } else { // 否则添加空的状态
-            const activity = {
-              content: '待处理',
-              timestamp: ''
-            }
-            this.activities.push(activity)
           }
+          // 若有人接单，状态改为已接单
+          // if (job.getJobTime) {
+          //   const activity = {
+          //     content: job.getJobPerson + '已接单',
+          //     timestamp: job.getJobTime
+          //   }
+          //   this.activities.push(activity)
+          //   this.activeStep = 1
+          // } else { // 否则添加空的状态
+          //   const activity = {
+          //     content: '待处理',
+          //     timestamp: ''
+          //   }
+          //   this.activities.push(activity)
+          // }
           // 若有人确认，状态改为已确认
-          if (job.confirmJobTime) {
-            const activity = {
-              content: job.confirmJobPerson + '已确认',
-              timestamp: job.confirmJobTime
-            }
-            this.activities.push(activity)
-            this.activeStep = 2
-          } else if (job.alarmType === '1') { // 若无人确认且为数据异常插入空的待确认
-            const activity = {
-              content: '待确认',
-              timestamp: ''
-            }
-            this.activities.push(activity)
-          }
+          // if (job.confirmJobTime) {
+          //   const activity = {
+          //     content: job.confirmJobPerson + '已确认',
+          //     timestamp: job.confirmJobTime
+          //   }
+          //   this.activities.push(activity)
+          //   this.activeStep = 2
+          // } else if (job.alarmType === '1') { // 若无人确认且为数据异常插入空的待确认
+          //   const activity = {
+          //     content: '待确认',
+          //     timestamp: ''
+          //   }
+          //   this.activities.push(activity)
+          // }
           if (job.handleJobTime) {
             // 若有处理时间，状态置为已完成
             // 若没有处理人则处理人为系统
@@ -256,17 +266,17 @@
             if (!handleJobPerson) {
               handleJobPerson = '系统'
             }
-            const activity1 = {
-              content: handleJobPerson + '处理中',
-              timestamp: job.handleJobTime
-            }
+            // const activity1 = {
+            //   content: handleJobPerson + '处理中',
+            //   timestamp: job.handleJobTime
+            // }
             const activity2 = {
               content: handleJobPerson + '已完成',
               timestamp: job.handleJobTime
             }
-            this.activities.push(activity1)
+            // this.activities.push(activity1)
             this.activities.push(activity2)
-            this.activeStep = 3
+            this.activeStep = 2
           } else if (this.jobForm.jobStatusName === '完成') {
             // 特殊情况处理:已确认之后结束的工单,将完成人和时间用确认人代替
             const activity = {
@@ -275,15 +285,15 @@
             }
             this.activities.push(activity)
           } else {
-            const activity1 = {
-              content: '处理中',
-              timestamp: ''
-            }
+            // const activity1 = {
+            //   content: '处理中',
+            //   timestamp: ''
+            // }
             const activity2 = {
               content: '已完成',
               timestamp: ''
             }
-            this.activities.push(activity1)
+            // this.activities.push(activity1)
             this.activities.push(activity2)
           }
           if (Array.isArray(job.flow) && job.flow.length > 0) {
diff --git a/src/views/overview/overviewBdOffline.vue b/src/views/overview/overviewBdOffline.vue
index b1b398d..0a4d0aa 100644
--- a/src/views/overview/overviewBdOffline.vue
+++ b/src/views/overview/overviewBdOffline.vue
@@ -17,7 +17,7 @@
             </el-select>
           </el-form-item>
           <el-form-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" placeholder="选择派出所"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
           <el-form-item style="margin-left:10px">
@@ -92,7 +92,7 @@
             <div class="info-body">
               <div>闸井类型：{{ wellInfo.wellTypeName }}</div>
               <div>井深：{{ wellInfo.deep }}(m)</div>
-              <div>权属单位：{{ wellInfo.deptName }}</div>
+              <div>派出所：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
           </div>
@@ -108,7 +108,7 @@
               </div>
               <el-divider/>
               <div>井深：{{ alarmInfo.deep }}(m)</div>
-              <div>权属单位：{{ alarmInfo.deptName }}</div>
+              <div>派出所：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
           </div>
@@ -185,6 +185,7 @@
         '4': 'static/BMap/images/well-heat.svg',
         '5': 'static/BMap/images/well-power.svg'
       }, // 井类型图标字典
+      commonIcon: 'static/BMap/images/well-common.svg',
       center: { lng: 116.4, lat: 39.9 }, // 地图中心
       zoom: 14, // 地图缩放比例
       markers: [], // 井列表标注marker
@@ -354,7 +355,8 @@
                   wellType: well.wellType,
                   deptid: well.deptid,
                   bfzt: well.bfzt,
-                  icon: this.icons[well.wellType],
+                  // icon: this.icons[well.wellType],
+                  icon: this.commonIcon,
                   visible: true,
                   wellStatus: 'alarm'
                 })
@@ -378,7 +380,8 @@
                   wellType: well.wellType,
                   deptid: well.deptid,
                   bfzt: well.bfzt,
-                  icon: this.icons[well.wellType],
+                  // icon: this.icons[well.wellType],
+                  icon: this.commonIcon,
                   visible: true,
                   wellStatus: 'normal'
                 })

diff --git a/config/dev.env.js b/config/dev.env.js
index b193360..9f671cf 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -7,9 +7,9 @@
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
+  // BASE_API: '"http://106.74.146.218:2031"'
+  // BASE_API: '"http://192.168.0.212:14537"'
   BASE_API: '"http://119.254.103.80:14537"'
-  // BASE_API: '"http://192.168.0.225:14537"'
-  // BASE_API: '"http://119.254.103.80:14536"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index d2d48be..488d501 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://119.254.103.80:14537"',
+  // BASE_API: '"http://119.254.103.80:14537"',
+  BASE_API: '"http://127.0.0.1:8083"'
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 32b0b59..30ecec9 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -85,7 +85,7 @@
           checkCell: true
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index bf896d5..4a3be6d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -135,7 +135,7 @@
           class: 'warning'
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 545db9d..7a0e35f 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/statics/alarmsByDept')" label="按权属单位" name="byDept">
+      <el-tab-pane v-if="hasPerm('/statics/alarmsByDept')" label="按派出所" name="byDept">
         <alarm-statics-by-dept ref="bydept"/>
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/statics/alarmsByArea')" label="按区域" name="byArea">
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4f841c8..4b9b221 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -29,7 +29,6 @@
         <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('/welldata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
-
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
@@ -102,7 +101,7 @@
           checkState: true
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 0020bf4..1e3eb1c 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -103,7 +103,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="20">
-        <el-col :span="14">
+        <el-col :span="9">
           <el-form-item label="工单动态">
             <el-steps :active="activeStep">
               <el-step
@@ -153,6 +153,7 @@
         firstStatePhotos: '', // 现场情况图片
         handleMessage: '', // 维护情况描述
         handleStatePhotos: '', // 维护图片
+        createTime: '', // 创建工单时间
         getJobPerson: '', // 接单人员名称
         getJobTime: '', // 接单时间
         confirmJobPerson: '', // 确认人员名称
@@ -219,36 +220,45 @@
             this.handleImageList = []
           }
           // 处理工单动态
-          // 若有人接单，状态改为已接单
-          if (job.getJobTime) {
+          // 显示创建工单时间
+          if (job.createTime) {
             const activity = {
-              content: job.getJobPerson + '已接单',
-              timestamp: job.getJobTime
+              content: '生成工单',
+              timestamp: job.createTime
             }
             this.activities.push(activity)
             this.activeStep = 1
-          } else { // 否则添加空的状态
-            const activity = {
-              content: '待处理',
-              timestamp: ''
-            }
-            this.activities.push(activity)
           }
+          // 若有人接单，状态改为已接单
+          // if (job.getJobTime) {
+          //   const activity = {
+          //     content: job.getJobPerson + '已接单',
+          //     timestamp: job.getJobTime
+          //   }
+          //   this.activities.push(activity)
+          //   this.activeStep = 1
+          // } else { // 否则添加空的状态
+          //   const activity = {
+          //     content: '待处理',
+          //     timestamp: ''
+          //   }
+          //   this.activities.push(activity)
+          // }
           // 若有人确认，状态改为已确认
-          if (job.confirmJobTime) {
-            const activity = {
-              content: job.confirmJobPerson + '已确认',
-              timestamp: job.confirmJobTime
-            }
-            this.activities.push(activity)
-            this.activeStep = 2
-          } else if (job.alarmType === '1') { // 若无人确认且为数据异常插入空的待确认
-            const activity = {
-              content: '待确认',
-              timestamp: ''
-            }
-            this.activities.push(activity)
-          }
+          // if (job.confirmJobTime) {
+          //   const activity = {
+          //     content: job.confirmJobPerson + '已确认',
+          //     timestamp: job.confirmJobTime
+          //   }
+          //   this.activities.push(activity)
+          //   this.activeStep = 2
+          // } else if (job.alarmType === '1') { // 若无人确认且为数据异常插入空的待确认
+          //   const activity = {
+          //     content: '待确认',
+          //     timestamp: ''
+          //   }
+          //   this.activities.push(activity)
+          // }
           if (job.handleJobTime) {
             // 若有处理时间，状态置为已完成
             // 若没有处理人则处理人为系统
@@ -256,17 +266,17 @@
             if (!handleJobPerson) {
               handleJobPerson = '系统'
             }
-            const activity1 = {
-              content: handleJobPerson + '处理中',
-              timestamp: job.handleJobTime
-            }
+            // const activity1 = {
+            //   content: handleJobPerson + '处理中',
+            //   timestamp: job.handleJobTime
+            // }
             const activity2 = {
               content: handleJobPerson + '已完成',
               timestamp: job.handleJobTime
             }
-            this.activities.push(activity1)
+            // this.activities.push(activity1)
             this.activities.push(activity2)
-            this.activeStep = 3
+            this.activeStep = 2
           } else if (this.jobForm.jobStatusName === '完成') {
             // 特殊情况处理:已确认之后结束的工单,将完成人和时间用确认人代替
             const activity = {
@@ -275,15 +285,15 @@
             }
             this.activities.push(activity)
           } else {
-            const activity1 = {
-              content: '处理中',
-              timestamp: ''
-            }
+            // const activity1 = {
+            //   content: '处理中',
+            //   timestamp: ''
+            // }
             const activity2 = {
               content: '已完成',
               timestamp: ''
             }
-            this.activities.push(activity1)
+            // this.activities.push(activity1)
             this.activities.push(activity2)
           }
           if (Array.isArray(job.flow) && job.flow.length > 0) {
diff --git a/src/views/overview/overviewBdOffline.vue b/src/views/overview/overviewBdOffline.vue
index b1b398d..0a4d0aa 100644
--- a/src/views/overview/overviewBdOffline.vue
+++ b/src/views/overview/overviewBdOffline.vue
@@ -17,7 +17,7 @@
             </el-select>
           </el-form-item>
           <el-form-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" placeholder="选择派出所"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
           <el-form-item style="margin-left:10px">
@@ -92,7 +92,7 @@
             <div class="info-body">
               <div>闸井类型：{{ wellInfo.wellTypeName }}</div>
               <div>井深：{{ wellInfo.deep }}(m)</div>
-              <div>权属单位：{{ wellInfo.deptName }}</div>
+              <div>派出所：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
           </div>
@@ -108,7 +108,7 @@
               </div>
               <el-divider/>
               <div>井深：{{ alarmInfo.deep }}(m)</div>
-              <div>权属单位：{{ alarmInfo.deptName }}</div>
+              <div>派出所：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
           </div>
@@ -185,6 +185,7 @@
         '4': 'static/BMap/images/well-heat.svg',
         '5': 'static/BMap/images/well-power.svg'
       }, // 井类型图标字典
+      commonIcon: 'static/BMap/images/well-common.svg',
       center: { lng: 116.4, lat: 39.9 }, // 地图中心
       zoom: 14, // 地图缩放比例
       markers: [], // 井列表标注marker
@@ -354,7 +355,8 @@
                   wellType: well.wellType,
                   deptid: well.deptid,
                   bfzt: well.bfzt,
-                  icon: this.icons[well.wellType],
+                  // icon: this.icons[well.wellType],
+                  icon: this.commonIcon,
                   visible: true,
                   wellStatus: 'alarm'
                 })
@@ -378,7 +380,8 @@
                   wellType: well.wellType,
                   deptid: well.deptid,
                   bfzt: well.bfzt,
-                  icon: this.icons[well.wellType],
+                  // icon: this.icons[well.wellType],
+                  icon: this.commonIcon,
                   visible: true,
                   wellStatus: 'normal'
                 })
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 3843939..e8487f7 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -26,13 +26,18 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="权属单位" prop="deptid">
-            <dept-select v-model="wellForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择权属单位"/>
+          <el-form-item label="所属派出所" prop="deptid">
+            <dept-select v-model="wellForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择所属派出所"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
+          <el-form-item label="产权单位">
+            <el-input v-model.trim="wellForm.owner" type="text" placeholder="非必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="9" :offset="3">
           <el-form-item label="井深(m)" prop="deep">
             <el-input v-model.trim="wellForm.deep" type="text" placeholder="必填"/>
           </el-form-item>
@@ -118,7 +123,7 @@
       <el-row :gutter="20">
         <el-col :span="9">
           <el-form-item label="闸井维护机构" prop="responsibleDept">
-            <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为权属单位" clearable>
+            <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为所属派出所" clearable>
               <el-option
                 v-for="item in secondDeptTreeList"
                 :key="item.id"
@@ -203,16 +208,17 @@
         wellCode: '', // 闸井编号
         wellName: '', // 闸井名称
         wellType: '', // 闸井类型
-        deptid: '', // 权属单位
+        deptid: '', // 所属派出所
         deep: '', // 井深，
         position: '', // 位置描述
         coordinateX: '', // 经度
         coordinateY: '', // 纬度
         photos: '', // 照片路径
         notes: '', // 备注,
-        qu: '',
+        qu: '', // 区
         area: '', // 街道
-        responsibleDept: '' // 维护人员部门
+        responsibleDept: '', // 维护人员部门
+        owner: '' // 产权单位
       }, // 表单
       deptProps: {
         parent: 'pid',
@@ -249,7 +255,7 @@
       dialogVisible: false,
       labelPosition: 'right',
       responseAssignShow: false,
-      deptShowTop: false, // 权属单位下拉是否显示顶级
+      deptShowTop: false, // 所属派出所下拉是否显示顶级
       deptShow: true
     }
   },
@@ -272,7 +278,7 @@
         return false
       }
     },
-    firstDept() { // 获取权属单位
+    firstDept() { // 获取所属派出所
       return this.wellForm.deptid
     },
     qu() { // 获取区
@@ -280,7 +286,7 @@
     }
   },
   watch: {
-    firstDept(val) { // 监控权属单位变化
+    firstDept(val) { // 监控所属派出所变化
       if (val !== '') {
         debugger
         this.wellForm.qu = ''
@@ -372,7 +378,7 @@
         wellCode: '', // 闸井编号
         wellName: '', // 闸井名称
         wellType: '', // 闸井类型
-        deptid: '', // 权属单位
+        deptid: '', // 所属派出所
         deep: '', // 井深，
         position: '', // 位置描述
         coordinateX: '', // 经度

diff --git a/config/dev.env.js b/config/dev.env.js
index b193360..9f671cf 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -7,9 +7,9 @@
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
+  // BASE_API: '"http://106.74.146.218:2031"'
+  // BASE_API: '"http://192.168.0.212:14537"'
   BASE_API: '"http://119.254.103.80:14537"'
-  // BASE_API: '"http://192.168.0.225:14537"'
-  // BASE_API: '"http://119.254.103.80:14536"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index d2d48be..488d501 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://119.254.103.80:14537"',
+  // BASE_API: '"http://119.254.103.80:14537"',
+  BASE_API: '"http://127.0.0.1:8083"'
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 32b0b59..30ecec9 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -85,7 +85,7 @@
           checkCell: true
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index bf896d5..4a3be6d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -135,7 +135,7 @@
           class: 'warning'
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 545db9d..7a0e35f 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/statics/alarmsByDept')" label="按权属单位" name="byDept">
+      <el-tab-pane v-if="hasPerm('/statics/alarmsByDept')" label="按派出所" name="byDept">
         <alarm-statics-by-dept ref="bydept"/>
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/statics/alarmsByArea')" label="按区域" name="byArea">
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4f841c8..4b9b221 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -29,7 +29,6 @@
         <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('/welldata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
-
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
@@ -102,7 +101,7 @@
           checkState: true
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 0020bf4..1e3eb1c 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -103,7 +103,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="20">
-        <el-col :span="14">
+        <el-col :span="9">
           <el-form-item label="工单动态">
             <el-steps :active="activeStep">
               <el-step
@@ -153,6 +153,7 @@
         firstStatePhotos: '', // 现场情况图片
         handleMessage: '', // 维护情况描述
         handleStatePhotos: '', // 维护图片
+        createTime: '', // 创建工单时间
         getJobPerson: '', // 接单人员名称
         getJobTime: '', // 接单时间
         confirmJobPerson: '', // 确认人员名称
@@ -219,36 +220,45 @@
             this.handleImageList = []
           }
           // 处理工单动态
-          // 若有人接单，状态改为已接单
-          if (job.getJobTime) {
+          // 显示创建工单时间
+          if (job.createTime) {
             const activity = {
-              content: job.getJobPerson + '已接单',
-              timestamp: job.getJobTime
+              content: '生成工单',
+              timestamp: job.createTime
             }
             this.activities.push(activity)
             this.activeStep = 1
-          } else { // 否则添加空的状态
-            const activity = {
-              content: '待处理',
-              timestamp: ''
-            }
-            this.activities.push(activity)
           }
+          // 若有人接单，状态改为已接单
+          // if (job.getJobTime) {
+          //   const activity = {
+          //     content: job.getJobPerson + '已接单',
+          //     timestamp: job.getJobTime
+          //   }
+          //   this.activities.push(activity)
+          //   this.activeStep = 1
+          // } else { // 否则添加空的状态
+          //   const activity = {
+          //     content: '待处理',
+          //     timestamp: ''
+          //   }
+          //   this.activities.push(activity)
+          // }
           // 若有人确认，状态改为已确认
-          if (job.confirmJobTime) {
-            const activity = {
-              content: job.confirmJobPerson + '已确认',
-              timestamp: job.confirmJobTime
-            }
-            this.activities.push(activity)
-            this.activeStep = 2
-          } else if (job.alarmType === '1') { // 若无人确认且为数据异常插入空的待确认
-            const activity = {
-              content: '待确认',
-              timestamp: ''
-            }
-            this.activities.push(activity)
-          }
+          // if (job.confirmJobTime) {
+          //   const activity = {
+          //     content: job.confirmJobPerson + '已确认',
+          //     timestamp: job.confirmJobTime
+          //   }
+          //   this.activities.push(activity)
+          //   this.activeStep = 2
+          // } else if (job.alarmType === '1') { // 若无人确认且为数据异常插入空的待确认
+          //   const activity = {
+          //     content: '待确认',
+          //     timestamp: ''
+          //   }
+          //   this.activities.push(activity)
+          // }
           if (job.handleJobTime) {
             // 若有处理时间，状态置为已完成
             // 若没有处理人则处理人为系统
@@ -256,17 +266,17 @@
             if (!handleJobPerson) {
               handleJobPerson = '系统'
             }
-            const activity1 = {
-              content: handleJobPerson + '处理中',
-              timestamp: job.handleJobTime
-            }
+            // const activity1 = {
+            //   content: handleJobPerson + '处理中',
+            //   timestamp: job.handleJobTime
+            // }
             const activity2 = {
               content: handleJobPerson + '已完成',
               timestamp: job.handleJobTime
             }
-            this.activities.push(activity1)
+            // this.activities.push(activity1)
             this.activities.push(activity2)
-            this.activeStep = 3
+            this.activeStep = 2
           } else if (this.jobForm.jobStatusName === '完成') {
             // 特殊情况处理:已确认之后结束的工单,将完成人和时间用确认人代替
             const activity = {
@@ -275,15 +285,15 @@
             }
             this.activities.push(activity)
           } else {
-            const activity1 = {
-              content: '处理中',
-              timestamp: ''
-            }
+            // const activity1 = {
+            //   content: '处理中',
+            //   timestamp: ''
+            // }
             const activity2 = {
               content: '已完成',
               timestamp: ''
             }
-            this.activities.push(activity1)
+            // this.activities.push(activity1)
             this.activities.push(activity2)
           }
           if (Array.isArray(job.flow) && job.flow.length > 0) {
diff --git a/src/views/overview/overviewBdOffline.vue b/src/views/overview/overviewBdOffline.vue
index b1b398d..0a4d0aa 100644
--- a/src/views/overview/overviewBdOffline.vue
+++ b/src/views/overview/overviewBdOffline.vue
@@ -17,7 +17,7 @@
             </el-select>
           </el-form-item>
           <el-form-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" placeholder="选择派出所"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
           <el-form-item style="margin-left:10px">
@@ -92,7 +92,7 @@
             <div class="info-body">
               <div>闸井类型：{{ wellInfo.wellTypeName }}</div>
               <div>井深：{{ wellInfo.deep }}(m)</div>
-              <div>权属单位：{{ wellInfo.deptName }}</div>
+              <div>派出所：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
           </div>
@@ -108,7 +108,7 @@
               </div>
               <el-divider/>
               <div>井深：{{ alarmInfo.deep }}(m)</div>
-              <div>权属单位：{{ alarmInfo.deptName }}</div>
+              <div>派出所：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
           </div>
@@ -185,6 +185,7 @@
         '4': 'static/BMap/images/well-heat.svg',
         '5': 'static/BMap/images/well-power.svg'
       }, // 井类型图标字典
+      commonIcon: 'static/BMap/images/well-common.svg',
       center: { lng: 116.4, lat: 39.9 }, // 地图中心
       zoom: 14, // 地图缩放比例
       markers: [], // 井列表标注marker
@@ -354,7 +355,8 @@
                   wellType: well.wellType,
                   deptid: well.deptid,
                   bfzt: well.bfzt,
-                  icon: this.icons[well.wellType],
+                  // icon: this.icons[well.wellType],
+                  icon: this.commonIcon,
                   visible: true,
                   wellStatus: 'alarm'
                 })
@@ -378,7 +380,8 @@
                   wellType: well.wellType,
                   deptid: well.deptid,
                   bfzt: well.bfzt,
-                  icon: this.icons[well.wellType],
+                  // icon: this.icons[well.wellType],
+                  icon: this.commonIcon,
                   visible: true,
                   wellStatus: 'normal'
                 })
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 3843939..e8487f7 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -26,13 +26,18 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="权属单位" prop="deptid">
-            <dept-select v-model="wellForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择权属单位"/>
+          <el-form-item label="所属派出所" prop="deptid">
+            <dept-select v-model="wellForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择所属派出所"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
+          <el-form-item label="产权单位">
+            <el-input v-model.trim="wellForm.owner" type="text" placeholder="非必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="9" :offset="3">
           <el-form-item label="井深(m)" prop="deep">
             <el-input v-model.trim="wellForm.deep" type="text" placeholder="必填"/>
           </el-form-item>
@@ -118,7 +123,7 @@
       <el-row :gutter="20">
         <el-col :span="9">
           <el-form-item label="闸井维护机构" prop="responsibleDept">
-            <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为权属单位" clearable>
+            <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为所属派出所" clearable>
               <el-option
                 v-for="item in secondDeptTreeList"
                 :key="item.id"
@@ -203,16 +208,17 @@
         wellCode: '', // 闸井编号
         wellName: '', // 闸井名称
         wellType: '', // 闸井类型
-        deptid: '', // 权属单位
+        deptid: '', // 所属派出所
         deep: '', // 井深，
         position: '', // 位置描述
         coordinateX: '', // 经度
         coordinateY: '', // 纬度
         photos: '', // 照片路径
         notes: '', // 备注,
-        qu: '',
+        qu: '', // 区
         area: '', // 街道
-        responsibleDept: '' // 维护人员部门
+        responsibleDept: '', // 维护人员部门
+        owner: '' // 产权单位
       }, // 表单
       deptProps: {
         parent: 'pid',
@@ -249,7 +255,7 @@
       dialogVisible: false,
       labelPosition: 'right',
       responseAssignShow: false,
-      deptShowTop: false, // 权属单位下拉是否显示顶级
+      deptShowTop: false, // 所属派出所下拉是否显示顶级
       deptShow: true
     }
   },
@@ -272,7 +278,7 @@
         return false
       }
     },
-    firstDept() { // 获取权属单位
+    firstDept() { // 获取所属派出所
       return this.wellForm.deptid
     },
     qu() { // 获取区
@@ -280,7 +286,7 @@
     }
   },
   watch: {
-    firstDept(val) { // 监控权属单位变化
+    firstDept(val) { // 监控所属派出所变化
       if (val !== '') {
         debugger
         this.wellForm.qu = ''
@@ -372,7 +378,7 @@
         wellCode: '', // 闸井编号
         wellName: '', // 闸井名称
         wellType: '', // 闸井类型
-        deptid: '', // 权属单位
+        deptid: '', // 所属派出所
         deep: '', // 井深，
         position: '', // 位置描述
         coordinateX: '', // 经度
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 44b0f9a..470f51d 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -21,7 +21,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
-            <el-form-item label="权属单位" prop="deptid">
+            <el-form-item label="所属派出所" prop="deptid">
               <el-input v-model="wellForm.deptName" type="text" placeholder="未知" disabled/>
             </el-form-item>
           </el-col>
@@ -78,8 +78,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="1">
-
+        <el-row v-show="false" :gutter="1">
           <el-form-item label="所在区域" required>
             <el-col :span="5">
               <el-form-item prop="qu">
@@ -117,8 +116,8 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="闸井维护人员" prop="responsibleDept">
-              <el-input v-model="wellForm.responsibleDeptName" type="text" placeholder="未知" disabled/>
+            <el-form-item label="产权单位">
+              <el-input v-model="wellForm.owner" type="text" placeholder="未知" disabled/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -163,8 +162,8 @@
         wellName: '', // 闸井名称
         wellType: '', // 闸井类型
         wellTypeName: '', // 闸井类型名称
-        deptid: '', // 权属单位
-        deptName: '', // 权属单位名称
+        deptid: '', // 所属派出所
+        deptName: '', // 所属派出所名称
         bfztName: '', // 布防状态
         deep: '', // 井深，
         position: '', // 位置描述
@@ -175,7 +174,8 @@
         qu: '',
         area: '', // 街道
         responsibleDept: '', // 维护人员部门
-        responsibleDeptName: '' // 维护人员部门名称
+        responsibleDeptName: '', // 维护人员部门名称
+        owner: '' // 产权单位
       }, // 表单
       deptProps: {
         parent: 'pid',
@@ -243,8 +243,8 @@
         wellType: row.wellType, // 闸井类型
         wellTypeName: row.wellTypeName, // 闸井类型
         bfztName: row.bfztName,
-        deptid: row.deptid, // 权属单位
-        deptName: row.deptName, // 权属单位
+        deptid: row.deptid, // 所属派出所
+        deptName: row.deptName, // 所属派出所
         deep: row.deep, // 井深，
         position: row.position, // 位置描述
         coordinateX: row.coordinateX, // 经度
@@ -254,7 +254,8 @@
         qu: row.qu,
         area: row.area, // 街道
         responsibleDept: row.responsibleDept, // 维护人员部门
-        responsibleDeptName: row.responsibleDeptName // 维护人员部门
+        responsibleDeptName: row.responsibleDeptName, // 维护人员部门
+        owner: row.owner
       }
       if (row.deptid && row.deptid !== '') {
         this.fetchArea1()

diff --git a/config/dev.env.js b/config/dev.env.js
index b193360..9f671cf 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -7,9 +7,9 @@
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
+  // BASE_API: '"http://106.74.146.218:2031"'
+  // BASE_API: '"http://192.168.0.212:14537"'
   BASE_API: '"http://119.254.103.80:14537"'
-  // BASE_API: '"http://192.168.0.225:14537"'
-  // BASE_API: '"http://119.254.103.80:14536"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index d2d48be..488d501 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://119.254.103.80:14537"',
+  // BASE_API: '"http://119.254.103.80:14537"',
+  BASE_API: '"http://127.0.0.1:8083"'
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 32b0b59..30ecec9 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -85,7 +85,7 @@
           checkCell: true
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index bf896d5..4a3be6d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -135,7 +135,7 @@
           class: 'warning'
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 545db9d..7a0e35f 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/statics/alarmsByDept')" label="按权属单位" name="byDept">
+      <el-tab-pane v-if="hasPerm('/statics/alarmsByDept')" label="按派出所" name="byDept">
         <alarm-statics-by-dept ref="bydept"/>
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/statics/alarmsByArea')" label="按区域" name="byArea">
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4f841c8..4b9b221 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -29,7 +29,6 @@
         <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('/welldata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
-
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
@@ -102,7 +101,7 @@
           checkState: true
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 0020bf4..1e3eb1c 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -103,7 +103,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="20">
-        <el-col :span="14">
+        <el-col :span="9">
           <el-form-item label="工单动态">
             <el-steps :active="activeStep">
               <el-step
@@ -153,6 +153,7 @@
         firstStatePhotos: '', // 现场情况图片
         handleMessage: '', // 维护情况描述
         handleStatePhotos: '', // 维护图片
+        createTime: '', // 创建工单时间
         getJobPerson: '', // 接单人员名称
         getJobTime: '', // 接单时间
         confirmJobPerson: '', // 确认人员名称
@@ -219,36 +220,45 @@
             this.handleImageList = []
           }
           // 处理工单动态
-          // 若有人接单，状态改为已接单
-          if (job.getJobTime) {
+          // 显示创建工单时间
+          if (job.createTime) {
             const activity = {
-              content: job.getJobPerson + '已接单',
-              timestamp: job.getJobTime
+              content: '生成工单',
+              timestamp: job.createTime
             }
             this.activities.push(activity)
             this.activeStep = 1
-          } else { // 否则添加空的状态
-            const activity = {
-              content: '待处理',
-              timestamp: ''
-            }
-            this.activities.push(activity)
           }
+          // 若有人接单，状态改为已接单
+          // if (job.getJobTime) {
+          //   const activity = {
+          //     content: job.getJobPerson + '已接单',
+          //     timestamp: job.getJobTime
+          //   }
+          //   this.activities.push(activity)
+          //   this.activeStep = 1
+          // } else { // 否则添加空的状态
+          //   const activity = {
+          //     content: '待处理',
+          //     timestamp: ''
+          //   }
+          //   this.activities.push(activity)
+          // }
           // 若有人确认，状态改为已确认
-          if (job.confirmJobTime) {
-            const activity = {
-              content: job.confirmJobPerson + '已确认',
-              timestamp: job.confirmJobTime
-            }
-            this.activities.push(activity)
-            this.activeStep = 2
-          } else if (job.alarmType === '1') { // 若无人确认且为数据异常插入空的待确认
-            const activity = {
-              content: '待确认',
-              timestamp: ''
-            }
-            this.activities.push(activity)
-          }
+          // if (job.confirmJobTime) {
+          //   const activity = {
+          //     content: job.confirmJobPerson + '已确认',
+          //     timestamp: job.confirmJobTime
+          //   }
+          //   this.activities.push(activity)
+          //   this.activeStep = 2
+          // } else if (job.alarmType === '1') { // 若无人确认且为数据异常插入空的待确认
+          //   const activity = {
+          //     content: '待确认',
+          //     timestamp: ''
+          //   }
+          //   this.activities.push(activity)
+          // }
           if (job.handleJobTime) {
             // 若有处理时间，状态置为已完成
             // 若没有处理人则处理人为系统
@@ -256,17 +266,17 @@
             if (!handleJobPerson) {
               handleJobPerson = '系统'
             }
-            const activity1 = {
-              content: handleJobPerson + '处理中',
-              timestamp: job.handleJobTime
-            }
+            // const activity1 = {
+            //   content: handleJobPerson + '处理中',
+            //   timestamp: job.handleJobTime
+            // }
             const activity2 = {
               content: handleJobPerson + '已完成',
               timestamp: job.handleJobTime
             }
-            this.activities.push(activity1)
+            // this.activities.push(activity1)
             this.activities.push(activity2)
-            this.activeStep = 3
+            this.activeStep = 2
           } else if (this.jobForm.jobStatusName === '完成') {
             // 特殊情况处理:已确认之后结束的工单,将完成人和时间用确认人代替
             const activity = {
@@ -275,15 +285,15 @@
             }
             this.activities.push(activity)
           } else {
-            const activity1 = {
-              content: '处理中',
-              timestamp: ''
-            }
+            // const activity1 = {
+            //   content: '处理中',
+            //   timestamp: ''
+            // }
             const activity2 = {
               content: '已完成',
               timestamp: ''
             }
-            this.activities.push(activity1)
+            // this.activities.push(activity1)
             this.activities.push(activity2)
           }
           if (Array.isArray(job.flow) && job.flow.length > 0) {
diff --git a/src/views/overview/overviewBdOffline.vue b/src/views/overview/overviewBdOffline.vue
index b1b398d..0a4d0aa 100644
--- a/src/views/overview/overviewBdOffline.vue
+++ b/src/views/overview/overviewBdOffline.vue
@@ -17,7 +17,7 @@
             </el-select>
           </el-form-item>
           <el-form-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" placeholder="选择派出所"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
           <el-form-item style="margin-left:10px">
@@ -92,7 +92,7 @@
             <div class="info-body">
               <div>闸井类型：{{ wellInfo.wellTypeName }}</div>
               <div>井深：{{ wellInfo.deep }}(m)</div>
-              <div>权属单位：{{ wellInfo.deptName }}</div>
+              <div>派出所：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
           </div>
@@ -108,7 +108,7 @@
               </div>
               <el-divider/>
               <div>井深：{{ alarmInfo.deep }}(m)</div>
-              <div>权属单位：{{ alarmInfo.deptName }}</div>
+              <div>派出所：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
           </div>
@@ -185,6 +185,7 @@
         '4': 'static/BMap/images/well-heat.svg',
         '5': 'static/BMap/images/well-power.svg'
       }, // 井类型图标字典
+      commonIcon: 'static/BMap/images/well-common.svg',
       center: { lng: 116.4, lat: 39.9 }, // 地图中心
       zoom: 14, // 地图缩放比例
       markers: [], // 井列表标注marker
@@ -354,7 +355,8 @@
                   wellType: well.wellType,
                   deptid: well.deptid,
                   bfzt: well.bfzt,
-                  icon: this.icons[well.wellType],
+                  // icon: this.icons[well.wellType],
+                  icon: this.commonIcon,
                   visible: true,
                   wellStatus: 'alarm'
                 })
@@ -378,7 +380,8 @@
                   wellType: well.wellType,
                   deptid: well.deptid,
                   bfzt: well.bfzt,
-                  icon: this.icons[well.wellType],
+                  // icon: this.icons[well.wellType],
+                  icon: this.commonIcon,
                   visible: true,
                   wellStatus: 'normal'
                 })
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 3843939..e8487f7 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -26,13 +26,18 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="权属单位" prop="deptid">
-            <dept-select v-model="wellForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择权属单位"/>
+          <el-form-item label="所属派出所" prop="deptid">
+            <dept-select v-model="wellForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择所属派出所"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
+          <el-form-item label="产权单位">
+            <el-input v-model.trim="wellForm.owner" type="text" placeholder="非必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="9" :offset="3">
           <el-form-item label="井深(m)" prop="deep">
             <el-input v-model.trim="wellForm.deep" type="text" placeholder="必填"/>
           </el-form-item>
@@ -118,7 +123,7 @@
       <el-row :gutter="20">
         <el-col :span="9">
           <el-form-item label="闸井维护机构" prop="responsibleDept">
-            <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为权属单位" clearable>
+            <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为所属派出所" clearable>
               <el-option
                 v-for="item in secondDeptTreeList"
                 :key="item.id"
@@ -203,16 +208,17 @@
         wellCode: '', // 闸井编号
         wellName: '', // 闸井名称
         wellType: '', // 闸井类型
-        deptid: '', // 权属单位
+        deptid: '', // 所属派出所
         deep: '', // 井深，
         position: '', // 位置描述
         coordinateX: '', // 经度
         coordinateY: '', // 纬度
         photos: '', // 照片路径
         notes: '', // 备注,
-        qu: '',
+        qu: '', // 区
         area: '', // 街道
-        responsibleDept: '' // 维护人员部门
+        responsibleDept: '', // 维护人员部门
+        owner: '' // 产权单位
       }, // 表单
       deptProps: {
         parent: 'pid',
@@ -249,7 +255,7 @@
       dialogVisible: false,
       labelPosition: 'right',
       responseAssignShow: false,
-      deptShowTop: false, // 权属单位下拉是否显示顶级
+      deptShowTop: false, // 所属派出所下拉是否显示顶级
       deptShow: true
     }
   },
@@ -272,7 +278,7 @@
         return false
       }
     },
-    firstDept() { // 获取权属单位
+    firstDept() { // 获取所属派出所
       return this.wellForm.deptid
     },
     qu() { // 获取区
@@ -280,7 +286,7 @@
     }
   },
   watch: {
-    firstDept(val) { // 监控权属单位变化
+    firstDept(val) { // 监控所属派出所变化
       if (val !== '') {
         debugger
         this.wellForm.qu = ''
@@ -372,7 +378,7 @@
         wellCode: '', // 闸井编号
         wellName: '', // 闸井名称
         wellType: '', // 闸井类型
-        deptid: '', // 权属单位
+        deptid: '', // 所属派出所
         deep: '', // 井深，
         position: '', // 位置描述
         coordinateX: '', // 经度
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 44b0f9a..470f51d 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -21,7 +21,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
-            <el-form-item label="权属单位" prop="deptid">
+            <el-form-item label="所属派出所" prop="deptid">
               <el-input v-model="wellForm.deptName" type="text" placeholder="未知" disabled/>
             </el-form-item>
           </el-col>
@@ -78,8 +78,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="1">
-
+        <el-row v-show="false" :gutter="1">
           <el-form-item label="所在区域" required>
             <el-col :span="5">
               <el-form-item prop="qu">
@@ -117,8 +116,8 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="闸井维护人员" prop="responsibleDept">
-              <el-input v-model="wellForm.responsibleDeptName" type="text" placeholder="未知" disabled/>
+            <el-form-item label="产权单位">
+              <el-input v-model="wellForm.owner" type="text" placeholder="未知" disabled/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -163,8 +162,8 @@
         wellName: '', // 闸井名称
         wellType: '', // 闸井类型
         wellTypeName: '', // 闸井类型名称
-        deptid: '', // 权属单位
-        deptName: '', // 权属单位名称
+        deptid: '', // 所属派出所
+        deptName: '', // 所属派出所名称
         bfztName: '', // 布防状态
         deep: '', // 井深，
         position: '', // 位置描述
@@ -175,7 +174,8 @@
         qu: '',
         area: '', // 街道
         responsibleDept: '', // 维护人员部门
-        responsibleDeptName: '' // 维护人员部门名称
+        responsibleDeptName: '', // 维护人员部门名称
+        owner: '' // 产权单位
       }, // 表单
       deptProps: {
         parent: 'pid',
@@ -243,8 +243,8 @@
         wellType: row.wellType, // 闸井类型
         wellTypeName: row.wellTypeName, // 闸井类型
         bfztName: row.bfztName,
-        deptid: row.deptid, // 权属单位
-        deptName: row.deptName, // 权属单位
+        deptid: row.deptid, // 所属派出所
+        deptName: row.deptName, // 所属派出所
         deep: row.deep, // 井深，
         position: row.position, // 位置描述
         coordinateX: row.coordinateX, // 经度
@@ -254,7 +254,8 @@
         qu: row.qu,
         area: row.area, // 街道
         responsibleDept: row.responsibleDept, // 维护人员部门
-        responsibleDeptName: row.responsibleDeptName // 维护人员部门
+        responsibleDeptName: row.responsibleDeptName, // 维护人员部门
+        owner: row.owner
       }
       if (row.deptid && row.deptid !== '') {
         this.fetchArea1()
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index 8513d37..c9e29de 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -27,13 +27,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
-            <el-form-item label="权属单位" prop="deptid">
-              <dept-select v-model="wellForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择权属单位"/>
+            <el-form-item label="所属派出所" prop="deptid">
+              <dept-select v-model="wellForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择所属派出所"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="10">
+            <el-form-item label="产权单位">
+              <el-input v-model.trim="wellForm.owner" type="text" placeholder="非必填"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" :offset="1">
             <el-form-item label="井深(m)" prop="deep">
               <el-input v-model.trim="wellForm.deep" type="text" placeholder="必填"/>
             </el-form-item>
@@ -119,7 +124,7 @@
         <el-row :gutter="20">
           <el-col :span="13">
             <el-form-item label="闸井维护机构" prop="responsibleDept">
-              <el-select v-if="secondDeptTreeList.length>=1" v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为权属单位" clearable>
+              <el-select v-if="secondDeptTreeList.length>=1" v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为所属派出所" clearable>
                 <el-option
                   v-for="item in secondDeptTreeList"
                   :key="item.id"
@@ -210,7 +215,7 @@
         wellCode: '', // 闸井编号
         wellName: '', // 闸井名称
         wellType: '', // 闸井类型
-        deptid: '', // 权属单位
+        deptid: '', // 所属派出所
         deep: '', // 井深，
         position: '', // 位置描述
         coordinateX: '', // 经度
@@ -220,6 +225,7 @@
         qu: '',
         area: '', // 街道
         responsibleDept: '', // 维护人员部门
+        owner: '', // 产权的单位
         responsibleDeptName: '' // 维护人员部门
       }, // 表单
       deptProps: {
@@ -245,12 +251,12 @@
         deep: [{ required: true, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
-        deptid: [{ required: true, message: '权属单位必选', trigger: 'change' }],
+        deptid: [{ required: true, message: '所属派出所必选', trigger: 'change' }],
         wellType: [{ required: true, message: '闸井类型必选', trigger: 'change' }],
         qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
-      deptShowTop: false, // 权属单位下拉是否显示顶级
+      deptShowTop: false, // 所属派出所下拉是否显示顶级
       dialogImageUrl: '',
       dialogVisible: false,
       labelPosition: 'right',
@@ -267,7 +273,7 @@
         return false
       }
     },
-    firstDept() { // 获取权属单位
+    firstDept() { // 获取所属派出所
       return this.wellForm.deptid
     },
     qu() { // 获取区
@@ -275,7 +281,7 @@
     }
   },
   watch: {
-    firstDept(val) { // 监控权属单位变化
+    firstDept(val) { // 监控所属派出所变化
       if (val !== '') {
         this.wellForm.responsibleDept = ''
         this.fetchSecondDeptTree()
@@ -304,7 +310,7 @@
         wellCode: row.wellCode, // 闸井编号
         wellName: row.wellName, // 闸井名称
         wellType: row.wellType, // 闸井类型
-        deptid: row.deptid, // 权属单位
+        deptid: row.deptid, // 所属派出所
         deep: row.deep, // 井深，
         position: row.position, // 位置描述
         coordinateX: row.coordinateX, // 经度

diff --git a/config/dev.env.js b/config/dev.env.js
index b193360..9f671cf 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -7,9 +7,9 @@
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
+  // BASE_API: '"http://106.74.146.218:2031"'
+  // BASE_API: '"http://192.168.0.212:14537"'
   BASE_API: '"http://119.254.103.80:14537"'
-  // BASE_API: '"http://192.168.0.225:14537"'
-  // BASE_API: '"http://119.254.103.80:14536"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index d2d48be..488d501 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://119.254.103.80:14537"',
+  // BASE_API: '"http://119.254.103.80:14537"',
+  BASE_API: '"http://127.0.0.1:8083"'
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 32b0b59..30ecec9 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -85,7 +85,7 @@
           checkCell: true
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index bf896d5..4a3be6d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -135,7 +135,7 @@
           class: 'warning'
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 545db9d..7a0e35f 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/statics/alarmsByDept')" label="按权属单位" name="byDept">
+      <el-tab-pane v-if="hasPerm('/statics/alarmsByDept')" label="按派出所" name="byDept">
         <alarm-statics-by-dept ref="bydept"/>
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/statics/alarmsByArea')" label="按区域" name="byArea">
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4f841c8..4b9b221 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -29,7 +29,6 @@
         <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('/welldata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
-
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
@@ -102,7 +101,7 @@
           checkState: true
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 0020bf4..1e3eb1c 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -103,7 +103,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="20">
-        <el-col :span="14">
+        <el-col :span="9">
           <el-form-item label="工单动态">
             <el-steps :active="activeStep">
               <el-step
@@ -153,6 +153,7 @@
         firstStatePhotos: '', // 现场情况图片
         handleMessage: '', // 维护情况描述
         handleStatePhotos: '', // 维护图片
+        createTime: '', // 创建工单时间
         getJobPerson: '', // 接单人员名称
         getJobTime: '', // 接单时间
         confirmJobPerson: '', // 确认人员名称
@@ -219,36 +220,45 @@
             this.handleImageList = []
           }
           // 处理工单动态
-          // 若有人接单，状态改为已接单
-          if (job.getJobTime) {
+          // 显示创建工单时间
+          if (job.createTime) {
             const activity = {
-              content: job.getJobPerson + '已接单',
-              timestamp: job.getJobTime
+              content: '生成工单',
+              timestamp: job.createTime
             }
             this.activities.push(activity)
             this.activeStep = 1
-          } else { // 否则添加空的状态
-            const activity = {
-              content: '待处理',
-              timestamp: ''
-            }
-            this.activities.push(activity)
           }
+          // 若有人接单，状态改为已接单
+          // if (job.getJobTime) {
+          //   const activity = {
+          //     content: job.getJobPerson + '已接单',
+          //     timestamp: job.getJobTime
+          //   }
+          //   this.activities.push(activity)
+          //   this.activeStep = 1
+          // } else { // 否则添加空的状态
+          //   const activity = {
+          //     content: '待处理',
+          //     timestamp: ''
+          //   }
+          //   this.activities.push(activity)
+          // }
           // 若有人确认，状态改为已确认
-          if (job.confirmJobTime) {
-            const activity = {
-              content: job.confirmJobPerson + '已确认',
-              timestamp: job.confirmJobTime
-            }
-            this.activities.push(activity)
-            this.activeStep = 2
-          } else if (job.alarmType === '1') { // 若无人确认且为数据异常插入空的待确认
-            const activity = {
-              content: '待确认',
-              timestamp: ''
-            }
-            this.activities.push(activity)
-          }
+          // if (job.confirmJobTime) {
+          //   const activity = {
+          //     content: job.confirmJobPerson + '已确认',
+          //     timestamp: job.confirmJobTime
+          //   }
+          //   this.activities.push(activity)
+          //   this.activeStep = 2
+          // } else if (job.alarmType === '1') { // 若无人确认且为数据异常插入空的待确认
+          //   const activity = {
+          //     content: '待确认',
+          //     timestamp: ''
+          //   }
+          //   this.activities.push(activity)
+          // }
           if (job.handleJobTime) {
             // 若有处理时间，状态置为已完成
             // 若没有处理人则处理人为系统
@@ -256,17 +266,17 @@
             if (!handleJobPerson) {
               handleJobPerson = '系统'
             }
-            const activity1 = {
-              content: handleJobPerson + '处理中',
-              timestamp: job.handleJobTime
-            }
+            // const activity1 = {
+            //   content: handleJobPerson + '处理中',
+            //   timestamp: job.handleJobTime
+            // }
             const activity2 = {
               content: handleJobPerson + '已完成',
               timestamp: job.handleJobTime
             }
-            this.activities.push(activity1)
+            // this.activities.push(activity1)
             this.activities.push(activity2)
-            this.activeStep = 3
+            this.activeStep = 2
           } else if (this.jobForm.jobStatusName === '完成') {
             // 特殊情况处理:已确认之后结束的工单,将完成人和时间用确认人代替
             const activity = {
@@ -275,15 +285,15 @@
             }
             this.activities.push(activity)
           } else {
-            const activity1 = {
-              content: '处理中',
-              timestamp: ''
-            }
+            // const activity1 = {
+            //   content: '处理中',
+            //   timestamp: ''
+            // }
             const activity2 = {
               content: '已完成',
               timestamp: ''
             }
-            this.activities.push(activity1)
+            // this.activities.push(activity1)
             this.activities.push(activity2)
           }
           if (Array.isArray(job.flow) && job.flow.length > 0) {
diff --git a/src/views/overview/overviewBdOffline.vue b/src/views/overview/overviewBdOffline.vue
index b1b398d..0a4d0aa 100644
--- a/src/views/overview/overviewBdOffline.vue
+++ b/src/views/overview/overviewBdOffline.vue
@@ -17,7 +17,7 @@
             </el-select>
           </el-form-item>
           <el-form-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" placeholder="选择派出所"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
           <el-form-item style="margin-left:10px">
@@ -92,7 +92,7 @@
             <div class="info-body">
               <div>闸井类型：{{ wellInfo.wellTypeName }}</div>
               <div>井深：{{ wellInfo.deep }}(m)</div>
-              <div>权属单位：{{ wellInfo.deptName }}</div>
+              <div>派出所：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
           </div>
@@ -108,7 +108,7 @@
               </div>
               <el-divider/>
               <div>井深：{{ alarmInfo.deep }}(m)</div>
-              <div>权属单位：{{ alarmInfo.deptName }}</div>
+              <div>派出所：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
           </div>
@@ -185,6 +185,7 @@
         '4': 'static/BMap/images/well-heat.svg',
         '5': 'static/BMap/images/well-power.svg'
       }, // 井类型图标字典
+      commonIcon: 'static/BMap/images/well-common.svg',
       center: { lng: 116.4, lat: 39.9 }, // 地图中心
       zoom: 14, // 地图缩放比例
       markers: [], // 井列表标注marker
@@ -354,7 +355,8 @@
                   wellType: well.wellType,
                   deptid: well.deptid,
                   bfzt: well.bfzt,
-                  icon: this.icons[well.wellType],
+                  // icon: this.icons[well.wellType],
+                  icon: this.commonIcon,
                   visible: true,
                   wellStatus: 'alarm'
                 })
@@ -378,7 +380,8 @@
                   wellType: well.wellType,
                   deptid: well.deptid,
                   bfzt: well.bfzt,
-                  icon: this.icons[well.wellType],
+                  // icon: this.icons[well.wellType],
+                  icon: this.commonIcon,
                   visible: true,
                   wellStatus: 'normal'
                 })
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 3843939..e8487f7 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -26,13 +26,18 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="权属单位" prop="deptid">
-            <dept-select v-model="wellForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择权属单位"/>
+          <el-form-item label="所属派出所" prop="deptid">
+            <dept-select v-model="wellForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择所属派出所"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
+          <el-form-item label="产权单位">
+            <el-input v-model.trim="wellForm.owner" type="text" placeholder="非必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="9" :offset="3">
           <el-form-item label="井深(m)" prop="deep">
             <el-input v-model.trim="wellForm.deep" type="text" placeholder="必填"/>
           </el-form-item>
@@ -118,7 +123,7 @@
       <el-row :gutter="20">
         <el-col :span="9">
           <el-form-item label="闸井维护机构" prop="responsibleDept">
-            <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为权属单位" clearable>
+            <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为所属派出所" clearable>
               <el-option
                 v-for="item in secondDeptTreeList"
                 :key="item.id"
@@ -203,16 +208,17 @@
         wellCode: '', // 闸井编号
         wellName: '', // 闸井名称
         wellType: '', // 闸井类型
-        deptid: '', // 权属单位
+        deptid: '', // 所属派出所
         deep: '', // 井深，
         position: '', // 位置描述
         coordinateX: '', // 经度
         coordinateY: '', // 纬度
         photos: '', // 照片路径
         notes: '', // 备注,
-        qu: '',
+        qu: '', // 区
         area: '', // 街道
-        responsibleDept: '' // 维护人员部门
+        responsibleDept: '', // 维护人员部门
+        owner: '' // 产权单位
       }, // 表单
       deptProps: {
         parent: 'pid',
@@ -249,7 +255,7 @@
       dialogVisible: false,
       labelPosition: 'right',
       responseAssignShow: false,
-      deptShowTop: false, // 权属单位下拉是否显示顶级
+      deptShowTop: false, // 所属派出所下拉是否显示顶级
       deptShow: true
     }
   },
@@ -272,7 +278,7 @@
         return false
       }
     },
-    firstDept() { // 获取权属单位
+    firstDept() { // 获取所属派出所
       return this.wellForm.deptid
     },
     qu() { // 获取区
@@ -280,7 +286,7 @@
     }
   },
   watch: {
-    firstDept(val) { // 监控权属单位变化
+    firstDept(val) { // 监控所属派出所变化
       if (val !== '') {
         debugger
         this.wellForm.qu = ''
@@ -372,7 +378,7 @@
         wellCode: '', // 闸井编号
         wellName: '', // 闸井名称
         wellType: '', // 闸井类型
-        deptid: '', // 权属单位
+        deptid: '', // 所属派出所
         deep: '', // 井深，
         position: '', // 位置描述
         coordinateX: '', // 经度
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 44b0f9a..470f51d 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -21,7 +21,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
-            <el-form-item label="权属单位" prop="deptid">
+            <el-form-item label="所属派出所" prop="deptid">
               <el-input v-model="wellForm.deptName" type="text" placeholder="未知" disabled/>
             </el-form-item>
           </el-col>
@@ -78,8 +78,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="1">
-
+        <el-row v-show="false" :gutter="1">
           <el-form-item label="所在区域" required>
             <el-col :span="5">
               <el-form-item prop="qu">
@@ -117,8 +116,8 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="闸井维护人员" prop="responsibleDept">
-              <el-input v-model="wellForm.responsibleDeptName" type="text" placeholder="未知" disabled/>
+            <el-form-item label="产权单位">
+              <el-input v-model="wellForm.owner" type="text" placeholder="未知" disabled/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -163,8 +162,8 @@
         wellName: '', // 闸井名称
         wellType: '', // 闸井类型
         wellTypeName: '', // 闸井类型名称
-        deptid: '', // 权属单位
-        deptName: '', // 权属单位名称
+        deptid: '', // 所属派出所
+        deptName: '', // 所属派出所名称
         bfztName: '', // 布防状态
         deep: '', // 井深，
         position: '', // 位置描述
@@ -175,7 +174,8 @@
         qu: '',
         area: '', // 街道
         responsibleDept: '', // 维护人员部门
-        responsibleDeptName: '' // 维护人员部门名称
+        responsibleDeptName: '', // 维护人员部门名称
+        owner: '' // 产权单位
       }, // 表单
       deptProps: {
         parent: 'pid',
@@ -243,8 +243,8 @@
         wellType: row.wellType, // 闸井类型
         wellTypeName: row.wellTypeName, // 闸井类型
         bfztName: row.bfztName,
-        deptid: row.deptid, // 权属单位
-        deptName: row.deptName, // 权属单位
+        deptid: row.deptid, // 所属派出所
+        deptName: row.deptName, // 所属派出所
         deep: row.deep, // 井深，
         position: row.position, // 位置描述
         coordinateX: row.coordinateX, // 经度
@@ -254,7 +254,8 @@
         qu: row.qu,
         area: row.area, // 街道
         responsibleDept: row.responsibleDept, // 维护人员部门
-        responsibleDeptName: row.responsibleDeptName // 维护人员部门
+        responsibleDeptName: row.responsibleDeptName, // 维护人员部门
+        owner: row.owner
       }
       if (row.deptid && row.deptid !== '') {
         this.fetchArea1()
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index 8513d37..c9e29de 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -27,13 +27,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
-            <el-form-item label="权属单位" prop="deptid">
-              <dept-select v-model="wellForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择权属单位"/>
+            <el-form-item label="所属派出所" prop="deptid">
+              <dept-select v-model="wellForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择所属派出所"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="10">
+            <el-form-item label="产权单位">
+              <el-input v-model.trim="wellForm.owner" type="text" placeholder="非必填"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" :offset="1">
             <el-form-item label="井深(m)" prop="deep">
               <el-input v-model.trim="wellForm.deep" type="text" placeholder="必填"/>
             </el-form-item>
@@ -119,7 +124,7 @@
         <el-row :gutter="20">
           <el-col :span="13">
             <el-form-item label="闸井维护机构" prop="responsibleDept">
-              <el-select v-if="secondDeptTreeList.length>=1" v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为权属单位" clearable>
+              <el-select v-if="secondDeptTreeList.length>=1" v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为所属派出所" clearable>
                 <el-option
                   v-for="item in secondDeptTreeList"
                   :key="item.id"
@@ -210,7 +215,7 @@
         wellCode: '', // 闸井编号
         wellName: '', // 闸井名称
         wellType: '', // 闸井类型
-        deptid: '', // 权属单位
+        deptid: '', // 所属派出所
         deep: '', // 井深，
         position: '', // 位置描述
         coordinateX: '', // 经度
@@ -220,6 +225,7 @@
         qu: '',
         area: '', // 街道
         responsibleDept: '', // 维护人员部门
+        owner: '', // 产权的单位
         responsibleDeptName: '' // 维护人员部门
       }, // 表单
       deptProps: {
@@ -245,12 +251,12 @@
         deep: [{ required: true, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
-        deptid: [{ required: true, message: '权属单位必选', trigger: 'change' }],
+        deptid: [{ required: true, message: '所属派出所必选', trigger: 'change' }],
         wellType: [{ required: true, message: '闸井类型必选', trigger: 'change' }],
         qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
-      deptShowTop: false, // 权属单位下拉是否显示顶级
+      deptShowTop: false, // 所属派出所下拉是否显示顶级
       dialogImageUrl: '',
       dialogVisible: false,
       labelPosition: 'right',
@@ -267,7 +273,7 @@
         return false
       }
     },
-    firstDept() { // 获取权属单位
+    firstDept() { // 获取所属派出所
       return this.wellForm.deptid
     },
     qu() { // 获取区
@@ -275,7 +281,7 @@
     }
   },
   watch: {
-    firstDept(val) { // 监控权属单位变化
+    firstDept(val) { // 监控所属派出所变化
       if (val !== '') {
         this.wellForm.responsibleDept = ''
         this.fetchSecondDeptTree()
@@ -304,7 +310,7 @@
         wellCode: row.wellCode, // 闸井编号
         wellName: row.wellName, // 闸井名称
         wellType: row.wellType, // 闸井类型
-        deptid: row.deptid, // 权属单位
+        deptid: row.deptid, // 所属派出所
         deep: row.deep, // 井深，
         position: row.position, // 位置描述
         coordinateX: row.coordinateX, // 经度
diff --git a/src/views/wellManage/infoWellBdOffline.vue b/src/views/wellManage/infoWellBdOffline.vue
index d39d8f7..ea66437 100644
--- a/src/views/wellManage/infoWellBdOffline.vue
+++ b/src/views/wellManage/infoWellBdOffline.vue
@@ -21,7 +21,7 @@
         </el-row>
         <el-row>
           <el-col :span="7">
-            <el-form-item label="权属单位" prop="deptid">
+            <el-form-item label="所属派出所" prop="deptid">
               <el-input v-model="wellForm.deptName" type="text" placeholder="未知" disabled/>
             </el-form-item>
           </el-col>
@@ -36,7 +36,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="1">
+        <el-row v-show="false" :gutter="1">
           <el-form-item label="所在区域" required>
             <el-col :span="4">
               <el-select v-model="wellForm.qu" placeholder="未知" disabled>
@@ -62,11 +62,16 @@
 
         </el-row>
         <el-row>
-          <el-col :span="15">
+          <el-col :span="14">
             <el-form-item label="详细地址" prop="position">
               <el-input v-model="wellForm.position" type="text" placeholder="未知" disabled/>
             </el-form-item>
           </el-col>
+          <el-col :span="7">
+            <el-form-item label="产权单位">
+              <el-input v-model="wellForm.owner" type="text" placeholder="未知" disabled/>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div class="watch-div">
@@ -106,8 +111,8 @@
         wellName: '', // 闸井名称
         wellType: '', // 闸井类型
         wellTypeName: '', // 闸井类型名称
-        deptid: '', // 权属单位
-        deptName: '', // 权属单位名称
+        deptid: '', // 所属派出所
+        deptName: '', // 所属派出所名称
         bfztName: '', // 布防状态
         deep: '', // 井深，
         position: '', // 位置描述
@@ -121,7 +126,8 @@
         notes: '', // 备注,
         qu: '',
         area: '', // 街道
-        responsibleDept: '' // 维护人员部门
+        responsibleDept: '', // 维护人员部门
+        owner: '' // 产权单位
       }, // 表单
       center: { lng: 121.59996, lat: 31.197646 },
       zoom: 16,
@@ -161,8 +167,8 @@
           wellName: row.wellName, // 闸井名称
           wellType: row.wellType, // 闸井类型
           wellTypeName: row.wellTypeName, // 闸井类型
-          deptid: row.deptid, // 权属单位
-          deptName: row.deptName, // 权属单位
+          deptid: row.deptid, // 所属派出所
+          deptName: row.deptName, // 所属派出所
           deep: row.deep, // 井深，
           bfztName: row.bfztName, // 布防状态
           position: row.position, // 位置描述
@@ -176,7 +182,8 @@
           lngGaode: row.lngGaode,
           qu: row.qu,
           area: row.area, // 街道
-          responsibleDept: row.responsibleDept // 维护人员部门
+          responsibleDept: row.responsibleDept, // 维护人员部门
+          owner: row.owner
         }
         this.center = { lng: row.lngBaidu, lat: row.latBaidu }
         this.marker = {

diff --git a/config/dev.env.js b/config/dev.env.js
index b193360..9f671cf 100644
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -7,9 +7,9 @@
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
   // BASE_API: '"http://rest.apizza.net/mock/cfbb939c147bb6d68372de83af189fee/"',
+  // BASE_API: '"http://106.74.146.218:2031"'
+  // BASE_API: '"http://192.168.0.212:14537"'
   BASE_API: '"http://119.254.103.80:14537"'
-  // BASE_API: '"http://192.168.0.225:14537"'
-  // BASE_API: '"http://119.254.103.80:14536"'
   // BASE_API: '"http://192.168.0.225:8083"'
   // BASE_API: '"http://127.0.0.1:8083"'
 })
diff --git a/config/prod.env.js b/config/prod.env.js
index d2d48be..488d501 100644
--- a/config/prod.env.js
+++ b/config/prod.env.js
@@ -1,5 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://119.254.103.80:14537"',
+  // BASE_API: '"http://119.254.103.80:14537"',
+  BASE_API: '"http://127.0.0.1:8083"'
 }
diff --git a/src/views/alarmManage/listAlarmNow.vue b/src/views/alarmManage/listAlarmNow.vue
index 32b0b59..30ecec9 100644
--- a/src/views/alarmManage/listAlarmNow.vue
+++ b/src/views/alarmManage/listAlarmNow.vue
@@ -85,7 +85,7 @@
           checkCell: true
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/alarmManage/listAlarmRecords.vue b/src/views/alarmManage/listAlarmRecords.vue
index bf896d5..4a3be6d 100644
--- a/src/views/alarmManage/listAlarmRecords.vue
+++ b/src/views/alarmManage/listAlarmRecords.vue
@@ -135,7 +135,7 @@
           class: 'warning'
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 545db9d..7a0e35f 100644
--- a/src/views/alarmStatics/alarmStatics.vue
+++ b/src/views/alarmStatics/alarmStatics.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="container">
     <el-tabs v-model="activeName" type="card" @tab-click="handleClick">
-      <el-tab-pane v-if="hasPerm('/statics/alarmsByDept')" label="按权属单位" name="byDept">
+      <el-tab-pane v-if="hasPerm('/statics/alarmsByDept')" label="按派出所" name="byDept">
         <alarm-statics-by-dept ref="bydept"/>
       </el-tab-pane>
       <el-tab-pane v-if="hasPerm('/statics/alarmsByArea')" label="按区域" name="byArea">
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4f841c8..4b9b221 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -29,7 +29,6 @@
         <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('/welldata/export')" class="edit_btn" size="small" @click="batchExport">导出记录</el-button>
-
         </el-col>
       </el-row>
       <el-table v-loading="listLoading" :data="list" class="table" border @selection-change="handleSelectionChange">
@@ -102,7 +101,7 @@
           checkState: true
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 0020bf4..1e3eb1c 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -103,7 +103,7 @@
         </el-col>
       </el-row>
       <el-row :gutter="20">
-        <el-col :span="14">
+        <el-col :span="9">
           <el-form-item label="工单动态">
             <el-steps :active="activeStep">
               <el-step
@@ -153,6 +153,7 @@
         firstStatePhotos: '', // 现场情况图片
         handleMessage: '', // 维护情况描述
         handleStatePhotos: '', // 维护图片
+        createTime: '', // 创建工单时间
         getJobPerson: '', // 接单人员名称
         getJobTime: '', // 接单时间
         confirmJobPerson: '', // 确认人员名称
@@ -219,36 +220,45 @@
             this.handleImageList = []
           }
           // 处理工单动态
-          // 若有人接单，状态改为已接单
-          if (job.getJobTime) {
+          // 显示创建工单时间
+          if (job.createTime) {
             const activity = {
-              content: job.getJobPerson + '已接单',
-              timestamp: job.getJobTime
+              content: '生成工单',
+              timestamp: job.createTime
             }
             this.activities.push(activity)
             this.activeStep = 1
-          } else { // 否则添加空的状态
-            const activity = {
-              content: '待处理',
-              timestamp: ''
-            }
-            this.activities.push(activity)
           }
+          // 若有人接单，状态改为已接单
+          // if (job.getJobTime) {
+          //   const activity = {
+          //     content: job.getJobPerson + '已接单',
+          //     timestamp: job.getJobTime
+          //   }
+          //   this.activities.push(activity)
+          //   this.activeStep = 1
+          // } else { // 否则添加空的状态
+          //   const activity = {
+          //     content: '待处理',
+          //     timestamp: ''
+          //   }
+          //   this.activities.push(activity)
+          // }
           // 若有人确认，状态改为已确认
-          if (job.confirmJobTime) {
-            const activity = {
-              content: job.confirmJobPerson + '已确认',
-              timestamp: job.confirmJobTime
-            }
-            this.activities.push(activity)
-            this.activeStep = 2
-          } else if (job.alarmType === '1') { // 若无人确认且为数据异常插入空的待确认
-            const activity = {
-              content: '待确认',
-              timestamp: ''
-            }
-            this.activities.push(activity)
-          }
+          // if (job.confirmJobTime) {
+          //   const activity = {
+          //     content: job.confirmJobPerson + '已确认',
+          //     timestamp: job.confirmJobTime
+          //   }
+          //   this.activities.push(activity)
+          //   this.activeStep = 2
+          // } else if (job.alarmType === '1') { // 若无人确认且为数据异常插入空的待确认
+          //   const activity = {
+          //     content: '待确认',
+          //     timestamp: ''
+          //   }
+          //   this.activities.push(activity)
+          // }
           if (job.handleJobTime) {
             // 若有处理时间，状态置为已完成
             // 若没有处理人则处理人为系统
@@ -256,17 +266,17 @@
             if (!handleJobPerson) {
               handleJobPerson = '系统'
             }
-            const activity1 = {
-              content: handleJobPerson + '处理中',
-              timestamp: job.handleJobTime
-            }
+            // const activity1 = {
+            //   content: handleJobPerson + '处理中',
+            //   timestamp: job.handleJobTime
+            // }
             const activity2 = {
               content: handleJobPerson + '已完成',
               timestamp: job.handleJobTime
             }
-            this.activities.push(activity1)
+            // this.activities.push(activity1)
             this.activities.push(activity2)
-            this.activeStep = 3
+            this.activeStep = 2
           } else if (this.jobForm.jobStatusName === '完成') {
             // 特殊情况处理:已确认之后结束的工单,将完成人和时间用确认人代替
             const activity = {
@@ -275,15 +285,15 @@
             }
             this.activities.push(activity)
           } else {
-            const activity1 = {
-              content: '处理中',
-              timestamp: ''
-            }
+            // const activity1 = {
+            //   content: '处理中',
+            //   timestamp: ''
+            // }
             const activity2 = {
               content: '已完成',
               timestamp: ''
             }
-            this.activities.push(activity1)
+            // this.activities.push(activity1)
             this.activities.push(activity2)
           }
           if (Array.isArray(job.flow) && job.flow.length > 0) {
diff --git a/src/views/overview/overviewBdOffline.vue b/src/views/overview/overviewBdOffline.vue
index b1b398d..0a4d0aa 100644
--- a/src/views/overview/overviewBdOffline.vue
+++ b/src/views/overview/overviewBdOffline.vue
@@ -17,7 +17,7 @@
             </el-select>
           </el-form-item>
           <el-form-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" placeholder="选择派出所"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
           <el-form-item style="margin-left:10px">
@@ -92,7 +92,7 @@
             <div class="info-body">
               <div>闸井类型：{{ wellInfo.wellTypeName }}</div>
               <div>井深：{{ wellInfo.deep }}(m)</div>
-              <div>权属单位：{{ wellInfo.deptName }}</div>
+              <div>派出所：{{ wellInfo.deptName }}</div>
               <div>详细地址：{{ wellInfo.position }}</div>
             </div>
           </div>
@@ -108,7 +108,7 @@
               </div>
               <el-divider/>
               <div>井深：{{ alarmInfo.deep }}(m)</div>
-              <div>权属单位：{{ alarmInfo.deptName }}</div>
+              <div>派出所：{{ alarmInfo.deptName }}</div>
               <div>详细地址：{{ alarmInfo.position }}</div>
             </div>
           </div>
@@ -185,6 +185,7 @@
         '4': 'static/BMap/images/well-heat.svg',
         '5': 'static/BMap/images/well-power.svg'
       }, // 井类型图标字典
+      commonIcon: 'static/BMap/images/well-common.svg',
       center: { lng: 116.4, lat: 39.9 }, // 地图中心
       zoom: 14, // 地图缩放比例
       markers: [], // 井列表标注marker
@@ -354,7 +355,8 @@
                   wellType: well.wellType,
                   deptid: well.deptid,
                   bfzt: well.bfzt,
-                  icon: this.icons[well.wellType],
+                  // icon: this.icons[well.wellType],
+                  icon: this.commonIcon,
                   visible: true,
                   wellStatus: 'alarm'
                 })
@@ -378,7 +380,8 @@
                   wellType: well.wellType,
                   deptid: well.deptid,
                   bfzt: well.bfzt,
-                  icon: this.icons[well.wellType],
+                  // icon: this.icons[well.wellType],
+                  icon: this.commonIcon,
                   visible: true,
                   wellStatus: 'normal'
                 })
diff --git a/src/views/wellManage/addWell.vue b/src/views/wellManage/addWell.vue
index 3843939..e8487f7 100644
--- a/src/views/wellManage/addWell.vue
+++ b/src/views/wellManage/addWell.vue
@@ -26,13 +26,18 @@
           </el-form-item>
         </el-col>
         <el-col :span="9" :offset="3">
-          <el-form-item label="权属单位" prop="deptid">
-            <dept-select v-model="wellForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择权属单位"/>
+          <el-form-item label="所属派出所" prop="deptid">
+            <dept-select v-model="wellForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择所属派出所"/>
           </el-form-item>
         </el-col>
       </el-row>
       <el-row :gutter="20">
         <el-col :span="9">
+          <el-form-item label="产权单位">
+            <el-input v-model.trim="wellForm.owner" type="text" placeholder="非必填"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="9" :offset="3">
           <el-form-item label="井深(m)" prop="deep">
             <el-input v-model.trim="wellForm.deep" type="text" placeholder="必填"/>
           </el-form-item>
@@ -118,7 +123,7 @@
       <el-row :gutter="20">
         <el-col :span="9">
           <el-form-item label="闸井维护机构" prop="responsibleDept">
-            <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为权属单位" clearable>
+            <el-select v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为所属派出所" clearable>
               <el-option
                 v-for="item in secondDeptTreeList"
                 :key="item.id"
@@ -203,16 +208,17 @@
         wellCode: '', // 闸井编号
         wellName: '', // 闸井名称
         wellType: '', // 闸井类型
-        deptid: '', // 权属单位
+        deptid: '', // 所属派出所
         deep: '', // 井深，
         position: '', // 位置描述
         coordinateX: '', // 经度
         coordinateY: '', // 纬度
         photos: '', // 照片路径
         notes: '', // 备注,
-        qu: '',
+        qu: '', // 区
         area: '', // 街道
-        responsibleDept: '' // 维护人员部门
+        responsibleDept: '', // 维护人员部门
+        owner: '' // 产权单位
       }, // 表单
       deptProps: {
         parent: 'pid',
@@ -249,7 +255,7 @@
       dialogVisible: false,
       labelPosition: 'right',
       responseAssignShow: false,
-      deptShowTop: false, // 权属单位下拉是否显示顶级
+      deptShowTop: false, // 所属派出所下拉是否显示顶级
       deptShow: true
     }
   },
@@ -272,7 +278,7 @@
         return false
       }
     },
-    firstDept() { // 获取权属单位
+    firstDept() { // 获取所属派出所
       return this.wellForm.deptid
     },
     qu() { // 获取区
@@ -280,7 +286,7 @@
     }
   },
   watch: {
-    firstDept(val) { // 监控权属单位变化
+    firstDept(val) { // 监控所属派出所变化
       if (val !== '') {
         debugger
         this.wellForm.qu = ''
@@ -372,7 +378,7 @@
         wellCode: '', // 闸井编号
         wellName: '', // 闸井名称
         wellType: '', // 闸井类型
-        deptid: '', // 权属单位
+        deptid: '', // 所属派出所
         deep: '', // 井深，
         position: '', // 位置描述
         coordinateX: '', // 经度
diff --git a/src/views/wellManage/detailWell.vue b/src/views/wellManage/detailWell.vue
index 44b0f9a..470f51d 100644
--- a/src/views/wellManage/detailWell.vue
+++ b/src/views/wellManage/detailWell.vue
@@ -21,7 +21,7 @@
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
-            <el-form-item label="权属单位" prop="deptid">
+            <el-form-item label="所属派出所" prop="deptid">
               <el-input v-model="wellForm.deptName" type="text" placeholder="未知" disabled/>
             </el-form-item>
           </el-col>
@@ -78,8 +78,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="1">
-
+        <el-row v-show="false" :gutter="1">
           <el-form-item label="所在区域" required>
             <el-col :span="5">
               <el-form-item prop="qu">
@@ -117,8 +116,8 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="10">
-            <el-form-item label="闸井维护人员" prop="responsibleDept">
-              <el-input v-model="wellForm.responsibleDeptName" type="text" placeholder="未知" disabled/>
+            <el-form-item label="产权单位">
+              <el-input v-model="wellForm.owner" type="text" placeholder="未知" disabled/>
             </el-form-item>
           </el-col>
         </el-row>
@@ -163,8 +162,8 @@
         wellName: '', // 闸井名称
         wellType: '', // 闸井类型
         wellTypeName: '', // 闸井类型名称
-        deptid: '', // 权属单位
-        deptName: '', // 权属单位名称
+        deptid: '', // 所属派出所
+        deptName: '', // 所属派出所名称
         bfztName: '', // 布防状态
         deep: '', // 井深，
         position: '', // 位置描述
@@ -175,7 +174,8 @@
         qu: '',
         area: '', // 街道
         responsibleDept: '', // 维护人员部门
-        responsibleDeptName: '' // 维护人员部门名称
+        responsibleDeptName: '', // 维护人员部门名称
+        owner: '' // 产权单位
       }, // 表单
       deptProps: {
         parent: 'pid',
@@ -243,8 +243,8 @@
         wellType: row.wellType, // 闸井类型
         wellTypeName: row.wellTypeName, // 闸井类型
         bfztName: row.bfztName,
-        deptid: row.deptid, // 权属单位
-        deptName: row.deptName, // 权属单位
+        deptid: row.deptid, // 所属派出所
+        deptName: row.deptName, // 所属派出所
         deep: row.deep, // 井深，
         position: row.position, // 位置描述
         coordinateX: row.coordinateX, // 经度
@@ -254,7 +254,8 @@
         qu: row.qu,
         area: row.area, // 街道
         responsibleDept: row.responsibleDept, // 维护人员部门
-        responsibleDeptName: row.responsibleDeptName // 维护人员部门
+        responsibleDeptName: row.responsibleDeptName, // 维护人员部门
+        owner: row.owner
       }
       if (row.deptid && row.deptid !== '') {
         this.fetchArea1()
diff --git a/src/views/wellManage/editWell.vue b/src/views/wellManage/editWell.vue
index 8513d37..c9e29de 100644
--- a/src/views/wellManage/editWell.vue
+++ b/src/views/wellManage/editWell.vue
@@ -27,13 +27,18 @@
             </el-form-item>
           </el-col>
           <el-col :span="10" :offset="1">
-            <el-form-item label="权属单位" prop="deptid">
-              <dept-select v-model="wellForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择权属单位"/>
+            <el-form-item label="所属派出所" prop="deptid">
+              <dept-select v-model="wellForm.deptid" :need-top="deptShowTop" :dept-show="deptShow" dept-type="03" placeholder="选择所属派出所"/>
             </el-form-item>
           </el-col>
         </el-row>
         <el-row>
           <el-col :span="10">
+            <el-form-item label="产权单位">
+              <el-input v-model.trim="wellForm.owner" type="text" placeholder="非必填"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="10" :offset="1">
             <el-form-item label="井深(m)" prop="deep">
               <el-input v-model.trim="wellForm.deep" type="text" placeholder="必填"/>
             </el-form-item>
@@ -119,7 +124,7 @@
         <el-row :gutter="20">
           <el-col :span="13">
             <el-form-item label="闸井维护机构" prop="responsibleDept">
-              <el-select v-if="secondDeptTreeList.length>=1" v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为权属单位" clearable>
+              <el-select v-if="secondDeptTreeList.length>=1" v-model="wellForm.responsibleDept" :disabled="showResponseDept" placeholder="选择维护组织，不选默认为所属派出所" clearable>
                 <el-option
                   v-for="item in secondDeptTreeList"
                   :key="item.id"
@@ -210,7 +215,7 @@
         wellCode: '', // 闸井编号
         wellName: '', // 闸井名称
         wellType: '', // 闸井类型
-        deptid: '', // 权属单位
+        deptid: '', // 所属派出所
         deep: '', // 井深，
         position: '', // 位置描述
         coordinateX: '', // 经度
@@ -220,6 +225,7 @@
         qu: '',
         area: '', // 街道
         responsibleDept: '', // 维护人员部门
+        owner: '', // 产权的单位
         responsibleDeptName: '' // 维护人员部门
       }, // 表单
       deptProps: {
@@ -245,12 +251,12 @@
         deep: [{ required: true, trigger: ['blur', 'change'], validator: validateDeep }],
         coordinateX: [{ required: true, trigger: ['blur', 'change'], validator: validateLat }],
         coordinateY: [{ required: true, trigger: ['blur', 'change'], validator: validateLng }],
-        deptid: [{ required: true, message: '权属单位必选', trigger: 'change' }],
+        deptid: [{ required: true, message: '所属派出所必选', trigger: 'change' }],
         wellType: [{ required: true, message: '闸井类型必选', trigger: 'change' }],
         qu: [{ required: true, message: '所在区/县必选', trigger: 'change' }],
         area: [{ required: true, message: '所在街道/镇必选', trigger: 'change' }]
       },
-      deptShowTop: false, // 权属单位下拉是否显示顶级
+      deptShowTop: false, // 所属派出所下拉是否显示顶级
       dialogImageUrl: '',
       dialogVisible: false,
       labelPosition: 'right',
@@ -267,7 +273,7 @@
         return false
       }
     },
-    firstDept() { // 获取权属单位
+    firstDept() { // 获取所属派出所
       return this.wellForm.deptid
     },
     qu() { // 获取区
@@ -275,7 +281,7 @@
     }
   },
   watch: {
-    firstDept(val) { // 监控权属单位变化
+    firstDept(val) { // 监控所属派出所变化
       if (val !== '') {
         this.wellForm.responsibleDept = ''
         this.fetchSecondDeptTree()
@@ -304,7 +310,7 @@
         wellCode: row.wellCode, // 闸井编号
         wellName: row.wellName, // 闸井名称
         wellType: row.wellType, // 闸井类型
-        deptid: row.deptid, // 权属单位
+        deptid: row.deptid, // 所属派出所
         deep: row.deep, // 井深，
         position: row.position, // 位置描述
         coordinateX: row.coordinateX, // 经度
diff --git a/src/views/wellManage/infoWellBdOffline.vue b/src/views/wellManage/infoWellBdOffline.vue
index d39d8f7..ea66437 100644
--- a/src/views/wellManage/infoWellBdOffline.vue
+++ b/src/views/wellManage/infoWellBdOffline.vue
@@ -21,7 +21,7 @@
         </el-row>
         <el-row>
           <el-col :span="7">
-            <el-form-item label="权属单位" prop="deptid">
+            <el-form-item label="所属派出所" prop="deptid">
               <el-input v-model="wellForm.deptName" type="text" placeholder="未知" disabled/>
             </el-form-item>
           </el-col>
@@ -36,7 +36,7 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row :gutter="1">
+        <el-row v-show="false" :gutter="1">
           <el-form-item label="所在区域" required>
             <el-col :span="4">
               <el-select v-model="wellForm.qu" placeholder="未知" disabled>
@@ -62,11 +62,16 @@
 
         </el-row>
         <el-row>
-          <el-col :span="15">
+          <el-col :span="14">
             <el-form-item label="详细地址" prop="position">
               <el-input v-model="wellForm.position" type="text" placeholder="未知" disabled/>
             </el-form-item>
           </el-col>
+          <el-col :span="7">
+            <el-form-item label="产权单位">
+              <el-input v-model="wellForm.owner" type="text" placeholder="未知" disabled/>
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div class="watch-div">
@@ -106,8 +111,8 @@
         wellName: '', // 闸井名称
         wellType: '', // 闸井类型
         wellTypeName: '', // 闸井类型名称
-        deptid: '', // 权属单位
-        deptName: '', // 权属单位名称
+        deptid: '', // 所属派出所
+        deptName: '', // 所属派出所名称
         bfztName: '', // 布防状态
         deep: '', // 井深，
         position: '', // 位置描述
@@ -121,7 +126,8 @@
         notes: '', // 备注,
         qu: '',
         area: '', // 街道
-        responsibleDept: '' // 维护人员部门
+        responsibleDept: '', // 维护人员部门
+        owner: '' // 产权单位
       }, // 表单
       center: { lng: 121.59996, lat: 31.197646 },
       zoom: 16,
@@ -161,8 +167,8 @@
           wellName: row.wellName, // 闸井名称
           wellType: row.wellType, // 闸井类型
           wellTypeName: row.wellTypeName, // 闸井类型
-          deptid: row.deptid, // 权属单位
-          deptName: row.deptName, // 权属单位
+          deptid: row.deptid, // 所属派出所
+          deptName: row.deptName, // 所属派出所
           deep: row.deep, // 井深，
           bfztName: row.bfztName, // 布防状态
           position: row.position, // 位置描述
@@ -176,7 +182,8 @@
           lngGaode: row.lngGaode,
           qu: row.qu,
           area: row.area, // 街道
-          responsibleDept: row.responsibleDept // 维护人员部门
+          responsibleDept: row.responsibleDept, // 维护人员部门
+          owner: row.owner
         }
         this.center = { lng: row.lngBaidu, lat: row.latBaidu }
         this.marker = {
diff --git a/src/views/wellManage/listWell.vue b/src/views/wellManage/listWell.vue
index 1e7066e..b7e068f 100644
--- a/src/views/wellManage/listWell.vue
+++ b/src/views/wellManage/listWell.vue
@@ -17,7 +17,7 @@
             </el-select>
           </el-form-item>
           <el-form-item class="selectForm-container-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" placeholder="选择派出所"/>
           </el-form-item>
           <el-button class="filter-item" type="primary" icon="el-icon-search" @click="search">搜索</el-button>
         </el-row>
@@ -138,7 +138,7 @@
           align: 'center'
         },
         {
-          text: '权属单位',
+          text: '派出所',
           value: 'deptName',
           align: 'center'
         },