大喇叭

src/apps/AppBroadcast1/AppEquipment/detail.vue

@@ -31,23 +31,24 @@
       </div>
       <div class="list-content" v-else>
         <div class="list">
-          <div class="item" @click="toTaskDetail">
+          <div class="item" v-for="(item, index) in list" :key="index"  @click="toPlayDetail(item)">
             <div class="left">
-              <p>韩红-我的祖国.mp3</p>
+              <p>{{ item.sourceName }}</p>
-              <div>李毅 2022-06-09 09:43:05</div>
+              <div>{{item.createUserName}} {{ item.createTime }}</div>
-              <div>日常 立即播发</div>
+              <div>{{ $dict.getLabel('dlbMessageUrgency', item.messageLevel) }} {{item.taskType == 1 ? '定时播放' : '立即播放'}}</div>
             </div>
             <div class="right">
               <div class="status">已下发</div>
-              <div class="cancel-btn">撤销</div>
+              <div class="cancel-btn" @click="cancel(item.id)" v-if="item.taskType == 1">撤销</div>
+              <div class="cancel-btn bg-AFD0FC" v-else>撤销</div>
             </div>
           </div>
         </div>
-        <!-- <AiEmpty v-if="!list.length"></AiEmpty> -->
+        <AiEmpty v-if="!list.length"></AiEmpty>
       </div>
     </div>
     
-    <div class="btn" @click="setVolume">设置音量</div>
+    <div class="btn" @click="setVolume" v-if="currIndex != 1">设置音量</div>
     <u-popup v-model="isShow" mode="bottom" class="popup">
       <div class="title">
         <span @click="isShow=false">取消</span>
@@ -102,8 +103,8 @@ export default {
     change(index) {
       this.currIndex = index
     },
-    toTaskDetail(item) {
+    toPlayDetail(item) {
-      uni.navigateTo({url: `./taskDetail`})
+      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() {

src/apps/AppBroadcast1/AppEquipment/taskDetail.vue

@@ -1,206 +0,0 @@
-<template>
-  <div class="taskDetail">
-    <div class="info-content">
-      <div class="info border-none">
-        <h2>播发任务</h2>
-        <h3>已下发</h3>
-      </div>
-      <div class="info">
-        <span>播发级别</span>
-        <span class="color-333">121312312312</span>
-      </div>
-      <div class="info">
-        <span>播放方式</span>
-        <span style="color: #4E8EEE">在线</span>
-      </div>
-      <div>
-        <div class="info">
-          <span>播放天数</span>
-          <span class="color-333">每周一、每周二、每周三</span>
-        </div>
-        <div class="info">
-        <span>开始日期</span>
-        <span class="color-333">2022-06-10</span>
-        </div>
-        <div class="info">
-          <span>开始时间</span>
-          <span class="color-333">18:00:00</span>
-        </div>
-        <div class="info">
-          <span>结束时间</span>
-          <span class="color-333">19:00:00</span>
-        </div>
-      </div>
-      <div class="info">
-        <span>创建人</span>
-        <span class="color-333">一般</span>
-      </div>
-      <div class="info">
-        <span>创建时间</span>
-        <span class="color-333"></span>
-      </div>
-    </div>
-    <div class="media-content">
-      <h2>播发素材</h2>
-      <div class="media-item">
-        <img :src="`${$cdn}video/play-icon.png`" alt="" @click="choose()">
-        <div class="info">
-          <p>五一活动唱红歌.mp3</p>
-          <div>李毅 2022-06-09 09:43:05</div>
-        </div>
-      </div>
-    </div>
-    <div class="btn">撤销任务</div>
-    <u-popup v-model="isShow" mode="bottom">
-      <div class="audio">
-        <AiVideo :src="url" autoplay></AiVideo>
-        <!-- <audio :src="url" ref="audio" :controls="true" :name="autioName" style="display: block;"></audio> -->
-      </div>
-    </u-popup>
-  </div>
-</template>
-<script>
-
-export default {
-  name: "taskDetail",
-  data() {
-    return {
-      isShow: false
-    }
-  },
-  onLoad(query) {
-    
-  },
-
-  onShow() {
-    document.title = '任务详情'
-  },
-
-  methods: {
-    choose(item) {
-      console.log(item.url)
-      this.url = item.url
-      this.isShow = tru
-    },
-  },
-}
-</script>
-<style lang="scss" scoped>
-.taskDetail {
-  .info-content{
-    padding-left: 32px;
-    background-color: #fff;
-    p{
-      padding: 32px 32px 32px 0;
-      font-size: 38px;
-      font-family: PingFangSC-Semibold, PingFang SC;
-      font-weight: 600;
-      color: #333;
-      line-height: 56px;
-      word-break: break-all;
-    }
-    .info{
-      display: flex;
-      justify-content: space-between;
-      font-size: 32px;
-      font-family: PingFangSC-Regular, PingFang SC;
-      color: #999;
-      line-height: 44px;
-      padding: 34px 32px 32px 0;
-      border-bottom: 1px solid #ddd;
-      .color-333{
-        color: #333;
-      }
-      h2{
-        font-size: 38px;
-        font-family: PingFangSC-Semibold, PingFang SC;
-        font-weight: 600;
-        color: #333;
-        line-height: 52px;
-      }
-      h3{
-        font-size: 34px;
-        font-family: PingFang-SC-Medium, PingFang-SC;
-        font-weight: 500;
-        color: #4E8EEE;
-        line-height: 52px;
-      }
-    }
-    .border-none{
-      border-bottom: 0;
-    }
-  }
-  .audio {
-    width: 100%;
-    height: 400px;
-    box-sizing: border-box;
-    padding: 104px 0 46px;
-  }
-  .media-content{
-    margin-top: 16px;
-    background-color: #fff;
-    h2{
-      padding: 32px;
-      font-size: 38px;
-      font-family: PingFangSC-Semibold, PingFang SC;
-      font-weight: 600;
-      color: #333;
-      line-height: 52px;
-    }
-    .media-item {
-      width: 100%;
-      display: flex;
-      border-bottom: 1px solid #ddd;
-      padding: 32px 30px;
-      box-sizing: border-box;
-
-      img {
-        width: 56px;
-        height: 56px;
-        margin-right: 14px;
-      }
-
-      .info {
-        width: calc(100% - 70px);
-        line-height: 44px;
-        font-size: 34px;
-        font-family: PingFang-SC-Medium, PingFang-SC;
-        font-weight: 500;
-        color: #333;
-
-        p {
-          overflow: hidden;
-          text-overflow: ellipsis;
-          white-space: nowrap;
-          word-break: break-all;
-        }
-        div{
-          font-size: 26px;
-          font-family: PingFang-SC-Medium, PingFang-SC;
-          font-weight: 500;
-          color: #999;
-          line-height: 36px;
-          margin-top: 8px;
-        }
-      }
-    }
-  }
-  
-  
-  .btn {
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    height: 112px;
-    line-height: 112px;
-    text-align: center;
-    background: #fff;
-    font-size: 32px;
-    font-family: PingFangSC-Medium, PingFang SC;
-    font-weight: 500;
-    color: #F46;
-    border-top: 1px solid #ddd;
-  }
-}
-</style>

src/apps/AppBroadcast1/AppPlayList/AppPlayList.vue

@@ -17,7 +17,8 @@
         </div>
         <div class="right">
           <div class="status">已下发</div>
-          <div class="cancel-btn">撤销</div>
+          <div class="cancel-btn" @click="cancel(item.id)" v-if="item.taskType == 1">撤销</div>
+          <div class="cancel-btn bg-AFD0FC" v-else>撤销</div>
         </div>
       </div>
     </div>
@@ -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}`})
     }

src/apps/AppBroadcast1/AppPlayList/detail.vue

@@ -11,12 +11,16 @@
       </div>
       <div class="info">
         <span>播放方式</span>
-        <span style="color: #4E8EEE">{{info.taskType == 1 ? '定时播放' : '立即播放'}}</span>
+        <span class="color-333">{{info.taskType == 1 ? '定时播放' : '立即播放'}}-{{ $dict.getLabel('dlbDyclingType', info.cyclingType) }}</span>
       </div>
       <div v-if="info.taskType == 1">
-        <div class="info">
+        <div class="info" v-if="info.cyclingType != 1">
           <span>播放天数</span>
-          <span class="color-333">每周一、每周二、每周三</span>
+          <span class="color-333" v-if="info.cyclingType == 3">{{info.broadcastDay}}</span>
+          <span class="color-333" v-if="info.cyclingType == 2">
+            {{info.cyclingDate}}
+            <span v-for="(item, index) in info.cyclingDateList" :key="index"><span v-if="index > 0">,</span>{{dayList[item]}}</span>
+          </span>
         </div>
         <div class="info">
         <span>开始日期</span>
@@ -54,6 +58,7 @@
         </div>
       </div>
     </div>
+    <div class="btn" v-if="info.taskType">撤销任务</div>
     <u-popup v-model="isShow" mode="bottom">
       <div class="audio">
         <AiVideo :src="url" autoplay></AiVideo>
@@ -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()
+          }
+        })
+      })
+    },
   },
 }
 </script>

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}`
       })
     },
 

