大喇叭

2022-06-11 14:38:37 +08:00
parent fca39122a8
commit ee1909afc4
7 changed files with 39 additions and 19 deletions
--- a/src/apps/AppBroadcast1/AppEquipment/AppEquipment.vue
+++ b/src/apps/AppBroadcast1/AppEquipment/AppEquipment.vue
@@ -24,6 +24,7 @@
        </div>
      </div>
    </div>
+    <AiEmpty v-if="!list.length"></AiEmpty>
  </div>
 </template>
 <script>
@@ -57,8 +58,8 @@ export default {
      this.current = 1
      this.getList()
    },
-    getList() {
-      this.$http.post(`/app/appdlbquipment/list?current=1&size=20&name=${this.keyword}`).then((res) => {
+    getList() { //&areaId=${this.areaId}
+      this.$http.post(`/app/appdlbquipment/list?current=1&size=20&name=${this.keyword}&areaId=${this.areaId}`).then((res) => {
        if (res.code == 0) {
          if (this.current > 1) {
            this.list = [...this.list, ...res.data.records]
--- a/src/apps/AppBroadcast1/AppEquipment/detail.vue
+++ b/src/apps/AppBroadcast1/AppEquipment/detail.vue
@@ -38,8 +38,13 @@
              <div>{{ $dict.getLabel('dlbMessageUrgency', item.messageLevel) }} {{item.taskType == 1 ? '定时播放' : '立即播放'}}</div>
            </div>
            <div class="right">
-              <div class="status">已下发</div>
-              <div class="cancel-btn" @click="cancel(item.id)" v-if="item.taskType == 1">撤销</div>
+              <div class="status" v-if="item.broadcastStatus == 6" style="color: #999;">已取消</div>
+              <div class="status" v-if="item.broadcastStatus == 3" style="color: #5aad6a;">播发成功</div>
+              <div class="status" v-if="item.broadcastStatus == 0">已下发</div>
+              <div v-if="item.broadcastStatus == 0 || item.broadcastStatus == 1 || item.broadcastStatus == 2">
+                <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 class="cancel-btn bg-AFD0FC" v-else>撤销</div>
            </div>
          </div>
--- a/src/apps/AppBroadcast1/AppPlayList/AppPlayList.vue
+++ b/src/apps/AppBroadcast1/AppPlayList/AppPlayList.vue
@@ -16,13 +16,18 @@
          <div>{{ $dict.getLabel('dlbMessageUrgency', item.messageLevel) }} {{item.taskType == 1 ? '定时播放' : '立即播放'}}</div>
        </div>
        <div class="right">
-          <div class="status">已下发</div>
-          <div class="cancel-btn" @click.stop="cancel(item.id)" v-if="item.taskType == 1">撤销</div>
+          <div class="status" v-if="item.broadcastStatus == 6" style="color: #999;">已取消</div>
+          <div class="status" v-if="item.broadcastStatus == 3" style="color: #5aad6a;">播发成功</div>
+          <div class="status" v-if="item.broadcastStatus == 0">已下发</div>
+          <div v-if="item.broadcastStatus == 0 || item.broadcastStatus == 1 || item.broadcastStatus == 2">
+            <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 class="cancel-btn bg-AFD0FC" v-else>撤销</div>
        </div>
      </div>
    </div>
-    <!-- <AiEmpty v-if="!list.length"></AiEmpty> -->
+    <AiEmpty v-if="!list.length"></AiEmpty>
  </div>
 </template>
 <script>
@@ -35,7 +40,7 @@ export default {
      current: 1,
      type: '0',
      typeList: [{label: '全部', value: '0'}, {label: '我发布的', value: '1'}],
-      keyword: ''
+      keyword: '',
    }
  },
  computed: { ...mapState(['user']) },
--- a/src/apps/AppBroadcast1/AppPlayList/detail.vue
+++ b/src/apps/AppBroadcast1/AppPlayList/detail.vue
@@ -3,7 +3,9 @@
    <div class="info-content">
      <div class="info border-none">
        <h2>播发任务</h2>
-        <h3>已下发</h3>
+        <h3 v-if="info.broadcastStatus == 6" style="color: #999;">已取消</h3>
+        <h3 v-if="info.broadcastStatus == 3" style="color: #5aad6a;">播发成功</h3>
+        <h3 v-if="info.broadcastStatus == 0">已下发</h3>
      </div>
      <div class="info">
        <span>播发级别</span>
@@ -20,7 +22,6 @@
          <span>播放天数</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>
@@ -52,15 +53,17 @@
    </div>
    <div class="media-content">
      <h2>播发素材</h2>
-      <div class="media-item">
-        <img :src="`${$cdn}video/play-icon.png`" alt="" @click="choose()">
+      <div class="media-item" v-for="(item, index) in info.materials" :key="index">
+        <img :src="`${$cdn}video/play-icon.png`" alt="" @click="choose(item)">
        <div class="info">
          <p>{{info.sourceName}}</p>
-          <div>李毅 {{info.createTime}}</div>
+          <div>{{item.createUserName}} {{item.createTime}}</div>
        </div>
      </div>
    </div>
-    <div class="btn" v-if="info.taskType" @click="cancel">撤销任务</div>
+    <div v-if="info.broadcastStatus == 0 || info.broadcastStatus == 1 || info.broadcastStatus == 2">
+      <div class="btn" v-if="info.taskType == 1" @click="cancel">撤销任务</div>
+    </div>
    <u-popup v-model="isShow" mode="bottom">
      <div class="audio">
        <AiVideo :src="url" autoplay></AiVideo>
@@ -95,9 +98,8 @@ export default {

  methods: {
    choose(item) {
-      console.log(item.url)
      this.url = item.url
-      this.isShow = tru
+      this.isShow = true
    },
    toEquipmentList() {
      uni.navigateTo({url: `./equipmentList?id=${this.id}`})
--- a/src/apps/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue
+++ b/src/apps/AppBroadcast1/AppResourcesManage/AppResourcesManage.vue
@@ -16,7 +16,7 @@
        <img :src="`${$cdn}video/play-icon.png`" alt="" @click.stop="choose(item)">
        <div class="info">
          <p>{{ item.name ? item.name.split('.')[0] : '-' }}</p>
-          <div>{{ item.createUserName }}{{ item.createTime }}</div>
+          <div class="time">{{ item.createUserName }} {{ item.createTime }}</div>
        </div>
        <div class="btn" @click.stop="toAddBroadcast(item)">发布</div>
      </div>
@@ -26,6 +26,7 @@
        <div class="info">
          <div>{{ item.name }}</div>
          <p>{{ item.content }}</p>
+          <div class="time">{{ item.createUserName }} {{ item.createTime }}</div>
        </div>
        <div class="btn" @click.stop="toAddBroadcast(item)">发布</div>
      </div>
@@ -169,6 +170,12 @@ export default {
    }
  }

+  .time{
+    font-size: 28px!important;
+    color: #999!important;
+    margin: 8px 0 0 0!important;
+  }
+
  .tab {
    border-bottom: 1px solid #ddd;
    margin-bottom: 4px;
@@ -264,7 +271,6 @@ export default {
          overflow: hidden;
          text-overflow: ellipsis;
          white-space: nowrap;
-          margin-bottom: 12px;

          .color-0063E5 {
            color: #0063E5;
--- a/src/apps/AppBroadcast1/AppResourcesManage/detail.vue
+++ b/src/apps/AppBroadcast1/AppResourcesManage/detail.vue
@@ -3,7 +3,7 @@
    <div class="header">
      <img :src="`${$cdn}video/play-icon.png`" alt="">
      <div class="right">
-        <h2>{{info.name}}.mp3</h2>
+        <h2>{{info.name}}</h2>
        <p>{{info.createTime}}</p>
      </div>
    </div>
--- a/src/apps/AppBroadcast1/selectMedia.vue
+++ b/src/apps/AppBroadcast1/selectMedia.vue
@@ -125,6 +125,7 @@ export default {
          type: this.currIndex === 0 ? 1 : 3,
          current: this.current,
          size: 10,
+          areaId: this.areaId
        }
      }).then(res => {
        if (res.code == 0) {