From f729da1909687ee04de5de596c44ef61796d2a27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=81=82=E9=BB=8E?= <329261568@qq.com>
Date: Mon, 31 Jul 2023 10:52:22 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=BE=E5=A4=87=E8=AF=A6=E6=83=85-?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=90=E8=AE=BE=E5=A4=87=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0[=E8=AE=BE=E5=A4=87=E6=A0=87=E7=AD=BE]?=
 =?UTF-8?q?=E5=B1=9E=E6=80=A7=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../profile/DeviceDetailsView/childDevice.vue | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/src/views/profile/DeviceDetailsView/childDevice.vue b/src/views/profile/DeviceDetailsView/childDevice.vue
index 8db82a8b..2573947d 100644
--- a/src/views/profile/DeviceDetailsView/childDevice.vue
+++ b/src/views/profile/DeviceDetailsView/childDevice.vue
@@ -210,6 +210,31 @@
           </el-select>
         </el-form-item>
 
+        <el-form-item
+            label="设备标签："
+            v-if="
+              form.deviceType !== 'VIDEO_CONTROLLER' &&
+              form.deviceType !== 'GATEWAY_CONTROLLER'
+            "
+            prop="deviceTag"
+          >
+            <el-select
+              v-model="form.deviceTag"
+              filterable
+              multiple
+              placeholder="请选择设备标签"
+              clearable
+              style="width: 100%"
+            >
+              <el-option
+                v-for="dict in deviceTagList"
+                :key="dict.dictValue"
+                :label="dict.dictLabel"
+                :value="dict.dictValue"
+              />
+            </el-select>
+          </el-form-item>
+
         <el-form-item label="参数设置：">
           <span style="color: red; font-size: 12px"
             >*注意：锁定即参数不可修改；未锁则可以修改。</span
@@ -344,6 +369,7 @@ export default {
         deviceType: null,
         parentId: "",
       },
+      deviceTagList: [],
       open: false,
       title: "",
       showSearch: true,
@@ -694,6 +720,9 @@ export default {
     /** 新增按钮操作 */
     handleAdd() {
       this.reset();
+      this.getDicts("	device_tag").then((response) => {
+        this.deviceTagList = response.data;
+      });
       this.open = true;
       this.title = "添加子设备";
     },
@@ -709,6 +738,9 @@ export default {
     /** 修改按钮操作 */
     handleUpdate(row) {
       this.reset();
+      this.getDicts("	device_tag").then((response) => {
+        this.deviceTagList = response.data;
+      });
       const _this = this;
       getDevice(row.deviceId).then((response) => {
         _this.form = response.data;