diff --git a/src/page/jobManage/ChoosePeople.vue b/src/page/jobManage/ChoosePeople.vue
index 51b6daf..ed14f70 100644
--- a/src/page/jobManage/ChoosePeople.vue
+++ b/src/page/jobManage/ChoosePeople.vue
@@ -57,11 +57,14 @@
                   message: '转单成功',
                   position: 'bottom',
                 })
-                this.$router.push({name: 'job'})
+                this.closeTo()
               }
             })
           }
         })
+      },
+      closeTo(){
+        this.$router.push({name: 'job'})
       }
     }
   }

diff --git a/src/page/jobManage/ChoosePeople.vue b/src/page/jobManage/ChoosePeople.vue
index 51b6daf..ed14f70 100644
--- a/src/page/jobManage/ChoosePeople.vue
+++ b/src/page/jobManage/ChoosePeople.vue
@@ -57,11 +57,14 @@
                   message: '转单成功',
                   position: 'bottom',
                 })
-                this.$router.push({name: 'job'})
+                this.closeTo()
               }
             })
           }
         })
+      },
+      closeTo(){
+        this.$router.push({name: 'job'})
       }
     }
   }
diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue
index ef6c264..687ce9d 100644
--- a/src/page/jobManage/JobManage.vue
+++ b/src/page/jobManage/JobManage.vue
@@ -66,7 +66,6 @@
       next()
     },
     activated(){
-      console.log('activated JobManage')
       if(!isFromDetail){
         if(this.$route.query && this.$route.query.tab){
           this.selected = this.$route.query.tab

diff --git a/src/page/jobManage/ChoosePeople.vue b/src/page/jobManage/ChoosePeople.vue
index 51b6daf..ed14f70 100644
--- a/src/page/jobManage/ChoosePeople.vue
+++ b/src/page/jobManage/ChoosePeople.vue
@@ -57,11 +57,14 @@
                   message: '转单成功',
                   position: 'bottom',
                 })
-                this.$router.push({name: 'job'})
+                this.closeTo()
               }
             })
           }
         })
+      },
+      closeTo(){
+        this.$router.push({name: 'job'})
       }
     }
   }
diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue
index ef6c264..687ce9d 100644
--- a/src/page/jobManage/JobManage.vue
+++ b/src/page/jobManage/JobManage.vue
@@ -66,7 +66,6 @@
       next()
     },
     activated(){
-      console.log('activated JobManage')
       if(!isFromDetail){
         if(this.$route.query && this.$route.query.tab){
           this.selected = this.$route.query.tab
diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue
index fd9fc63..fc96322 100644
--- a/src/page/jobManage/modules/JobDetail.vue
+++ b/src/page/jobManage/modules/JobDetail.vue
@@ -109,7 +109,7 @@
         </div>
         <div v-if="jobForm.editable==1" class="button-div">
           <mt-button v-if="winType=='waitGetJob'" type="primary" @click="getJob">接单</mt-button>
-          <mt-button v-if="winType=='waitGetJob'" type="default" @click="goToMap">到这里去</mt-button>
+          <mt-button v-if="winType=='waitGetJob'" type="default" @click="goToMap">地图位置</mt-button>
           <mt-button v-if="showTransferBtn" type="primary" @click="openTransferWin">转单</mt-button>
           <mt-button v-if="winType=='waitConfirmJob'" type="default" @click="confirmJob">提交</mt-button>
           <mt-button v-if="winType=='inHandleJob'" type="default" @click="overJob">提交</mt-button>
@@ -122,22 +122,20 @@
         <mt-popup v-model="bigImageVisible" class="imageShowPopup">
           <img :src="bigImageSrc" style="width: 100%; max-height: 100%"/>
         </mt-popup>
-
       </div>
-
-
     </div>
   </transition>
 </template>
 
 <script>
-  import {MessageBox, Indicator, Toast} from 'mint-ui'
+  import {MessageBox, Toast} from 'mint-ui'
   import Updatefile from '@/components/Updatefile'
   import { openMapWindow } from '@/utils/common'
   import { getJobInfo, getJob, confirmJob, overJob  } from '@/api/job'
   import ChoosePeople from "../ChoosePeople";
   import Loading from "../../../components/Loading/index";
   import {compareCalendar} from '@/utils/string'
+  let fromPath = '' // 跳转来的地址
   export default {
     name: "JobDetail",
     components:{
@@ -284,7 +282,11 @@
         return timeList
       }
     },
-    mounted(){
+    beforeRouteEnter(to,from,next){
+      fromPath = from.path
+      next()
+    },
+    created(){
       if(this.$route.params.id && this.$route.params.id!=''){
         this.fetchData(this.$route.params.id)
       }
@@ -305,7 +307,8 @@
       },
       //跳转地图
       goToMap(){
-        openMapWindow(this.jobForm.latGaode,this.jobForm.lngGaode,this.jobForm.wellCode)
+        this.$router.push({path:'/gaodeMap',query:{lng:this.jobForm.lngGaode,lat:this.jobForm.latGaode}})
+        // openMapWindow(this.jobForm.latGaode,this.jobForm.lngGaode,this.jobForm.wellCode)
       },
       //获取工单详情
       fetchData(id){
@@ -363,7 +366,7 @@
                   message: '接单成功',
                   position: 'bottom',
                 })
-                this.$router.push({name: 'job'})
+                this.closeTo()
               }
             })
           }
@@ -421,7 +424,7 @@
                   message: '现场确认成功',
                   position: 'bottom',
                 })
-                this.$router.push({name: 'job'})
+                this.closeTo()
               }
             })
           }
@@ -475,7 +478,7 @@
                   message: '结束工单成功',
                   position: 'bottom',
                 })
-                this.$router.push({name: 'job'})
+                this.closeTo()
               }
             })
           }
@@ -485,6 +488,17 @@
       showBigImage(src){
         this.bigImageVisible = true
         this.bigImageSrc = src
+      },
+      // 工单提交操作结束后的跳转
+      closeTo(){
+        // 如果来自搜索页面，跳转回搜索页面并传递刷新参数
+        if(fromPath=='/searchList'){
+          this.$router.replace({path:'/searchList',query:{refresh:true}})
+        }else if(fromPath=='/jobOvertime'){
+          this.$router.replace({path:'/jobOvertime',query:{refresh:true}})
+        }else{ // 如果来自工单页面，跳转回工单搜索页面并传递刷新参数
+          this.$router.replace({path:'/job',query:{refresh:true}})
+        }
       }
     }
   }

