From 3a11109642961896bd5ae64ead123cf1a31e5216 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 03 三月 2025 15:54:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/device.vue | 83 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 77 insertions(+), 6 deletions(-)
diff --git a/admin/src/views/business/device.vue b/admin/src/views/business/device.vue
index 0ecbd96..1c1ff3c 100644
--- a/admin/src/views/business/device.vue
+++ b/admin/src/views/business/device.vue
@@ -75,6 +75,72 @@
<!-- 鏂板缓/淇敼 -->
<!-- <OperaDeviceWindow ref="operaDeviceWindow" @success="handlePageChange"/>-->
</TableLayout>
+ <TableLayout :permissions="['business:device:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <div ref="QueryFormRef" slot="search-form">
+ <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="闂ㄧ鐐瑰悕绉�" prop="doorName">
+ <el-input v-model="searchForm.doorName" placeholder="璇疯緭鍏ラ棬绂佺偣鍚嶇О" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="鍖哄煙鍚嶇О" prop="regionPathName">
+ <el-input v-model="searchForm.regionPathName" placeholder="璇疯緭鍏ュ尯鍩熷悕绉�"
+ @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="鏄惁鍥尯鍏ュ彛" prop="isEntrance">
+ <el-select v-model="searchForm.isEntrance" placeholder="璇烽�夋嫨">
+ <el-option label="鏄�" value="1"></el-option>
+ <el-option label="鍚�" value="0"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍦ㄧ嚎鐘舵��" prop="online">
+ <el-select v-model="searchForm.online" placeholder="璇烽�夋嫨" clearable>
+ <el-option label="绂荤嚎" value="0"></el-option>
+ <el-option label="鍦ㄧ嚎" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ </div>
+
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <ul class="toolbar">
+ <li><el-button type="primary" @click="synchronousData">鍚屾</el-button></li>
+ </ul>
+ <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe>
+ <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="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" width="200px" label="璁惧鍙�"></el-table-column>
+ </el-table>
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
+ </pagination>
+ </template>
+ <!-- 鏂板缓/淇敼 -->
+ <!-- <OperaDeviceWindow ref="operaDeviceWindow" @success="handlePageChange"/>-->
+ </TableLayout>
</template>
<script>
@@ -87,7 +153,7 @@
name: 'Device',
extends: BaseTable,
components: { TableLayout, Pagination, OperaDeviceWindow },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
@@ -95,12 +161,12 @@
regionPathName: '',
isEntrance: '',
online: '',
- type:0
+ type: 0
},
options: []
}
},
- created () {
+ created() {
this.config({
module: '璁惧淇℃伅琛�',
api: '/business/device',
@@ -109,6 +175,11 @@
})
this.search()
},
+ mounted() {
+ this.$nextTick(() => {
+ this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 300
+ })
+ },
methods: {
changeManufature(e, row) {
updateEntranceById({
@@ -116,11 +187,11 @@
isEntrance: e
})
},
- synchronousData () {
+ synchronousData() {
this.$dialog.actionConfirm('鎿嶄綔纭鎻愰啋', '鎮ㄧ‘璁ゅ悓姝ュ叏閮ㄤ俊鎭悧锛�')
.then(() => {
this.isWorking.delete = true
- syncDevices({type:0})
+ syncDevices({ type: 0 })
.then(res => {
this.$tip.apiSuccess(res || '鍚屾鎴愬姛')
this.search()
@@ -132,7 +203,7 @@
this.isWorking.delete = false
})
})
- .catch(() => {})
+ .catch(() => { })
}
}
}
--
Gitblit v1.9.3