From 54da8a22c438e1495b9c5fbae75ca9d4b5ca7335 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 02 九月 2024 16:04:37 +0800
Subject: [PATCH] Merge branch 'master' into wxw

---
 Web/src/views/wcs/wcsDevice/component/editDialog.vue |    9 +++++++++
 1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/Web/src/views/wcs/wcsDevice/component/editDialog.vue b/Web/src/views/wcs/wcsDevice/component/editDialog.vue
index 0eed749..da9d95d 100644
--- a/Web/src/views/wcs/wcsDevice/component/editDialog.vue
+++ b/Web/src/views/wcs/wcsDevice/component/editDialog.vue
@@ -24,6 +24,15 @@
 
 					</el-col>
 					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
+						<el-form-item label="浜や簰绫诲瀷" prop="deviceType">
+							<el-select clearable v-model="ruleForm.deviceType" placeholder="璇烽�夋嫨浜や簰绫诲瀷">
+								<el-option v-for="(item, index) in dl('DeviceTypeEnum')" :key="index"
+									:value="Number(item.value)"
+									:label="`${item.name} (${item.code}) [${item.value}]`"></el-option>
+							</el-select>
+						</el-form-item>
+					</el-col>
+					<el-col :xs="24" :sm="12" :md="12" :lg="12" :xl="12" class="mb20">
 						<el-form-item label="璁惧绾у埆" prop="level">
 							<el-select clearable v-model="ruleForm.level" placeholder="璇烽�夋嫨璁惧绾у埆">
 								<el-option v-for="(item, index) in dl('DeviceLevelEnum')" :key="index"

--
Gitblit v1.8.0