diff --git a/nezha-fronted/src/assets/css/components/common/detailView/detailViewTopSearch.scss b/nezha-fronted/src/assets/css/components/common/detailView/detailViewTopSearch.scss index ba26178c0..036157f53 100644 --- a/nezha-fronted/src/assets/css/components/common/detailView/detailViewTopSearch.scss +++ b/nezha-fronted/src/assets/css/components/common/detailView/detailViewTopSearch.scss @@ -41,6 +41,12 @@ max-width: 100px; } } +.detail-top-search-dropdown.right-box-max-width { + .el-dropdown-menu__item { + max-width: unset; + min-width: 200px; + } +} .detail-top-search-dropdown{ max-height: 300px; overflow-y: auto; @@ -52,10 +58,10 @@ text-overflow: ellipsis; white-space: nowrap; display: flex; + justify-content: space-between; .el-checkbox{ width: calc(100% - 20px); height: 36px; - padding: 0 0 0 20px; display: flex; align-items: center; .el-checkbox__label{ @@ -72,12 +78,15 @@ .children-title-name{ width: calc(100% - 20px); height: 36px; - padding-left: 20px; + padding-right: 20px; font-size: 12px; color: $--color-text-secondary; line-height: 30px; } } + .el-checkbox-group { + padding: 0 20px; + } .el-dropdown-menu__item:not(.is-disabled):hover{ color: $--color-text-secondary; background: $--background-color-base !important; diff --git a/nezha-fronted/src/assets/css/components/common/project/L5/CanvasProps.scss b/nezha-fronted/src/assets/css/components/common/project/L5/CanvasProps.scss index cb86e03d2..71b5507a2 100644 --- a/nezha-fronted/src/assets/css/components/common/project/L5/CanvasProps.scss +++ b/nezha-fronted/src/assets/css/components/common/project/L5/CanvasProps.scss @@ -13,7 +13,7 @@ } .props-box .el-tabs--card > .el-tabs__header { - background: #EEEEEE; + background-color: $--background-color-base; border: none; } @@ -31,26 +31,11 @@ height: 31px; line-height: 31px; } -.metric-selector-input-box { - width: calc(100% - 120px) !important; -} .query-row .input-box { margin: 0; } -.legend-title { - width: 100px; - margin-right: 10px; - text-align: left; - padding-left: 0; - margin-left: 10px; - height: 32px; - line-height: 32px; - font-size: 14px; - color: $--color-text-regular; -} - .project-title { background: #eeeeee; height: 36px; @@ -145,7 +130,7 @@ background: $--background-color-base; font-size: 14px; padding: 0 10px; - + color: $--color-text-regular; .el-form-item__content { height: 100%; line-height: 32px; @@ -211,6 +196,39 @@ margin-right: 0 !important; } + .metric-selector-input-box { + width: calc(100% - 120px) !important; + } + .legend-title { + width: 100px; + margin-right: 10px; + text-align: left; + padding-left: 0; + margin-left: 10px; + height: 32px; + line-height: 32px; + font-size: 14px; + color: $--color-text-regular; + background: transparent; + } + .el-textarea { + .el-textarea__inner { + border: 1px solid $--border-color-light !important; + } + .el-textarea__inner:focus { + border: 1px solid $--color-primary !important; + } + .el-textarea__inner:hover { + border: 1px solid $--border-color-light-hover !important; + } + } + .el-input__inner:hover,.el-select:hover .el-input__inner { + border: 1px solid $--border-color-light-hover !important; + } + .form-row-item.form-row-item-border { + border: 1px dashed $--border-color-light; + } + .el-cascader-node { max-width: 200px; overflow: hidden; @@ -253,7 +271,7 @@ .el-collapse-item__header { padding: 0 10px; - background-color: #eeeeee; + background-color: $--background-color-base; height: 32px; font-size: 14px; color: $--color-text-primary; @@ -601,12 +619,16 @@ height: 22px; } .color-before-select { - width: 60px; + width: 60px !important; border-radius: 4px 0 0 4px; - background: $--border-color-light; + cursor: pointer; +} +.color-show { + cursor: pointer; } .color-before-select .el-input__inner { - background: rgb(245, 247, 250); + background: $--right-box-sub-title-background-color; + border-color: $--border-color-light; } .color-before-select .el-input__prefix { @@ -618,4 +640,5 @@ .color-before-select .el-select-dropdown__item { text-align: center; + overflow: unset; } diff --git a/nezha-fronted/src/assets/css/components/common/project/topology.scss b/nezha-fronted/src/assets/css/components/common/project/topology.scss index 8240f063a..2ed6b49d0 100644 --- a/nezha-fronted/src/assets/css/components/common/project/topology.scss +++ b/nezha-fronted/src/assets/css/components/common/project/topology.scss @@ -410,7 +410,7 @@ } .special-select .el-input.el-input--prefix.el-input--suffix, .line-width .el-input.el-input--prefix.el-input--suffix { - border: 1px solid #DCDFE6; + border: 1px solid $--border-color-light; height: 28px; } diff --git a/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss b/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss index d1932e062..c3789e5c2 100644 --- a/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss +++ b/nezha-fronted/src/assets/css/components/page/monitor/project/project.scss @@ -15,11 +15,11 @@ width: calc(50% - 10px); margin-right: 10px; min-width: 435px; - div.page { - textarea { - display: none; - } - } + //div.page { + // textarea { + // display: none; + // } + //} .project-box.list-page { width: 100%; height: calc(100% - 8px)!important; diff --git a/nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue b/nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue index 2fc9dfff5..6f4714f24 100644 --- a/nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue +++ b/nezha-fronted/src/components/common/detailView/detailViewTopSearch.vue @@ -89,7 +89,7 @@ - + {searchStrChange(val,key)}" suffix-icon="el-icon-search"/> diff --git a/nezha-fronted/src/components/common/nezhaColor.vue b/nezha-fronted/src/components/common/nezhaColor.vue index fdd0e5a0c..22266e417 100644 --- a/nezha-fronted/src/components/common/nezhaColor.vue +++ b/nezha-fronted/src/components/common/nezhaColor.vue @@ -17,7 +17,7 @@ - + {{item.name}} diff --git a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue index a3ad75f8a..feb4e2b23 100644 --- a/nezha-fronted/src/components/common/project/L5/CanvasProps.vue +++ b/nezha-fronted/src/components/common/project/L5/CanvasProps.vue @@ -9,7 +9,7 @@ @@ -130,6 +130,7 @@ @@ -207,7 +209,7 @@ prop="type"> {{ item.name }} @@ -216,8 +218,8 @@ + class="element-item form-row-item form-row-item-border" + style="width: 100%; border-radius: 2px; padding-right: 60px;"> {{ $t('project.topology.gradient') }} + class="color-before-select" popper-class="color-before-select right-box-select-top right-public-box-dropdown-top" @change="bkTypeChange"> @@ -457,7 +459,7 @@ {{ $t('project.topology.lineDash') }} - @@ -487,7 +489,7 @@ {{ $t('project.topology.lineType') }} - @@ -517,7 +519,7 @@ {{ $t('project.topology.fromArrow') }} - @@ -566,7 +568,7 @@ {{ $t('project.topology.toArrow') }} - @@ -685,7 +687,7 @@ {{ $t('project.topology.textAlign') }} @@ -699,7 +701,7 @@ {{ $t('project.topology.textBaseline') }} diff --git a/nezha-fronted/src/permission.js b/nezha-fronted/src/permission.js index 4eba56f1a..2751fa163 100644 --- a/nezha-fronted/src/permission.js +++ b/nezha-fronted/src/permission.js @@ -5,6 +5,7 @@ import ElementUI from 'element-ui' import Vue from 'vue' import i18n, { loadI18n } from './components/common/i18n' import VueResource from 'vue-resource' +import bus from "@/libs/bus"; Vue.use(VueResource) @@ -39,11 +40,18 @@ router.beforeEach((to, from, next) => { next({ path: '/setup' }) } else { if (localStorage.getItem('nz-token')) { - next({ - path: 'overview', - query: { - t: +new Date() - } + post('/sys/user/permissions', { token: localStorage.getItem('nz-token') }).then(res => { + const menuList = sortByOrderNum(res.data.menus) + store.commit('setMenuList', menuList) + store.commit('setButtonList', res.data.buttons) + store.commit('setRoleList', res.data.roles) + bus.$emit('login') + router.push({ + path: menuList[0].children[0].route, + query: { + t: +new Date() + } + }) }) } else { next() diff --git a/nezha-fronted/src/store/user.js b/nezha-fronted/src/store/user.js index 5208878a0..1a25e57a8 100644 --- a/nezha-fronted/src/store/user.js +++ b/nezha-fronted/src/store/user.js @@ -83,7 +83,7 @@ const user = { store.commit('setRoleList', res.data.roles) bus.$emit('login') router.push({ - path: menuList[0].children[0].name, + path: menuList[0].children[0].route, query: { t: +new Date() }