diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 1097b65d9..8f5b5b998 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -1060,6 +1060,9 @@ li{ .nz-dialog .el-dialog { border-radius: 10px; } +.nz-dialog .el-dialog__body { + padding: 0 20px 30px 20px; +} .nz-dialog-title { font-size: 18px; color: $box-title-color; diff --git a/nezha-fronted/src/components/charts/chart-table.vue b/nezha-fronted/src/components/charts/chart-table.vue index 8befa3a4b..d9c4c76d7 100644 --- a/nezha-fronted/src/components/charts/chart-table.vue +++ b/nezha-fronted/src/components/charts/chart-table.vue @@ -52,7 +52,7 @@ - + diff --git a/nezha-fronted/src/components/charts/line-chart-block.scss b/nezha-fronted/src/components/charts/line-chart-block.scss index 14f6e674c..b39bbc8da 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.scss +++ b/nezha-fronted/src/components/charts/line-chart-block.scss @@ -19,7 +19,7 @@ color:lightgray; } .legend-container{ - width:80%; + width: calc(100% - 130px); max-height:80px; min-height:40px; overflow-y: auto; diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue index ca7405d4a..c586111eb 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.vue +++ b/nezha-fronted/src/components/charts/line-chart-block.vue @@ -432,7 +432,8 @@ export default { }, grid: { //height:"50%", - //top: '13%', + left: 65, + right: 65, containLabel: false, bottom:70//156 }, diff --git a/nezha-fronted/src/components/common/js/validate.js b/nezha-fronted/src/components/common/js/validate.js index cf8c23ccf..0daeb733f 100644 --- a/nezha-fronted/src/components/common/js/validate.js +++ b/nezha-fronted/src/components/common/js/validate.js @@ -30,7 +30,9 @@ export function phone(rule, value, callback) { export function port(rule, value, callback) { setTimeout(() => { - if(typeof value != 'number'){ + if (!value) { + callback(); + } else if(typeof value != 'number'){ callback(new Error(vm.$t('validate.number'))) }else{ if(value < 1 ||value > 65535){ diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue index a5f262c2e..e3726f175 100644 --- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue @@ -122,10 +122,8 @@ ], port: [ {validator:port, trigger: 'blur'}, - {required: true, message: this.$t('validate.required'), trigger: 'blur'}, ], path: [ - {required: true, message: this.$t('validate.required'), trigger: 'blur'}, ] }, projectList: [],