From edf489fd504c33208e80d5a21992bb88f64b948b Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Thu, 7 Dec 2023 13:59:25 +0800
Subject: [PATCH] =?UTF-8?q?NEZ-3355=20fix=EF=BC=9A=E5=BD=93=20status=20=3D?=
 =?UTF-8?q?=202=20=E6=97=B6=E5=B1=95=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/table/asset/assetTable.scss           |  2 +-
 .../components/common/table/asset/assetTable.vue | 16 ++++++++++------
 .../common/table/settings/softwareAssetTable.vue | 14 +++++++++-----
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/nezha-fronted/src/assets/css/components/common/table/asset/assetTable.scss b/nezha-fronted/src/assets/css/components/common/table/asset/assetTable.scss
index 9d6c1c3f0..a9c279c72 100644
--- a/nezha-fronted/src/assets/css/components/common/table/asset/assetTable.scss
+++ b/nezha-fronted/src/assets/css/components/common/table/asset/assetTable.scss
@@ -35,7 +35,7 @@
   padding: 20px 15px;
   background: $--background-color-empty;
   border-radius: 3px;
-  transform: translate(-40px,20px);
+  transform: translate(0,20px);
   .licenseStatus-title{
     color: $--color-text-regular;
   }
diff --git a/nezha-fronted/src/components/common/table/asset/assetTable.vue b/nezha-fronted/src/components/common/table/asset/assetTable.vue
index e7253ab04..c91cefd3d 100644
--- a/nezha-fronted/src/components/common/table/asset/assetTable.vue
+++ b/nezha-fronted/src/components/common/table/asset/assetTable.vue
@@ -143,7 +143,7 @@
           <!-- license -->
           <template v-else-if="item.prop === 'license'">
             <el-popover
-              placement="right-start"
+              placement="left-start"
               trigger="hover"
               :open-delay="300"
               popper-class="licenseStatus nz-tooltip-bac"
@@ -166,13 +166,17 @@
               </div>
               <!-- status -->
               <div slot="reference">
-                <div v-if="scope.row.license&&scope.row.license.status == 1">
+                <div v-if="scope.row.license && scope.row.license.status == 0">
+                  <i class="nz-icon nz-icon-stop" style="color:#bebebe;"></i>
+                  <span>{{$t('licenseMange.notLicensed')}}</span>
+                </div>
+                <div v-else-if="scope.row.license && scope.row.license.status == 1">
                   <i class="nz-icon nz-icon-import-success1" style="color:#8dcb4b;"></i>
                   <span>{{$t('licenseMange.licensed')}}</span>
                 </div>
-                <div v-if="scope.row.license&&scope.row.license.status == 0">
-                  <i class="nz-icon nz-icon-stop" style="color:#bebebe;"></i>
-                  <span>{{$t('licenseMange.notLicensed')}}</span>
+                <div v-else-if="scope.row.license && scope.row.license.status == 2">
+                  <i class="nz-icon nz-icon-stop" style="color:#ec7f66;"></i>
+                  <span>{{$t('overall.error')}}（{{$t('config.terminallog.statusItem.unknownError')}}）</span>
                 </div>
                 <div v-else>-</div>
               </div>
@@ -365,7 +369,7 @@ export default {
         }, {
           label: this.$t('licenseMange.licenseStatus'),
           prop: 'license',
-          minWidth: 150,
+          minWidth: 200,
           show: true
         }
       ]
diff --git a/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue b/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue
index 68c339d38..1ec7424f2 100644
--- a/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue
+++ b/nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue
@@ -73,13 +73,17 @@
           </span>
           <!-- status -->
           <template v-else-if="item.prop === 'status'">
-            <div v-if="scope.row.status == 1">
+            <div v-if="scope.row.status == 0">
+              <i class="nz-icon nz-icon-stop" style="color:#bebebe;"></i>
+              <span>{{$t('licenseMange.notLicensed')}}</span>
+            </div>
+            <div v-else-if="scope.row.status == 1">
               <i class="nz-icon nz-icon-import-success1" style="color:#8dcb4b;"></i>
               <span>{{$t('licenseMange.licensed')}}</span>
             </div>
-            <div v-else-if="scope.row.status == 0">
-              <i class="nz-icon nz-icon-stop" style="color:#bebebe;"></i>
-              <span>{{$t('licenseMange.notLicensed')}}</span>
+            <div v-else-if="scope.row.status == 2">
+              <i class="nz-icon nz-icon-stop" style="color:#ec7f66;"></i>
+              <span>{{$t('overall.error')}}（{{$t('config.terminallog.statusItem.unknownError')}}）</span>
             </div>
             <div v-else>-</div>
           </template>
@@ -197,7 +201,7 @@ export default {
         }, {
           label: this.$t('licenseMange.licenseStatus'),
           prop: 'status',
-          minWidth: 150,
+          minWidth: 200,
           show: true
         }, {
           label: this.$t('licenseMange.concurrency'),