diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 8300d1594..d6028d3a0 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -394,6 +394,7 @@ li{ padding-bottom: 10px; color: #999; cursor: pointer; + display: inline-block; } .nz-tab-item-active { border-bottom: 3px solid $global-text-color-active; @@ -401,7 +402,16 @@ li{ cursor: default; font-weight: bold; } - +.nz-tab-item-close { + color: rgba(245, 108, 108, 0.6); + cursor: pointer; +} +.nz-tab-item-close:hover { + color: rgba(245, 108, 108, 1); +} +.nz-tab-error { + font-weight: normal; +} /* end--nz-tab组件*/ /* begin--二级页面tab*/ @@ -1071,6 +1081,11 @@ li{ .right-box-add-endpoint.right-box-add-endpoint-snmp { width: 850px; } +.snmp-form { + .el-form-item__content { + margin-left: 10px !important; + } +} /* begin--右侧弹框--顶部按钮*/ .right-box-top-btns { text-align: center; diff --git a/nezha-fronted/src/components/charts/chart-list.vue b/nezha-fronted/src/components/charts/chart-list.vue index a92f4f32a..56027fc10 100644 --- a/nezha-fronted/src/components/charts/chart-list.vue +++ b/nezha-fronted/src/components/charts/chart-list.vue @@ -28,8 +28,8 @@ z-index: 2000; } .vue-resizable-handle:after { - border-right: 2px solid #555; - border-bottom: 2px solid #555; + border-right: 2px solid #acb6bf; + border-bottom: 2px solid #acb6bf; content: ""; position: absolute; right: 3px; diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index ae7c10e2d..5c46c52c6 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -450,9 +450,9 @@ const en = { protocol:"Protocol", sshProtocol:"SSH", telnetProtocol:"Telnet", - userTip:"UserTip",//用户名提示 - passwordTip:"PasswordTip",//密码提示 - reloginPasswordTip:"Relogin",//密码提示 + userTip:"User tip",//用户名提示 + passwordTip:"Password tip",//密码提示 + reloginPasswordTip:"Relogin tip",//密码提示 userPwdIntroduce:'Please specify a user name and password so that the telenet login process can automatically log in', reLoginPwdIntroduce:'Please specify the password prompt so that the login process can run automatically', account:'User name',//'用户名' diff --git a/nezha-fronted/src/components/common/rightBox/assetBox.vue b/nezha-fronted/src/components/common/rightBox/assetBox.vue index 76348e33b..df3557463 100644 --- a/nezha-fronted/src/components/common/rightBox/assetBox.vue +++ b/nezha-fronted/src/components/common/rightBox/assetBox.vue @@ -21,7 +21,7 @@ {{tabView == false && !pageObj.id ? $t('asset.createAssetTab.title') : ''}} - + @@ -151,7 +151,7 @@ -
+
@@ -176,22 +176,39 @@ -
{{$t('asset.createAssetTab.cli')}} - +
{{$t('config.account.account')}} +
-