diff --git a/src/views/iot/device/index.vue b/src/views/iot/device/index.vue
index 8b941932..7ed152b1 100644
--- a/src/views/iot/device/index.vue
+++ b/src/views/iot/device/index.vue
@@ -140,6 +140,13 @@
           width="120px"
           prop="deviceTypeName"
         />
+        <!-- <el-table-column
+          label="设备标签"
+          align="left"
+          width="120px"
+          :formatter="statusFormat"
+          prop="deviceTag"
+        /> -->
         <!-- <el-table-column label="父设备" align="left" prop="parentName" /> -->
         <el-table-column
           label="设备状态"
@@ -312,6 +319,24 @@
           />
         </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
@@ -481,8 +506,12 @@ export default {
             trigger: "blur",
           },
         ],
+        deviceTag: [
+          { required: true, message: "设备标签不能为空", trigger: "change" },
+        ]
       },
       deviceTypeList: {},
+      deviceTagList: [],
     };
   },
   created() {
@@ -490,10 +519,17 @@ export default {
     this.init();
   },
   methods: {
+    // 字典状态字典翻译
+    statusFormat(row, column) {
+      return this.selectDictLabel(this.deviceTagList, row.deviceTag);
+    },
     init() {
       if (this.$route.query["deviceId"]) {
         this.handleDetails(this.$route.query);
       }
+      this.getDicts("	device_tag").then((response) => {
+        this.deviceTagList = response.data;
+      });
       this.getDeviceTypeList();
       this.initGetModelList();
       this.getList();
@@ -869,6 +905,7 @@ export default {
         paramList: [],
         deviceKey: "",
         lineType: undefined,
+        deviceTag: '',
       };
       this.resetForm("form");
     },