diff --git a/projects/app-vniigaz/src/assets/css/basics.scss b/projects/app-vniigaz/src/assets/css/basics.scss index 0bba4dc..346c67a 100644 --- a/projects/app-vniigaz/src/assets/css/basics.scss +++ b/projects/app-vniigaz/src/assets/css/basics.scss @@ -141,7 +141,7 @@ body { } .menu{ position: absolute; - left: 0px; + left: 40px; top: 32px; } } diff --git a/projects/app-vniigaz/src/assets/css/dropdown.scss b/projects/app-vniigaz/src/assets/css/dropdown.scss index 2584d1b..eca93e2 100644 --- a/projects/app-vniigaz/src/assets/css/dropdown.scss +++ b/projects/app-vniigaz/src/assets/css/dropdown.scss @@ -1,3 +1,11 @@ +add-section{ + position: relative; + .dropdown{ + top:22px; + left:0px; + } +} + .dropdown { position: absolute; width: 250px; diff --git a/projects/app-vniigaz/src/assets/html/header.component.html b/projects/app-vniigaz/src/assets/html/header.component.html index b032eaf..d5a9b13 100644 --- a/projects/app-vniigaz/src/assets/html/header.component.html +++ b/projects/app-vniigaz/src/assets/html/header.component.html @@ -8,41 +8,5 @@ АИС СЦ ВНИИГАЗ - - - - - - - - - diff --git a/projects/app/_modules/layout/header/header.component.ts b/projects/app/_modules/layout/header/header.component.ts index eac219e..886ca3a 100644 --- a/projects/app/_modules/layout/header/header.component.ts +++ b/projects/app/_modules/layout/header/header.component.ts @@ -1,5 +1,4 @@ import {Component} from '@angular/core'; -import {PagesService} from "@app/_services/pages.service"; import {AuthenticationService, ListsService} from "@app/_services"; import {Subscription} from "rxjs"; import { Router } from '@angular/router'; @@ -11,17 +10,13 @@ import { html } from '@environments/htmlenv'; styleUrls: ['header.component.scss'] }) export class HeaderComponent { - public menuItems = []; public user: any; public loading: boolean = false; - public error: string = ''; - routeSubscription?: Subscription; subscription: Subscription; showMobileMenu = false; constructor( private router:Router, - private pagesService: PagesService, public authenticationService: AuthenticationService, private listsService: ListsService) { this.subscription = this.authenticationService.user.subscribe(user => { diff --git a/projects/app/_modules/pages/sections/add/add-section.component.html b/projects/app/_modules/pages/sections/add/add-section.component.html index d7b43e4..8bac65a 100644 --- a/projects/app/_modules/pages/sections/add/add-section.component.html +++ b/projects/app/_modules/pages/sections/add/add-section.component.html @@ -1,41 +1,23 @@ -
- -
- - - Добавить элемент - - - -
- - - -
-
- -
- - - {{type.title}} - - +
+
+ + Добавить элемент + +
+
+
+
+
+
{{type.title}}
+ +
-
-
-
-
-
- - -
-
+
+
+ +
+
- - +
- -
- diff --git a/projects/app/_modules/pages/sections/add/add-section.component.ts b/projects/app/_modules/pages/sections/add/add-section.component.ts index c07b1e0..e560c52 100644 --- a/projects/app/_modules/pages/sections/add/add-section.component.ts +++ b/projects/app/_modules/pages/sections/add/add-section.component.ts @@ -12,6 +12,7 @@ export class AddSectionComponent { @Input() modelType: string; public types = []; public ddVisible = false; + public sub:boolean[] =[] constructor(private formsService: FormsService, private objectsService: ObjectsService) { } @@ -22,7 +23,7 @@ export class AddSectionComponent { fetchTypes() { - this.objectsService.fetchType('page-section', {include: 'children.children.children.children'}).subscribe(res => { + this.objectsService.fetchType('page-section', {include: 'children.children'}).subscribe(res => { this.types = res.data?.children?.data; this.types = this.types.map(item => { item.parent = item?.children?.data?.length > 0; @@ -31,7 +32,6 @@ export class AddSectionComponent { }); }); } - add(type: string) { this.types = this.types.map(item => { item.showChilren = false; @@ -42,15 +42,25 @@ export class AddSectionComponent { this.hideDD(); } + submenu(type: any) { + this.types = this.types.map(item => { + item.showChilren = item.showChilren ? false : item.id === type.id; + return item; + }); + } + toggleDD() { this.ddVisible = !this.ddVisible; } - + showDD() { + this.ddVisible = true; + } hideDD() { this.ddVisible = false; } - - subClick(type){ - type.showChilren = !type.showChilren; + toggleSub(i:number){ + let val=!this.sub[i]; + this.sub = this.sub.map(item=>false); + this.sub[i]=val; } } diff --git a/projects/app/_modules/pages/sections/menu/page-menu.component.html b/projects/app/_modules/pages/sections/menu/page-menu.component.html index d469589..f9a02f5 100644 --- a/projects/app/_modules/pages/sections/menu/page-menu.component.html +++ b/projects/app/_modules/pages/sections/menu/page-menu.component.html @@ -1,16 +1,16 @@
- + - + - +
diff --git a/projects/app/_modules/viget/drop-down/drop-down.component.ts b/projects/app/_modules/viget/drop-down/drop-down.component.ts index e3f1a25..e677b3f 100644 --- a/projects/app/_modules/viget/drop-down/drop-down.component.ts +++ b/projects/app/_modules/viget/drop-down/drop-down.component.ts @@ -7,7 +7,7 @@ import { Component, Input, Output, EventEmitter } from '@angular/core'; }) export class DropDownComponent { - @Input() ico = 'drop_down_24'; + @Input() ico = 'arrow_drop_down_24'; @Input() angle = [0,-180]; @Input() visible = false; @Input() target:HTMLElement;