Merge remote-tracking branch 'origin/dev' into dev

packages/device/AppBroadcast/AppBroadcast.vue

@@ -21,7 +21,7 @@ export default {
 
   data() {
     return {
-      component: 'Detail',
+      component: 'List',
       params: {},
       include: [],
     }

packages/device/AppBroadcast/components/Detail.vue

@@ -9,18 +9,26 @@
       <div v-show="currIndex == 0">
         <ai-card title="播发任务" v-show="currIndex === 0">
           <template #content>
-            <!-- <ai-wrapper
+            <ai-wrapper
               label-width="120px">
-              <ai-info-item label="姓名" :value="info.name"></ai-info-item>
-              <ai-info-item label="上报时间" :value="info.createTime"></ai-info-item>
-              <ai-info-item label="身份证号" :value="info.idNumber"></ai-info-item>
-              <ai-info-item label="所属地区" :value="info.areaName"></ai-info-item>
+              <ai-info-item label="播发级别" :value="info.name"></ai-info-item>
+              <ai-info-item label="播放方式" :value="info.createTime"></ai-info-item>
+              <ai-info-item label="开始日期" :value="info.name"></ai-info-item>
+              <ai-info-item label="播放天数" :value="info.name"></ai-info-item>
+              <ai-info-item label="开始时间" :value="info.name"></ai-info-item>
+              <ai-info-item label="结束时间" :value="info.areaName"></ai-info-item>
+              <ai-info-item label="创建人" :value="info.idNumber"></ai-info-item>
+              <ai-info-item label="创建时间" :value="info.areaName"></ai-info-item>
+              <ai-info-item label="起止时间" :value="info.name"></ai-info-item>
               <ai-info-item label="详细地址" isLine :value="info.address"></ai-info-item>
-            </ai-wrapper> -->
+            </ai-wrapper>
           </template>
         </ai-card>
       </div>
       <ai-card title="播发设备" v-show="currIndex == 1">
+        <template #right>
+           <div style="color: #333;font-size: 15px;">共<span style="color: #0082ff;font-size: 15px;">10</span>个设备</div>
+        </template>
         <template #content>
           <ai-table
             class="detail-table__table"
@@ -30,34 +38,14 @@
             :current.sync="search.current"
             :size.sync="search.size"
             @getList="getList">
-            <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
-              <template slot-scope="{ row }">
-                <div class="table-options">
-                  <el-button type="text" @click="toDetail(row.id)">详情</el-button>
-                </div>
-              </template>
-            </el-table-column>
           </ai-table>
         </template>
       </ai-card>
       <ai-card title="播发素材" v-show="currIndex == 2">
         <template #content>
-          <ai-table
-            class="detail-table__table"
-            :tableData="tableData"
-            :col-configs="colConfigs"
-            :total="total"
-            :current.sync="search.current"
-            :size.sync="search.size"
-            @getList="getList">
-            <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
-              <template slot-scope="{ row }">
-                <div class="table-options">
-                  <el-button type="text" @click="toDetail(row.id)">详情</el-button>
-                </div>
-              </template>
-            </el-table-column>
-          </ai-table>
+          <div class="audios">
+            <ai-audio :src="info.url"  skin="flat"/>
+          </div>
         </template>
       </ai-card>
     </template>
@@ -75,7 +63,17 @@ export default {
   },
   data() {
     return {
-      tabList: ['播发任务','播发设备','播发素材']
+      tabList: ['播发任务','播发设备','播发素材'],
+      currIndex: 0,
+      info: {},
+      tableData: [],
+      search: {},
+      total: 0,
+      colConfigs: [
+        {prop: 'messageName', label: '设备名称', width: 400},
+        {prop: 'messageType', label: '行政区划', align: 'center', dict: "dlbResourceType"},
+        {prop: 'messageUrgency', label: '状态', align: 'center', dict: "dlbMessageUrgency"},
+      ],
     }
   },
   methods: {

packages/device/AppEquipmentManage/AppEquipmentManage.vue

@@ -20,7 +20,7 @@ export default {
 
   data() {
     return {
-      component: 'taskList',
+      component: 'List',
       params: {},
       include: [],
     }

packages/device/AppMediaManage/components/Play.vue

@@ -16,7 +16,7 @@
                          :selectList="$dict.getDict('dlbMessageUrgency')"></ai-select>
             </el-form-item>
             <el-form-item label="行政区划" prop="areaId">
-              <ai-area-get v-model="areaId" :root="areaRootId"  :instance="instance" @select="handleAreaSelect" multiple  size="small" placeholder="全部地区"/>
+              <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">