From 51e18e190dafdec70dc1f4a3a9ecd76fb2116726 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期六, 12 十月 2024 16:25:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/deviceBroadcast.vue | 37 +++++++++----------------------------
1 files changed, 9 insertions(+), 28 deletions(-)
diff --git a/admin/src/views/business/deviceBroadcast.vue b/admin/src/views/business/deviceBroadcast.vue
index f5a4e65..d40fbe1 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>
@@ -20,32 +20,13 @@
:data="tableData.list"
stripe
>
- <el-table-column prop="name" label="璁惧鍚嶇О"></el-table-column>
- <el-table-column prop="doorName" label="闂ㄧ鐐瑰悕绉�"></el-table-column>
- <el-table-column prop="regionPathName" label="鍖哄煙鍚嶇О"></el-table-column>
- <el-table-column prop="doorNo" label="闂ㄧ鐐圭紪鍙�"></el-table-column>
- <el-table-column prop="manufature" label="鍘傚晢"></el-table-column>
- <el-table-column prop="online" label="鍦ㄧ嚎鐘舵��">
- <template slot-scope="{row}">
- <span v-if="row.online == 0">绂荤嚎</span>
- <span v-if="row.online == 1">鍦ㄧ嚎</span>
- </template>
- </el-table-column>
- <el-table-column prop="ip" label="璁惧ip"></el-table-column>
- <el-table-column prop="port" label="璁惧绔彛"></el-table-column>
- <el-table-column label="鏄惁鍥尯鍏ュ彛">
- <template slot-scope="{row}">
- <el-switch
- @change="changeManufature($event, row)"
- v-model="row.isEntrance"
- active-color="#13ce66"
- inactive-color="#ff4949"
- :active-value="1"
- :inactive-value="0">
- </el-switch>
- </template>
- </el-table-column>
- <el-table-column prop="no" label="璁惧鍙�"></el-table-column>
+ <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="channelInfo" label="骞挎挱鐐圭被鍨�"></el-table-column>
+ <el-table-column prop="channelNo" label="閫氶亾鍙�"></el-table-column>
+ <el-table-column prop="regionName" label="鍖哄煙鍚嶇О"></el-table-column>
+ <el-table-column prop="hkDate" label="鍚屾鏃堕棿"></el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
@@ -108,7 +89,7 @@
this.search()
})
.catch(e => {
- this.$tip.apiFailed(e)
+ // this.$tip.apiFailed(e)
})
.finally(() => {
this.isWorking.delete = false
--
Gitblit v1.9.3