From 2f9ff1e3ad499a91f85b8a25b74835fc04b63c7f Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Tue, 13 Sep 2022 15:35:43 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix=20:=20asset=20process=20=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2=20=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/table/asset/assetProcessTable.vue  | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/nezha-fronted/src/components/common/table/asset/assetProcessTable.vue b/nezha-fronted/src/components/common/table/asset/assetProcessTable.vue
index f6cc40489..b363fca20 100644
--- a/nezha-fronted/src/components/common/table/asset/assetProcessTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetProcessTable.vue
@@ -38,14 +38,14 @@
       </template>
       <template slot-scope="scope" :column="item">
         <template v-if="item.prop === 'commandLine'">
-          <div style="height:100%;display: flex;align-items: center;">
-             <el-popover trigger="hover" placement="right-start" v-if="typeof scope.row.state != 'undefined' && scope.row.state != null">
+          <div style="height:24px;display: flex;align-items: center;">
+             <el-popover trigger="hover" placement="top" v-if="typeof scope.row.state != 'undefined' && scope.row.state != null">
                 <div>
                   <span class="metirc-tip-list">{{$t('overall.state')}}&nbsp;:&nbsp;&nbsp;</span><span>{{ scope.row.state }}</span>
                 </div>
                 <div slot="reference"><div class="bar active-icon " :style="{'background-color':comBgc[scope.row.state]}"></div></div>
              </el-popover>
-             <span style="margin-left: 6px;line-height: 100%;">{{scope.row[item.prop] || '-'}}</span>
+             <div class="process-name" :title="scope.row[item.prop] || scope.row.name">{{scope.row[item.prop] || scope.row.name}}</div>
           </div>
         </template>
         <template v-else-if="item.prop === 'startTime'">
@@ -92,7 +92,7 @@ export default {
     return {
       tableTitle: [
         {
-          label: this.$t('config.terminallog.cmd.cmd'),
+          label: this.$t('overall.process'),
           prop: 'commandLine',
           show: true,
           minWidth: 300,
@@ -116,13 +116,13 @@ export default {
           minWidth: 150,
           sortable: 'custom'
         }, {
-          label: '%' + this.$t('asset.process.cpu'),
+          label: this.$t('asset.process.cpu'),
           prop: 'cpuUsage',
           show: true,
           minWidth: 200,
           sortable: 'custom'
         }, {
-          label: '%' + this.$t('asset.process.mem'),
+          label: this.$t('asset.process.mem'),
           prop: 'memUsage',
           show: true,
           minWidth: 200,
@@ -190,6 +190,14 @@ export default {
   margin-right: 0px;
   line-height: 100%;
 }
+.process-name{
+  height: 100%;
+  margin-left: 6px;
+  line-height: 24px;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
 #container {
   width: 120px;
   min-width: 120px;

From 2de73b2095c08c5461cc4590d640ec1bc5d99fd9 Mon Sep 17 00:00:00 2001
From: likexuan <likexuan@geedgenetworks.com>
Date: Tue, 13 Sep 2022 17:00:39 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=20:=20asset=20process=20=E4=BA=8C?=
 =?UTF-8?q?=E7=BA=A7=E9=A1=B5=E9=9D=A2=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/common/bottomBox/tabs/processBottomTab.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/processBottomTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/processBottomTab.vue
index 98dc5d6cd..7930f8410 100644
--- a/nezha-fronted/src/components/common/bottomBox/tabs/processBottomTab.vue
+++ b/nezha-fronted/src/components/common/bottomBox/tabs/processBottomTab.vue
@@ -150,7 +150,7 @@ export default {
     tableFilter () {
       const tableDatas = JSON.parse(this.tableDataCopy)
       this.tableData = tableDatas.filter((item) => {
-        const element = item.commandLine
+        const element = item.commandLine ? item.commandLine : item.name
         return element.indexOf(this.queryExpression) !== -1
       })
     },