diff --git a/src/page/jobManage/ChoosePeople.vue b/src/page/jobManage/ChoosePeople.vue
index 51b6daf..ed14f70 100644
--- a/src/page/jobManage/ChoosePeople.vue
+++ b/src/page/jobManage/ChoosePeople.vue
@@ -57,11 +57,14 @@
                   message: '转单成功',
                   position: 'bottom',
                 })
-                this.$router.push({name: 'job'})
+                this.closeTo()
               }
             })
           }
         })
+      },
+      closeTo(){
+        this.$router.push({name: 'job'})
       }
     }
   }
diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue
index ef6c264..687ce9d 100644
--- a/src/page/jobManage/JobManage.vue
+++ b/src/page/jobManage/JobManage.vue
@@ -66,7 +66,6 @@
       next()
     },
     activated(){
-      console.log('activated JobManage')
       if(!isFromDetail){
         if(this.$route.query && this.$route.query.tab){
           this.selected = this.$route.query.tab
diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue
index fd9fc63..fc96322 100644
--- a/src/page/jobManage/modules/JobDetail.vue
+++ b/src/page/jobManage/modules/JobDetail.vue
@@ -109,7 +109,7 @@
         </div>
         <div v-if="jobForm.editable==1" class="button-div">
           <mt-button v-if="winType=='waitGetJob'" type="primary" @click="getJob">接单</mt-button>
-          <mt-button v-if="winType=='waitGetJob'" type="default" @click="goToMap">到这里去</mt-button>
+          <mt-button v-if="winType=='waitGetJob'" type="default" @click="goToMap">地图位置</mt-button>
           <mt-button v-if="showTransferBtn" type="primary" @click="openTransferWin">转单</mt-button>
           <mt-button v-if="winType=='waitConfirmJob'" type="default" @click="confirmJob">提交</mt-button>
           <mt-button v-if="winType=='inHandleJob'" type="default" @click="overJob">提交</mt-button>
@@ -122,22 +122,20 @@
         <mt-popup v-model="bigImageVisible" class="imageShowPopup">
           <img :src="bigImageSrc" style="width: 100%; max-height: 100%"/>
         </mt-popup>
-
       </div>
-
-
     </div>
   </transition>
 </template>
 
 <script>
-  import {MessageBox, Indicator, Toast} from 'mint-ui'
+  import {MessageBox, Toast} from 'mint-ui'
   import Updatefile from '@/components/Updatefile'
   import { openMapWindow } from '@/utils/common'
   import { getJobInfo, getJob, confirmJob, overJob  } from '@/api/job'
   import ChoosePeople from "../ChoosePeople";
   import Loading from "../../../components/Loading/index";
   import {compareCalendar} from '@/utils/string'
+  let fromPath = '' // 跳转来的地址
   export default {
     name: "JobDetail",
     components:{
@@ -284,7 +282,11 @@
         return timeList
       }
     },
-    mounted(){
+    beforeRouteEnter(to,from,next){
+      fromPath = from.path
+      next()
+    },
+    created(){
       if(this.$route.params.id && this.$route.params.id!=''){
         this.fetchData(this.$route.params.id)
       }
@@ -305,7 +307,8 @@
       },
       //跳转地图
       goToMap(){
-        openMapWindow(this.jobForm.latGaode,this.jobForm.lngGaode,this.jobForm.wellCode)
+        this.$router.push({path:'/gaodeMap',query:{lng:this.jobForm.lngGaode,lat:this.jobForm.latGaode}})
+        // openMapWindow(this.jobForm.latGaode,this.jobForm.lngGaode,this.jobForm.wellCode)
       },
       //获取工单详情
       fetchData(id){
@@ -363,7 +366,7 @@
                   message: '接单成功',
                   position: 'bottom',
                 })
-                this.$router.push({name: 'job'})
+                this.closeTo()
               }
             })
           }
@@ -421,7 +424,7 @@
                   message: '现场确认成功',
                   position: 'bottom',
                 })
-                this.$router.push({name: 'job'})
+                this.closeTo()
               }
             })
           }
@@ -475,7 +478,7 @@
                   message: '结束工单成功',
                   position: 'bottom',
                 })
-                this.$router.push({name: 'job'})
+                this.closeTo()
               }
             })
           }
@@ -485,6 +488,17 @@
       showBigImage(src){
         this.bigImageVisible = true
         this.bigImageSrc = src
+      },
+      // 工单提交操作结束后的跳转
+      closeTo(){
+        // 如果来自搜索页面，跳转回搜索页面并传递刷新参数
+        if(fromPath=='/searchList'){
+          this.$router.replace({path:'/searchList',query:{refresh:true}})
+        }else if(fromPath=='/jobOvertime'){
+          this.$router.replace({path:'/jobOvertime',query:{refresh:true}})
+        }else{ // 如果来自工单页面，跳转回工单搜索页面并传递刷新参数
+          this.$router.replace({path:'/job',query:{refresh:true}})
+        }
       }
     }
   }
diff --git a/src/page/jobSearch/searchList.vue b/src/page/jobSearch/searchList.vue
index 3751755..d92c94d 100644
--- a/src/page/jobSearch/searchList.vue
+++ b/src/page/jobSearch/searchList.vue
@@ -127,7 +127,27 @@
         list: [],
         isLoading: true,
         total: 50,
-        listQuery: {},
+        listQuery: {
+          keywords: '', // 关键字
+          alarmLevel: '', // 告警等级
+          alarmType: '1', // 告警类型
+          alarmContent: '', // 告警内容
+          jobStatus: '', // 工单状态
+          beginTime: '点击选择开始时间', // 工单开始时间
+          endTime: '点击选择结束时间', // 工单结束时间
+          getJobBeginTime: '',// 接单开始时间
+          getJobEndTime: '',// 接单结束时间
+          shouldGetBeginTime: '',// 应接单开始时间
+          shouldGetEndTime: '',// 应接单结束时间
+          handleJobBeginTime: '',// 处理开始时间
+          handleJobEndTime: '',// 接单结束时间
+          shouldHandleBeginTime: '',// 应处理开始时间
+          shouldHandleEndTime: '',// 应处理结束时间
+          offset: 1,
+          limit: 20,
+          sort: '',
+          order: ''
+        },
         loadConf: {
           loadTopConf: {
             isFinish: false,  // 是否完成下拉
@@ -145,12 +165,23 @@
         }
       }
     },
