From 73351235cef5b9c006f3ccb34c94007b1774425d Mon Sep 17 00:00:00 2001
From: 100011797 <2642441182@qq.com>
Date: Thu, 23 Mar 2023 15:08:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/device/Instance/index.vue      |  4 +++
 src/views/edge/Device/index.vue          | 40 ++++++++++++------------
 src/views/edge/Resource/Issue/Result.vue |  4 +--
 src/views/edge/Resource/Issue/index.vue  |  3 +-
 4 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/src/views/device/Instance/index.vue b/src/views/device/Instance/index.vue
index 30270b39..2d3b82b7 100644
--- a/src/views/device/Instance/index.vue
+++ b/src/views/device/Instance/index.vue
@@ -328,6 +328,7 @@ const columns = [
         title: 'ID',
         dataIndex: 'id',
         key: 'id',
+        ellipsis: true,
         search: {
             type: 'string',
             defaultTermType: 'eq',
@@ -337,6 +338,7 @@ const columns = [
         title: '设备名称',
         dataIndex: 'name',
         key: 'name',
+        ellipsis: true,
         search: {
             type: 'string',
             first: true,
@@ -346,6 +348,7 @@ const columns = [
         title: '产品名称',
         dataIndex: 'productName',
         key: 'productName',
+        ellipsis: true,
         search: {
             type: 'select',
             rename: 'productId',
@@ -367,6 +370,7 @@ const columns = [
         dataIndex: 'createTime',
         key: 'createTime',
         scopedSlots: true,
+        width: 200,
         search: {
             type: 'date',
         },
diff --git a/src/views/edge/Device/index.vue b/src/views/edge/Device/index.vue
index 9d9bc8cb..116442f4 100644
--- a/src/views/edge/Device/index.vue
+++ b/src/views/edge/Device/index.vue
@@ -267,26 +267,26 @@ const columns = [
                 }),
         },
     },
-    {
-        key: 'productId$product-info',
-        dataIndex: 'productId$product-info',
-        title: '接入方式',
-        hideInTable: true,
-        search: {
-            type: 'select',
-            options: () =>
-                new Promise((resolve) => {
-                    queryGatewayList({}).then((resp: any) => {
-                        resolve(
-                            resp.result.map((item: any) => ({
-                                label: item.name,
-                                value: `accessId is ${item.id}`,
-                            })),
-                        );
-                    });
-                }),
-        },
-    },
+    // {
+    //     key: 'productId$product-info',
+    //     dataIndex: 'productId$product-info',
+    //     title: '接入方式',
+    //     hideInTable: true,
+    //     search: {
+    //         type: 'select',
+    //         options: () =>
+    //             new Promise((resolve) => {
+    //                 queryGatewayList({}).then((resp: any) => {
+    //                     resolve(
+    //                         resp.result.map((item: any) => ({
+    //                             label: item.name,
+    //                             value: `accessId is ${item.id}`,
+    //                         })),
+    //                     );
+    //                 });
+    //             }),
+    //     },
+    // },
     {
         dataIndex: 'deviceType',
         title: '设备类型',
diff --git a/src/views/edge/Resource/Issue/Result.vue b/src/views/edge/Resource/Issue/Result.vue
index 52589e13..339ddb2d 100644
--- a/src/views/edge/Resource/Issue/Result.vue
+++ b/src/views/edge/Resource/Issue/Result.vue
@@ -20,7 +20,7 @@
             <j-col :span="8">已下发数量：{{ countErr + count }}</j-col>
         </j-row>
         <div v-if="!flag">
-            <j-textarea :rows="20" :value="JSON.stringify(errMessage)" />
+            <j-textarea :rows="10" :value="JSON.stringify(errMessage)" />
         </div>
     </j-modal>
 </template>
@@ -86,7 +86,7 @@ const getData = () => {
             et += 1;
             countErr.value = et;
             flag.value = false;
-            if (errMessages.length <= 5) {
+            if (errMessages.length < 5) {
                 errMessages.push({ ...res });
                 errMessage.value = [...errMessages];
             }
diff --git a/src/views/edge/Resource/Issue/index.vue b/src/views/edge/Resource/Issue/index.vue
index 5bab28ac..b12f7554 100644
--- a/src/views/edge/Resource/Issue/index.vue
+++ b/src/views/edge/Resource/Issue/index.vue
@@ -169,7 +169,8 @@ const onCancel = () => {
 
 <style lang="less" scoped>
 .search {
-    padding: 0 0 0 24px;
+    padding: 0px;
+    margin: 0px;
 }
 .alert {
     height: 40px;