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

---
 packages/device/AppBroadcast/components/List.vue           | 2 +-
 packages/device/AppEquipmentManage/components/taskList.vue | 2 +-
 packages/device/AppMediaManage/components/Play.vue         | 7 ++-----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/device/AppBroadcast/components/List.vue b/packages/device/AppBroadcast/components/List.vue
index 52d7c28d..eafb244e 100644
--- a/packages/device/AppBroadcast/components/List.vue
+++ b/packages/device/AppBroadcast/components/List.vue
@@ -33,7 +33,7 @@
               <!-- <el-button type="text" @click="onAdd(row.id)">复制</el-button> -->
               <el-button type="text" @click="toDetail(row.id)">详情</el-button>
               <el-button type="text" @click="reset(row.id)"
-                         v-if="row.taskType == 1">撤回
+                         v-if="row.taskType == 1 && (row.broadcastStatus == 0 || row.broadcastStatus == 1 || row.broadcastStatus == 2 )">撤回
               </el-button>
             </template>
           </el-table-column>
diff --git a/packages/device/AppEquipmentManage/components/taskList.vue b/packages/device/AppEquipmentManage/components/taskList.vue
index 4f75d3c4..4580587d 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>
diff --git a/packages/device/AppMediaManage/components/Play.vue b/packages/device/AppMediaManage/components/Play.vue
index 369df7f1..0f4a1216 100644
--- a/packages/device/AppMediaManage/components/Play.vue
+++ b/packages/device/AppMediaManage/components/Play.vue
@@ -59,7 +59,7 @@
                               value-format="HH:mm:ss"></el-time-picker>
             </el-form-item>
             <el-form-item label="播放设备" v-if="areaId" prop="serialNo" style="width: 100%;">
-              <ai-table-select nodeName="name" :instance="instance" extra="serialNo" :action="`/app/appdlbquipment/list?devStatus=5&areaId=${areaId}`"
+              <ai-table-select nodeName="name" :instance="instance" extra="serialNo" searchKey="name" :action="`/app/appdlbquipment/list?devStatus=5&areaId=${areaId}`"
                               @select="v => formData.serialNo = v.map(e=> e.serialNo).toString()" multiple/>
             </el-form-item>
           </el-form>
@@ -183,10 +183,7 @@ export default {
     newDate() {
       var myDate = new Date();
       return myDate.getHours() + ':' + myDate.getMinutes() + ':' + myDate.getSeconds()
-    },
-    // areaRoot() {
-    //   return this.areaRootId = [this.user.info.areaId.substr(0,6),'000000'].join("")
-    // }
+    }
   },
 
   watch: {