From bf6d86bf4eaad1c9af17958148f29aae6825d770 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 13 Jun 2022 13:59:03 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=AA=92=E8=B5=84=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/AppBroadcast/components/List.vue   |  8 ++++----
 .../components/taskList.vue                   | 19 +++++++++++--------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/packages/device/AppBroadcast/components/List.vue b/packages/device/AppBroadcast/components/List.vue
index b2dede3c..cf234bf5 100644
--- a/packages/device/AppBroadcast/components/List.vue
+++ b/packages/device/AppBroadcast/components/List.vue
@@ -6,7 +6,7 @@
         <ai-search-bar bottomBorder>
           <template slot="left">
             <ai-select v-model="search.cyclingType" placeholder="媒资类型" clearable
-                       :selectList="$dict.getDict('dlbDyclingType')"
+                       :selectList="$dict.getDict('dlbResourceType')"
                        @change=";(page.current = 1), getList()"></ai-select>
             <ai-select v-model="search.messageLevel" placeholder="级别" clearable
                        :selectList="$dict.getDict('dlbMessageUrgency')"
@@ -71,8 +71,8 @@ export default {
       ids: [],
       colConfigs: [
         {prop: 'sourceName', label: '媒资名称', width: 200},
-        {prop: 'cyclingType', label: '媒资类型', align: 'center', render: (h, {row}) => {
-          return h('span', null, this.dict.getLabel('dlbDyclingType',row.cyclingType))},
+        {prop: 'type', label: '媒资类型', align: 'center', render: (h, {row}) => {
+          return h('span', null, this.dict.getLabel('dlbResourceType',row.type))},
         },
         {prop: 'messageLevel', label: '级别', align: 'center', dict: "dlbMessageUrgency"},
         {prop: 'taskType', label: '播发方式', align: 'center', render: (h, {row}) => {
@@ -80,7 +80,7 @@ export default {
         },
         {prop: 'startTime', label: '开始时间', align: 'center', width: 180},
         {prop: 'broadcastStatus', label: '状态', align: 'center', dict: "dlbBroadcastStatus"},
-        {prop: 'areaName', label: '地区', align: 'center'},
+        // {prop: 'areaName', label: '地区', align: 'center'},
         {prop: 'createUserName', label: '创建人', align: 'center'},
         {slot: 'options'},
       ],
diff --git a/packages/device/AppEquipmentManage/components/taskList.vue b/packages/device/AppEquipmentManage/components/taskList.vue
index 0d14d8df..47da1bb7 100644
--- a/packages/device/AppEquipmentManage/components/taskList.vue
+++ b/packages/device/AppEquipmentManage/components/taskList.vue
@@ -50,12 +50,12 @@ export default {
           label: '任务名称',
         },
         {
-          prop: 'cyclingType',
+          prop: 'type',
           label: '媒资类型',
           width: '200',
           align: 'center',
           render: (h, { row })=>{
-            return h('span',null,this.dict.getLabel('dlbDyclingType',row.cyclingType))
+            return h('span',null,this.dict.getLabel('dlbResourceType',row.cyclingType))
           }
         },
         {
@@ -81,11 +81,14 @@ export default {
           width: '120',
           align: 'center',
         },
-        // {
-        //   prop: 'serialNo',
-        //   label: '状态',
-        //   align: 'center',
-        // },
+        {
+          prop: 'broadcastStatus',
+          label: '状态',
+          align: 'center',
+          render: (h, {row}) => {
+            return h('span',null,this.dict.getLabel('dlbBroadcastStatus',row.broadcastStatus))
+          },
+        },
         {
           prop: 'createUserName',
           label: '创建人',
@@ -100,7 +103,7 @@ export default {
     }
   },
   created() {
-    this.$dict.load('dlbDyclingType','dlbMessageUrgency',).then(()=>{
+    this.$dict.load('dlbDyclingType','dlbMessageUrgency','dlbBroadcastStatus','dlbResourceType').then(()=>{
       this.getList()
     })
   },

From 2f1e902885992528f1a686485fbebb1c594048c6 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Mon, 13 Jun 2022 14:14:47 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/device/AppBroadcast/components/List.vue           | 6 +++++-
 packages/device/AppEquipmentManage/components/taskList.vue | 6 +++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/device/AppBroadcast/components/List.vue b/packages/device/AppBroadcast/components/List.vue
index cf234bf5..52d7c28d 100644
--- a/packages/device/AppBroadcast/components/List.vue
+++ b/packages/device/AppBroadcast/components/List.vue
@@ -79,7 +79,11 @@ export default {
           return h('span', null, (row.taskType == 1? '定时播放':'立即播放'))},
         },
         {prop: 'startTime', label: '开始时间', align: 'center', width: 180},
-        {prop: 'broadcastStatus', label: '状态', align: 'center', dict: "dlbBroadcastStatus"},
+        {prop: 'broadcastStatus', label: '状态', align: 'center', 
+          render: (h, { row })=>{
+            return h('span',null, (row.broadcastStatus == 0? '已下发': row.broadcastStatus == 3? '播发成功': row.broadcastStatus == 6? '已取消': ''))
+          }
+        },
         // {prop: 'areaName', label: '地区', align: 'center'},
         {prop: 'createUserName', label: '创建人', align: 'center'},
         {slot: 'options'},
diff --git a/packages/device/AppEquipmentManage/components/taskList.vue b/packages/device/AppEquipmentManage/components/taskList.vue
index 47da1bb7..4f75d3c4 100644
--- a/packages/device/AppEquipmentManage/components/taskList.vue
+++ b/packages/device/AppEquipmentManage/components/taskList.vue
@@ -85,9 +85,9 @@ export default {
           prop: 'broadcastStatus',
           label: '状态',
           align: 'center',
-          render: (h, {row}) => {
-            return h('span',null,this.dict.getLabel('dlbBroadcastStatus',row.broadcastStatus))
-          },
+          render: (h, { row })=>{
+            return h('span',null, (row.broadcastStatus == 0? '已下发': row.broadcastStatus == 3? '播发成功': row.broadcastStatus == 6? '已取消': ''))
+          }
         },
         {
           prop: 'createUserName',