diff --git a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss index 90180db9f..f00d91b40 100644 --- a/nezha-fronted/src/assets/css/common/rightBoxCommon.scss +++ b/nezha-fronted/src/assets/css/common/rightBoxCommon.scss @@ -386,3 +386,19 @@ color: $--color-text-primary; } } +.right-box-credential .half-form-item { + width: calc(50% - 20px); +} +.right-box-credential .half-form-item:nth-child(odd) { + width: calc(50% - 15px); + margin-left: 15px; + +} +.right-box.right-box-alert-expr{ + .metric-selector-title{ + margin-left: 0 !important; + } + .query-row .metric-selector-input-box { + width: calc(100% - 120px) !important; + } +} diff --git a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss index e8ae29e79..00be3d2d3 100644 --- a/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss +++ b/nezha-fronted/src/assets/css/components/common/bottomBox/bottomBox.scss @@ -338,6 +338,25 @@ } } +#recordRuleEvalLogTable{ + .active-icon { + margin-left: 5px !important; + } + .schedEnableTitle .week-item{ + width: 32px; + border-radius: 2px; + padding-left: 3px; + } +} + +.alertRuleEvalLogTable{ + .schedEnableTitle .week-item{ + width: 32px; + border-radius: 2px; + padding-left: 3px; + } +} + // comments #commentBottomTab { .sub-container .nz-table-list { diff --git a/nezha-fronted/src/assets/css/components/common/deleteButton.scss b/nezha-fronted/src/assets/css/components/common/deleteButton.scss index 5b0dc6710..7926efef8 100644 --- a/nezha-fronted/src/assets/css/components/common/deleteButton.scss +++ b/nezha-fronted/src/assets/css/components/common/deleteButton.scss @@ -100,3 +100,12 @@ vertical-align: middle; } } +.delete-button{ + margin-right: 10px; + opacity: 0.7; + border-radius: 2px; +} +.delete-button-light.delete-button{ + border-radius: 2px; + opacity: 1; +} diff --git a/nezha-fronted/src/assets/css/components/common/latIngPicker.scss b/nezha-fronted/src/assets/css/components/common/latIngPicker.scss new file mode 100644 index 000000000..64ffadc65 --- /dev/null +++ b/nezha-fronted/src/assets/css/components/common/latIngPicker.scss @@ -0,0 +1,22 @@ +.latlng .input-box{ + width: 100%; + display: flex; + } + .latlng .input-box .input-box-item{ + margin-right: 20px; + flex: 1; + } + .latlng .input-box .el-input,.latlng .input-box .el-input-number{ + width: 100%; + } + .latlng .map-config-dialog .el-dialog{ + height: 45%; + } + .latlng .map-config-dialog .el-dialog__body{ + height: calc(100% - 48px) !important; + + } + .latlng .input-box .el-input .el-input-group__prepend{ + padding:0px 5px!important; + } + diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/assetMetaBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/assetMetaBox.scss index 00dac6207..3a9e23dd6 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/assetMetaBox.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/assetMetaBox.scss @@ -6,4 +6,16 @@ text-align: right; color: $--color-text-regular; } + .nz-meta-group-box{ + min-width: 220px !important; + } + .asset-meta-param-row{ + text-align: center; + margin-bottom: 10px; + display: flex; + justify-content: space-between; + } + .asset-meta-param-row:last-child{ + margin-bottom: 0; + } } diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/menuBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/menuBox.scss index 01a8ba741..5052a1b54 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/menuBox.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/menuBox.scss @@ -14,4 +14,8 @@ } } } + .form-item-title{ + position: absolute; + left: -120px; + } } diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/mibBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/mibBox.scss index 0dec8a09e..772c816d7 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/mibBox.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/mibBox.scss @@ -13,4 +13,46 @@ background-color: $--background-color-empty; border: 1px solid $--border-color-light; } + .right-box-form-row{ + margin-top:0; + width: 100%; + } + .add-required .el-form-item__label:before{ + content: '*'; + color: #F56C6C; + margin-right: 4px; + } + .mib-upload .el-upload{ + width: 100%; + } + .mib-upload .el-upload-dragger{ + width: 100% !important; + } + /*去除上传文件动画start*/ + /*.upload-demo {*/ + /* display: flex;*/ + /*}*/ + .el-list-enter-active, + .el-list-leave-active { + transition: none !important; + } + .nz-tab { + margin-bottom: 22px !important; + margin-left: 13px !important; + } + .el-list-enter, + .el-list-leave-active { + opacity: 0 !important; + } + .el-upload-list { + height: 40px !important; + } + .el-upload .nz-icon-upload{ + font-size: 67px; + color: #c0c4cc; + margin: 40px 0 16px; + line-height: 50px; + display: inline-block; + } + /*去除上传文件动画end*/ } diff --git a/nezha-fronted/src/assets/css/components/common/table/alert/alertRuleTable.scss b/nezha-fronted/src/assets/css/components/common/table/alert/alertRuleTable.scss index 39d86756c..a33fef471 100644 --- a/nezha-fronted/src/assets/css/components/common/table/alert/alertRuleTable.scss +++ b/nezha-fronted/src/assets/css/components/common/table/alert/alertRuleTable.scss @@ -53,3 +53,8 @@ .schedEnableTitle .week-item:nth-of-type(4){ margin-right: 0px !important; } +#alertRuleTable{ + .active-icon { + margin-left: 5px; + } +} \ No newline at end of file diff --git a/nezha-fronted/src/assets/css/components/index.scss b/nezha-fronted/src/assets/css/components/index.scss index f75b86c08..c867e303b 100644 --- a/nezha-fronted/src/assets/css/components/index.scss +++ b/nezha-fronted/src/assets/css/components/index.scss @@ -84,6 +84,7 @@ @import './common/intro.scss'; @import './common/multipleTime.scss'; @import './common/nezhaColor.scss'; +@import './common/latIngPicker.scss'; @import './common/nzTransfer.scss'; @import './common/pagination.scss'; @import './common/searchInput.scss'; diff --git a/nezha-fronted/src/components/common/deleteButton.vue b/nezha-fronted/src/components/common/deleteButton.vue index b1ef9daea..3959f2c7d 100644 --- a/nezha-fronted/src/components/common/deleteButton.vue +++ b/nezha-fronted/src/components/common/deleteButton.vue @@ -289,15 +289,3 @@ export default { } } - - diff --git a/nezha-fronted/src/components/common/latlngPicker.vue b/nezha-fronted/src/components/common/latlngPicker.vue index f70a65ea4..ecaa34376 100644 --- a/nezha-fronted/src/components/common/latlngPicker.vue +++ b/nezha-fronted/src/components/common/latlngPicker.vue @@ -220,30 +220,3 @@ export default { } } - - - - diff --git a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue index 494a5f17d..63df0c5ad 100644 --- a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue +++ b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue @@ -510,21 +510,3 @@ export default { } } - - diff --git a/nezha-fronted/src/components/common/rightBox/exprTmplBox.vue b/nezha-fronted/src/components/common/rightBox/exprTmplBox.vue index ca006ef2b..3519adfee 100644 --- a/nezha-fronted/src/components/common/rightBox/exprTmplBox.vue +++ b/nezha-fronted/src/components/common/rightBox/exprTmplBox.vue @@ -230,12 +230,3 @@ export default { } } - - diff --git a/nezha-fronted/src/components/common/rightBox/menuBox.vue b/nezha-fronted/src/components/common/rightBox/menuBox.vue index 63653bba5..0f15c08ec 100644 --- a/nezha-fronted/src/components/common/rightBox/menuBox.vue +++ b/nezha-fronted/src/components/common/rightBox/menuBox.vue @@ -250,10 +250,3 @@ export default { } } - diff --git a/nezha-fronted/src/components/common/rightBox/mibBox.vue b/nezha-fronted/src/components/common/rightBox/mibBox.vue index 8d5901f07..2b4c75ca6 100644 --- a/nezha-fronted/src/components/common/rightBox/mibBox.vue +++ b/nezha-fronted/src/components/common/rightBox/mibBox.vue @@ -243,50 +243,3 @@ export default { } } - - - diff --git a/nezha-fronted/src/components/common/rightBox/snmpCredentialBox.vue b/nezha-fronted/src/components/common/rightBox/snmpCredentialBox.vue index 67e90c13d..c1083390e 100644 --- a/nezha-fronted/src/components/common/rightBox/snmpCredentialBox.vue +++ b/nezha-fronted/src/components/common/rightBox/snmpCredentialBox.vue @@ -233,13 +233,3 @@ export default { } } - diff --git a/nezha-fronted/src/components/common/table/alert/alertRuleEvalLogTable.vue b/nezha-fronted/src/components/common/table/alert/alertRuleEvalLogTable.vue index d917c52c6..f79676378 100644 --- a/nezha-fronted/src/components/common/table/alert/alertRuleEvalLogTable.vue +++ b/nezha-fronted/src/components/common/table/alert/alertRuleEvalLogTable.vue @@ -1,6 +1,7 @@