From 9a2623232c4e553a40e4e7c7a824ae4a648ad823 Mon Sep 17 00:00:00 2001
From: shijingjing <1789544664@qq.com>
Date: Sat, 11 Jun 2022 14:42:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=92=A4=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/device/AppBroadcast/components/Detail.vue         | 1 +
 packages/device/AppEquipmentManage/components/taskList.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/device/AppBroadcast/components/Detail.vue b/packages/device/AppBroadcast/components/Detail.vue
index 85e4f94f..f5649a2e 100644
--- a/packages/device/AppBroadcast/components/Detail.vue
+++ b/packages/device/AppBroadcast/components/Detail.vue
@@ -36,6 +36,7 @@
             :tableData="tableData"
             :col-configs="colConfigs"
             :total="total"
+            :isShowPagination="false"
             @getList="getDetail">
           </ai-table>
         </template>
diff --git a/packages/device/AppEquipmentManage/components/taskList.vue b/packages/device/AppEquipmentManage/components/taskList.vue
index 7f6728b9..38a2a5d1 100644
--- a/packages/device/AppEquipmentManage/components/taskList.vue
+++ b/packages/device/AppEquipmentManage/components/taskList.vue
@@ -14,7 +14,7 @@
                   :current.sync="page.current" :size.sync="page.size" @getList="getList"
                   @selection-change="(v) => (ids = v.map((e) => e.id))">
           <el-table-column slot="options" label="操作" align="center" width="280" fixed="right">
-            <template slot-scope="{ row }" v-if="row.taskType == 1">
+            <template slot-scope="{ row }" v-if="row.taskType == 1 && (row.broadcastStatus == 0 || row.broadcastStatus == 1 || row.broadcastStatus == 2 )">
               <el-button type="text" @click="reset(row.id)">撤回任务</el-button>
             </template>
           </el-table-column>