-    mounted() {
-      this.listQuery = this.$route.query.listQuery
+    created() {
+      this.listQuery = {
+        keywords: this.$route.query.keywords, // 关键字
+        alarmLevel: this.$route.query.alarmLevel, // 告警等级
+        alarmType: this.$route.query.alarmType, // 告警类型
+        alarmContent: this.$route.query.alarmContent, // 告警内容
+        jobStatus: this.$route.query.jobStatus, // 工单状态
+        beginTime: this.$route.query.beginTime, // 工单开始时间
+        endTime: this.$route.query.endTime, // 工单结束时间
+        offset: this.$route.query.offset,
+        limit: this.$route.query.limit
+      }
       this.list = []
       this.isLoading = true
       this.loadTop()
     },
+    // 进入页面之前，判断是不是来自jobDetail
     beforeRouteEnter(to, from, next) {
       if (from.name) {
         if (from.name.indexOf('jobDetail') === -1) {
@@ -165,19 +196,38 @@
     },
     activated() {
       if (isFromDetail) { // 来自详情页面
-        this.$refs.wrapper.scrollTop = this.$store.getters.pageYOffset;
-      } else { // 滚动到最顶，数据初始化
+        // 如果refresh为true，刷新页面，否则不动
+        if(this.$route.query && this.$route.query.refresh){
+          this.isLoading = true
+          this.loadTop()
+          this.$refs.wrapper.scrollTop = 0
+        }else{
+          this.$refs.wrapper.scrollTop = this.$store.getters.pageYOffset;
+        }
+      } else { // 不是来自详情页面，获取参数，滚动到最顶，数据初始化
         this.list = []
-        this.listQuery = this.$route.query.listQuery
+        //1. 从路由获取参数
+        this.listQuery = {
+          keywords: this.$route.query.keywords, // 关键字
+          alarmLevel: this.$route.query.alarmLevel, // 告警等级
+          alarmType: this.$route.query.alarmType, // 告警类型
+          alarmContent: this.$route.query.alarmContent, // 告警内容
+          jobStatus: this.$route.query.jobStatus, // 工单状态
+          beginTime: this.$route.query.beginTime, // 工单开始时间
+          endTime: this.$route.query.endTime, // 工单结束时间
+          offset: this.$route.query.offset, // 页码
+          limit: this.$route.query.limit // 第几页
+        }
+        //2. 加载数据
         this.isLoading = true
         this.loadTop()
+        //3. 滚动到顶部
         this.$refs.wrapper.scrollTop = 0
       }
     },
     methods: {
       loadTop() {
         this.list = []
-        console.log('inHandleJobList:loadTop')
         this.isLoading = true
         this.flag = 0
         this.$refs.loadmore.onTopLoaded()
@@ -246,7 +296,6 @@
     margin-top 50px
     padding 0px 2vw
     overflow: scroll;
-    //height: calc(100vh - 135px)
     height: calc(100vh - 40px);
   }
 

diff --git a/src/page/jobManage/ChoosePeople.vue b/src/page/jobManage/ChoosePeople.vue
index 51b6daf..ed14f70 100644
--- a/src/page/jobManage/ChoosePeople.vue
+++ b/src/page/jobManage/ChoosePeople.vue
@@ -57,11 +57,14 @@
                   message: '转单成功',
                   position: 'bottom',
                 })
-                this.$router.push({name: 'job'})
+                this.closeTo()
               }
             })
           }
         })
+      },
+      closeTo(){
+        this.$router.push({name: 'job'})
       }
     }
   }
diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue
index ef6c264..687ce9d 100644
--- a/src/page/jobManage/JobManage.vue
+++ b/src/page/jobManage/JobManage.vue
@@ -66,7 +66,6 @@
       next()
     },
     activated(){
-      console.log('activated JobManage')
       if(!isFromDetail){
         if(this.$route.query && this.$route.query.tab){
           this.selected = this.$route.query.tab
diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue
index fd9fc63..fc96322 100644
--- a/src/page/jobManage/modules/JobDetail.vue
+++ b/src/page/jobManage/modules/JobDetail.vue
@@ -109,7 +109,7 @@
         </div>
         <div v-if="jobForm.editable==1" class="button-div">
           <mt-button v-if="winType=='waitGetJob'" type="primary" @click="getJob">接单</mt-button>
-          <mt-button v-if="winType=='waitGetJob'" type="default" @click="goToMap">到这里去</mt-button>
+          <mt-button v-if="winType=='waitGetJob'" type="default" @click="goToMap">地图位置</mt-button>
           <mt-button v-if="showTransferBtn" type="primary" @click="openTransferWin">转单</mt-button>
           <mt-button v-if="winType=='waitConfirmJob'" type="default" @click="confirmJob">提交</mt-button>
           <mt-button v-if="winType=='inHandleJob'" type="default" @click="overJob">提交</mt-button>
@@ -122,22 +122,20 @@
         <mt-popup v-model="bigImageVisible" class="imageShowPopup">
           <img :src="bigImageSrc" style="width: 100%; max-height: 100%"/>
         </mt-popup>
-
       </div>
-
-
     </div>
   </transition>
 </template>
 
 <script>
-  import {MessageBox, Indicator, Toast} from 'mint-ui'
+  import {MessageBox, Toast} from 'mint-ui'
   import Updatefile from '@/components/Updatefile'
   import { openMapWindow } from '@/utils/common'
   import { getJobInfo, getJob, confirmJob, overJob  } from '@/api/job'
   import ChoosePeople from "../ChoosePeople";
   import Loading from "../../../components/Loading/index";
   import {compareCalendar} from '@/utils/string'
+  let fromPath = '' // 跳转来的地址
   export default {
     name: "JobDetail",
     components:{
@@ -284,7 +282,11 @@
         return timeList
       }
     },
-    mounted(){
+    beforeRouteEnter(to,from,next){
+      fromPath = from.path
+      next()
+    },
+    created(){
       if(this.$route.params.id && this.$route.params.id!=''){
         this.fetchData(this.$route.params.id)
       }
@@ -305,7 +307,8 @@
       },
       //跳转地图
       goToMap(){
-        openMapWindow(this.jobForm.latGaode,this.jobForm.lngGaode,this.jobForm.wellCode)
+        this.$router.push({path:'/gaodeMap',query:{lng:this.jobForm.lngGaode,lat:this.jobForm.latGaode}})
+        // openMapWindow(this.jobForm.latGaode,this.jobForm.lngGaode,this.jobForm.wellCode)
       },
       //获取工单详情
       fetchData(id){
@@ -363,7 +366,7 @@
                   message: '接单成功',
                   position: 'bottom',
                 })
-                this.$router.push({name: 'job'})
+                this.closeTo()
               }
             })
           }
@@ -421,7 +424,7 @@
                   message: '现场确认成功',
                   position: 'bottom',
                 })
-                this.$router.push({name: 'job'})
+                this.closeTo()
               }
             })
           }
