diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 7a0e35f..c0b41b4 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/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 7a0e35f..c0b41b4 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/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index 0c3a03c..46301ff 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -17,19 +17,19 @@
             size="mini"
             @change="fetchData"/>
         </el-col>
-        <el-col :span="3">
-          <el-select v-model="listQuery.deviceType" size="mini" placeholder="设备类型" clearable @change="fetchData">
-            <el-option
-              v-for="item in deviceTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-col>
+        <!--<el-col :span="3">-->
+        <!--<el-select v-model="listQuery.deviceType" size="mini" placeholder="设备类型" clearable @change="fetchData">-->
+        <!--<el-option-->
+        <!--v-for="item in deviceTypeList"-->
+        <!--:key="item.value"-->
+        <!--:label="item.name"-->
+        <!--:value="item.value"/>-->
+        <!--</el-select>-->
+        <!--</el-col>-->
       </el-row>
       <el-row>
         <el-col :span="12" :offset="6">
-          <div class="chart-title">按权属单位统计报警情况</div>
+          <div class="chart-title">按组织机构统计报警情况</div>
         </el-col>
       </el-row>
       <div class="chart-body">

diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 7a0e35f..c0b41b4 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/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index 0c3a03c..46301ff 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -17,19 +17,19 @@
             size="mini"
             @change="fetchData"/>
         </el-col>
-        <el-col :span="3">
-          <el-select v-model="listQuery.deviceType" size="mini" placeholder="设备类型" clearable @change="fetchData">
-            <el-option
-              v-for="item in deviceTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-col>
+        <!--<el-col :span="3">-->
+        <!--<el-select v-model="listQuery.deviceType" size="mini" placeholder="设备类型" clearable @change="fetchData">-->
+        <!--<el-option-->
+        <!--v-for="item in deviceTypeList"-->
+        <!--:key="item.value"-->
+        <!--:label="item.name"-->
+        <!--:value="item.value"/>-->
+        <!--</el-select>-->
+        <!--</el-col>-->
       </el-row>
       <el-row>
         <el-col :span="12" :offset="6">
-          <div class="chart-title">按权属单位统计报警情况</div>
+          <div class="chart-title">按组织机构统计报警情况</div>
         </el-col>
       </el-row>
       <div class="chart-body">
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4b9b221..4d28be0 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -8,7 +8,7 @@
             <el-input v-model.trim="listQuery.keywords" placeholder="闸井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择派出所"/>
           </el-form-item>
           <el-form-item class="selectForm-container-item" prop="beginTime">
             <el-date-picker

diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 7a0e35f..c0b41b4 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/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index 0c3a03c..46301ff 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -17,19 +17,19 @@
             size="mini"
             @change="fetchData"/>
         </el-col>
-        <el-col :span="3">
-          <el-select v-model="listQuery.deviceType" size="mini" placeholder="设备类型" clearable @change="fetchData">
-            <el-option
-              v-for="item in deviceTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-col>
+        <!--<el-col :span="3">-->
+        <!--<el-select v-model="listQuery.deviceType" size="mini" placeholder="设备类型" clearable @change="fetchData">-->
+        <!--<el-option-->
+        <!--v-for="item in deviceTypeList"-->
+        <!--:key="item.value"-->
+        <!--:label="item.name"-->
+        <!--:value="item.value"/>-->
+        <!--</el-select>-->
+        <!--</el-col>-->
       </el-row>
       <el-row>
         <el-col :span="12" :offset="6">
-          <div class="chart-title">按权属单位统计报警情况</div>
+          <div class="chart-title">按组织机构统计报警情况</div>
         </el-col>
       </el-row>
       <div class="chart-body">
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4b9b221..4d28be0 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -8,7 +8,7 @@
             <el-input v-model.trim="listQuery.keywords" placeholder="闸井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择派出所"/>
           </el-form-item>
           <el-form-item class="selectForm-container-item" prop="beginTime">
             <el-date-picker
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 43ba820..31e3900 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.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>
@@ -55,7 +55,7 @@
             <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
+        <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" @click="datalist(scope.row)">历史数据</el-button>
             <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">编辑</el-button>
