From fca39122a8e4d0a2379f25e4705b018258981370 Mon Sep 17 00:00:00 2001
From: liuye <liuye@sinoecare.com>
Date: Sat, 11 Jun 2022 13:43:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=96=87=E5=8F=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppBroadcast1/AppEquipment/detail.vue     |  5 ++-
 .../AppBroadcast1/AppPlayList/AppPlayList.vue |  2 +-
 src/apps/AppBroadcast1/AppPlayList/detail.vue | 10 +++---
 .../AppPlayList/equipmentList.vue             | 35 +++++++++----------
 .../AppResourcesManage/AppResourcesManage.vue |  7 ++--
 5 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/src/apps/AppBroadcast1/AppEquipment/detail.vue b/src/apps/AppBroadcast1/AppEquipment/detail.vue
index bf06fd29..ceba3c87 100644
--- a/src/apps/AppBroadcast1/AppEquipment/detail.vue
+++ b/src/apps/AppBroadcast1/AppEquipment/detail.vue
@@ -108,11 +108,10 @@ export default {
     },
     setVolume() {
       this.isShow = true
-      this.volume = this.info.volume * 10 || 10
+      this.volume = this.info.volume
     },
     confirmAdd() {
-      var volume = parseInt(this.volume/10)
-      this.$http.post(`/app/appdlbquipment/volumeControl?deviceId=${this.info.deviceId}&volume=${volume}`).then((res) => {
+      this.$http.post(`/app/appdlbquipment/volumeControl?deviceId=${this.info.deviceId}&volume=${this.volume}`).then((res) => {
         if (res.code == 0) {
           this.getDetail()
           this.isShow = false
diff --git a/src/apps/AppBroadcast1/AppPlayList/AppPlayList.vue b/src/apps/AppBroadcast1/AppPlayList/AppPlayList.vue
index 1e15fd43..096b8bbc 100644
--- a/src/apps/AppBroadcast1/AppPlayList/AppPlayList.vue
+++ b/src/apps/AppBroadcast1/AppPlayList/AppPlayList.vue
@@ -17,7 +17,7 @@
         </div>
         <div class="right">
           <div class="status">已下发</div>
-          <div class="cancel-btn" @click="cancel(item.id)" v-if="item.taskType == 1">撤销</div>
+          <div class="cancel-btn" @click.stop="cancel(item.id)" v-if="item.taskType == 1">撤销</div>
           <div class="cancel-btn bg-AFD0FC" v-else>撤销</div>
         </div>
       </div>
diff --git a/src/apps/AppBroadcast1/AppPlayList/detail.vue b/src/apps/AppBroadcast1/AppPlayList/detail.vue
index e3d99db7..da13bee7 100644
--- a/src/apps/AppBroadcast1/AppPlayList/detail.vue
+++ b/src/apps/AppBroadcast1/AppPlayList/detail.vue
@@ -11,7 +11,9 @@
       </div>
       <div class="info">
         <span>播放方式</span>
-        <span class="color-333">{{info.taskType == 1 ? '定时播放' : '立即播放'}}-{{ $dict.getLabel('dlbDyclingType', info.cyclingType) }}</span>
+        <span class="color-333">{{info.taskType == 1 ? '定时播放' : '立即播放'}}
+          <span v-if="info.taskType == 1 ">-{{ $dict.getLabel('dlbDyclingType', info.cyclingType) }}</span>
+        </span>
       </div>
       <div v-if="info.taskType == 1">
         <div class="info" v-if="info.cyclingType != 1">
@@ -45,7 +47,7 @@
       </div>
       <div class="info">
         <span>播发设备</span>
-        <span class="color-333" @click="toEquipmentList">共<span style="color:#1174FE;">10</span>个设备<u-icon name="arrow-right" size="28" color="#999999" style="margin-left:8px;"></u-icon></span>
+        <span class="color-333" @click="toEquipmentList">共<span style="color:#1174FE;" v-if="info.devices">{{info.devices.length}}</span>个设备<u-icon name="arrow-right" size="28" color="#999999" style="margin-left:8px;"></u-icon></span>
       </div>
     </div>
     <div class="media-content">
@@ -58,7 +60,7 @@
         </div>
       </div>
     </div>
-    <div class="btn" v-if="info.taskType">撤销任务</div>
+    <div class="btn" v-if="info.taskType" @click="cancel">撤销任务</div>
     <u-popup v-model="isShow" mode="bottom">
       <div class="audio">
         <AiVideo :src="url" autoplay></AiVideo>
@@ -98,7 +100,7 @@ export default {
       this.isShow = tru
     },
     toEquipmentList() {
-      uni.navigateTo({url: `./equipmentList`})
+      uni.navigateTo({url: `./equipmentList?id=${this.id}`})
     },
     getDetail() {
       this.$http.post(`/app/appzyvideobroadcast/queryDetailById?id=${this.id}`).then(res => {
diff --git a/src/apps/AppBroadcast1/AppPlayList/equipmentList.vue b/src/apps/AppBroadcast1/AppPlayList/equipmentList.vue
index a8ebefcf..dfa737eb 100644
--- a/src/apps/AppBroadcast1/AppPlayList/equipmentList.vue
+++ b/src/apps/AppBroadcast1/AppPlayList/equipmentList.vue
@@ -1,22 +1,13 @@
 <template>
   <div class="equipmentList">
-    <p class="title">播发设备<span class="mini-title">共<span style="color:#1174FE;">10</span>个设备</span></p>
+    <p class="title">播发设备<span class="mini-title">共<span style="color:#1174FE;">{{info.devices.length}}</span>个设备</span></p>
     <div class="record">
-      <div class="item">
+      <div class="item" v-for="(item, index) in info.devices" :key="index">
         <img src="../img/lb@2x.png" alt="" class="voice-img">
         <div class="info">
           <div class="text">
-            <p>村头大喇叭</p>
-            <span>刘家河居委会</span>
-          </div>
-        </div>
-      </div>
-      <div class="item">
-        <img src="../img/lb@2x.png" alt="" class="voice-img">
-        <div class="info">
-          <div class="text">
-            <p>村头大喇叭</p>
-            <span>刘家河居委会</span>
+            <p>{{item.name}}</p>
+            <span>{{item.areaName}}</span>
           </div>
         </div>
       </div>
@@ -29,17 +20,25 @@ export default {
   name: "equipmentList",
   data() {
     return {
-
+      id: '',
+      info: {},
     }
   },
   computed: { ...mapState(['user']) },
   onLoad(option) {
-    this.areaId = this.user.areaId
-    this.areaName = this.user.areaName
+    this.id = option.id
+    this.getDetail()
   },
   methods: {
-
-
+    getDetail() {
+      this.$http.post(`/app/appzyvideobroadcast/queryDetailById?id=${this.id}`).then(res => {
+        if (res.code == 0) {
+          this.info = res.data
+        }
+      }).catch(() => {
+        uni.hideLoading()
+      })
+    },
   }
 }
 </script>
diff --git a/src/apps/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue b/src/apps/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue
index 47c6f09b..949652ed 100644
--- a/src/apps/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue
+++ b/src/apps/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue
@@ -18,7 +18,7 @@
           <p>{{ item.name ? item.name.split('.')[0] : '-' }}</p>
           <div>{{ item.createUserName }}{{ item.createTime }}</div>
         </div>
-        <div class="btn">发布</div>
+        <div class="btn" @click.stop="toAddBroadcast(item)">发布</div>
       </div>
     </div>
     <div class="record-text" v-else>
@@ -27,7 +27,7 @@
           <div>{{ item.name }}</div>
           <p>{{ item.content }}</p>
         </div>
-        <div class="btn">发布</div>
+        <div class="btn" @click.stop="toAddBroadcast(item)">发布</div>
       </div>
     </div>
     <AiEmpty v-if="!list.length"></AiEmpty>
@@ -149,6 +149,9 @@ export default {
     },
     toDetail(item) {
       uni.navigateTo({url: `./detail?id=${item.id}`})
+    },
+    toAddBroadcast(item) {
+      uni.navigateTo({ url: `../addPlay?mediaId=${item.id}&mediaName=${item.name}` })
     }
   },