@@ -475,7 +478,7 @@
                   message: '结束工单成功',
                   position: 'bottom',
                 })
-                this.$router.push({name: 'job'})
+                this.closeTo()
               }
             })
           }
@@ -485,6 +488,17 @@
       showBigImage(src){
         this.bigImageVisible = true
         this.bigImageSrc = src
+      },
+      // 工单提交操作结束后的跳转
+      closeTo(){
+        // 如果来自搜索页面，跳转回搜索页面并传递刷新参数
+        if(fromPath=='/searchList'){
+          this.$router.replace({path:'/searchList',query:{refresh:true}})
+        }else if(fromPath=='/jobOvertime'){
+          this.$router.replace({path:'/jobOvertime',query:{refresh:true}})
+        }else{ // 如果来自工单页面，跳转回工单搜索页面并传递刷新参数
+          this.$router.replace({path:'/job',query:{refresh:true}})
+        }
       }
     }
   }
diff --git a/src/page/jobSearch/searchList.vue b/src/page/jobSearch/searchList.vue
index 3751755..d92c94d 100644
--- a/src/page/jobSearch/searchList.vue
+++ b/src/page/jobSearch/searchList.vue
@@ -127,7 +127,27 @@
         list: [],
         isLoading: true,
         total: 50,
-        listQuery: {},
+        listQuery: {
+          keywords: '', // 关键字
+          alarmLevel: '', // 告警等级
+          alarmType: '1', // 告警类型
+          alarmContent: '', // 告警内容
+          jobStatus: '', // 工单状态
+          beginTime: '点击选择开始时间', // 工单开始时间
+          endTime: '点击选择结束时间', // 工单结束时间
+          getJobBeginTime: '',// 接单开始时间
+          getJobEndTime: '',// 接单结束时间
+          shouldGetBeginTime: '',// 应接单开始时间
+          shouldGetEndTime: '',// 应接单结束时间
+          handleJobBeginTime: '',// 处理开始时间
+          handleJobEndTime: '',// 接单结束时间
+          shouldHandleBeginTime: '',// 应处理开始时间
+          shouldHandleEndTime: '',// 应处理结束时间
+          offset: 1,
+          limit: 20,
+          sort: '',
+          order: ''
+        },
         loadConf: {
           loadTopConf: {
             isFinish: false,  // 是否完成下拉
@@ -145,12 +165,23 @@
         }
       }
     },
