|
|
|
|
@ -1,8 +1,5 @@
|
|
|
|
|
<template>
|
|
|
|
|
<div id="big-screen" ref="appRef">
|
|
|
|
|
<!-- <div class="refresh-time">-->
|
|
|
|
|
<!-- {{ refreshTime }}秒后刷新-->
|
|
|
|
|
<!-- </div>-->
|
|
|
|
|
<topBackground></topBackground>
|
|
|
|
|
<Title ref="title" @show-done="$refs['done'].show()" @step-click="stepClick"></Title>
|
|
|
|
|
<toDo ref="toDo"
|
|
|
|
|
@ -78,6 +75,7 @@ export default {
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
nowTime: () => this.time,
|
|
|
|
|
newTransferLength: () => this.transferLength,
|
|
|
|
|
auths: () => this.auths_auth_mixin,
|
|
|
|
|
refreshTime: () => this.refreshTime,
|
|
|
|
|
refreshList: () => this.getTransfer(true)
|
|
|
|
|
@ -85,6 +83,7 @@ export default {
|
|
|
|
|
},
|
|
|
|
|
data() {
|
|
|
|
|
return {
|
|
|
|
|
transferLength: 0,
|
|
|
|
|
refreshTime: refreshTransferTime / 10000,
|
|
|
|
|
forwardRefreshTime: '',
|
|
|
|
|
transfers1: [],
|
|
|
|
|
@ -191,10 +190,10 @@ export default {
|
|
|
|
|
if (pTransfer && (pTransfer.status === i.status)) {
|
|
|
|
|
transfers1.splice(transfers1.indexOf(pTransfer),1,i)
|
|
|
|
|
} else {
|
|
|
|
|
transfers1.push(i)
|
|
|
|
|
transfers1.unshift(i)
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
transfers1.push(i)
|
|
|
|
|
transfers1.unshift(i)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (i.status === 5 || i.status === 6) {
|
|
|
|
|
@ -203,22 +202,25 @@ export default {
|
|
|
|
|
if (pTransfer && (pTransfer.status === i.status)) {
|
|
|
|
|
transfers2.splice(transfers2.indexOf(pTransfer),1,i)
|
|
|
|
|
} else {
|
|
|
|
|
transfers2.push(i)
|
|
|
|
|
transfers2.unshift(i)
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
if (!transfers2.find(j => j.to_transfer_id === i.id)) {
|
|
|
|
|
transfers2.push(i)
|
|
|
|
|
transfers2.unshift(i)
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
if (i.status === 7) {
|
|
|
|
|
transfers3.push(i)
|
|
|
|
|
transfers3.unshift(i)
|
|
|
|
|
}
|
|
|
|
|
})
|
|
|
|
|
this.transfers1 = transfers1;
|
|
|
|
|
this.transfers2 = transfers2;
|
|
|
|
|
this.transfers3 = transfers3;
|
|
|
|
|
} else {
|
|
|
|
|
const startTime = this.forwardRefreshTime.format('YYYY-MM-DD HH:mm:ss');
|
|
|
|
|
const endTime = this.$moment().format('YYYY-MM-DD HH:mm:ss');
|
|
|
|
|
this.forwardRefreshTime = this.$moment()
|
|
|
|
|
//新的调令
|
|
|
|
|
const res = (
|
|
|
|
|
(await index({
|
|
|
|
|
@ -229,7 +231,7 @@ export default {
|
|
|
|
|
{
|
|
|
|
|
key: "created_at",
|
|
|
|
|
op: "range",
|
|
|
|
|
value: `${this.forwardRefreshTime.format('YYYY-MM-DD HH:mm:ss')},${this.$moment().format('YYYY-MM-DD HH:mm:ss')}`
|
|
|
|
|
value: `${startTime},${endTime}`
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
key: "status",
|
|
|
|
|
@ -239,9 +241,10 @@ export default {
|
|
|
|
|
]
|
|
|
|
|
},false)
|
|
|
|
|
).data);
|
|
|
|
|
this.transferLength = res.length;
|
|
|
|
|
if (res.length > 0) {
|
|
|
|
|
this.$audioPlay(2)
|
|
|
|
|
this.transfers1.push(...res)
|
|
|
|
|
this.transfers1.unshift(...res)
|
|
|
|
|
}
|
|
|
|
|
//跟新的调令
|
|
|
|
|
const res1 = (await index({
|
|
|
|
|
@ -252,7 +255,7 @@ export default {
|
|
|
|
|
{
|
|
|
|
|
key: "updated_at",
|
|
|
|
|
op: "range",
|
|
|
|
|
value: `${this.forwardRefreshTime.format('YYYY-MM-DD HH:mm:ss')},${this.$moment().format('YYYY-MM-DD HH:mm:ss')}`
|
|
|
|
|
value: `${startTime},${endTime}`
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
key: "status",
|
|
|
|
|
@ -275,8 +278,9 @@ export default {
|
|
|
|
|
else {}
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
this.forwardRefreshTime = this.$moment()
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
this.$forceUpdate()
|
|
|
|
|
}
|
|
|
|
|
},
|
|
|
|
|
computed: {},
|
|
|
|
|
|