diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 6d8c4e2b1..6c8d5873e 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -1067,7 +1067,7 @@ li{ z-index: 410; box-shadow: 0 0 15px #ccc; background-color: white; - padding: 0 0 0 30px; + padding: 0 0 0 15px; height: calc(100% - 50px); } @@ -1168,7 +1168,7 @@ li{ height: 36px; text-align: left; display: inline-block; - padding-top: 20px; + padding-top: 10px; font-size: 14px; font-weight: bold; color: $box-title-color; @@ -1303,6 +1303,7 @@ li{ height: calc(100% - 132px); width: 100%; overflow: auto; + margin-top: 15px; } .el-scrollbar__wrap { @@ -1382,11 +1383,11 @@ li{ } .right-box-form>.el-form-item.half-form-item{ display: inline-block; - width: 350px; + width: 395px; } .right-box-form>.el-form-item.half-form-item:nth-child(odd){ display: inline-block; - width: 350px; + width: 395px; margin-left: 0; } .right-box-form .one-third-form-item-left{ @@ -1406,14 +1407,14 @@ li{ } .right-box-form>.el-form-item { margin-bottom: 18px; - width: calc(100% - 70px); - margin-left: 70px; + width: calc(100% - 15px); + margin-left: 15px; } .right-box-form .el-select { width: 100%; } .right-box-form .select-warp .el-select { - width: calc(100% - 120px); + width: calc(100% - 0px); } .right-box-form .el-form-item .el-form-item__label { padding: 0; @@ -1434,6 +1435,27 @@ li{ font-size: 14px; color: $box-label-color; line-height: 34px; + font-weight: bold; +} +.right-box-form-left.right-box-form /deep/ .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label:before{ + display: none; +} +.right-box-form-left.right-box-form /deep/ .el-form-item.is-required:not(.is-no-asterisk) .el-form-item__label:after{ + content: "*"; + color: #f56c6c; + margin-left: 4px; +} + +.right-box-form-left.right-box-form /deep/ .el-form-item.required-marker:not(.is-no-asterisk) .el-form-item__label:before{ + display: none; +} +.right-box-form-left.right-box-form /deep/ .el-form-item.required-marker:not(.is-no-asterisk) .el-form-item__label:after{ + content: "*"; + color: #f56c6c; + margin-left: 4px; +} +.right-box-form-left.right-box-form .el-form-item.label-warp .el-form-item__label {//el-form label需要换行的行高 + line-height: 17px; } .right-child-box-title, .asset-sub-title, .label-center, .metric-title-label { font-size: 14px; @@ -2153,26 +2175,37 @@ li{ font-size: 13px; color: #0275b8; } - >div:not(:last-of-type) { - width: calc(50% - 25px); + .tag-edit-tag{ + width: 100px; padding: 0 10px; } - >div:last-of-type { + .tag-edit-value{ + width: calc(100% - 149px); + padding: 0 10px; + } + .tag-edit-action { width: 50px; } } .tag-edit-box-body { display: flex; box-sizing: border-box; + /deep/ .el-autocomplete{ + width: 100%; + } .tag-edit { padding: 0 10px; } - >div:not(:last-of-type) { - width: calc(50% - 25px); + .tag-edit-tag{ + width: 100px; padding: 0 10px; } - >div:last-of-type { - width: 50px; + .tag-edit-value{ + width: calc(100% - 149px); + padding: 0 10px; + } + .tag-edit-action { + width: 34px; } } } @@ -2263,11 +2296,11 @@ li{ } .right-box-form>.el-form-item.half-form-item-other{ display: inline-block; - width: 350px; + width: 345px; } .right-box-form>.el-form-item.half-form-item-other-two{ display: inline-block; - width: 380px; + width: 455px; margin-left: 0; } .right-box .right-box-form-add,.right-box .right-box-form-minus-box{ diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index 42db7ef46..8fbe98015 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -599,6 +599,7 @@ const cn = { menu:"菜单", createRole:"新增角色", editRole:"编辑角色", + remark:'描述' }, menus:{ menus:'菜单', diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index a46f40af1..542b6d587 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -601,7 +601,8 @@ const en = { permission:"Permission", menu:"Menu", createRole:"Create role", - editRole:"Edit role" + editRole:"Edit role", + remark:'Remark', }, menus:{ menus:'Menus', diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue index 20a7fe383..8f2b955fc 100644 --- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue +++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue @@ -148,9 +148,9 @@ {{$t('project.topology.level')}} {{$t('project.topology.color')}} - {{$t('project.topology.value')}} + {{$t('project.topology.value')}} {{$t('project.topology.animation')}} - + @@ -189,8 +189,8 @@ base - - > + + > base - + diff --git a/nezha-fronted/src/components/common/rightBox/accountBox.vue b/nezha-fronted/src/components/common/rightBox/accountBox.vue index 83ffaa560..9720ef1a2 100644 --- a/nezha-fronted/src/components/common/rightBox/accountBox.vue +++ b/nezha-fronted/src/components/common/rightBox/accountBox.vue @@ -17,7 +17,7 @@
- + - + @@ -339,8 +339,4 @@ position: absolute; left: -120px; } - .passwordChange{ - margin-left: 30px !important; - width: calc(100% - 30px) !important; - } diff --git a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue index 937a1b2dd..04bc63563 100644 --- a/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue +++ b/nezha-fronted/src/components/common/rightBox/addEndpointBox.vue @@ -10,7 +10,7 @@
- + @@ -1105,11 +1105,11 @@ float: left; border: 1px solid #DCDFE6; border-radius: 4px; - width: 260px; + width: 320px; } .endpoints-box { - margin: 0 0 0 280px; - width: 540px; + margin: 0 0 0 340px; + width: 445px; } .endpoints-box.endpoints-box-snmp { width: 380px; @@ -1260,7 +1260,7 @@ } .line-100 { margin-bottom: 3px; - width: 600px; + width: 320px; } .endpoint-sub-table-head { line-height: 28px; diff --git a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue index f07dbf32d..dfb8297bf 100644 --- a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue @@ -15,12 +15,12 @@
- + -
+
- + - + @@ -305,13 +305,13 @@ justify-content: left; justify-items: center; align-items: center; - width: calc(100% - 220px); + width: calc(100% - 46px); padding: 10px 15px; background: #F6F6F6; color: #999999; margin-top: -13px; margin-bottom: 18px; - margin-left: 190px; + margin-left: 15px; font-size: 14px; } .rule-severity-remark .nz-icon-info-normal{ diff --git a/nezha-fronted/src/components/common/rightBox/assetBox.vue b/nezha-fronted/src/components/common/rightBox/assetBox.vue index 69c09075b..d43a716d6 100644 --- a/nezha-fronted/src/components/common/rightBox/assetBox.vue +++ b/nezha-fronted/src/components/common/rightBox/assetBox.vue @@ -12,7 +12,7 @@
{{editAsset.id ? ($t("asset.editAsset") + " ID:" + editAsset.id) : $t("asset.createAsset")}}
- + @@ -91,15 +91,12 @@
- - +
-
Tag
-
Value
-
Action
+
Tag
+
Value
+
Action
@@ -109,7 +106,7 @@ -
+
@@ -130,7 +127,7 @@
-
+
{{account.protocol}} @@ -144,7 +141,7 @@ diff --git a/nezha-fronted/src/components/common/rightBox/cabinetBox.vue b/nezha-fronted/src/components/common/rightBox/cabinetBox.vue index 5c7e1810d..475c010eb 100644 --- a/nezha-fronted/src/components/common/rightBox/cabinetBox.vue +++ b/nezha-fronted/src/components/common/rightBox/cabinetBox.vue @@ -15,7 +15,7 @@
- + diff --git a/nezha-fronted/src/components/common/rightBox/dcBox.vue b/nezha-fronted/src/components/common/rightBox/dcBox.vue index 917a2ff92..a723b4f54 100644 --- a/nezha-fronted/src/components/common/rightBox/dcBox.vue +++ b/nezha-fronted/src/components/common/rightBox/dcBox.vue @@ -15,7 +15,7 @@
- + diff --git a/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue b/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue index 0cff51cb7..832140153 100644 --- a/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue +++ b/nezha-fronted/src/components/common/rightBox/editEndpointBox.vue @@ -15,7 +15,7 @@
- + diff --git a/nezha-fronted/src/components/common/rightBox/menuBox.vue b/nezha-fronted/src/components/common/rightBox/menuBox.vue index ce9cd1af3..6cb65c1e8 100644 --- a/nezha-fronted/src/components/common/rightBox/menuBox.vue +++ b/nezha-fronted/src/components/common/rightBox/menuBox.vue @@ -17,7 +17,7 @@
- + diff --git a/nezha-fronted/src/components/common/rightBox/mibBox.vue b/nezha-fronted/src/components/common/rightBox/mibBox.vue index c0da3c096..fb7bbc508 100644 --- a/nezha-fronted/src/components/common/rightBox/mibBox.vue +++ b/nezha-fronted/src/components/common/rightBox/mibBox.vue @@ -15,7 +15,7 @@
- +
- + diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue index eaa96523b..a0a450cc7 100644 --- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue @@ -15,13 +15,13 @@
- + - + @@ -43,7 +43,7 @@
{{$t('project.module.walk')}}
- +