-    mounted() {
-      this.listQuery = this.$route.query.listQuery
+    created() {
+      this.listQuery = {
+        keywords: this.$route.query.keywords, // 关键字
+        alarmLevel: this.$route.query.alarmLevel, // 告警等级
+        alarmType: this.$route.query.alarmType, // 告警类型
+        alarmContent: this.$route.query.alarmContent, // 告警内容
+        jobStatus: this.$route.query.jobStatus, // 工单状态
+        beginTime: this.$route.query.beginTime, // 工单开始时间
+        endTime: this.$route.query.endTime, // 工单结束时间
+        offset: this.$route.query.offset,
+        limit: this.$route.query.limit
+      }
       this.list = []
       this.isLoading = true
       this.loadTop()
     },
+    // 进入页面之前，判断是不是来自jobDetail
     beforeRouteEnter(to, from, next) {
       if (from.name) {
         if (from.name.indexOf('jobDetail') === -1) {
@@ -165,19 +196,38 @@
     },
     activated() {
       if (isFromDetail) { // 来自详情页面
-        this.$refs.wrapper.scrollTop = this.$store.getters.pageYOffset;
-      } else { // 滚动到最顶，数据初始化
+        // 如果refresh为true，刷新页面，否则不动
+        if(this.$route.query && this.$route.query.refresh){
+          this.isLoading = true
+          this.loadTop()
+          this.$refs.wrapper.scrollTop = 0
+        }else{
+          this.$refs.wrapper.scrollTop = this.$store.getters.pageYOffset;
+        }
+      } else { // 不是来自详情页面，获取参数，滚动到最顶，数据初始化
         this.list = []
-        this.listQuery = this.$route.query.listQuery
+        //1. 从路由获取参数
+        this.listQuery = {
+          keywords: this.$route.query.keywords, // 关键字
+          alarmLevel: this.$route.query.alarmLevel, // 告警等级
+          alarmType: this.$route.query.alarmType, // 告警类型
+          alarmContent: this.$route.query.alarmContent, // 告警内容
+          jobStatus: this.$route.query.jobStatus, // 工单状态
+          beginTime: this.$route.query.beginTime, // 工单开始时间
+          endTime: this.$route.query.endTime, // 工单结束时间
+          offset: this.$route.query.offset, // 页码
+          limit: this.$route.query.limit // 第几页
+        }
+        //2. 加载数据
         this.isLoading = true
         this.loadTop()
+        //3. 滚动到顶部
         this.$refs.wrapper.scrollTop = 0
       }
     },
     methods: {
       loadTop() {
         this.list = []
-        console.log('inHandleJobList:loadTop')
         this.isLoading = true
         this.flag = 0
         this.$refs.loadmore.onTopLoaded()
@@ -246,7 +296,6 @@
     margin-top 50px
     padding 0px 2vw
     overflow: scroll;
-    //height: calc(100vh - 135px)
     height: calc(100vh - 40px);
   }
 
diff --git a/src/page/jobSearch/searchPage.vue b/src/page/jobSearch/searchPage.vue
index 30b124c..365a44e 100644
--- a/src/page/jobSearch/searchPage.vue
+++ b/src/page/jobSearch/searchPage.vue
@@ -39,25 +39,10 @@
               </span>
             </div>
           </div>
-          <!--<mt-field label="接单开始时间" placeholder="" v-model="listQuery."></mt-field>-->
           <mt-cell title="创建开始时间" :value="listQuery.beginTime"
                    @click.native="openTimeSelectWindow('beginTimePicker')"></mt-cell>
           <mt-cell title="创建结束时间" :value="listQuery.endTime"
                    @click.native="openTimeSelectWindow('endTimePicker')"></mt-cell>
-          <!--<mt-cell title="接单时间" :value="listQuery.getJobBeginTime" @click.native="openTimeSelectWindow('getBeginTimePicker')"></mt-cell>-->
-          <!--<mt-cell title="" :value="listQuery.getJobEndTime" @click.native="openTimeSelectWindow('getEndTimePicker')"></mt-cell>-->
-          <!--<mt-cell title="应接单开始时间" :value="listQuery.shouldGetBeginTime" @click.native="openTimeSelectWindow('shouldGetBeginTimePicker')"></mt-cell>-->
-          <!--<mt-cell title="应接单结束时间" :value="listQuery.shouldGetEndTime" @click.native="openTimeSelectWindow('shouldGetEndTimePicker')"></mt-cell>-->
-          <!--<mt-cell title="处理开始时间" :value="listQuery.handleJobBeginTime" @click.native="openTimeSelectWindow('handleBeginTimePicker')"></mt-cell>-->
-          <!--<mt-cell title="处理结束时间" :value="listQuery.handleJobEndTime" @click.native="openTimeSelectWindow('handleEndTimePicker')"></mt-cell>-->
-          <!--<mt-cell title="应处理开始时间" :value="listQuery.shouldHandleBeginTime" @click.native="openTimeSelectWindow('shouldHandleBeginTimePicker')"></mt-cell>-->
-          <!--<mt-cell title="应处理结束时间" :value="listQuery.shouldHandleEndTime" @click.native="openTimeSelectWindow('shouldHandleEndTimePicker')"></mt-cell>-->
-          <!--<div class="well-info">-->
-          <!--<div class="search-name">接单开始时间</div>-->
-          <!--<div class="search-value">-->
-
-          <!--</div>-->
-          <!--</div>-->
           <div class="row-block">
             <mt-button class="search-btn" type="primary" @click="beginSearch()">查询</mt-button>
             <mt-button class="clear-btn" type="default" @click="cleanSearch()">清空</mt-button>
@@ -65,12 +50,6 @@
 
         </div>
       </div>
-      <!--<mt-popup-->
-      <!--v-model="popupVisible"-->
-      <!--position="bottom">-->
-      <!--<mt-picker :slots="levelList" @change="onValuesChange"></mt-picker>-->
-      <!--</mt-popup>-->
-      <!--时间选择器-->
       <div>
         <!--创建开始时间-->
         <mt-datetime-picker
@@ -92,86 +71,6 @@
           v-model="dateForm.endTime"
           @confirm="handleConfirm('endTime')">
         </mt-datetime-picker>
-        <!--接单开始时间-->
-        <mt-datetime-picker
-          ref="getBeginTimePicker"
-          type="date"
-          year-format="{value} 年"
-          month-format="{value} 月"
-          date-format="{value} 日"
-          v-model="dateForm.getJobBeginTime"
-          @confirm="handleConfirm('getJobBeginTime')">
-        </mt-datetime-picker>
-        <!--接单结束时间-->
-        <mt-datetime-picker
-          ref="getEndTimePicker"
-          type="date"
-          year-format="{value} 年"
-          month-format="{value} 月"
-          date-format="{value} 日"
-          v-model="dateForm.getJobEndTime"
-          @confirm="handleConfirm('getJobEndTime')">
-        </mt-datetime-picker>
-        <!--应接单开始时间-->
-        <mt-datetime-picker
-          ref="shouldGetBeginTimePicker"
-          type="date"
-          year-format="{value} 年"
-          month-format="{value} 月"
-          date-format="{value} 日"
-          v-model="dateForm.shouldGetBeginTime"
-          @confirm="handleConfirm('shouldGetBeginTime')">
-        </mt-datetime-picker>
-        <!--应接单结束时间-->
-        <mt-datetime-picker
-          ref="shouldGetEndTimePicker"
-          type="date"
-          year-format="{value} 年"
-          month-format="{value} 月"
-          date-format="{value} 日"
-          v-model="dateForm.shouldGetEndTime"
-          @confirm="handleConfirm('shouldGetEndTime')">
-        </mt-datetime-picker>
-        <!--处理开始时间-->
-        <mt-datetime-picker
-          ref="handleBeginTimePicker"
-          type="date"
-          year-format="{value} 年"
-          month-format="{value} 月"
-          date-format="{value} 日"
-          v-model="dateForm.handleJobBeginTime"
-          @confirm="handleConfirm('handleJobBeginTime')">
-        </mt-datetime-picker>
-        <!--处理结束时间-->
-        <mt-datetime-picker
-          ref="handleEndTimePicker"
-          type="date"
-          year-format="{value} 年"
-          month-format="{value} 月"
-          date-format="{value} 日"
-          v-model="dateForm.handleJobEndTime"
-          @confirm="handleConfirm('handleJobEndTime')">
-        </mt-datetime-picker>
-        <!--处理开始时间-->
-        <mt-datetime-picker
-          ref="shouldHandleBeginTimePicker"
-          type="date"
-          year-format="{value} 年"
-          month-format="{value} 月"
-          date-format="{value} 日"
-          v-model="dateForm.shouldHandleBeginTime"
-          @confirm="handleConfirm('shouldHandleBeginTime')">
-        </mt-datetime-picker>
-        <!--处理结束时间-->
-        <mt-datetime-picker
-          ref="shouldHandleEndTimePicker"
-          type="date"
-          year-format="{value} 年"
-          month-format="{value} 月"
-          date-format="{value} 日"
-          v-model="dateForm.shouldHandleEndTime"
-          @confirm="handleConfirm('shouldHandleEndTime')">
-        </mt-datetime-picker>
       </div>
     </div>
   </transition>
@@ -197,30 +96,12 @@
           jobStatus: '', // 工单状态
           beginTime: '点击选择开始时间', // 工单开始时间
           endTime: '点击选择结束时间', // 工单结束时间
-          getJobBeginTime: '',// 接单开始时间
-          getJobEndTime: '',// 接单结束时间
-          shouldGetBeginTime: '',// 应接单开始时间
-          shouldGetEndTime: '',// 应接单结束时间
-          handleJobBeginTime: '',// 处理开始时间
-          handleJobEndTime: '',// 接单结束时间
-          shouldHandleBeginTime: '',// 应处理开始时间
-          shouldHandleEndTime: '',// 应处理结束时间
           offset: 1,
           limit: 20,
-          sort: '',
-          order: ''
         }, // 筛选条件表单
         dateForm: {
           beginTime: new Date(),// 接单开始时间
           endTime: new Date(),// 接单结束时间
-          etJobBeginTime: new Date(),// 接单开始时间
-          getJobEndTime: new Date(),// 接单结束时间
-          shouldGetBeginTime: '',// 应接单开始时间
-          shouldGetEndTime: '',// 应接单结束时间
-          handleJobBeginTime: '',// 处理开始时间
-          handleJobEndTime: '',// 接单结束时间
-          shouldHandleBeginTime: '',// 应处理开始时间
-          shouldHandleEndTime: '',// 应处理结束时间
         },
         levelList: [
           {name: '全部', value: ''},
@@ -302,7 +183,7 @@
         if (listQuery.endTime === '点击选择结束时间') {
           listQuery.endTime = ''
         }
-        this.$router.push({name: 'searchList', query: {listQuery}})
+        this.$router.push({name: 'searchList', query: {...listQuery}})
       },
       cleanSearch() {
         this.listQuery = {

diff --git a/src/page/jobManage/ChoosePeople.vue b/src/page/jobManage/ChoosePeople.vue
index 51b6daf..ed14f70 100644
--- a/src/page/jobManage/ChoosePeople.vue
+++ b/src/page/jobManage/ChoosePeople.vue
@@ -57,11 +57,14 @@
                   message: '转单成功',
                   position: 'bottom',
                 })
-                this.$router.push({name: 'job'})
+                this.closeTo()
               }
             })
           }
         })
