From d338718350c3248e3691b1b3efc49ca6a9dec2a8 Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Mon, 14 Dec 2020 16:41:14 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E5=B7=A6=E4=BE=A7?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/navigation/navigation.component.html | 35 ++++--- src/app/navigation/navigation.component.scss | 95 +++++++------------ src/app/navigation/navigation.component.ts | 69 +------------- .../changepassword.component.ts | 2 +- 4 files changed, 58 insertions(+), 143 deletions(-) diff --git a/src/app/navigation/navigation.component.html b/src/app/navigation/navigation.component.html index c489a07..85590a7 100644 --- a/src/app/navigation/navigation.component.html +++ b/src/app/navigation/navigation.component.html @@ -10,25 +10,30 @@
- +
-
- logo -
-
-
上海消防救援
-
shanghai fire and rescue
-
- +
+ logo +
+
+
上海消防救援
+
shanghai fire and rescue
+
-
    -
  • 创建考试
    • -
  • 阅卷
    • -
  • 统计分析
    • -
- +
    +
  • + +
    • +
  • + +
    • +
  • + +
    • +
+
diff --git a/src/app/navigation/navigation.component.scss b/src/app/navigation/navigation.component.scss index b1bdf98..9854d68 100644 --- a/src/app/navigation/navigation.component.scss +++ b/src/app/navigation/navigation.component.scss @@ -20,38 +20,32 @@ mat-sidenav{ } ul{ width: 100%; - li{ - list-style: none; - height: 48px; - line-height: 48px; - cursor: pointer; - color: white; - width: 194px; - // text-align: center; - overflow: hidden; - text-overflow:ellipsis; - white-space: nowrap; + list-style: none; + height: 48px; + line-height: 48px; + cursor: pointer; + width: 100%; + border: none; + outline: none; + overflow: hidden; + text-overflow:ellipsis; + white-space: nowrap; + img { + display: inline-block; + margin: 5px; + width: 18px; + height: 20px; + vertical-align: middle; + } + label { + display: inline-block; + vertical-align: middle; + } } } } - - .logobox{ - border-radius: 50%; - width: 64px; - height: 64px; - - background:url("https://img5.tianyancha.com/logo/lll/cce72488294fb8f4bc670a5bb7f0cc4d.png@!f_200x200") no-repeat; - background-size: 100%; - margin: 0px auto; - - img{ - width: 100%; - height: 100%; - } - - } .shownav{ position: absolute; top: 13px; @@ -87,31 +81,21 @@ mat-sidenav{ bottom: 0px; overflow-y: scroll; font-size: 15px; - /* .router-link-active{ - background-color: #FFFFFF; - } */ ul{ li{ width: 198px; height: 44px; line-height:44px; - font-size: 20px; + font-size: 18px; margin-left: 10px; margin-top: 30px; - position: relative; text-align: center; outline:none; - + border-radius: 8px; } li:hover{ - background-color: #FFFFFF; - color: #07CDCF; - } - img{ - position: relative; - top: 2px; - width: 18px; - height: 20px; + background-color: #FFFFFF; + color: #07CDCF; } } } @@ -123,7 +107,6 @@ mat-sidenav{ } ul li{ background-color: white; - //color: black; } .biglogobox{ background-color: #d50000; @@ -180,24 +163,23 @@ mat-sidenav{ padding-left: 60px; } } - // mat-panel-title{ - // color: white; - // } } .mat-expansion-indicator::after { color: white; } -.example-container .router-link-active { - //background-color: rgba(225,225,225,.5); - border-radius: 8px ; -} -.btn{ + + //选中左侧菜单样式 + .clickStyle{ + background-color: #FFFFFF; + color: #07CDCF; + } + .btn{ text-align: center; button{ margin: 0 5px; - } + } } .example-sidenav-content{ height: 100%; @@ -217,15 +199,4 @@ mat-sidenav{ border-radius: 50%; border: 2px solid #fff; font-weight: 550; -} -//选中左侧菜单样式 -.clickStyle{ - background-color: #FFFFFF; - border-radius: 8px ; - //border:1px solid #FFFFFF ; - color: #07CDCF; -} -//鼠标移入改变背景色 -.onmousbackcolor{ - background-color: #FFFFFF; } \ No newline at end of file diff --git a/src/app/navigation/navigation.component.ts b/src/app/navigation/navigation.component.ts index e30e975..ead61d3 100644 --- a/src/app/navigation/navigation.component.ts +++ b/src/app/navigation/navigation.component.ts @@ -14,62 +14,9 @@ import { Router,ActivatedRoute } from '@angular/router' styleUrls: ['./navigation.component.scss'] }) export class NavigationComponent implements OnInit { - - constructor(private router:Router,public emitService: ComponentServiceService,public navmenus:CacheTokenService,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public islogin:IsLoginService) { } - - @ViewChild('child') child:AllFileComponent; //父组件中获得子组件的引用 - - allDataBank:any //所有的资料库 - selectedDataBank:any //当前选中的资料库 - hoverDataBank:any//当前鼠标移入的资料库 - isOneClick:boolean //是否第一次进入网页 - leftMenuname="found" - //左侧菜单点击事件 - clickLeftmenu(name){ - this.leftMenuname=name - } - - //支队级菜单 - detachmentMenus:any = [ - { id:"支队级-主官", name:"主官" }, - { id:"支队级-副官", name:"副官" }, - { id:"支队级-灭火救援指挥岗位", name:"灭火救援指挥岗位" }, - { id:"支队级-政工岗位", name:"政工岗位" }, - { id:"支队级-后勤与保障岗位", name:"后勤与保障岗位" }, - { id:"支队级-防火监督岗位", name:"防火监督岗位" }, - { id:"支队级-指挥中心", name:"指挥中心" }, - { id:"支队级-安全员", name:"安全员" }, - ] - //大队级菜单 - brigadeMenus:any = [ - { id:"大队级-主官", name:"主官" }, - { id:"大队级-副官", name:"副官" }, - { id:"大队级-灭火救援指挥岗位", name:"灭火救援指挥岗位" }, - { id:"大队级-政工岗位", name:"政工岗位" }, - { id:"大队级-后勤与保障岗位", name:"后勤与保障岗位" }, - { id:"大队级-防火监督岗位", name:"防火监督岗位" }, - { id:"大队级-安全员", name:"安全员" }, - ] - //消防救援站菜单 - rescueStationMenus:any = [ - { id:"消防救援站-消防站指挥员", name:"消防站指挥员" }, - { id:"消防救援站-站长助理", name:"站长助理" }, - { id:"消防救援站-战斗员", name:"战斗员" }, - { id:"消防救援站-供水源", name:"供水源" }, - { id:"消防救援站-训导员", name:"训导员" }, - { id:"消防救援站-通信员", name:"通信员" }, - { id:"消防救援站-无人机飞手", name:"无人机飞手" }, - { id:"消防救援站-消防车驾驶员", name:"消防车驾驶员" }, - { id:"消防救援站-装备技师", name:"装备技师" } - ] + constructor(private router:Router,public emitService: ComponentServiceService,public navmenus:CacheTokenService,private http: HttpClient,public dialog: MatDialog,public snackBar: MatSnackBar,public islogin:IsLoginService) { } - //系统管理菜单 - systemManagement:any = [ - { id:"学员管理", name:"学员管理" }, - { id:"教员管理", name:"教员管理" } - ] - isAdmin:boolean = false ngOnInit() { // if(sessionStorage.getItem("roleType") == "0"){ @@ -77,18 +24,10 @@ export class NavigationComponent implements OnInit { // } } - - darktheme = false;//黑夜主题 - switchTheme(dark) { - this.darktheme = dark; - } - defaulttheme(){ - this.darktheme = false - } - redtheme(){ - this.darktheme = true - } + switchTheme (dark) { this.darktheme = dark; } + defaulttheme () { this.darktheme = false } + redtheme () { this.darktheme = true} } diff --git a/src/app/ui/changepassword/changepassword.component.ts b/src/app/ui/changepassword/changepassword.component.ts index 1b2e15a..a880cd6 100644 --- a/src/app/ui/changepassword/changepassword.component.ts +++ b/src/app/ui/changepassword/changepassword.component.ts @@ -19,7 +19,7 @@ export class ChangepasswordComponent implements OnInit { errmsg :string = '' onSubmit(e){ - this.http.put('/api/Account/Password', { + this.http.put('/api/ExamAccounts/Password', { password: e.password, newPassword: e.newPassword, }).subscribe(data=> { From 76d489a4e80551fd385dd73b511c5891fa9d6a3c Mon Sep 17 00:00:00 2001 From: cpf <1105965053@qq.com> Date: Mon, 14 Dec 2020 16:41:54 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E5=AE=8C=E5=96=84]=20=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/navigation/navigation.component.scss | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/app/navigation/navigation.component.scss b/src/app/navigation/navigation.component.scss index 9854d68..4db0b5f 100644 --- a/src/app/navigation/navigation.component.scss +++ b/src/app/navigation/navigation.component.scss @@ -37,10 +37,12 @@ mat-sidenav{ width: 18px; height: 20px; vertical-align: middle; + cursor: pointer; } label { display: inline-block; vertical-align: middle; + cursor: pointer; } } }