yin.wei
/
bigScreen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 以服务器时间为准

Browse Source
main
shengwen.chen 6 days ago
parent 855ffa543e
commit 9011d459e3
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File

13
src/views/scheduleList/index.vue
Unescape View File

@ -96,8 +96,7 @@
</template> </template>
<script> <script>
import { getDynamicTableHeader, getDynamicTableList, getGlobeConfig, getDepList } from '@/api/publishApi'; import { getDynamicTableHeader, getDynamicTableList, getGlobeConfig, getDepList, getServerDateTime } from '@/api/publishApi';
import { getServerDateTime } from '@/api/publishApi';
import { Carousel, CarouselItem, Select, Option } from 'element-ui'; import { Carousel, CarouselItem, Select, Option } from 'element-ui';
import { statusToTxt, textToColor } from '@/utils/common'; import { statusToTxt, textToColor } from '@/utils/common';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
@ -319,11 +318,11 @@ export default {
// 每秒更新一次当前时间 // 每秒更新一次当前时间
getServerDateTime().then(res => { getServerDateTime().then(res => {
if (dayjs().utcOffset() == 480) { // if (dayjs().utcOffset() == 480) {
this.serverTimeStamp = dayjs(res['Data']).valueOf() this.serverTimeStamp = dayjs(res['Data']).valueOf()
} else { // } else {
this.serverTimeStamp = dayjs(res['Data']).valueOf() + 8 * 60 * 60 * 1000 // this.serverTimeStamp = dayjs(res['Data']).valueOf() + 8 * 60 * 60 * 1000
} // }
this.dateTimer = setInterval(() => { this.dateTimer = setInterval(() => {
this.currentDateTime = dayjs(this.serverTimeStamp).format(`YYYY-MM-DD HH:mm dddd`); this.currentDateTime = dayjs(this.serverTimeStamp).format(`YYYY-MM-DD HH:mm dddd`);
this.serverTimeStamp += 1000 this.serverTimeStamp += 1000

13
src/views/waitList/index.vue
Unescape View File

@ -97,8 +97,7 @@
</template> </template>
<script> <script>
import { getDynamicTableHeader, getDynamicTableList, getGlobeConfig, getAudio } from '@/api/publishApi'; import { getDynamicTableHeader, getDynamicTableList, getGlobeConfig, getAudio, getServerDateTime } from '@/api/publishApi';
import { getServerDateTime } from '@/api/publishApi';
import { Carousel, CarouselItem } from 'element-ui'; import { Carousel, CarouselItem } from 'element-ui';
import dayjs from 'dayjs'; import dayjs from 'dayjs';
import { statusToTxt, textWaitToColor } from '@/utils/common'; import { statusToTxt, textWaitToColor } from '@/utils/common';
@ -364,11 +363,11 @@ export default {
// 每秒更新一次当前时间 // 每秒更新一次当前时间
getServerDateTime().then(res => { getServerDateTime().then(res => {
if (dayjs().utcOffset() == 480) { // if (dayjs().utcOffset() == 480) {
this.serverTimeStamp = dayjs(res['Data']).valueOf() this.serverTimeStamp = dayjs(res['Data']).valueOf()
} else { // } else {
this.serverTimeStamp = dayjs(res['Data']).valueOf() + 8 * 60 * 60 * 1000 // this.serverTimeStamp = dayjs(res['Data']).valueOf() + 8 * 60 * 60 * 1000
} // }
this.dateTimer = setInterval(() => { this.dateTimer = setInterval(() => {
this.currentDateTime = dayjs(this.serverTimeStamp).format(`YYYY-MM-DD HH:mm dddd`); this.currentDateTime = dayjs(this.serverTimeStamp).format(`YYYY-MM-DD HH:mm dddd`);
this.serverTimeStamp += 1000 this.serverTimeStamp += 1000

Write Preview
Loading…
Cancel
Save