From ca02cfc24e34ef4a72ec9415d01fdb70100b65dd Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Sat, 11 Jun 2022 12:21:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=96=87=E5=8F=AD=E6=92=AD=E6=94=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/AppMediaManage/components/List.vue     |  6 +++---
 .../device/AppMediaManage/components/Play.vue     | 15 +++++++++------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/packages/device/AppMediaManage/components/List.vue b/packages/device/AppMediaManage/components/List.vue
index 107d2c5f..6e0129bf 100644
--- a/packages/device/AppMediaManage/components/List.vue
+++ b/packages/device/AppMediaManage/components/List.vue
@@ -50,11 +50,11 @@
       <ai-detail style="background: #FFF;">
         <template #content>
           <div class="audios">
-            <ai-audio :src="info.url" v-if="info.type == 1" skin="flat"/>
+            <ai-audio :src="info.url" skin="flat"/>
           </div>
           <ai-wrapper style="margin-top: 30px;">
             <ai-info-item label="媒资名称" :value="info.name"></ai-info-item>
-            <ai-info-item label="状态" :value="info.content"></ai-info-item>
+            <!-- <ai-info-item label="状态">{{ $dict.getLabel('dlbDevStatus', info.devStatus)  }}</ai-info-item> -->
             <ai-info-item label="媒资类型">{{$dict.getLabel('dlbResourceType', info.type)}}</ai-info-item>
             <ai-info-item label="创建时间" :value="info.createTime"></ai-info-item>
             <ai-info-item label="内容" class="contentBox"  v-if="info.type == 3" isLine>
@@ -150,7 +150,7 @@ export default {
     },
   },
   created() {
-    this.dict.load('dlbResourceType').then(() => {
+    this.dict.load('dlbResourceType','dlbDevStatus').then(() => {
       this.getList()
     })
   },
diff --git a/packages/device/AppMediaManage/components/Play.vue b/packages/device/AppMediaManage/components/Play.vue
index 2aa1630f..38f6ea39 100644
--- a/packages/device/AppMediaManage/components/Play.vue
+++ b/packages/device/AppMediaManage/components/Play.vue
@@ -15,8 +15,8 @@
               <ai-select v-model="formData.messageLevel" placeholder="播发级别" clearable
                          :selectList="$dict.getDict('dlbMessageUrgency')"></ai-select>
             </el-form-item>
-            <el-form-item label="行政区划" prop="areaId">
-              <ai-area-get v-model="formData.areaId" :root="areaRootId"  :instance="instance" @select="handleAreaSelect" size="small" placeholder="请选择行政区划"/>
+            <el-form-item label="设备行政区划">
+              <ai-area-get v-model="areaId" :root="areaRootId"  :instance="instance" @select="handleAreaSelect" size="small" placeholder="请选择行政区划"/>
             </el-form-item>
             <el-form-item label="播放方式" prop="taskType" class="buildingTypes">
               <el-radio-group v-model="formData.taskType">
@@ -58,9 +58,9 @@
                               :picker-options="{ start: formData.startTime, minTime: formData.startTime}"
                               value-format="HH:mm:ss"></el-time-picker>
             </el-form-item>
-            <el-form-item label="播放设备" prop="serialNo" style="width: 100%;">
-              <ai-table-select nodeName="deviceName" :instance="instance" :action="`/app/appdlbquipment/getDlbDeviceList?devStatus=5`"
-                              @select="v=>formData.serialNo=v" multiple/>
+            <el-form-item label="播放设备" v-if="areaId.length" prop="serialNo" style="width: 100%;">
+              <ai-table-select nodeName="name" :instance="instance" :action="`/app/appdlbquipment/list?devStatus=5&areaId=${areaId}`"
+                              @select="v=> formData.serialNo = v.map(e=> e.serialNo).toString()" multiple/>
             </el-form-item>
           </el-form>
         </template>
@@ -269,11 +269,14 @@ export default {
     },
     // 地区选择
     handleAreaSelect() {
-      this.form.areaName = v?.[0]?.label
+      this.areaName = v?.[0]?.label
     },
 
     // 播放
     confirm() {
+      if(!this.areaId) {
+        this.$message.error('请选择所要播放设备的行政区划！')
+      }
       this.$refs['ruleForm'].validate((valid) => {
         if (valid) {
           if (this.formData.checkList.length) {