From 83c7cfa4ecd5d59106b09efff26be43141e38386 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 21 十二月 2023 09:10:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/business/device.vue | 46 ++++++++++++++++++++++++++++++++--------------
1 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/admin/src/views/business/device.vue b/admin/src/views/business/device.vue
index d93229a..dc6a3de 100644
--- a/admin/src/views/business/device.vue
+++ b/admin/src/views/business/device.vue
@@ -1,18 +1,15 @@
<template>
- <TableLayout :permissions="['business:company:query']">
+ <TableLayout :permissions="['business:device:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="闂ㄧ鍚嶇О" prop="title">
- <el-input v-model="searchForm.title" placeholder="璇疯緭鍏ラ棬绂佸悕绉�" @keypress.enter.native="search"></el-input>
+ <el-form-item label="闂ㄧ鍚嶇О" prop="name">
+ <el-input v-model="searchForm.name" 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
- v-for="item in options"
- :key="item.value"
- :label="item.label"
- :value="item.value">
- </el-option>
+ <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>
<section>
@@ -23,7 +20,7 @@
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar">
- <li><el-button type="primary">鍚屾</el-button></li>
+ <li><el-button type="primary" @click="synchronousData">鍚屾</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
@@ -32,16 +29,16 @@
>
<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="title" 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="璁惧鐘舵�� 0绂佺敤 1鍚敤" min-width="100px">
+ <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
- v-if="containPermissions(['business:company:update'])"
+ v-if="containPermissions(['business:device:update'])"
label="鎿嶄綔"
min-width="120"
fixed="right"
@@ -68,6 +65,7 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaDeviceWindow from '@/components/business/OperaDeviceWindow'
+import { syncDevices } from '@/api/business/device'
export default {
name: 'Device',
extends: BaseTable,
@@ -76,7 +74,7 @@
return {
// 鎼滅储
searchForm: {
- title: '',
+ name: '',
level: ''
},
options: []
@@ -90,6 +88,26 @@
'field.main': 'id'
})
this.search()
+ },
+ methods: {
+ synchronousData () {
+ this.$confirm('纭鍚屾鍚�?', '鎻愮ず', {
+ confirmButtonText: '纭畾',
+ cancelButtonText: '鍙栨秷',
+ type: 'warning'
+ }).then(() => {
+ syncDevices({})
+ .then(res => {
+ this.$message({
+ type: 'success',
+ message: '鍚屾鎴愬姛'
+ })
+ this.search()
+ })
+ }).catch(() => {
+
+ })
+ }
}
}
</script>
--
Gitblit v1.9.3