From be5afdf49938b5830313740b12c25c6851847e3f Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期五, 08 三月 2024 15:42:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/device.vue | 30 +++++++++++-------------------
1 files changed, 11 insertions(+), 19 deletions(-)
diff --git a/admin/src/views/business/device.vue b/admin/src/views/business/device.vue
index 585e035..cd26382 100644
--- a/admin/src/views/business/device.vue
+++ b/admin/src/views/business/device.vue
@@ -2,15 +2,11 @@
<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-input v-model="searchForm.name" placeholder="璇疯緭鍏ラ棬绂佸悕绉�" @keypress.enter.native="search"></el-input>
+ <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="level">
- <el-select v-model="searchForm.level" placeholder="璇烽�夋嫨闂ㄧ绛夌骇" @keypress.enter.native="search">
- <el-option label="涓�绾ч棬绂�" value="1"></el-option>
- <el-option label="浜岀骇闂ㄧ" value="2"></el-option>
- <el-option label="涓夌骇闂ㄧ" value="3"></el-option>
- </el-select>
+ <el-form-item label="鍖哄煙鍚嶇О" prop="regionPathName">
+ <el-input v-model="searchForm.regionPathName" placeholder="璇疯緭鍏ュ尯鍩熷悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
<section>
<el-button type="primary" @click="search">鎼滅储</el-button>
@@ -27,16 +23,12 @@
:data="tableData.list"
stripe
>
+ <el-table-column prop="name" label="璁惧鍚嶇О" min-width="100px"></el-table-column>
+ <el-table-column prop="doorName" label="闂ㄧ鐐瑰悕绉�" min-width="100px"></el-table-column>
+ <el-table-column prop="regionPathName" label="鍖哄煙鍚嶇О" min-width="100px"></el-table-column>
+ <el-table-column prop="doorNo" label="闂ㄧ鐐圭紪鍙�" min-width="100px"></el-table-column>
<el-table-column prop="manufature" label="鍘傚晢" min-width="100px"></el-table-column>
- <el-table-column prop="no" label="璁惧缂栧彿" min-width="100px"></el-table-column>
- <el-table-column prop="name" label="闂ㄧ鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="level" label="闂ㄧ绛夌骇" min-width="100px"></el-table-column>
- <el-table-column prop="status" label="璁惧鐘舵��" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.status === 0">绂佺敤</span>
- <span v-if="row.status === 1">鍚敤</span>
- </template>
- </el-table-column>
+ <el-table-column prop="no" label="璁惧鍙�" min-width="100px"></el-table-column>
<!-- <el-table-column-->
<!-- v-if="containPermissions(['business:device:update'])"-->
<!-- label="鎿嶄綔"-->
@@ -75,8 +67,8 @@
return {
// 鎼滅储
searchForm: {
- name: '',
- level: ''
+ doorName: '',
+ regionPathName: ''
},
options: []
}
--
Gitblit v1.9.3