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

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,16 +71,20 @@ 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}) => {
           return h('span', null, (row.taskType == 1? '定时播放':'立即播放'))},
         },
         {prop: 'startTime', label: '开始时间', align: 'center', width: 180},
-        {prop: 'broadcastStatus', label: '状态', align: 'center', dict: "dlbBroadcastStatus"},
-        {prop: 'areaName', label: '地区', align: 'center'},
+        {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'},
       ],

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, (row.broadcastStatus == 0? '已下发': row.broadcastStatus == 3? '播发成功': row.broadcastStatus == 6? '已取消': ''))
+          }
+        },
         {
           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()
     })
   },