diff --git a/src/apps/AppBroadcast1/AppEquipment/detail.vue b/src/apps/AppBroadcast1/AppEquipment/detail.vue index f3fa4984..bf06fd29 100644 --- a/src/apps/AppBroadcast1/AppEquipment/detail.vue +++ b/src/apps/AppBroadcast1/AppEquipment/detail.vue @@ -31,23 +31,24 @@
-
+
-

韩红-我的祖国.mp3

-
李毅 2022-06-09 09:43:05
-
日常 立即播发
+

{{ item.sourceName }}

+
{{item.createUserName}} {{ item.createTime }}
+
{{ $dict.getLabel('dlbMessageUrgency', item.messageLevel) }} {{item.taskType == 1 ? '定时播放' : '立即播放'}}
已下发
-
撤销
+
撤销
+
撤销
- +
-
设置音量
+
设置音量
取消 @@ -102,8 +103,8 @@ export default { change(index) { this.currIndex = index }, - toTaskDetail(item) { - uni.navigateTo({url: `./taskDetail`}) + toPlayDetail(item) { + uni.navigateTo({url: `../AppPlayList/detail?id=${item.id}`}) }, setVolume() { this.isShow = true @@ -123,9 +124,31 @@ export default { this.$http.post(`/app/appdlbquipment/queryDetailById?id=${this.id}`).then((res) => { if (res.code == 0) { this.info = res.data + this.getPlayList() } }) - } + }, + getPlayList() { + this.$http.post(`/app/appzyvideobroadcast/list?current=${this.current}&size=10&serialNo=${this.info.serialNo}`).then(res => { + if (res.code == 0) { + if (this.current > 1) { + this.list = [...this.list, ...res.data.records] + } else { + this.list = res.data.records + } + } + }) + }, + cancel(id) { + this.$confirm('确定撤回该广播?').then(() => { + this.$http.post(`/app/appzyvideobroadcast/getBroadcastRecall?broadcastId=${id}`).then((res) => { + if (res.code == 0) { + this.$u.toast('撤回成功！') + this.getList() + } + }) + }) + }, }, onReachBottom() { diff --git a/src/apps/AppBroadcast1/AppEquipment/taskDetail.vue b/src/apps/AppBroadcast1/AppEquipment/taskDetail.vue deleted file mode 100644 index 596a057b..00000000 --- a/src/apps/AppBroadcast1/AppEquipment/taskDetail.vue +++ /dev/null @@ -1,206 +0,0 @@ - - - diff --git a/src/apps/AppBroadcast1/AppPlayList/AppPlayList.vue b/src/apps/AppBroadcast1/AppPlayList/AppPlayList.vue index 9a0bad28..1e15fd43 100644 --- a/src/apps/AppBroadcast1/AppPlayList/AppPlayList.vue +++ b/src/apps/AppBroadcast1/AppPlayList/AppPlayList.vue @@ -17,7 +17,8 @@
已下发
-
撤销
+
撤销
+
撤销
@@ -79,6 +80,17 @@ export default { uni.hideLoading() }) }, + + cancel(id) { + this.$confirm('确定撤回该广播?').then(() => { + this.$http.post(`/app/appzyvideobroadcast/getBroadcastRecall?broadcastId=${id}`).then((res) => { + if (res.code == 0) { + this.$u.toast('撤回成功！') + this.getList() + } + }) + }) + }, toDetail(item) { uni.navigateTo({url: `./detail?id=${item.id}`}) } diff --git a/src/apps/AppBroadcast1/AppPlayList/detail.vue b/src/apps/AppBroadcast1/AppPlayList/detail.vue index 0cd5136d..e3d99db7 100644 --- a/src/apps/AppBroadcast1/AppPlayList/detail.vue +++ b/src/apps/AppBroadcast1/AppPlayList/detail.vue @@ -11,12 +11,16 @@
播放方式 - {{info.taskType == 1 ? '定时播放' : '立即播放'}} + {{info.taskType == 1 ? '定时播放' : '立即播放'}}-{{ $dict.getLabel('dlbDyclingType', info.cyclingType) }}
-
+
播放天数 - 每周一、每周二、每周三 + {{info.broadcastDay}} + + {{info.cyclingDate}} + ,{{dayList[item]}} +
开始日期 @@ -54,6 +58,7 @@
+
撤销任务
@@ -77,7 +82,7 @@ export default { }, onLoad(option) { this.id = option.id - this.$dict.load(['dlbMessageUrgency']).then(() => { + this.$dict.load(['dlbMessageUrgency', 'dlbDyclingType']).then(() => { this.getDetail() }) }, @@ -99,11 +104,24 @@ export default { this.$http.post(`/app/appzyvideobroadcast/queryDetailById?id=${this.id}`).then(res => { if (res.code == 0) { this.info = res.data + if(this.info.cyclingType == 2) { + this.info.cyclingDateList = this.info.cyclingDate.split(',') + } } }).catch(() => { uni.hideLoading() }) }, + cancel() { + this.$confirm('确定撤回该广播?').then(() => { + this.$http.post(`/app/appzyvideobroadcast/getBroadcastRecall?broadcastId=${this.info.id}`).then((res) => { + if (res.code == 0) { + this.$u.toast('撤回成功！') + this.getList() + } + }) + }) + }, }, } diff --git a/src/apps/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue b/src/apps/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue index 15f671a1..47c6f09b 100644 --- a/src/apps/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue +++ b/src/apps/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue @@ -92,7 +92,7 @@ export default { add() { uni.navigateTo({ - url: `./addPlay?type=${this.currIndex === 0 ? 1 : 3}` + url: `./addMedia?type=${this.currIndex === 0 ? 1 : 3}` }) }, diff --git a/src/apps/AppBroadcast1/AppResourcesManage/addPlay.vue b/src/apps/AppBroadcast1/AppResourcesManage/addMedia.vue similarity index 100% rename from src/apps/AppBroadcast1/AppResourcesManage/addPlay.vue rename to src/apps/AppBroadcast1/AppResourcesManage/addMedia.vue diff --git a/src/apps/AppBroadcast1/selectMp3.vue b/src/apps/AppBroadcast1/selectMp3.vue deleted file mode 100644 index 2dbc434f..00000000 --- a/src/apps/AppBroadcast1/selectMp3.vue +++ /dev/null @@ -1,77 +0,0 @@ - - -