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

Merge branch 'dev-3.3' of https://git.mesalab.cn/nezha/nezha-fronted into dev-3.4

Browse Source 
# Conflicts:
#	nezha-fronted/src/components/common/table/settings/userTable.vue
This commit is contained in:
zhangyu
2022-06-22 11:47:20 +08:00
parent f12a067685 f3589cdd2a
commit 98decd29f9
245 changed files with 2832 additions and 1444 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,7 +60,7 @@
<span style="cursor: pointer" @click="$emit('showBottomBox', 'alertMessageTab', scope.row)">
<i :class="scope.row.alertNum ? 'red' : 'green'" class="nz-icon nz-icon-overview-alert vertical-align-top;" @mouseenter="tooltipHover(scope.row,true, $event)" @mouseleave="tooltipHover(scope.row,false, $event)"></i>
<div v-if="scope.row.alertNumtooltipShow" class="alert-days-info-tooltip" :style="{left: scope.row.left + 'px',top:scope.row.top + 'px'}">
<div class="tooltip-title">{{$t('project.topology.alert')}}({{$t('asset.pingActive')}})</div>
<div class="tooltip-title">{{$t('project.topology.alert')}}({{$t('overall.active')}})</div>
<div class="severity-info" style='justify-content: space-between'>
<div class="severity-name">{{$t('overall.result.total')}}</div>
<div class="severity-value">{{scope.row.alertNum}}</div>
@@ -115,7 +115,7 @@
OK
</div>
<div v-else-if="scope.row['clientState']===0">
<div class="active-icon gray-bg inline-block"></div> {{ $t('config.user.disable') }}
<div class="active-icon gray-bg inline-block"></div> {{ $t('profile.close') }}
</div>
<div v-else-if="scope.row['clientState']===2">
<div class="active-icon red-bg inline-block"></div> {{ $t('asset.connectionTimedOut') }}
@@ -157,7 +157,7 @@
<el-dropdown-menu slot="dropdown" class="right-box-select-top right-public-box-dropdown-top">
<el-dropdown-item v-if="!assetTab" v-has="'asset_edit'" :command="['edit', scope.row]"><i class="nz-icon nz-icon-edit"></i><span class="operation-dropdown-text">{{$t('overall.edit')}}</span></el-dropdown-item>
<el-dropdown-item v-has="'asset_connect'" :command="['cli', scope.row]" :disabled="!scope.row.authUsername"><i class="nz-icon nz-icon-cli"></i><span class="operation-dropdown-text">{{$t('dashboard.connect')}}</span></el-dropdown-item>
<el-dropdown-item v-has="'asset_add'" :command="['duplicate', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('dashboard.duplicate')}}</span></el-dropdown-item>
<el-dropdown-item v-has="'asset_add'" :command="['duplicate', scope.row]"><i class="nz-icon nz-icon-override"></i><span class="operation-dropdown-text">{{$t('overall.duplicate')}}</span></el-dropdown-item>
<el-dropdown-item v-has="'asset_delete'" :command="['delete', scope.row]"><i class="nz-icon nz-icon-delete"></i><span class="operation-dropdown-text">{{$t('overall.delete')}}</span></el-dropdown-item>
<el-dropdown-item v-has="'alertSilence_add'" :command="['fastSilence', scope.row, 'asset']"><i class="nz-icon nz-icon-fast-silence"></i><span class="operation-dropdown-text">{{$t('overall.silenceAlert')}}</span></el-dropdown-item>
<el-dropdown-item v-has="'asset_add'" :command="['topology', scope.row, 'asset']"><i class="nz-icon nz-icon-Topology"></i><span class="operation-dropdown-text">{{$t('overall.topology')}}</span></el-dropdown-item>
@@ -230,12 +230,12 @@ export default {
minWidth: 140,
sortable: 'custom'
}, {
label: this.$t('overall.parent'),
label: this.$t('asset.parent'),
prop: 'parent',
show: false,
minWidth: 110
}, {
label: this.$t('overall.children'),
label: this.$t('overall.assetSubTab'),
prop: 'children',
show: false,
minWidth: 120
@@ -246,7 +246,7 @@ export default {
minWidth: 140,
sortable: 'custom'
}, {
label: this.$t('asset.state'),
label: this.$t('overall.state'),
prop: 'state',
show: true,
minWidth: 110,
@@ -269,7 +269,7 @@ export default {
minWidth: 110,
sortable: 'custom'
}, {
label: this.$t('asset.alertNum'),
label: this.$t('overall.alert'),
prop: 'alertNum',
show: true,
width: 120,