diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 25b599a4f..b3c856f8d 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -72,9 +72,9 @@ li{ } .too-long-split { text-overflow: ellipsis; - white-space: nowrap; overflow: hidden; display: inline-block; + width: 100%; } /* begin--按钮组件*/ .nz-btn-min-width-35 { @@ -387,40 +387,37 @@ li{ border-right: 1px solid #d4d4d4; box-shadow: inset -1px -2px 1px 0 rgba(0,0,0,0.11), inset 2px 2px 1px 0 rgba(255,255,255,0.50); } +.content-right>.el-table th:first-of-type .cell{ + padding-left: 0; +} .content-right>.el-table td .cell{ height: 44px; line-height: 44px; - display:flex; -} -.nav-tabel-header{ - display: flex; - height: 36px; - min-width: 100px; } .content-right .el-table__row td:first-of-type { padding-left: 38px; } +.el-tooltip__popper.is-light[x-placement^=top] .popper__arrow { /*覆盖tooltip小三角颜色*/ + border-top-color: #ebeef5; +} .nz-table-gear { - display: block; + display: inline-block; width: 38px; - margin-left:-10px; - padding-left:10px; - padding-right:10px; text-align: center; - border-right:2px solid #d4d4d4; + border-right: 1px solid #d4d4d4; box-sizing: border-box; + box-shadow: inset -1px -2px 1px 0 rgba(0,0,0,0.11), inset 2px 2px 1px 0 rgba(255,255,255,0.5); + float: left; } .nz-table-gear>i { cursor: pointer; } -.nz-table-txt{ - padding-left:10px; - display: flex; - height: 100%; +.nz-table-txt { + display: inline-block; border-left:1px solid #fff; - min-width: 60px; box-sizing: border-box; - padding-right:20px; + float: left; + padding-left: 10px; } /* end--内容*/ @@ -585,6 +582,9 @@ li{ .pop-item-wider .el-form-item__content { margin-left: 80px !important; } +.pop-item-wider .module-box-table td { + padding: 4px 0; +} .pop-label { padding-bottom: 5px; } diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue index 52514ca03..31cb16f51 100644 --- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue @@ -91,74 +91,6 @@ {{$t('overall.save')}} - - diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue index 07ede8f2a..55de2faea 100644 --- a/nezha-fronted/src/components/page/alert/config.vue +++ b/nezha-fronted/src/components/page/alert/config.vue @@ -46,14 +46,15 @@ :key="`col-${index}`" :label="item.label" show-overflow-tooltip + min-width="110px" > @@ -217,6 +216,7 @@ label: this.$t("alert.config.link"), prop: 'linkObject', show: true, + width: 140 }, { label: this.$t("alert.config.for"), prop: 'last', @@ -229,11 +229,11 @@ label: this.$t('alert.description'), prop: 'description', show: true, - }, { + }, /*{ label: this.$t('alert.config.receiver'), prop: 'receiver', show: true, - }, { + }, */{ label: this.$t('alert.config.option'), prop: 'option', show: true, diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue index 1d551a221..1021787db 100644 --- a/nezha-fronted/src/components/page/alert/list.vue +++ b/nezha-fronted/src/components/page/alert/list.vue @@ -4,335 +4,362 @@ } diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 38aeabd1a..6ff630f1d 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -1,5 +1,5 @@