From ab5377b9d826b619ec7f313ea92d3b56442a1fe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=95=B8=E9=9D=9E?= <13281114856@qq.com>
Date: Tue, 10 May 2022 09:45:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87=E6=96=B0?=
=?UTF-8?q?=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
device-manager-ui/admin/src/assets/mixins/table.js | 13 +++++++++++++
device-manager-ui/admin/src/components/Table.vue | 1 +
device-manager-ui/admin/src/views/device/list.vue | 10 ++++++++--
3 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/device-manager-ui/admin/src/assets/mixins/table.js b/device-manager-ui/admin/src/assets/mixins/table.js
index 972f393..c1f4140 100644
--- a/device-manager-ui/admin/src/assets/mixins/table.js
+++ b/device-manager-ui/admin/src/assets/mixins/table.js
@@ -143,6 +143,19 @@ export default {
//return content;
return content ? <el-tag type={'info'} size='mini'>{content}</el-tag> : val
},
+
+ formatterYES(row, column, val) {
+ const content = formatter(this.tableData, column, val);
+ if (content) {
+ if (val == '0') {
+ return <el-tag type={'danger'} size='mini'>{content}</el-tag>
+ } else if (val == '1') {
+ return <el-tag type={'success'} size='mini'>{content}</el-tag>
+ }
+ } else {
+ return val
+ }
+ },
formatterDictLink(row, column, val) {
const content = formatter(this.tableData, column, val);
diff --git a/device-manager-ui/admin/src/components/Table.vue b/device-manager-ui/admin/src/components/Table.vue
index 9c94555..7a7be90 100644
--- a/device-manager-ui/admin/src/components/Table.vue
+++ b/device-manager-ui/admin/src/components/Table.vue
@@ -143,6 +143,7 @@ export default {
methods: {
// 鏍规嵁url鐨剄uery鍙傛暟鍒ゆ柇鏄惁灞曠ず鏌ヨ鏉′欢
isShowSearch(query) {
+ return true;
if (!this.config.showSearch) {
return false
}
diff --git a/device-manager-ui/admin/src/views/device/list.vue b/device-manager-ui/admin/src/views/device/list.vue
index fcd25b0..0c21a15 100644
--- a/device-manager-ui/admin/src/views/device/list.vue
+++ b/device-manager-ui/admin/src/views/device/list.vue
@@ -76,7 +76,13 @@ export default {
{
name: 'deviceNum',
type: 'text',
- label: '璁惧缂栧彿',
+ label: '璁惧缂栫爜',
+ },
+
+ {
+ name: 'deviceType',
+ type: 'select',
+ label: '璁惧绫诲瀷',
},
{
name: 'deviceOnlineStatus',
@@ -96,7 +102,7 @@ export default {
{
label: "鍦ㄧ嚎鐘舵€� ",
prop: "deviceOnlineStatus",
- formatter: this.formatter,
+ formatter: this.formatterYES,
},
{
--
2.24.3