diff --git a/README.md b/README.md index 1b5b740..c28bebb 100644 --- a/README.md +++ b/README.md @@ -1 +1 @@ -# 济南项目 +# 济南防消一体化综合治理平台 diff --git a/src/app/CustomReuseStrategy.ts b/src/app/CustomReuseStrategy.ts index 8089987..313c05f 100644 --- a/src/app/CustomReuseStrategy.ts +++ b/src/app/CustomReuseStrategy.ts @@ -21,7 +21,7 @@ export class CustomReuseStrategy implements RouteReuseStrategy { /** 当路由离开时会触发。按path作为key存储路由快照&组件当前实例对象 */ store(route: ActivatedRouteSnapshot, handle: DetachedRouteHandle): void { console.log('store======>', route, handle); - if(route.routeConfig.path == 'host'){ + if(route.routeConfig.path == 'basicInfo'){ CustomReuseStrategy.handlers[this.getRouteUrl(route)] = handle; } } diff --git a/src/app/home/home-routing.module.ts b/src/app/home/home-routing.module.ts index 43adab8..bb4388e 100644 --- a/src/app/home/home-routing.module.ts +++ b/src/app/home/home-routing.module.ts @@ -17,7 +17,8 @@ const routes: Routes = [ children: [ { path: '', - component: RoleComponent, + redirectTo: '/homePage/system/role', + pathMatch: 'full' }, { path: 'role', diff --git a/src/app/home/nav/nav.component.html b/src/app/home/nav/nav.component.html index dffc78a..289b281 100644 --- a/src/app/home/nav/nav.component.html +++ b/src/app/home/nav/nav.component.html @@ -1,10 +1,18 @@ diff --git a/src/app/home/nav/nav.component.scss b/src/app/home/nav/nav.component.scss index a6081d5..7336dc3 100644 --- a/src/app/home/nav/nav.component.scss +++ b/src/app/home/nav/nav.component.scss @@ -4,33 +4,55 @@ nz-header { - background: #7dbcea; + height: 48px; + line-height: 48px; + background: #2D4DbF; color: #fff; + display: flex; + justify-content: center; + align-items: center; ul { display: flex; + justify-content: center; + margin-bottom: 0px; + width:600px; li { margin: 0 6px; + width: 120px; + display: flex; + justify-content: center; + align-items: center; + cursor: pointer; } + } } +.router-link-active { + background-image: linear-gradient(to top, #fbc2eb 0%, #a6c1ee 100%); + text-align: center; + transform: skewX(-20deg); +} + +.router-link-active>div { + height: 48px; + transform: skewX(20deg); + border-bottom: 2px solid red; +} + nz-footer { line-height: 1.5; } nz-sider { - background: #3ba0e9; + background: #2D4DbF; color: #fff; - line-height: 120px; } nz-content { - background: rgba(16, 142, 233, 1); color: #fff; - min-height: 120px; - line-height: 120px; } nz-layout { diff --git a/src/app/home/system-management/system-management.component.scss b/src/app/home/system-management/system-management.component.scss index bc65672..bdc52f6 100644 --- a/src/app/home/system-management/system-management.component.scss +++ b/src/app/home/system-management/system-management.component.scss @@ -2,12 +2,22 @@ display: flex; } + .nav { - width: 300px; + width: 200px; height: 100%; - border-right: 1px solid red; - + background: #2c4dc1; + ul { + li { + height: 48px; + line-height: 48px; + cursor: pointer; + } + } +} +.router-link-active { + background: #fff; } .content { @@ -17,3 +27,9 @@ .router-link-active { color: black; } + +.content { + box-sizing: border-box; + padding: 8px; + background: #F6F5F8; +} diff --git a/src/assets/font-family/sybold.OTF b/src/assets/font-family/sybold.OTF new file mode 100644 index 0000000..4b3429a Binary files /dev/null and b/src/assets/font-family/sybold.OTF differ diff --git a/src/assets/font-family/synormal.OTF b/src/assets/font-family/synormal.OTF new file mode 100644 index 0000000..091f56d Binary files /dev/null and b/src/assets/font-family/synormal.OTF differ diff --git a/src/assets/font-family/titlefont.TTF b/src/assets/font-family/titlefont.TTF new file mode 100644 index 0000000..3729151 Binary files /dev/null and b/src/assets/font-family/titlefont.TTF differ diff --git a/src/index.html b/src/index.html index d383833..56ac851 100644 --- a/src/index.html +++ b/src/index.html @@ -2,7 +2,7 @@ - 边缘主机管理系统 + 防消一体化综合治理平台 diff --git a/src/styles.scss b/src/styles.scss index c5d400d..bbae987 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -5,7 +5,10 @@ @import "~ng-zorro-antd/button/style/index.min.css"; /* 引入组件样式 */ - +@font-face { + font-family: synormal; + src: url("./assets/font-family/synormal.OTF"); +} /* css初始化 */ html, @@ -15,6 +18,7 @@ body { width: 100%; height: 100%; overflow: hidden; + font-family: synormal !important; } body {