diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss index dad90b25f..36eb111ef 100644 --- a/nezha-fronted/src/assets/css/common.scss +++ b/nezha-fronted/src/assets/css/common.scss @@ -317,10 +317,10 @@ td .nz-icon-gear:before{ border-color: $--color-warning; } } -.switch-open { +.el-switch.is-checked .el-switch__core { background-color: $--color-primary; } -.switch-shut { +.el-switch .el-switch__core { background-color: $--switch-background-color; } //.editor-core { diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss b/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss index f87c11add..baadcb62f 100644 --- a/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss +++ b/nezha-fronted/src/assets/css/components/page/dashboard/explore/explore.scss @@ -34,11 +34,15 @@ line-height: 38px; flex-direction: row-reverse; justify-content: flex-end; - + background-color: $--background-color-empty; i { margin: 0 8px; } } + .el-collapse-item__wrap { + background-color: $--background-color-empty; + border-bottom: 1px solid $--border-color-light; + } .el-collapse-item__content { padding: 0 30px 20px; } diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/explore/logTab.scss b/nezha-fronted/src/assets/css/components/page/dashboard/explore/logTab.scss index d88704e89..2c83f21b0 100644 --- a/nezha-fronted/src/assets/css/components/page/dashboard/explore/logTab.scss +++ b/nezha-fronted/src/assets/css/components/page/dashboard/explore/logTab.scss @@ -18,10 +18,13 @@ .log-table .nz-table2 { padding: 10px 0 0 0; position: relative; + background-color: $--background-color-empty; .el-table__body { border-collapse: separate; border-spacing: 0 6px; - + tr { + background-color: $--background-color-empty; + } td { vertical-align: top; padding: 1px 0; @@ -29,7 +32,19 @@ } td.el-table__expanded-cell { padding: 0 0 0 60px; - background-color: $--background-color-base; + background-color: $--popover-background-color !important; + } + pre { + border: none; + background: none; + } + td.el-table__expanded-cell:hover { + padding: 0 0 0 60px; + background-color: $--background-color-base !important; + } + pre:hover { + background: none; + border: none; } // 左侧边框 td:first-child { diff --git a/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss b/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss index a62d24ef4..a1755ea4b 100644 --- a/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss +++ b/nezha-fronted/src/assets/css/components/page/dashboard/explore/promqlInput.scss @@ -48,7 +48,9 @@ width: 105px; margin-left: 1px; } - + .el-cascader-menu { + width: 200px; + } .metric-btn:hover, .metric-btn:focus { background-image: linear-gradient(180deg, rgb(247, 248, 250) 0%, rgb(247, 248, 250) 100%); color: $--color-text-regular; @@ -59,7 +61,6 @@ position: absolute; z-index: 2100; background-color: $--background-color-empty; - width: 450px; .el-cascader-menu__wrap { height: 100%; .el-scrollbar__view.el-cascader-menu__list { @@ -82,12 +83,10 @@ letter-spacing: 0; line-height: 22px; } - - /deep/ .el-cascader-node { + .el-cascader-node { padding: 0; } - - /deep/ .el-cascader-menu:last-child .el-cascader-node, /deep/ .el-cascader-node__label { + .el-cascader-menu:last-child .el-cascader-node, /deep/ .el-cascader-node__label { padding: 0; } .metric-selector-title{ diff --git a/nezha-fronted/src/components/charts/logs.vue b/nezha-fronted/src/components/charts/logs.vue index ba6798321..9edb1807f 100644 --- a/nezha-fronted/src/components/charts/logs.vue +++ b/nezha-fronted/src/components/charts/logs.vue @@ -719,10 +719,10 @@ export default { .show-tab-icon .nz-icon.is-active-icon{ color: #BDE3FD; } - /deep/ .chart-no-data{ + .chart-no-data{ width: calc(100% - 30px); } - /deep/ .log-detail .log-table .nz-table2 { + .log-detail .log-table .nz-table2 { padding: 0; } .logs-box{ diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue index 6e891b7cd..4a7b671d3 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQuery.vue @@ -42,7 +42,7 @@
{{$t('project.endpoint.hideSameLabels')}} - +
diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue index 9cea71b09..9935046ba 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue @@ -53,7 +53,7 @@
{{$t('project.endpoint.hideSameLabels')}} - +
diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue index e57944393..a3ad75f8a 100644 --- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue +++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue @@ -36,8 +36,6 @@ v-model="selection.pen.data.valueMappingShow" :active-value="true" :inactive-value="false" - active-icon-class="switch-open" - inactive-icon-class="switch-shut" /> diff --git a/nezha-fronted/src/components/common/project/L5/topologyTopTool.vue b/nezha-fronted/src/components/common/project/L5/topologyTopTool.vue index 41ddeef5f..8cc7b26c7 100644 --- a/nezha-fronted/src/components/common/project/L5/topologyTopTool.vue +++ b/nezha-fronted/src/components/common/project/L5/topologyTopTool.vue @@ -31,8 +31,6 @@ v-model="option.grid" :active-value="true" :inactive-value="false" - active-icon-class="switch-open" - inactive-icon-class="switch-shut" @change="changeOption('grid')"> @@ -42,8 +40,6 @@ v-model="option.rule" :active-value="true" :inactive-value="false" - active-icon-class="switch-open" - inactive-icon-class="switch-shut" @change="changeOption('rule')"> diff --git a/nezha-fronted/src/components/common/rightBox/administration/assetTypeBox.vue b/nezha-fronted/src/components/common/rightBox/administration/assetTypeBox.vue index 8bfbd57b9..439bf635e 100644 --- a/nezha-fronted/src/components/common/rightBox/administration/assetTypeBox.vue +++ b/nezha-fronted/src/components/common/rightBox/administration/assetTypeBox.vue @@ -17,8 +17,6 @@ @@ -27,8 +25,6 @@ @@ -43,8 +39,6 @@ @@ -53,8 +47,6 @@ @@ -63,8 +55,6 @@ diff --git a/nezha-fronted/src/components/common/rightBox/administration/userBox.vue b/nezha-fronted/src/components/common/rightBox/administration/userBox.vue index 8fd77fcb7..0126ced98 100644 --- a/nezha-fronted/src/components/common/rightBox/administration/userBox.vue +++ b/nezha-fronted/src/components/common/rightBox/administration/userBox.vue @@ -87,7 +87,7 @@ - diff --git a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue index 5e3de2b63..ee864aba1 100644 --- a/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue +++ b/nezha-fronted/src/components/common/rightBox/asset/assetBox.vue @@ -248,7 +248,7 @@
- +
diff --git a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue index 8bf0b65c4..0aa4fc405 100644 --- a/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue +++ b/nezha-fronted/src/components/common/rightBox/assetMetaBox.vue @@ -28,8 +28,6 @@ @@ -37,8 +35,6 @@ @@ -104,9 +100,7 @@ {{$t('config.assetLabel.interval')}}: + @change="$forceUpdate()"> diff --git a/nezha-fronted/src/components/common/rightBox/assetStateBox.vue b/nezha-fronted/src/components/common/rightBox/assetStateBox.vue index dc7066105..571f8f173 100644 --- a/nezha-fronted/src/components/common/rightBox/assetStateBox.vue +++ b/nezha-fronted/src/components/common/rightBox/assetStateBox.vue @@ -24,19 +24,19 @@ - - - diff --git a/nezha-fronted/src/components/common/rightBox/dcBox.vue b/nezha-fronted/src/components/common/rightBox/dcBox.vue index 78b6c8539..392e3deb0 100644 --- a/nezha-fronted/src/components/common/rightBox/dcBox.vue +++ b/nezha-fronted/src/components/common/rightBox/dcBox.vue @@ -44,10 +44,7 @@ id="dc-box-input-name" v-model="editDc.state" active-value="ON" - inactive-value="OFF" - active-icon-class="switch-open" - inactive-icon-class="switch-shut" - > + inactive-value="OFF">
diff --git a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue index a4582df63..d78a39f73 100644 --- a/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue +++ b/nezha-fronted/src/components/common/rightBox/editEndpointBoxNew.vue @@ -105,7 +105,7 @@ {{$t('project.endpoint.metrics')}} - + @@ -346,7 +346,7 @@ {{$t('project.endpoint.logs')}} - +
diff --git a/nezha-fronted/src/components/common/rightBox/moduleBox.vue b/nezha-fronted/src/components/common/rightBox/moduleBox.vue index 5096490eb..96586e04b 100644 --- a/nezha-fronted/src/components/common/rightBox/moduleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/moduleBox.vue @@ -86,7 +86,7 @@ {{$t('project.endpoint.metrics')}} - +
@@ -326,7 +326,7 @@ {{$t('project.endpoint.logs')}} - +
diff --git a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue index 8076825c2..f7f5bda7f 100644 --- a/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue +++ b/nezha-fronted/src/components/common/table/alert/alertRuleTable.vue @@ -75,8 +75,6 @@ style="margin-left: 14px" slot="reference" v-model="scope.row.schedEnable" - active-icon-class="switch-open" - inactive-icon-class="switch-shut" :active-value="1" :inactive-value="0" @change="(val)=>{$emit('statusChange', scope.row)}" diff --git a/nezha-fronted/src/components/page/config/assetState.vue b/nezha-fronted/src/components/page/config/assetState.vue index 0e3d2d2b2..73f9557d7 100644 --- a/nezha-fronted/src/components/page/config/assetState.vue +++ b/nezha-fronted/src/components/page/config/assetState.vue @@ -61,8 +61,6 @@ :active-value="1" :disabled="!hasButton('assetState_toEdit')" :inactive-value="0" - active-icon-class="switch-open" - inactive-icon-class="switch-shut" @change="(val)=>{statusChange(scope.row)}"> {{scope.row[item.prop]}} diff --git a/nezha-fronted/src/components/page/config/system.vue b/nezha-fronted/src/components/page/config/system.vue index 81fc85c81..527639341 100644 --- a/nezha-fronted/src/components/page/config/system.vue +++ b/nezha-fronted/src/components/page/config/system.vue @@ -68,17 +68,17 @@ - +
{{$t('config.system.basic.pinPolicy')}} ({{$t('config.system.basic.pinPolicyValue')}})
- + - + diff --git a/nezha-fronted/src/components/page/config/system/notifyMethodTable.vue b/nezha-fronted/src/components/page/config/system/notifyMethodTable.vue index f251035e7..c5abc5ac1 100644 --- a/nezha-fronted/src/components/page/config/system/notifyMethodTable.vue +++ b/nezha-fronted/src/components/page/config/system/notifyMethodTable.vue @@ -53,11 +53,11 @@ - +