+      },
+      closeTo(){
+        this.$router.push({name: 'job'})
       }
     }
   }
diff --git a/src/page/jobManage/JobManage.vue b/src/page/jobManage/JobManage.vue
index ef6c264..687ce9d 100644
--- a/src/page/jobManage/JobManage.vue
+++ b/src/page/jobManage/JobManage.vue
@@ -66,7 +66,6 @@
       next()
     },
     activated(){
-      console.log('activated JobManage')
       if(!isFromDetail){
         if(this.$route.query && this.$route.query.tab){
           this.selected = this.$route.query.tab
diff --git a/src/page/jobManage/modules/JobDetail.vue b/src/page/jobManage/modules/JobDetail.vue
index fd9fc63..fc96322 100644
--- a/src/page/jobManage/modules/JobDetail.vue
+++ b/src/page/jobManage/modules/JobDetail.vue
@@ -109,7 +109,7 @@
         </div>
         <div v-if="jobForm.editable==1" class="button-div">
           <mt-button v-if="winType=='waitGetJob'" type="primary" @click="getJob">接单</mt-button>
-          <mt-button v-if="winType=='waitGetJob'" type="default" @click="goToMap">到这里去</mt-button>
+          <mt-button v-if="winType=='waitGetJob'" type="default" @click="goToMap">地图位置</mt-button>
           <mt-button v-if="showTransferBtn" type="primary" @click="openTransferWin">转单</mt-button>
           <mt-button v-if="winType=='waitConfirmJob'" type="default" @click="confirmJob">提交</mt-button>
           <mt-button v-if="winType=='inHandleJob'" type="default" @click="overJob">提交</mt-button>
@@ -122,22 +122,20 @@
         <mt-popup v-model="bigImageVisible" class="imageShowPopup">
           <img :src="bigImageSrc" style="width: 100%; max-height: 100%"/>
         </mt-popup>
-
       </div>
-
-
     </div>
   </transition>
 </template>
 
 <script>
-  import {MessageBox, Indicator, Toast} from 'mint-ui'
+  import {MessageBox, Toast} from 'mint-ui'
   import Updatefile from '@/components/Updatefile'
   import { openMapWindow } from '@/utils/common'
   import { getJobInfo, getJob, confirmJob, overJob  } from '@/api/job'
   import ChoosePeople from "../ChoosePeople";
   import Loading from "../../../components/Loading/index";
   import {compareCalendar} from '@/utils/string'
+  let fromPath = '' // 跳转来的地址
   export default {
     name: "JobDetail",
     components:{
@@ -284,7 +282,11 @@
         return timeList
       }
     },
-    mounted(){
+    beforeRouteEnter(to,from,next){
+      fromPath = from.path
+      next()
+    },
+    created(){
       if(this.$route.params.id && this.$route.params.id!=''){
         this.fetchData(this.$route.params.id)
       }
@@ -305,7 +307,8 @@
       },
       //跳转地图
       goToMap(){
-        openMapWindow(this.jobForm.latGaode,this.jobForm.lngGaode,this.jobForm.wellCode)
+        this.$router.push({path:'/gaodeMap',query:{lng:this.jobForm.lngGaode,lat:this.jobForm.latGaode}})
+        // openMapWindow(this.jobForm.latGaode,this.jobForm.lngGaode,this.jobForm.wellCode)
       },
       //获取工单详情
       fetchData(id){
@@ -363,7 +366,7 @@
                   message: '接单成功',
                   position: 'bottom',
                 })
-                this.$router.push({name: 'job'})
+                this.closeTo()
               }
             })
           }
@@ -421,7 +424,7 @@
                   message: '现场确认成功',
                   position: 'bottom',
                 })
-                this.$router.push({name: 'job'})
+                this.closeTo()
               }
             })
           }
@@ -475,7 +478,7 @@
                   message: '结束工单成功',
                   position: 'bottom',
                 })
-                this.$router.push({name: 'job'})
+                this.closeTo()
               }
             })
           }
@@ -485,6 +488,17 @@
       showBigImage(src){
         this.bigImageVisible = true
         this.bigImageSrc = src
+      },
+      // 工单提交操作结束后的跳转
+      closeTo(){
+        // 如果来自搜索页面，跳转回搜索页面并传递刷新参数
+        if(fromPath=='/searchList'){
+          this.$router.replace({path:'/searchList',query:{refresh:true}})
+        }else if(fromPath=='/jobOvertime'){
+          this.$router.replace({path:'/jobOvertime',query:{refresh:true}})
+        }else{ // 如果来自工单页面，跳转回工单搜索页面并传递刷新参数
+          this.$router.replace({path:'/job',query:{refresh:true}})
+        }
       }
     }
   }
diff --git a/src/page/jobSearch/searchList.vue b/src/page/jobSearch/searchList.vue
index 3751755..d92c94d 100644
--- a/src/page/jobSearch/searchList.vue
+++ b/src/page/jobSearch/searchList.vue
@@ -127,7 +127,27 @@
         list: [],
         isLoading: true,
         total: 50,
-        listQuery: {},
+        listQuery: {
+          keywords: '', // 关键字
+          alarmLevel: '', // 告警等级
+          alarmType: '1', // 告警类型
+          alarmContent: '', // 告警内容
+          jobStatus: '', // 工单状态
+          beginTime: '点击选择开始时间', // 工单开始时间
+          endTime: '点击选择结束时间', // 工单结束时间
+          getJobBeginTime: '',// 接单开始时间
+          getJobEndTime: '',// 接单结束时间
+          shouldGetBeginTime: '',// 应接单开始时间
+          shouldGetEndTime: '',// 应接单结束时间
+          handleJobBeginTime: '',// 处理开始时间
+          handleJobEndTime: '',// 接单结束时间
+          shouldHandleBeginTime: '',// 应处理开始时间
+          shouldHandleEndTime: '',// 应处理结束时间
+          offset: 1,
+          limit: 20,
+          sort: '',
+          order: ''
+        },
         loadConf: {
           loadTopConf: {
             isFinish: false,  // 是否完成下拉
@@ -145,12 +165,23 @@
         }
       }
     },
