From dd6a43fdbadaaf6d646b3eb2ca0a63f58ed77ea4 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 29 十月 2025 15:56:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
admin/src/views/business/jkCabinet.vue | 28 +++++++++++++++++++---------
1 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/admin/src/views/business/jkCabinet.vue b/admin/src/views/business/jkCabinet.vue
index d6f7b5c..e2182e2 100644
--- a/admin/src/views/business/jkCabinet.vue
+++ b/admin/src/views/business/jkCabinet.vue
@@ -31,7 +31,7 @@
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:jkcabinet:create', 'business:jkcabinet:delete']">
<li><el-button type="primary" @click="$refs.operaJkCabinetWindow.open('鏂板缓璁惧')" icon="el-icon-plus" v-permissions="['business:jkcabinet:create']">鏂板缓</el-button></li>
- <li><el-button @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:jkcabinet:delete']">鍒犻櫎</el-button></li>
+ <li><el-button type="warning" @click="$refs.alcoholTest.open('鏂板缓閰掔簿妫�娴嬮厤缃�', form)">閰掔簿妫�娴嬮厤缃�</el-button></li>
</ul>
<el-table
:height="tableHeightNew"
@@ -44,7 +44,7 @@
<el-table-column prop="devId" label="璁惧ID" min-width="100px"></el-table-column>
<el-table-column prop="linkAddr" label="閫氳鍦板潃" min-width="100px"></el-table-column>
<el-table-column prop="port" label="绔彛鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="lacation" label="鎵�鍦ㄤ綅缃�" min-width="100px"></el-table-column>
+ <el-table-column prop="location" label="鎵�鍦ㄤ綅缃�" min-width="100px"></el-table-column>
<el-table-column label="鏌滄牸鏁伴噺" min-width="100px">
<template slot-scope="{row}">
<el-button @click="$refs.cabinetDetails.open(row.name + '-鏌滄牸淇℃伅', row.id)">{{row.gridNum}}</el-button>
@@ -52,8 +52,8 @@
</el-table-column>
<el-table-column label="杩愯鐘舵��" min-width="100px">
<template slot-scope="{row}">
- <el-link type="success" v-if="row.runStatus === 0">鍦ㄧ嚎</el-link>
- <el-link type="danger" v-if="row.runStatus === 1">绂荤嚎</el-link>
+ <el-link type="success" :underline="false" v-if="row.runStatus === 0">鍦ㄧ嚎</el-link>
+ <el-link type="danger" :underline="false" v-if="row.runStatus === 1">绂荤嚎</el-link>
</template>
</el-table-column>
<el-table-column label="鐘舵��" min-width="100px">
@@ -75,8 +75,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text">鏃ュ織</el-button>
- <el-button type="text">缁戝畾閽ュ寵</el-button>
+ <el-button type="text" @click="$refs.cabinetDetails.open(row.name + '-鏌滄牸淇℃伅', row.id)">缁戝畾閽ュ寵</el-button>
<el-button type="text" @click="$refs.operaJkCabinetWindow.open('缂栬緫閽ュ寵鏌滃熀鏈俊鎭〃', row)" v-permissions="['business:jkcabinet:update']">缂栬緫</el-button>
<el-button type="text" @click="deleteById(row)" v-permissions="['business:jkcabinet:delete']">鍒犻櫎</el-button>
</template>
@@ -93,6 +92,8 @@
<OperaJkCabinetWindow ref="operaJkCabinetWindow" @success="handlePageChange"/>
<!-- 鏌滃瓙璇︽儏 -->
<CabinetDetails ref="cabinetDetails" />
+ <!-- 鏂板閰掔簿妫�娴� -->
+ <AlcoholTest ref="alcoholTest" @success="GetCabinetConfig" />
</TableLayout>
</template>
@@ -102,11 +103,12 @@
import Pagination from '@/components/common/Pagination'
import OperaJkCabinetWindow from '@/components/business/OperaJkCabinetWindow'
import CabinetDetails from '@/components/business/cabinetDetails'
-import { updateStatusById } from '@/api/business/jkCabinet'
+import AlcoholTest from '@/components/business/alcoholTest'
+import { updateStatusById, getCabinetConfig } from '@/api/business/jkCabinet'
export default {
name: 'JkCabinet',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaJkCabinetWindow, CabinetDetails },
+ components: { TableLayout, Pagination, OperaJkCabinetWindow, CabinetDetails, AlcoholTest},
data () {
return {
// 鎼滅储
@@ -115,7 +117,8 @@
name: '',
status: '',
rumStatus: ''
- }
+ },
+ form: null
}
},
created () {
@@ -126,6 +129,7 @@
'field.main': 'id'
})
this.search()
+ this.GetCabinetConfig()
},
methods: {
changeStatus(status, id) {
@@ -133,6 +137,12 @@
.then(res => {
this.search()
})
+ },
+ GetCabinetConfig() {
+ getCabinetConfig()
+ .then(res => {
+ this.form = res
+ })
}
}
}
--
Gitblit v1.9.3