@@ -104,6 +104,7 @@
       listQuery: {
         keywords: '',
         deviceType: '',
+        deptid: '',
         offset: 1,
         limit: 20,
         sort: 'id',
@@ -128,13 +129,11 @@
         {
           text: '在线状态',
           value: 'onlineStateName',
-          width: 60,
           align: 'center'
         },
         {
           text: '设备位置',
           value: 'position',
-          width: 140,
           align: 'center'
         },
         {

diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 7a0e35f..c0b41b4 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/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index 0c3a03c..46301ff 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -17,19 +17,19 @@
             size="mini"
             @change="fetchData"/>
         </el-col>
-        <el-col :span="3">
-          <el-select v-model="listQuery.deviceType" size="mini" placeholder="设备类型" clearable @change="fetchData">
-            <el-option
-              v-for="item in deviceTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-col>
+        <!--<el-col :span="3">-->
+        <!--<el-select v-model="listQuery.deviceType" size="mini" placeholder="设备类型" clearable @change="fetchData">-->
+        <!--<el-option-->
+        <!--v-for="item in deviceTypeList"-->
+        <!--:key="item.value"-->
+        <!--:label="item.name"-->
+        <!--:value="item.value"/>-->
+        <!--</el-select>-->
+        <!--</el-col>-->
       </el-row>
       <el-row>
         <el-col :span="12" :offset="6">
-          <div class="chart-title">按权属单位统计报警情况</div>
+          <div class="chart-title">按组织机构统计报警情况</div>
         </el-col>
       </el-row>
       <div class="chart-body">
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4b9b221..4d28be0 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -8,7 +8,7 @@
             <el-input v-model.trim="listQuery.keywords" placeholder="闸井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择派出所"/>
           </el-form-item>
           <el-form-item class="selectForm-container-item" prop="beginTime">
             <el-date-picker
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 43ba820..31e3900 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.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>
@@ -55,7 +55,7 @@
             <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
+        <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" @click="datalist(scope.row)">历史数据</el-button>
             <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">编辑</el-button>
@@ -104,6 +104,7 @@
       listQuery: {
         keywords: '',
         deviceType: '',
+        deptid: '',
         offset: 1,
         limit: 20,
         sort: 'id',
@@ -128,13 +129,11 @@
         {
           text: '在线状态',
           value: 'onlineStateName',
-          width: 60,
           align: 'center'
         },
         {
           text: '设备位置',
           value: 'position',
-          width: 140,
           align: 'center'
         },
         {
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 1e3eb1c..5713aa4 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -280,8 +280,8 @@
           } else if (this.jobForm.jobStatusName === '完成') {
             // 特殊情况处理:已确认之后结束的工单,将完成人和时间用确认人代替
             const activity = {
-              content: job.confirmJobPerson + '已完成',
-              timestamp: job.confirmJobTime
+              content: job.handleJobPerson + '处理完成',
+              timestamp: job.handleJobTime
             }
             this.activities.push(activity)
           } else {
@@ -290,7 +290,7 @@
             //   timestamp: ''
             // }
             const activity2 = {
-              content: '已完成',
+              content: '待处理',
               timestamp: ''
             }
             // this.activities.push(activity1)

diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 7a0e35f..c0b41b4 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/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index 0c3a03c..46301ff 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -17,19 +17,19 @@
             size="mini"
             @change="fetchData"/>
         </el-col>
-        <el-col :span="3">
-          <el-select v-model="listQuery.deviceType" size="mini" placeholder="设备类型" clearable @change="fetchData">
-            <el-option
-              v-for="item in deviceTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-col>
+        <!--<el-col :span="3">-->
+        <!--<el-select v-model="listQuery.deviceType" size="mini" placeholder="设备类型" clearable @change="fetchData">-->
+        <!--<el-option-->
+        <!--v-for="item in deviceTypeList"-->
+        <!--:key="item.value"-->
+        <!--:label="item.name"-->
+        <!--:value="item.value"/>-->
+        <!--</el-select>-->
+        <!--</el-col>-->
       </el-row>
       <el-row>
         <el-col :span="12" :offset="6">
-          <div class="chart-title">按权属单位统计报警情况</div>
+          <div class="chart-title">按组织机构统计报警情况</div>
         </el-col>
       </el-row>
       <div class="chart-body">
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4b9b221..4d28be0 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -8,7 +8,7 @@
             <el-input v-model.trim="listQuery.keywords" placeholder="闸井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择派出所"/>
           </el-form-item>
           <el-form-item class="selectForm-container-item" prop="beginTime">
             <el-date-picker
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 43ba820..31e3900 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.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>
@@ -55,7 +55,7 @@
             <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
+        <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" @click="datalist(scope.row)">历史数据</el-button>
             <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">编辑</el-button>
@@ -104,6 +104,7 @@
       listQuery: {
         keywords: '',
         deviceType: '',
+        deptid: '',
         offset: 1,
         limit: 20,
         sort: 'id',
@@ -128,13 +129,11 @@
         {
           text: '在线状态',
           value: 'onlineStateName',
-          width: 60,
           align: 'center'
         },
         {
           text: '设备位置',
           value: 'position',
-          width: 140,
           align: 'center'
         },
         {
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 1e3eb1c..5713aa4 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -280,8 +280,8 @@
           } else if (this.jobForm.jobStatusName === '完成') {
             // 特殊情况处理:已确认之后结束的工单,将完成人和时间用确认人代替
             const activity = {
-              content: job.confirmJobPerson + '已完成',
-              timestamp: job.confirmJobTime
+              content: job.handleJobPerson + '处理完成',
+              timestamp: job.handleJobTime
             }
             this.activities.push(activity)
           } else {
@@ -290,7 +290,7 @@
             //   timestamp: ''
             // }
             const activity2 = {
-              content: '已完成',
+              content: '待处理',
               timestamp: ''
             }
             // this.activities.push(activity1)
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 677f3b5..31c168b 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -130,13 +130,13 @@
           align: 'center',
           width: 120
         },
-        {
-          text: '告警数值',
-          value: 'alarmValue',
-          width: 80,
-          align: 'center',
-          class: 'warning'
-        },
+        // {
+        //   text: '告警数值',
+        //   value: 'alarmValue',
+        //   width: 80,
+        //   align: 'center',
+        //   class: 'warning'
+        // },
         {
           text: '工单创建时间',
           value: 'createTime',
@@ -150,15 +150,15 @@
         },
         {
           text: '处理人',
-          value: 'jobBelongTo',
+          value: 'handleJobPerson',
           align: 'center',
           format: true
-        },
-        {
-          text: '接单时间',
-          value: 'getJobTime',
-          align: 'center'
         }
+        // {
+        //   text: '接单时间',
+        //   value: 'getJobTime',
+        //   align: 'center'
+        // }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据

diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 7a0e35f..c0b41b4 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/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index 0c3a03c..46301ff 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -17,19 +17,19 @@
             size="mini"
             @change="fetchData"/>
         </el-col>
-        <el-col :span="3">
-          <el-select v-model="listQuery.deviceType" size="mini" placeholder="设备类型" clearable @change="fetchData">
-            <el-option
-              v-for="item in deviceTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-col>
+        <!--<el-col :span="3">-->
+        <!--<el-select v-model="listQuery.deviceType" size="mini" placeholder="设备类型" clearable @change="fetchData">-->
+        <!--<el-option-->
+        <!--v-for="item in deviceTypeList"-->
+        <!--:key="item.value"-->
+        <!--:label="item.name"-->
+        <!--:value="item.value"/>-->
+        <!--</el-select>-->
+        <!--</el-col>-->
       </el-row>
       <el-row>
         <el-col :span="12" :offset="6">
-          <div class="chart-title">按权属单位统计报警情况</div>
+          <div class="chart-title">按组织机构统计报警情况</div>
         </el-col>
       </el-row>
       <div class="chart-body">
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4b9b221..4d28be0 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -8,7 +8,7 @@
             <el-input v-model.trim="listQuery.keywords" placeholder="闸井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择派出所"/>
           </el-form-item>
           <el-form-item class="selectForm-container-item" prop="beginTime">
             <el-date-picker
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 43ba820..31e3900 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.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>
@@ -55,7 +55,7 @@
             <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
+        <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" @click="datalist(scope.row)">历史数据</el-button>
             <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">编辑</el-button>
@@ -104,6 +104,7 @@
       listQuery: {
         keywords: '',
         deviceType: '',
+        deptid: '',
         offset: 1,
         limit: 20,
         sort: 'id',
@@ -128,13 +129,11 @@
         {
           text: '在线状态',
           value: 'onlineStateName',
-          width: 60,
           align: 'center'
         },
         {
           text: '设备位置',
           value: 'position',
-          width: 140,
           align: 'center'
         },
         {
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 1e3eb1c..5713aa4 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -280,8 +280,8 @@
           } else if (this.jobForm.jobStatusName === '完成') {
             // 特殊情况处理:已确认之后结束的工单,将完成人和时间用确认人代替
             const activity = {
-              content: job.confirmJobPerson + '已完成',
-              timestamp: job.confirmJobTime
+              content: job.handleJobPerson + '处理完成',
+              timestamp: job.handleJobTime
             }
             this.activities.push(activity)
           } else {
@@ -290,7 +290,7 @@
             //   timestamp: ''
             // }
             const activity2 = {
-              content: '已完成',
+              content: '待处理',
               timestamp: ''
             }
             // this.activities.push(activity1)
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 677f3b5..31c168b 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -130,13 +130,13 @@
           align: 'center',
           width: 120
         },
-        {
-          text: '告警数值',
-          value: 'alarmValue',
-          width: 80,
-          align: 'center',
-          class: 'warning'
-        },
+        // {
+        //   text: '告警数值',
+        //   value: 'alarmValue',
+        //   width: 80,
+        //   align: 'center',
+        //   class: 'warning'
+        // },
         {
           text: '工单创建时间',
           value: 'createTime',
@@ -150,15 +150,15 @@
         },
         {
           text: '处理人',
-          value: 'jobBelongTo',
+          value: 'handleJobPerson',
           align: 'center',
           format: true
-        },
-        {
-          text: '接单时间',
-          value: 'getJobTime',
-          align: 'center'
         }
+        // {
+        //   text: '接单时间',
+        //   value: 'getJobTime',
+        //   align: 'center'
+        // }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 949edb6..46be5a8 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-header">
-    <h3>智能闸井监测管理系统</h3>
+    <h3>地下管线技防设备管理系统</h3>
 
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">

diff --git a/src/views/alarmStatics/alarmStatics.vue b/src/views/alarmStatics/alarmStatics.vue
index 7a0e35f..c0b41b4 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/alarmStatics/components/alarmStaticsByDept.vue b/src/views/alarmStatics/components/alarmStaticsByDept.vue
index 0c3a03c..46301ff 100644
--- a/src/views/alarmStatics/components/alarmStaticsByDept.vue
+++ b/src/views/alarmStatics/components/alarmStaticsByDept.vue
@@ -17,19 +17,19 @@
             size="mini"
             @change="fetchData"/>
         </el-col>
-        <el-col :span="3">
-          <el-select v-model="listQuery.deviceType" size="mini" placeholder="设备类型" clearable @change="fetchData">
-            <el-option
-              v-for="item in deviceTypeList"
-              :key="item.value"
-              :label="item.name"
-              :value="item.value"/>
-          </el-select>
-        </el-col>
+        <!--<el-col :span="3">-->
+        <!--<el-select v-model="listQuery.deviceType" size="mini" placeholder="设备类型" clearable @change="fetchData">-->
+        <!--<el-option-->
+        <!--v-for="item in deviceTypeList"-->
+        <!--:key="item.value"-->
+        <!--:label="item.name"-->
+        <!--:value="item.value"/>-->
+        <!--</el-select>-->
+        <!--</el-col>-->
       </el-row>
       <el-row>
         <el-col :span="12" :offset="6">
-          <div class="chart-title">按权属单位统计报警情况</div>
+          <div class="chart-title">按组织机构统计报警情况</div>
         </el-col>
       </el-row>
       <div class="chart-body">
diff --git a/src/views/dataManage/deviceData/listWellCoverData.vue b/src/views/dataManage/deviceData/listWellCoverData.vue
index 4b9b221..4d28be0 100644
--- a/src/views/dataManage/deviceData/listWellCoverData.vue
+++ b/src/views/dataManage/deviceData/listWellCoverData.vue
@@ -8,7 +8,7 @@
             <el-input v-model.trim="listQuery.keywords" placeholder="闸井编号/设备编号" clearable/>
           </el-form-item>
           <el-form-item class="selectForm-container-item">
-            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择权属单位"/>
+            <dept-select v-model="listQuery.deptid" :need-top="deptShowTop" dept-type="03" placeholder="选择派出所"/>
           </el-form-item>
           <el-form-item class="selectForm-container-item" prop="beginTime">
             <el-date-picker
diff --git a/src/views/deviceManage/listDevice.vue b/src/views/deviceManage/listDevice.vue
index 43ba820..31e3900 100644
--- a/src/views/deviceManage/listDevice.vue
+++ b/src/views/deviceManage/listDevice.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>
@@ -55,7 +55,7 @@
             <el-button v-if="column.type=='Button'" type="text" @click="showWellDetail(scope.row)">{{ scope.row[column.value] }}</el-button>
           </template>
         </el-table-column>
-        <el-table-column label="操作" align="center" width="160">
+        <el-table-column label="操作" align="center">
           <template slot-scope="scope">
             <el-button type="text" @click="datalist(scope.row)">历史数据</el-button>
             <el-button v-if="hasPerm('/device/update')" type="text" @click="edit(scope.row)">编辑</el-button>
@@ -104,6 +104,7 @@
       listQuery: {
         keywords: '',
         deviceType: '',
+        deptid: '',
         offset: 1,
         limit: 20,
         sort: 'id',
@@ -128,13 +129,11 @@
         {
           text: '在线状态',
           value: 'onlineStateName',
-          width: 60,
           align: 'center'
         },
         {
           text: '设备位置',
           value: 'position',
-          width: 140,
           align: 'center'
         },
         {
diff --git a/src/views/jobManage/detailJob.vue b/src/views/jobManage/detailJob.vue
index 1e3eb1c..5713aa4 100644
--- a/src/views/jobManage/detailJob.vue
+++ b/src/views/jobManage/detailJob.vue
@@ -280,8 +280,8 @@
           } else if (this.jobForm.jobStatusName === '完成') {
             // 特殊情况处理:已确认之后结束的工单,将完成人和时间用确认人代替
             const activity = {
-              content: job.confirmJobPerson + '已完成',
-              timestamp: job.confirmJobTime
+              content: job.handleJobPerson + '处理完成',
+              timestamp: job.handleJobTime
             }
             this.activities.push(activity)
           } else {
@@ -290,7 +290,7 @@
             //   timestamp: ''
             // }
             const activity2 = {
-              content: '已完成',
+              content: '待处理',
               timestamp: ''
             }
             // this.activities.push(activity1)
diff --git a/src/views/jobManage/listJobs.vue b/src/views/jobManage/listJobs.vue
index 677f3b5..31c168b 100644
--- a/src/views/jobManage/listJobs.vue
+++ b/src/views/jobManage/listJobs.vue
@@ -130,13 +130,13 @@
           align: 'center',
           width: 120
         },
-        {
-          text: '告警数值',
-          value: 'alarmValue',
-          width: 80,
-          align: 'center',
-          class: 'warning'
-        },
+        // {
+        //   text: '告警数值',
+        //   value: 'alarmValue',
+        //   width: 80,
+        //   align: 'center',
+        //   class: 'warning'
+        // },
         {
           text: '工单创建时间',
           value: 'createTime',
@@ -150,15 +150,15 @@
         },
         {
           text: '处理人',
-          value: 'jobBelongTo',
+          value: 'handleJobPerson',
           align: 'center',
           format: true
-        },
-        {
-          text: '接单时间',
-          value: 'getJobTime',
-          align: 'center'
         }
+        // {
+        //   text: '接单时间',
+        //   value: 'getJobTime',
+        //   align: 'center'
+        // }
       ], // 显示列
       multipleSelection: [], // 多选选中项
       list: [], // 列表数据
diff --git a/src/views/layout/components/AppHeader.vue b/src/views/layout/components/AppHeader.vue
index 949edb6..46be5a8 100644
--- a/src/views/layout/components/AppHeader.vue
+++ b/src/views/layout/components/AppHeader.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="app-header">
-    <h3>智能闸井监测管理系统</h3>
+    <h3>地下管线技防设备管理系统</h3>
 
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index ef5ac50..41deae8 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -7,7 +7,7 @@
           <img>
         </div>
         <div class="title-div">
-          <h3 class="title">智能闸井监测管理系统</h3>
+          <h3 class="title">地下管线技防设备管理系统</h3>
         </div>
       </div>
       <div ref="element" class="right-div">
@@ -163,7 +163,7 @@
             this.$message.success('登录成功')
             this.$router.push({ path: '/' })
           }).catch((error) => {
-            this.$message.error(error)
+            // this.$message.error(error)
             this.loading = false
             if (this.showKaptcha) {
               this.$refs.kaptcha.refreshCode()