From 6c5e752949e9e1cbe293d981087fad8d657b751d Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Fri, 16 Sep 2022 15:29:47 +0800
Subject: [PATCH] =?UTF-8?q?perf=20:=20network=20,process=20=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/table/asset/assetNetworkTable.vue  | 34 +++++++++++--------
 .../common/table/asset/assetProcessTable.vue  |  7 ++--
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/nezha-fronted/src/components/common/table/asset/assetNetworkTable.vue b/nezha-fronted/src/components/common/table/asset/assetNetworkTable.vue
index ca95b5f64..c6319edfc 100644
--- a/nezha-fronted/src/components/common/table/asset/assetNetworkTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetNetworkTable.vue
@@ -11,12 +11,12 @@
     @selection-change="selectionChange"
     @row-dblclick="(row)=>{queryMessage(row)}"
   >
-    <el-table-column
+    <!-- <el-table-column
       :resizable="false"
       align="center"
       type="selection"
       width="55">
-    </el-table-column>
+    </el-table-column> -->
     <el-table-column
       v-for="(item, index) in customTableTitle"
       v-if="item.show"
@@ -38,15 +38,21 @@
       </template>
       <template slot-scope="scope" :column="item">
         <template v-if="item.prop === 'processCmd'">
-          <div :title="scope.row[item.prop] || scope.row.processName">{{scope.row[item.prop] || scope.row.processName}}</div>
+          <div :title="scope.row[item.prop] ? scope.row[item.prop] : scope.row.processName">{{scope.row[item.prop] ? scope.row[item.prop] : scope.row.processName}}</div>
         </template>
         <template v-else-if="item.prop === 'processId'">
           {{scope.row[item.prop]}}
         </template>
-        <template v-else-if="item.prop === 'transmitQueue'">
+        <template v-else-if="item.prop === 'localAddress'">
+          {{scope.row[item.prop]}} : {{scope.row.localPort == 0 ? '*' : scope.row.localPort}}
+        </template>
+        <template v-else-if="item.prop === 'foreignAddress'">
+          {{scope.row[item.prop] + ':' + scope.row.foreignPort}}
+        </template>
+        <template v-else-if="item.prop === 'receiveQueue'">
           {{scope.row[item.prop]}}
         </template>
-         <template v-else-if="item.prop === 'receiveQueue'">
+        <template v-else-if="item.prop === 'transmitQueue'">
           {{scope.row[item.prop]}}
         </template>
         <span v-else-if="scope.row[item.prop]">{{scope.row[item.prop]}}</span>
@@ -111,19 +117,21 @@ export default {
           label: this.$t('overall.state'),
           prop: 'state',
           show: true,
-          minWidth: 120
+          minWidth: 120,
+          sortable: 'custom'
+        },
+        {
+          label: this.$t('asset.network.receiveQueue'),
+          prop: 'receiveQueue',
+          show: true,
+          minWidth: 120,
+          sortable: 'custom'
         }, {
           label: this.$t('asset.network.transmitQueue'),
           prop: 'transmitQueue',
           show: true,
           minWidth: 200,
           sortable: 'custom'
-        }, {
-          label: this.$t('asset.network.receiveQueue'),
-          prop: 'receiveQueue',
-          show: true,
-          minWidth: 120,
-          sortable: 'custom'
         }
       ]
     }
@@ -139,5 +147,3 @@ export default {
 </script>
 <style>
 </style>
-<style>
-</style>
diff --git a/nezha-fronted/src/components/common/table/asset/assetProcessTable.vue b/nezha-fronted/src/components/common/table/asset/assetProcessTable.vue
index d3429506b..463c998d5 100644
--- a/nezha-fronted/src/components/common/table/asset/assetProcessTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetProcessTable.vue
@@ -11,12 +11,12 @@
     @selection-change="selectionChange"
     @row-dblclick="(row)=>{queryMessage(row)}"
   >
-    <el-table-column
+    <!-- <el-table-column
       :resizable="false"
       align="center"
       type="selection"
       width="55">
-    </el-table-column>
+    </el-table-column> -->
     <el-table-column
       v-for="(item, index) in customTableTitle"
       v-if="item.show"
@@ -143,7 +143,8 @@ export default {
           label: this.$t('overall.state'),
           prop: 'state',
           show: false,
-          minWidth: 120
+          minWidth: 120,
+          sortable: 'custom'
         }, {
           label: this.$t('asset.process.threadCount'),
           prop: 'threadCount',