gfwleak/nezha-nezha-fronted
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

NEZ-3355 fix：当 status = 2 时展示异常

Browse Source
This commit is contained in:
zyh
2023-12-07 13:59:25 +08:00
parent c1a86bca29
commit edf489fd50
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
nezha-fronted/src/assets/css/components/common/table/asset/assetTable.scss
View File

@@ -35,7 +35,7 @@
padding: 20px 15px; padding: 20px 15px;
background: $--background-color-empty; background: $--background-color-empty;
border-radius: 3px; border-radius: 3px;
transform: translate(-40px,20px); transform: translate(0,20px);
.licenseStatus-title{ .licenseStatus-title{
color: $--color-text-regular; color: $--color-text-regular;
} }

16
nezha-fronted/src/components/common/table/asset/assetTable.vue
View File

@@ -143,7 +143,7 @@
<!-- license --> <!-- license -->
<template v-else-if="item.prop === 'license'"> <template v-else-if="item.prop === 'license'">
<el-popover <el-popover
placement="right-start" placement="left-start"
trigger="hover" trigger="hover"
:open-delay="300" :open-delay="300"
popper-class="licenseStatus nz-tooltip-bac" popper-class="licenseStatus nz-tooltip-bac"
@@ -166,13 +166,17 @@
</div> </div>
<!-- status --> <!-- status -->
<div slot="reference"> <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> <i class="nz-icon nz-icon-import-success1" style="color:#8dcb4b;"></i>
<span>{{$t('licenseMange.licensed')}}</span> <span>{{$t('licenseMange.licensed')}}</span>
</div> </div>
<div v-if="scope.row.license&&scope.row.license.status == 0"> <div v-else-if="scope.row.license && scope.row.license.status == 2">
<i class="nz-icon nz-icon-stop" style="color:#bebebe;"></i> <i class="nz-icon nz-icon-stop" style="color:#ec7f66;"></i>
<span>{{$t('licenseMange.notLicensed')}}</span> <span>{{$t('overall.error')}}（{{$t('config.terminallog.statusItem.unknownError')}}）</span>
</div> </div>
<div v-else>-</div> <div v-else>-</div>
</div> </div>
@@ -365,7 +369,7 @@ export default {
}, { }, {
label: this.$t('licenseMange.licenseStatus'), label: this.$t('licenseMange.licenseStatus'),
prop: 'license', prop: 'license',
minWidth: 150, minWidth: 200,
show: true show: true
} }
] ]

14
nezha-fronted/src/components/common/table/settings/softwareAssetTable.vue
View File

@@ -73,13 +73,17 @@
</span> </span>
<!-- status --> <!-- status -->
<template v-else-if="item.prop === '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> <i class="nz-icon nz-icon-import-success1" style="color:#8dcb4b;"></i>
<span>{{$t('licenseMange.licensed')}}</span> <span>{{$t('licenseMange.licensed')}}</span>
</div> </div>
<div v-else-if="scope.row.status == 0"> <div v-else-if="scope.row.status == 2">
<i class="nz-icon nz-icon-stop" style="color:#bebebe;"></i> <i class="nz-icon nz-icon-stop" style="color:#ec7f66;"></i>
<span>{{$t('licenseMange.notLicensed')}}</span> <span>{{$t('overall.error')}}（{{$t('config.terminallog.statusItem.unknownError')}}）</span>
</div> </div>
<div v-else>-</div> <div v-else>-</div>
</template> </template>
@@ -197,7 +201,7 @@ export default {
}, { }, {
label: this.$t('licenseMange.licenseStatus'), label: this.$t('licenseMange.licenseStatus'),
prop: 'status', prop: 'status',
minWidth: 150, minWidth: 200,
show: true show: true
}, { }, {
label: this.$t('licenseMange.concurrency'), label: this.$t('licenseMange.concurrency'),