From b0684324ad2f075255d8a96ffacd5610099c1dfd Mon Sep 17 00:00:00 2001
From: 23688nl <329261568@qq.com>
Date: Wed, 7 Sep 2022 18:03:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E4=B8=8B=20?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=BD=91=E5=85=B3=E7=9A=84=20=E5=9C=A8?=
 =?UTF-8?q?=E7=BA=BF=E7=8A=B6=E6=80=81=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../profileV2/DeviceManage/EDeviceTable.vue   | 26 ++++++++++++++-----
 .../project/profileV2/DeviceManage/index.vue  |  2 +-
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue b/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue
index 7e5ce5cd..41a1e582 100644
--- a/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue
+++ b/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue
@@ -39,15 +39,22 @@
         </el-col>
         <el-col :span="5">
           <el-form-item label="设备状态" prop="deviceStatus">
-            <el-input
-              v-model="queryParams.deviceStatus"
-              placeholder="请输入设备状态"
+            <el-select
+              v-model="queryParams.deviceState"
+              placeholder="请选择设备状态"
               clearable
               size="small"
-            />
+            >
+              <el-option
+                :label="keys"
+                v-for="(keys, vals) in deviceStatusOpt"
+                :key="vals"
+                :value="vals"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
-        <el-col :span="5">
+        <!-- <el-col :span="5">
           <el-form-item label="设备类型" prop="deviceStatus">
             <el-input
               v-model="queryParams.deviceStatus"
@@ -56,7 +63,7 @@
               size="small"
             />
           </el-form-item>
-        </el-col>
+        </el-col> -->
 
         <el-col :span="4">
           <el-form-item class="query-foot">
@@ -137,6 +144,12 @@ import EDeviceChildren from './EDeviceChildren'
 import { webSocketProjectGatewayUrl } from "@/config/env";
 import { listProjectDevice, listProjectModel } from '@/api/iot/project_new'
 import { getIotFileUrl } from "@/utils/hciot"
+const deviceStatusOpt = {
+  ONLINE: "在线",
+  OFFLINE: "离线",
+  OUTLINE: "脱线",
+  UNACTIVE: "未激活",
+};
 export default {
   name: "EDeviceTable",
   components: {
@@ -155,6 +168,7 @@ export default {
   },
   data() {
     return {
+      deviceStatusOpt,
       queryParams: {
         prodKey: undefined,
         deviceName: undefined,
diff --git a/src/views/iot/project/profileV2/DeviceManage/index.vue b/src/views/iot/project/profileV2/DeviceManage/index.vue
index 850bd1f7..80786562 100644
--- a/src/views/iot/project/profileV2/DeviceManage/index.vue
+++ b/src/views/iot/project/profileV2/DeviceManage/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="e-object-device-manage">
-    <el-tabs v-model="activeName">
+    <el-tabs v-model="activeName"  style="width: 100%;">
       <el-tab-pane
         :label="tabLabel.dictLabel"
         :name="tabLabel.dictValue"