From 842a51346f380eb8f6b69efb4223cf953d366e80 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 13 九月 2024 16:11:31 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Web/src/views/wcs/wcsDevice/index.vue | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/Web/src/views/wcs/wcsDevice/index.vue b/Web/src/views/wcs/wcsDevice/index.vue
index bb543eb..6266dc0 100644
--- a/Web/src/views/wcs/wcsDevice/index.vue
+++ b/Web/src/views/wcs/wcsDevice/index.vue
@@ -55,6 +55,12 @@
</template>
</el-table-column>
+ <el-table-column prop="deviceType" label="浜や簰绫诲瀷" show-overflow-tooltip="">
+ <template #default="scope">
+ <el-tag :type="dv('DeviceTypeEnum', scope.row.deviceType)?.tagType"> {{ dv('DeviceTypeEnum',
+ scope.row.deviceType)?.name }}</el-tag>
+ </template>
+ </el-table-column>
<el-table-column prop="level" label="璁惧绾у埆" show-overflow-tooltip="">
<template #default="scope">
<el-tag :type="dv('DeviceLevelEnum', scope.row.level)?.tagType"> {{ dv('DeviceLevelEnum',
@@ -124,7 +130,7 @@
const queryParams = ref<any>({});
const tableParams = ref({
page: 1,
- pageSize: 10,
+ pageSize: 20,
total: 0,
});
--
Gitblit v1.8.0