From c226922f0729f3d66dd4a9b987af15ce13d6edf8 Mon Sep 17 00:00:00 2001
From: kerwincui <164770707@qq.com>
Date: Tue, 31 May 2022 17:21:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A7=E5=93=81=E5=92=8C=E8=AE=BE=E5=A4=87?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=95=8C=E9=9D=A2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vue/src/views/iot/device/device-edit.vue   | 2 +-
 vue/src/views/iot/product/product-edit.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/vue/src/views/iot/device/device-edit.vue b/vue/src/views/iot/device/device-edit.vue
index 4bad2421..0e2302b3 100644
--- a/vue/src/views/iot/device/device-edit.vue
+++ b/vue/src/views/iot/device/device-edit.vue
@@ -44,7 +44,7 @@
                     </el-col>
                     <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="8">
                         <el-form-item label="定位方式" prop="isCustomLocation">
-                            <el-select v-model="form.isCustomLocation" placeholder="请选择设备状态" clearable size="small">
+                            <el-select v-model="form.isCustomLocation" placeholder="请选择设备状态" clearable size="small" style="width:100%;">
                                 <el-option v-for="dict in dict.type.iot_location_way" :key="dict.value" :label="dict.label" :value="Number(dict.value)" />
                             </el-select>
                         </el-form-item>
diff --git a/vue/src/views/iot/product/product-edit.vue b/vue/src/views/iot/product/product-edit.vue
index 93385c9d..ae8a4376 100644
--- a/vue/src/views/iot/product/product-edit.vue
+++ b/vue/src/views/iot/product/product-edit.vue
@@ -23,12 +23,12 @@
                             <el-switch v-model="form.isAuthorize" @change="changeIsAuthorize(form.isAuthorize)" :active-value="1" :inactive-value="0" :disabled="form.status==2" />
                         </el-form-item>
                         <el-form-item label="备注信息" prop="remark">
-                            <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" rows="3" :readonly="form.status==2" />
+                            <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" rows="4" :readonly="form.status==2" />
                         </el-form-item>
                     </el-col>
                     <el-col :xs="24" :sm="24" :md="24" :lg="12" :xl="8">
                         <el-form-item label="设备类型" prop="deviceType">
-                            <el-select v-model="form.deviceType" placeholder="请选择设备类型" disabled style="width:100%">
+                            <el-select v-model="form.deviceType" placeholder="请选择设备类型" :disabled="form.status==2" style="width:100%">
                                 <el-option v-for="dict in dict.type.iot_device_type" :key="dict.value" :label="dict.label" :value="parseInt(dict.value)"></el-option>
                             </el-select>
                         </el-form-item>