-    mounted() {
-      this.listQuery = this.$route.query.listQuery
+    created() {
+      this.listQuery = {
+        keywords: this.$route.query.keywords, // 关键字
+        alarmLevel: this.$route.query.alarmLevel, // 告警等级
+        alarmType: this.$route.query.alarmType, // 告警类型
+        alarmContent: this.$route.query.alarmContent, // 告警内容
+        jobStatus: this.$route.query.jobStatus, // 工单状态
+        beginTime: this.$route.query.beginTime, // 工单开始时间
+        endTime: this.$route.query.endTime, // 工单结束时间
+        offset: this.$route.query.offset,
+        limit: this.$route.query.limit
+      }
       this.list = []
       this.isLoading = true
       this.loadTop()
     },
+    // 进入页面之前，判断是不是来自jobDetail
     beforeRouteEnter(to, from, next) {
       if (from.name) {
         if (from.name.indexOf('jobDetail') === -1) {
@@ -165,19 +196,38 @@
     },
     activated() {
       if (isFromDetail) { // 来自详情页面
-        this.$refs.wrapper.scrollTop = this.$store.getters.pageYOffset;
-      } else { // 滚动到最顶，数据初始化
+        // 如果refresh为true，刷新页面，否则不动
+        if(this.$route.query && this.$route.query.refresh){
+          this.isLoading = true
+          this.loadTop()
+          this.$refs.wrapper.scrollTop = 0
+        }else{
+          this.$refs.wrapper.scrollTop = this.$store.getters.pageYOffset;
+        }
+      } else { // 不是来自详情页面，获取参数，滚动到最顶，数据初始化
         this.list = []
-        this.listQuery = this.$route.query.listQuery
+        //1. 从路由获取参数
+        this.listQuery = {
+          keywords: this.$route.query.keywords, // 关键字
+          alarmLevel: this.$route.query.alarmLevel, // 告警等级
+          alarmType: this.$route.query.alarmType, // 告警类型
+          alarmContent: this.$route.query.alarmContent, // 告警内容
+          jobStatus: this.$route.query.jobStatus, // 工单状态
+          beginTime: this.$route.query.beginTime, // 工单开始时间
+          endTime: this.$route.query.endTime, // 工单结束时间
+          offset: this.$route.query.offset, // 页码
+          limit: this.$route.query.limit // 第几页
+        }
+        //2. 加载数据
         this.isLoading = true
         this.loadTop()
+        //3. 滚动到顶部
         this.$refs.wrapper.scrollTop = 0
       }
     },
     methods: {
       loadTop() {
         this.list = []
-        console.log('inHandleJobList:loadTop')
         this.isLoading = true
         this.flag = 0
         this.$refs.loadmore.onTopLoaded()
@@ -246,7 +296,6 @@
     margin-top 50px
     padding 0px 2vw
     overflow: scroll;
-    //height: calc(100vh - 135px)
     height: calc(100vh - 40px);
   }
 
diff --git a/src/page/jobSearch/searchPage.vue b/src/page/jobSearch/searchPage.vue
index 30b124c..365a44e 100644
--- a/src/page/jobSearch/searchPage.vue
+++ b/src/page/jobSearch/searchPage.vue
@@ -39,25 +39,10 @@
               </span>
             </div>
           </div>
-          <!--<mt-field label="接单开始时间" placeholder="" v-model="listQuery."></mt-field>-->
           <mt-cell title="创建开始时间" :value="listQuery.beginTime"
                    @click.native="openTimeSelectWindow('beginTimePicker')"></mt-cell>
           <mt-cell title="创建结束时间" :value="listQuery.endTime"
                    @click.native="openTimeSelectWindow('endTimePicker')"></mt-cell>
-          <!--<mt-cell title="接单时间" :value="listQuery.getJobBeginTime" @click.native="openTimeSelectWindow('getBeginTimePicker')"></mt-cell>-->
-          <!--<mt-cell title="" :value="listQuery.getJobEndTime" @click.native="openTimeSelectWindow('getEndTimePicker')"></mt-cell>-->
-          <!--<mt-cell title="应接单开始时间" :value="listQuery.shouldGetBeginTime" @click.native="openTimeSelectWindow('shouldGetBeginTimePicker')"></mt-cell>-->
-          <!--<mt-cell title="应接单结束时间" :value="listQuery.shouldGetEndTime" @click.native="openTimeSelectWindow('shouldGetEndTimePicker')"></mt-cell>-->
-          <!--<mt-cell title="处理开始时间" :value="listQuery.handleJobBeginTime" @click.native="openTimeSelectWindow('handleBeginTimePicker')"></mt-cell>-->
-          <!--<mt-cell title="处理结束时间" :value="listQuery.handleJobEndTime" @click.native="openTimeSelectWindow('handleEndTimePicker')"></mt-cell>-->
-          <!--<mt-cell title="应处理开始时间" :value="listQuery.shouldHandleBeginTime" @click.native="openTimeSelectWindow('shouldHandleBeginTimePicker')"></mt-cell>-->
-          <!--<mt-cell title="应处理结束时间" :value="listQuery.shouldHandleEndTime" @click.native="openTimeSelectWindow('shouldHandleEndTimePicker')"></mt-cell>-->
-          <!--<div class="well-info">-->
-          <!--<div class="search-name">接单开始时间</div>-->
-          <!--<div class="search-value">-->
-
-          <!--</div>-->
-          <!--</div>-->
           <div class="row-block">
             <mt-button class="search-btn" type="primary" @click="beginSearch()">查询</mt-button>
             <mt-button class="clear-btn" type="default" @click="cleanSearch()">清空</mt-button>
@@ -65,12 +50,6 @@
 
         </div>
       </div>
-      <!--<mt-popup-->
-      <!--v-model="popupVisible"-->
-      <!--position="bottom">-->
-      <!--<mt-picker :slots="levelList" @change="onValuesChange"></mt-picker>-->
-      <!--</mt-popup>-->
-      <!--时间选择器-->
       <div>
         <!--创建开始时间-->
         <mt-datetime-picker
@@ -92,86 +71,6 @@
           v-model="dateForm.endTime"
           @confirm="handleConfirm('endTime')">
         </mt-datetime-picker>
-        <!--接单开始时间-->
-        <mt-datetime-picker
-          ref="getBeginTimePicker"
-          type="date"
-          year-format="{value} 年"
-          month-format="{value} 月"
-          date-format="{value} 日"
-          v-model="dateForm.getJobBeginTime"
-          @confirm="handleConfirm('getJobBeginTime')">
-        </mt-datetime-picker>
-        <!--接单结束时间-->
-        <mt-datetime-picker
-          ref="getEndTimePicker"
-          type="date"
-          year-format="{value} 年"
-          month-format="{value} 月"
-          date-format="{value} 日"
-          v-model="dateForm.getJobEndTime"
-          @confirm="handleConfirm('getJobEndTime')">
-        </mt-datetime-picker>
-        <!--应接单开始时间-->
-        <mt-datetime-picker
-          ref="shouldGetBeginTimePicker"
-          type="date"
-          year-format="{value} 年"
-          month-format="{value} 月"
-          date-format="{value} 日"
-          v-model="dateForm.shouldGetBeginTime"
-          @confirm="handleConfirm('shouldGetBeginTime')">
-        </mt-datetime-picker>
-        <!--应接单结束时间-->
-        <mt-datetime-picker
-          ref="shouldGetEndTimePicker"
-          type="date"
-          year-format="{value} 年"
-          month-format="{value} 月"
-          date-format="{value} 日"
-          v-model="dateForm.shouldGetEndTime"
-          @confirm="handleConfirm('shouldGetEndTime')">
-        </mt-datetime-picker>
-        <!--处理开始时间-->
-        <mt-datetime-picker
-          ref="handleBeginTimePicker"
-          type="date"
-          year-format="{value} 年"
-          month-format="{value} 月"
-          date-format="{value} 日"
-          v-model="dateForm.handleJobBeginTime"
-          @confirm="handleConfirm('handleJobBeginTime')">
-        </mt-datetime-picker>
-        <!--处理结束时间-->
-        <mt-datetime-picker
-          ref="handleEndTimePicker"
-          type="date"
-          year-format="{value} 年"
-          month-format="{value} 月"
-          date-format="{value} 日"
-          v-model="dateForm.handleJobEndTime"
-          @confirm="handleConfirm('handleJobEndTime')">
-        </mt-datetime-picker>
-        <!--处理开始时间-->
-        <mt-datetime-picker
-          ref="shouldHandleBeginTimePicker"
-          type="date"
-          year-format="{value} 年"
-          month-format="{value} 月"
-          date-format="{value} 日"
-          v-model="dateForm.shouldHandleBeginTime"
-          @confirm="handleConfirm('shouldHandleBeginTime')">
-        </mt-datetime-picker>
-        <!--处理结束时间-->
-        <mt-datetime-picker
-          ref="shouldHandleEndTimePicker"
-          type="date"
-          year-format="{value} 年"
-          month-format="{value} 月"
-          date-format="{value} 日"
-          v-model="dateForm.shouldHandleEndTime"
-          @confirm="handleConfirm('shouldHandleEndTime')">
-        </mt-datetime-picker>
       </div>
     </div>
   </transition>
@@ -197,30 +96,12 @@
           jobStatus: '', // 工单状态
           beginTime: '点击选择开始时间', // 工单开始时间
           endTime: '点击选择结束时间', // 工单结束时间
-          getJobBeginTime: '',// 接单开始时间
-          getJobEndTime: '',// 接单结束时间
-          shouldGetBeginTime: '',// 应接单开始时间
-          shouldGetEndTime: '',// 应接单结束时间
-          handleJobBeginTime: '',// 处理开始时间
-          handleJobEndTime: '',// 接单结束时间
-          shouldHandleBeginTime: '',// 应处理开始时间
-          shouldHandleEndTime: '',// 应处理结束时间
           offset: 1,
           limit: 20,
-          sort: '',
-          order: ''
         }, // 筛选条件表单
         dateForm: {
           beginTime: new Date(),// 接单开始时间
           endTime: new Date(),// 接单结束时间
-          etJobBeginTime: new Date(),// 接单开始时间
-          getJobEndTime: new Date(),// 接单结束时间
-          shouldGetBeginTime: '',// 应接单开始时间
-          shouldGetEndTime: '',// 应接单结束时间
-          handleJobBeginTime: '',// 处理开始时间
-          handleJobEndTime: '',// 接单结束时间
-          shouldHandleBeginTime: '',// 应处理开始时间
-          shouldHandleEndTime: '',// 应处理结束时间
         },
         levelList: [
           {name: '全部', value: ''},
@@ -302,7 +183,7 @@
         if (listQuery.endTime === '点击选择结束时间') {
           listQuery.endTime = ''
         }
-        this.$router.push({name: 'searchList', query: {listQuery}})
+        this.$router.push({name: 'searchList', query: {...listQuery}})
       },
       cleanSearch() {
         this.listQuery = {
diff --git a/src/page/overtimeJob/OvertimeJobManage.vue b/src/page/overtimeJob/OvertimeJobManage.vue
index 9203274..10eb209 100644
--- a/src/page/overtimeJob/OvertimeJobManage.vue
+++ b/src/page/overtimeJob/OvertimeJobManage.vue
@@ -41,7 +41,6 @@
       }
     },
     beforeRouteEnter(to, from, next) {
-      console.log('overtimeJobManage beforeRoute')
       if (from.name) {
         if (from.name.indexOf('jobDetail') === -1) {
           isFromDetail = false
@@ -53,18 +52,37 @@
       }
       next()
     },
+    created(){
+      // 刷新对应的Tab
+      const currentTab = this.selected
+      if(currentTab=='1'){
+        this.$refs.waitTab.loadTop()
+      }else if(currentTab=='2'){
+        this.$refs.confirmTab.loadTop()
+      }
+    },
     activated(){
-      console.log('activated JobManage')
       if (isFromDetail) { // 来自详情页面
-        //  不做处理
-      }else{// 否则需要刷新页面
+        // 如果refresh为true，刷新页面，否则不动
+        if(this.$route.query && this.$route.query.refresh){
+          const currentTab = this.selected
+          // 刷新对应的tab
+          if(currentTab=='1'){
+            this.$refs.waitTab.loadTop()
+          }else if(currentTab=='2'){
+            this.$refs.confirmTab.loadTop()
+          }
+        }else{ // 否则置为原位
+          this.$refs.wrapper.scrollTop = this.$store.getters.pageYOffset;
+        }
+      }else{// 否则需要刷新当前页面
         if(this.$route.query && this.$route.query.tab){
           this.selected = this.$route.query.tab
         }
-        const val = this.selected
-        if(val=='1'){
+        const currentTab = this.selected
+        if(currentTab=='1'){
           this.$refs.waitTab.loadTop()
-        }else if(val=='2'){
+        }else if(currentTab=='2'){
           this.$refs.confirmTab.loadTop()
         }
       }