diff --git a/src/assets/notice1.mp3 b/src/assets/notice1.mp3 new file mode 100644 index 0000000..b73a118 Binary files /dev/null and b/src/assets/notice1.mp3 differ diff --git a/src/main.js b/src/main.js index d9b239a..2a4bc01 100644 --- a/src/main.js +++ b/src/main.js @@ -95,10 +95,18 @@ import dataV from '@jiaminghi/data-view'; Vue.use(dataV); import noticeAudio from "@/assets/notice.mp3"; +import noticeAudioNew from "@/assets/notice1.mp3"; let audio = new Audio(); audio.src = noticeAudio; -Vue.prototype.$audioPlay = () => { - audio.play() +Vue.prototype.$audioPlay = (type = 1) => { + if (audio) { + if (type === 1) { + audio.src = noticeAudio; + } else { + audio.src = noticeAudioNew; + } + audio.play() + } } import VueMatomo from 'vue-matomo' diff --git a/src/views/bigScreen1/component/doing.vue b/src/views/bigScreen1/component/doing.vue index 791b8ae..a0d539c 100644 --- a/src/views/bigScreen1/component/doing.vue +++ b/src/views/bigScreen1/component/doing.vue @@ -15,7 +15,7 @@
-
进行中
+
未执行
@@ -55,6 +55,8 @@
执行时间:{{ timeFormat(item.start_time) }}至{{ timeFormat(item.end_time,'HH:mm') }} +
+ 发布时间:{{ timeFormat(item.created_at) }}
预计时长 {{ $moment(item.end_time).diff($moment(item.start_time),'hours', true).toFixed(2) }}小时
@@ -80,7 +82,7 @@