diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 6820e5941..c07c99a67 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -884,6 +884,7 @@ li{ } .alert-rule-tag { cursor: default; + max-width: 100px; } /* end--内容*/ @@ -2192,3 +2193,21 @@ li{ .nz-dialog.silence-box .el-dialog__body{ padding-bottom: 0; } +.user-name { + font-weight: bold; + margin-right: 5px; + max-width: 50%; + text-overflow:ellipsis; + white-space:nowrap; + vertical-align: bottom; +} +.user-username{ + color: #999; + max-width: calc(50% - 10px); + text-overflow:ellipsis; + white-space:nowrap; + vertical-align: bottom; +} +.hover .user-username{ + color: #fa901c; +} diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index df9ae0e78..d67869d49 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -861,7 +861,7 @@ const en = { terminallog: { terminallog: 'Terminal log', status: 'State', // "状态" - username: 'Username', + username: 'User', SessionID: 'Session ID', authtype: 'AuthType', statusItem: { diff --git a/nezha-fronted/src/components/common/popBox/selectPanel.vue b/nezha-fronted/src/components/common/popBox/selectPanel.vue index a0aae7fae..9ec8be52a 100644 --- a/nezha-fronted/src/components/common/popBox/selectPanel.vue +++ b/nezha-fronted/src/components/common/popBox/selectPanel.vue @@ -21,7 +21,7 @@ node-key="id" ref="panelTree">
- {{ node.label }} + {{ node.label }} diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue index b3d930405..5360f086c 100644 --- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue +++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue @@ -2499,4 +2499,7 @@ export default { /deep/ .el-collapse-item__arrow.el-icon-arrow-right{ display: inline-block !important; } +/deep/ .el-select--mini { + width: 100%; +} diff --git a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue index 7634f85ae..80822e880 100644 --- a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue @@ -314,10 +314,12 @@ @change="receiverShowChange" > + {{item.name}}@{{item.username}} diff --git a/nezha-fronted/src/components/common/rightBox/dcBox.vue b/nezha-fronted/src/components/common/rightBox/dcBox.vue index b40620ab2..8ebb92cc6 100644 --- a/nezha-fronted/src/components/common/rightBox/dcBox.vue +++ b/nezha-fronted/src/components/common/rightBox/dcBox.vue @@ -21,8 +21,9 @@ - - + + + {{item.name}}@{{item.username}} diff --git a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue index 164166fe4..37b1fab0b 100644 --- a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue +++ b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue @@ -58,7 +58,7 @@ -