src/apps/AppBroadcast1/selectMp3.vue

@@ -1,77 +0,0 @@
-<template>
-  <div class="selectMp3">
-    <div class="record">
-      <div class="item">
-        <img src="./img/cir.png" alt="">
-        <div class="info">
-          <p>村头大喇叭</p>
-        </div>
-      </div>
-    </div>
-    <div class="btn">
-      <div>确定选择</div>
-    </div>
-  </div>
-</template>
-<script>
-export default {
-  name: "selectMp3",
-}
-</script>
-<style lang="scss" scoped>
-.selectMp3 {
-  padding-bottom: 128px;
-
-  .record {
-    padding-left: 32px;
-    background-color: #fff;
-
-    .item {
-      width: 100%;
-      display: flex;
-
-      img {
-        width: 32px;
-        height: 32px;
-        margin: 40px 16px 0 0;
-      }
-
-      .info {
-        width: calc(100% - 60px);
-        padding: 34px 0;
-        line-height: 44px;
-        border-bottom: 1px solid #ddd;
-        font-size: 34px;
-        font-family: PingFang-SC-Medium, PingFang-SC;
-        font-weight: 500;
-        color: #333;
-        margin-left: 16px;
-      }
-    }
-  }
-
-  .btn {
-    position: fixed;
-    bottom: 0;
-    left: 0;
-    width: 100%;
-    height: 128px;
-    background: #FFF;
-    border-top: 1px solid #ddd;
-    padding: 24px 32px 24px 0;
-    box-sizing: border-box;
-
-    div {
-      width: 192px;
-      height: 80px;
-      line-height: 80px;
-      text-align: center;
-      background: #3975C6;
-      border-radius: 4px;
-      color: #fff;
-      font-size: 32px;
-      float: right;
-    }
-  }
-}
-</style>