From 67cb445d8262b5df01e73f2a2510ddcf846befa2 Mon Sep 17 00:00:00 2001
From: hyx <hanyuxia@iie.ac.cn>
Date: Wed, 20 Sep 2023 17:24:15 +0800
Subject: [PATCH] =?UTF-8?q?CN-1293=20fix:Administration>=20Operation=20Log?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=BB=85=E4=BF=9D=E7=95=99ID?=
 =?UTF-8?q?=E4=B8=80=E5=88=97=E6=97=B6=EF=BC=8C=E8=A1=A8=E6=A0=BC=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/charts2/networkOverviewTabs.scss         | 10 ++++++++++
 .../table/administration/OperationLogTable.vue     |  6 +++---
 src/components/table/administration/RoleTable.vue  |  2 +-
 src/components/table/administration/UserTable.vue  | 14 +++++++-------
 .../charts/networkOverview/NetworkOverviewTabs.vue | 12 +++++++++---
 5 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/src/assets/css/components/views/charts2/networkOverviewTabs.scss b/src/assets/css/components/views/charts2/networkOverviewTabs.scss
index 8ec96843..ee1203f0 100644
--- a/src/assets/css/components/views/charts2/networkOverviewTabs.scss
+++ b/src/assets/css/components/views/charts2/networkOverviewTabs.scss
@@ -64,6 +64,12 @@
         .data-click:hover{
           cursor: pointer;
         }
+        .el-table__header {
+          width:100%;
+        }
+        .el-table__body {
+          width:100%;
+        }
       }
       .dns-in-ex {
         display: flex;
@@ -103,8 +109,12 @@
         .data-click:hover{
           cursor: pointer;
         }
+        .el-table__header {
+          width:100%;
+        }
         .el-table__body {
           height:100%;
+          width:100%;
         }
       }
       .tab-table__no-bottom {
diff --git a/src/components/table/administration/OperationLogTable.vue b/src/components/table/administration/OperationLogTable.vue
index d1cb324c..c2eb657d 100644
--- a/src/components/table/administration/OperationLogTable.vue
+++ b/src/components/table/administration/OperationLogTable.vue
@@ -83,7 +83,7 @@ export default {
           label: this.$t('config.operationlog.id'),
           prop: 'id',
           show: true,
-          width: 100
+          minWidth: 100
         }, {
           label: this.$t('config.operationlog.username'),
           prop: 'username',
@@ -133,13 +133,13 @@ export default {
           label: this.$t('config.operationlog.params'),
           prop: 'params',
           show: false,
-          width: 150
+          minWidth: 150
         },
         {
           label: this.$t('config.operationlog.response'),
           prop: 'response',
           show: false,
-          width: 150
+          minWidth: 150
         }
       ]
     }
diff --git a/src/components/table/administration/RoleTable.vue b/src/components/table/administration/RoleTable.vue
index ead089ec..984591f3 100644
--- a/src/components/table/administration/RoleTable.vue
+++ b/src/components/table/administration/RoleTable.vue
@@ -76,7 +76,7 @@ export default {
           label: 'ID',
           prop: 'id',
           show: true,
-          width: 100,
+          minWidth: 100,
           sortable: 'custom'
         }, {
           label: this.$t('config.roles.name'),
diff --git a/src/components/table/administration/UserTable.vue b/src/components/table/administration/UserTable.vue
index b075850d..477292d5 100644
--- a/src/components/table/administration/UserTable.vue
+++ b/src/components/table/administration/UserTable.vue
@@ -93,7 +93,7 @@ export default {
           label: 'ID',
           prop: 'id',
           show: true,
-          width: 100,
+          minWidth: 100,
           sortable: 'custom'
         }, {
           label: this.$t('config.user.name'),
@@ -104,12 +104,12 @@ export default {
           label: this.$t('config.user.username'),
           prop: 'username',
           show: true,
-          width: 150
+          minWidth: 150
         }, {
           label: this.$t('config.user.roles'),
           prop: 'roles',
           show: true,
-          width: 150
+          minWidth: 150
         }, {
           label: 'E-mail',
           prop: 'email',
@@ -119,22 +119,22 @@ export default {
           label: this.$t('config.user.lastLoginTime'),
           prop: 'lastLoginTime',
           show: true,
-          width: 200
+          minWidth: 200
         }, {
           label: this.$t('config.user.lastLoginIp'),
           prop: 'lastLoginIp',
           show: true,
-          width: 150
+          minWidth: 150
         }, {
           label: this.$t('config.user.source'),
           prop: 'source',
           show: true,
-          width: 150
+          minWidth: 150
         }, {
           label: this.$t('config.user.enable'),
           prop: 'status',
           show: true,
-          width: 100
+          minWidth: 100
         }
       ]
     }
diff --git a/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue b/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue
index b96f9f54..4327d338 100644
--- a/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue
+++ b/src/views/charts2/charts/networkOverview/NetworkOverviewTabs.vue
@@ -29,7 +29,7 @@
                   height="100%"
                   empty-text=" "
                   @sort-change="((col) => {sortChange(col,tab.prop)})"
-                  :key="tabIndex"
+                  :key="`tabTable_${tabIndex}`"
           >
             <template v-for="(item, index) in customTableTitles">
               <el-table-column
@@ -39,7 +39,7 @@
                       :prop="item.prop"
                       class="data-column"
                       :ref="item.prop"
-                      :key="index"
+                      :key="`column_${index}`"
                       :width="searchColumnWidth(item.columnType)"
               >
                 <template #header >
@@ -468,8 +468,14 @@ export default {
       return excludeName.indexOf(title.name) > -1 ? false : 'custom'
     },
     searchColumnWidth (columnType) {
+      let checkedGroup = this.customTableTitles.filter(item => item.checked)
+      let checkedNum = checkedGroup.length
       if (columnType === 'dillDown') {
-        return '217px'
+        if(checkedNum === 1){
+          return 'auto'
+        }else if(checkedNum > 1){
+          return '217px'
+        }
       }
     },
     async initDropdownList (tabProp) {