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/deviceLed.vue | 38 +++++++++++++++++---------------------
1 files changed, 17 insertions(+), 21 deletions(-)
diff --git a/admin/src/views/business/deviceLed.vue b/admin/src/views/business/deviceLed.vue
index 05737ca..4cdd754 100644
--- a/admin/src/views/business/deviceLed.vue
+++ b/admin/src/views/business/deviceLed.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,11 +20,10 @@
: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 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="manufature" label="鍘傚晢"></el-table-column>
+ <el-table-column prop="no" label="璁惧缂栧彿"></el-table-column>
<el-table-column prop="online" label="鍦ㄧ嚎鐘舵��">
<template slot-scope="{row}">
<span v-if="row.online == 0">绂荤嚎</span>
@@ -33,19 +32,16 @@
</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
+ v-if="containPermissions(['business:device:update' ])"
+ label="鎿嶄綔"
+ min-width="120"
+ fixed="right"
+ >
+ <template slot-scope="{row}">
+ <el-button type="text" @click="$refs.OperaDeviceLedWindow.open('璁剧疆灞忔樉鍐呭', row)" icon="el-icon-edit" v-permissions="['business:device:update']">璁剧疆灞忔樉鍐呭</el-button>
+ </template>
+ </el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
@@ -55,7 +51,7 @@
</pagination>
</template>
<!-- 鏂板缓/淇敼 -->
-<!-- <OperaDeviceWindow ref="operaDeviceWindow" @success="handlePageChange"/>-->
+ <OperaDeviceLedWindow ref="OperaDeviceLedWindow" @success="handlePageChange"/>
</TableLayout>
</template>
@@ -63,12 +59,12 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
-import OperaDeviceWindow from '@/components/business/OperaDeviceWindow'
+import OperaDeviceLedWindow from '@/components/business/OperaDeviceLedWindow'
import { syncDevices, updateEntranceById } from '@/api/business/device'
export default {
name: 'Device',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaDeviceWindow },
+ components: { TableLayout, Pagination, OperaDeviceLedWindow },
data () {
return {
// 鎼滅储
--
Gitblit v1.9.3