From d65e6f9c8cb7c9218801318f8cdd1a1e3a2f2408 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 05 三月 2025 13:55:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/views/business/deviceBroadcast.vue |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/src/views/business/deviceBroadcast.vue b/admin/src/views/business/deviceBroadcast.vue
index c5d62e2..1dfd766 100644
--- a/admin/src/views/business/deviceBroadcast.vue
+++ b/admin/src/views/business/deviceBroadcast.vue
@@ -2,7 +2,7 @@
     <TableLayout :permissions="['business:device:query']">
         <!-- 鎼滅储琛ㄥ崟 -->
         <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
-            <el-form-item label="鍚嶇О" prop="name">
+            <el-form-item title="鍚嶇О" prop="name">
                 <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
             </el-form-item>
             <section>
@@ -22,7 +22,7 @@
             >
               <el-table-column label="搴忓彿"  width="55" fixed><template slot-scope="scope" >{{scope.$index+1}}</template></el-table-column>
                 <el-table-column prop="name" label="鍚嶇О"></el-table-column>
-                <el-table-column prop="hkId" label="骞挎挱鐐瑰敮涓�鏍囪瘑"></el-table-column>
+                <el-table-column prop="hkId" label="骞挎挱鐐瑰敮涓�鏍囪瘑" min-width="200"></el-table-column>
                 <el-table-column prop="channelInfo" label="骞挎挱鐐圭被鍨�"></el-table-column>
                 <el-table-column prop="channelNo" label="閫氶亾鍙�"></el-table-column>
                 <el-table-column prop="regionName" label="鍖哄煙鍚嶇О"></el-table-column>
@@ -89,7 +89,7 @@
               this.search()
             })
             .catch(e => {
-              this.$tip.apiFailed(e)
+             //  this.$tip.apiFailed(e)
             })
             .finally(() => {
               this.isWorking.delete = false

--
Gitblit v1.9.3