diff --git a/src/page/overtimeJob/modules/OvertimeGetJob.vue b/src/page/overtimeJob/modules/OvertimeGetJob.vue index 3caec3d..7b955dc 100644 --- a/src/page/overtimeJob/modules/OvertimeGetJob.vue +++ b/src/page/overtimeJob/modules/OvertimeGetJob.vue @@ -20,20 +20,26 @@
{{item.alarmContentName}} - {{item.wellCode}} + {{item.createTime}}
-
- {{item.position}} +
+ {{item.wellCode}}
-
-
- 接单 +
+
+ {{item.position}} +
+
+ 接单 +
+
+
-
暂无待处理工单
+
暂无超时未接工单
已经到底了
@@ -157,7 +163,7 @@ } .job-card { .card-left { - width 70% + width 90% float left padding 15px 15px .card-alarm { @@ -167,31 +173,43 @@ color #f7615a } .card-wellcode { - margin-left 10px + margin-top 12px font-size: 0.8rem } + .card-createtime { + margin-top 5px + float right + font-size 0.8rem + color #bbbbbb + } .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-info { + .card-position { + margin-top 18px + font-size 0.8rem + line-height 0.9rem + color #646464 + width 70% + float: left; + } + .card-right { + height: 100% + width 70px; + padding-top: 1px + float: right + text-align: right + .mint-button { + /*margin-top:7px*/ + /*margin-top 20px*/ + margin-left 10px + } + } } - } - .card-right { - height: 100% - width 20% - padding-top: 1px - float: left - .mint-button{ - /*margin-top:7px*/ - margin-top 20px - margin-left 10px - } + } } diff --git a/src/page/overtimeJob/modules/OvertimeGetJob.vue b/src/page/overtimeJob/modules/OvertimeGetJob.vue index 3caec3d..7b955dc 100644 --- a/src/page/overtimeJob/modules/OvertimeGetJob.vue +++ b/src/page/overtimeJob/modules/OvertimeGetJob.vue @@ -20,20 +20,26 @@
{{item.alarmContentName}} - {{item.wellCode}} + {{item.createTime}}
-
- {{item.position}} +
+ {{item.wellCode}}
-
-
- 接单 +
+
+ {{item.position}} +
+
+ 接单 +
+
+
-
暂无待处理工单
+
暂无超时未接工单
已经到底了
@@ -157,7 +163,7 @@ } .job-card { .card-left { - width 70% + width 90% float left padding 15px 15px .card-alarm { @@ -167,31 +173,43 @@ color #f7615a } .card-wellcode { - margin-left 10px + margin-top 12px font-size: 0.8rem } + .card-createtime { + margin-top 5px + float right + font-size 0.8rem + color #bbbbbb + } .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-info { + .card-position { + margin-top 18px + font-size 0.8rem + line-height 0.9rem + color #646464 + width 70% + float: left; + } + .card-right { + height: 100% + width 70px; + padding-top: 1px + float: right + text-align: right + .mint-button { + /*margin-top:7px*/ + /*margin-top 20px*/ + margin-left 10px + } + } } - } - .card-right { - height: 100% - width 20% - padding-top: 1px - float: left - .mint-button{ - /*margin-top:7px*/ - margin-top 20px - margin-left 10px - } + } } diff --git a/src/page/overtimeJob/modules/OvertimeHandle.vue b/src/page/overtimeJob/modules/OvertimeHandle.vue index a655101..6963b25 100644 --- a/src/page/overtimeJob/modules/OvertimeHandle.vue +++ b/src/page/overtimeJob/modules/OvertimeHandle.vue @@ -18,45 +18,47 @@
  • -
    -
    - {{item.alarmContentName}} - {{item.wellCode}} - {{item.createTime}} -
    -
    - {{item.position}} -
    -
    -
    -
    -
    - - {{item.jobBelongTo}}正在处理... - {{item.jobBelongTo}}正在确认... -
    - - {{item.createTime}} 发起工单 - - - {{item.getJobTime}} {{item.getJobPerson}}接单 - - - {{item.confirmJobTime}} {{item.confirmJobPerson}}确认工单 - -
    - +
    +
    + {{item.alarmContentName}} + {{item.createTime}} +
    +
    + {{item.wellCode}} +
    +
    + {{item.position}}
    -
    - -
    - +
    +
    +
    + + {{item.jobBelongTo}}正在处理... + {{item.jobBelongTo}}正在确认... +
    + + {{item.createTime}} 发起工单 + + + {{item.getJobTime}} {{item.getJobPerson}}接单 + + + {{item.confirmJobTime}} {{item.confirmJobPerson}}确认工单 + +
    + +
    +
    +
    + +
    +
  • -
    暂无处理中工单
    +
    超时未处理工单
    已经到底了
    @@ -183,7 +185,7 @@ color #f7615a } .card-wellcode { - margin-left 10px + margin-top 12px font-size: 0.8rem } .card-welltype {