diff --git a/src/page/overtimeJob/OvertimeJobManage.vue b/src/page/overtimeJob/OvertimeJobManage.vue
new file mode 100644
index 0000000..9203274
--- /dev/null
+++ b/src/page/overtimeJob/OvertimeJobManage.vue
@@ -0,0 +1,100 @@
+<template>
+  <transition name="slide">
+    <div class="index-container">
+      <!--标题-->
+      <mt-header class="header" title="工单管理" fixed>
+      </mt-header>
+      <!--列表主体-->
+      <div class="listbody">
+        <mt-navbar v-model="selected" fixed>
+          <mt-tab-item id="1">超时未接单</mt-tab-item>
+          <mt-tab-item id="2">超时未处理</mt-tab-item>
+        </mt-navbar>
+        <!-- tab-container -->
+        <mt-tab-container v-model="selected" swipeable>
+          <mt-tab-container-item id="1">
+            <overtime-get-job ref="waitTab"></overtime-get-job>
+          </mt-tab-container-item>
+          <mt-tab-container-item id="2">
+            <overtime-handle ref="confirmTab"></overtime-handle>
+          </mt-tab-container-item>
+        </mt-tab-container>
+      </div>
+      <tabbottom activeTabItem="JOB"/>
+    </div>
+  </transition>
+</template>
+
+<script>
+  import OvertimeGetJob from './modules/OvertimeGetJob'
+  import OvertimeHandle from './modules/OvertimeHandle'
+  let isFromDetail = false
+  export default {
+    name: "OvertimeJobManage",
+    components: {
+      OvertimeGetJob,
+      OvertimeHandle
+    },
+    data() {
+      return {
+        selected: '1'
+      }
+    },
+    beforeRouteEnter(to, from, next) {
+      console.log('overtimeJobManage beforeRoute')
+      if (from.name) {
+        if (from.name.indexOf('jobDetail') === -1) {
+          isFromDetail = false
+        } else {
+          isFromDetail = true
+        }
+      } else {
+        isFromDetail = false
+      }
+      next()
+    },
+    activated(){
+      console.log('activated JobManage')
+      if (isFromDetail) { // 来自详情页面
+        //  不做处理
+      }else{// 否则需要刷新页面
+        if(this.$route.query && this.$route.query.tab){
+          this.selected = this.$route.query.tab
+        }
+        const val = this.selected
+        if(val=='1'){
+          this.$refs.waitTab.loadTop()
+        }else if(val=='2'){
+          this.$refs.confirmTab.loadTop()
+        }
+      }
+    },
+    watch:{
+      selected(val){
+        console.log('watch selected val:'+val)
+        if(val=='1'){
+          this.$refs.waitTab.loadTop()
+        }else if(val=='2'){
+          this.$refs.confirmTab.loadTop()
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="stylus" rel="stylesheet/stylus" scoped>
+  .index-container {
+    .listbody {
+      margin-top 40px
+      margin-bottom 50px
+      .mint-navbar .mint-tab-item {
+        font-size: 0.9rem
+      }
+    }
+    .mint-tab-container-item {
+      background-color #f0f0f0
+      min-height: calc(100vh - 136px)
+    }
+  }
+
+</style>

diff --git a/src/page/overtimeJob/OvertimeJobManage.vue b/src/page/overtimeJob/OvertimeJobManage.vue
new file mode 100644
index 0000000..9203274
--- /dev/null
+++ b/src/page/overtimeJob/OvertimeJobManage.vue
@@ -0,0 +1,100 @@
+<template>
+  <transition name="slide">
+    <div class="index-container">
+      <!--标题-->
+      <mt-header class="header" title="工单管理" fixed>
+      </mt-header>
+      <!--列表主体-->
+      <div class="listbody">
+        <mt-navbar v-model="selected" fixed>
+          <mt-tab-item id="1">超时未接单</mt-tab-item>
+          <mt-tab-item id="2">超时未处理</mt-tab-item>
+        </mt-navbar>
+        <!-- tab-container -->
+        <mt-tab-container v-model="selected" swipeable>
+          <mt-tab-container-item id="1">
+            <overtime-get-job ref="waitTab"></overtime-get-job>
+          </mt-tab-container-item>
+          <mt-tab-container-item id="2">
+            <overtime-handle ref="confirmTab"></overtime-handle>
+          </mt-tab-container-item>
+        </mt-tab-container>
+      </div>
+      <tabbottom activeTabItem="JOB"/>
+    </div>
+  </transition>
+</template>
+
+<script>
+  import OvertimeGetJob from './modules/OvertimeGetJob'
+  import OvertimeHandle from './modules/OvertimeHandle'
+  let isFromDetail = false
+  export default {
+    name: "OvertimeJobManage",
+    components: {
+      OvertimeGetJob,
+      OvertimeHandle
+    },
+    data() {
+      return {
+        selected: '1'
+      }
+    },
+    beforeRouteEnter(to, from, next) {
+      console.log('overtimeJobManage beforeRoute')
+      if (from.name) {
+        if (from.name.indexOf('jobDetail') === -1) {
+          isFromDetail = false
+        } else {
+          isFromDetail = true
+        }
+      } else {
+        isFromDetail = false
+      }
+      next()
+    },
+    activated(){
+      console.log('activated JobManage')
+      if (isFromDetail) { // 来自详情页面
+        //  不做处理
+      }else{// 否则需要刷新页面
+        if(this.$route.query && this.$route.query.tab){
+          this.selected = this.$route.query.tab
+        }
+        const val = this.selected
+        if(val=='1'){
+          this.$refs.waitTab.loadTop()
+        }else if(val=='2'){
+          this.$refs.confirmTab.loadTop()
+        }
+      }
+    },
+    watch:{
+      selected(val){
+        console.log('watch selected val:'+val)
+        if(val=='1'){
+          this.$refs.waitTab.loadTop()
+        }else if(val=='2'){
+          this.$refs.confirmTab.loadTop()
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="stylus" rel="stylesheet/stylus" scoped>
+  .index-container {
+    .listbody {
+      margin-top 40px
+      margin-bottom 50px
+      .mint-navbar .mint-tab-item {
+        font-size: 0.9rem
+      }
+    }
+    .mint-tab-container-item {
+      background-color #f0f0f0
+      min-height: calc(100vh - 136px)
+    }
+  }
+
+</style>
diff --git a/src/page/overtimeJob/modules/OvertimeGetJob.vue b/src/page/overtimeJob/modules/OvertimeGetJob.vue
new file mode 100644
index 0000000..3caec3d
--- /dev/null
+++ b/src/page/overtimeJob/modules/OvertimeGetJob.vue
@@ -0,0 +1,197 @@
+<template>
+  <div class="joblist">
+    <Loading v-show="isLoading"/>
+    <mt-loadmore
+      :top-method="loadTop"
+      :topPullText="loadConf.loadTopConf.topPullText"
+      :topDropText="loadConf.loadTopConf.topDropText"
+      :topLoadingText="loadConf.loadTopConf.topLoadingText"
+      :bottom-method="loadBottom"
+      :bottomAllLoaded="loadConf.loadBottomConf.isFinish"
+      :bottomPullText="loadConf.loadBottomConf.bottomPullText"
+      :bottomDropText="loadConf.loadBottomConf.bottomDropText"
+      :bottomLoadingText="loadConf.loadBottomConf.bottomLoadingText"
+      ref="loadmore"
+      class="loadmore-content"
+    >
+      <ul class="list-ul">
+        <li class="list-li" v-for="item in list" @click="goJobDetail(item.id)">
+          <div class="job-card">
+            <div class="card-left">
+              <div>
+                <span class="card-alarm">{{item.alarmContentName}}</span>
+                <span class="card-wellcode">{{item.wellCode}}</span>
+              </div>
+              <div class="card-position">
+                <span>{{item.position}}</span>
+              </div>
+            </div>
+            <div class="card-right">
+              <mt-button type="primary" size="small" @click.stop="getJob(item.id)">接单</mt-button>
+            </div>
+            <div class="clear-float"></div>
+          </div>
+        </li>
+      </ul>
+      <div class="no-content" v-show="list.length<1">暂无待处理工单</div>
+      <div class="no-content" v-show="list.length>10 && loadConf.loadBottomConf.isFinish">已经到底了</div>
+    </mt-loadmore>
+  </div>
+</template>
+
+<script>
+  import {MessageBox, Indicator, Toast} from 'mint-ui'
+  import Loading from '@/components/Loading'
+  import { getOvertimeGetList, getJob } from '@/api/job'
+  export default {
+    name: "OvertimeGetJob",
+    components: {Loading},
+    data(){
+      return {
+        list:[],
+        total: 50,
+        isLoading:true,
+        listQuery: {
+          jobStatus: '0',
+          offset: 1,
+          limit: 10,
+          sort: '',
+          order: ''
+        },
+        loadConf: {
+          loadTopConf: {
+            isFinish: false,  // 是否完成下拉
+            topPullText: '下拉刷新',
+            topDropText: '松开刷新',
+            topLoadingText: '刷新中'
+          },
+          loadBottomConf: {
+            isFinish: false,  // 是否完成上拉
+            bottomPullText: '',
+            bottomDropText: '释放获取内容',
+            bottomLoadingText: '加载中',
+            count: 1, // 模拟次数
+          }
+        }
+      }
+    },
+    // mounted(){
+    //   this.list = []
+    //   this.isLoading = true
+    //   this.loadTop()
+    // },
+    methods:{
+      loadTop() {
+        this.list = []
+        this.isLoading = true
+        console.log('waiGetJobList:loadTop')
+        this.$refs.loadmore.onTopLoaded()
+        //页码置1
+        this.listQuery.offset=1
+        this.loadConf.loadBottomConf.isFinish = false
+
+        getOvertimeGetList(this.listQuery).then(response => {
+          this.listQuery.offset+=1
+          this.list = []
+          this.isLoading = false
+          for(let item of response.data.rows){
+            item.showTimeline = false
+            this.list.push(item)
+          }
+          if (this.list.length >= this.total) {
+            this.loadConf.loadBottomConf.isFinish = true
+            this.$refs.loadmore.onBottomLoaded();
+          }
+        })
+      },
+      loadBottom() {
+        if (this.list.length >= this.total) {
+          this.loadConf.loadBottomConf.isFinish = true
+          this.$refs.loadmore.onBottomLoaded();
+        } else {
+          getOvertimeGetList(this.listQuery).then(response => {
+            this.listQuery.offset+=1
+            this.list = this.list.concat(response.data.rows)
+            this.total = parseInt(response.data.total)
+            this.$refs.loadmore.onBottomLoaded()
+            this.isLoading = false
+          })
+        }
+      },
+      goJobDetail(id){
+        this.$router.push({
+          path :`/jobDetail/${id}`
+        })
+      },
+      getJob(id){
+        MessageBox.confirm('确定要接单吗?').then(action => {
+          if(action=='confirm'){
+            getJob(id).then(response => {
+              if(response.code==200){
+                Toast({
+                  message: '接单成功',
+                  position: 'bottom',
+                })
+                this.loadTop()
+              }
+            })
+          }
+        })
+      },
+    }
+  }
+</script>
+
+<style lang="stylus" rel="stylesheet/stylus" scoped>
+  .joblist {
+    margin-top 50px
+    padding 0px 2vw
+    overflow scroll;
+    height  calc( 100vh - 135px  );
+  }
+  .list-li {
+    margin-top 1vw;
+    border 1px solid #f0f0f0
+    background-color #ffffff
+    min-height 80px
+  }
+  .job-card {
+    .card-left {
+      width 70%
+      float left
+      padding 15px 15px
+      .card-alarm {
+        margin-top 5px
+        font-size: 1rem
+        font-weight 500
+        color #f7615a
+      }
+      .card-wellcode {
+        margin-left 10px
+        font-size: 0.8rem
+      }
+      .card-welltype {
+        margin-left 10px
+        font-size 0.8rem
+        color #13ad00
+      }
+      .card-position {
+        margin-top 18px
+        font-size 0.8rem
+        line-height 0.9rem
+        color #646464
+      }
+    }
+    .card-right {
+      height: 100%
+      width 20%
+      padding-top: 1px
+      float: left
+      .mint-button{
+        /*margin-top:7px*/
+        margin-top 20px
+        margin-left 10px
+      }
+    }
+  }
+</style>

diff --git a/src/page/overtimeJob/OvertimeJobManage.vue b/src/page/overtimeJob/OvertimeJobManage.vue
new file mode 100644
index 0000000..9203274
--- /dev/null
+++ b/src/page/overtimeJob/OvertimeJobManage.vue
@@ -0,0 +1,100 @@
+<template>
+  <transition name="slide">
+    <div class="index-container">
+      <!--标题-->
+      <mt-header class="header" title="工单管理" fixed>
+      </mt-header>
+      <!--列表主体-->
+      <div class="listbody">
+        <mt-navbar v-model="selected" fixed>
+          <mt-tab-item id="1">超时未接单</mt-tab-item>
+          <mt-tab-item id="2">超时未处理</mt-tab-item>
+        </mt-navbar>
+        <!-- tab-container -->
+        <mt-tab-container v-model="selected" swipeable>
+          <mt-tab-container-item id="1">
+            <overtime-get-job ref="waitTab"></overtime-get-job>
+          </mt-tab-container-item>
+          <mt-tab-container-item id="2">
+            <overtime-handle ref="confirmTab"></overtime-handle>
+          </mt-tab-container-item>
+        </mt-tab-container>
+      </div>
+      <tabbottom activeTabItem="JOB"/>
+    </div>
+  </transition>
+</template>
+
+<script>
+  import OvertimeGetJob from './modules/OvertimeGetJob'
+  import OvertimeHandle from './modules/OvertimeHandle'
+  let isFromDetail = false
+  export default {
+    name: "OvertimeJobManage",
+    components: {
+      OvertimeGetJob,
+      OvertimeHandle
+    },
+    data() {
+      return {
+        selected: '1'
+      }
+    },
+    beforeRouteEnter(to, from, next) {
+      console.log('overtimeJobManage beforeRoute')
+      if (from.name) {
+        if (from.name.indexOf('jobDetail') === -1) {
+          isFromDetail = false
+        } else {
+          isFromDetail = true
+        }
+      } else {
+        isFromDetail = false
+      }
+      next()
+    },
+    activated(){
+      console.log('activated JobManage')
+      if (isFromDetail) { // 来自详情页面
+        //  不做处理
+      }else{// 否则需要刷新页面
+        if(this.$route.query && this.$route.query.tab){
+          this.selected = this.$route.query.tab
+        }
+        const val = this.selected
+        if(val=='1'){
+          this.$refs.waitTab.loadTop()
+        }else if(val=='2'){
+          this.$refs.confirmTab.loadTop()
+        }
+      }
+    },
+    watch:{
+      selected(val){
+        console.log('watch selected val:'+val)
+        if(val=='1'){
+          this.$refs.waitTab.loadTop()
+        }else if(val=='2'){
+          this.$refs.confirmTab.loadTop()
+        }
+      }
+    }
+  }
+</script>
+
+<style lang="stylus" rel="stylesheet/stylus" scoped>
+  .index-container {
+    .listbody {
+      margin-top 40px
+      margin-bottom 50px
+      .mint-navbar .mint-tab-item {
+        font-size: 0.9rem
+      }
+    }
+    .mint-tab-container-item {
+      background-color #f0f0f0
+      min-height: calc(100vh - 136px)
+    }
+  }
+
+</style>
diff --git a/src/page/overtimeJob/modules/OvertimeGetJob.vue b/src/page/overtimeJob/modules/OvertimeGetJob.vue
new file mode 100644
index 0000000..3caec3d
--- /dev/null
+++ b/src/page/overtimeJob/modules/OvertimeGetJob.vue
@@ -0,0 +1,197 @@
+<template>
+  <div class="joblist">
+    <Loading v-show="isLoading"/>
+    <mt-loadmore
+      :top-method="loadTop"
+      :topPullText="loadConf.loadTopConf.topPullText"
+      :topDropText="loadConf.loadTopConf.topDropText"
+      :topLoadingText="loadConf.loadTopConf.topLoadingText"
+      :bottom-method="loadBottom"
+      :bottomAllLoaded="loadConf.loadBottomConf.isFinish"
+      :bottomPullText="loadConf.loadBottomConf.bottomPullText"
+      :bottomDropText="loadConf.loadBottomConf.bottomDropText"
+      :bottomLoadingText="loadConf.loadBottomConf.bottomLoadingText"
+      ref="loadmore"
+      class="loadmore-content"
+    >
+      <ul class="list-ul">
+        <li class="list-li" v-for="item in list" @click="goJobDetail(item.id)">
+          <div class="job-card">
+            <div class="card-left">
+              <div>
+                <span class="card-alarm">{{item.alarmContentName}}</span>
+                <span class="card-wellcode">{{item.wellCode}}</span>
+              </div>
+              <div class="card-position">
+                <span>{{item.position}}</span>
+              </div>
+            </div>
+            <div class="card-right">
+              <mt-button type="primary" size="small" @click.stop="getJob(item.id)">接单</mt-button>
+            </div>
+            <div class="clear-float"></div>
+          </div>
+        </li>
+      </ul>
+      <div class="no-content" v-show="list.length<1">暂无待处理工单</div>
+      <div class="no-content" v-show="list.length>10 && loadConf.loadBottomConf.isFinish">已经到底了</div>
+    </mt-loadmore>
+  </div>
+</template>
+
+<script>
+  import {MessageBox, Indicator, Toast} from 'mint-ui'
+  import Loading from '@/components/Loading'
+  import { getOvertimeGetList, getJob } from '@/api/job'
+  export default {
+    name: "OvertimeGetJob",
+    components: {Loading},
+    data(){
+      return {
+        list:[],
+        total: 50,
+        isLoading:true,
+        listQuery: {
+          jobStatus: '0',
+          offset: 1,
+          limit: 10,
+          sort: '',
+          order: ''
+        },
+        loadConf: {
+          loadTopConf: {
+            isFinish: false,  // 是否完成下拉
+            topPullText: '下拉刷新',
+            topDropText: '松开刷新',
+            topLoadingText: '刷新中'
+          },
+          loadBottomConf: {
+            isFinish: false,  // 是否完成上拉
+            bottomPullText: '',
+            bottomDropText: '释放获取内容',
+            bottomLoadingText: '加载中',
+            count: 1, // 模拟次数
+          }
+        }
+      }
+    },
+    // mounted(){
+    //   this.list = []
+    //   this.isLoading = true
+    //   this.loadTop()
+    // },
+    methods:{
+      loadTop() {
+        this.list = []
+        this.isLoading = true
+        console.log('waiGetJobList:loadTop')
+        this.$refs.loadmore.onTopLoaded()
+        //页码置1
+        this.listQuery.offset=1
+        this.loadConf.loadBottomConf.isFinish = false
+
+        getOvertimeGetList(this.listQuery).then(response => {
+          this.listQuery.offset+=1
+          this.list = []
+          this.isLoading = false
+          for(let item of response.data.rows){
+            item.showTimeline = false
+            this.list.push(item)
+          }
+          if (this.list.length >= this.total) {
+            this.loadConf.loadBottomConf.isFinish = true
+            this.$refs.loadmore.onBottomLoaded();
+          }
+        })
+      },
+      loadBottom() {
+        if (this.list.length >= this.total) {
+          this.loadConf.loadBottomConf.isFinish = true
+          this.$refs.loadmore.onBottomLoaded();
+        } else {
+          getOvertimeGetList(this.listQuery).then(response => {
+            this.listQuery.offset+=1
+            this.list = this.list.concat(response.data.rows)
+            this.total = parseInt(response.data.total)
+            this.$refs.loadmore.onBottomLoaded()
+            this.isLoading = false
+          })
+        }
+      },
+      goJobDetail(id){
+        this.$router.push({
+          path :`/jobDetail/${id}`
+        })
+      },
+      getJob(id){
+        MessageBox.confirm('确定要接单吗?').then(action => {
+          if(action=='confirm'){
+            getJob(id).then(response => {
+              if(response.code==200){
+                Toast({
+                  message: '接单成功',
+                  position: 'bottom',
+                })
+                this.loadTop()
+              }
+            })
+          }
+        })
+      },
+    }
+  }
+</script>
+
+<style lang="stylus" rel="stylesheet/stylus" scoped>
+  .joblist {
+    margin-top 50px
+    padding 0px 2vw
+    overflow scroll;
+    height  calc( 100vh - 135px  );
+  }
+  .list-li {
+    margin-top 1vw;
+    border 1px solid #f0f0f0
+    background-color #ffffff
+    min-height 80px
+  }
+  .job-card {
+    .card-left {
+      width 70%
+      float left
+      padding 15px 15px
+      .card-alarm {
+        margin-top 5px
+        font-size: 1rem
+        font-weight 500
+        color #f7615a
+      }
+      .card-wellcode {
+        margin-left 10px
+        font-size: 0.8rem
+      }
+      .card-welltype {
+        margin-left 10px
+        font-size 0.8rem
+        color #13ad00
+      }
+      .card-position {
+        margin-top 18px
+        font-size 0.8rem
+        line-height 0.9rem
+        color #646464
+      }
+    }
+    .card-right {
+      height: 100%
+      width 20%
+      padding-top: 1px
+      float: left
+      .mint-button{
+        /*margin-top:7px*/
+        margin-top 20px
+        margin-left 10px
+      }
+    }
+  }
+</style>
diff --git a/src/page/overtimeJob/modules/OvertimeHandle.vue b/src/page/overtimeJob/modules/OvertimeHandle.vue
new file mode 100644
index 0000000..a655101
--- /dev/null
+++ b/src/page/overtimeJob/modules/OvertimeHandle.vue
@@ -0,0 +1,218 @@
+<template>
+  <div class="joblist">
+    <Loading v-show="isLoading" ></Loading>
+    <mt-loadmore
+      :top-method="loadTop"
+      :topPullText="loadConf.loadTopConf.topPullText"
+      :topDropText="loadConf.loadTopConf.topDropText"
+      :topLoadingText="loadConf.loadTopConf.topLoadingText"
+      :bottom-method="loadBottom"
+      :bottomAllLoaded="loadConf.loadBottomConf.isFinish"
+      :bottomPullText="loadConf.loadBottomConf.bottomPullText"
+      :bottomDropText="loadConf.loadBottomConf.bottomDropText"
+      :bottomLoadingText="loadConf.loadBottomConf.bottomLoadingText"
+      ref="loadmore"
+      class="loadmore-content"
+    >
+      <ul class="list-ul">
+        <li class="list-li" v-for="item in list" @click="goJobDetail(item.id)">
+          <div class="job-card">
+            <div class="card-brief">
+            <div class="card-left">
+              <div>
+                <span class="card-alarm">{{item.alarmContentName}}</span>
+                <span class="card-wellcode">{{item.wellCode}}</span>
+                <span class="card-createtime">{{item.createTime}}</span>
+              </div>
+              <div class="card-position">
+                <span>{{item.position}}</span>
+              </div>
+            </div>
+            <div class="clear-float"></div>
+            </div>
+            <div class="time-line">
+            <timeline>
+              <timeline-title v-if="item.jobStatus=='2'" bg-color="#26a2ff">{{item.jobBelongTo}}正在处理...</timeline-title>
+              <timeline-title v-if="item.jobStatus=='1'" bg-color="#26a2ff">{{item.jobBelongTo}}正在确认...</timeline-title>
+              <div v-if="item.showTimeline">
+                <timeline-item>
+                  <span class="timeline-left">{{item.createTime}}</span> <span class="timeline-right">发起工单</span>
+                </timeline-item>
+                <timeline-item>
+                  <span class="timeline-left">{{item.getJobTime}}</span> <span class="timeline-right">{{item.getJobPerson}}接单</span>
+                </timeline-item>
+                <timeline-item v-if="item.jobStatus=='2'">
+                  <span class="timeline-left">{{item.confirmJobTime}}</span> <span class="timeline-right">{{item.confirmJobPerson}}确认工单</span>
+                </timeline-item>
+                <div class="detail-btn" @click.stop="item.showTimeline=!item.showTimeline">
+                  <i class="iconfont icon-fanhui3"></i>
+                </div>
+              </div>
+              <div class="detail-btn" v-else @click.stop="item.showTimeline=!item.showTimeline">
+                <i class="iconfont icon-31xiala"></i>
+              </div>
+            </timeline>
+            </div>
+          </div>
+        </li>
+      </ul>
+      <div class="no-content" v-show="list.length<1">暂无处理中工单</div>
+      <div class="no-content" v-show="list.length>10 && loadConf.loadBottomConf.isFinish">已经到底了</div>
+    </mt-loadmore>
+  </div>
+</template>
+
+<script>
+  import { Timeline, TimelineItem, TimelineTitle } from 'vue-cute-timeline'
+  import {Loadmore, Indicator, Toast} from 'mint-ui'
+  import Loading from '@/components/Loading'
+  import { getOvertimeHandleList } from '@/api/job'
+  let isFromDetail = false
+
+  export default {
+    name: "InHandleJob",
+    components:{
+      Timeline,
+      TimelineItem,
+      TimelineTitle,
+      Loading
+    },
+    data(){
+      return {
+        list:[],
+        isLoading:true,
+        total: 50,
+        listQuery: {
+          jobStatus: '2',
+          offset: 1,
+          limit: 10,
+          sort: '',
+          order: ''
+        },
+        loadConf: {
+          loadTopConf: {
+            isFinish: false,  // 是否完成下拉
+            topPullText: '下拉刷新',
+            topDropText: '松开刷新',
+            topLoadingText: '刷新中'
+          },
+          loadBottomConf: {
+            isFinish: false,  // 是否完成上拉
+            bottomPullText: '',
+            bottomDropText: '释放获取内容',
+            bottomLoadingText: '加载中',
+            count: 1, // 模拟次数
+          }
+        }
+      }
+    },
+    methods:{
+      loadTop() {
+        this.list = []
+        console.log('inHandleJobList:loadTop')
+        this.isLoading = true
+        this.flag = 0
+        this.$refs.loadmore.onTopLoaded()
+        this.listQuery.offset=1
+        this.loadConf.loadBottomConf.isFinish = false
+        getOvertimeHandleList(this.listQuery).then(response => {
+          this.listQuery.offset+=1
+          this.list = []
+          this.isLoading = false
+          for(let item of response.data.rows){
+            item.showTimeline = false
+            this.list.push(item)
+          }
+          if (this.list.length >= this.total) {
+            this.loadConf.loadBottomConf.isFinish = true
+            this.$refs.loadmore.onBottomLoaded();
+          }
+        })
+      },
+      loadBottom() {
+        console.log('loadbottom')
+        if (this.list.length >= this.total) {
+          this.loadConf.loadBottomConf.isFinish = true
+          this.$refs.loadmore.onBottomLoaded();
+        } else {
+          getOvertimeHandleList(this.listQuery).then(response => {
+            console.log('getOvertimeHandleList')
+            this.listQuery.offset+=1
+            for(let item of response.data.rows){
+              item.showTimeline = false
+              this.list.push(item)
+              console.log(this.list.length)
+            }
+            this.total = parseInt(response.data.total)
+            this.$refs.loadmore.onBottomLoaded();
+            this.isLoading = false
+          })
+        }
+      },
+      goJobDetail(id){
+        this.$router.push({
+          path :`/jobDetail/${id}`
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="stylus" rel="stylesheet/stylus" scoped>
+  .joblist {
+    margin-top 50px
+    padding 0px 2vw
+    overflow: scroll;
+    height: calc( 100vh - 135px  );
+  }
+  .list-li {
+    margin-top 1vw;
+    border 1px solid #f0f0f0
+    background-color #ffffff
+    min-height 80px
+  }
+  .job-card {
+    .card-left {
+      width 90%
+      float left
+      padding 15px 15px
+      .card-alarm {
+        margin-top 5px
+        font-size: 1rem
+        font-weight 500
+        color #f7615a
+      }
+      .card-wellcode {
+        margin-left 10px
+        font-size: 0.8rem
+      }
+      .card-welltype {
+        margin-left 10px
+        font-size 0.8rem
+        color #13ad00
+      }
+      .card-createtime{
+        margin-top 5px
+        float right
+        font-size 0.8rem
+        color #bbbbbb
+      }
+      .card-position {
+        margin-top 18px
+        font-size 0.8rem
+        line-height 0.9rem
+        color #646464
+      }
+    }
+    .timeline-right{
+      float right
+    }
+    .detail-btn{
+      height 1rem
+      text-align center
+      i{
+        font-size:1rem
+      }
+    }
+  }
+</style>