diff --git a/nezha-fronted/src/App.vue b/nezha-fronted/src/App.vue index c26526151..839c8fada 100644 --- a/nezha-fronted/src/App.vue +++ b/nezha-fronted/src/App.vue @@ -10,10 +10,10 @@ export default { name: 'App', mounted() { - /*this.$http.get("config.json").then((result)=>{ + this.$http.get("config.json").then((result)=>{ this.$axios.defaults.baseURL = result.body.baseUrl; - });*/ - this.$axios.defaults.baseURL = 'http://192.168.40.247:8080/nz-admin'; + }); + //this.$axios.defaults.baseURL = 'http://192.168.40.247:8080/nz-admin'; } } diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index c6f43a824..4e8220e7f 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -326,6 +326,7 @@ li{ border-bottom: 3px solid $global-text-color-active; color: #333; cursor: default; + font-weight: bold; } /* end--nz-tab组件*/ @@ -386,7 +387,8 @@ li{ } .content-left .sidebar-info-item-active { border-left: 2px solid $global-text-color-active; - color: $global-text-color-active; + color: $box-title-color; + font-weight: bold; } .content-left .el-checkbox-group .sidebar-info-item-active { border-left: none; @@ -1031,10 +1033,20 @@ li{ } .el-checkbox__input.is-checked + .el-checkbox__label { - color: $global-text-color-active; + color: $box-title-color; } .el-checkbox__input.is-checked .el-checkbox__inner, .asset .content-left .el-checkbox__input.is-indeterminate .el-checkbox__inner { background-color: $global-text-color-active; } /* --end--复选框自定义颜色 */ + +/* dashboard-dialog */ +.nz-dialog .el-dialog { + border-radius: 10px; +} +.nz-dialog-title { + font-size: 18px; + color: $box-title-color; + font-weight: bold; +} diff --git a/nezha-fronted/src/components/charts/chart-table.scss b/nezha-fronted/src/components/charts/chart-table.scss index 93509204c..19dd8fe6b 100644 --- a/nezha-fronted/src/components/charts/chart-table.scss +++ b/nezha-fronted/src/components/charts/chart-table.scss @@ -20,9 +20,10 @@ padding: 20px 30px 3px; margin-bottom: 10px; .table-title { - font-family: Arial; + font-weight: bold; font-size: 18px; line-height: 30px; + color: #333; } .edit:after{ display: block; diff --git a/nezha-fronted/src/components/charts/chart-table.vue b/nezha-fronted/src/components/charts/chart-table.vue index 823da3fac..8befa3a4b 100644 --- a/nezha-fronted/src/components/charts/chart-table.vue +++ b/nezha-fronted/src/components/charts/chart-table.vue @@ -43,9 +43,9 @@ - +
- {{data.title}} + {{data.title}}
diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue index 83bb5adc1..94fc02c1a 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.vue +++ b/nezha-fronted/src/components/charts/line-chart-block.vue @@ -37,14 +37,14 @@
-
- {{data.title}} + {{data.title}}