xiaoy
/
water-dispatch-web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

小时

Browse Source
master
xy 2 years ago
parent 280cef7364
commit 4b234ee560
7 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File

12
.env.development
Unescape View File

@ -2,10 +2,10 @@
ENV='development' ENV='development'
# base api # base api
VUE_APP_BASE_API=http://192.168.60.78:9001/ #VUE_APP_BASE_API=http://192.168.60.78:9001/
VUE_APP_UPLOAD_API=http://192.168.60.78:9001/api/admin/upload-file #VUE_APP_UPLOAD_API=http://192.168.60.78:9001/api/admin/upload-file
VUE_APP_OA_URL=http://192.168.60.18:2021 #VUE_APP_OA_URL=http://192.168.60.18:2021
#VUE_APP_BASE_API=http://diaoling-test.ali251.langye.net/ VUE_APP_BASE_API=http://diaoling-test.ali251.langye.net/
#VUE_APP_UPLOAD_API=http://diaoling-test.ali251.langye.net/api/admin/upload-file VUE_APP_UPLOAD_API=http://diaoling-test.ali251.langye.net/api/admin/upload-file
#VUE_APP_OA_URL=http://suzhouhedaooa.langye.net VUE_APP_OA_URL=http://suzhouhedaooa.langye.net

2
src/views/bigScreen1/component/doing.vue
Unescape View File

@ -43,7 +43,7 @@
<div class="list-item__time"> <div class="list-item__time">
执行时间：{{ timeFormat(item.start_time) }}至{{ timeFormat(item.end_time,'HH:mm') }} 执行时间：{{ timeFormat(item.start_time) }}至{{ timeFormat(item.end_time,'HH:mm') }}
</div> </div>
<div class="list-item__last">预计时长 {{ $moment(item.end_time).diff($moment(item.start_time),'hours') }}时</div> <div class="list-item__last">预计时长 {{ $moment(item.end_time).diff($moment(item.start_time),'hours', true) }}时</div>
<div class="list-item__operate"> <div class="list-item__operate">
<div v-for="(s, si) in status" class="step" @click="stepClick(item,s)"> <div v-for="(s, si) in status" class="step" @click="stepClick(item,s)">
<div class="step-icon"> <div class="step-icon">

4
src/views/bigScreen1/component/done.vue
Unescape View File

@ -43,7 +43,7 @@
<div class="list-item__time"> <div class="list-item__time">
实际执行时间：{{ timeFormat(item.act_start_time) }}至{{ timeFormat(item.act_end_time,'HH:mm') }} 实际执行时间：{{ timeFormat(item.act_start_time) }}至{{ timeFormat(item.act_end_time,'HH:mm') }}
</div> </div>
<div class="list-item__last">预计时长 {{ $moment(item.end_time).diff($moment(item.start_time),'hours') }}时</div> <div class="list-item__last">预计时长 {{ $moment(item.end_time).diff($moment(item.start_time),'hours', true) }}时</div>
<div class="list-item__operate"> <div class="list-item__operate">
<div v-for="(s, si) in status" class="step"> <div v-for="(s, si) in status" class="step">
<div class="step-icon"> <div class="step-icon">
@ -303,7 +303,7 @@ $list-height: calc(#{$container-height} - 5.33rem);
text-align: center; text-align: center;
} }
&__last { &__last {
flex-basis: 7.8%; flex-basis: 9%;
text-align: center; text-align: center;
} }
&__operate { &__operate {

2
src/views/bigScreen1/component/toDo.vue
Unescape View File

@ -43,7 +43,7 @@
<div class="list-item__time"> <div class="list-item__time">
执行时间：{{ timeFormat(item.start_time) }}至{{ timeFormat(item.end_time,'HH:mm') }} 执行时间：{{ timeFormat(item.start_time) }}至{{ timeFormat(item.end_time,'HH:mm') }}
</div> </div>
<div class="list-item__last">预计时长 {{ $moment(item.end_time).diff($moment(item.start_time),'hours') }}时</div> <div class="list-item__last">预计时长 {{ $moment(item.end_time).diff($moment(item.start_time),'hours',true) }}小时</div>
<div class="list-item__operate"> <div class="list-item__operate">
<div v-for="(s, si) in status" class="step" @click="stepClick(item,s)"> <div v-for="(s, si) in status" class="step" @click="stepClick(item,s)">
<div class="step-icon"> <div class="step-icon">

2
src/views/order/component/dispatchList.vue
Unescape View File

@ -168,7 +168,7 @@ export default {
width: 100, width: 100,
align: "center", align: "center",
key: "last", key: "last",
render: (h,{ row }) => h('span', this.$moment(row.end_time).diff(this.$moment(row.start_time),'minutes') + '分钟') render: (h,{ row }) => h('span', this.$moment(row.end_time).diff(this.$moment(row.start_time),'hours',true) + '小时')
}, },
{ {
title: "结束时间", title: "结束时间",

5
src/views/order/handle.vue
Unescape View File

@ -468,8 +468,9 @@ export default {
}], }],
["shichang",{ ["shichang",{
formatter: (data) => { formatter: (data) => {
return this.$moment(data.end_time).diff(this.$moment(data.start_time),"hours") + "时" return this.$moment(data.end_time).diff(this.$moment(data.start_time),"hours",true) + "小时"
} },
width: 120
}] }]
]) ])
}; };

5
src/views/order/history.vue
Unescape View File

@ -440,8 +440,9 @@ export default {
}], }],
["shichang",{ ["shichang",{
formatter: (data) => { formatter: (data) => {
return this.$moment(data.end_time).diff(this.$moment(data.start_time),"hours") + "时" return this.$moment(data.end_time).diff(this.$moment(data.start_time),"hours",true) + "小时"
} },
width: 120
}] }]
]), ]),
equipments: [], equipments: [],

Write Preview
Loading…
Cancel
Save